ymmv-cli 0.6.0 → 0.6.1

package/dist/cli.js

@@ -270,8 +270,8 @@ var MAX_PARSE_EXTRAS = 256;
 var MAX_PARSE_VALUE = 4096;
 var MAX_PARSE_LABEL = 4096;
 var ProfileParseError = class extends Error {
-  constructor(message) {
-    super(message);
+  constructor(message2) {
+    super(message2);
     this.name = "ProfileParseError";
   }
 };
@@ -353,6 +353,10 @@ var NO_CODES = { amber: "", faint: "", bold: "", reset: "" };
 function palette(color) {
   return color ? CODES : NO_CODES;
 }
+function message(text) {
+  return `
+${text.split(/\r?\n/).map((l) => l ? `  ${l}` : l).join("\n")}`;
+}
 var ESC_INTRODUCERS = `${String.fromCharCode(27)}${String.fromCharCode(155)}`;
 var BEL = String.fromCharCode(7);
 var ANSI_RE = new RegExp(
@@ -449,7 +453,6 @@ function renderProfile(profile, opts) {
   if (!preview) {
     lines.push("", `  ${c.faint}updated ${relTime(profile.updated_at, opts.now)}${c.reset}`);
   }
-  lines.push("");
   return lines.join("\n");
 }
 var MISSING = "\u2014";
@@ -499,20 +502,18 @@ function renderDiff(result, opts) {
     }
   }
   lines.push(...extrasBlock(result.extras, theirsLabel, mineLabel, c));
-  lines.push("", `  ${c.faint}${result.differ} differ   ${result.shared} shared${c.reset}`, "");
+  lines.push("", `  ${c.faint}${result.differ} differ   ${result.shared} shared${c.reset}`);
   return lines.join("\n");
 }
 function nudge(color) {
   const c = palette(color);
   return `
-  ${c.amber}publish yours to diff \u2192${c.reset} run ${c.bold}ymmv${c.reset}
-`;
+  ${c.amber}publish yours to diff \u2192${c.reset} run ${c.bold}ymmv${c.reset}`;
 }
 function notFound(handle, color, base) {
   return `
   no ymmv profile for "${sanitizeValue(handle)}" yet.
-  publish one at ${link(base, color)} with: npx ymmv-cli
-`;
+  publish one at ${link(base, color)} with: npx ymmv-cli`;
 }
 
 // src/http.ts
@@ -574,7 +575,7 @@ async function mintYmmvToken(accessToken) {
     if (res.status === 429) {
       const retry = res.headers.get("retry-after");
       const msg = body.message ? wireText(body.message) : "Too many login attempts. Slow down and try again shortly";
-      throw new Error(retry ? `${msg} (retry in ${retry}s)` : msg);
+      throw new Error(retry && /^\d+$/.test(retry) ? `${msg} (retry in ${retry}s)` : msg);
     }
     throw new Error(`login failed: ${res.status} ${wireText(body.error ?? "")}`.trim());
   }
