deepspace 0.3.6 → 0.3.7

package/dist/cli.js

@@ -14,7 +14,24 @@ import { join as join2 } from "path";
 import { homedir } from "os";
 import { exec } from "child_process";
 import { platform } from "os";
+import * as p2 from "@clack/prompts";
+
+// src/cli/lib/spinner.ts
 import * as p from "@clack/prompts";
+function createSpinner() {
+  if (process.stdout.isTTY) return p.spinner();
+  return {
+    start: (msg) => {
+      if (msg) console.log(msg);
+    },
+    stop: (msg) => {
+      if (msg) console.log(msg);
+    },
+    message: (msg) => {
+      if (msg) console.log(msg);
+    }
+  };
+}
 
 // src/cli/env.ts
 import { existsSync, readFileSync, writeFileSync } from "fs";
@@ -261,36 +278,36 @@ var login_default = defineCommand({
       console.log("Logged in");
       return;
     }
-    p.intro("DeepSpace Login");
-    const s = p.spinner();
+    p2.intro("DeepSpace Login");
+    const s = createSpinner();
     s.start("Creating login session...");
     const sessionRes = await fetch(`${AUTH_URL}/api/auth/cli/session`, { method: "POST" });
     if (!sessionRes.ok) {
       s.stop("Failed");
-      p.cancel("Could not create login session");
+      p2.cancel("Could not create login session");
       process.exit(1);
     }
     const sessionData = await sessionRes.json();
     if (!sessionData.sessionId || !sessionData.loginUrl) {
       s.stop("Failed");
-      p.cancel("Could not create login session");
+      p2.cancel("Could not create login session");
       process.exit(1);
     }
     const { sessionId, loginUrl } = sessionData;
     s.stop("Opening browser...");
-    p.log.info(`If the browser doesn't open, visit:
+    p2.log.info(`If the browser doesn't open, visit:
   ${loginUrl}`);
     openBrowser(loginUrl);
     s.start("Waiting for authentication...");
     const result = await pollForCompletion(sessionId);
     if (!result) {
       s.stop("Timed out");
-      p.cancel("Login timed out. Run `deepspace login` to try again.");
+      p2.cancel("Login timed out. Run `deepspace login` to try again.");
       process.exit(1);
     }
     storeCredentials(result.sessionToken, result.jwt);
     s.stop("Authenticated");
-    p.outro(`Logged in as ${result.name ?? result.email}`);
+    p2.outro(`Logged in as ${result.name ?? result.email}`);
   }
 });
 async function pollForCompletion(sessionId) {
@@ -808,7 +825,7 @@ function resolvePort3(arg) {
 
 // src/cli/commands/test-accounts.ts
 import { defineCommand as defineCommand6 } from "citty";
-import * as p2 from "@clack/prompts";
+import * as p3 from "@clack/prompts";
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, existsSync as existsSync6, mkdirSync as mkdirSync3 } from "fs";
 import { join as join7 } from "path";
 import { homedir as homedir4 } from "os";
@@ -1048,11 +1065,11 @@ var clear = defineCommand6({
     }
     if (!args.yes) {
       const subject = args.label ? `${targets.length} test account(s) labeled '${args.label}'` : `all ${targets.length} test account(s)`;
-      const confirmed = await p2.confirm({
+      const confirmed = await p3.confirm({
         message: `Delete ${subject}? This is not reversible.`,
         initialValue: false
       });
-      if (p2.isCancel(confirmed) || !confirmed) {
+      if (p3.isCancel(confirmed) || !confirmed) {
         console.log("Cancelled.");
         return;
       }
@@ -1099,7 +1116,7 @@ import { execSync as execSync2 } from "child_process";
 import { readFileSync as readFileSync5, readdirSync, existsSync as existsSync7 } from "fs";
 import { parse as parseToml2 } from "smol-toml";
 import { join as join8, resolve as resolve3, dirname } from "path";
-import * as p3 from "@clack/prompts";
+import * as p4 from "@clack/prompts";
 
 // src/server/rooms/binding-manifest.ts
 var AUTO_PROVISION_SENTINEL = "auto";
@@ -1373,29 +1390,29 @@ var deploy_default = defineCommand7({
   },
   async run({ args }) {
     const appDir = resolve3(args.dir ?? ".");
-    p3.intro("Deploying DeepSpace app");
+    p4.intro("Deploying DeepSpace app");
     const wranglerPath = join8(appDir, "wrangler.toml");
     if (!existsSync7(wranglerPath)) {
-      p3.cancel("No wrangler.toml found. Are you in a DeepSpace app directory?");
+      p4.cancel("No wrangler.toml found. Are you in a DeepSpace app directory?");
       process.exit(1);
     }
     const wranglerConfig = parseToml2(readFileSync5(wranglerPath, "utf-8"));
     const nameRes = resolveAppName(wranglerConfig.name);
     if (!nameRes.ok) {
-      p3.cancel(`wrangler.toml: ${nameRes.reason}`);
+      p4.cancel(`wrangler.toml: ${nameRes.reason}`);
       process.exit(1);
     }
-    if (nameRes.warning) p3.log.warn(nameRes.warning);
+    if (nameRes.warning) p4.log.warn(nameRes.warning);
     const appName = nameRes.name;
-    p3.log.info(`App: ${appName}`);
+    p4.log.info(`App: ${appName}`);
     let token;
     try {
       token = await ensureToken();
     } catch (err) {
-      p3.cancel(err.message);
+      p4.cancel(err.message);
       process.exit(1);
     }
-    const s = p3.spinner();
+    const s = createSpinner();
     s.start("Building...");
     try {
       execSync2("npx vite build", { cwd: appDir, stdio: "pipe" });
@@ -1407,13 +1424,13 @@ var deploy_default = defineCommand7({
     s.stop("Built");
     const deployConfigPath = join8(appDir, ".wrangler", "deploy", "config.json");
     if (!existsSync7(deployConfigPath)) {
-      p3.cancel("Build output config not found at .wrangler/deploy/config.json");
+      p4.cancel("Build output config not found at .wrangler/deploy/config.json");
       process.exit(1);
     }
     const deployConfig = JSON.parse(readFileSync5(deployConfigPath, "utf-8"));
     const outputWranglerPath = resolve3(dirname(deployConfigPath), deployConfig.configPath);
     if (!existsSync7(outputWranglerPath)) {
-      p3.cancel(`Output wrangler.json not found at ${outputWranglerPath}`);
+      p4.cancel(`Output wrangler.json not found at ${outputWranglerPath}`);
       process.exit(1);
     }
     const outputConfig = JSON.parse(readFileSync5(outputWranglerPath, "utf-8"));
@@ -1421,11 +1438,11 @@ var deploy_default = defineCommand7({
     const workerBundlePath = join8(workerDir, outputConfig.main);
     const clientDir = outputConfig.assets?.directory ? resolve3(workerDir, outputConfig.assets.directory) : null;
     if (!existsSync7(workerBundlePath)) {
-      p3.cancel(`Worker bundle not found at ${workerBundlePath}`);
+      p4.cancel(`Worker bundle not found at ${workerBundlePath}`);
       process.exit(1);
     }
     if (!clientDir || !existsSync7(clientDir)) {
-      p3.cancel(`Client assets not found at ${clientDir}`);
+      p4.cancel(`Client assets not found at ${clientDir}`);
       process.exit(1);
     }
     s.start("Collecting assets...");
@@ -1442,19 +1459,19 @@ var deploy_default = defineCommand7({
       sqlite: sqliteClasses.has(b.class_name)
     }));
     if (doManifest?.length) {
-      p3.log.info(`DO manifest: ${doManifest.length} binding(s)`);
+      p4.log.info(`DO manifest: ${doManifest.length} binding(s)`);
     }
     const customBindings = bindingManifestFromOutputConfig(outputConfig);
     const validation = validateBindingManifest(customBindings);
     if (!validation.valid) {
-      p3.cancel(
+      p4.cancel(
         `Invalid binding(s) in wrangler.toml:
 ` + validation.errors.map((e) => `  \u2022 ${e.reason}`).join("\n")
       );
       process.exit(1);
     }
     if (customBindings.length) {
-      p3.log.info(
+      p4.log.info(
         `Custom bindings: ${customBindings.map((b) => `${b.name} (${b.type})`).join(", ")}`
       );
     }
@@ -1466,7 +1483,7 @@ var deploy_default = defineCommand7({
         try {
           userSecrets = parseDevVars(customSection);
         } catch (err) {
-          p3.cancel(`.dev.vars: ${err.message}`);
+          p4.cancel(`.dev.vars: ${err.message}`);
           process.exit(1);
         }
       }
@@ -1478,20 +1495,20 @@ var deploy_default = defineCommand7({
     ]);
     for (const name of userSecretNames) {
       if (RESERVED_BINDING_NAMES.has(name)) {
-        p3.cancel(
+        p4.cancel(
           `.dev.vars: "${name}" is a reserved binding name and cannot be used as an app secret.`
         );
         process.exit(1);
       }
       if (declaredBindingNames.has(name)) {
-        p3.cancel(
+        p4.cancel(
           `.dev.vars: "${name}" collides with a binding declared in wrangler.toml \u2014 rename one or the other.`
         );
         process.exit(1);
       }
     }
     if (userSecretNames.length) {
-      p3.log.info(`App secrets (from .dev.vars): ${userSecretNames.join(", ")}`);
+      p4.log.info(`App secrets (from .dev.vars): ${userSecretNames.join(", ")}`);
     }
     s.start(`Deploying to ${appName}.app.space...`);
     const form = new FormData();
@@ -1514,7 +1531,7 @@ var deploy_default = defineCommand7({
     const body = await res.json().catch(() => ({}));
     if (!res.ok || !body.success) {
       s.stop("Deploy failed");
-      p3.cancel(body.error ?? `Deployment error (${res.status})`);
+      p4.cancel(body.error ?? `Deployment error (${res.status})`);
       process.exit(1);
     }
     if (body.url) {
@@ -1522,15 +1539,15 @@ var deploy_default = defineCommand7({
       const ok = await waitForAssetsReady(body.url, 9e4);
       if (!ok) {
         s.stop("Deployed (edge propagation still in progress after 90s)");
-        p3.log.warn("First requests may briefly hit the assets transitional page; retry in a minute.");
-        p3.log.success(`Live at: ${body.url}`);
-        p3.outro("Done");
+        p4.log.warn("First requests may briefly hit the assets transitional page; retry in a minute.");
+        p4.log.success(`Live at: ${body.url}`);
+        p4.outro("Done");
         return;
       }
     }
     s.stop("Deployed!");
-    p3.log.success(`Live at: ${body.url}`);
-    p3.outro("Done");
+    p4.log.success(`Live at: ${body.url}`);
+    p4.outro("Done");
   }
 });
 async function waitForAssetsReady(url, timeoutMs) {
@@ -1577,7 +1594,7 @@ import { defineCommand as defineCommand8 } from "citty";
 import { readFileSync as readFileSync6, existsSync as existsSync8 } from "fs";
 import { join as join9 } from "path";
 import { parse as parseToml3 } from "smol-toml";
-import * as p4 from "@clack/prompts";
+import * as p5 from "@clack/prompts";
 var DEPLOY_URL2 = process.env.DEEPSPACE_DEPLOY_URL ?? ENVS.prod.deploy;
 var undeploy_default = defineCommand8({
   meta: {
@@ -1601,18 +1618,18 @@ var undeploy_default = defineCommand8({
       }
     }
     if (!appName) {
-      p4.cancel("Provide an app name or run from a DeepSpace app directory.");
+      p5.cancel("Provide an app name or run from a DeepSpace app directory.");
       process.exit(1);
     }
     let token;
     try {
       token = await ensureToken();
     } catch (err) {
-      p4.cancel(err.message);
+      p5.cancel(err.message);
       process.exit(1);
     }
-    p4.intro(`Undeploying ${appName}`);
-    const s = p4.spinner();
+    p5.intro(`Undeploying ${appName}`);
+    const s = createSpinner();
     s.start("Removing...");
     const res = await fetch(`${DEPLOY_URL2}/api/deploy/${appName}`, {
       method: "DELETE",
@@ -1621,11 +1638,11 @@ var undeploy_default = defineCommand8({
     const body = await res.json().catch(() => ({}));
     if (!res.ok || !body.success) {
       s.stop("Failed");
-      p4.cancel(body.error ?? `Undeploy error (${res.status})`);
+      p5.cancel(body.error ?? `Undeploy error (${res.status})`);
       process.exit(1);
     }
     s.stop("Removed");
-    p4.outro(`${appName}.app.space has been taken down`);
+    p5.outro(`${appName}.app.space has been taken down`);
   }
 });
 
@@ -1796,6 +1813,18 @@ async function api(token, path, init) {
   }
   return JSON.parse(text);
 }
+function scrubInternal(value) {
+  if (Array.isArray(value)) return value.map(scrubInternal);
+  if (value && typeof value === "object") {
+    const out = {};
+    for (const [k, v] of Object.entries(value)) {
+      if (k === "costCents") continue;
+      out[k] = scrubInternal(v);
+    }
+    return out;
+  }
+  return value;
+}
 function fmtCents(cents) {
   if (cents === null || cents === void 0) return "\u2014";
   return `$${(cents / 100).toFixed(2)}`;
@@ -1832,7 +1861,7 @@ var search = defineCommand11({
       `/api/domains/search?q=${encodeURIComponent(args.query)}&limit=${limit}`
     );
     if (args.json) {
-      process.stdout.write(JSON.stringify(result, null, 2) + "\n");
+      process.stdout.write(JSON.stringify(scrubInternal(result), null, 2) + "\n");
       return;
     }
     if (result.domains.length === 0) {
@@ -1853,8 +1882,8 @@ var buy = defineCommand11({
     domain: { type: "positional", description: "Domain to buy", required: true },
     app: { type: "string", description: "App to attach (defaults to ./wrangler.toml)" },
     yes: { type: "boolean", description: "Skip the confirmation prompt", default: false },
-    "no-open": { type: "boolean", description: "Do not open browser; print Stripe URL", default: false },
-    "no-wait": { type: "boolean", description: "Exit after creating session; do not poll until active", default: false },
+    open: { type: "boolean", description: "Open browser at Stripe URL (use --no-open to print URL only)", default: true },
+    wait: { type: "boolean", description: "Poll until provisioning completes (use --no-wait to exit after session creation)", default: true },
     json: { type: "boolean", description: "Emit JSON to stdout", default: false }
   },
   async run({ args }) {
@@ -1889,14 +1918,14 @@ var buy = defineCommand11({
       }
     );
     if (args.json) {
-      process.stdout.write(JSON.stringify({ ...checkout, expectedTime, registrar: result.registrar }, null, 2) + "\n");
+      process.stdout.write(JSON.stringify(scrubInternal({ ...checkout, expectedTime, registrar: result.registrar }), null, 2) + "\n");
     } else {
       console.log(`Stripe Checkout: ${checkout.url}`);
     }
-    if (!args["no-open"] && process.stdin.isTTY) {
+    if (args.open && process.stdin.isTTY) {
       openBrowser2(checkout.url);
     }
-    if (args["no-wait"]) return;
+    if (!args.wait) return;
     const timeoutMs = result.registrar === "cloudflare" ? 5 * 60 * 1e3 : 60 * 60 * 1e3;
     if (!args.json) {
       console.log(`Waiting for payment & provisioning (up to ${expectedTime}). Press Ctrl-C anytime \u2014`);
@@ -1917,7 +1946,7 @@ var buy = defineCommand11({
         }
         if (detail.domain.status === "active") {
           if (args.json) {
-            process.stdout.write(JSON.stringify({ ...checkout, status: "active", domain: args.domain }, null, 2) + "\n");
+            process.stdout.write(JSON.stringify(scrubInternal({ ...checkout, status: "active", domain: args.domain }), null, 2) + "\n");
           } else {
             console.log(`\u2713 ${args.domain} is live and pointing at ${appName}`);
           }
@@ -1945,7 +1974,7 @@ var list2 = defineCommand11({
     const token = await ensureToken();
     const result = await api(token, "/api/domains");
     if (args.json) {
-      process.stdout.write(JSON.stringify(result, null, 2) + "\n");
+      process.stdout.write(JSON.stringify(scrubInternal(result), null, 2) + "\n");
       return;
     }
     if (result.domains.length === 0) {
@@ -1975,7 +2004,7 @@ var status = defineCommand11({
       process.exit(1);
     }
     if (args.json) {
-      process.stdout.write(JSON.stringify(found, null, 2) + "\n");
+      process.stdout.write(JSON.stringify(scrubInternal(found), null, 2) + "\n");
       return;
     }
     console.log(`Domain:        ${found.domain}`);