@fireproof/core 0.17.2 → 0.17.3

package/dist/node/fireproof.global.js

@@ -4136,22 +4136,6 @@ var Fireproof = (() => {
       }
     }
   };
-  var MultiBlockFetcher = class {
-    /** @type {API.BlockFetcher[]} */
-    #fetchers;
-    /** @param {API.BlockFetcher[]} fetchers */
-    constructor(...fetchers) {
-      this.#fetchers = fetchers;
-    }
-    /** @type {API.BlockFetcher['get']} */
-    async get(link2) {
-      for (const f of this.#fetchers) {
-        const v = await f.get(link2);
-        if (v)
-          return v;
-      }
-    }
-  };
 
   // ../../node_modules/.pnpm/yocto-queue@1.0.0/node_modules/yocto-queue/index.js
   var Node = class {
@@ -19034,7 +19018,7 @@ ${key.data.toString("base64")}
     return await (0, import_promises.writeFile)(path, data);
   }
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.0/node_modules/@web3-storage/pail/src/clock/index.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/clock/index.js
   var advance = async (blocks, head, event) => {
     const events = new EventFetcher(blocks);
     const headmap = new Map(head.map((cid) => [cid.toString(), cid]));
@@ -19108,7 +19092,6 @@ ${key.data.toString("base64")}
       return true;
     const [{ value: aevent }, { value: bevent }] = await Promise.all([events.get(a), events.get(b)]);
     const links3 = [...aevent.parents];
-    const seen = /* @__PURE__ */ new Set();
     while (links3.length) {
       const link2 = links3.shift();
       if (!link2)
@@ -19117,9 +19100,6 @@ ${key.data.toString("base64")}
         return true;
       if (bevent.parents.some((p) => link2.toString() === p.toString()))
         continue;
-      if (seen.has(link2.toString()))
-        continue;
-      seen.add(link2.toString());
       const { value: event } = await events.get(link2);
       links3.push(...event.parents);
     }
@@ -19160,7 +19140,7 @@ ${key.data.toString("base64")}
   };
   var shortLink = (l) => `${String(l).slice(0, 4)}..${String(l).slice(-4)}`;
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.0/node_modules/@web3-storage/pail/src/shard.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/shard.js
   var MaxKeyLength = 64;
   var MaxShardSize = 512 * 1024;
   var CID_TAG2 = new Token(Type.tag, 42);
@@ -19291,41 +19271,8 @@ ${key.data.toString("base64")}
       }
     }
   };
-  var encodedLength = (shard) => {
-    let entriesLength = 0;
-    for (const entry of shard.entries) {
-      entriesLength += entryEncodedLength(entry);
-    }
-    const tokens = [
-      new Token(Type.map, 3),
-      new Token(Type.string, "entries"),
-      new Token(Type.array, shard.entries.length),
-      new Token(Type.string, "maxKeyLength"),
-      new Token(Type.uint, shard.maxKeyLength),
-      new Token(Type.string, "maxSize"),
-      new Token(Type.uint, shard.maxSize)
-    ];
-    return tokensToLength(tokens) + entriesLength;
-  };
-  var entryEncodedLength = (entry) => {
-    const tokens = [
-      new Token(Type.array, entry.length),
-      new Token(Type.string, entry[0])
-    ];
-    if (Array.isArray(entry[1])) {
-      tokens.push(new Token(Type.array, entry[1].length));
-      for (const link2 of entry[1]) {
-        tokens.push(CID_TAG2);
-        tokens.push(new Token(Type.bytes, { length: link2.byteLength + 1 }));
-      }
-    } else {
-      tokens.push(CID_TAG2);
-      tokens.push(new Token(Type.bytes, { length: entry[1].byteLength + 1 }));
-    }
-    return tokensToLength(tokens);
-  };
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.0/node_modules/@web3-storage/pail/src/index.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/index.js
   var put = async (blocks, root2, key, value) => {
     const shards = new ShardFetcher(blocks);
     const rshard = await shards.get(root2);
@@ -19528,15 +19475,118 @@ ${key.data.toString("base64")}
     return [shard];
   };
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.0/node_modules/@web3-storage/pail/src/batch/shard.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/block.js
+  var MemoryBlockstore2 = class {
+    /** @type {Map<string, Uint8Array>} */
+    #blocks = /* @__PURE__ */ new Map();
+    /**
+     * @param {Array<import('multiformats').Block>} [blocks]
+     */
+    constructor(blocks) {
+      if (blocks) {
+        this.#blocks = new Map(blocks.map((b) => [b.cid.toString(), b.bytes]));
+      }
+    }
+    /** @type {API.BlockFetcher['get']} */
+    async get(cid) {
+      const bytes = this.#blocks.get(cid.toString());
+      if (!bytes)
+        return;
+      return { cid, bytes };
+    }
+    /**
+     * @param {API.UnknownLink} cid
+     * @param {Uint8Array} bytes
+     */
+    async put(cid, bytes) {
+      this.#blocks.set(cid.toString(), bytes);
+    }
+    /**
+     * @param {API.UnknownLink} cid
+     * @param {Uint8Array} bytes
+     */
+    putSync(cid, bytes) {
+      this.#blocks.set(cid.toString(), bytes);
+    }
+    /** @param {API.UnknownLink} cid */
+    async delete(cid) {
+      this.#blocks.delete(cid.toString());
+    }
+    /** @param {API.UnknownLink} cid */
+    deleteSync(cid) {
+      this.#blocks.delete(cid.toString());
+    }
+    *entries() {
+      for (const [str, bytes] of this.#blocks) {
+        yield { cid: parse(str), bytes };
+      }
+    }
+  };
+  var MultiBlockFetcher = class {
+    /** @type {API.BlockFetcher[]} */
+    #fetchers;
+    /** @param {API.BlockFetcher[]} fetchers */
+    constructor(...fetchers) {
+      this.#fetchers = fetchers;
+    }
+    /** @type {API.BlockFetcher['get']} */
+    async get(link2) {
+      for (const f of this.#fetchers) {
+        const v = await f.get(link2);
+        if (v)
+          return v;
+      }
+    }
+  };
+
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/batch/shard.js
+  var ShardLinkByteLength = 36;
+  var CID_TAG3 = new Token(Type.tag, 42);
   var create8 = (init2) => ({
     base: init2?.base,
     prefix: init2?.prefix ?? "",
-    entries: init2?.entries ?? [],
+    entries: [...init2?.entries ?? []],
     ...configure(init2)
   });
