@hawkeyexl/manni 2.10.0 → 2.10.2

package/README.md

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

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

@@ -75,7 +75,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-ROAPSWWB.js";
+} from "./chunk-KJLPOY2I.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -3488,6 +3488,15 @@ async function commitFor(opts) {
   if (client === void 0 || !await client.available()) return void 0;
   return await client.head() ?? void 0;
 }
+async function assertCommitHolds(opts, commit, path, range, pin, key) {
+  const client = opts.gitClient;
+  if (client === void 0 || !await client.available()) return;
+  const history = await historyOf(client, commit, path, range, pin, key, void 0);
+  if (history.kind !== "never-true") return;
+  throw new CiteError(
+    `${opts.src} is not committed: ${commit.slice(0, 7)} does not contain those lines. Commit the source, or use --no-commit-sha.`
+  );
+}
 function refusalFor(reason, path, encrypted) {
   switch (reason) {
     case "untracked":
@@ -3521,7 +3530,11 @@ async function mintCitation(opts) {
   const file = pinKey !== void 0 && !range.encrypted ? encryptSourcePath(read.resolvedPath, pinKey) : range.path;
   const lines = rangeLines(range);
   const commitSha = await commitFor(opts);
-  const source = { file, integrity: hashLines(joined, pinKey) };
+  const integrity = hashLines(joined, pinKey);
+  if (commitSha !== void 0) {
+    await assertCommitHolds(opts, commitSha, read.resolvedPath, range, integrity, pinKey);
+  }
+  const source = { file, integrity };
   const ordered = {
     file: source.file,
     ...lines === void 0 ? {} : { lines },
@@ -4505,8 +4518,11 @@ function settles(plan) {
     // refusal prints, so it is not also reported as skipped.
     case "claim-replaced":
       return "claim-changed";
-    // A shifted entry was `current`, so it had no finding to settle.
+    // A shifted entry was `current`, so it had no finding to settle. A
+    // re-committed one was `current` too: `check` never reported it, which is
+    // why the repair is asked for rather than offered.
     case "claim-shifted":
+    case "source-recommitted":
       return "";
   }
 }
@@ -4544,6 +4560,8 @@ function apply2(content, format, plan) {
       }
       return out;
     }
+    case "source-recommitted":
+      return spliceEntryField(content, format, index, ["source", "commit-sha"], plan.commitSha);
     case "claim-accepted": {
       let out = spliceEntryField(content, format, index, ["claim", "integrity"], plan.pin);
       if (plan.lines !== void 0) {
@@ -4612,6 +4630,12 @@ function applyToEntry(entry, plan) {
       if (plan.commitSha !== void 0) source["commit-sha"] = plan.commitSha;
       return true;
     }
+    case "source-recommitted": {
+      const source = end("source");
+      if (source === void 0) return false;
+      source["commit-sha"] = plan.commitSha;
+      return true;
+    }
     case "claim-accepted": {
       const claim = end("claim");
       if (claim === void 0) return false;
@@ -4728,6 +4752,19 @@ function rewriteOf(plan) {
         from: source.src,
         to: plan.to
       };
+    case "source-recommitted":
+      return {
+        ...base,
+        end: "source",
+        reason: "recommitted",
+        // The source itself held. Only its date was wrong.
+        status: "current",
+        from: plan.from,
+        to: plan.commitSha,
+        fromCommit: plan.from,
+        toCommit: plan.commitSha,
+        src: source.src
+      };
     case "claim-accepted": {
       const was = citation.claim?.integrity ?? "";
       const out = {
@@ -4927,6 +4964,26 @@ async function runUpdate(opts) {
   const writes = new WrittenFiles();
   const only = opts.only !== void 0 && opts.only.length > 0 ? new Set(opts.only) : void 0;
   const accept = opts.accept === true;
+  const recommit = opts.recommit === true;
+  if (recommit && !await git.available()) {
+    throw new CiteError(
+      "--recommit needs git to verify recorded commits, and git is not available here."
+    );
+  }
+  const recommitFor = async (result) => {
+    const recorded = result.citation.source["commit-sha"];
+    const path = result.source.resolvedPath;
+    if (recorded === void 0 || path === void 0) return void 0;
+    const range = sourceRange(result.citation.source);
+    const pin = result.citation.source.integrity;
+    const key = range.encrypted ? run3.key : void 0;
+    const was = await historyOf(git, recorded, path, range, pin, key, void 0);
+    if (was.kind !== "never-true") return void 0;
+    const head = await git.head();
+    if (head === null || head === recorded) return void 0;
+    const now = await historyOf(git, head, path, range, pin, key, void 0);
+    return now.kind === "original" ? head : void 0;
+  };
   const plansFor = async (result, entry, page, lines, lineNow, declined) => {
     const out = [];
     const claim = result.claim;
@@ -5018,6 +5075,17 @@ async function runUpdate(opts) {
         }
       }
     }
+    if (recommit && result.source.status === "current") {
+      const to = await recommitFor(result);
+      if (to !== void 0) {
+        out.push({
+          kind: "source-recommitted",
+          result,
+          from: result.citation.source["commit-sha"] ?? "",
+          commitSha: to
+        });
+      }
+    }
     if (!accept) return out;
     if (claim !== null && claim.status === "changed" && entry !== void 0 && result.anchor !== "marker") {
       const held = claim.fileLines === void 0 ? void 0 : parseLines(claim.fileLines);
@@ -5753,6 +5821,11 @@ function rewriteLine(rewrite) {
   if (rewrite.end === "marker") {
     return `marker line ${rewrite.from} -> ${rewrite.to} (misplaced)`;
   }
+  if (rewrite.reason === "recommitted") {
+    const from = shortCommit(rewrite.fromCommit ?? "");
+    const to = shortCommit(rewrite.toCommit ?? "");
+    return `source ${shortSrc(rewrite.src ?? "")} commit ${from} -> ${to} (did not contain the pinned lines)`;
+  }
   if (rewrite.reason === "shifted") {
     return `claim ${word} ${rewrite.from} -> ${rewrite.to} (shifted by a marker)`;
   }
@@ -6413,4 +6486,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-FHRU3GN6.js.map
+//# sourceMappingURL=chunk-4HKOQIJL.js.map