ymmv-cli 0.11.2 → 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)

package/dist/cli.js

@@ -431,6 +431,9 @@ 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));
 }
@@ -482,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),
@@ -501,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) {
@@ -1554,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);
@@ -1760,7 +1783,7 @@ async function promptEntries(defaults, saved, prompter) {
       const answer = (await prompter.ask(KEY_LABELS[key], defaults.get(key))).trim();
       const value = answer === "-" ? "" : answer;
       const rawDefault = defaults.get(key) ?? "";
-      const isDefault = value === sanitizeValue(rawDefault).trim();
+      const isDefault = value === shownValue(rawDefault);
       const emptiedDefault = answer === "" && rawDefault !== "";
       const problem = emptiedDefault ? "invisible" : value === "" ? void 0 : valueProblem(value);
       if (problem !== void 0) {
@@ -1803,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) {
@@ -1829,14 +1859,29 @@ 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;
+    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 entries = assemble();
@@ -1846,7 +1891,7 @@ async function publish(io) {
       process.exitCode = 1;
       return;
     }
-    showCard(entries);
+    showCard(entries, /* @__PURE__ */ new Map());
     printPublished(
       await publishProfile(newProfile(handle, entries, extras), cred, { ifMatch }),
       color
@@ -1859,12 +1904,14 @@ async function publish(io) {
     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 {
@@ -1894,6 +1941,8 @@ 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;
@@ -1915,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) {

package/package.json

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