ymmv-cli 0.11.1 → 0.11.3

package/README.md

@@ -46,7 +46,8 @@ via npm Trusted Publishing, with provenance.
 
 ## Commands
 
-- `ymmv` detects, confirms, and publishes (re-run any time to update; `ymmv publish` is the same command)
+- `ymmv` detects, confirms, and publishes (re-run any time to update: the preview marks values
+  your environment now detects differently and `d` takes them; `ymmv publish` is the same command)
 - `ymmv <handle>` views a profile, or diffs it against yours when you're logged in
 - `ymmv set editor Neovim` changes one value
 - `ymmv set --extra "Keyboard=HHKB"` adds a free-form line of your own (`-e` works too)
@@ -58,8 +59,8 @@ via npm Trusted Publishing, with provenance.
   the commands to run by hand)
 - `ymmv version` prints the CLI version (and notes a newer release when one is known)
 
-Values are capped at 256 characters and extra labels at 64; a profile holds up
-to 32 extras.
+Values are capped at 256 characters and extra labels at 64, and each needs at
+least one visible character; a profile holds up to 32 extras.
 
 Every profile is open JSON too: `GET https://ymmv.fyi/api/v1/u/<handle>`. Full contract
 (shape, statuses, caching, CORS):

package/dist/cli.js

@@ -393,6 +393,12 @@ function isValidHandle(handle) {
   return handle.length >= 1 && handle.length <= 39 && HANDLE_RE.test(handle);
 }
 
+// ../shared/dist/visible.js
+var VISIBLE_RE = /[^\s\p{Default_Ignorable_Code_Point}\p{Cc}]/u;
+function hasVisibleContent(s) {
+  return VISIBLE_RE.test(s);
+}
+
 // src/render.ts
 var ESC = String.fromCharCode(27);
 var CSI = `${ESC}[`;
@@ -425,6 +431,12 @@ var BIDI_RE = new RegExp("\\p{Bidi_Control}", "gu");
 function sanitizeValue(value) {
   return value.replace(ANSI_RE, "").replace(CTRL_RE, "").replace(BIDI_RE, "");
 }
