@hawkeyexl/manni 2.8.2 → 2.8.4

package/README.md

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

package/dist/{chunk-7UBCWTCO.js → chunk-3QRJR6LM.js}

@@ -61,7 +61,7 @@ import {
   supportedExtensions,
   terminalConfirm,
   toJsonText
-} from "./chunk-KEW557TN.js";
+} from "./chunk-XHH5OSQQ.js";
 
 // src/meta/cli.ts
 import { existsSync } from "node:fs";
@@ -1517,4 +1517,4 @@ export {
   reportConfig,
   buildProgram
 };
-//# sourceMappingURL=chunk-7UBCWTCO.js.map
+//# sourceMappingURL=chunk-3QRJR6LM.js.map

package/dist/{chunk-WCNU53MJ.js → chunk-HZ2KWOOO.js}

@@ -35,6 +35,7 @@ import {
   hasFrontmatterFence,
   hashLines,
   hashRange,
+  heldManifest,
   isEncryptedValue,
   isErrorSeverity,
   isIgnoredByGit,
@@ -56,11 +57,13 @@ import {
   readConfigFile,
   readFamilyConfigFile,
   readManifestValue,
+  rebaseable,
   removeManifestKey,
   resolveBaselineRequest,
   resolveEncryptionKey,
   resolveTargetSet,
   selectCollections,
+  settle,
   settleBaseline,
   sliceLines,
   spellLines,
@@ -72,7 +75,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-KEW557TN.js";
+} from "./chunk-XHH5OSQQ.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -1033,10 +1036,14 @@ function fenceSpanAt(text, line, format) {
   if (!block || block.line !== line) return void 0;
   return { start: line, end: lineAt(text, block.end) };
 }