+  var encodedLength = (shard) => {
+    let entriesLength = 0;
+    for (const entry of shard.entries) {
+      entriesLength += entryEncodedLength(entry);
+    }
+    const tokens = [
+      new Token(Type.map, 3),
+      new Token(Type.string, "entries"),
+      new Token(Type.array, shard.entries.length),
+      new Token(Type.string, "maxKeyLength"),
+      new Token(Type.uint, shard.maxKeyLength),
+      new Token(Type.string, "maxSize"),
+      new Token(Type.uint, shard.maxSize)
+    ];
+    return tokensToLength(tokens) + entriesLength;
+  };
+  var entryEncodedLength = (entry) => {
+    const tokens = [
+      new Token(Type.array, entry.length),
+      new Token(Type.string, entry[0])
+    ];
+    if (Array.isArray(entry[1])) {
+      tokens.push(new Token(Type.array, entry[1].length));
+      for (const item of entry[1]) {
+        tokens.push(CID_TAG3);
+        if (isLink(item)) {
+          tokens.push(new Token(Type.bytes, { length: item.byteLength + 1 }));
+        } else {
+          tokens.push(new Token(Type.bytes, { length: ShardLinkByteLength + 1 }));
+        }
+      }
+    } else {
+      tokens.push(CID_TAG3);
+      tokens.push(new Token(Type.bytes, { length: entry[1].byteLength + 1 }));
+    }
+    return tokensToLength(tokens);
+  };
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.0/node_modules/@web3-storage/pail/src/batch/index.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/batch/index.js
   var Batcher = class _Batcher {
     #committed = false;
     /**
@@ -19551,7 +19601,7 @@ ${key.data.toString("base64")}
     constructor({ blocks, entries: entries3, prefix, maxSize, maxKeyLength, base: base4 }) {
       this.blocks = blocks;
       this.prefix = prefix;
-      this.entries = entries3;
+      this.entries = [...entries3];
       this.base = base4;
       this.maxSize = maxSize;
       this.maxKeyLength = maxKeyLength;
@@ -19581,7 +19631,7 @@ ${key.data.toString("base64")}
     static async create({ blocks, link: link2, prefix }) {
       const shards = new ShardFetcher(blocks);
       const base4 = await shards.get(link2);
-      return new _Batcher({ blocks, entries: base4.value.entries, prefix, base: base4, ...configure(base4.value) });
+      return new _Batcher({ blocks, prefix, base: base4, ...base4.value });
     }
   };
   var put2 = async (blocks, shard, key, value) => {
@@ -19618,7 +19668,7 @@ ${key.data.toString("base64")}
       entry = [pfxskeys[0].key, [batcher]];
     }
     shard.entries = putEntry(asShardEntries(shard.entries), asShardEntry(entry));
-    const size = encodedLength(withEntries(asShardEntries(shard.entries), shard));
+    const size = encodedLength(shard);
     if (size > shard.maxSize) {
       const common = findCommonPrefix(
         asShardEntries(shard.entries),
@@ -19655,14 +19705,16 @@ ${key.data.toString("base64")}
     }
   };
   var traverse2 = async (shards, key, shard) => {
-    for (const e of shard.entries) {
-      const [k, v] = e;
+    for (let i = 0; i < shard.entries.length; i++) {
+      const [k, v] = shard.entries[i];
       if (key <= k)
         break;
       if (key.startsWith(k) && Array.isArray(v)) {
         if (isShardLink(v[0])) {
           const blk = await shards.get(v[0], shard.prefix + k);
-          v[0] = create8({ base: blk, prefix: blk.prefix, ...blk.value });
+          const batcher = create8({ base: blk, prefix: blk.prefix, ...blk.value });
+          shard.entries[i] = [k, v[1] == null ? [batcher] : [batcher, v[1]]];
+          return traverse2(shards, key.slice(k.length), batcher);
         }
         return traverse2(shards, key.slice(k.length), v[0]);
       }
@@ -19716,9 +19768,9 @@ ${key.data.toString("base64")}
     static code = "ERR_BATCH_COMMITTED";
   };
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.0/node_modules/@web3-storage/pail/src/crdt/index.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/crdt/index.js
   var put3 = async (blocks, head, key, value) => {
-    const mblocks = new MemoryBlockstore();
+    const mblocks = new MemoryBlockstore2();
     blocks = new MultiBlockFetcher(mblocks, blocks);
     if (!head.length) {
       const shard = await ShardBlock.create();
@@ -19802,7 +19854,7 @@ ${key.data.toString("base64")}
   var root = async (blocks, head) => {
     if (!head.length)
       throw new Error("cannot determine root of headless clock");
-    const mblocks = new MemoryBlockstore();
+    const mblocks = new MemoryBlockstore2();
     blocks = new MultiBlockFetcher(mblocks, blocks);
     const events = new EventFetcher(blocks);
     if (head.length === 1) {
@@ -19861,7 +19913,7 @@ ${key.data.toString("base64")}
       return;
     const result = await root(blocks, head);
     if (result.additions.length) {
-      blocks = new MultiBlockFetcher(new MemoryBlockstore(result.additions), blocks);
+      blocks = new MultiBlockFetcher(new MemoryBlockstore2(result.additions), blocks);
     }
     return get2(blocks, result.root, key);
   };
@@ -19870,7 +19922,7 @@ ${key.data.toString("base64")}
       return;
     const result = await root(blocks, head);
     if (result.additions.length) {
-      blocks = new MultiBlockFetcher(new MemoryBlockstore(result.additions), blocks);
+      blocks = new MultiBlockFetcher(new MemoryBlockstore2(result.additions), blocks);
     }
     yield* entries(blocks, result.root, options);
   };
@@ -19954,7 +20006,7 @@ ${key.data.toString("base64")}
     return acc.concat(...rest);
   };
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.0/node_modules/@web3-storage/pail/src/crdt/batch/index.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/crdt/batch/index.js
   var Batcher2 = class _Batcher {
     #committed = false;
     /**
@@ -19973,7 +20025,7 @@ ${key.data.toString("base64")}
       this.blocks = blocks;
       this.head = head;
       this.prefix = prefix;
-      this.entries = entries3;
+      this.entries = [...entries3];
       this.base = base4;
       this.maxSize = maxSize;
       this.maxKeyLength = maxKeyLength;
@@ -19999,7 +20051,7 @@ ${key.data.toString("base64")}
       const res = await commit(this);
       const data = { type: "batch", ops: this.ops, root: res.root };
       const event = await EventBlock.create(data, this.head);
-      const mblocks = new MemoryBlockstore();
+      const mblocks = new MemoryBlockstore2();
       const blocks = new MultiBlockFetcher(mblocks, this.blocks);
       mblocks.putSync(event.cid, event.bytes);
       const head = await advance(blocks, this.head, event.cid);
@@ -20039,7 +20091,7 @@ ${key.data.toString("base64")}
      * @param {string} init.prefix
      */
     static async create({ blocks, head, prefix }) {
-      const mblocks = new MemoryBlockstore();
+      const mblocks = new MemoryBlockstore2();
       blocks = new MultiBlockFetcher(mblocks, blocks);
       if (!head.length) {
         const base5 = await ShardBlock.create();
@@ -28480,10 +28532,8 @@ ${key.data.toString("base64")}
 
   // src/crdt-helpers.ts
   function time(tag2) {
-    console.time(tag2);
   }
   function timeEnd(tag2) {
-    console.timeEnd(tag2);
   }
   async function applyBulkUpdateToCrdt(tblocks, head, updates) {
     let result = null;
@@ -29531,7 +29581,7 @@ ${key.data.toString("base64")}
       try {
         head = await advance(tblocks, head, cid);
       } catch (e) {
-        console.error("failed to advance", cid.toString(), e);
+        console.log("failed to advance head:", cid.toString());
         continue;
       }
     }