+function shownValue(value) {
+  return sanitizeValue(value).trim();
+}
+function showsVisibleText(value) {
+  return hasVisibleContent(sanitizeValue(value));
+}
 function useColor(env, isTTY) {
   if (env.NO_COLOR !== void 0) return false;
   if (env.FORCE_COLOR !== void 0) {
@@ -473,7 +485,13 @@ function renderProfile(profile, opts) {
   const rows = CURATED_KEYS.flatMap((key) => {
     const value = byKey.get(key);
     if (value === void 0 && !preview) return [];
-    return [{ label: KEY_LABELS[key], value: value === void 0 ? null : sanitizeValue(value) }];
+    return [
+      {
+        label: KEY_LABELS[key],
+        value: value === void 0 ? null : sanitizeValue(value),
+        note: preview && value !== void 0 ? opts.disagreements?.get(key) : void 0
+      }
+    ];
   });
   const extras = (profile.extras ?? []).map((x) => ({
     label: sanitizeValue(x.label),
@@ -492,9 +510,12 @@ function renderProfile(profile, opts) {
   if (rows.length) {
     lines.push("");
     for (const r of rows) {
-      lines.push(
-        r.value === null ? `  ${c.faint}${r.label.padEnd(labelW)}  ${MISSING}${c.reset}` : `  ${c.faint}${r.label.padEnd(labelW)}${c.reset}  ${val(r.value)}`
-      );
+      if (r.value === null) {
+        lines.push(`  ${c.faint}${r.label.padEnd(labelW)}  ${MISSING}${c.reset}`);
+        continue;
+      }
+      const note = r.note ? `  ${c.faint}(detected: ${sanitizeValue(r.note)})${c.reset}` : "";
+      lines.push(`  ${c.faint}${r.label.padEnd(labelW)}${c.reset}  ${val(r.value)}${note}`);
     }
   }
   if (extras.length) {
@@ -597,10 +618,16 @@ function causeText(err) {
   return sanitizeValue(text);
 }
 function wireText(text) {
-  const clean = sanitizeValue(String(text));
-  return clean.length > 200 ? `${clean.slice(0, 200)}\u2026` : clean;
+  return capped(sanitizeValue(String(text)));
+}
+var WIRE_TEXT_CAP = 200;
+function head(clean) {
+  return [...clean.slice(0, WIRE_TEXT_CAP * 2)].slice(0, WIRE_TEXT_CAP).join("");
+}
+function capped(clean) {
+  const kept = head(clean);
+  return kept.length < clean.length ? `${kept}\u2026` : clean;
 }
-var INVISIBLE_RE = new RegExp("\\p{Default_Ignorable_Code_Point}", "gu");
 async function wireBody(res) {
   try {
     return await res.text();
@@ -615,8 +642,8 @@ function wireErrorBody(raw) {
     const out = {};
     if (typeof body?.error === "string") out.slug = body.error;
     if (typeof body?.message === "string") {
-      const clean = wireText(body.message).trim();
-      if (clean.replace(INVISIBLE_RE, "").trim()) out.message = clean;
+      const clean = sanitizeValue(body.message);
+      if (hasVisibleContent(head(clean))) out.message = capped(clean).trim();
     }
     return out;
   } catch {
@@ -1539,6 +1566,17 @@ function buildDefaults(existing, detected) {
   }
   return out;
 }
+function detectionDisagreements(values, detected, decided = /* @__PURE__ */ new Set()) {
+  const out = /* @__PURE__ */ new Map();
+  for (const key of CURATED_KEYS) {
+    const current = values.get(key);
+    const fresh = detected.get(key);
+    if (current === void 0 || fresh === void 0 || decided.has(key)) continue;
+    const take = shownValue(fresh);
+    if (take && canonical(key, shownValue(current)) !== canonical(key, take)) out.set(key, take);
+  }
+  return out;
+}
 function entriesFromMap(map) {
   return CURATED_KEYS.flatMap((key) => {
     const value = map.get(key);
@@ -1712,7 +1750,31 @@ function pagePointer(handle) {
   const c = palette(color);
   return ` ${c.faint}\u2192 ${color ? displayUrl(BASE) : BASE}/${handle}${c.reset}`;
 }
-async function promptEntries(defaults, prompter) {
+function writeRuleRefusal(entries, existing) {
+  const saved = savedKeys(existing);
+  for (const { key, value } of entries) {
+    if (!isCuratedKey(key)) continue;
+    const problem = valueProblem(value);
+    if (problem === void 0) continue;
+    const remedy = problem === "invisible" ? "Set one" : "Set a shorter one";
+    const source = saved.has(key) ? "saved" : "detected";
+    const remove = problem === "invisible" && source === "saved" ? `, or remove it: ymmv unset ${key}` : "";
+    return `The ${source} ${KEY_LABELS[key]} value ${ruleClause(problem, value)}. ${remedy}: ymmv set ${key} <value>${remove}.`;
+  }
+  return void 0;
+}
+function valueProblem(value) {
+  if (!showsVisibleText(value)) return "invisible";
+  if (value.length > MAX_VALUE) return "over-cap";
+  return void 0;
+}
+function ruleClause(problem, value) {
+  return problem === "invisible" ? "has no visible text" : `is ${value.length} characters; the cap is ${MAX_VALUE}`;
+}
+function savedKeys(existing) {
+  return new Set((existing?.entries ?? []).map((e) => e.key));
+}
+async function promptEntries(defaults, saved, prompter) {
   const c = palette(colorEnabled());
   console.log(message(`${c.faint}Enter to keep, "-" to clear${c.reset}`));
   const chosen = /* @__PURE__ */ new Map();
@@ -1720,13 +1782,15 @@ async function promptEntries(defaults, prompter) {
     for (; ; ) {
       const answer = (await prompter.ask(KEY_LABELS[key], defaults.get(key))).trim();
       const value = answer === "-" ? "" : answer;
-      if (value.length > MAX_VALUE) {
-        const isDefault = value === (defaults.get(key) ?? "").trim();
-        console.log(
-          message(
-            `${c.faint}${isDefault ? `the saved value is ${value.length} characters; the cap is ${MAX_VALUE}. Type a shorter value or - to clear` : `that value is ${value.length} characters; the cap is ${MAX_VALUE}`}${c.reset}`
-          )
-        );
+      const rawDefault = defaults.get(key) ?? "";
+      const isDefault = value === shownValue(rawDefault);
+      const emptiedDefault = answer === "" && rawDefault !== "";
+      const problem = emptiedDefault ? "invisible" : value === "" ? void 0 : valueProblem(value);
+      if (problem !== void 0) {
+        const which = `the ${saved.has(key) ? "saved" : "detected"} value`;
+        const clause = ruleClause(problem, value);
+        const note = isDefault ? `${which} ${clause}. Type a ${problem === "invisible" ? "value" : "shorter value"} or - to clear` : `that value ${clause}`;
+        console.log(message(`${c.faint}${note}${c.reset}`));
         continue;
       }
       if (value) chosen.set(key, value);
@@ -1762,9 +1826,16 @@ async function publish(io) {
   let ifMatch = own?.etag;
   const color = colorEnabled();
   const site = displayUrl(BASE);
-  const showCard = (entries) => {
+  let cardShown = false;
+  const showCard = (entries, disagreements) => {
+    cardShown = true;
     console.log(
-      renderProfile(newProfile(handle, entries, extras), { color, site, mode: "preview" })
+      renderProfile(newProfile(handle, entries, extras), {
+        color,
+        site,
+        mode: "preview",
+        disagreements
+      })
     );
     const notes = [];
     if (carried.length > 0) {
@@ -1788,27 +1859,39 @@ async function publish(io) {
   let values = defaults;
   const assemble = () => [...entriesFromMap(values), ...carried];
   const edits = /* @__PURE__ */ new Map();
+  const kept = /* @__PURE__ */ new Map();
+  let saved = savedKeys(existing);
+  const disagreeing = () => {
+    const out = detectionDisagreements(
+      values,
+      detected,
+      /* @__PURE__ */ new Set([...edits.keys(), ...kept.keys()])
+    );
+    for (const [key, value] of out) if (valueProblem(value) !== void 0) out.delete(key);
+    return out;
+  };
   const prompt = async (prompter) => {
     const before = values;
-    values = await promptEntries(values, prompter);
+    const marked = cardShown ? disagreeing() : /* @__PURE__ */ new Map();
+    values = await promptEntries(values, saved, prompter);
     for (const key of CURATED_KEYS) {
       const after = values.get(key);
       if (after !== before.get(key)) edits.set(key, after);
     }
+    for (const key of marked.keys()) {
+      const value = values.get(key);
+      if (!edits.has(key) && value !== void 0) kept.set(key, value);
+    }
   };
   if (!io.interactive || !io.prompter || io.yes) {
-    const over = [...values].find(([, v]) => v.length > MAX_VALUE);
-    if (over) {
-      console.error(
-        message(
-          `The detected ${KEY_LABELS[over[0]]} value is ${over[1].length} characters; the cap is ${MAX_VALUE}. Set a shorter one: ymmv set ${over[0]} <value>.`
-        )
-      );
+    const entries = assemble();
+    const refusal = writeRuleRefusal(entries, existing);
+    if (refusal !== void 0) {
+      console.error(message(refusal));
       process.exitCode = 1;
       return;
     }
-    const entries = assemble();
-    showCard(entries);
+    showCard(entries, /* @__PURE__ */ new Map());
     printPublished(
       await publishProfile(newProfile(handle, entries, extras), cred, { ifMatch }),
       color
@@ -1817,14 +1900,18 @@ async function publish(io) {
   }
   try {
     if (!existing) await prompt(io.prompter);
+    const failsRule = ([, v]) => valueProblem(v) !== void 0;
     for (; ; ) {
+      if ([...values].some(failsRule)) await prompt(io.prompter);
       const entries = assemble();
-      showCard(entries);
+      const disagreements = disagreeing();
+      showCard(entries, disagreements);
+      const offerD = disagreements.size > 0;
       const ans = await io.prompter.choice(
         `Publish to ${site}/${sanitizeValue(handle)}?`,
-        ["y", "n", "e"],
+        offerD ? ["y", "n", "e", "d"] : ["y", "n", "e"],
         "y",
-        "Y/n/e=edit"
+        offerD ? "Y/n/e=edit/d=detected" : "Y/n/e=edit"
       );
       if (ans === "y") {
         try {
@@ -1854,6 +1941,9 @@ async function publish(io) {
               else rebased.set(key, value);
             }
             values = rebased;
+            for (const [key, value] of kept) if (rebased.get(key) !== value) kept.delete(key);
+            cardShown = false;
+            saved = savedKeys(fresh.profile);
             carried = unknownEntries(fresh.profile);
             extras = fresh.profile.extras;
             ifMatch = fresh.etag;
@@ -1874,6 +1964,14 @@ ${ambiguous ? "The publish may not have completed. Your answers are kept." : "No
         console.log(message("Aborted. Nothing published."));
         return;
       }
+      if (ans === "d") {
+        values = new Map(values);
+        for (const [key, value] of disagreements) {
+          values.set(key, value);
+          edits.set(key, value);
+        }
+        continue;
+      }
       await prompt(io.prompter);
     }
   } catch (e) {
@@ -1954,18 +2052,24 @@ async function runSet(target) {
     process.exitCode = 1;
     return;
   }
+  const refusal = writeRuleRefusal(entries, existing);
+  if (refusal !== void 0) {
+    console.error(message(refusal));
+    process.exitCode = 1;
+    return;
+  }
   const res = await publishProfile(newProfile(handle, entries, extras), cred, {
     ifMatch: own?.etag
   });
-  const line = target.kind === "curated" ? `Set ${KEY_LABELS[target.key]} = ${target.value}.` : `Set extra ${target.label} = ${target.value}.`;
+  const line = target.kind === "curated" ? `Set ${KEY_LABELS[target.key]} = ${sanitizeValue(target.value)}.` : `Set extra ${sanitizeValue(target.label)} = ${sanitizeValue(target.value)}.`;
   console.log(message(`${line}${pagePointer(res.handle)}`));
 }
 var PASTE_SAFE_LABEL = /^[\p{L}\p{N} _.+/:-]+$/u;
 function extraHint(existing, label) {
   const eq = label.indexOf("=");
-  const head = eq > 0 ? label.slice(0, eq).trim() : "";
-  if (!head || !applyUnset(existing, { kind: "extra", label: head }).removed) return "";
-  const shown = PASTE_SAFE_LABEL.test(head) ? head : "Label";
+  const head2 = eq > 0 ? label.slice(0, eq).trim() : "";
+  if (!head2 || !applyUnset(existing, { kind: "extra", label: head2 }).removed) return "";
+  const shown = PASTE_SAFE_LABEL.test(head2) ? head2 : "Label";
   return `
 (unset takes just the label: ymmv unset --extra "${shown}")`;
 }
@@ -1986,6 +2090,12 @@ async function runUnset(target) {
     console.log(message(line2));
     return;
   }
+  const refusal = writeRuleRefusal(entries, existing);
+  if (refusal !== void 0) {
+    console.error(message(refusal));
+    process.exitCode = 1;
+    return;
+  }
   const res = await publishProfile(newProfile(handle, entries, extras), cred, {
     ifMatch: own?.etag
   });
@@ -2034,10 +2144,10 @@ 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}`;
 var VIEW_USAGE = "usage: ymmv view <handle>";
-function invalidKeyError(head, hint) {
+function invalidKeyError(head2, hint) {
   return {
     kind: "error",
-    message: `"${sanitizeValue(head)}" is not a curated key. Valid keys: ${CURATED_KEYS.join(", ")}.
+    message: `"${sanitizeValue(head2)}" is not a curated key. Valid keys: ${CURATED_KEYS.join(", ")}.
 For anything else, use: ${hint}.`
   };
 }
@@ -2061,9 +2171,15 @@ function valueCapError(value) {
     message: `That value is ${value.length} characters; the cap is ${MAX_VALUE}.`
   };
 }
+function labelInvisibleError() {
+  return { kind: "error", message: "That label has no visible text." };
+}
+function valueInvisibleError() {
+  return { kind: "error", message: "That value has no visible text." };
+}
 function parseSet(rest) {
-  const head = rest[0];
-  if (head === "--extra" || head === "-e") {
+  const head2 = rest[0];
+  if (head2 === "--extra" || head2 === "-e") {
     const spec = rest.slice(1).join(" ").trim();
     const eq = spec.indexOf("=");
     if (eq <= 0) return { kind: "error", message: EXTRA_USAGE };
@@ -2071,30 +2187,33 @@ function parseSet(rest) {
     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 } };
+    if (!showsVisibleText(label)) return labelInvisibleError();
+    if (!showsVisibleText(value2)) return valueInvisibleError();
     if (label.length > MAX_LABEL) return labelCapError(label);
     if (value2.length > MAX_VALUE) return valueCapError(value2);
     return { kind: "set", target: { kind: "extra", label, value: value2 } };
   }
-  if (!head) return { kind: "error", message: SET_USAGE };
-  if (!isCuratedKey(head)) return invalidKeyError(head, SET_EXTRA);
+  if (!head2) return { kind: "error", message: SET_USAGE };
+  if (!isCuratedKey(head2)) return invalidKeyError(head2, 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 } };
+  if (!value) return { kind: "error", message: `usage: ymmv set ${head2} <value>` };
+  if (value === "-") return { kind: "unset", target: { kind: "curated", key: head2 } };
+  if (!showsVisibleText(value)) return valueInvisibleError();
   if (value.length > MAX_VALUE) return valueCapError(value);
-  return { kind: "set", target: { kind: "curated", key: head, value } };
+  return { kind: "set", target: { kind: "curated", key: head2, value } };
 }
 function parseUnset(rest) {
-  const head = rest[0];
-  if (head === "--extra" || head === "-e") {
+  const head2 = rest[0];
+  if (head2 === "--extra" || head2 === "-e") {
     const label = rest.slice(1).join(" ").trim();
     if (!label) return { kind: "error", message: `usage: ${UNSET_EXTRA}` };
     if (label.length > MAX_LABEL) return labelCapError(label);
     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 } };
+  if (!head2) return { kind: "error", message: UNSET_USAGE };
+  if (!isCuratedKey(head2)) return invalidKeyError(head2, UNSET_EXTRA);
+  if (rest.length > 1) return { kind: "error", message: `usage: ymmv unset ${head2}` };
+  return { kind: "unset", target: { kind: "curated", key: head2 } };
 }
 function resolveArg(argv) {
   const first = argv[0];

package/package.json

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