@devicecloud.dev/dcd 5.11.0-beta.1 → 5.11.0-beta.3

package/dist/utils/device-run.js

@@ -0,0 +1,105 @@
+import { colors } from './styling.js';
+import { ui } from './ui.js';
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function text(value) {
+    return typeof value === 'string' && value.trim() ? value.trim() : null;
+}
+function toFlow(raw, file) {
+    const success = raw.success === true;
+    return {
+        file: text(raw.file) ?? file,
+        success,
+        // A failed flow's reason is in `error`; some reports only have `message`.
+        error: text(raw.error) ?? (success ? null : text(raw.message)),
+    };
+}
+/** The runner's JSON report in `body`, or null when it is not one. */
+function parseRunnerJson(body) {
+    if (!body || !body.trimStart().startsWith('{'))
+        return null;
+    let parsed;
+    try {
+        parsed = JSON.parse(body);
+    }
+    catch {
+        return null;
+    }
+    if (!isRecord(parsed))
+        return null;
+    if (Array.isArray(parsed.results)) {
+        return {
+            flows: parsed.results.filter((r) => isRecord(r)).map((r) => toFlow(r, null)),
+            message: text(parsed.message),
+        };
+    }
+    if (typeof parsed.success !== 'boolean')
+        return null;
+    // One flow: the report is that flow's result.
+    return { flows: [toFlow(parsed, null)], message: text(parsed.message) };
+}
+/**
+ * The flows a run reported, or null when the result carries no report the
+ * CLI can read (plain text): then the text is shown as it came.
+ */
+export function parseRunReport(result) {
+    if (Array.isArray(result.flows)) {
+        return { flows: result.flows.map((f) => toFlow({ ...f }, null)), message: null };
+    }
+    return parseRunnerJson(result.error) ?? parseRunnerJson(result.output);
+}
+/** The failure message for a failed run: each failing flow and why. */
+export function runFailureMessage(result, report) {
+    if (!report)
+        return result.error || 'The flow failed.';
+    const failed = report.flows.filter((f) => !f.success);
+    if (failed.length === 0)
+        return report.message ?? 'The flow failed.';
+    return failed
+        .map((f) => `${f.file ?? 'flow'}: ${f.error ?? 'failed'}`)
+        .join('; ');
+}
+/**
+ * Print a run's result for a person. `label` names a flow the report does not
+ * (a single flow's report has no file name).
+ */
+export function printRunResult(log, passed, result, label) {
+    const report = parseRunReport(result);
+    if (!report || report.flows.length === 0) {
+        log(passed ? ui.success('Flow passed') : `${ui.statusSymbol('FAILED')} Flow failed`);
+        if (report) {
+            if (report.message)
+                log(ui.note(report.message));
+            return;
+        }
+        // Plain text, not a report the CLI can read: show it as it came.
+        if (result.output) {
+            log(ui.section('Output'));
+            log(result.output);
+        }
+        if (result.error) {
+            log(ui.section('Error'));
+            log(colors.error(result.error));
+        }
+        return;
+    }
+    const { flows } = report;
+    const failed = flows.filter((f) => !f.success).length;
+    const total = flows.length;
+    let summary;
+    if (total === 1)
+        summary = passed ? 'Flow passed' : 'Flow failed';
+    else if (failed === 0)
+        summary = `${total} flows passed`;
+    else
+        summary = `${failed} of ${total} flows failed`;
+    log(passed && failed === 0 ? ui.success(summary) : `${ui.statusSymbol('FAILED')} ${summary}`);
+    const rows = flows.map((f) => [
+        f.file ?? label,
+        f.success
+            ? ui.statusWord('PASSED')
+            : `${ui.statusWord('FAILED')}${f.error ? `  ${colors.error(f.error)}` : ''}`,
+    ]);
+    log(ui.branch(ui.fields(rows)));
+}

package/dist/utils/progress.d.ts