@@ -754,11 +755,11 @@ async function login(deps = {}) {
   const c = palette(color);
   const verifyUri = /^https:\/\/github\.com\//.test(dc.verification_uri) ? link(dc.verification_uri, color) : sanitizeValue(dc.verification_uri);
   console.log(
-    `
-  Open ${verifyUri} and enter code: ${c.bold}${sanitizeValue(dc.user_code)}${c.reset}`
+    message(
+      `Open ${verifyUri} and enter code: ${c.bold}${sanitizeValue(dc.user_code)}${c.reset}
+${c.faint}waiting for GitHub approval\u2026 (Ctrl+C to cancel)${c.reset}`
+    )
   );
-  console.log(`  ${c.faint}waiting for GitHub approval\u2026 (Ctrl+C to cancel)${c.reset}
-`);
   const accessToken = await pollForToken(dc, deps);
   const { token, handle } = await mintYmmvToken(accessToken);
   try {
@@ -769,8 +770,9 @@ async function login(deps = {}) {
     throw e;
   }
   console.log(
-    handle ? `  Logged in as ${handle}.
-` : "  Logged in. No handle bound (your GitHub username is a reserved word).\n"
+    message(
+      handle ? `Logged in as ${handle}.` : "Logged in. No handle bound (your GitHub username is a reserved word)."
+    )
   );
 }
 
@@ -783,7 +785,7 @@ async function rateLimitMessage(res) {
     if (typeof body?.message === "string" && body.message) msg = wireText(body.message);
   } catch {
   }
-  return retry ? `${msg} (retry in ${retry}s)` : msg;
+  return retry && /^\d+$/.test(retry) ? `${msg} (retry in ${retry}s)` : msg;
 }
 async function ensureLogin() {
   const existing = await loadToken();
@@ -1201,15 +1203,25 @@ function makePrompter() {
       const answer = (await question(promptLine(label, def, color))).trim();
       return answer === "" ? clean ?? "" : answer;
     },
+    // Prompts are output units (render.ts convention): confirm/choice open with the unit's one
+    // blank line here — never in the caller's question string. Field ask()s stay tight: the
+    // 13-key walk is a single unit opened by its hint line.
     async confirm(q, defYes) {
-      const answer = (await question(`  ${q} ${c.faint}[${defYes ? "Y/n" : "y/N"}]${c.reset} `)).trim().toLowerCase();
+      const answer = (await question(`
+  ${q} ${c.faint}[${defYes ? "Y/n" : "y/N"}]${c.reset} `)).trim().toLowerCase();
       if (answer === "") return defYes;
       return answer === "y" || answer === "yes";
     },
     async choice(q, keys, def, hint) {
+      let prefix = "\n";
       for (; ; ) {
-        const hit = matchChoice(await question(`  ${q} ${c.faint}[${hint}]${c.reset} `), keys, def);
+        const hit = matchChoice(
+          await question(`${prefix}  ${q} ${c.faint}[${hint}]${c.reset} `),
+          keys,
+          def
+        );
         if (hit !== null) return hit;
+        prefix = "";
       }
     },
     close() {
@@ -1223,7 +1235,9 @@ function makePrompter() {
 function requireHandle(cred) {
   if (cred.handle) return cred.handle;
   console.error(
-    "Your GitHub username is a reserved word, so no handle is bound. Rename on GitHub, then run `ymmv login` again."
+    message(
+      "Your GitHub username is a reserved word, so no handle is bound. Rename on GitHub, then run `ymmv login` again."
+    )
   );
   process.exitCode = 1;
   return null;
@@ -1245,7 +1259,7 @@ function newProfile(handle, entries, extras) {
   };
 }
 function printPublished(res, color) {
-  console.log(`Published ${res.handle} \u2192 ${link(res.url, color)}`);
+  console.log(message(`Published ${res.handle} \u2192 ${link(res.url, color)}`));
 }
 function pagePointer(handle) {
   const color = colorEnabled();
@@ -1254,8 +1268,7 @@ function pagePointer(handle) {
 }
 async function promptEntries(defaults, prompter) {
   const c = palette(colorEnabled());
-  console.log(`
-  ${c.faint}Enter to keep, "-" to clear${c.reset}`);
+  console.log(message(`${c.faint}Enter to keep, "-" to clear${c.reset}`));
   const chosen = /* @__PURE__ */ new Map();
   for (const key of CURATED_KEYS) {
     const answer = (await prompter.ask(KEY_LABELS[key], defaults.get(key))).trim();
@@ -1266,7 +1279,9 @@ async function promptEntries(defaults, prompter) {
 }
 async function publish(io) {
   if (!io.interactive && !io.yes) {
-    console.error("Non-interactive publish needs -y (nothing publishes unconfirmed): ymmv -y");
+    console.error(
+      message("Non-interactive publish needs -y (nothing publishes unconfirmed): ymmv -y")
+    );
     process.exitCode = 1;
     return;
   }
@@ -1291,11 +1306,12 @@ async function publish(io) {
     console.log(
       renderProfile(newProfile(handle, entries, extras), { color, site, mode: "preview" })
     );
+    const notes = [];
     if (carried.length > 0) {
       const s = carried.length === 1 ? "" : "s";
-      console.log(`(+${carried.length} newer field${s} kept as-is; upgrade ymmv-cli to edit them)`);
+      notes.push(`(+${carried.length} newer field${s} kept as-is; upgrade ymmv-cli to edit them)`);
       for (const e of carried) {
-        console.log(`    ${sanitizeValue(e.key)} = ${sanitizeValue(e.value)}`);
+        notes.push(`  ${sanitizeValue(e.key)} = ${sanitizeValue(e.value)}`);
       }
     }
     const publishedLabels = new Set(
@@ -1304,9 +1320,10 @@ async function publish(io) {
     for (const x of extras) {
       if (publishedLabels.has(x.label.trim().toLowerCase())) {
         const label = sanitizeValue(x.label.trim());
-        console.log(`(extra "${label}" duplicates a curated field; ymmv unset --extra "${label}")`);
+        notes.push(`(extra "${label}" duplicates a curated field; ymmv unset --extra "${label}")`);
       }
     }
+    if (notes.length > 0) console.log(message(notes.join("\n")));
   };
   let values = defaults;
   const assemble = () => [...entriesFromMap(values), ...carried];
@@ -1332,14 +1349,15 @@ async function publish(io) {
         return;
       }
       if (ans === "n") {
-        console.log("Aborted. Nothing published.");
+        console.log(message("Aborted. Nothing published."));
         return;
       }
       values = await promptEntries(values, io.prompter);
     }
   } catch (e) {
     if (e instanceof PromptAborted) {
-      console.log("\nAborted. Nothing published.");
+      console.log(`
+${message("Aborted. Nothing published.")}`);
       process.exitCode = 130;
       return;
     }
@@ -1379,7 +1397,7 @@ async function runSet(target) {
   const { entries, extras } = applySet(existing, target);
   const res = await publishProfile(newProfile(handle, entries, extras));
   const line = target.kind === "curated" ? `Set ${KEY_LABELS[target.key]} = ${target.value}.` : `Set extra ${target.label} = ${target.value}.`;
-  console.log(`${line}${pagePointer(res.handle)}`);
+  console.log(message(`${line}${pagePointer(res.handle)}`));
 }
 async function runUnset(target) {
   const cred = await ensureLogin();
@@ -1388,19 +1406,21 @@ async function runUnset(target) {
   const existing = await fetchProfileJson(handle);
   assertHandleUnchanged(existing, handle);
   if (!existing) {
-    console.log("No profile yet. Run `ymmv` to publish one.");
+    console.log(message("No profile yet. Run `ymmv` to publish one."));
     return;
   }
   const { entries, extras, removed } = applyUnset(existing, target);
   if (!removed) {
     console.log(
-      target.kind === "curated" ? `${KEY_LABELS[target.key]} is not set.` : `No extra "${target.label}".`
+      message(
+        target.kind === "curated" ? `${KEY_LABELS[target.key]} is not set.` : `No extra "${target.label}".`
+      )
     );
     return;
   }
   const res = await publishProfile(newProfile(handle, entries, extras));
   const line = target.kind === "curated" ? `Removed ${KEY_LABELS[target.key]} (was "${sanitizeValue(removed.value)}").` : `Removed extra "${sanitizeValue(removed.label)}" (was "${sanitizeValue(removed.value)}").`;
-  console.log(`${line}${pagePointer(res.handle)}`);
+  console.log(message(`${line}${pagePointer(res.handle)}`));
 }
 async function runDelete(io) {
   const cred = await ensureLogin();
@@ -1408,7 +1428,9 @@ async function runDelete(io) {
   if (!io.yes) {
     if (!io.interactive || !io.prompter) {
       console.error(
-        `Refusing to delete ${target} without confirmation. Re-run with -y to confirm: ymmv delete -y`
+        message(
+          `Refusing to delete ${target} without confirmation. Re-run with -y to confirm: ymmv delete -y`
+        )
       );
       process.exitCode = 1;
       return;
@@ -1418,20 +1440,21 @@ async function runDelete(io) {
       go = await io.prompter.confirm(`Delete ${target}? This is permanent`, false);
     } catch (e) {
       if (e instanceof PromptAborted) {
-        console.log("\nCancelled. Nothing deleted.");
+        console.log(`
+${message("Cancelled. Nothing deleted.")}`);
         process.exitCode = 130;
         return;
       }
       throw e;
     }
     if (!go) {
-      console.log("Cancelled. Nothing deleted.");
+      console.log(message("Cancelled. Nothing deleted."));
       return;
     }
   }
   await deleteProfile();
   await deleteToken();
-  console.log(`Deleted ${target}. Run \`ymmv\` to publish again.`);
+  console.log(message(`Deleted ${target}. Run \`ymmv\` to publish again.`));
 }
 
 // src/resolve.ts
@@ -1541,7 +1564,9 @@ async function logout() {
   if (!stored) {
     const otherBase = await peekBase();
     console.log(
-      otherBase && otherBase !== BASE ? `Not logged in to ${BASE} (a token for ${otherBase} exists; set YMMV_API to that to log out of it).` : "Not logged in."
+      message(
+        otherBase && otherBase !== BASE ? `Not logged in to ${BASE} (a token for ${otherBase} exists; set YMMV_API to that to log out of it).` : "Not logged in."
+      )
     );
     return;
   }
@@ -1550,13 +1575,15 @@ async function logout() {
     revoked = await revokeYmmvToken(stored.token);
   } catch {
     console.error(
-      "Couldn't reach the server to revoke. Your token is still active. Run `ymmv logout` again when connected."
+      message(
+        "Couldn't reach the server to revoke. Your token is still active. Run `ymmv logout` again when connected."
+      )
     );
     process.exitCode = 1;
     return;
   }
   await deleteToken();
-  console.log(revoked ? "Logged out." : "Logged out (no active session on this server).");
+  console.log(message(revoked ? "Logged out." : "Logged out (no active session on this server)."));
 }
 function printVersion() {
   try {
@@ -1596,7 +1623,7 @@ async function main(argv) {
     case "login": {
       await login();
       const c = palette(colorEnabled());
-      console.log(`  ${c.faint}next: run ymmv to publish your stack${c.reset}`);
+      console.log(message(`${c.faint}next: run ymmv to publish your stack${c.reset}`));
       break;
     }
     case "logout":
@@ -1609,7 +1636,7 @@ async function main(argv) {
       printVersion();
       break;
     case "error":
-      console.error(cmd.message);
+      console.error(message(cmd.message));
       process.exitCode = 1;
       break;
   }
@@ -1617,6 +1644,8 @@ async function main(argv) {
 
 // src/cli.ts
 main(process.argv.slice(2)).catch((err) => {
-  console.error(err instanceof Error ? err.message : String(err));
+  console.error(message(err instanceof Error ? err.message : String(err)));
   process.exitCode = 1;
+}).finally(() => {
+  (process.exitCode ? process.stderr : process.stdout).write("\n");
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ymmv-cli",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Publish and diff terminal-native developer tool-stack profiles at ymmv.fyi.",
   "type": "module",
   "bin": {