betterstart-cli 0.0.34 → 0.0.36

package/dist/cli.js

@@ -1664,8 +1664,8 @@ function ensureDatabasePushDependencies(cwd, pm) {
   Installing database push dependencies (${missing.map((dependency) => dependency.name).join(", ")})...`
   );
   for (const dependency of missing) {
-    const installed = installDependency(cwd, pm, dependency.name, dependency.dev);
-    if (!installed) {
+    const installed2 = installDependency(cwd, pm, dependency.name, dependency.dev);
+    if (!installed2) {
       console.log(`  Failed to install ${dependency.name}`);
       return false;
     }
@@ -3460,7 +3460,7 @@ function schemaManifestContainsMailchimpImports(cwd, config, schemaName) {
       return false;
     }
     const content = fs14.readFileSync(fullPath, "utf-8");
-    return markers.some((marker) => content.includes(marker));
+    return markers.some((marker2) => content.includes(marker2));
   });
 }
 function findBlockingIntegrationDependencies(cwd, config, integrationId) {
@@ -3605,7 +3605,7 @@ async function installIntegrations({
   const orderedIntegrationIds = resolveIntegrationInstallOrder(integrationIds);
   const installedIntegrationIds = normalizeInstalledIntegrations(config);
   const skipped = [];
-  const installed = [];
+  const installed2 = [];
   const activated = [];
   const warnings = [];
   for (const integrationId of orderedIntegrationIds) {
@@ -3704,7 +3704,7 @@ async function installIntegrations({
     });
     saveInstalledIntegrationManifest(cwd, manifest);
     writeConfigFile(cwd, config);
-    installed.push(integrationId);
+    installed2.push(integrationId);
     if (!configureResult.configured && isProviderIntegration(definition)) {
       warnings.push(
         `${integrationId} was installed but not activated because its required environment variables are still missing.`
@@ -3712,7 +3712,7 @@ async function installIntegrations({
     }
   }
   return {
-    installed,
+    installed: installed2,
     activated,
     skipped,
     warnings,
@@ -18727,7 +18727,7 @@ async function installPlugins({
   const orderedPluginIds = resolvePluginInstallOrder(pluginIds);
   const installedPluginIds = normalizeInstalledPlugins(config);
   const skipped = [];
-  const installed = [];
+  const installed2 = [];
   const warnings = [];
   ensureSnapshotGitFiles(cwd);
   for (const pluginId of orderedPluginIds) {
@@ -18796,10 +18796,10 @@ async function installPlugins({
     };
     saveInstalledPluginManifest(cwd, manifest);
     writeConfigFile(cwd, config);
-    installed.push(pluginId);
+    installed2.push(pluginId);
   }
   return {
-    installed,
+    installed: installed2,
     skipped,
     warnings,
     config
@@ -21828,6 +21828,89 @@ import fs39 from "fs";
 import path50 from "path";
 import * as p17 from "@clack/prompts";
 
+// core-engine/utils/prompt-theme.ts
+var GREEN_STEP_SUBMIT = "\x1B[32m\u25C7\x1B[39m";
+var GREEN_CHECK = "\x1B[32m\u2713\x1B[39m";
+function restyleStepSubmitSymbols(text7) {
+  return text7.split(GREEN_STEP_SUBMIT).join(GREEN_CHECK);
+}
+var ROW_ESCAPES = /\u001B\[(\d*)([ABEF])/g;
+function rowDelta(text7) {
+  let delta = text7.split("\n").length - 1;
+  for (const match of text7.matchAll(ROW_ESCAPES)) {
+    const n = match[1] === "" ? 1 : Number(match[1]);
+    delta += match[2] === "A" || match[2] === "F" ? -n : n;
+  }
+  return delta;
+}
+var installed = false;
+var armed = false;
+var marker = null;
+var generation = 0;
+var rawStdoutWrite;
+function installPromptCheckmarks() {
+  if (installed || !process.stdout.isTTY || process.env.CI === "true") return () => {
+  };
+  installed = true;
+  const unpatchedOut = process.stdout.write;
+  const unpatchedErr = process.stderr.write;
+  const writeOut = unpatchedOut.bind(process.stdout);
+  const writeErr = unpatchedErr.bind(process.stderr);
+  rawStdoutWrite = writeOut;
+  process.stdout.write = ((chunk, encoding, callback) => {
+    if (typeof chunk !== "string") return writeOut(chunk, encoding, callback);
+    const idx = armed ? chunk.indexOf(GREEN_STEP_SUBMIT) : -1;
+    if (idx === -1) {
+      if (marker) marker.rowsAbove += rowDelta(chunk);
+      return writeOut(restyleStepSubmitSymbols(chunk), encoding, callback);
+    }
+    armed = false;
+    const rest = chunk.slice(idx + GREEN_STEP_SUBMIT.length);
+    marker = { rowsAbove: rowDelta(rest) };
+    return writeOut(
+      restyleStepSubmitSymbols(chunk.slice(0, idx)) + GREEN_STEP_SUBMIT + restyleStepSubmitSymbols(rest),
+      encoding,
+      callback
+    );
+  });
+  process.stderr.write = ((chunk, encoding, callback) => {
+    if (typeof chunk === "string" && marker) marker.rowsAbove += rowDelta(chunk);
+    return writeErr(chunk, encoding, callback);
+  });
+  return () => {
+    process.stdout.write = unpatchedOut;
+    process.stderr.write = unpatchedErr;
+    rawStdoutWrite = void 0;
+    installed = false;
+    armed = false;
+    marker = null;
+  };
+}
+function deferNextPromptCheck() {
+  if (!installed) return { confirm() {
+  }, skip() {
+  } };
+  generation += 1;
+  const token = generation;
+  armed = true;
+  marker = null;
+  return {
+    confirm() {
+      if (token !== generation) return;
+      armed = false;
+      const rows = marker?.rowsAbove;
+      marker = null;
+      if (rows === void 0 || rows <= 0 || rows >= (process.stdout.rows ?? 24)) return;
+      rawStdoutWrite?.(`\x1B[${rows}A\r${GREEN_CHECK}\x1B[${rows}B\r`);
+    },
+    skip() {
+      if (token !== generation) return;
+      armed = false;
+      marker = null;
+    }
+  };
+}
+
 // adapters/next/init/prompts/database.ts
 import { execFileSync as execFileSync4 } from "child_process";
 import * as p10 from "@clack/prompts";
@@ -22076,6 +22159,7 @@ async function promptPlugins(cwd, options = {}) {
       overwriteKeys.add(key);
     }
   };
+  const storageStep = deferNextPromptCheck();
   const storage = await p11.select({
     message: "Choose a file storage",
     options: [
@@ -22101,6 +22185,7 @@ async function promptPlugins(cwd, options = {}) {
   }
   if (storage === "r2") {
     mergeIntegrationConfig(await collectIntegrationConfig(cwd, ["r2"]));
+    storageStep.confirm();
   } else if (storage === "vercel-blob") {
     const existingToken = readEnvVar(cwd, "BLOB_READ_WRITE_TOKEN")?.trim();
     const flow = !existingToken && options.provisionVercelBlob ? await options.provisionVercelBlob() : void 0;
@@ -22112,6 +22197,8 @@ async function promptPlugins(cwd, options = {}) {
         vars: [{ key: "BLOB_READ_WRITE_TOKEN", value: flow.token }]
       });
       overwriteKeys.add("BLOB_READ_WRITE_TOKEN");
+      if (flow.usedTerminalFallback) storageStep.skip();
+      else storageStep.confirm();
     } else {
       if (existingToken) {
         p11.log.info("Using the existing Vercel Blob token from .env.local");
@@ -22119,7 +22206,11 @@ async function promptPlugins(cwd, options = {}) {
         p11.log.info("Falling back to a manual Vercel Blob token.");
       }
       mergeIntegrationConfig(await collectIntegrationConfig(cwd, ["vercel-blob"]));
+      if (flow) storageStep.skip();
+      else storageStep.confirm();
     }
+  } else {
+    storageStep.confirm();
   }
   const selectedPlugins = await p11.multiselect({
     message: "Select presets",
@@ -24468,7 +24559,7 @@ async function provisionBlobStoreInteractive(runner, cwd, options) {
     return { storeName: quiet.storeName, failure: "env-pull-empty" };
   }
   pullSpinner.clear();
-  return { token, storeName: quiet.storeName };
+  return { token, storeName: quiet.storeName, usedTerminalFallback: true };
 }
 async function provisionBlobStore(runner, cwd, options) {
   const provisionSpinner = spinner2();
@@ -24845,7 +24936,8 @@ async function runVercelBlobFlow(options) {
     return {
       ok: true,
       token: blob.token,
-      blobStoreName: blob.storeName
+      blobStoreName: blob.storeName,
+      usedTerminalFallback: blob.usedTerminalFallback
     };
   } catch (error) {
     p16.log.warn(
@@ -24881,7 +24973,9 @@ async function runVercelDeployFlow(options) {
     } else {
       envSpinner.clear();
     }
+    let printedWarnings = false;
     for (const key of sync.failed) {
+      printedWarnings = true;
       p16.log.warn(
         `Could not set ${pc6.cyan(key)} on Vercel \u2014 add it in the project's environment settings.`
       );
@@ -24891,6 +24985,7 @@ async function runVercelDeployFlow(options) {
     }
     const packageGuard = guardProjectForDeploy(options.cwd);
     for (const dep of packageGuard.localSpecDeps) {
+      printedWarnings = true;
       p16.log.warn(
         `Dependency ${pc6.cyan(dep)} uses a local spec that cannot install on Vercel \u2014 the remote build may fail.`
       );
@@ -24912,7 +25007,7 @@ async function runVercelDeployFlow(options) {
     const linkedName = readLinkedProjectName(options.cwd);
     const url = linkedName ? `https://${linkedName}.vercel.app` : deploy.url;
     deploySpinner.stop(url ? `Deployed ${pc6.cyan(url)}` : "Deployed to Vercel");
-    return { ok: true, url, syncedEnvKeys: sync.synced };
+    return { ok: true, url, syncedEnvKeys: sync.synced, cleanScreen: !printedWarnings };
   } catch (error) {
     p16.log.warn(`Vercel deploy failed: ${error instanceof Error ? error.message : String(error)}`);
     printManualDeployHint();
@@ -25387,6 +25482,7 @@ function removeExistingAdminPaths(cwd, namespaces) {
   return removed;
 }
 async function runInitCommand(name, options) {
+  installPromptCheckmarks();
   p17.box(
     `
 \u2584   \u2597 \u2597     \u2584\u2596\u2597     \u2597 
@@ -25613,6 +25709,7 @@ async function runInitCommand(name, options) {
     p17.log.info(`Using existing database URL from .env.local ${pc7.dim(`(${masked})`)}`);
     databaseUrl = existingDbUrl;
   } else {
+    const databaseStep = deferNextPromptCheck();
     const servicesResult = await promptServices({ allowVercel: options.vercel !== false });
     if (servicesResult.provider === "vercel-cli") {
       const flow = await runVercelNeonFlow({
@@ -25626,17 +25723,22 @@ async function runInitCommand(name, options) {
         databaseUrl = flow.databaseUrl;
         persistDatabaseUrl(cwd, databaseUrl);
         dismissVercelSignedInNote = flow.dismissSignedInNote;
+        if (flow.dismissSignedInNote) databaseStep.confirm();
+        else databaseStep.skip();
       } else if (flow.ok) {
+        databaseStep.skip();
         openBrowserVercelNeonResource(flow.dashboardUrl ?? flow.resourceUrl);
         databaseUrl = await promptConnectionString();
         persistDatabaseUrl(cwd, databaseUrl);
       } else {
+        databaseStep.skip();
         p17.log.info("Falling back to a manual database connection string.");
         openBrowserVercelNeon();
         databaseUrl = await promptConnectionString();
       }
     } else {
       databaseUrl = servicesResult.url;
+      databaseStep.confirm();
     }
   }
   const selectedPlugins = (() => {
@@ -26152,12 +26254,17 @@ Run manually: ${pc7.cyan(betterstartExecCommand(pm, "seed"))}`,
   if (options.vercel !== false && !options.skipDeploy) {
     const linkedVercelProject = Boolean(readLinkedProjectId(cwd));
     if (!options.yes) {
+      const deployStep = deferNextPromptCheck();
       const deployNow = await p17.confirm({
         message: "Deploy to Vercel now?",
         initialValue: linkedVercelProject
       });
       if (!p17.isCancel(deployNow) && deployNow) {
-        await runVercelDeployFlow({ cwd, projectName, env: process.env });
+        const deployFlow = await runVercelDeployFlow({ cwd, projectName, env: process.env });
+        if (deployFlow.ok && deployFlow.cleanScreen) deployStep.confirm();
+        else deployStep.skip();
+      } else {
+        deployStep.confirm();
       }
     } else if (linkedVercelProject && process.env.VERCEL_TOKEN) {
       const deployFlow = await runVercelDeployFlow({