@fireproof/core 0.20.0-dev-preview-62 → 0.20.0

package/deno.json

@@ -1,11 +1,11 @@
 {
   "imports": {
     "@fireproof/core": "./index.js",
-    "@adviser/cement": "npm:@adviser/cement@~0.4.7",
-    "@fireproof/vendor": "npm:@fireproof/vendor@~2.0.2",
+    "@adviser/cement": "npm:@adviser/cement@~0.4.10",
     "@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",
+    "@web3-storage/pail": "npm:@web3-storage/pail@^0.6.2",
     "cborg": "npm:cborg@^4.2.9",
     "jose": "npm:jose@^6.0.10",
     "multiformats": "npm:multiformats@^13.3.2",

package/index.cjs

@@ -84,7 +84,7 @@ var import_cement = require("@adviser/cement");
 
 // src/types.ts
 function isFalsy(value) {
-  return value === false || value === null || value === void 0;
+  return value === false && value === null && value === void 0;
 }
 var PARAM = {
   SUFFIX: "suffix",
@@ -112,8 +112,7 @@ var PARAM = {
   CAR_CACHE_SIZE: "carCacheSize",
   CAR_COMPACT_CACHE_SIZE: "carCompactCacheSize",
   CAR_META_CACHE_SIZE: "carMetaCacheSize",
-  GENESIS_CID: "baembeiarootfireproofgenesisblockaaaafireproofgenesisblocka",
-  LOCAL_NAME: "localName"
+  GENESIS_CID: "baembeiarootfireproofgenesisblockaaaafireproofgenesisblocka"
   // FS = "fs",
 };
 function throwFalsy(value) {
@@ -488,11 +487,11 @@ function storeType2DataMetaWal(store) {
       throw new Error(`unknown store ${store}`);
   }
 }
-function ensureURIDefaults(sthis, names, curi, uri, store, ctx) {
+function ensureURIDefaults(sthis, name, curi, uri, store, ctx) {
   ctx = ctx || {};
-  const ret = (curi ? import_cement.URI.from(curi) : uri).build().setParam(PARAM.STORE, store).defParam(PARAM.NAME, names.name);
-  if (names.local) {
-    ret.defParam(PARAM.LOCAL_NAME, names.local);
+  const ret = (curi ? import_cement.URI.from(curi) : uri).build().setParam(PARAM.STORE, store).defParam(PARAM.NAME, name);
+  if (!ret.hasParam(PARAM.NAME)) {
+    throw sthis.logger.Error().Url(ret).Any("ctx", ctx).Msg("Ledger name is required").AsError();
   }
   if (ctx.idx) {
     ret.defParam(PARAM.INDEX, "idx");
@@ -1292,13 +1291,6 @@ var import_cement7 = require("@adviser/cement");
 var MEMORY_VERSION = "v0.19-memory";
 
 // src/runtime/gateways/memory/gateway.ts
-function cleanURI(uri) {
-  return uri.build().cleanParams(
-    PARAM.VERSION,
-    // PARAM.STORE,
-    PARAM.LOCAL_NAME
-  ).URI();
-}
 var MemoryGateway = class {
   // readonly logger: Logger;
   constructor(sthis, memorys) {
@@ -1316,33 +1308,33 @@ var MemoryGateway = class {
     return Promise.resolve(import_cement7.Result.Ok(void 0));
   }
   destroy(baseUrl) {
-    const keyUrl = cleanURI(baseUrl);
-    const match = keyUrl.match(keyUrl);
+    const keyUrl = baseUrl.toString();
     for (const key of this.memorys.keys()) {
-      if (keyUrl.match(key).score >= match.score) {
+      if (key.startsWith(keyUrl)) {
         this.memorys.delete(key);
       }
     }
+    this.memorys.clear();
     return Promise.resolve(import_cement7.Result.Ok(void 0));
   }
   async put(url, bytes) {
-    this.memorys.set(cleanURI(url).toString(), bytes);
+    this.memorys.set(url.toString(), bytes);
     return import_cement7.Result.Ok(void 0);
   }
   // get could return a NotFoundError if the key is not found
   get(url) {
-    const x = this.memorys.get(cleanURI(url).toString());
+    const x = this.memorys.get(url.toString());
     if (!x) {
       return Promise.resolve(import_cement7.Result.Err(new NotFoundError(`not found: ${url.toString()}`)));
     }
     return Promise.resolve(import_cement7.Result.Ok(x));
   }
   delete(url) {
-    this.memorys.delete(cleanURI(url).toString());
+    this.memorys.delete(url.toString());
     return Promise.resolve(import_cement7.Result.Ok(void 0));
   }
   async getPlain(url, key) {
-    const x = this.memorys.get(cleanURI(url).build().setParam(PARAM.KEY, key).toString());
+    const x = this.memorys.get(url.build().setParam(PARAM.KEY, key).toString());
     if (!x) {
       return import_cement7.Result.Err(new NotFoundError("not found"));
     }
@@ -1370,7 +1362,7 @@ function File2FPMsg(fpfile) {
 
 // src/runtime/gateways/fp-envelope-serialize.ts
 var import_cement9 = require("@adviser/cement");
-var import_clock = require("@fireproof/vendor/@web3-storage/pail/clock");
+var import_clock = require("@web3-storage/pail/clock");
 var import_base64 = require("multiformats/bases/base64");
 var import_multiformats = require("multiformats");
 var import_link = require("multiformats/link");
@@ -2351,7 +2343,7 @@ async function parseCarFile(reader, logger) {
 }
 
 // src/blockstore/transaction.ts
-var import_block4 = require("@fireproof/vendor/@web3-storage/pail/block");
+var import_block4 = require("@web3-storage/pail/block");
 var import_cement12 = require("@adviser/cement");
 var CarTransactionImpl = class {
   #memblock = new import_block4.MemoryBlockstore();
@@ -3025,44 +3017,19 @@ var AttachedRemotesImpl = class {
     const gws = {
       car: {
         ...gwp.car,
-        url: ensureURIDefaults(
-          this.loadable.sthis,
-          { name: attached.name, local: this._local?.gatewayUrls.car.url.getParam(PARAM.NAME) },
-          void 0,
-          import_cement14.URI.from(gwp.car.url),
-          "car"
-        )
+        url: ensureURIDefaults(this.loadable.sthis, attached.name, gwp.car.url, import_cement14.URI.from(gwp.car.url), "car")
       },
       file: {
         ...gwp.file,
-        url: ensureURIDefaults(
-          this.loadable.sthis,
-          { name: attached.name, local: this._local?.gatewayUrls.file.url.getParam(PARAM.NAME) },
-          void 0,
-          import_cement14.URI.from(gwp.file.url),
-          "file",
-          { file: true }
-        )
+        url: ensureURIDefaults(this.loadable.sthis, attached.name, void 0, import_cement14.URI.from(gwp.file.url), "file", { file: true })
       },
       meta: {
         ...gwp.meta,
-        url: ensureURIDefaults(
-          this.loadable.sthis,
-          { name: attached.name, local: this._local?.gatewayUrls.meta.url.getParam(PARAM.NAME) },
-          void 0,
-          import_cement14.URI.from(gwp.meta.url),
-          "meta"
-        )
+        url: ensureURIDefaults(this.loadable.sthis, attached.name, void 0, import_cement14.URI.from(gwp.meta.url), "meta")
       },
       wal: gwp.wal ? {
         ...gwp.wal,
-        url: ensureURIDefaults(
-          this.loadable.sthis,
-          { name: attached.name, local: this._local?.gatewayUrls.wal?.url.getParam(PARAM.NAME) },
-          void 0,
-          import_cement14.URI.from(gwp.wal.url),
-          "wal"
-        )
+        url: ensureURIDefaults(this.loadable.sthis, attached.name, void 0, import_cement14.URI.from(gwp.wal.url), "wal")
       } : void 0
     };
     const key = JSON.stringify(
@@ -3087,7 +3054,7 @@ var AttachedRemotesImpl = class {
       );
       if (result.stores.wal) {
         if (this._local) {
-          throw this.loadable.sthis.logger.Error().Any({ urls: result.gatewayUrls }).Msg("local store could only set once").AsError();
+          throw this.loadable.sthis.logger.Error().Msg("local store could only set once").AsError();
         }
         this._local = result;
       }
@@ -3154,11 +3121,10 @@ var Loader = class {
     if (!at.stores.wal) {
       try {
         const dbMeta = await at.stores.meta.load();
-        if (Array.isArray(dbMeta)) {
-          await this.handleDbMetasFromStore(dbMeta, this.attachedStores.activate(at.stores));
-        } else if (!isFalsy(dbMeta)) {
-          throw this.logger.Error().Any({ dbMeta }).Msg("missing dbMeta").AsError();
+        if (!Array.isArray(dbMeta)) {
+          throw this.logger.Error().Msg("missing dbMeta").AsError();
         }
+        await this.handleDbMetasFromStore(dbMeta, this.attachedStores.activate(at.stores));
       } catch (e) {
         this.logger.Error().Err(e).Msg("error attaching store");
         at.detach();
@@ -3680,7 +3646,7 @@ async function keyedCryptoFactory(url, kb, sthis) {
 }
 
 // src/blockstore/store.ts
-var import_clock2 = require("@fireproof/vendor/@web3-storage/pail/clock");
+var import_clock2 = require("@web3-storage/pail/clock");
 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);
@@ -4430,9 +4396,9 @@ var URIInterceptor = class _URIInterceptor extends PassThroughGateway {
 var import_link2 = require("multiformats/link");
 var import_sha27 = require("multiformats/hashes/sha2");
 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);
+var import_crdt = require("@web3-storage/pail/crdt");
+var import_clock3 = require("@web3-storage/pail/clock");
+var Batch = __toESM(require("@web3-storage/pail/crdt/batch"), 1);
 function time(tag) {
 }
 function timeEnd(tag) {
@@ -4744,8 +4710,8 @@ async function getBlock(blocks, cidString) {
 }
 
 // src/crdt-clock.ts
-var import_clock4 = require("@fireproof/vendor/@web3-storage/pail/clock");
-var import_crdt2 = require("@fireproof/vendor/@web3-storage/pail/crdt");
+var import_clock4 = require("@web3-storage/pail/clock");
+var import_crdt2 = require("@web3-storage/pail/crdt");
 var import_cement19 = require("@adviser/cement");
 
 // src/apply-head-queue.ts
@@ -5287,26 +5253,19 @@ function toStoreURIRuntime(sthis, name, sopts) {
   const base = import_cement21.URI.from(sopts.base);
   return {
     idx: {
-      car: ensureURIDefaults(sthis, { name }, sopts.idx?.car ?? sopts.data?.car, base, "car", { idx: true }),
-      file: ensureURIDefaults(
-        sthis,
-        { name },
-        sopts.idx?.file ?? sopts.idx?.car ?? sopts.data?.file ?? sopts.data?.car,
-        base,
-        "file",
-        {
-          file: true,
-          idx: true
-        }
-      ),
-      meta: ensureURIDefaults(sthis, { name }, sopts.idx?.meta ?? sopts.data?.meta, base, "meta", { idx: true }),
-      wal: ensureURIDefaults(sthis, { name }, sopts.idx?.wal ?? sopts.data?.wal, base, "wal", { idx: true })
+      car: ensureURIDefaults(sthis, name, sopts.idx?.car ?? sopts.data?.car, base, "car", { idx: true }),
+      file: ensureURIDefaults(sthis, name, sopts.idx?.file ?? sopts.idx?.car ?? sopts.data?.file ?? sopts.data?.car, base, "file", {
+        file: true,
+        idx: true
+      }),
+      meta: ensureURIDefaults(sthis, name, sopts.idx?.meta ?? sopts.data?.meta, base, "meta", { idx: true }),
+      wal: ensureURIDefaults(sthis, name, sopts.idx?.wal ?? sopts.data?.wal, base, "wal", { idx: true })
     },
     data: {
-      car: ensureURIDefaults(sthis, { name }, sopts.data?.car, base, "car"),
-      file: ensureURIDefaults(sthis, { name }, sopts.data?.file ?? sopts.data?.car, base, "file", { file: true }),
-      meta: ensureURIDefaults(sthis, { name }, sopts.data?.meta, base, "meta"),
-      wal: ensureURIDefaults(sthis, { name }, sopts.data?.wal, base, "wal")
+      car: ensureURIDefaults(sthis, name, sopts.data?.car, base, "car"),
+      file: ensureURIDefaults(sthis, name, sopts.data?.file ?? sopts.data?.car, base, "file", { file: true }),
+      meta: ensureURIDefaults(sthis, name, sopts.data?.meta, base, "meta"),
+      wal: ensureURIDefaults(sthis, name, sopts.data?.wal, base, "wal")
     }
   };
 }
@@ -7304,6 +7263,6 @@ function buildResDelWAL(msgCtx, req, ctx) {
 
 // src/version.ts
 var PACKAGE_VERSION = Object.keys({
-  "0.20.0-dev-preview-62": "xxxx"
+  "0.20.0": "xxxx"
 })[0];
 //# sourceMappingURL=index.cjs.map