@fireproof/core 0.20.0-dev-preview-19 → 0.20.0-dev-preview-21

package/deno.json

@@ -1,8 +1,13 @@
 {
   "imports": {
     "@fireproof/core": "./index.js",
-    "@adviser/cement": "npm:@adviser/cement@^0.3.5",
-    "@fireproof/vendor": "npm:@fireproof/vendor@^1.0.4",
+    "@ipld/car": "npm:@ipld/car@^5.4.0",
+    "@ipld/dag-cbor": "npm:@ipld/dag-cbor@^9.2.2",
+    "@ipld/dag-json": "npm:@ipld/dag-json@^10.2.3",
+    "@fireproof/vendor": "npm:@fireproof/vendor@^1.1.0-dev",
+    "cborg": "npm:cborg@^4.2.8",
+    "ipfs-unixfs-exporter": "npm:ipfs-unixfs-exporter@^13.6.1",
+    "@adviser/cement": "npm:@adviser/cement@^0.3.8",
     "multiformats": "npm:multiformats@^13.3.1",
     "@ipld/unixfs": "npm:@ipld/unixfs@^3.0.0",
     "charwise": "npm:charwise@^3.0.1",

package/index.cjs

@@ -516,7 +516,7 @@ var UnixFS = __toESM(require("@ipld/unixfs"), 1);
 var raw = __toESM(require("multiformats/codecs/raw"), 1);
 var import_fixed = require("@ipld/unixfs/file/chunker/fixed");
 var import_balanced = require("@ipld/unixfs/file/layout/balanced");
-var import_ipfs_unixfs_exporter = require("@fireproof/vendor/ipfs-unixfs-exporter");
+var import_ipfs_unixfs_exporter = require("ipfs-unixfs-exporter");
 var queuingStrategy = UnixFS.withCapacity();
 var settings = UnixFS.configure({
   fileChunkEncoder: raw,
@@ -784,9 +784,9 @@ var keyBagProviderFactories = new Map(
       }
     },
     {
-      protocol: "indexdb:",
+      protocol: "indexeddb:",
       factory: async (url, sthis) => {
-        const { KeyBagProviderImpl } = await import("@fireproof/core/indexdb");
+        const { KeyBagProviderImpl } = await import("@fireproof/core/indexeddb");
         return new KeyBagProviderImpl(url, sthis);
       }
     },
@@ -809,7 +809,7 @@ function defaultKeyBagUrl(sthis) {
   let bagFnameOrUrl = sthis.env.get("FP_KEYBAG_URL");
   let url;
   if ((0, import_cement4.runtimeFn)().isBrowser) {
-    url = import_cement4.URI.from(bagFnameOrUrl || "indexdb://fp-keybag");
+    url = import_cement4.URI.from(bagFnameOrUrl || "indexeddb://fp-keybag");
   } else {
     if (!bagFnameOrUrl) {
       const home = sthis.env.get("HOME");
@@ -836,7 +836,7 @@ function defaultKeyBagOpts(sthis, kbo) {
   } else {
     let bagFnameOrUrl = sthis.env.get("FP_KEYBAG_URL");
     if ((0, import_cement4.runtimeFn)().isBrowser) {
-      url = import_cement4.URI.from(bagFnameOrUrl || "indexdb://fp-keybag");
+      url = import_cement4.URI.from(bagFnameOrUrl || "indexeddb://fp-keybag");
     } else {
       if (!bagFnameOrUrl) {
         const home = sthis.env.get("HOME");
@@ -880,8 +880,8 @@ var import_cement10 = require("@adviser/cement");
 // src/runtime/gateways/file/version.ts
 var FILESTORE_VERSION = "v0.19-file";
 
-// src/runtime/gateways/indexdb-version.ts
-var INDEXDB_VERSION = "v0.19-indexdb";
+// src/runtime/gateways/indexeddb-version.ts
+var INDEXEDDB_VERSION = "v0.19-indexeddb";
 
 // src/runtime/gateways/file/gateway-impl.ts
 var import_cement5 = require("@adviser/cement");
@@ -1103,7 +1103,7 @@ var import_clock = require("@fireproof/vendor/@web3-storage/pail/clock");
 var import_base64 = require("multiformats/bases/base64");
 var import_multiformats = require("multiformats");
 var import_link = require("multiformats/link");
-var import_dag_json = require("@fireproof/vendor/@ipld/dag-json");
+var import_dag_json = require("@ipld/dag-json");
 async function dbMetaEvent2Serialized(sthis, dbEvents) {
   return await Promise.all(
     dbEvents.map(async (dbEvent) => {
@@ -1270,7 +1270,7 @@ var DefSerdeGateway = class {
     const ret = this.gw.put(url, rUint8.Ok(), sthis);
     if (env.type === "meta" /* META */) {
       if (this.subscribeFn.has(url.toString())) {
-        this.subscribeFn.get(url.toString())(env);
+        this.subscribeFn.get(url.toString())(rUint8.Ok());
       }
     }
     return ret;
@@ -1281,22 +1281,22 @@ var DefSerdeGateway = class {
     return fpDeserialize(sthis, url, res, decoder);
   }
   async subscribe({ loader: { sthis }, decoder }, url, callback) {
+    function rawCallback(raw2) {
+      return fpDeserialize(sthis, url, import_cement9.Result.Ok(raw2), decoder).then((res) => {
+        if (res.isErr()) {
+          sthis.logger.Error().Err(res).Msg("Failed to deserialize");
+          return;
+        }
+        callback(res.Ok());
+      });
+    }
     if (!this.gw.subscribe) {
-      this.subscribeFn.set(url.toString(), callback);
+      this.subscribeFn.set(url.toString(), rawCallback);
       return import_cement9.Result.Ok(() => {
         this.subscribeFn.delete(url.toString());
       });
     }
-    const unreg = await this.gw.subscribe(
-      url,
-      (raw2) => {
-        fpDeserialize(sthis, url, import_cement9.Result.Ok(raw2), decoder).then((res) => {
-          if (res.isErr()) return;
-          callback(res.Ok());
-        });
-      },
-      sthis
-    );
+    const unreg = await this.gw.subscribe(url, rawCallback, sthis);
     return unreg;
   }
   async delete({ loader: { sthis } }, url) {
@@ -1384,13 +1384,13 @@ if ((0, import_cement10.runtimeFn)().isNodeIsh || (0, import_cement10.runtimeFn)
 }
 if ((0, import_cement10.runtimeFn)().isBrowser) {
   registerStoreProtocol({
-    protocol: "indexdb:",
+    protocol: "indexeddb:",
     isDefault: true,
     defaultURI: () => {
-      return import_cement10.BuildURI.from("indexdb://").pathname("fp").setParam("version" /* VERSION */, INDEXDB_VERSION).setParam("runtime" /* RUNTIME */, "browser").URI();
+      return import_cement10.BuildURI.from("indexeddb://").pathname("fp").setParam("version" /* VERSION */, INDEXEDDB_VERSION).setParam("runtime" /* RUNTIME */, "browser").URI();
     },
     gateway: async () => {
-      const { GatewayImpl } = await import("@fireproof/core/indexdb");
+      const { GatewayImpl } = await import("@fireproof/core/indexeddb");
       return new GatewayImpl();
     }
   });
@@ -1480,7 +1480,7 @@ async function createUnsafe({
 
 // src/indexer-helpers.ts
 var import_sha2 = require("multiformats/hashes/sha2");
-var codec = __toESM(require("@fireproof/vendor/@ipld/dag-cbor"), 1);
+var codec = __toESM(require("@ipld/dag-cbor"), 1);
 var import_charwise = __toESM(require("charwise"), 1);
 var DbIndex = __toESM(require("prolly-trees/db-index"), 1);
 var import_utils8 = require("prolly-trees/utils");
@@ -1989,12 +1989,12 @@ var import_cement15 = require("@adviser/cement");
 
 // src/blockstore/loader.ts
 var import_p_limit = __toESM(require("p-limit"), 1);
-var import_reader = require("@fireproof/vendor/@ipld/car/reader");
+var import_reader = require("@ipld/car/reader");
 var import_cement13 = require("@adviser/cement");
 
 // src/blockstore/loader-helpers.ts
 var import_sha22 = require("multiformats/hashes/sha2");
-var dagCodec = __toESM(require("@fireproof/vendor/@ipld/dag-cbor"), 1);
+var dagCodec = __toESM(require("@ipld/dag-cbor"), 1);
 async function parseCarFile(reader, logger) {
   const roots = await reader.getRoots();
   const header = await reader.get(roots[0]);
@@ -2281,9 +2281,9 @@ var CommitQueue = class {
 };
 
 // src/blockstore/commitor.ts
-var CBW = __toESM(require("@fireproof/vendor/@ipld/car/buffer-writer"), 1);
+var CBW = __toESM(require("@ipld/car/buffer-writer"), 1);
 var import_sha23 = require("multiformats/hashes/sha2");
-var dagCodec2 = __toESM(require("@fireproof/vendor/@ipld/dag-cbor"), 1);
+var dagCodec2 = __toESM(require("@ipld/dag-cbor"), 1);
 async function encodeCarFile(roots, t, codec3) {
   let size = 0;
   const headerSize = CBW.headerLength({ roots });
@@ -2762,7 +2762,7 @@ var Loader = class {
     let loadedCar = void 0;
     let activeStore = local;
     try {
-      this.logger.Debug().Str("cid", cidsString).Msg("loading car");
+      this.logger.Debug().Any("cid", cidsString).Msg("loading car");
       loadedCar = await local.load(cid);
       this.logger.Debug().Bool("loadedCar", loadedCar).Msg("loaded");
     } catch (e) {
@@ -2819,7 +2819,7 @@ __export(keyed_crypto_exports, {
 });
 var import_base583 = require("multiformats/bases/base58");
 var import_sha25 = require("multiformats/hashes/sha2");
-var CBOR = __toESM(require("@fireproof/vendor/cborg"), 1);
+var CBOR = __toESM(require("cborg"), 1);
 var generateIV = {
   random: {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -2985,7 +2985,7 @@ async function keyedCryptoFactory(url, kb, sthis) {
 
 // src/blockstore/store.ts
 var import_clock2 = require("@fireproof/vendor/@web3-storage/pail/clock");
-var import_dag_json2 = require("@fireproof/vendor/@ipld/dag-json");
+var import_dag_json2 = require("@ipld/dag-json");
 var import_p_retry = __toESM(require("p-retry"), 1);
 var import_p_map = __toESM(require("p-map"), 1);
 
@@ -3836,7 +3836,7 @@ var ConnectionBase = class {
 // src/crdt-helpers.ts
 var import_link2 = require("multiformats/link");
 var import_sha26 = require("multiformats/hashes/sha2");
-var codec2 = __toESM(require("@fireproof/vendor/@ipld/dag-cbor"), 1);
+var codec2 = __toESM(require("@ipld/dag-cbor"), 1);
 var import_crdt = require("@fireproof/vendor/@web3-storage/pail/crdt");
 var import_clock3 = require("@fireproof/vendor/@web3-storage/pail/clock");
 var Batch = __toESM(require("@fireproof/vendor/@web3-storage/pail/crdt/batch"), 1);
@@ -4657,7 +4657,7 @@ function fireproof(name, opts) {
 var runtime_exports = {};
 __export(runtime_exports, {
   FILESTORE_VERSION: () => FILESTORE_VERSION,
-  INDEXDB_VERSION: () => INDEXDB_VERSION,
+  INDEXEDDB_VERSION: () => INDEXEDDB_VERSION,
   KeyBag: () => KeyBag,
   defaultKeyBagOpts: () => defaultKeyBagOpts,
   defaultKeyBagUrl: () => defaultKeyBagUrl,
@@ -4707,6 +4707,6 @@ __export(file_exports, {
 
 // src/version.ts
 var PACKAGE_VERSION = Object.keys({
-  "0.20.0-dev-preview-19": "xxxx"
+  "0.20.0-dev-preview-21": "xxxx"
 })[0];
 //# sourceMappingURL=index.cjs.map