@hawkeyexl/manni 2.3.7 → 2.3.9

package/dist/{chunk-Y2XNDEM6.js → chunk-YSI2VNKE.js}

@@ -70,7 +70,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-D5FTEP3H.js";
+} from "./chunk-LC4H35XX.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -2594,7 +2594,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 +2608,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);
@@ -2997,6 +2999,12 @@ async function runAdd(opts) {
         `${at2} runs past the ${holding.kind} at ${spellAt(holding)}. A marker anchors one paragraph.`
       );
     }
+    const unitWide = tooWide({ start: holding.start, end: holding.end });
+    if (unitWide !== void 0) {
+      throw new CiteError(
+        `${at2} is in a ${holding.kind} at ${spellAt(holding)} that ${unitWide}. A marker anchors the whole ${holding.kind}.`
+      );
+    }
     shifted = shiftedEntries(page.citations, holding.start, 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);
@@ -3242,7 +3250,7 @@ async function runUpdate(opts) {
   const manifests = new ManifestSet();
   const only = opts.only !== void 0 && opts.only.length > 0 ? new Set(opts.only) : void 0;
   const accept = opts.accept === true;
-  const plansFor = async (result, entry, page, lines) => {
+  const plansFor = async (result, entry, page, lines, declined) => {
     const out = [];
     const claim = result.claim;
     if (claim !== null && claim.status === "moved" && claim.newLines !== void 0) {
@@ -3271,7 +3279,10 @@ async function runUpdate(opts) {
       })();
       const wantsBlock = entry.citation.quote === true;
       const pin = unit === void 0 ? void 0 : pinOfLines(lines, unit.lines);
-      if (unit !== void 0 && pin !== void 0 && (!wantsBlock || unit.kind === "block")) {
+      const wide = unit === void 0 ? void 0 : tooWide(unit.lines);
+      if (unit !== void 0 && wide !== void 0) {
+        declined.set(result.origin.index, `Not re-pinned: the ${unit.kind} ${wide}.`);
+      } else if (unit !== void 0 && pin !== void 0 && (!wantsBlock || unit.kind === "block")) {
         const plan = { kind: "claim-accepted", result, unit, pin };
         if (entry.citation.claim?.lines !== void 0) {
           const body = toBodyLines(unit.lines, page.bodyLine);
@@ -3314,6 +3325,7 @@ async function runUpdate(opts) {
     const lines = splitLines(content);
     const rewritten2 = [];
     const settled = /* @__PURE__ */ new Set();
+    const declined = /* @__PURE__ */ new Map();
     let after = content;
     const owner = setup.sidecar?.owner;
     const entries = setup.sidecar?.citations === void 0 ? void 0 : JSON.parse(JSON.stringify(setup.sidecar.citations.map((c) => c.entry)));
@@ -3323,7 +3335,7 @@ async function runUpdate(opts) {
         continue;
       }
       const entry = page.citations.find((c) => c.origin.index === result.origin.index);
-      for (const plan of await plansFor(result, entry, page, lines)) {
+      for (const plan of await plansFor(result, entry, page, lines, declined)) {
         if (result.origin.kind === "manifest") {
           if (entries === void 0 || !applyToEntry(entries[result.origin.index], plan)) continue;
           manifestDirty = true;
@@ -3344,7 +3356,10 @@ async function runUpdate(opts) {
     }
     const skipped2 = report.findings.filter(
       (finding2) => (only === void 0 || finding2.id !== void 0 && only.has(finding2.id)) && !settled.has(`${String(finding2.index ?? -1)}\0${finding2.rule}`)
-    );
+    ).map((finding2) => {
+      const why = finding2.rule === "claim-changed" && finding2.index !== void 0 ? declined.get(finding2.index) : void 0;
+      return why === void 0 ? finding2 : { ...finding2, message: `${finding2.message} ${why}` };
+    });
     const diff = after === content ? "" : unifiedDiff(label, content, after);
     const written = after !== content && path !== void 0 && opts.dryRun !== true;
     if (written) await writeFileAtomic(path, after);
@@ -3818,7 +3833,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;
@@ -3836,7 +3851,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))}`
       );
     }
   });
@@ -4272,8 +4287,11 @@ export {
   codeEndAt,
   CiteError,
   asCiteError,
+  RULE_ID_PREFIX,
+  isCiteRule,
   spellSource,
   runAdd,
+  errorSite,
   runCheck,
   runUpdate,
   shortPin,
@@ -4281,6 +4299,7 @@ export {
   shortSrc,
   renderCheckPretty,
   renderUpdatePretty,
+  findingMessage,
   renderCheckGithub,
   renderCheckJson,
   renderUpdateJson,
@@ -4289,4 +4308,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-Y2XNDEM6.js.map
+//# sourceMappingURL=chunk-YSI2VNKE.js.map