@hawkeyexl/manni 2.10.2 → 2.11.1

package/dist/{chunk-4HKOQIJL.js → chunk-CZGAZGDN.js}

@@ -29,10 +29,13 @@ import {
   findConfigFile,
   findFamilyConfigFile,
   findGitRoot,
+  findPageManifests,
   findWindows,
   generateEncryptionKey,
+  gitIgnored,
   gitignoreOptions,
   hasFrontmatterFence,
+  hasPagePlaceholder,
   hashLines,
   hashRange,
   heldManifest,
@@ -41,6 +44,7 @@ import {
   isIgnoredByGit,
   isKeyedPin,
   isMember,
+  isMissing,
   isValidEncryptionKey,
   lineSpec,
   loadExternalMetadata,
@@ -51,6 +55,7 @@ import {
   orphanEntries,
   orphanError,
   orphanJoins,
+  pageManifestPath,
   palette,
   parseLines,
   pinOfLines,
@@ -72,10 +77,11 @@ import {
   supportedExtensions,
   toBodyLines,
   toFileLines,
+  warn,
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-KJLPOY2I.js";
+} from "./chunk-7ODP2AB3.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -2481,6 +2487,7 @@ function withClaimLines(entry, lines) {
 }
 
 // src/cite/core/sidecar.ts
+import { existsSync } from "node:fs";
 import { isAbsolute, relative, resolve, sep as sep2 } from "node:path";
 var CITATIONS_KEY2 = "citations";
 var toPosix = (path) => path.split(sep2).join("/");
@@ -2513,7 +2520,8 @@ async function loadCitationSidecars(opts) {
         collection: collection.name,
         path,
         file: reportedPath(path, opts.base),
-        join: externalMetadataJoin(manifest)
+        join: externalMetadataJoin(manifest),
+        ...hasPagePlaceholder(manifest.file) ? { pattern: manifest.file } : {}
       });
     }
     scoped.push({ ...collection, externalMetadata: owning });
