@hawkeyexl/manni 4.0.2 → 4.0.3

package/README.md

@@ -102,7 +102,7 @@ actually reads rather than hand-written:
 ```yaml
 repos:
   - repo: https://github.com/hawkeyexl/manni
-    rev: v4.0.2
+    rev: v4.0.3
     hooks:
       - id: manni-meta
 ```

package/dist/{chunk-KSH7XS2R.js → chunk-DEP5AMVA.js}

@@ -63,7 +63,7 @@ import {
   terminalConfirm,
   toJsonText,
   warn
-} from "./chunk-TK5PYPFU.js";
+} from "./chunk-TQG3WCJY.js";
 
 // src/meta/cli.ts
 import { existsSync } from "node:fs";
@@ -1533,4 +1533,4 @@ export {
   reportConfig,
   buildProgram
 };
-//# sourceMappingURL=chunk-KSH7XS2R.js.map
+//# sourceMappingURL=chunk-DEP5AMVA.js.map

package/dist/{chunk-L26XRFBJ.js → chunk-JYRY7SKD.js}

@@ -90,7 +90,7 @@ import {
   writeEncryptionKey,
   writeFileAtomic,
   writeTextAtomic
-} from "./chunk-TK5PYPFU.js";
+} from "./chunk-TQG3WCJY.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -13905,4 +13905,4 @@ export {
   renderTemplates,
   renderTools
 };
-//# sourceMappingURL=chunk-L26XRFBJ.js.map
+//# sourceMappingURL=chunk-JYRY7SKD.js.map

package/dist/{chunk-TK5PYPFU.js → chunk-TQG3WCJY.js}