-function insideFence(text, bodyOffset, line, format) {
-  return fencedBlocks(text, bodyOffset, format).some(
-    (block) => line > block.line && line <= lineAt(text, block.end)
+function fenceAround(text, bodyOffset, line, format) {
+  const block = fencedBlocks(text, bodyOffset, format).find(
+    (b) => line > b.line && line <= lineAt(text, b.end)
   );
+  return block === void 0 ? void 0 : { start: block.line, end: lineAt(text, block.end) };
+}
+function insideFence(text, bodyOffset, line, format) {
+  return fenceAround(text, bodyOffset, line, format) !== void 0;
 }
 function unitHolding(text, line, format, body) {
   const textOf = (n) => lineText(text, offsetOfLine(text, n), lineEnd(text, offsetOfLine(text, n)));
@@ -1719,9 +1726,12 @@ function spellElsewhere(spans) {
   const last = named4.pop() ?? "";
   return named4.length === 0 ? `${noun} ${last}` : `${noun} ${named4.join(", ")} and ${last}`;
 }
-function rowsAt(line, lines, recorded, named4) {
+function spanOf(line, recorded) {
   const width = recorded === void 0 ? 1 : Math.max(1, recorded.end - recorded.start + 1);
-  const end = line + width - 1;
+  return { start: line, end: line + width - 1 };
+}
+function rowsAt(line, lines, recorded, named4) {
+  const end = spanOf(line, recorded).end;
   if (end > lines.length) return "table-short";
   for (let n = line; n <= end; n++) {
     if (!isTableRow(lines[n - 1] ?? "")) return "table-short";
@@ -1740,7 +1750,11 @@ function unitOrWhy(page, line, lines, recorded, named4 = false) {
   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";
+  const around = fenceAround(page.content, page.bodyOffset, line, page.format);
+  if (around !== void 0) {
+    const span2 = spanOf(line, recorded);
+    return span2.end < around.end ? { lines: span2, kind: "fenced-lines", text: lines.slice(span2.start - 1, span2.end) } : "fence-crossed";
+  }
   if (isTableRow(own)) return rowsAt(line, lines, recorded, named4);
   const paragraph = paragraphAfter(
     page.content,
@@ -2663,13 +2677,7 @@ function unifiedDiff(label, before, after) {
 }
 
 // src/cite/core/manifest.ts
-var COMMIT_ATTEMPTS = 5;
-function conflictRefusal(file) {
-  return `${file} changed under the command while it was being written. Nothing was written to it. Re-run the command.`;
-}
-function encodeValue(value) {
-  return value === void 0 ? "absent" : JSON.stringify(value);
-}
+var codec = { apply, read: readManifestValue };
 var ManifestSet = class {
   held = /* @__PURE__ */ new Map();
   /** Read a manifest, or hand back the copy this run has already rewritten. */
@@ -2683,14 +2691,7 @@ var ManifestSet = class {
       const reason = error instanceof Error ? error.message : String(error);
       throw new CiteError(`Manifest ${manifest.file} could not be read: ${reason}`);
     }
-    const fresh = {
-      path: manifest.path,
-      file: manifest.file,
-      before,
-      text: before,
-      ops: [],
-      bases: /* @__PURE__ */ new Map()
-    };
+    const fresh = heldManifest(manifest.path, manifest.file, before);
     this.held.set(manifest.path, fresh);
     return fresh;
   }
@@ -2704,11 +2705,12 @@ var ManifestSet = class {
     const op = {
       kind: "splice",
       entry,
+      key: CITATIONS_KEY2,
       join: manifest.join,
       file: manifest.file,
       value: [...citations]
     };
-    rebaseable(held, op);
+    rebaseable(held, op, codec);
     const spliced = splice(held.text, {
       entry,
       key: CITATIONS_KEY2,
@@ -2738,8 +2740,14 @@ var ManifestSet = class {
    */
   async remove(manifest, entry) {
     const held = await this.hold(manifest);
-    const op = { kind: "remove", entry, join: manifest.join, file: manifest.file };
-    rebaseable(held, op);
+    const op = {
+      kind: "remove",
+      entry,
+      key: CITATIONS_KEY2,
+      join: manifest.join,
+      file: manifest.file
+    };
+    rebaseable(held, op, codec);
     held.text = apply(held.text, op);
     held.ops.push(op);
   }
@@ -2761,7 +2769,7 @@ var ManifestSet = class {
     for (const held of this.held.values()) {
       if (held.text === held.before) continue;
       try {
-        await settle(held, write, read);
+        await settle(held, { codec, write, read, toError: (message) => new CiteError(message) });
       } catch (error) {
         if (io.onError !== void 0) await io.onError(changeOf(held), error);
         throw error;
@@ -2782,70 +2790,16 @@ function changeOf(held) {
     diff: unifiedDiff(held.file, held.before, held.text)
   };
 }
-function rebaseable(held, op) {
-  const at2 = op.join === "path" ? posix.normalize(op.entry) : op.entry;
-  if (held.bases.has(at2)) return;
-  held.bases.set(at2, {
-    entry: op.entry,
-    join: op.join,
-    value: encodeValue(
-      readManifestValue(held.before, { entry: op.entry, key: CITATIONS_KEY2, join: op.join })
-    )
-  });
-}
 function apply(text, op) {
-  if (op.kind === "splice") {
-    return splice(text, {
-      entry: op.entry,
-      key: CITATIONS_KEY2,
-      value: op.value,
-      join: op.join,
-      file: op.file
-    }).text;
-  }
+  const where = { entry: op.entry, key: op.key, join: op.join, file: op.file };
+  if (op.kind === "splice") return splice(text, { ...where, value: op.value }).text;
   try {
-    return removeManifestKey(text, {
-      entry: op.entry,
-      key: CITATIONS_KEY2,
-      join: op.join,
-      file: op.file
-    }).text;
+    return removeManifestKey(text, where).text;
   } catch (error) {
     if (error instanceof DocmetaError) throw new CiteError(error.message);
     throw error;
   }
 }
-function rebase(held, current) {
-  for (const base of held.bases.values()) {
-    const now = encodeValue(
-      readManifestValue(current, { entry: base.entry, key: CITATIONS_KEY2, join: base.join })
-    );
-    if (now !== base.value) return void 0;
-  }
-  let text = current;
-  for (const op of held.ops) text = apply(text, op);
-  return text;
-}
-async function settle(held, write, read) {
-  for (let attempt = 1; attempt <= COMMIT_ATTEMPTS; attempt++) {
-    let current;
-    try {
-      current = await read(held.path);
-    } catch (error) {
-      const reason = error instanceof Error ? error.message : String(error);
-      throw new CiteError(`Manifest ${held.file} could not be read: ${reason}`);
-    }
-    if (current === held.before) {
-      await write(held.path, held.text);
-      return;
-    }
-    const replayed = rebase(held, current);
-    if (replayed === void 0) throw new CiteError(conflictRefusal(held.file));
-    held.before = current;
-    held.text = replayed;
-  }
-  throw new CiteError(conflictRefusal(held.file));
-}
 function splice(text, options) {
   try {
     return spliceManifestValue(text, options);
@@ -4270,8 +4224,8 @@ function sayNoUnit(reason) {
       return "the line is outside the page body";
     case "blank":
       return "the line is blank";
-    case "fenced":
-      return "the line sits inside a fenced block";
+    case "fence-crossed":
+      return "the claim's lines are not all inside one fenced block";
     case "marker":
       return "that line now holds a cite marker, not claim text";
     case "not-a-paragraph":
@@ -4282,6 +4236,9 @@ function sayNoUnit(reason) {
       return "that line is a table rule, not claim text";
   }
 }
+function unitNoun(kind) {
+  return kind === "fenced-lines" ? "fenced text" : kind;
+}
 function settles(plan) {
   switch (plan.kind) {
     case "claim-moved":
@@ -4757,7 +4714,7 @@ async function runUpdate(opts) {
       if (unit !== void 0 && wide !== void 0) {
         declined.set(result.origin.index, {
           rule: "claim-changed",
-          why: `Not re-pinned: the ${unit.kind} ${wide}.`
+          why: `Not re-pinned: the ${unitNoun(unit.kind)} ${wide}.`
         });
       } else if (unit === void 0) {
         const why = at2 === void 0 ? void 0 : noUnitAt(page, at2, lines, held, named4);
@@ -4767,7 +4724,12 @@ async function runUpdate(opts) {
             why: `Not re-pinned: ${sayNoUnit(why)}.`
           });
         }
-      } else if (pin !== void 0 && (!wantsBlock || unit.kind === "block")) {
+      } else if (wantsBlock && unit.kind !== "block") {
+        declined.set(result.origin.index, {
+          rule: "claim-changed",
+          why: "Not re-pinned: quote: true, and the line no longer opens a fenced block."
+        });
+      } else if (pin !== void 0) {
         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) {
@@ -5413,10 +5375,10 @@ function renderCheckPretty(run3, opts) {
   return lines.join("\n");
 }
 function spellAtSpec(spec) {
-  const span = spanOf(spec);
+  const span = spanOf2(spec);
   return span === void 0 ? `lines ${spec}` : spellAt(span);
 }
-function spanOf(spec) {
+function spanOf2(spec) {
   const [first, second] = spec.split("-");
   const start = Number(first);
   const end = second === void 0 ? start : Number(second);
@@ -5424,8 +5386,8 @@ function spanOf(spec) {
   return { start, end };
 }
 function widening(held, now) {
-  const was = spanOf(held);
-  const is = spanOf(now);
+  const was = spanOf2(held);
+  const is = spanOf2(now);
   if (was === void 0 || is === void 0) return "";
   const parts = [];
   if (is.start < was.start) {
@@ -6114,4 +6076,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-WCNU53MJ.js.map
+//# sourceMappingURL=chunk-HZ2KWOOO.js.map