100
if (isInteractive) fn();
101
}
102
103
-function createClackSpinnerHandle(s: p.SpinnerResult, defaultMessage: string): SpinnerHandle {
103
+function createClackSpinnerHandle(
104
+ s: p.SpinnerResult,
105
+ defaultMessage: string
106
+): { handle: SpinnerHandle; isStopped: () => boolean } {
107
+ let stopped = false;
108
return {
105
- message: (msg: string) => Effect.sync(() => s.message(msg)),
106
- stop: (msg?: string) => Effect.sync(() => s.stop(msg ?? defaultMessage)),
107
- error: (msg?: string) => Effect.sync(() => s.error(msg ?? defaultMessage)),
109
+ handle: {
110
+ message: (msg: string) => Effect.sync(() => s.message(msg)),
111
+ stop: (msg?: string) =>
112
+ Effect.sync(() => {
113
+ stopped = true;
114
+ s.stop(msg ?? defaultMessage);
115
+ }),
116
+ error: (msg?: string) =>
117
+ Effect.sync(() => {
118
+ stopped = true;
119
+ s.error(msg ?? defaultMessage);
120
+ }),
121
+ },
122
+ isStopped: () => stopped,
123
};
124
}
125
189
Effect.sync(() => {
190
const s = p.spinner({ output: process.stderr });
191
s.start(message);
177
- return { raw: s, handle: createClackSpinnerHandle(s, message) };
192
+ const { handle, isStopped } = createClackSpinnerHandle(s, message);
193
+ return { raw: s, handle, isStopped };
194
}),
195
({ handle }) => use(handle),
180
- ({ raw }, exit) =>
196
+ ({ raw, isStopped }, exit) =>
197
Effect.sync(() => {
182
- // Only clean up if the spinner is still active (user didn't call stop/error)
183
- // Clack spinners have an internal `isCancelled` state after stop/error/cancel
184
- if (Exit.isFailure(exit) && !raw.isCancelled) {
198
+ // Only clean up if the spinner hasn't been stopped/errored by the callback
199
+ if (Exit.isFailure(exit) && !isStopped()) {
200
raw.error(message);
201
}
202
})