@hawkeyexl/manni 2.3.8 → 2.3.10

package/README.md

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

package/dist/{chunk-TIZE6GXU.js → chunk-LORLZO3J.js}

@@ -70,7 +70,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-EYD2RYKV.js";
+} from "./chunk-TNT3ZROC.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -260,6 +260,7 @@ __export(cite_exports, {
   runCheck: () => runCheck,
   runUpdate: () => runUpdate,
   shortCommit: () => shortCommit,
+  shortLine: () => shortLine,
   shortPin: () => shortPin,
   shortSrc: () => shortSrc,
   sidecarsFor: () => sidecarsFor,
@@ -420,6 +421,11 @@ function shortSrc(src) {
   const lines = colon === -1 ? "" : src.slice(colon);
   return token.length <= 5 ? src : `${token.slice(0, 5)}\u2026${lines}`;
 }
+var LINE_WIDTH = 60;
+function shortLine(text) {
+  const one = text.replace(/\s+/g, " ").trim();
+  return one.length <= LINE_WIDTH ? one : `${one.slice(0, LINE_WIDTH)}\u2026`;
+}
 
 // src/cite/core/sources.ts
 import fg from "fast-glob";
@@ -2594,7 +2600,8 @@ async function resolveCiteRun(opts) {
   const cwd = resolve2(opts.cwd);
   const env = opts.env ?? process.env;
   const wanted = opts.collection ?? [];
-  if (wanted.length > 0 && opts.inputs.some((input) => input !== STDIN)) {
+  const typedInputs = opts.inputs.filter((input) => input !== STDIN);
+  if (wanted.length > 0 && typedInputs.length > 0) {
     throw new CiteError(
       "--collection selects a configured collection; it cannot be combined with paths."
     );
@@ -2607,9 +2614,10 @@ async function resolveCiteRun(opts) {
   if (loaded) opts.onConfigLoaded?.({ path: loaded.path, dir: loaded.dir });
   const config = loaded ? loaded.config : null;
   const collections = loaded ? selectCollections(loaded.collections, wanted, loaded.source, (message) => new CiteError(message)) : [];
-  const fromCollections = opts.inputs.length === 0;
-  const inputs = fromCollections ? collections.flatMap((c) => c.paths) : opts.inputs;
-  const base = fromCollections && inputs.length > 0 && loaded ? loaded.dir : cwd;
+  const fromCollections = wanted.length > 0 || opts.inputs.length === 0;
+  const collectionPaths = fromCollections ? collections.flatMap((c) => c.paths) : [];
+  const inputs = fromCollections ? [...opts.inputs, ...collectionPaths] : opts.inputs;
+  const base = collectionPaths.length > 0 && loaded ? loaded.dir : cwd;
   let root;
   if (opts.root !== void 0) {
     root = resolve2(cwd, opts.root);
@@ -2864,6 +2872,50 @@ async function citedText(root, index, src, key) {
 function spellAt(lines) {
   return lines.start === lines.end ? `line ${String(lines.start)}` : `lines ${String(lines.start)}-${String(lines.end)}`;
 }
+function entryName(entry) {
+  return entry.citation.id ?? `/citations/${String(entry.origin.index)}`;
+}
+function duplicateOf(page, src, pageLines) {
+  const wanted = formatSrc(parseSrc(src));
+  return page.citations.find((entry) => {
+    const { citation } = entry;
+    if (spellSource(citation.source) !== wanted) return false;
+    if (pageLines === void 0) return citation.claim === void 0;
+    const spec = citation.claim?.lines;
+    if (spec === void 0) return false;
+    const recorded = parseLines(spec);
+    if (recorded === void 0) return false;
+    const file = toFileLines(recorded, page.bodyLine);
+    return file.start === pageLines.start && file.end === pageLines.end;
+  });
+}
+function holdsNoText(text) {
+  return text.trim() === "" || ANY_FENCE.test(text);
+}
+function emptyClaimRefusal(lines, pageLines, at2) {
+  const span = lines.slice(pageLines.start - 1, pageLines.end);
+  if (span.some((text) => !holdsNoText(text))) return void 0;
+  if (pageLines.start !== pageLines.end) return `${at2} holds no claim text.`;
+  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 named3 = spans.slice(0, NAMED_SPANS).map((span) => spellLines(span));
+  const rest = spans.length - named3.length;
+  if (rest > 0) return `${noun} ${named3.join(", ")} and ${String(rest)} more`;
+  const last = named3.pop() ?? "";
+  return named3.length === 0 ? `${noun} ${last}` : `${noun} ${named3.join(", ")} and ${last}`;
+}
 function shiftedEntries(citations, insertLine, bodyLine, label) {
   const out = { frontmatter: [], manifest: /* @__PURE__ */ new Map() };
   for (const { citation, origin } of citations) {
@@ -2962,6 +3014,12 @@ async function runAdd(opts) {
       );
     }
   }
+  const duplicate = marker ? void 0 : duplicateOf(page, opts.src, pageLines);
+  if (duplicate !== void 0) {
+    const src = shortSrc(spellSource(duplicate.citation.source));
+    const what = pageLines === void 0 ? `a bare pin for ${src}` : `an entry for ${spellAt(pageLines)} and ${src}`;
+    throw new CiteError(`${label} already has ${what} (${entryName(duplicate)}).`);
+  }
   const lines = splitLines(content);
   if (pageLines !== void 0) {
     if (pageLines.end > lines.length) {
@@ -2975,6 +3033,9 @@ async function runAdd(opts) {
       if (span === void 0 || span.end !== pageLines.end) {
         throw new CiteError(`${at2} is not a fenced block, so it cannot be a quote.`);
       }
+    } else if (!marker) {
+      const empty = emptyClaimRefusal(lines, pageLines, at2);
+      if (empty !== void 0) throw new CiteError(empty);
     }
   }
   const client = opts.gitClient ?? gitClient(root);
@@ -2983,6 +3044,7 @@ async function runAdd(opts) {
   let markerAt;
   let claimSpan;
   let claim;
+  let elsewhere = [];
   let shifted = { frontmatter: [], manifest: /* @__PURE__ */ new Map() };
   if (marker && pageLines !== void 0) {
     const holding = unitHolding(content, pageLines.start, format, {
@@ -3025,6 +3087,7 @@ async function runAdd(opts) {
     }
     claimSpan = pageLines;
     claim = { lines: lineSpec(toBodyLines(pageLines, page.bodyLine)), integrity: pin };
+    elsewhere = otherClaimSpans(lines, pageLines, pin, page.bodyLine);
   }
   const mint = (key, encrypt) => mintCitation({
     root,
@@ -3061,6 +3124,12 @@ async function runAdd(opts) {
     });
     citation = await mint(key, true);
   }
+  const srcRange = parseSrc(opts.src);
+  let sourceLine;
+  if (srcRange.start !== void 0 && !isEncryptedValue(citation.source.file)) {
+    const read = await readSource(root, sourceIndex, srcRange, void 0);
+    if (read.kind === "ok") sourceLine = splitLines(read.text)[srcRange.start - 1];
+  }
   const manifests = new ManifestSet();
   let placed;
   if (owner !== void 0) {
@@ -3093,6 +3162,7 @@ async function runAdd(opts) {
     content: after,
     diff: unifiedDiff(label, content, after),
     written: false,
+    ...sourceLine === void 0 ? {} : { sourceLine },
     ...placed === void 0 ? {} : { manifest: placed }
   };
   if (markerAt !== void 0) result.markerLine = markerAt + shift;
@@ -3105,6 +3175,13 @@ async function runAdd(opts) {
     for (const changed of manifests.changed()) await writeFileAtomic(changed.path, changed.text);
     result.manifest.written = true;
   }
+  if (elsewhere.length > 0) {
+    const named3 = elsewhere.map((span) => ({ start: span.start + shift, end: span.end + shift }));
+    const who = citation.id === void 0 ? "" : `${citation.id}: `;
+    opts.onNotice?.(
+      `${who}the claim's text also appears at ${spellElsewhere(named3)}, so a move would be ambiguous. Use --marker, or pin more lines.`
+    );
+  }
   if (opts.commitSha !== false && !await client.available()) {
     opts.onNotice?.(GIT_UNAVAILABLE_COMMIT);
   }
@@ -3831,7 +3908,7 @@ var NAMES_ITS_SUBJECT = /* @__PURE__ */ new Set([
   "marker-repeated",
   "anchor-invalid"
 ]);
-function annotationMessage(finding2) {
+function findingMessage(finding2) {
   const subject = finding2.id ?? finding2.src;
   if (subject === void 0) return finding2.message;
   if (NAMES_ITS_SUBJECT.has(finding2.rule)) return finding2.message;
@@ -3849,7 +3926,7 @@ function renderCheckGithub(run3) {
       if (site.line !== void 0) params.push(`line=${String(site.line)}`);
       params.push(`title=${escapeWorkflowCommandProperty(finding2.ruleId)}`);
       lines.push(
-        `::${finding2.severity} ${params.join(",")}::${escapeWorkflowCommandMessage(annotationMessage(finding2))}`
+        `::${finding2.severity} ${params.join(",")}::${escapeWorkflowCommandMessage(findingMessage(finding2))}`
       );
     }
   });
@@ -4285,15 +4362,20 @@ export {
   codeEndAt,
   CiteError,
   asCiteError,
+  RULE_ID_PREFIX,
+  isCiteRule,
   spellSource,
-  runAdd,
-  runCheck,
-  runUpdate,
   shortPin,
   shortCommit,
   shortSrc,
+  shortLine,
+  runAdd,
+  errorSite,
+  runCheck,
+  runUpdate,
   renderCheckPretty,
   renderUpdatePretty,
+  findingMessage,
   renderCheckGithub,
   renderCheckJson,
   renderUpdateJson,
@@ -4302,4 +4384,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-TIZE6GXU.js.map
+//# sourceMappingURL=chunk-LORLZO3J.js.map