@cardelli/ambit 0.1.3 → 0.1.5

package/esm/lib/command.js

@@ -4,24 +4,69 @@
 import "../_dnt.polyfills.js";
 import { spawn } from "node:child_process";
 import { Spinner } from "./cli.js";
+import { Result } from "./result.js";
+// =============================================================================
+// Command Result
+// =============================================================================
+export class CmdResult {
+    code;
+    stdout;
+    stderr;
+    ok;
+    constructor(code, stdout, stderr) {
+        this.code = code;
+        this.stdout = stdout;
+        this.stderr = stderr;
+        this.ok = code === 0;
+    }
+    /** Parse stdout as JSON, returning Result<T>. */
+    json() {
+        if (!this.ok) {
+            return Result.err(this.stderr || `Command failed with code ${this.code}`);
+        }
+        try {
+            return Result.ok(JSON.parse(this.stdout));
+        }
+        catch {
+            return Result.err(`Failed to parse JSON: ${this.stdout.slice(0, 100)}`);
+        }
+    }
+    /** Merged stdout + stderr. */
+    get output() {
+        return (this.stdout + this.stderr).trimEnd();
+    }
+}
 // =============================================================================
 // Run Command
 // =============================================================================
 /**
  * Run a command and capture output.
+ * When `interactive: true`, inherits all stdio (no capture).
  */
 export const runCommand = (args, options) => {
     const [cmd, ...cmdArgs] = args;
+    const interactive = options?.interactive ?? false;
     return new Promise((resolve) => {
         const child = spawn(cmd, cmdArgs, {
             cwd: options?.cwd,
             env: options?.env ? { ...process.env, ...options.env } : undefined,
-            stdio: [
-                options?.stdin === "inherit" ? "inherit" : "ignore",
-                "pipe",
-                "pipe",
-            ],
+            stdio: interactive
+                ? "inherit"
+                : [
+                    options?.stdin === "inherit" ? "inherit" : "ignore",
+                    "pipe",
+                    "pipe",
+                ],
         });
+        if (interactive) {
+            child.on("error", () => {
+                resolve(new CmdResult(-1, "", ""));
+            });
+            child.on("close", (code) => {
+                resolve(new CmdResult(code ?? 1, "", ""));
+            });
+            return;
+        }
         const stdout = [];
         const stderr = [];
         child.stdout.setEncoding("utf8");
@@ -29,98 +74,24 @@ export const runCommand = (args, options) => {
         child.stdout.on("data", (chunk) => stdout.push(chunk));
         child.stderr.on("data", (chunk) => stderr.push(chunk));
         child.on("error", (error) => {
-            resolve({
-                success: false,
-                code: -1,
-                stdout: "",
-                stderr: error.message,
-            });
+            resolve(new CmdResult(-1, "", error.message));
         });
         child.on("close", (code) => {
-            resolve({
-                success: code === 0,
-                code: code ?? 1,
-                stdout: stdout.join(""),
-                stderr: stderr.join(""),
-            });
+            resolve(new CmdResult(code ?? 1, stdout.join(""), stderr.join("")));
         });
     });
 };
 // =============================================================================
-// Run Command with JSON Output
-// =============================================================================
-/**
- * Run a command that outputs JSON and parse it.
- */
-export const runCommandJson = async (args, options) => {
-    const result = await runCommand(args, options);
-    if (!result.success) {
-        return {
-            success: false,
-            error: result.stderr || `Command failed with code ${result.code}`,
-        };
-    }
-    try {
-        const data = JSON.parse(result.stdout);
-        return { success: true, data };
-    }
-    catch {
-        return {
-            success: false,
-            error: `Failed to parse JSON output: ${result.stdout.slice(0, 100)}`,
-        };
-    }
-};
-// =============================================================================
-// Run with Spinner
+// Wrappers
 // =============================================================================
-/**
- * Run a command while showing a spinner.
- */
-export const runWithSpinner = async (label, args, options) => {
+/** Run with spinner, return CmdResult. */
+export const runQuiet = (label, args, options) => {
     const spinner = new Spinner();
     spinner.start(label);
-    const result = await runCommand(args, options);
-    if (result.success) {
-        spinner.success(label);
-    }
-    else {
-        spinner.fail(label);
-    }
-    return result;
-};
-// =============================================================================
-// Run Quiet
-// =============================================================================
-/**
- * Run a command with spinner and return simplified result.
- */
-export const runQuiet = async (label, args, options) => {
-    const result = await runWithSpinner(label, args, options);
-    return {
-        success: result.success,
-        output: result.stdout + result.stderr,
-    };
-};
-// =============================================================================
-// Run Interactive
-// =============================================================================
-/**
- * Run a command interactively (inherits stdio).
- */
-export const runInteractive = (args, options) => {
-    const [cmd, ...cmdArgs] = args;
-    return new Promise((resolve) => {
-        const child = spawn(cmd, cmdArgs, {
-            cwd: options?.cwd,
-            env: options?.env ? { ...process.env, ...options.env } : undefined,
-            stdio: "inherit",
-        });
-        child.on("error", () => {
-            resolve({ success: false, code: -1 });
-        });
-        child.on("close", (code) => {
-            resolve({ success: (code ?? 1) === 0, code: code ?? 1 });
-        });
+    return runCommand(args, options).then((r) => {
+        r.ok ? spinner.success(label) : spinner.fail(label);
+        return r;
     });
 };
+/** Run and parse stdout as JSON. */
+export const runJson = (args, options) => runCommand(args, options).then((r) => r.json());

package/esm/lib/output.d.ts

@@ -12,6 +12,7 @@ export declare class Output<T extends Record<string, unknown>> {
     constructor(jsonMode: boolean);
     done(data: T): this;
     fail(error: string, data?: Record<string, unknown>): this;
+    print(): void;
     ok(text: string): this;
     err(text: string): this;
     info(text: string): this;
@@ -25,7 +26,6 @@ export declare class Output<T extends Record<string, unknown>> {
         fail(msg: string): void;
         stop(): void;
     };
-    print(): void;
     die(message: string): never;
     isJson(): boolean;
 }

package/esm/lib/output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"AAGA,OAAO,sBAAsB,CAAC;AAmB9B,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG,CAAC,CAAC;AAChD,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAMvD,qBAAa,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACnD,OAAO,CAAC,MAAM,CAGE;IAChB,OAAO,CAAC,QAAQ,CAAU;gBAEd,QAAQ,EAAE,OAAO;IAS7B,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAMnB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IASzD,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKtB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKvB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKvB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK1B,KAAK,IAAI,IAAI;IAMb,OAAO,CACL,OAAO,EAAE,MAAM,GACd;QAAE,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,IAAI,IAAI,CAAA;KAAE;IAkBxE,KAAK,IAAI,IAAI;IAOb,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK;IAU3B,MAAM,IAAI,OAAO;CAGlB;AAMD,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,QAAQ,EAAE,OAAO,GAChB,MAAM,CAAC,CAAC,CAAC,CAEX"}
+{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"AAGA,OAAO,sBAAsB,CAAC;AAmB9B,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG,CAAC,CAAC;AAChD,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAMvD,qBAAa,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACnD,OAAO,CAAC,MAAM,CAGE;IAChB,OAAO,CAAC,QAAQ,CAAU;gBAEd,QAAQ,EAAE,OAAO;IAS7B,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAMnB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAKzD,KAAK,IAAI,IAAI;IAUb,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKtB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKvB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKvB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK1B,KAAK,IAAI,IAAI;IAKb,OAAO,CACL,OAAO,EAAE,MAAM,GACd;QAAE,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,IAAI,IAAI,CAAA;KAAE;IAiBxE,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK;IAS3B,MAAM,IAAI,OAAO;CAGlB;AAMD,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,QAAQ,EAAE,OAAO,GAChB,MAAM,CAAC,CAAC,CAAC,CAEX"}

package/esm/lib/output.js

@@ -26,6 +26,11 @@ export class Output {
         this.result = { ok: false, error, ...data };
         return this;
     }
+    print() {
+        if (this.jsonMode && this.result) {
+            console.log(JSON.stringify(this.result, null, 2));
+        }
+    }
     // ===========================================================================
     // Human-Mode Output (no-op in JSON mode)
     // ===========================================================================
@@ -69,7 +74,6 @@ export class Output {
             console.log();
         return this;
     }
-    // JSON-aware spinner — no-op in JSON mode
     spinner(message) {
         if (this.jsonMode) {
             return { success: () => { }, fail: () => { }, stop: () => { } };
@@ -85,13 +89,6 @@ export class Output {
     // ===========================================================================
     // Terminal Output
     // ===========================================================================
-    // Print result as JSON (no-op in human mode)
-    print() {
-        if (this.jsonMode && this.result) {
-            console.log(JSON.stringify(this.result, null, 2));
-        }
-    }
-    // Fatal error — outputs { ok: false, error } and exits
     die(message) {
         if (this.jsonMode) {
             console.log(JSON.stringify({ ok: false, error: message }, null, 2));
@@ -101,7 +98,6 @@ export class Output {
         }
         dntShim.Deno.exit(1);
     }
-    // Check if in JSON mode
     isJson() {
         return this.jsonMode;
     }

package/esm/lib/result.d.ts

@@ -1,8 +1,20 @@
-export type Result<T, K extends string = string> = ({
-    ok: true;
-} & T) | {
-    ok: false;
-    kind: K;
-    message: string;
-};
+import "../_dnt.polyfills.js";
+export declare class Result<T> {
+    readonly ok: boolean;
+    private readonly _value;
+    private readonly _error;
+    private constructor();
+    static ok<T>(value: T): Result<T>;
+    static err<T = never>(error: string): Result<T>;
+    get value(): T | undefined;
+    get error(): string | undefined;
+    map<U>(fn: (value: T) => U): Result<U>;
+    flatMap<U>(fn: (value: T) => Result<U>): Result<U>;
+    unwrap(): T;
+    unwrapOr(fallback: T): T;
+    match<U>(cases: {
+        ok: (value: T) => U;
+        err: (error: string) => U;
+    }): U;
+}
 //# sourceMappingURL=result.d.ts.map

package/esm/lib/result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../src/lib/result.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,IAC3C,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG,CAAC,CAAC,GAClB;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC"}
+{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../src/lib/result.ts"],"names":[],"mappings":"AAGA,OAAO,sBAAsB,CAAC;AAG9B,qBAAa,MAAM,CAAC,CAAC;IAEjB,QAAQ,CAAC,EAAE,EAAE,OAAO;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHzB,OAAO;IAMP,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;IAIjC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;IAI/C,IAAI,KAAK,IAAI,CAAC,GAAG,SAAS,CAEzB;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;IAKtC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;IAKlD,MAAM,IAAI,CAAC;IAKX,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC;IAIxB,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE;QAAE,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;QAAC,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC,CAAA;KAAE,GAAG,CAAC;CAGvE"}

package/esm/lib/result.js

@@ -1 +1,47 @@
-export {};
+// =============================================================================
+// Result<T> — Shared Success/Failure Type
+// =============================================================================
+import "../_dnt.polyfills.js";
+export class Result {
+    ok;
+    _value;
+    _error;
+    constructor(ok, _value, _error) {
+        this.ok = ok;
+        this._value = _value;
+        this._error = _error;
+    }
+    static ok(value) {
+        return new Result(true, value, undefined);
+    }
+    static err(error) {
+        return new Result(false, undefined, error);
+    }
+    get value() {
+        return this._value;
+    }
+    get error() {
+        return this._error;
+    }
+    map(fn) {
+        if (this.ok)
+            return Result.ok(fn(this._value));
+        return Result.err(this._error);
+    }
+    flatMap(fn) {
+        if (this.ok)
+            return fn(this._value);
+        return Result.err(this._error);
+    }
+    unwrap() {
+        if (this.ok)
+            return this._value;
+        throw new Error(this._error);
+    }
+    unwrapOr(fallback) {
+        return this.ok ? this._value : fallback;
+    }
+    match(cases) {
+        return this.ok ? cases.ok(this._value) : cases.err(this._error);
+    }
+}

package/esm/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";AACA,OAAO,qBAAqB,CAAC;AA8B7B,OAAO,8BAA8B,CAAC;AACtC,OAAO,8BAA8B,CAAC;AACtC,OAAO,4BAA4B,CAAC;AACpC,OAAO,8BAA8B,CAAC;AACtC,OAAO,+BAA+B,CAAC;AACvC,OAAO,8BAA8B,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";AACA,OAAO,qBAAqB,CAAC;AA+B7B,OAAO,8BAA8B,CAAC;AACtC,OAAO,8BAA8B,CAAC;AACtC,OAAO,4BAA4B,CAAC;AACpC,OAAO,8BAA8B,CAAC;AACtC,OAAO,+BAA+B,CAAC;AACvC,OAAO,8BAA8B,CAAC"}

package/esm/main.js

@@ -13,13 +13,14 @@ import * as dntShim from "./_dnt.shims.js";
 //   create     Create a Tailscale subnet router on a Fly.io custom network
 //   deploy     Deploy an app safely on a custom private network
 //   status     Show router status, network, and tailnet info
-//   destroy    Tear down the router, clean up DNS and tailnet device
+//   destroy    Destroy a network (router) or a workload app
 //   doctor     Check that Tailscale and the router are working correctly
 //
 // Examples:
 //   ambit create browsers
 //   ambit status
-//   ambit destroy
+//   ambit destroy network browsers
+//   ambit destroy app my-app.browsers
 //   ambit doctor
 //
 // =============================================================================