@hawkeyexl/manni 2.2.0 → 2.3.1

package/README.md

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

package/dist/{chunk-6JWX6JM2.js → chunk-CD3LHG26.js}

@@ -69,7 +69,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-5O4FIGDJ.js";
+} from "./chunk-HUHERW7E.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -491,51 +491,12 @@ async function readSource(root, index, range, key) {
   }
 }
 
-// src/cite/core/statements.ts
-var HTML_COMMENT = { open: "<!--", close: "-->" };
-var JSX_COMMENT = { open: "{/*", close: "*/}" };
-var LINK_REFERENCE = { open: "[comment]: # (", close: ")" };
-var MARKDOWN_FORMS = [HTML_COMMENT, JSX_COMMENT, LINK_REFERENCE];
-var MDX_FORMS = [JSX_COMMENT, HTML_COMMENT, LINK_REFERENCE];
-var COMMENT_FORMS = [{ open: "<!--", close: "-->" }];
-var ASCIIDOC_FORMS = [{ open: "// (", close: ")" }];
-var RST_FORMS = [{ open: ".. (", close: ")" }];
-var ID = /^[a-z0-9][a-z0-9-]*$/;
-var ANY_FENCE = /^(?:[ \t]*(?:`{3,}|~{3,})|-{4,})/;
-var MARKDOWN_FENCE = /^(`{3,}|~{3,})/;
-var ASCIIDOC_FENCE = /^(-{4,})/;
+// src/shared/code-regions.ts
 var SKIP_MARKDOWN_FENCE = /^[ \t]*(`{3,}|~{3,})/;
-var SKIP_ASCIIDOC_FENCE = ASCIIDOC_FENCE;
+var SKIP_ASCIIDOC_FENCE = /^(-{4,})/;
 var SPAN_FORMATS = /* @__PURE__ */ new Set(["markdown", "mdx", "asciidoc", "rst"]);
-function statementForms(format) {
-  switch (format) {
-    case "markdown":
-      return MARKDOWN_FORMS;
-    case "mdx":
-      return MDX_FORMS;
-    case "html":
-    case "xml":
-      return COMMENT_FORMS;
-    case "asciidoc":
-      return ASCIIDOC_FORMS;
-    case "rst":
-      return RST_FORMS;
-    default:
-      return [];
-  }
-}
+var BACKTICK = 96;
 function fenceFor(format) {
-  switch (format) {
-    case "markdown":
-    case "mdx":
-      return MARKDOWN_FENCE;
-    case "asciidoc":
-      return ASCIIDOC_FENCE;
-    default:
-      return void 0;
-  }
-}
-function skipFenceFor(format) {
   switch (format) {
     case "markdown":
     case "mdx":
@@ -546,24 +507,23 @@ function skipFenceFor(format) {
       return void 0;
   }
 }
-var BACKTICK = 96;
 function backtickRun(text, i) {
   let n = 0;
   while (text.charCodeAt(i + n) === BACKTICK) n++;
   return n;
 }
-function spanRegions(text, lineStart, out) {
+function spanRegions(line, lineStart, out) {
   let i = 0;
-  while (i < text.length) {
-    const n = backtickRun(text, i);
+  while (i < line.length) {
+    const n = backtickRun(line, i);
     if (n === 0) {
       i++;
       continue;
     }
     let j = i + n;
     let closer = -1;
-    while (j < text.length) {
-      const m = backtickRun(text, j);
+    while (j < line.length) {
+      const m = backtickRun(line, j);
       if (m === 0) {
         j++;
         continue;
@@ -582,40 +542,87 @@ function spanRegions(text, lineStart, out) {
     i = closer + n;
   }
 }
-function closesFence(text, open) {
-  const trimmed = text.trim();
+function closesFence(line, open) {
+  const trimmed = line.trim();
   let n = 0;
   while (trimmed.charAt(n) === open.char) n++;
   return n >= open.length && n === trimmed.length;
 }
-function codeRegions(body, format) {
-  const fence = skipFenceFor(format);
-  const spans = SPAN_FORMATS.has(format);
+function codeRegions(text, format, options = {}) {
+  const fence = fenceFor(format);
+  const spans = options.spans !== false && SPAN_FORMATS.has(format);
   const out = [];
   if (fence === void 0 && !spans) return out;
   let open;
   let pos = 0;
-  while (pos < body.length) {
-    const end = lineEnd(body, pos);
-    const text = lineText(body, pos, end);
+  while (pos < text.length) {
+    const nl = text.indexOf("\n", pos);
+    const end = nl === -1 ? text.length : nl;
+    const raw = text.slice(pos, end);
+    const line = raw.endsWith("\r") ? raw.slice(0, -1) : raw;
     if (open !== void 0) {
-      if (closesFence(text, open)) {
+      if (closesFence(line, open)) {
         out.push({ start: open.start, end });
         open = void 0;
       }
     } else {
-      const opener = fence?.exec(text)?.[1];
+      const opener = fence?.exec(line)?.[1];
       if (opener !== void 0) {
         open = { char: opener.charAt(0), length: opener.length, start: pos };
       } else if (spans) {
-        spanRegions(text, pos, out);
+        spanRegions(line, pos, out);
       }
     }
     pos = end + 1;
   }
-  if (open !== void 0) out.push({ start: open.start, end: body.length });
+  if (open !== void 0) out.push({ start: open.start, end: text.length });
   return out;
 }
+function codeEndAt(regions, offset) {
+  return regions.find((r) => offset >= r.start && offset < r.end)?.end;
+}
+
+// src/cite/core/statements.ts
+var HTML_COMMENT = { open: "<!--", close: "-->" };
+var JSX_COMMENT = { open: "{/*", close: "*/}" };
+var LINK_REFERENCE = { open: "[comment]: # (", close: ")" };
+var MARKDOWN_FORMS = [HTML_COMMENT, JSX_COMMENT, LINK_REFERENCE];
+var MDX_FORMS = [JSX_COMMENT, HTML_COMMENT, LINK_REFERENCE];
+var COMMENT_FORMS = [{ open: "<!--", close: "-->" }];
+var ASCIIDOC_FORMS = [{ open: "// (", close: ")" }];
+var RST_FORMS = [{ open: ".. (", close: ")" }];
+var ID = /^[a-z0-9][a-z0-9-]*$/;
+var ANY_FENCE = /^(?:[ \t]*(?:`{3,}|~{3,})|-{4,})/;
+var MARKDOWN_FENCE = /^(`{3,}|~{3,})/;
+var ASCIIDOC_FENCE = /^(-{4,})/;
+function statementForms(format) {
+  switch (format) {
+    case "markdown":
+      return MARKDOWN_FORMS;
+    case "mdx":
+      return MDX_FORMS;
+    case "html":
+    case "xml":
+      return COMMENT_FORMS;
+    case "asciidoc":
+      return ASCIIDOC_FORMS;
+    case "rst":
+      return RST_FORMS;
+    default:
+      return [];
+  }
+}
+function fenceFor2(format) {
+  switch (format) {
+    case "markdown":
+    case "mdx":
+      return MARKDOWN_FENCE;
+    case "asciidoc":
+      return ASCIIDOC_FENCE;
+    default:
+      return void 0;
+  }
+}
 function lineEnd(content, pos) {
   const nl = content.indexOf("\n", pos);
   return nl === -1 ? content.length : nl;
@@ -637,17 +644,29 @@ function payloadOf(payload) {
   if (ID.test(payload)) return { kind: "ref", id: payload };
   return { kind: "bad", reason: "payload is not an id" };
 }
+function isCite(inner) {
+  return inner === "cite" || inner.startsWith("cite") && /\s/.test(inner.charAt(4));
+}
+function isMarkerLine(line, format) {
+  const text = line.trim();
+  return statementForms(format).some((form) => {
+    if (text.length < form.open.length + form.close.length) return false;
+    if (!text.startsWith(form.open)) return false;
+    const closeAt = text.indexOf(form.close, form.open.length);
+    if (closeAt !== text.length - form.close.length) return false;
+    return isCite(text.slice(form.open.length, closeAt).trim());
+  });
+}
 function parseStatements(body, format, from = { offset: 0, line: 1 }) {
   const out = [];
   const fileLine = (bodyOffset) => from.line + lineAt(body, bodyOffset) - 1;
   const code = codeRegions(body, format);
-  const codeEndAt = (at2) => code.find((r) => at2 >= r.start && at2 < r.end)?.end;
   for (const form of statementForms(format)) {
     let cursor = 0;
     for (; ; ) {
       const at2 = body.indexOf(form.open, cursor);
       if (at2 === -1) break;
-      const codeEnd = codeEndAt(at2);
+      const codeEnd = codeEndAt(code, at2);
       if (codeEnd !== void 0) {
         cursor = codeEnd;
         continue;
@@ -657,9 +676,7 @@ function parseStatements(body, format, from = { offset: 0, line: 1 }) {
       const end = closeAt + form.close.length;
       cursor = end;
       const inner = body.slice(at2 + form.open.length, closeAt).trim();
-      if (!(inner === "cite" || inner.startsWith("cite") && /\s/.test(inner.charAt(4)))) {
-        continue;
-      }
+      if (!isCite(inner)) continue;
       const payload = inner.slice(4).trim();
       const unit = anchoredLines(body, end, format);
       const anchorLine = unit === void 0 ? void 0 : from.line + unit.start - 1;
@@ -680,14 +697,15 @@ function detectEol(text) {
   const nl = text.indexOf("\n");
   return nl > 0 && text.charCodeAt(nl - 1) === 13 ? "\r\n" : "\n";
 }
-function paragraphAfter(content, offset) {
+function paragraphAfter(content, offset, format) {
+  const marker = (text) => format !== void 0 && isMarkerLine(text, format);
   let pos = offset;
   const firstEnd = lineEnd(content, pos);
   if (lineText(content, pos, firstEnd).trim() === "") pos = firstEnd + 1;
   while (pos < content.length) {
     const end = lineEnd(content, pos);
     const text = lineText(content, pos, end);
-    if (text.trim() === "") {
+    if (text.trim() === "" || marker(text)) {
       pos = end + 1;
       continue;
     }
@@ -698,7 +716,7 @@ function paragraphAfter(content, offset) {
     while (cursor < content.length) {
       const e = lineEnd(content, cursor);
       const t = lineText(content, cursor, e);
-      if (t.trim() === "" || ANY_FENCE.test(t)) break;
+      if (t.trim() === "" || ANY_FENCE.test(t) || marker(t)) break;
       last = e;
       cursor = e + 1;
     }
@@ -737,7 +755,7 @@ function scanFence(content, offset, fence) {
   return void 0;
 }
 function fencedBlockAfter(content, offset, format) {
-  const fence = fenceFor(format);
+  const fence = fenceFor2(format);
   if (!fence) return void 0;
   const block = scanFence(content, offset, fence);
   if (!block) return void 0;
@@ -755,7 +773,7 @@ function fencedBlockAt(content, offset) {
   return { start, end, line, text };
 }
 function fencedBlocks(content, bodyOffset, format) {
-  const fence = fenceFor(format);
+  const fence = fenceFor2(format);
   if (!fence) return [];
   const out = [];
   let pos = bodyOffset;
@@ -779,17 +797,18 @@ function formatStatement(format, payload) {
   const pad = form.open.endsWith("(") ? "" : " ";
   return `${form.open}${pad}cite ${payload.id}${pad}${form.close}`;
 }
-function nextNonBlankLine(text, offset) {
+function nextTextLine(text, offset, format) {
   let pos = nextLineStart(text, offset);
   while (pos < text.length) {
     const end = lineEnd(text, pos);
-    if (lineText(text, pos, end).trim() !== "") return lineAt(text, pos);
+    const line = lineText(text, pos, end);
+    if (line.trim() !== "" && !isMarkerLine(line, format)) return lineAt(text, pos);
     pos = end + 1;
   }
   return void 0;
 }
 function fenceSpanAt(text, line, format) {
-  const fence = fenceFor(format);
+  const fence = fenceFor2(format);
   if (!fence) return void 0;
   const block = scanFence(text, offsetOfLine(text, line), fence);
   if (!block || block.line !== line) return void 0;
@@ -800,6 +819,27 @@ function insideFence(text, bodyOffset, line, format) {
     (block) => line > block.line && line <= lineAt(text, block.end)
   );
 }
+function unitHolding(text, line, format, body) {
+  const textOf = (n) => lineText(text, offsetOfLine(text, n), lineEnd(text, offsetOfLine(text, n)));
+  const own = textOf(line);
+  if (own.trim() === "" || isMarkerLine(own, format)) return void 0;
+  const block = fencedBlocks(text, body.offset, format).find(
+    (b) => line >= b.line && line <= lineAt(text, b.end)
+  );
+  if (block !== void 0) {
+    return { start: block.line, end: lineAt(text, block.end), kind: "block" };
+  }
+  if (ANY_FENCE.test(own)) return void 0;
+  let start = line;
+  while (start - 1 >= body.line) {
+    const above = textOf(start - 1);
+    if (above.trim() === "" || ANY_FENCE.test(above) || isMarkerLine(above, format)) break;
+    start--;
+  }
+  const paragraph = paragraphAfter(text, offsetOfLine(text, start), format);
+  if (paragraph?.line !== start) return void 0;
+  return { start, end: lineAt(text, paragraph.end), kind: "paragraph" };
+}
 function anchoredLines(text, after, format, quote = false) {
   if (quote) {
     const block = fencedBlockAfter(text, after, format);
@@ -810,11 +850,11 @@ function anchoredLines(text, after, format, quote = false) {
     const line2 = lineAt(text, after);
     return { start: line2, end: line2 };
   }
-  const paragraph = paragraphAfter(text, after);
+  const paragraph = paragraphAfter(text, after, format);
   if (paragraph !== void 0) {
     return { start: paragraph.line, end: lineAt(text, paragraph.end) };
   }
-  const line = nextNonBlankLine(text, after);
+  const line = nextTextLine(text, after, format);
   return line === void 0 ? void 0 : fenceSpanAt(text, line, format);
 }
 function lineAt(content, offset) {
@@ -1320,7 +1360,7 @@ function subjectOf(entry) {
 function pickExtractor(file, format) {
   if (format !== void 0) {
     const forced = extractorByName(format);
-    if (!forced?.implemented) {
+    if (forced === void 0) {
       throw new CiteError(
         `Unknown format "${format}". Supported extensions: ${supportedExtensions().join(", ")}.`
       );
@@ -2582,7 +2622,7 @@ async function prepareRun(opts, action, verb, requireSources = false) {
   }
   const usingStdin = inputs.includes(STDIN_TOKEN);
   const forced = opts.as === void 0 ? void 0 : extractorByName(opts.as);
-  if (opts.as !== void 0 && forced?.implemented !== true) {
+  if (opts.as !== void 0 && forced === void 0) {
     throw new CiteError(
       `Unknown format "${opts.as}". Supported extensions: ${supportedExtensions().join(", ")}.`
     );
@@ -2748,6 +2788,35 @@ async function citedText(root, index, src, key) {
   }
   return sliceLines2(splitLines(source.text), range, range.path);
 }
+function spellAt(lines) {
+  return lines.start === lines.end ? `line ${String(lines.start)}` : `lines ${String(lines.start)}-${String(lines.end)}`;
+}
+function shiftedEntries(citations, insertLine, bodyLine, label) {
+  const out = { frontmatter: [], manifest: /* @__PURE__ */ new Map() };
+  for (const { citation, origin } of citations) {
+    const spec = citation.claim?.lines;
+    const recorded = spec === void 0 ? void 0 : parseLines(spec);
+    if (recorded === void 0) continue;
+    const file = toFileLines(recorded, bodyLine);
+    if (file.start < insertLine) {
+      if (file.end < insertLine) continue;
+      const whose = citation.id === void 0 ? `the claim at ${spellAt(file)}` : `the claim of ${citation.id} (${spellAt(file)})`;
+      throw new CiteError(
+        `${label}:${String(insertLine)} is inside ${whose}. A marker there would change its pin.`
+      );
+    }
+    const moved = lineSpec({ start: recorded.start + 1, end: recorded.end + 1 });
+    if (origin.kind === "manifest") out.manifest.set(origin.index, moved);
+    else out.frontmatter.push({ index: origin.index, lines: moved });
+  }
+  return out;
+}
+function withClaimLines(entry, lines) {
+  if (typeof entry !== "object" || entry === null || Array.isArray(entry)) return entry;
+  const claim = entry.claim;
+  if (typeof claim !== "object" || claim === null || Array.isArray(claim)) return entry;
+  return { ...entry, claim: { ...claim, lines } };
+}
 async function runAdd(opts) {
   const cwd = resolve4(opts.cwd ?? process.cwd());
   const run3 = await resolveCiteRun({
@@ -2839,16 +2908,33 @@ async function runAdd(opts) {
   let markerAt;
   let claimSpan;
   let claim;
+  let shifted = { frontmatter: [], manifest: /* @__PURE__ */ new Map() };
   if (marker && pageLines !== void 0) {
+    const holding = unitHolding(content, pageLines.start, format, {
+      offset: page.bodyOffset,
+      line: page.bodyLine
+    });
+    if (holding === void 0) {
+      throw new CiteError(`${at2} has no paragraph or block for a marker to anchor.`);
+    }
+    if (pageLines.end > holding.end) {
+      throw new CiteError(
+        `${at2} runs past the ${holding.kind} at ${spellAt(holding)}. A marker anchors one paragraph.`
+      );
+    }
+    shifted = shiftedEntries(page.citations, holding.start, page.bodyLine, label);
     const statement = formatStatement(format, { kind: "ref", id: opts.id ?? "" });
-    const insertAt = offsetOfLine(content, pageLines.start);
+    const insertAt = offsetOfLine(content, holding.start);
     body = insertStatementBefore(content, insertAt, statement);
-    markerAt = pageLines.start;
+    markerAt = holding.start;
     const unit = anchoredLines(body, insertAt + statement.length, format, quote);
     const pin = unit === void 0 ? void 0 : pinOfLines(splitLines(body), unit);
     if (unit === void 0 || pin === void 0) {
       throw new CiteError(`${at2} has no paragraph or block for a marker to anchor.`);
     }
+    for (const { index, lines: moved } of shifted.frontmatter) {
+      body = spliceEntryField(body, format, index, ["claim", "lines"], moved);
+    }
     claimSpan = unit;
     claim = { integrity: pin };
   } else if (pageLines !== void 0) {
@@ -2902,7 +2988,10 @@ async function runAdd(opts) {
         `${label} carries no ${owner.join}: value, so its citations cannot be keyed in ${owner.file}.`
       );
     }
-    const existing = (sidecar.citations ?? []).map((input) => input.entry);
+    const existing = (sidecar.citations ?? []).map((input, index) => {
+      const moved = shifted.manifest.get(index);
+      return moved === void 0 ? input.entry : withClaimLines(input.entry, moved);
+    });
     const list = [...existing, entryObject(citation)];
     const at3 = await manifests.write(owner, sidecar.entry, list, list.length - 1);
     const [changed] = manifests.changed();
@@ -3870,7 +3959,7 @@ async function runKeyRotate(opts) {
   if (inputs.length === 0) throw new KeyError(NO_FILES);
   const base = fromCollections && file !== null ? file.dir : cwd;
   const forced = opts.as === void 0 ? void 0 : extractorByName(opts.as);
-  if (opts.as !== void 0 && forced?.implemented !== true) {
+  if (opts.as !== void 0 && forced === void 0) {
     throw new KeyError(
       `Unknown format "${opts.as}". Supported extensions: ${supportedExtensions().join(", ")}.`
     );
@@ -4080,6 +4169,8 @@ export {
   isSeverity,
   meetsSeverity,
   reencryptMetadata,
+  codeRegions,
+  codeEndAt,
   CiteError,
   asCiteError,
   spellSource,
@@ -4099,4 +4190,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-6JWX6JM2.js.map
+//# sourceMappingURL=chunk-CD3LHG26.js.map