ymmv-cli 0.2.0 → 0.4.0

package/README.md

@@ -25,6 +25,7 @@ First run includes a one-time GitHub sign-in (the device flow you know from `gh`
 - `ymmv <handle>` — view a profile, or diff it against yours when you're logged in
 - `ymmv set editor Neovim` — change one value
 - `ymmv set --extra "Keyboard=HHKB"` — add a free-form line of your own
+- `ymmv unset editor` — remove one value (`ymmv set editor -` works too); `ymmv unset --extra "Keyboard"` removes an extra
 - `ymmv delete` — remove your profile
 - `ymmv login` / `ymmv logout` — sign in / out
 

package/dist/cli.js

@@ -284,7 +284,7 @@ function parseProfile(raw) {
 
 // ../shared/dist/reserved.js
 var RESERVED_ROUTES = ["api", "login", "logout"];
-var CLI_VERBS = ["login", "logout", "set", "delete", "view", "help"];
+var CLI_VERBS = ["login", "logout", "set", "unset", "delete", "view", "help"];
 var RESERVED = [.../* @__PURE__ */ new Set([...RESERVED_ROUTES, ...CLI_VERBS])];
 var RESERVED_SET = new Set(RESERVED);
 var HANDLE_RE = /^[a-zA-Z0-9](?:-?[a-zA-Z0-9])*$/;
@@ -440,6 +440,136 @@ async function login(deps = {}) {
   );
 }
 
+// src/render.ts
+var ESC = String.fromCharCode(27);
+var CSI = `${ESC}[`;
+var CODES = {
+  amber: `${CSI}93m`,
+  // DESIGN: amber == ANSI bright-yellow
+  faint: `${CSI}90m`,
+  bold: `${CSI}1m`,
+  reset: `${CSI}0m`
+};
+var NO_CODES = { amber: "", faint: "", bold: "", reset: "" };
+function palette(color) {
+  return color ? CODES : NO_CODES;
+}
+var ESC_INTRODUCERS = `${String.fromCharCode(27)}${String.fromCharCode(155)}`;
+var BEL = String.fromCharCode(7);
+var ANSI_RE = new RegExp(
+  `[${ESC_INTRODUCERS}][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d/#&.:=?%@~_]*)*)?${BEL})|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))`,
+  "g"
+);
+var CTRL_RE = new RegExp(
+  `[${String.fromCharCode(0)}-${String.fromCharCode(31)}${String.fromCharCode(127)}-${String.fromCharCode(159)}]`,
+  "g"
+);
+var BIDI_RE = new RegExp(
+  `[${String.fromCharCode(8234)}-${String.fromCharCode(8238)}${String.fromCharCode(8294)}-${String.fromCharCode(8297)}${String.fromCharCode(8206)}${String.fromCharCode(8207)}]`,
+  "g"
+);
+function sanitizeValue(value) {
+  return value.replace(ANSI_RE, "").replace(CTRL_RE, "").replace(BIDI_RE, "");
+}
+function useColor(env, isTTY) {
+  if (env.NO_COLOR !== void 0) return false;
+  if (env.FORCE_COLOR !== void 0) return env.FORCE_COLOR !== "0";
+  return isTTY;
+}
+function orderedEntries(profile) {
+  const byKey = new Map(
+    (profile.entries ?? []).map((e) => [e.key, e.value])
+  );
+  return CURATED_KEYS.flatMap((key) => {
+    const value = byKey.get(key);
+    return value === void 0 ? [] : [{ label: KEY_LABELS[key], value: sanitizeValue(value) }];
+  });
+}
+function renderProfile(profile, opts) {
+  const c = palette(opts.color);
+  const rows = orderedEntries(profile);
+  const extras = (profile.extras ?? []).map((x) => ({
+    label: sanitizeValue(x.label),
+    value: sanitizeValue(x.value)
+  }));
+  const labelW = Math.max(
+    0,
+    ...rows.map((r) => r.label.length),
+    ...extras.map((x) => x.label.length)
+  );
+  const lines = ["", `  ${c.bold}${sanitizeValue(profile.handle)}${c.reset}`, ""];
+  for (const r of rows) {
+    lines.push(`  ${c.faint}${r.label.padEnd(labelW)}${c.reset}  ${r.value}`);
+  }
+  if (extras.length) {
+    lines.push("");
+    for (const x of extras) {
+      lines.push(`  ${c.faint}${x.label.padEnd(labelW)}${c.reset}  ${x.value}`);
+    }
+  }
+  lines.push("", `  ${c.faint}updated ${sanitizeValue(profile.updated_at)}${c.reset}`, "");
+  return lines.join("\n");
+}
+var MISSING = "\u2014";
+function extrasBlock(extras, theirsLabel, mineLabel, c) {
+  if (!extras.theirs.length && !extras.mine.length) return [];
+  const out = ["", `  ${c.faint}extras${c.reset}`];
+  const line = (who, label, value) => `  ${c.faint}${who}${c.reset}  ${sanitizeValue(label)} = ${sanitizeValue(value)}`;
+  for (const x of extras.theirs) out.push(line(theirsLabel, x.label, x.value));
+  for (const x of extras.mine) out.push(line(mineLabel, x.label, x.value));
+  return out;
+}
+function renderDiff(result, opts) {
+  const c = palette(opts.color);
+  const theirsLabel = sanitizeValue(opts.theirsLabel);
+  const mineLabel = sanitizeValue(opts.mineLabel);
+  const cells = result.rows.map((r) => ({
+    label: r.label,
+    theirs: r.theirs === null ? MISSING : sanitizeValue(r.theirs),
+    mine: r.mine === null ? MISSING : sanitizeValue(r.mine),
+    differ: r.status !== "same"
+  }));
+  const labelW = Math.max(3, ...cells.map((r) => r.label.length));
+  const theirsW = Math.max(theirsLabel.length, ...cells.map((r) => r.theirs.length));
+  const lines = [""];
+  lines.push(
+    `  ${c.faint}${"".padEnd(labelW)}  ${theirsLabel.padEnd(theirsW)}  ${mineLabel}${c.reset}`
+  );
+  for (const r of cells) {
+    if (!opts.color) {
+      const sym = r.differ ? "~" : "=";
+      lines.push(`${sym} ${r.label.padEnd(labelW)}  ${r.theirs.padEnd(theirsW)}  ${r.mine}`);
+    } else if (r.differ) {
+      lines.push(
+        `${c.amber}\u2022${c.reset} ${r.label.padEnd(labelW)}  ${c.amber}${r.theirs.padEnd(theirsW)}${c.reset}  ${c.amber}${r.mine}${c.reset}`
+      );
+    } else {
+      lines.push(
+        `  ${c.faint}${r.label.padEnd(labelW)}  ${r.theirs.padEnd(theirsW)}  ${r.mine}${c.reset}`
+      );
+    }
+  }
+  lines.push(...extrasBlock(result.extras, theirsLabel, mineLabel, c));
+  lines.push(
+    "",
+    `  ${c.faint}${result.differ} differ \xB7 ${result.shared} shared \u2014 your mileage may vary${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}
+`;
+}
+function notFound(handle) {
+  return `
+  no ymmv profile for "${sanitizeValue(handle)}" yet.
+  publish one at ymmv.fyi with: npx ymmv-cli
+`;
+}
+
 // src/api.ts
 async function rateLimitMessage(res) {
   const retry = res.headers.get("retry-after");
@@ -470,6 +600,11 @@ async function publishProfile(profile) {
     // a mutation must never follow a redirect into a false success
   });
   let cred = await ensureLogin();
+  if ((cred.handle ?? "").toLowerCase() !== profile.handle.toLowerCase()) {
+    throw new Error(
+      "the stored login changed while this command was running \u2014 re-run it under the current account."
+    );
+  }
   let res = await send(cred);
   if (res.status === 401 || res.status === 409) {
     if (res.status === 401) await deleteToken();
@@ -488,7 +623,8 @@ async function publishProfile(profile) {
     throw new Error(`publish failed: ${res.status} ${await res.text()}`);
   }
   const data = await res.json();
-  console.log(`Published ${data.handle} -> ${BASE}/${data.handle}`);
+  const shown = typeof data.handle === "string" ? sanitizeValue(data.handle) : profile.handle;
+  console.log(`Published ${shown} -> ${BASE}/${shown}`);
 }
 async function fetchProfileJson(handle) {
   const res = await fetch(`${BASE}/api/v1/u/${encodeURIComponent(handle)}`);
@@ -625,142 +761,34 @@ function applySet(existing, target) {
     if (i >= 0) entries[i] = next;
     else entries.push(next);
   } else {
-    const i = extras.findIndex((x) => x.label.toLowerCase() === target.label.toLowerCase());
+    const wanted = target.label.trim().toLowerCase();
+    const i = extras.findIndex((x) => x.label.trim().toLowerCase() === wanted);
     const next = { label: target.label, value: target.value };
     if (i >= 0) extras[i] = next;
     else extras.push(next);
   }
   return { entries, extras };
 }
-
-// src/render.ts
-var ESC = String.fromCharCode(27);
-var CSI = `${ESC}[`;
-var CODES = {
-  amber: `${CSI}93m`,
-  // DESIGN: amber == ANSI bright-yellow
-  faint: `${CSI}90m`,
-  bold: `${CSI}1m`,
-  reset: `${CSI}0m`
-};
-var NO_CODES = { amber: "", faint: "", bold: "", reset: "" };
-function palette(color) {
-  return color ? CODES : NO_CODES;
-}
-var ESC_INTRODUCERS = `${String.fromCharCode(27)}${String.fromCharCode(155)}`;
-var BEL = String.fromCharCode(7);
-var ANSI_RE = new RegExp(
-  `[${ESC_INTRODUCERS}][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d/#&.:=?%@~_]*)*)?${BEL})|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))`,
-  "g"
-);
-var CTRL_RE = new RegExp(
-  `[${String.fromCharCode(0)}-${String.fromCharCode(31)}${String.fromCharCode(127)}-${String.fromCharCode(159)}]`,
-  "g"
-);
-var BIDI_RE = new RegExp(
-  `[${String.fromCharCode(8234)}-${String.fromCharCode(8238)}${String.fromCharCode(8294)}-${String.fromCharCode(8297)}${String.fromCharCode(8206)}${String.fromCharCode(8207)}]`,
-  "g"
-);
-function sanitizeValue(value) {
-  return value.replace(ANSI_RE, "").replace(CTRL_RE, "").replace(BIDI_RE, "");
-}
-function useColor(env, isTTY) {
-  if (env.NO_COLOR !== void 0) return false;
-  if (env.FORCE_COLOR !== void 0) return env.FORCE_COLOR !== "0";
-  return isTTY;
-}
-function orderedEntries(profile) {
-  const byKey = new Map(
-    (profile.entries ?? []).map((e) => [e.key, e.value])
-  );
-  return CURATED_KEYS.flatMap((key) => {
-    const value = byKey.get(key);
-    return value === void 0 ? [] : [{ label: KEY_LABELS[key], value: sanitizeValue(value) }];
-  });
-}
-function renderProfile(profile, opts) {
-  const c = palette(opts.color);
-  const rows = orderedEntries(profile);
-  const extras = (profile.extras ?? []).map((x) => ({
-    label: sanitizeValue(x.label),
-    value: sanitizeValue(x.value)
-  }));
-  const labelW = Math.max(
-    0,
-    ...rows.map((r) => r.label.length),
-    ...extras.map((x) => x.label.length)
-  );
-  const lines = ["", `  ${c.bold}${sanitizeValue(profile.handle)}${c.reset}`, ""];
-  for (const r of rows) {
-    lines.push(`  ${c.faint}${r.label.padEnd(labelW)}${c.reset}  ${r.value}`);
-  }
-  if (extras.length) {
-    lines.push("");
-    for (const x of extras) {
-      lines.push(`  ${c.faint}${x.label.padEnd(labelW)}${c.reset}  ${x.value}`);
-    }
-  }
-  lines.push("", `  ${c.faint}updated ${sanitizeValue(profile.updated_at)}${c.reset}`, "");
-  return lines.join("\n");
-}
-var MISSING = "\u2014";
-function extrasBlock(extras, theirsLabel, mineLabel, c) {
-  if (!extras.theirs.length && !extras.mine.length) return [];
-  const out = ["", `  ${c.faint}extras${c.reset}`];
-  const line = (who, label, value) => `  ${c.faint}${who}${c.reset}  ${sanitizeValue(label)} = ${sanitizeValue(value)}`;
-  for (const x of extras.theirs) out.push(line(theirsLabel, x.label, x.value));
-  for (const x of extras.mine) out.push(line(mineLabel, x.label, x.value));
-  return out;
-}
-function renderDiff(result, opts) {
-  const c = palette(opts.color);
-  const theirsLabel = sanitizeValue(opts.theirsLabel);
-  const mineLabel = sanitizeValue(opts.mineLabel);
-  const cells = result.rows.map((r) => ({
-    label: r.label,
-    theirs: r.theirs === null ? MISSING : sanitizeValue(r.theirs),
-    mine: r.mine === null ? MISSING : sanitizeValue(r.mine),
-    differ: r.status !== "same"
-  }));
-  const labelW = Math.max(3, ...cells.map((r) => r.label.length));
-  const theirsW = Math.max(theirsLabel.length, ...cells.map((r) => r.theirs.length));
-  const lines = [""];
-  lines.push(
-    `  ${c.faint}${"".padEnd(labelW)}  ${theirsLabel.padEnd(theirsW)}  ${mineLabel}${c.reset}`
-  );
-  for (const r of cells) {
-    if (!opts.color) {
-      const sym = r.differ ? "~" : "=";
-      lines.push(`${sym} ${r.label.padEnd(labelW)}  ${r.theirs.padEnd(theirsW)}  ${r.mine}`);
-    } else if (r.differ) {
-      lines.push(
-        `${c.amber}\u2022${c.reset} ${r.label.padEnd(labelW)}  ${r.theirs.padEnd(theirsW)}  ${c.amber}${r.mine}${c.reset}`
-      );
-    } else {
-      lines.push(
-        `  ${c.faint}${r.label.padEnd(labelW)}  ${r.theirs.padEnd(theirsW)}  ${r.mine}${c.reset}`
-      );
-    }
+function applyUnset(existing, target) {
+  const entries = existing.entries.map((e) => ({ ...e }));
+  const extras = existing.extras.map((x) => ({ ...x }));
+  if (target.kind === "curated") {
+    const hit2 = entries.find((e) => e.key === target.key);
+    if (!hit2) return { entries, extras, removed: null };
+    return {
+      entries: entries.filter((e) => e.key !== target.key),
+      extras,
+      removed: { label: hit2.key, value: hit2.value }
+    };
   }
-  lines.push(...extrasBlock(result.extras, theirsLabel, mineLabel, c));
-  lines.push(
-    "",
-    `  ${c.faint}${result.differ} differ \xB7 ${result.shared} shared \u2014 your mileage may vary${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}
-`;
-}
-function notFound(handle) {
-  return `
-  no ymmv profile for "${sanitizeValue(handle)}" yet.
-  publish one at ymmv.fyi with: npx ymmv-cli
-`;
+  const wanted = target.label.trim().toLowerCase();
+  const hit = extras.find((x) => x.label.trim().toLowerCase() === wanted);
+  if (!hit) return { entries, extras, removed: null };
+  return {
+    entries,
+    extras: extras.filter((x) => x.label.trim().toLowerCase() !== wanted),
+    removed: { label: hit.label, value: hit.value }
+  };
 }
 
 // src/commands.ts
@@ -775,6 +803,13 @@ function requireHandle(cred) {
   process.exitCode = 1;
   return null;
 }
+function assertHandleUnchanged(existing, handle) {
+  if (existing && existing.handle.toLowerCase() !== handle.toLowerCase()) {
+    throw new Error(
+      `this login is bound to "${handle}" but your profile now lives at "${sanitizeValue(existing.handle)}" \u2014 run \`ymmv login\` to refresh, then retry.`
+    );
+  }
+}
 function newProfile(handle, entries, extras) {
   return {
     schema_version: SCHEMA_VERSION,
@@ -799,6 +834,7 @@ async function publish(io) {
   if (!handle) return;
   const detected = detectStack(process.env, process.platform);
   const existing = await fetchProfileJson(handle);
+  assertHandleUnchanged(existing, handle);
   const defaults = buildDefaults(existing, detected);
   let entries = entriesFromMap(defaults);
   const extras = existing?.extras ?? [];
@@ -845,6 +881,7 @@ async function runSet(target) {
   const handle = requireHandle(cred);
   if (!handle) return;
   const existing = await fetchProfileJson(handle);
+  assertHandleUnchanged(existing, handle);
   const { entries, extras } = applySet(existing, target);
   await publishProfile(newProfile(handle, entries, extras));
   if (target.kind === "curated") {
@@ -853,6 +890,32 @@ async function runSet(target) {
     console.log(`Set extra ${target.label} = ${target.value}.`);
   }
 }
+async function runUnset(target) {
+  const cred = await ensureLogin();
+  const handle = requireHandle(cred);
+  if (!handle) return;
+  const existing = await fetchProfileJson(handle);
+  assertHandleUnchanged(existing, handle);
+  if (!existing) {
+    console.log("No profile yet \u2014 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}".`
+    );
+    return;
+  }
+  await publishProfile(newProfile(handle, entries, extras));
+  if (target.kind === "curated") {
+    console.log(`Removed ${KEY_LABELS[target.key]} (was "${sanitizeValue(removed.value)}").`);
+  } else {
+    console.log(
+      `Removed extra "${sanitizeValue(removed.label)}" (was "${sanitizeValue(removed.value)}").`
+    );
+  }
+}
 async function runDelete(io) {
   const cred = await ensureLogin();
   const target = cred.handle ? `ymmv.fyi/${cred.handle}` : "your profile";
@@ -902,8 +965,18 @@ function makePrompter() {
 }
 
 // src/resolve.ts
-var SET_USAGE = 'usage: ymmv set <key> <value>  |  ymmv set --extra "Label=Value"';
-var EXTRA_USAGE = 'usage: ymmv set --extra "Label=Value"';
+var SET_EXTRA = 'ymmv set --extra "Label=Value"';
+var UNSET_EXTRA = 'ymmv unset --extra "Label"';
+var SET_USAGE = `usage: ymmv set <key> <value>  |  ${SET_EXTRA}`;
+var EXTRA_USAGE = `usage: ${SET_EXTRA}`;
+var UNSET_USAGE = `usage: ymmv unset <key>  |  ${UNSET_EXTRA}`;
+function invalidKeyError(head, hint) {
+  return {
+    kind: "error",
+    message: `"${head}" is not a curated key. Valid keys: ${CURATED_KEYS.join(", ")}.
+For anything else, use: ${hint}.`
+  };
+}
 function hasYes(args) {
   return args.includes("-y") || args.includes("--yes");
 }
@@ -916,20 +989,34 @@ function parseSet(rest) {
     const label = spec.slice(0, eq).trim();
     const value2 = spec.slice(eq + 1).trim();
     if (!label || !value2) return { kind: "error", message: EXTRA_USAGE };
+    if (value2 === "-") return { kind: "unset", target: { kind: "extra", label } };
     return { kind: "set", target: { kind: "extra", label, value: value2 } };
   }
   if (!head) return { kind: "error", message: SET_USAGE };
-  if (!isCuratedKey(head)) {
-    return {
-      kind: "error",
-      message: `"${head}" is not a curated key. Valid keys: ${CURATED_KEYS.join(", ")}.
-For anything else, use: ymmv set --extra "Label=Value".`
-    };
-  }
+  if (!isCuratedKey(head)) return invalidKeyError(head, SET_EXTRA);
   const value = rest.slice(1).join(" ").trim();
   if (!value) return { kind: "error", message: `usage: ymmv set ${head} <value>` };
+  if (value === "-") return { kind: "unset", target: { kind: "curated", key: head } };
   return { kind: "set", target: { kind: "curated", key: head, value } };
 }
+function parseUnset(rest) {
+  const head = rest[0];
+  if (head === "--extra" || head === "-e") {
+    const label = rest.slice(1).join(" ").trim();
+    if (!label) return { kind: "error", message: `usage: ${UNSET_EXTRA}` };
+    if (label.includes("=")) {
+      return {
+        kind: "error",
+        message: 'unset takes just the label: ymmv unset --extra "Keyboard"'
+      };
+    }
+    return { kind: "unset", target: { kind: "extra", label } };
+  }
+  if (!head) return { kind: "error", message: UNSET_USAGE };
+  if (!isCuratedKey(head)) return invalidKeyError(head, UNSET_EXTRA);
+  if (rest.length > 1) return { kind: "error", message: `usage: ymmv unset ${head}` };
+  return { kind: "unset", target: { kind: "curated", key: head } };
+}
 function resolveArg(argv) {
   const first = argv[0];
   if (first === "-h" || first === "--help" || first === "help") return { kind: "help" };
@@ -940,6 +1027,7 @@ function resolveArg(argv) {
   if (first === "logout") return { kind: "logout" };
   if (first === "delete") return { kind: "delete", yes: hasYes(argv.slice(1)) };
   if (first === "set") return parseSet(argv.slice(1));
+  if (first === "unset") return parseUnset(argv.slice(1));
   if (first === "view") {
     const handle = argv[1];
     if (!handle) return { kind: "error", message: "usage: ymmv view <handle>" };
@@ -969,6 +1057,8 @@ Usage:
   ymmv view <handle>        explicit view (when a handle collides with a verb)
   ymmv set <key> <value>    set one curated key
   ymmv set --extra "L=V"    set a free-form extra
+  ymmv unset <key>          remove one curated key (ymmv set <key> - works too)
+  ymmv unset --extra "L"    remove a free-form extra
   ymmv delete               delete your profile (permanent)
   ymmv login | logout       GitHub device-flow auth
   ymmv help | --version
@@ -1029,6 +1119,9 @@ async function main(argv) {
     case "set":
       await runSet(cmd.target);
       break;
+    case "unset":
+      await runUnset(cmd.target);
+      break;
     case "delete":
       await interactive(runDelete, cmd.yes);
       break;

package/package.json

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