@hawkeyexl/manni 2.8.2 → 2.8.3

package/README.md

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

package/dist/{chunk-WCNU53MJ.js → chunk-DGC4CCK3.js}

@@ -35,6 +35,7 @@ import {
   hasFrontmatterFence,
   hashLines,
   hashRange,
+  heldManifest,
   isEncryptedValue,
   isErrorSeverity,
   isIgnoredByGit,
@@ -56,11 +57,13 @@ import {
   readConfigFile,
   readFamilyConfigFile,
   readManifestValue,
+  rebaseable,
   removeManifestKey,
   resolveBaselineRequest,
   resolveEncryptionKey,
   resolveTargetSet,
   selectCollections,
+  settle,
   settleBaseline,
   sliceLines,
   spellLines,
@@ -72,7 +75,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-KEW557TN.js";
+} from "./chunk-KGI7B6DD.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -2663,13 +2666,7 @@ function unifiedDiff(label, before, after) {
 }
 
 // src/cite/core/manifest.ts
-var COMMIT_ATTEMPTS = 5;
-function conflictRefusal(file) {
-  return `${file} changed under the command while it was being written. Nothing was written to it. Re-run the command.`;
-}
-function encodeValue(value) {
-  return value === void 0 ? "absent" : JSON.stringify(value);
-}
+var codec = { apply, read: readManifestValue };
 var ManifestSet = class {
   held = /* @__PURE__ */ new Map();
   /** Read a manifest, or hand back the copy this run has already rewritten. */
@@ -2683,14 +2680,7 @@ var ManifestSet = class {
       const reason = error instanceof Error ? error.message : String(error);
       throw new CiteError(`Manifest ${manifest.file} could not be read: ${reason}`);
     }
-    const fresh = {
-      path: manifest.path,
-      file: manifest.file,
-      before,
-      text: before,
-      ops: [],
-      bases: /* @__PURE__ */ new Map()
-    };
+    const fresh = heldManifest(manifest.path, manifest.file, before);
     this.held.set(manifest.path, fresh);
     return fresh;
   }
@@ -2704,11 +2694,12 @@ var ManifestSet = class {
     const op = {
       kind: "splice",
       entry,
+      key: CITATIONS_KEY2,
       join: manifest.join,
       file: manifest.file,
       value: [...citations]
     };
-    rebaseable(held, op);
+    rebaseable(held, op, codec);
     const spliced = splice(held.text, {
       entry,
       key: CITATIONS_KEY2,
@@ -2738,8 +2729,14 @@ var ManifestSet = class {
    */
   async remove(manifest, entry) {
     const held = await this.hold(manifest);
-    const op = { kind: "remove", entry, join: manifest.join, file: manifest.file };
-    rebaseable(held, op);
+    const op = {
+      kind: "remove",
+      entry,
+      key: CITATIONS_KEY2,
+      join: manifest.join,
+      file: manifest.file
+    };
+    rebaseable(held, op, codec);
     held.text = apply(held.text, op);
     held.ops.push(op);
   }
@@ -2761,7 +2758,7 @@ var ManifestSet = class {
     for (const held of this.held.values()) {
       if (held.text === held.before) continue;
       try {
-        await settle(held, write, read);
+        await settle(held, { codec, write, read, toError: (message) => new CiteError(message) });
       } catch (error) {
         if (io.onError !== void 0) await io.onError(changeOf(held), error);
         throw error;
@@ -2782,70 +2779,16 @@ function changeOf(held) {
     diff: unifiedDiff(held.file, held.before, held.text)
   };
 }
-function rebaseable(held, op) {
-  const at2 = op.join === "path" ? posix.normalize(op.entry) : op.entry;
-  if (held.bases.has(at2)) return;
-  held.bases.set(at2, {
-    entry: op.entry,
-    join: op.join,
-    value: encodeValue(
-      readManifestValue(held.before, { entry: op.entry, key: CITATIONS_KEY2, join: op.join })
-    )
-  });
-}
 function apply(text, op) {
-  if (op.kind === "splice") {
-    return splice(text, {
-      entry: op.entry,
-      key: CITATIONS_KEY2,
-      value: op.value,
-      join: op.join,
-      file: op.file
-    }).text;
-  }
+  const where = { entry: op.entry, key: op.key, join: op.join, file: op.file };
+  if (op.kind === "splice") return splice(text, { ...where, value: op.value }).text;
   try {
-    return removeManifestKey(text, {
-      entry: op.entry,
-      key: CITATIONS_KEY2,
-      join: op.join,
-      file: op.file
-    }).text;
+    return removeManifestKey(text, where).text;
   } catch (error) {
     if (error instanceof DocmetaError) throw new CiteError(error.message);
     throw error;
   }
 }
-function rebase(held, current) {
-  for (const base of held.bases.values()) {
-    const now = encodeValue(
-      readManifestValue(current, { entry: base.entry, key: CITATIONS_KEY2, join: base.join })
-    );
-    if (now !== base.value) return void 0;
-  }
-  let text = current;
-  for (const op of held.ops) text = apply(text, op);
-  return text;
-}
-async function settle(held, write, read) {
-  for (let attempt = 1; attempt <= COMMIT_ATTEMPTS; attempt++) {
-    let current;
-    try {
-      current = await read(held.path);
-    } catch (error) {
-      const reason = error instanceof Error ? error.message : String(error);
-      throw new CiteError(`Manifest ${held.file} could not be read: ${reason}`);
-    }
-    if (current === held.before) {
-      await write(held.path, held.text);
-      return;
-    }
-    const replayed = rebase(held, current);
-    if (replayed === void 0) throw new CiteError(conflictRefusal(held.file));
-    held.before = current;
-    held.text = replayed;
-  }
-  throw new CiteError(conflictRefusal(held.file));
-}
 function splice(text, options) {
   try {
     return spliceManifestValue(text, options);
@@ -6114,4 +6057,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-WCNU53MJ.js.map
+//# sourceMappingURL=chunk-DGC4CCK3.js.map