@@ -8,7 +8,7 @@ var __export = (target, all) => {
 // package.json
 var package_default = {
   name: "@hawkeyexl/manni",
-  version: "4.0.2",
+  version: "4.0.3",
   description: "One command line for documentation that is meant to be checked. `manni meta` validates the presence and format of document metadata (Markdown frontmatter and more) against JSON Schema, built for CI. Formerly docmeta.",
   type: "module",
   bin: {
@@ -14684,15 +14684,24 @@ async function deriveFromGit(inputs, opts) {
       continue;
     }
     try {
-      const histories = bucket.length <= threshold ? await perFileHistories(run2, bucket) : await bulkHistories(run2, bucket);
-      if (histories === null) {
+      const found = await histories(
+        run2,
+        bucket.map((e) => e.rel),
+        threshold
+      );
+      if (found === null) {
+        reasons.push(`git could not read the history at ${root}`);
+        continue;
+      }
+      await readOtherParentBlobs(run2, found);
+      const blobs = await fetchBlobs(run2, neededBlobs(found));
+      if (!await followTakenBodies(run2, bucket, found, blobs, threshold)) {
         reasons.push(`git could not read the history at ${root}`);
         continue;
       }
-      const blobs = await fetchBlobs(run2, neededBlobs(histories));
-      const manifestStamps = await stampsInManifests(run2, root, bucket, histories, blobs);
+      const manifestStamps = await stampsInManifests(run2, root, bucket, found, blobs);
       for (const entry of bucket) {
-        const history = histories.get(entry.rel) ?? [];
+        const history = found.get(entry.rel) ?? [];
         const facts = judge(
           entry.input,
           root,
@@ -14753,7 +14762,7 @@ function groupByRoot(inputs) {
   }
   return byRoot;
 }
-var RECORD_FORMAT = "--format=%x1e%H%x00%aI%x00%an%x00%ae%x00%(trailers:key=Co-authored-by,valueonly,unfold,separator=%x1f)%x00%(trailers:key=Reviewed-by,valueonly,unfold,separator=%x1f)%x00%(trailers:key=Generated-by,valueonly,unfold,separator=%x1f)";
+var RECORD_FORMAT = "--format=%x1e%H%x00%aI%x00%an%x00%ae%x00%(trailers:key=Co-authored-by,valueonly,unfold,separator=%x1f)%x00%(trailers:key=Reviewed-by,valueonly,unfold,separator=%x1f)%x00%(trailers:key=Generated-by,valueonly,unfold,separator=%x1f)%x00%P";
 var LOG_ARGS = [
   "-c",
   "core.quotePath=false",
@@ -14764,31 +14773,70 @@ var LOG_ARGS = [
   "--no-abbrev",
   RECORD_FORMAT
 ];
-async function perFileHistories(run2, bucket) {
-  const histories = /* @__PURE__ */ new Map();
-  for (const entry of bucket) {
-    const out = await run2([...LOG_ARGS, "--follow", "--", pathspec(entry.rel)]);
+function histories(run2, rels, threshold, rev = "HEAD") {
+  return rels.length <= threshold ? perFileHistories(run2, rels, rev) : bulkHistories(run2, rels, rev);
+}
+async function perFileHistories(run2, rels, rev) {
+  const found = /* @__PURE__ */ new Map();
+  for (const rel of rels) {
+    const out = await run2([...LOG_ARGS, rev, "--follow", "--", pathspec(rel)]);
     if (out.tooLarge) throw new HistoryTooLarge();
     if (out.code !== 0) {
-      if (await isUnbornHead(run2)) return histories;
+      if (await isUnbornHead(run2)) return found;
       return null;
     }
-    const attributed = attribute(parseLog(text(out)), [entry.rel]);
-    histories.set(entry.rel, attributed.get(entry.rel) ?? []);
+    const attributed = attribute(parseLog(text(out)), [rel]);
+    found.set(rel, attributed.get(rel) ?? []);
   }
-  return histories;
+  return found;
 }
-async function bulkHistories(run2, bucket) {
-  const out = await run2(LOG_ARGS);
+async function bulkHistories(run2, rels, rev) {
+  const out = await run2([...LOG_ARGS, rev]);
   if (out.tooLarge) throw new HistoryTooLarge();
   if (out.code !== 0) {
     if (await isUnbornHead(run2)) return /* @__PURE__ */ new Map();
     return null;
   }
-  return attribute(
-    parseLog(text(out)),
-    bucket.map((e) => e.rel)
-  );
+  return attribute(parseLog(text(out)), [...rels]);
+}
+async function followTakenBodies(run2, bucket, found, blobs, threshold) {
+  for (; ; ) {
+    const byParent = /* @__PURE__ */ new Map();
+    for (const entry of bucket) {
+      const history = found.get(entry.rel) ?? [];
+      const taken = takenMerge(entry.input.extracted.fenced, history, blobs);
+      if (taken === void 0) continue;
+      const group = byParent.get(taken.parent) ?? [];
+      group.push({ rel: entry.rel, keep: history.slice(0, taken.index), path: taken.path });
+      byParent.set(taken.parent, group);
+    }
+    if (byParent.size === 0) return true;
+    const walked = /* @__PURE__ */ new Map();
+    for (const [parent, group] of byParent) {
+      const paths = [...new Set(group.map((g) => g.path))];
+      const side = await histories(run2, paths, threshold, parent);
+      if (side === null) return false;
+      for (const g of group) {
+        const tail = side.get(g.path) ?? [];
+        walked.set(g.rel, tail);
+        found.set(g.rel, [...g.keep, ...tail]);
+      }
+    }
+    await readOtherParentBlobs(run2, walked);
+    const missing = new Set([...neededBlobs(walked)].filter((sha) => !blobs.has(sha)));
+    for (const [sha, content] of await fetchBlobs(run2, missing)) blobs.set(sha, content);
+  }
+}
+function takenMerge(fenced, history, blobs) {
+  const blobBody = (sha) => sha === null ? null : bodyOf(blobs.get(sha) ?? "", fenced);
+  const index = history.findIndex((h) => !sameBody(blobBody(h.newBlob), blobBody(h.oldBlob)));
+  const newest = history[index];
+  if (newest === void 0) return void 0;
+  const body = blobBody(newest.newBlob);
+  const k = newest.otherParentBlobs.findIndex((b) => b !== null && sameBody(body, blobBody(b)));
+  const parent = newest.otherParents[k];
+  if (k === -1 || parent === void 0) return void 0;
+  return { index, parent, path: newest.pathAtCommit };
 }
 function pathspec(rel) {
   return /[*?[\]]/.test(rel) ? `:(literal)${rel}` : rel;
@@ -14821,6 +14869,7 @@ function parseLog(text2) {
       coAuthors: splitTrailers(fields[4]),
       reviewedBy: splitTrailers(fields[5]),
       generatedBy: splitTrailers(fields[6]),
+      parents: (fields[7] ?? "").trim().split(" ").filter((p) => p !== ""),
       raw
     });
   }
@@ -14891,10 +14940,10 @@ function unquotePath(p) {
   return Buffer.from(bytes).toString("utf8");
 }
 function attribute(records, wanted) {
-  const histories = /* @__PURE__ */ new Map();
+  const histories2 = /* @__PURE__ */ new Map();
   const tracked = /* @__PURE__ */ new Map();
   for (const rel of wanted) {
-    histories.set(rel, []);
+    histories2.set(rel, []);
     tracked.set(rel, rel);
   }
   for (const record of records) {
@@ -14904,7 +14953,7 @@ function attribute(records, wanted) {
     for (const [rel, current] of tracked) {
       const entry = byNewPath.get(current);
       if (!entry) continue;
-      histories.get(rel)?.push({
+      histories2.get(rel)?.push({
         sha: record.sha,
         authorDate: record.authorDate,
         authorName: record.authorName,
@@ -14914,23 +14963,52 @@ function attribute(records, wanted) {
         generatedBy: record.generatedBy,
         oldBlob: entry.oldBlob === NULL_SHA ? null : entry.oldBlob,
         newBlob: entry.newBlob === NULL_SHA ? null : entry.newBlob,
-        pathAtCommit: entry.newPath
+        pathAtCommit: entry.newPath,
+        otherParents: record.parents.slice(1),
+        otherParentBlobs: []
       });
       if (entry.oldPath !== entry.newPath) tracked.set(rel, entry.oldPath);
     }
   }
-  return histories;
+  return histories2;
 }
-function neededBlobs(histories) {
+function neededBlobs(histories2) {
   const shas = /* @__PURE__ */ new Set();
-  for (const history of histories.values()) {
+  for (const history of histories2.values()) {
     for (const h of history) {
       if (h.oldBlob !== null) shas.add(h.oldBlob);
       if (h.newBlob !== null) shas.add(h.newBlob);
+      for (const b of h.otherParentBlobs) if (b !== null) shas.add(b);
     }
   }
   return shas;
 }
+async function readOtherParentBlobs(run2, histories2) {
+  const merges = [];
+  const specs = [];
+  for (const history of histories2.values()) {
+    for (const h of history) {
+      if (h.otherParents.length === 0) continue;
+      merges.push(h);
+      for (const parent of h.otherParents) specs.push(`${parent}:${h.pathAtCommit}`);
+    }
+  }
+  if (specs.length === 0) return;
+  const out = await run2(["cat-file", "--batch-check"], `${specs.join("\n")}
+`);
+  if (out.tooLarge) throw new HistoryTooLarge();
+  if (out.code !== 0) throw new BlobsUnreadable(`exit ${String(out.code)}`);
+  const lines = text(out).split("\n");
+  let i = 0;
+  for (const h of merges) {
+    h.otherParentBlobs = h.otherParents.map(() => blobOfCheckLine(lines[i++]));
+  }
+}
+function blobOfCheckLine(line) {
+  const [sha, kind] = (line ?? "").split(" ");
+  if (sha === void 0 || kind !== "blob" || !/^[0-9a-f]{40,64}$/.test(sha)) return null;
+  return sha;
+}
 async function fetchBlobs(run2, shas) {
   const blobs = /* @__PURE__ */ new Map();
   if (shas.size === 0) return blobs;
@@ -14964,19 +15042,23 @@ var git = (value, evidence) => ({
 function factCommits(input, history, blobs) {
   const fenced = input.extracted.fenced;
   const blobBody = (sha) => sha === null ? null : bodyOf(blobs.get(sha) ?? "", fenced);
-  const bodyChanging = [...history].reverse().filter((h) => !sameBody(blobBody(h.newBlob), blobBody(h.oldBlob)));
+  const bodyChanging = [...history].reverse().filter((h) => {
+    const body = blobBody(h.newBlob);
+    if (sameBody(body, blobBody(h.oldBlob))) return false;
+    return !h.otherParentBlobs.some((b) => b !== null && sameBody(body, blobBody(b)));
+  });
   return {
     bodyChanging,
     oldest: history[history.length - 1],
     newestBody: bodyChanging[bodyChanging.length - 1]
   };
 }
-async function stampsInManifests(run2, root, bucket, histories, blobs) {
+async function stampsInManifests(run2, root, bucket, histories2, blobs) {
   const reads = [];
   for (const entry of bucket) {
     const refs = entry.input.stampManifests;
     if (refs === void 0) continue;
-    const { oldest, newestBody } = factCommits(entry.input, histories.get(entry.rel) ?? [], blobs);
+    const { oldest, newestBody } = factCommits(entry.input, histories2.get(entry.rel) ?? [], blobs);
     for (const field of STAMPED_DATE_FIELDS) {
       const ref = refs[field];
       const at2 = field === "created" ? oldest : newestBody;
@@ -25113,4 +25195,4 @@ export {
   renderQuery,
   renderQueryCsv
 };
-//# sourceMappingURL=chunk-TK5PYPFU.js.map
+//# sourceMappingURL=chunk-TQG3WCJY.js.map