@hawkeyexl/manni 2.8.5 → 2.9.0-cite-marker-ids.1

package/dist/{chunk-GRPDC5BY.js → chunk-33FPHH3J.js}

@@ -75,7 +75,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-4UI4MDAG.js";
+} from "./chunk-DI3NC57Z.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -832,11 +832,32 @@ function nextLineStart(content, offset) {
   if (offset === 0 || content.charCodeAt(offset - 1) === 10) return offset;
   return lineEnd(content, offset) + 1;
 }
+var MAX_IDS_PER_MARKER = 25;
 function payloadOf(payload) {
   if (payload === "") return { kind: "bad", reason: "empty payload" };
-  if (payload.startsWith("{")) return { kind: "bad", reason: "a JSON payload", json: true };
-  if (ID.test(payload)) return { kind: "ref", id: payload };
-  return { kind: "bad", reason: "payload is not an id" };
+  if (/[\r\n]/.test(payload)) {
+    return { kind: "bad", reason: "a marker is one line; write two markers" };
+  }
+  const words = payload.split(" ").filter((word) => word !== "");
+  if (words.some((word) => word.startsWith("{"))) {
+    return { kind: "bad", reason: "a JSON payload", json: true };
+  }
+  if (words.length > MAX_IDS_PER_MARKER) {
+    return {
+      kind: "bad",
+      reason: `more than ${String(MAX_IDS_PER_MARKER)} ids in one marker (${String(words.length)}); write a second marker`
+    };
+  }
+  const bad = words.find((word) => !ID.test(word));
+  if (bad !== void 0) return { kind: "bad", reason: `"${bad}" is not an id` };
+  const seen = /* @__PURE__ */ new Set();
+  for (const word of words) {
+    if (seen.has(word)) {
+      return { kind: "bad", reason: `"${word}" is named twice in one marker` };
+    }
+    seen.add(word);
+  }
+  return { kind: "ref", ids: words };
 }
 function isCite(inner) {
   return inner === "cite" || inner.startsWith("cite") && /\s/.test(inner.charAt(4));
@@ -1017,7 +1038,15 @@ function writtenForm(format) {
 function formatStatement(format, payload) {
   const form = writtenForm(format);
   const pad = form.open.endsWith("(") ? "" : " ";
-  return `${form.open}${pad}cite ${payload.id}${pad}${form.close}`;
+  return `${form.open}${pad}cite ${payload.ids.join(" ")}${pad}${form.close}`;
+}
+function respellStatement(content, statement, ids) {
+  const text = content.slice(statement.start, statement.end);
+  const at2 = text.indexOf(statement.raw);
+  if (at2 === -1) return content;
+  const respelled = `cite ${ids.join(" ")}`;
+  const marker = text.slice(0, at2) + respelled + text.slice(at2 + statement.raw.length);
+  return content.slice(0, statement.start) + marker + content.slice(statement.end);
 }
 function nextTextLine(text, offset, format) {
   let pos = nextLineStart(text, offset);
@@ -1408,34 +1437,58 @@ function readPage(file, content, opts) {
       );
       continue;
     }
-    const target = byId.get(payload.id);
-    if (target === void 0) {
-      findings.push(
-        finding("marker-orphan", `no entry has id "${payload.id}"`, {
-          line: statement.line,
-          id: payload.id
-        })
-      );
-      continue;
-    }
-    const first = markedAt.get(target);
-    if (first !== void 0) {
+    const marked = [];
+    for (const id of payload.ids) {
+      const target = byId.get(id);
+      if (target === void 0) {
+        findings.push(
+          finding("marker-orphan", `no entry has id "${id}"`, {
+            line: statement.line,
+            id
+          })
+        );
+        continue;
+      }
+      marked.push(target);
+      const first = markedAt.get(target);
+      if (first !== void 0) {
+        findings.push(
+          finding(
+            "marker-repeated",
+            `${id} is named by markers at lines ${String(first)} and ${String(statement.line)}; the first anchors it.`,
+            {
+              line: statement.line,
+              id,
+              index: target.origin.index,
+              src: spellSource(target.citation.source)
+            }
+          )
+        );
+        continue;
+      }
+      markedAt.set(target, statement.line);
+      target.marker = statement;
+    }
+    const quoted2 = marked.find((entry) => entry.citation.quote === true);
+    const plain = marked.find((entry) => entry.citation.quote !== true);
+    if (quoted2 !== void 0 && plain !== void 0) {
+      const mixed = {
+        line: statement.line,
+        index: quoted2.origin.index,
+        src: spellSource(quoted2.citation.source)
+      };
+      if (quoted2.citation.id !== void 0) mixed.id = quoted2.citation.id;
       findings.push(
         finding(
-          "marker-repeated",
-          `${payload.id} is named by markers at lines ${String(first)} and ${String(statement.line)}; the first anchors it.`,
-          {
-            line: statement.line,
-            id: payload.id,
-            index: target.origin.index,
-            src: spellSource(target.citation.source)
-          }
+          "anchor-invalid",
+          named(
+            quoted2.citation.id,
+            "a quote entry shares a marker with a non-quote entry. Give the quote its own marker."
+          ),
+          mixed
         )
       );
-      continue;
     }
-    markedAt.set(target, statement.line);
-    target.marker = statement;
   }
   for (const entry of citations) {
     const { citation, origin, marker } = entry;
@@ -1985,7 +2038,7 @@ function readThen(input, text) {
   const id = input.entry.citation.id;
   if (id === void 0) return void 0;
   const marker = then.statements.find(
-    (statement) => statement.payload.kind === "ref" && statement.payload.id === id
+    (statement) => statement.payload.kind === "ref" && statement.payload.ids.includes(id)
   );
   if (marker === void 0) return void 0;
   return { page: then, lines, marker };
@@ -3834,7 +3887,7 @@ async function runAdd(opts) {
   }
   if (marker && opts.id !== void 0) {
     const already = page.statements.find(
-      (s) => s.payload.kind === "ref" && s.payload.id === opts.id
+      (s) => s.payload.kind === "ref" && s.payload.ids.includes(opts.id ?? "")
     );
     if (already !== void 0) {
       throw new CiteError(
@@ -3887,11 +3940,17 @@ async function runAdd(opts) {
   const sourceIndex = await sourceIndexFor(root, client);
   let body = content;
   let markerAt2;
+  let markerJoined = false;
   let claimSpan;
   let claim;
   let elsewhere = [];
   let shifted = { frontmatter: [], manifest: /* @__PURE__ */ new Map() };
   if (marker && pageLines !== void 0) {
+    if (isMarkerLine(lines[pageLines.start - 1] ?? "", format)) {
+      throw new CiteError(
+        `${label}:${String(pageLines.start)} is a marker line. A marker there would change its pin.`
+      );
+    }
     const holding = unitHolding(content, pageLines.start, format, {
       offset: page.bodyOffset,
       line: page.bodyLine
@@ -3910,18 +3969,30 @@ async function runAdd(opts) {
         `${at2} is in a ${holding.kind} at ${spellAt(holding)} that ${unitWide}. A marker anchors the whole ${holding.kind}.`
       );
     }
-    shifted = shiftedEntries({
-      citations: page.citations,
-      at: [holding.start],
-      delta: 1,
-      bodyLine: page.bodyLine,
-      label
-    });
-    const statement = markerIndent(content, holding.start, format, page.bodyLine) + formatStatement(format, { kind: "ref", id: opts.id ?? "" });
-    const insertAt = offsetOfLine(content, holding.start);
-    body = insertStatementBefore(content, insertAt, statement);
-    markerAt2 = holding.start;
-    const unit = anchoredLines(body, insertAt + statement.length, format, quote);
+    const above = page.statements.filter((s) => s.anchorLine === holding.start);
+    const nearest = above[above.length - 1];
+    const held = nearest !== void 0 && nearest.payload.kind === "ref" && nearest.payload.ids.length < MAX_IDS_PER_MARKER ? nearest.payload.ids : void 0;
+    let after2;
+    if (nearest !== void 0 && held !== void 0) {
+      body = respellStatement(content, nearest, [...held, opts.id ?? ""]);
+      after2 = nearest.end + (body.length - content.length);
+      markerAt2 = nearest.line;
+      markerJoined = true;
+    } else {
+      shifted = shiftedEntries({
+        citations: page.citations,
+        at: [holding.start],
+        delta: 1,
+        bodyLine: page.bodyLine,
+        label
+      });
+      const statement = markerIndent(content, holding.start, format, page.bodyLine) + formatStatement(format, { kind: "ref", ids: [opts.id ?? ""] });
+      const insertAt = offsetOfLine(content, holding.start);
+      body = insertStatementBefore(content, insertAt, statement);
+      after2 = insertAt + statement.length;
+      markerAt2 = holding.start;
+    }
+    const unit = anchoredLines(body, after2, 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.`);
@@ -4019,6 +4090,7 @@ async function runAdd(opts) {
     ...placed === void 0 ? {} : { manifest: placed }
   };
   if (markerAt2 !== void 0) result.markerLine = markerAt2 + shift;
+  if (markerJoined) result.markerJoined = true;
   if (claimSpan !== void 0) {
     result.claimLines = { start: claimSpan.start + shift, end: claimSpan.end + shift };
   }
@@ -4105,7 +4177,15 @@ async function runRemove(opts) {
       }
       return [];
     };
-    const markersFor = (id) => id === void 0 ? [] : page.statements.filter((s) => s.payload.kind === "ref" && s.payload.id === id).map((s) => s.line);
+    const markersFor = (id) => id === void 0 ? [] : page.statements.filter(
+      (s) => s.payload.kind === "ref" && s.payload.ids.includes(id)
+    );
+    const dropped = /* @__PURE__ */ new Map();
+    const drop = (statement, id) => {
+      const held = dropped.get(statement.line) ?? { statement, ids: /* @__PURE__ */ new Set() };
+      held.ids.add(id);
+      dropped.set(statement.line, held);
+    };
     const removed = [];
     const indices = /* @__PURE__ */ new Set();
     const markerLines = [];
@@ -4116,20 +4196,22 @@ async function runRemove(opts) {
         const id = idOf(input?.entry);
         const markers2 = markersFor(id);
         indices.add(index);
-        markerLines.push(...markers2);
+        markerLines.push(...markers2.map((s) => s.line));
+        if (id !== void 0) for (const statement of markers2) drop(statement, id);
         removed.push({
           ...id === void 0 ? {} : { id },
           index,
           ...input === void 0 ? {} : { origin: input.origin },
-          markerLines: markers2
+          markerLines: markers2.map((s) => s.line)
         });
         matched.add(value);
       }
       if (found.length > 0) continue;
       const markers = markersFor(value);
       if (markers.length === 0) continue;
-      markerLines.push(...markers);
-      removed.push({ id: value, markerLines: markers });
+      markerLines.push(...markers.map((s) => s.line));
+      for (const statement of markers) drop(statement, value);
+      removed.push({ id: value, markerLines: markers.map((s) => s.line) });
       matched.add(value);
     }
     const nothing = { file: label, removed: [], diff: "", written: false };
@@ -4138,16 +4220,24 @@ async function runRemove(opts) {
       planned.push({ page: nothing, ...path === void 0 ? {} : { path } });
       return;
     }
-    const ordered = [...new Set(markerLines)].sort((a, b) => a - b);
-    for (const line of ordered) {
+    const touched = [...new Set(markerLines)].sort((a, b) => a - b);
+    for (const line of touched) {
       if (!isMarkerLine(lines[line - 1] ?? "", format)) {
         const id = page.statements.find((s) => s.line === line)?.payload;
-        const named4 = id?.kind === "ref" ? ` ${id.id}` : "";
+        const named4 = id?.kind === "ref" ? ` ${id.ids.join(" ")}` : "";
         throw new CiteError(
           `the marker${named4} at ${label}:${String(line)} shares its line with text; remove it by hand.`
         );
       }
     }
+    const kept = /* @__PURE__ */ new Map();
+    const ordered = [];
+    for (const line of touched) {
+      const held = dropped.get(line);
+      const ids = held === void 0 || held.statement.payload.kind !== "ref" ? [] : held.statement.payload.ids.filter((id) => !held.ids.has(id));
+      if (ids.length === 0) ordered.push(line);
+      else kept.set(line, ids);
+    }
     const survivors = page.citations.filter((c) => !indices.has(c.origin.index));
     const shifted = shiftedEntries({
       citations: survivors,
@@ -4160,6 +4250,10 @@ async function runRemove(opts) {
     for (const { index, lines: moved } of shifted.frontmatter) {
       after = spliceEntryField(after, format, index, ["claim", "lines"], moved);
     }
+    for (const [line, ids] of kept) {
+      const held = dropped.get(line);
+      if (held !== void 0) after = respellStatement(after, held.statement, ids);
+    }
     for (const line of [...ordered].sort((a, b) => b - a)) after = removeLine(after, line);
     if (owner === void 0) {
       after = removeFrontmatterCitations(after, format, indices, label);
@@ -4169,12 +4263,12 @@ async function runRemove(opts) {
           `${label} carries no ${owner.join}: value, so its citations cannot be keyed in ${owner.file}.`
         );
       }
-      const kept = inputs.map((input, index) => {
+      const kept2 = inputs.map((input, index) => {
         const moved = shifted.manifest.get(index);
         return moved === void 0 ? input.entry : withClaimLines(input.entry, moved);
       }).filter((_entry, index) => !indices.has(index));
-      if (kept.length === 0) await manifests.remove(owner, setup.sidecar.entry);
-      else void await manifests.write(owner, setup.sidecar.entry, kept, 0);
+      if (kept2.length === 0) await manifests.remove(owner, setup.sidecar.entry);
+      else void await manifests.write(owner, setup.sidecar.entry, kept2, 0);
     }
     const out = {
       file: label,
@@ -6117,4 +6211,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-GRPDC5BY.js.map
+//# sourceMappingURL=chunk-33FPHH3J.js.map