@@ -4,9 +4,13 @@ declare class Action {
     private _lastPrinted;
     private interactive;
     start(title: string, initialStatus?: string, _opts?: unknown): void;
+    /** End the action as a success: `✓ message`. */
     stop(message?: string): void;
+    /** End the action as a failure: `✗ message`. */
+    fail(message?: string): void;
     set status(value: string);
     get status(): string;
+    private finish;
     private print;
 }
 export declare const ux: {

package/dist/utils/progress.js

@@ -10,9 +10,20 @@
  * non-interactive environments we skip the spinner entirely and instead print a
  * plain line once per *distinct* status, so CI logs show real progress without
  * the flood.
+ *
+ * Styling: the spinner uses the CLI's own palette (cyan braille frames) rather
+ * than clack's magenta default, and no `│` guide bar, since the rest of the CLI
+ * is a `⏺`/`⎿` tree rather than a clack session. The final line is written by
+ * us, not clack, so it carries the same `✓` / `✗` symbols as every other
+ * command (see STYLE_GUIDE.md).
  */
 import * as p from '@clack/prompts';
 import { isCI } from './ci.js';
+import { colors, symbols } from './styling.js';
+// Braille dots where the terminal can draw them, plain ASCII otherwise.
+const FRAMES = p.unicode
+    ? ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏']
+    : ['-', '\\', '|', '/'];
 class Action {
     current = null;
     _status = '';
@@ -23,37 +34,30 @@ class Action {
     }
     start(title, initialStatus, _opts) {
         this._status = initialStatus ?? '';
-        const line = initialStatus ? `${title} — ${initialStatus}` : title;
+        const line = initialStatus ? `${title} ${colors.dim('·')} ${initialStatus}` : title;
         if (!this.interactive()) {
             this.current = null;
             this.print(line);
             return;
         }
         if (this.current) {
-            this.current.stop();
+            this.current.clear();
         }
-        this.current = p.spinner();
+        this.current = p.spinner({
+            delay: 80,
+            frames: FRAMES,
+            styleFrame: colors.highlight,
+            withGuide: false,
+        });
         this.current.start(line);
     }
+    /** End the action as a success: `✓ message`. */
     stop(message) {
-        if (!this.interactive()) {
-            if (message)
-                this.print(message);
-            this.current = null;
-            this._status = '';
-            this._lastPrinted = '';
-            return;
-        }
-        if (!this.current) {
-            if (message) {
-                // eslint-disable-next-line no-console
-                console.log(message);
-            }
-            return;
-        }
-        this.current.stop(message ?? '');
-        this.current = null;
-        this._status = '';
+        this.finish(symbols.success, message);
+    }
+    /** End the action as a failure: `✗ message`. */
+    fail(message) {
+        this.finish(symbols.error, message);
     }
     set status(value) {
         this._status = value;
@@ -70,6 +74,26 @@ class Action {
     get status() {
         return this._status;
     }
+    // Erase the spinner (if one is live) and print the final line ourselves, so
+    // the symbol matches the rest of the CLI instead of clack's `◇`.
+    finish(symbol, message) {
+        const line = message ? `${symbol} ${message}` : '';
+        if (!this.interactive()) {
+            if (line)
+                this.print(line);
+            this.current = null;
+            this._status = '';
+            this._lastPrinted = '';
+            return;
+        }
+        this.current?.clear();
+        this.current = null;
+        this._status = '';
+        if (line) {
+            // eslint-disable-next-line no-console
+            console.log(line);
+        }
+    }
     // Emit a line only when it differs from the previous one, so repeated polls
     // with no state change stay quiet.
     print(line) {

package/package.json

@@ -68,7 +68,7 @@
     "test:unit": "node scripts/test-runner.mjs --unit",
     "typecheck": "tsc --noEmit -p tsconfig.test.json"
   },
-  "version": "5.11.0-beta.1",
+  "version": "5.11.0-beta.3",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },
@@ -109,7 +109,7 @@
       "ws@>=8.0.0 <8.21.0": "8.21.0",
       "esbuild@<0.28.1": ">=0.28.1",
       "qs@<6.16.0": "6.16.0",
-      "fast-uri@>=3.0.0 <3.1.8": "3.1.8",
+      "fast-uri@>=3.0.0 <3.1.9": "3.1.9",
       "hono@>=4.0.0 <4.13.11": "4.13.11",
       "source-map-js@<1.2.2": "1.2.2",
       "micromatch>picomatch": "^2.3.2",