@hawkeyexl/manni 2.7.1 → 2.8.1

package/README.md

@@ -98,7 +98,7 @@ actually reads rather than hand-written:
 ```yaml
 repos:
   - repo: https://github.com/hawkeyexl/manni
-    rev: v2.7.1
+    rev: v2.8.1
     hooks:
       - id: manni-meta
 ```

package/dist/{chunk-3WGFQKOP.js → chunk-FWB6LGBB.js}

@@ -71,7 +71,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-PRCLNOMG.js";
+} from "./chunk-RLHN765L.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -855,6 +855,10 @@ var TABLE_ROW = /^[ \t]*\|/;
 function isTableRow(line) {
   return TABLE_ROW.test(line);
 }
+var TABLE_RULE = /^(?=[^|]*\|)[ \t]*\|?(?:[ \t]*:?-+:?[ \t]*\|)*[ \t]*:?-+:?[ \t]*\|?[ \t]*$/;
+function isTableSeparator(line) {
+  return TABLE_RULE.test(line);
+}
 function isBoundLine(line, format) {
   if (ADORNMENT.test(line)) return true;
   switch (format) {
@@ -1697,36 +1701,61 @@ function claimEnd(page, entry, lines, misplaced) {
   }
   return { status: "changed" };
 }
-function rowsAt(line, lines, recorded) {
+function otherClaimSpans(lines, pageLines, pin, bodyLine) {
+  const width = pageLines.end - pageLines.start + 1;
+  const found = findWindows(lines.slice(bodyLine - 1), width, pin, void 0, {
+    around: toBodyLines(pageLines, bodyLine).start
+  });
+  return found.starts.map((start) => toFileLines({ start, end: start + width - 1 }, bodyLine)).filter((span) => span.start !== pageLines.start);
+}
+var NAMED_SPANS = 3;
+function spellElsewhere(spans) {
+  const first = spans[0];
+  const noun = spans.length === 1 && first !== void 0 && first.start === first.end ? "line" : "lines";
+  const named4 = spans.slice(0, NAMED_SPANS).map((span) => spellLines(span));
+  const rest = spans.length - named4.length;
+  if (rest > 0) return `${noun} ${named4.join(", ")} and ${String(rest)} more`;
+  const last = named4.pop() ?? "";
+  return named4.length === 0 ? `${noun} ${last}` : `${noun} ${named4.join(", ")} and ${last}`;
+}
+function rowsAt(line, lines, recorded, named4) {
   const width = recorded === void 0 ? 1 : Math.max(1, recorded.end - recorded.start + 1);
   const end = line + width - 1;
   if (end > lines.length) return "table-short";
   for (let n = line; n <= end; n++) {
     if (!isTableRow(lines[n - 1] ?? "")) return "table-short";
   }
-  return { lines: { start: line, end }, kind: "paragraph", text: lines.slice(line - 1, end) };
+  const text = lines.slice(line - 1, end);
+  if (!named4 && text.every((row) => isTableSeparator(row))) return "table-rule";
+  return { lines: { start: line, end }, kind: "paragraph", text };
 }
-function unitOrWhy(page, line, lines, recorded) {
+function unitOrWhy(page, line, lines, recorded, named4 = false) {
   if (line < page.bodyLine || line > lines.length) return "outside";
   const own = lines[line - 1] ?? "";
   if (own.trim() === "") return "blank";
+  const marker = isMarkerLine(own, page.format);
+  if (marker && !named4) return "marker";
   const block = fenceSpanAt(page.content, line, page.format);
   if (block !== void 0) {
     return { lines: block, kind: "block", text: lines.slice(block.start - 1, block.end) };
   }
   if (insideFence(page.content, page.bodyOffset, line, page.format)) return "fenced";
-  if (isTableRow(own)) return rowsAt(line, lines, recorded);
-  const paragraph = paragraphAfter(page.content, offsetOfLine(page.content, line));
+  if (isTableRow(own)) return rowsAt(line, lines, recorded, named4);
+  const paragraph = paragraphAfter(
+    page.content,
+    offsetOfLine(page.content, line),
+    marker ? void 0 : page.format
+  );
   if (paragraph === void 0 || paragraph.line !== line) return "not-a-paragraph";
   const span = { start: line, end: lineAt(page.content, paragraph.end) };
   return { lines: span, kind: "paragraph", text: lines.slice(span.start - 1, span.end) };
 }
-function unitAt(page, line, lines, recorded) {
-  const found = unitOrWhy(page, line, lines, recorded);
+function unitAt(page, line, lines, recorded, named4 = false) {
+  const found = unitOrWhy(page, line, lines, recorded, named4);
   return typeof found === "string" ? void 0 : found;
 }
-function noUnitAt(page, line, lines, recorded) {
-  const found = unitOrWhy(page, line, lines, recorded);
+function noUnitAt(page, line, lines, recorded, named4 = false) {
+  const found = unitOrWhy(page, line, lines, recorded, named4);
   return typeof found === "string" ? found : void 0;
 }
 function markerUnit(page, entry, lines) {
@@ -1870,6 +1899,19 @@ function sharesSentence(a, b) {
   const left = new Set(sentencesOf(a));
   return sentencesOf(b).some((sentence) => left.has(sentence));
 }
+function wordSet(text) {
+  return new Set(
+    text.toLowerCase().split(/\s+/).filter((word) => word !== "")
+  );
+}
+function wordShare(was, now) {
+  const left = wordSet(was);
+  if (left.size === 0) return 1;
+  const right = wordSet(now);
+  let held = 0;
+  for (const word of left) if (right.has(word)) held++;
+  return held / left.size;
+}
 function holdsWords(outer, inner) {
   if (inner === "") return true;
   if (outer === inner) return true;
@@ -3648,23 +3690,6 @@ function emptyClaimRefusal(lines, pageLines, at2) {
   const only = span[0] ?? "";
   return only.trim() === "" ? `${at2} is blank.` : `${at2} is a fence line, not claim text.`;
 }
-function otherClaimSpans(lines, pageLines, pin, bodyLine) {
-  const width = pageLines.end - pageLines.start + 1;
-  const found = findWindows(lines.slice(bodyLine - 1), width, pin, void 0, {
-    around: toBodyLines(pageLines, bodyLine).start
-  });
-  return found.starts.map((start) => toFileLines({ start, end: start + width - 1 }, bodyLine)).filter((span) => span.start !== pageLines.start);
-}
-var NAMED_SPANS = 3;
-function spellElsewhere(spans) {
-  const first = spans[0];
-  const noun = spans.length === 1 && first !== void 0 && first.start === first.end ? "line" : "lines";
-  const named4 = spans.slice(0, NAMED_SPANS).map((span) => spellLines(span));
-  const rest = spans.length - named4.length;
-  if (rest > 0) return `${noun} ${named4.join(", ")} and ${String(rest)} more`;
-  const last = named4.pop() ?? "";
-  return named4.length === 0 ? `${noun} ${last}` : `${noun} ${named4.join(", ")} and ${last}`;
-}
 async function runAdd(opts) {
   const cwd = resolve4(opts.cwd ?? process.cwd());
   const run3 = await resolveCiteRun({
@@ -4111,10 +4136,14 @@ function sayNoUnit(reason) {
       return "the line is blank";
     case "fenced":
       return "the line sits inside a fenced block";
+    case "marker":
+      return "that line now holds a cite marker, not claim text";
     case "not-a-paragraph":
       return "the line does not start a paragraph";
     case "table-short":
       return "the table no longer holds every row the claim covers";
+    case "table-rule":
+      return "that line is a table rule, not claim text";
   }
 }
 function settles(plan) {
@@ -4317,7 +4346,8 @@ function rewriteOf(plan) {
         fromPin: plan.pin,
         toPin: plan.would,
         at: plan.at,
-        commitSha: plan.commitSha
+        commitSha: plan.commitSha,
+        ...plan.wordShare === void 0 ? {} : { wordShare: plan.wordShare }
       };
     case "claim-shifted":
       return {
@@ -4383,12 +4413,17 @@ function rewriteOf(plan) {
     }
   }
 }
+var CLAIM_WORD_SHARE = 0.5;
 function replacementAt(claim, text, format) {
   const was = claim.baselineText;
   const commit = claim.commitSha;
   if (was === void 0 || commit === void 0) return void 0;
-  if (sharesSentence(claimWords(was, format), claimWords(text, format))) return void 0;
-  return commit;
+  const before = claimWords(was, format);
+  const now = claimWords(text, format);
+  if (!sharesSentence(before, now)) return { commit };
+  const share = wordShare(before, now);
+  if (share < CLAIM_WORD_SHARE) return { commit, share };
+  return void 0;
 }
 var QUOTE_CAP = 200;
 function quoted(text) {
@@ -4578,7 +4613,8 @@ async function runUpdate(opts) {
     if (claim !== null && claim.status === "changed" && entry !== void 0 && result.anchor !== "marker") {
       const held = claim.fileLines === void 0 ? void 0 : parseLines(claim.fileLines);
       const at2 = held?.start;
-      const unit = at2 === void 0 ? void 0 : unitAt(page, at2, lines, held);
+      const named4 = only !== void 0;
+      const unit = at2 === void 0 ? void 0 : unitAt(page, at2, lines, held, named4);
       const wantsBlock = entry.citation.quote === true;
       const pin = unit === void 0 ? void 0 : pinOfLines(lines, unit.lines);
       const wide = unit === void 0 ? void 0 : tooWide(unit.lines);
@@ -4588,7 +4624,7 @@ async function runUpdate(opts) {
           why: `Not re-pinned: the ${unit.kind} ${wide}.`
         });
       } else if (unit === void 0) {
-        const why = at2 === void 0 ? void 0 : noUnitAt(page, at2, lines, held);
+        const why = at2 === void 0 ? void 0 : noUnitAt(page, at2, lines, held, named4);
         if (why !== void 0) {
           declined.set(result.origin.index, {
             rule: "claim-changed",
@@ -4596,16 +4632,25 @@ async function runUpdate(opts) {
           });
         }
       } else if (pin !== void 0 && (!wantsBlock || unit.kind === "block")) {
+        const elsewhere = named4 ? [] : otherClaimSpans(lines, unit.lines, pin, page.bodyLine);
         const replaced = replacementAt(claim, unit.text, page.format);
         if (replaced !== void 0 && only === void 0) {
           out.push({
             kind: "claim-replaced",
             result,
             at: unit.lines.start,
-            commitSha: replaced,
+            commitSha: replaced.commit,
+            ...replaced.share === void 0 ? {} : { wordShare: replaced.share },
             pin: entry.citation.claim?.integrity ?? "",
             would: pin
           });
+        } else if (elsewhere.length > 0) {
+          const id = result.citation.id;
+          const anyway = id === void 0 ? "" : ` Re-run with --only ${id} to accept it anyway.`;
+          declined.set(result.origin.index, {
+            rule: "claim-changed",
+            why: `Not re-pinned: the text there also appears at ${spellElsewhere(elsewhere)}, so a pin cannot identify it.${anyway}`
+          });
         } else {
           const plan = { kind: "claim-accepted", result, unit, pin };
           if (replaced !== void 0) plan.replaced = true;
@@ -4732,7 +4777,8 @@ async function runUpdate(opts) {
                   kind: "claim-replaced",
                   result,
                   at: now.span.start,
-                  commitSha: replaced,
+                  commitSha: replaced.commit,
+                  ...replaced.share === void 0 ? {} : { wordShare: replaced.share },
                   pin: recorded,
                   would: now.pin
                 }
@@ -5260,7 +5306,12 @@ function movedSpan(rewrite) {
 }
 function refusalLine(rewrite) {
   const at2 = shortCommit(rewrite.commitSha ?? "");
-  return `claim at ${spellAtSpec(String(rewrite.at ?? 0))} skipped: that line now holds different text than the claim at ${at2}. Re-add it with cite add.`;
+  const where = `claim at ${spellAtSpec(String(rewrite.at ?? 0))} skipped:`;
+  if (rewrite.wordShare !== void 0) {
+    const share = Math.round(rewrite.wordShare * 100);
+    return `${where} that line now holds text sharing ${String(share)}% of the claim's words at ${at2}. Re-add it with cite add.`;
+  }
+  return `${where} that line now holds different text than the claim at ${at2}. Re-add it with cite add.`;
 }
 function rewriteLine(rewrite) {
   const word = rewrite.from.includes("-") ? "lines" : "line";
@@ -5922,4 +5973,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-3WGFQKOP.js.map
+//# sourceMappingURL=chunk-FWB6LGBB.js.map