betterstart-cli 0.0.32 → 0.0.34

package/dist/cli.js

@@ -19775,6 +19775,24 @@ function fitSpinnerMessage(message) {
   if (visible.length <= max) return message;
   return `${visible.slice(0, max - 1)}\u2026`;
 }
+var CLACK_LINE_ROWS = 2;
+var LOG_PREFIX_WIDTH = 3;
+function clackLogRows(message) {
+  const columns = process.stdout.columns ?? 80;
+  const width = stripVTControlCharacters(message).length + LOG_PREFIX_WIDTH;
+  return 1 + Math.max(1, Math.ceil(width / columns));
+}
+function eraseRows(rows) {
+  if (rows <= 0 || !process.stdout.isTTY || process.env.CI === "true") return;
+  process.stdout.write(`\x1B[${rows}A\x1B[${rows}M`);
+}
+function eraseClackLine(options = {}) {
+  if (!process.stdout.isTTY || process.env.CI === "true") return;
+  const below = (options.linesBelow ?? 0) * CLACK_LINE_ROWS;
+  const up = below + CLACK_LINE_ROWS;
+  const restore = below > 0 ? `\x1B[${below}B` : "";
+  process.stdout.write(`\x1B[${up}A\x1B[${CLACK_LINE_ROWS}M${restore}`);
+}
 function spinner2(options) {
   const inner = p5.spinner(options);
   const guided = options?.withGuide !== false;
@@ -21825,7 +21843,7 @@ async function promptServices(options) {
     options: [
       {
         value: "vercel",
-        label: "Vercel",
+        label: "Vercel (Neon)",
         hint: "Automatically provision a Neon Postgres database"
       },
       {
@@ -24235,35 +24253,41 @@ async function ensureVercelAuth(runner, cwd, options) {
   if (existing.authed) {
     if (options.quietIfAuthed) {
       checkSpinner.clear();
-    } else {
-      checkSpinner.stop(signedInMessage(existing.username));
+      return existing;
     }
-    return existing;
+    checkSpinner.stop(signedInMessage(existing.username));
+    return { ...existing, dismissNote: eraseClackLine };
   }
   if (env.VERCEL_TOKEN) {
     checkSpinner.stop("Could not verify VERCEL_TOKEN with Vercel");
     return { authed: false, reason: "login-failed" };
   }
   checkSpinner.clear();
-  p13.log.info(
-    `Sign in to Vercel to continue ${pc3.dim("(or press Ctrl-C to enter a connection string manually)")}`
-  );
+  const signInMessage = `Sign in to Vercel to continue ${pc3.dim("(or press Ctrl-C to enter a connection string manually)")}`;
+  const signInRows = clackLogRows(signInMessage);
+  p13.log.info(signInMessage);
+  let streamedRows = 0;
   const login = await runVercel(runner, ["login"], {
     cwd,
     mode: "stream",
-    streamLineFilter: showVercelLoginLine,
+    streamLineFilter: (line) => {
+      const show = showVercelLoginLine(line);
+      if (show) streamedRows += 1;
+      return show;
+    },
     timeoutMs: LOGIN_TIMEOUT_MS,
     env
   });
   if (!login.success) {
     return { authed: false, reason: login.timedOut ? "timeout" : "login-cancelled" };
   }
+  eraseRows(signInRows + streamedRows);
   const verifySpinner = spinner2();
   verifySpinner.start("Verifying Vercel sign-in");
   const after = await checkVercelAuth(runner, cwd, env);
   if (after.authed) {
     verifySpinner.stop(signedInMessage(after.username));
-    return after;
+    return { ...after, dismissNote: eraseClackLine };
   }
   verifySpinner.stop("Could not verify your Vercel sign-in");
   return { authed: false, reason: "login-failed" };
@@ -24710,7 +24734,7 @@ async function provisionNeonInteractive(runner, cwd, options) {
   if (!add.success) {
     return { failure: add.timedOut ? "timeout" : "provision-failed" };
   }
-  return {};
+  return { usedTerminalFallback: true };
 }
 async function provisionNeon(runner, cwd, options) {
   const provisionSpinner = spinner2();
@@ -24773,7 +24797,7 @@ async function runVercelNeonFlow(options) {
       p16.log.warn(authFailureMessage(auth.reason));
       return { ok: false };
     }
-    await ensureLinkedProject(runner, options.cwd, options.projectName, env);
+    const linkLinePrinted = await ensureLinkedProject(runner, options.cwd, options.projectName, env);
     const neon = await provisionNeonForMode(runner, options);
     if (neon.failure) {
       p16.log.warn(neonFailureMessage(neon.failure));
@@ -24781,11 +24805,13 @@ async function runVercelNeonFlow(options) {
       return { ok: false };
     }
     const databaseUrl = await pullNeonDatabaseUrl(runner, options.cwd, env);
+    const dismissSignedInNote = databaseUrl && auth.dismissNote && !neon.usedTerminalFallback ? () => auth.dismissNote?.({ linesBelow: linkLinePrinted ? 1 : 0 }) : void 0;
     return {
       ok: true,
       databaseUrl,
       dashboardUrl: neon.dashboardUrl,
-      resourceUrl: neon.resourceUrl
+      resourceUrl: neon.resourceUrl,
+      dismissSignedInNote
     };
   } catch (error) {
     p16.log.warn(
@@ -24899,13 +24925,14 @@ function printManualDeployHint() {
   p16.log.info(`You can deploy manually: ${pc6.cyan("vercel deploy --prod")}`);
 }
 async function ensureLinkedProject(runner, cwd, projectName, env) {
-  if (readLinkedProjectId(cwd)) return;
+  if (readLinkedProjectId(cwd)) return false;
   const projectSpinner = spinner2();
   projectSpinner.start(`Creating a Vercel project ${pc6.cyan(projectName)}`);
   const project2 = await createVercelProject(runner, cwd, projectName, env);
   projectSpinner.stop(
     project2.linked ? `Linked Vercel project ${pc6.cyan(project2.name)}` : `Using Vercel project ${pc6.cyan(project2.name)}`
   );
+  return true;
 }
 async function pullNeonDatabaseUrl(runner, cwd, env) {
   const neonSpinner = spinner2();
@@ -25541,6 +25568,7 @@ async function runInitCommand(name, options) {
     isFreshProject = true;
   }
   let databaseUrl;
+  let dismissVercelSignedInNote;
   const existingDbUrl = readExistingDbUrl(cwd);
   if (options.yes) {
     if (options.databaseUrl) {
@@ -25564,10 +25592,9 @@ async function runInitCommand(name, options) {
       if (flow.ok && flow.databaseUrl) {
         databaseUrl = flow.databaseUrl;
         persistDatabaseUrl(cwd, databaseUrl);
-        p17.log.success(`Saved DATABASE_URL to ${pc7.cyan(".env.local")}`);
       } else if (flow.ok) {
         p17.log.warn("Created a Neon database, but DATABASE_URL could not be retrieved from Vercel.");
-        const resourceUrl = flow.resourceUrl ?? flow.dashboardUrl;
+        const resourceUrl = flow.dashboardUrl ?? flow.resourceUrl;
         if (resourceUrl) {
           p17.log.info(
             `Open ${pc7.cyan(resourceUrl)} to copy DATABASE_URL, then rerun ${pc7.cyan("betterstart init --database-url <url> --yes")}.`
@@ -25598,12 +25625,11 @@ async function runInitCommand(name, options) {
       if (flow.ok && flow.databaseUrl) {
         databaseUrl = flow.databaseUrl;
         persistDatabaseUrl(cwd, databaseUrl);
-        p17.log.success(`Saved DATABASE_URL to ${pc7.cyan(".env.local")}`);
+        dismissVercelSignedInNote = flow.dismissSignedInNote;
       } else if (flow.ok) {
-        openBrowserVercelNeonResource(flow.resourceUrl ?? flow.dashboardUrl);
+        openBrowserVercelNeonResource(flow.dashboardUrl ?? flow.resourceUrl);
         databaseUrl = await promptConnectionString();
         persistDatabaseUrl(cwd, databaseUrl);
-        p17.log.success(`Saved DATABASE_URL to ${pc7.cyan(".env.local")}`);
       } else {
         p17.log.info("Falling back to a manual database connection string.");
         openBrowserVercelNeon();
@@ -25666,6 +25692,7 @@ async function runInitCommand(name, options) {
   } else if (options.yes) {
     pluginSelection = { plugins: [], integrations: [], storage: "local" };
   } else {
+    dismissVercelSignedInNote?.();
     const promptResult = await promptPlugins(cwd, {
       provisionVercelBlob: vercelBlobAllowed ? () => runVercelBlobFlow({ cwd, projectName, interactive: true, env: process.env }) : void 0
     });