@doist/twist-cli 1.9.1 → 1.10.1

package/dist/lib/spinner.js

@@ -1,54 +1,110 @@
 import chalk from 'chalk';
 import yoctoSpinner from 'yocto-spinner';
+function shouldDisableSpinner() {
+    // Check for environment variables that should disable spinners
+    if (process.env.TW_SPINNER === 'false') {
+        return true;
+    }
+    // Check if we're in CI environment
+    if (process.env.CI) {
+        return true;
+    }
+    // Check process arguments for flags that should disable spinner
+    const args = process.argv;
+    const spinnerDisablingFlags = ['--json', '--ndjson', '--no-spinner', '--progress-jsonl'];
+    // Check for both exact matches and prefix matches (to handle --flag=value variants)
+    return spinnerDisablingFlags.some((flag) => args.includes(flag) || // exact match
+        args.some((arg) => arg.startsWith(`${flag}=`)));
+}
+// ── Early spinner (shown before command module is loaded) ──────────────
+let earlySpinnerInstance = null;
+let originalStdoutWrite = null;
+export function startEarlySpinner() {
+    if (!process.stdout.isTTY || shouldDisableSpinner()) {
+        return;
+    }
+    earlySpinnerInstance = yoctoSpinner({ text: chalk.blue('Loading...') });
+    earlySpinnerInstance.start();
+    // Intercept stdout.write so the spinner auto-stops before any command output
+    originalStdoutWrite = process.stdout.write.bind(process.stdout);
+    process.stdout.write = ((...args) => {
+        stopEarlySpinner();
+        return process.stdout.write(...args);
+    });
+}
+export function stopEarlySpinner() {
+    if (originalStdoutWrite) {
+        process.stdout.write = originalStdoutWrite;
+        originalStdoutWrite = null;
+    }
+    if (earlySpinnerInstance) {
+        earlySpinnerInstance.stop();
+        earlySpinnerInstance = null;
+    }
+}
+/** For tests only — reset singleton state without stopping */
+export function resetEarlySpinner() {
+    earlySpinnerInstance = null;
+    originalStdoutWrite = null;
+}
+// ── LoadingSpinner (used by API calls) ─────────────────────────────────
 class LoadingSpinner {
     spinnerInstance = null;
+    adopted = false;
     start(options) {
         // Don't show spinner in non-interactive environments, when disabled via options, or when JSON output is expected
-        if (!process.stdout.isTTY || options.noSpinner || this.shouldDisableSpinner()) {
+        if (!process.stdout.isTTY || options.noSpinner || shouldDisableSpinner()) {
+            return this;
+        }
+        // If an early spinner is running, adopt it instead of creating a new one
+        if (earlySpinnerInstance) {
+            this.spinnerInstance = earlySpinnerInstance;
+            this.spinnerInstance.text = chalk[options.color || 'blue'](options.text);
+            earlySpinnerInstance = null;
+            this.adopted = true;
             return this;
         }
         const colorFn = chalk[options.color || 'blue'];
         this.spinnerInstance = yoctoSpinner({
             text: colorFn(options.text),
-            // yocto-spinner uses dots spinner by default which matches NPM's braille pattern
         });
         this.spinnerInstance.start();
         return this;
     }
     succeed(text) {
         if (this.spinnerInstance) {
+            if (this.adopted) {
+                // Release back so subsequent API calls can re-adopt
+                earlySpinnerInstance = this.spinnerInstance;
+                this.spinnerInstance = null;
+                this.adopted = false;
+                return;
+            }
             this.spinnerInstance.success(text ? chalk.green(`✓ ${text}`) : undefined);
             this.spinnerInstance = null;
         }
     }
     fail(text) {
         if (this.spinnerInstance) {
+            // Errors always stop the spinner for real
             this.spinnerInstance.error(text ? chalk.red(`✗ ${text}`) : undefined);
             this.spinnerInstance = null;
+            this.adopted = false;
         }
     }
     stop() {
         if (this.spinnerInstance) {
+            if (this.adopted) {
+                // Release back so subsequent API calls can re-adopt
+                earlySpinnerInstance = this.spinnerInstance;
+                this.spinnerInstance = null;
+                this.adopted = false;
+                return;
+            }
             this.spinnerInstance.stop();
             this.spinnerInstance = null;
         }
     }
-    shouldDisableSpinner() {
-        // Check for environment variables that should disable spinners
-        if (process.env.TW_SPINNER === 'false') {
-            return true;
-        }
-        // Check if we're in CI environment
-        if (process.env.CI) {
-            return true;
-        }
-        // Check process arguments for flags that should disable spinner
-        const args = process.argv;
-        const spinnerDisablingFlags = ['--json', '--ndjson', '--no-spinner', '--progress-jsonl'];
-        // Check for both exact matches and prefix matches (to handle --flag=value variants)
-        return spinnerDisablingFlags.some((flag) => args.includes(flag) || // exact match
-            args.some((arg) => arg.startsWith(`${flag}=`)));
-    }
 }
 /**
  * High-level wrapper function for running async operations with a loading spinner.

package/dist/lib/spinner.js.map

@@ -1 +1 @@
-{"version":3,"file":"spinner.js","sourceRoot":"","sources":["../../src/lib/spinner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spinner.js","sourceRoot":"","sources":["../../src/lib/spinner.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@doist/twist-cli",
-    "version": "1.9.1",
+    "version": "1.10.1",
     "description": "TypeScript CLI for Twist",
     "type": "module",
     "main": "dist/index.js",