@@ -2521,7 +2529,8 @@ async function loadCitationSidecars(opts) {
   if (manifests.length === 0) return null;
   const index = await loadExternalMetadata(scoped, {
     configDir: opts.configDir,
-    base: opts.base
+    base: opts.base,
+    ...opts.pages === void 0 ? {} : { pages: opts.pages }
   });
   if (index === null) return null;
   return sidecars(index, manifests, scoped, opts);
@@ -2529,15 +2538,23 @@ async function loadCitationSidecars(opts) {
 function sidecars(index, manifests, collections, opts) {
   const toError = opts.toError ?? ((message) => new CiteError(message));
   const { configDir, base } = opts;
+  const pageOwner = (owner, label) => {
+    if (owner.pattern === void 0) return owner;
+    const resolved = pageManifestPath(owner.pattern, configDir, resolve(base, label));
+    if ("outside" in resolved) return void 0;
+    return { ...owner, path: resolved.abs, file: reportedPath(resolved.abs, base) };
+  };
   const forPage = (label, content, format) => {
     const members = memberOf(collections, configDir, base, label);
     if (members.length === 0) return { joins: [] };
     const mine = manifests.filter((m) => members.includes(m.collection));
-    const [owner, second] = mine;
-    if (owner === void 0) return { joins: [] };
+    const [declared, second] = mine;
+    if (declared === void 0) return { joins: [] };
     if (second !== void 0) {
-      throw toError(twoManifestsRefusal(label, owner.collection, second.collection));
+      throw toError(twoManifestsRefusal(label, declared.collection, second.collection));
     }
+    const owner = pageOwner(declared, label);
+    if (owner === void 0) return { joins: [] };
     const extractor = pickExtractor(label, format);
     const extracted = extractor.extract(content, label);
     const merged = mergeExternalMetadata(label, extracted, index, members, base, {
@@ -2571,15 +2588,33 @@ function sidecars(index, manifests, collections, opts) {
     }
     return out;
   };
+  const ignoredManifests = async (loaded) => {
+    const existing = /* @__PURE__ */ new Set();
+    for (const label of loaded) {
+      const members = memberOf(collections, configDir, base, label);
+      for (const declared of manifests) {
+        if (declared.pattern === void 0 || !members.includes(declared.collection)) continue;
+        const owner = pageOwner(declared, label);
+        if (owner !== void 0 && existsSync(owner.path)) existing.add(owner.file);
+      }
+    }
+    if (existing.size === 0) return [];
+    const { ignored } = await gitIgnored([...existing], base);
+    return [...existing].filter((file) => ignored.has(file));
+  };
   return {
     manifests,
     configDir,
     base,
     forPage,
     orphans: (loaded, covered) => orphanEntries(index, loaded, base, covered),
-    orphanJoins: (matched, covered) => orphanJoins(index, matched, covered)
+    orphanJoins: (matched, covered) => orphanJoins(index, matched, covered),
+    ignoredManifests
   };
 }
+function ignoredManifestWarning(file) {
+  return `${file} is covered by .gitignore, so CI checks out a page with no citations.`;
+}
 function orphanRefusal(orphans, toError = (m) => new CiteError(m)) {
   return toError(orphanError(orphans).message);
 }
@@ -2596,7 +2631,8 @@ function sidecarsFor(run3, over = {}) {
     base: over.base ?? run3.base,
     configSource: run3.configSource ?? run3.configPath ?? "the config",
     ...run3.key === void 0 ? {} : { key: run3.key },
-    ...over.toError === void 0 ? {} : { toError: over.toError }
+    ...over.toError === void 0 ? {} : { toError: over.toError },
+    ...over.pages === void 0 ? {} : { pages: over.pages }
   });
 }
 
@@ -2875,13 +2911,18 @@ var ManifestSet = class {
     const already = this.held.get(manifest.path);
     if (already !== void 0) return already;
     let before;
+    let absent = false;
     try {
       before = await readFile2(manifest.path, "utf8");
     } catch (error) {
-      const reason = error instanceof Error ? error.message : String(error);
-      throw new CiteError(`Manifest ${manifest.file} could not be read: ${reason}`);
+      if (manifest.pattern === void 0 || !isMissing(error)) {
+        const reason = error instanceof Error ? error.message : String(error);
+        throw new CiteError(`Manifest ${manifest.file} could not be read: ${reason}`);
+      }
+      before = "";
+      absent = true;
     }
-    const fresh = heldManifest(manifest.path, manifest.file, before);
+    const fresh = heldManifest(manifest.path, manifest.file, before, absent);
     this.held.set(manifest.path, fresh);
     return fresh;
   }
@@ -2953,7 +2994,7 @@ var ManifestSet = class {
    * that may be seconds old.
    */
   async commit(io = {}) {
-    const write = io.write ?? writeFileAtomic;
+    const write = io.write ?? ((at2, text) => writeFileAtomic(at2, text, { createParents: true }));
     const read = io.read ?? ((at2) => readFile2(at2, "utf8"));
     const landed = [];
     for (const held of this.held.values()) {
@@ -3731,7 +3772,7 @@ async function resolveCiteRun(opts) {
 }
 
 // src/cite/commands/check.ts
-import { existsSync } from "node:fs";
+import { existsSync as existsSync2 } from "node:fs";
 import { readFile as readFile3 } from "node:fs/promises";
 import { resolve as resolve3 } from "node:path";
 function joinHits() {
@@ -3826,7 +3867,7 @@ async function prepareRun(opts, action, verb, sources = {}) {
     pageGitClient: pageGit
   };
   if (checkSources) pageOptions.sourceIndex = await sourceIndexFor(run3.root, git);
-  const sidecars2 = await sidecarsFor(run3);
+  const sidecars2 = await sidecarsFor(run3, { pages: files.map((file) => resolve3(base, file)) });
   const setupFor = (label, content) => {
     const page = sidecars2?.forPage(label, content, forced?.name);
     if (page?.owner === void 0) return { options: pageOptions };
@@ -3860,11 +3901,13 @@ async function prepareRun(opts, action, verb, sources = {}) {
     ...covered === void 0 ? {} : { covered }
   };
 }
-function assertNoOrphans(prepared) {
+async function assertNoOrphans(prepared) {
   const { sidecars: sidecars2 } = prepared;
   if (sidecars2 === null || prepared.scopedByFlags) return;
   const orphans = sidecars2.orphans(prepared.files, prepared.covered);
   if (orphans.length > 0) throw orphanRefusal(orphans);
+  if (prepared.covered !== void 0) return;
+  for (const file of await sidecars2.ignoredManifests(prepared.files)) warn(ignoredManifestWarning(file));
 }
 function assertNoOrphanJoins(prepared, hits) {
   const { sidecars: sidecars2 } = prepared;
@@ -3886,7 +3929,7 @@ function sayNotices(pages, onNotice, also = []) {
 async function runCheck(opts) {
   const prepared = await prepareRun(opts, "checked", "check");
   const { cwd, run: run3, files, gitignoreSkipped, usingStdin, forced, pageOptions, git } = prepared;
-  assertNoOrphans(prepared);
+  await assertNoOrphans(prepared);
   const hits = joinHits();
   const pages = [];
   const checkOne = async (label, content) => {
@@ -3904,7 +3947,7 @@ async function runCheck(opts) {
   const request = resolveBaselineRequest(opts, run3.config?.baseline, run3.configDir, cwd, {
     current: DEFAULT_CITE_BASELINE_PATH
   });
-  if (request !== null && !request.write && !existsSync(request.absPath)) {
+  if (request !== null && !request.write && !existsSync2(request.absPath)) {
     throw new CiteError(
       `Baseline "${request.label}" not found. Record one with \`manni cite check --write-baseline\`, or drop --baseline.`
     );
@@ -4000,7 +4043,11 @@ async function runAdd(opts) {
   const path = usingStdin ? void 0 : resolve4(cwd, opts.page);
   const label = path === void 0 ? STDIN_LABEL : toPosix2(relative2(cwd, path));
   const content = path === void 0 ? opts.stdinContent ?? "" : await readPageFile(path, label);
-  const sidecars2 = await sidecarsFor(run3, { base: cwd });
+  const sidecars2 = await sidecarsFor(run3, {
+    base: cwd,
+    // A `{page}` manifest (0058) is read for the one page being cited.
+    ...path === void 0 ? {} : { pages: [path] }
+  });
   const firstManifest = sidecars2?.manifests[0];
   if (usingStdin && firstManifest !== void 0) {
     const keyedBy = firstManifest.join === "path" ? "path" : firstManifest.join;
@@ -4297,7 +4344,7 @@ async function runRemove(opts) {
     resolve: false
   });
   const { run: run3, files, usingStdin, forced } = prepared;
-  assertNoOrphans(prepared);
+  await assertNoOrphans(prepared);
   const hits = joinHits();
   const manifests = new ManifestSet();
   const matched = /* @__PURE__ */ new Set();
@@ -4958,7 +5005,7 @@ function citationsIn(rows) {
 async function runUpdate(opts) {
   const prepared = await prepareRun(opts, "updated", "update", { require: true });
   const { run: run3, files, usingStdin, forced, pageOptions, git } = prepared;
-  assertNoOrphans(prepared);
+  await assertNoOrphans(prepared);
   const hits = joinHits();
   const manifests = new ManifestSet();
   const writes = new WrittenFiles();
@@ -5677,6 +5724,13 @@ function rowOrder(citations) {
     return left - right;
   });
 }
+function oneManifest(citations) {
+  const files = new Set(
+    citations.map((result) => result.origin.kind === "manifest" ? result.origin.file : void 0)
+  );
+  const [only, ...rest] = [...files];
+  return rest.length === 0 ? only : void 0;
+}
 function padTo(text, width, plain) {
   return width <= plain ? text : text + " ".repeat(width - plain);
 }
@@ -5695,12 +5749,14 @@ function renderCheckPretty(run3, opts) {
     const errors = reported.filter((f) => f.severity === "error").length;
     const warned = reported.some((f) => f.severity === "warning");
     const forgiven = baselined2.length > 0 ? c.dim(`  (${String(baselined2.length)} baselined)`) : "";
+    const manifest = oneManifest(page.citations);
+    const heading = manifest === void 0 ? page.file : `${page.file}   ${c.dim(manifest)}`;
     if (reported.length === 0) {
       if (quiet) return;
-      lines.push(`${c.green("\u2713")} ${page.file}${forgiven}`);
+      lines.push(`${c.green("\u2713")} ${heading}${forgiven}`);
     } else {
       const mark = errors > 0 ? c.red("\u2717") : warned ? c.yellow("\u26A0") : c.dim("\u2139");
-      lines.push(`${mark} ${page.file}${forgiven}`);
+      lines.push(`${mark} ${heading}${forgiven}`);
     }
     const isBaselined = new Set(baselined2);
     const placed = /* @__PURE__ */ new Set();
@@ -5732,7 +5788,7 @@ function renderCheckPretty(run3, opts) {
         label: labelOf(result),
         claim: claimColumn(result),
         source: `${sourceColumn(result, opts, c.dim)}${forgivenEnd}`,
-        where: result.origin.kind === "manifest" ? `${result.origin.file}${result.origin.line === void 0 ? "" : `:${String(result.origin.line)}`}` : "",
+        where: result.origin.kind === "manifest" && manifest === void 0 ? `${result.origin.file}${result.origin.line === void 0 ? "" : `:${String(result.origin.line)}`}` : "",
         under
       });
     }
@@ -6041,7 +6097,7 @@ var KeyError = class extends ToolError {
 };
 
 // src/key/commands/rotate.ts
-import { existsSync as existsSync2 } from "node:fs";
+import { existsSync as existsSync3 } from "node:fs";
 import { readFile as readFile5 } from "node:fs/promises";
 import { isAbsolute as isAbsolute3, join as join2, relative as relative3, resolve as resolve7, sep as sep3 } from "node:path";
 import { parse as parseYaml } from "yaml";
@@ -6162,31 +6218,63 @@ async function planManifests(opts) {
     )
   })).filter((c) => c.externalMetadata.length > 0);
   if (local.length === 0) return [];
+  const pages = new Set(opts.pages);
+  if (opts.whole) {
+    for (const c of local) {
+      for (const m of c.externalMetadata) {
+        if (!hasPagePlaceholder(m.file)) continue;
+        for (const found of findPageManifests(m.file, opts.configDir, (rel) => isMember(c, rel))) {
+          for (const entry of found.entries) pages.add(entry.pageAbs);
+        }
+      }
+    }
+  }
   const index = await loadExternalMetadata(local, {
     configDir: opts.configDir,
-    base: opts.base
+    base: opts.base,
+    pages: [...pages]
   });
   if (index === null) return [];
   const plans = /* @__PURE__ */ new Map();
   const located = /* @__PURE__ */ new Map();
+  const locate = (collection, abs, join4) => {
+    located.set(`${collection}\0${reportedPath2(abs, opts.base)}\0${join4}`, { abs, collection });
+  };
   for (const c of local) {
     for (const m of c.externalMetadata) {
       const join4 = externalMetadataJoin(m);
-      const abs = isAbsolute3(m.file) ? m.file : resolve7(opts.configDir, m.file);
-      const file = reportedPath2(abs, opts.base);
-      located.set(`${c.name}\0${file}\0${join4}`, abs);
-      if (plans.has(abs)) continue;
-      plans.set(abs, {
-        manifest: { file, collection: c.name, rewritten: [], skipped: [], written: false },
-        path: abs,
-        text: await readFile5(abs, "utf8"),
-        changed: false
-      });
+      if (!hasPagePlaceholder(m.file)) {
+        locate(c.name, isAbsolute3(m.file) ? m.file : resolve7(opts.configDir, m.file), join4);
+        continue;
+      }
+      for (const page of pages) {
+        const resolved = pageManifestPath(m.file, opts.configDir, page);
+        if (!("outside" in resolved)) locate(c.name, resolved.abs, join4);
+      }
     }
   }
+  const planFor = async (key) => {
+    const where = located.get(key);
+    if (where === void 0) return void 0;
+    const known = plans.get(where.abs);
+    if (known !== void 0) return known;
+    const plan = {
+      manifest: {
+        file: reportedPath2(where.abs, opts.base),
+        collection: where.collection,
+        rewritten: [],
+        skipped: [],
+        written: false
+      },
+      path: where.abs,
+      text: await readFile5(where.abs, "utf8"),
+      changed: false
+    };
+    plans.set(where.abs, plan);
+    return plan;
+  };
   for (const entry of index.entries) {
-    const abs = located.get(`${entry.collection}\0${entry.file}\0${entry.join}`);
-    const plan = abs === void 0 ? void 0 : plans.get(abs);
+    const plan = await planFor(`${entry.collection}\0${entry.file}\0${entry.join}`);
     if (plan === void 0) continue;
     const data = {};
     for (const [key, supplied] of valuesOf(index, entry)) {
@@ -6295,7 +6383,9 @@ async function runKeyRotate(opts) {
     base,
     configSource: file.source,
     key: current,
-    toError: toKeyError
+    toError: toKeyError,
+    // A `{page}` manifest (0058) is read for exactly the pages rotated.
+    pages: files.map((rel) => resolve7(base, rel))
   });
   const manifests = new ManifestSet();
   const planned = [];
@@ -6358,7 +6448,9 @@ async function runKeyRotate(opts) {
     configDir: file.dir,
     base,
     fromKey,
-    toKey
+    toKey,
+    pages: files.map((rel) => resolve7(base, rel)),
+    whole: !narrowed
   });
   const reencrypted = planned.reduce((n, p) => n + p.page.rewritten.length, 0) + valueManifests.reduce((n, m) => n + m.manifest.rewritten.length, 0);
   const skipped = planned.reduce((n, p) => n + p.page.skipped.length, 0) + valueManifests.reduce((n, m) => n + m.manifest.skipped.length, 0);
@@ -6401,13 +6493,13 @@ async function runKeyRotate(opts) {
     keyWritten: outcome === "written" || outcome === "finished",
     outcome,
     ...keyFile === null ? {} : { configSource: keyFile.source },
-    baselineStale: wrote && existsSync2(baseline),
+    baselineStale: wrote && existsSync3(baseline),
     exitCode: skipped > 0 ? 1 : 0
   };
 }
 
 // src/key/commands/set.ts
-import { existsSync as existsSync3 } from "node:fs";
+import { existsSync as existsSync4 } from "node:fs";
 import { basename, dirname, join as join3, relative as relative4, resolve as resolve8 } from "node:path";
 var BAD_VALUE = "The key must be at least 32 hex or base64url characters. Run `manni key set` with no value to generate one.";
 var ENV_SET = `${ENCRYPTION_KEY_ENV} is set, so a key written to config would never be read. Unset it, or keep the key in the secret.`;
@@ -6417,7 +6509,7 @@ function refuseBesideLegacy(path, cwd) {
   const name = basename(path);
   for (const legacy of LEGACY_CONFIG_NAMES) {
     const found = join3(dir, legacy);
-    if (!existsSync3(found)) continue;
+    if (!existsSync4(found)) continue;
     const source = relative4(cwd, found).replace(/\\/g, "/");
     throw new KeyError(
       `${source} is a single-tool config; a ${name} beside it would hide it. Move its keys under meta: in ${name} first.`
@@ -6486,4 +6578,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-4HKOQIJL.js.map
+//# sourceMappingURL=chunk-CZGAZGDN.js.map