@niroai/niro 0.9.0 → 0.10.0

package/src/lib/spinner.js

@@ -22,6 +22,17 @@ const FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "
 const FRAME_MS = 120;
 const HEARTBEAT_MS = 30_000;
 const ERASE_LINE = "\r\x1b[2K";
+
+/**
+ * Current nesting depth as spaces.
+ *
+ * The spinner writes straight to the stream, so withIndent's console wrappers never see it.
+ * Left alone, the build status and its "Build completed" line print flush left in the middle
+ * of an indented step, which is where they were.
+ */
+function pad() {
+  return " ".repeat(require("./nestedOutput").currentIndent());
+}
 const ANSI_RE = /\x1b\[[0-9;]*m/g;
 
 /**
@@ -40,8 +51,18 @@ function fit(line, width) {
  * Labels can carry backend text (e.g. build log messages); an embedded
  * newline would defeat the single-line overwrite, so flatten whitespace.
  */
+/**
+ * Flatten a label to one line, but KEEP its leading indent.
+ *
+ * The old version trimmed both ends, which silently ate the indent callers use to place the
+ * label in the output tree: "        Waiting for build..." came out flush left, four columns
+ * off from every line around it. Interior whitespace still collapses, because a newline would
+ * defeat the single-line overwrite.
+ */
 function sanitize(label) {
-  return String(label).replace(/\s+/g, " ").trim();
+  const text = String(label);
+  const indent = /^[ \t]*/.exec(text)[0].replace(/\t/g, "  ");
+  return indent + text.replace(/\s+/g, " ").trim();
 }
 
 function start(label, opts = {}) {
@@ -58,9 +79,9 @@ function start(label, opts = {}) {
   let stopped = false;
 
   if (!isTty) {
-    stream.write(`${label}\n`);
+    stream.write(`${pad()}${label}\n`);
     const timer = setInterval(() => {
-      stream.write(`${label} ${color.dim(`(still waiting — ${elapsed()}s)`)}\n`);
+      stream.write(`${pad()}${label} ${color.dim(`(still waiting — ${elapsed()}s)`)}\n`);
     }, heartbeatMs);
     if (timer.unref) timer.unref();
     return {
@@ -68,13 +89,13 @@ function start(label, opts = {}) {
         newLabel = sanitize(newLabel);
         if (stopped || newLabel === label) return;
         label = newLabel;
-        stream.write(`${label}\n`);
+        stream.write(`${pad()}${label}\n`);
       },
       stop(finalLine) {
         clearInterval(timer);
         if (stopped) return;
         stopped = true;
-        if (finalLine) stream.write(finalLine + "\n");
+        if (finalLine) stream.write(pad() + finalLine + "\n");
       },
     };
   }
@@ -83,7 +104,7 @@ function start(label, opts = {}) {
   const render = () => {
     const frame = FRAMES[i = (i + 1) % FRAMES.length];
     const line = `${color.cyan(frame)} ${label} ${color.dim("(" + elapsed() + "s)")}`;
-    stream.write(ERASE_LINE + fit(line, (stream.columns || 80) - 1));
+    stream.write(ERASE_LINE + pad() + fit(line, (stream.columns || 80) - 1 - pad().length));
   };
 
   render();
@@ -101,7 +122,7 @@ function start(label, opts = {}) {
       if (stopped) return;
       stopped = true;
       stream.write(ERASE_LINE);
-      if (finalLine) stream.write(finalLine + "\n");
+      if (finalLine) stream.write(pad() + finalLine + "\n");
     },
   };
 }

package/src/lib/watchDaemon.js

@@ -33,7 +33,7 @@ const color = require("./color");
  */
 async function ensureWatchDaemon({ skipPrompts = false } = {}) {
   if (!service.pm2Available()) {
-    console.log(`\n  ${color.yellow("⚠")} PM2 is not installed. Niro uses PM2 to keep your synced folders`);
+    console.log(`\n    ${color.yellow("⚠")} PM2 is not installed. Niro uses PM2 to keep your synced folders`);
     console.log(`    up to date in the background, including after a reboot.`);
 
     if (skipPrompts || prompt.isNonInteractive()) {
@@ -49,29 +49,29 @@ async function ensureWatchDaemon({ skipPrompts = false } = {}) {
 
     console.log("");
     if (!service.installPm2()) {
-      console.log(`\n  ${color.yellow("⚠")} PM2 install failed (a permission error is the usual cause).`);
+      console.log(`\n    ${color.yellow("⚠")} PM2 install failed (a permission error is the usual cause).`);
       console.log(`    Try manually: ${color.cyan("sudo npm install -g pm2")} then ${color.cyan("niro service install")}`);
       return { ok: false, reason: "pm2_install_failed" };
     }
-    console.log(`  ${color.green("✓")} PM2 installed.`);
+    console.log(`    ${color.green("✓")} PM2 installed.`);
   }
 
-  console.log(`\n  ${color.cyan("●")}  Installing niro-watch daemon (keeps your synced folders up to date, auto-starts on login)...`);
+  console.log(`\n    ${color.cyan("●")}  Installing niro-watch daemon (keeps your synced folders up to date, auto-starts on login)...`);
   try {
     // install() returns false when pm2 turns out not to be runnable after
     // all — e.g. npm installed it into a global bin dir that isn't on PATH
     // (npm exits 0 for that). Treat it as the failure it is; the old code's
     // unchecked call here is how "✓ Done." lied to customers.
     if (!service.install()) {
-      console.log(`       ${color.yellow("⚠")} PM2 was installed but isn't runnable from this shell (its global bin`);
-      console.log(`       directory may not be on your PATH). Open a NEW terminal and run ${color.cyan("niro service install")}.`);
+      console.log(`        ${color.yellow("⚠")} PM2 was installed but isn't runnable from this shell (its global bin`);
+      console.log(`        directory may not be on your PATH). Open a NEW terminal and run ${color.cyan("niro service install")}.`);
       return { ok: false, reason: "daemon_install_failed" };
     }
-    console.log(`       ${color.green("✓")} niro-watch is running and will start automatically on login.`);
+    console.log(`        ${color.green("✓")} niro-watch is running and will start automatically on login.`);
     return { ok: true };
   } catch (err) {
-    console.log(`       ${color.yellow("⚠")} Could not install the watch daemon: ${err.message}`);
-    console.log(`       Run ${color.cyan("niro service install")} to try again, or ${color.cyan("niro watch")} to sync manually.`);
+    console.log(`        ${color.yellow("⚠")} Could not install the watch daemon: ${err.message}`);
+    console.log(`        Run ${color.cyan("niro service install")} to try again, or ${color.cyan("niro watch")} to sync manually.`);
     return { ok: false, reason: "daemon_install_failed" };
   }
 }