@hawkeyexl/manni 2.8.3 → 2.8.5

package/dist/{chunk-DGC4CCK3.js → chunk-GRPDC5BY.js}

@@ -75,7 +75,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-KGI7B6DD.js";
+} from "./chunk-4UI4MDAG.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -1036,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)));
@@ -1722,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";
@@ -1743,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,
@@ -4213,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":
@@ -4225,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":
@@ -4270,8 +4284,21 @@ function apply2(content, format, plan) {
     // The move is a page rewrite, applied to the whole page before any splice.
     case "marker-moved":
       return content;
-    case "source-moved":
-      return spliceEntryField(content, format, index, ["source", "lines"], plan.lines);
+    case "source-moved": {
+      let out = spliceEntryField(content, format, index, ["source", "lines"], plan.lines);
+      out = spliceEntryField(
+        out,
+        format,
+        index,
+        ["source", "integrity"],
+        plan.minted.source.integrity
+      );
+      const commit = plan.minted.source["commit-sha"];
+      if (commit !== void 0) {
+        out = spliceEntryField(out, format, index, ["source", "commit-sha"], commit);
+      }
+      return out;
+    }
     case "claim-accepted": {
       let out = spliceEntryField(content, format, index, ["claim", "integrity"], plan.pin);
       if (plan.lines !== void 0) {
@@ -4331,6 +4358,9 @@ function applyToEntry(entry, plan) {
       const source = end("source");
       if (source === void 0) return false;
       source.lines = plan.lines;
+      source.integrity = plan.minted.source.integrity;
+      const commit = plan.minted.source["commit-sha"];
+      if (commit !== void 0) source["commit-sha"] = commit;
       return true;
     }
     case "claim-accepted": {
@@ -4684,8 +4714,33 @@ async function runUpdate(opts) {
     }
     if (result.source.status === "moved" && result.source.newLines !== void 0) {
       const at2 = parseLines(result.source.newLines);
-      if (at2 !== void 0 && result.source.newSrc !== void 0) {
-        out.push({ kind: "source-moved", result, lines: lineSpec(at2), to: result.source.newSrc });
+      const to = result.source.newSrc;
+      const recorded = result.citation.source["commit-sha"];
+      if (at2 !== void 0 && to !== void 0) {
+        try {
+          const minted = await mintCitation({
+            root: run3.root,
+            src: to,
+            ...run3.key === void 0 ? {} : { key: run3.key },
+            ...recorded === void 0 ? { commitSha: false } : {},
+            gitClient: git,
+            ...pageOptions.sourceIndex === void 0 ? {} : { sourceIndex: pageOptions.sourceIndex }
+          });
+          if (recorded !== void 0 && minted.source["commit-sha"] === void 0) {
+            declined.set(result.origin.index, {
+              rule: "source-moved",
+              why: "Not rewritten: git is not available here, so the entry's commit-sha cannot advance with its lines."
+            });
+          } else {
+            out.push({ kind: "source-moved", result, lines: lineSpec(at2), to, minted });
+          }
+        } catch (error) {
+          if (!(error instanceof CiteError)) throw error;
+          declined.set(result.origin.index, {
+            rule: "source-moved",
+            why: `Not rewritten: ${error.message}`
+          });
+        }
       }
     }
     if (!accept) return out;
@@ -4700,7 +4755,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);
@@ -4710,7 +4765,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) {
@@ -5356,10 +5416,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);
@@ -5367,8 +5427,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) {
@@ -6057,4 +6117,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-DGC4CCK3.js.map
+//# sourceMappingURL=chunk-GRPDC5BY.js.map