@fireproof/core 0.20.0-dev-preview-26 → 0.20.0-dev-preview-28

package/index.d.cts

@@ -1361,7 +1361,7 @@ interface WriteQueue<T extends DocUpdate<S>, S extends DocTypes = DocTypes> {
     close(): Promise<void>;
 }
 interface LedgerOpts {
-    readonly name?: string;
+    readonly name: string;
     readonly meta?: DbMeta;
     readonly gatewayInterceptor?: SerdeGatewayInterceptor;
     readonly writeQueue: WriteQueueParams;
@@ -1384,9 +1384,9 @@ interface Ledger extends HasCRDT {
     subscribe<T extends DocTypes>(listener: ListenerFn<T>, updates?: boolean): () => void;
 }
 
-declare function keyConfigOpts(sthis: SuperThis, name?: string, opts?: ConfigOpts): string;
+declare function keyConfigOpts(sthis: SuperThis, name: string, opts?: ConfigOpts): string;
 declare function isLedger(db: unknown): db is Ledger;
-declare function LedgerFactory(name: string | undefined, opts?: ConfigOpts): Ledger;
+declare function LedgerFactory(name: string, opts?: ConfigOpts): Ledger;
 declare class LedgerShell implements Ledger {
     readonly ref: LedgerImpl;
     readonly writeQueue: WriteQueue<DocUpdate<DocTypes>>;
@@ -1430,7 +1430,7 @@ declare class LedgerImpl implements Ledger {
     private _notify;
     private _no_update_notify;
 }
-declare function toStoreURIRuntime(sthis: SuperThis, name?: string, sopts?: StoreUrlsOpts): StoreURIRuntime;
+declare function toStoreURIRuntime(sthis: SuperThis, name: string, sopts?: StoreUrlsOpts): StoreURIRuntime;
 declare function fireproof(name: string, opts?: ConfigOpts): Database;
 
 declare function isDatabase(db: unknown): db is Database;

package/index.d.ts

@@ -1361,7 +1361,7 @@ interface WriteQueue<T extends DocUpdate<S>, S extends DocTypes = DocTypes> {
     close(): Promise<void>;
 }
 interface LedgerOpts {
-    readonly name?: string;
+    readonly name: string;
     readonly meta?: DbMeta;
     readonly gatewayInterceptor?: SerdeGatewayInterceptor;
     readonly writeQueue: WriteQueueParams;
@@ -1384,9 +1384,9 @@ interface Ledger extends HasCRDT {
     subscribe<T extends DocTypes>(listener: ListenerFn<T>, updates?: boolean): () => void;
 }
 
-declare function keyConfigOpts(sthis: SuperThis, name?: string, opts?: ConfigOpts): string;
+declare function keyConfigOpts(sthis: SuperThis, name: string, opts?: ConfigOpts): string;
 declare function isLedger(db: unknown): db is Ledger;
-declare function LedgerFactory(name: string | undefined, opts?: ConfigOpts): Ledger;
+declare function LedgerFactory(name: string, opts?: ConfigOpts): Ledger;
 declare class LedgerShell implements Ledger {
     readonly ref: LedgerImpl;
     readonly writeQueue: WriteQueue<DocUpdate<DocTypes>>;
@@ -1430,7 +1430,7 @@ declare class LedgerImpl implements Ledger {
     private _notify;
     private _no_update_notify;
 }
-declare function toStoreURIRuntime(sthis: SuperThis, name?: string, sopts?: StoreUrlsOpts): StoreURIRuntime;
+declare function toStoreURIRuntime(sthis: SuperThis, name: string, sopts?: StoreUrlsOpts): StoreURIRuntime;
 declare function fireproof(name: string, opts?: ConfigOpts): Database;
 
 declare function isDatabase(db: unknown): db is Database;

package/index.js

@@ -589,7 +589,7 @@ var KeyBagProviderFile = class {
       if (isNotFoundError(e)) {
         return void 0;
       }
-      throw this.logger.Error().Err(e).Str("file", ctx.dirName).Msg("read bag failed").AsError();
+      throw this.logger.Error().Err(e).Any("file", ctx).Msg("read bag failed").AsError();
     }
   }
   async set(item) {
@@ -720,7 +720,7 @@ var keysByFingerprint = class _keysByFingerprint {
     if (found) {
       return found;
     }
-    throw this.keybag.logger.Error().Msg("KeyBag: keysByFingerprint: no default").AsError();
+    throw this.keybag.logger.Error().Str("fpr", fingerPrint).Any("fprs", Object.keys(this.keys)).Msg("keysByFingerprint: not found").AsError();
   }
   async upsert(materialStrOrUint8, def, keyBagAction = true) {
     def = !!def;
@@ -837,7 +837,7 @@ var KeyBag = class {
       const keyName = `@${keyFactory()}@`;
       const ret = await this.getNamedKey(keyName);
       if (ret.isErr()) {
-        return ret;
+        return Result2.Err(ret);
       }
       const urb = url.build().setParam(PARAM.STORE_KEY, keyName);
       return Result2.Ok(urb.URI());
@@ -845,7 +845,7 @@ var KeyBag = class {
     if (storeKey.startsWith("@") && storeKey.endsWith("@")) {
       const ret = await this.getNamedKey(storeKey);
       if (ret.isErr()) {
-        return ret;
+        return Result2.Err(ret);
       }
     }
     return Result2.Ok(url);
@@ -1209,6 +1209,7 @@ var MEMORY_VERSION = "v0.19-memory";
 
 // src/runtime/gateways/memory/gateway.ts
 var MemoryGateway = class {
+  // readonly logger: Logger;
   constructor(sthis, memorys) {
     this.memorys = memorys;
     this.sthis = sthis;
@@ -4704,7 +4705,7 @@ var LedgerImpl = class {
     this.crdt.clock.onTock(() => this._no_update_notify());
   }
   get name() {
-    return this.opts.storeUrls.data.data.getParam(PARAM.NAME) ?? "default";
+    return this.opts.name;
   }
   addShell(shell) {
     this.shells.add(shell);
@@ -4788,15 +4789,11 @@ var LedgerImpl = class {
     }
   }
 };
-function defaultURI2(sthis, curi, uri, store, ctx) {
+function defaultURI2(sthis, name, curi, uri, store, ctx) {
   ctx = ctx || {};
-  const ret = (curi ? URI13.from(curi) : uri).build().setParam(PARAM.STORE, store);
+  const ret = (curi ? URI13.from(curi) : uri).build().setParam(PARAM.STORE, store).defParam(PARAM.NAME, name);
   if (!ret.hasParam(PARAM.NAME)) {
-    const name = sthis.pathOps.basename(ret.URI().pathname);
-    if (!name) {
-      throw sthis.logger.Error().Url(ret).Any("ctx", ctx).Msg("Ledger name is required").AsError();
-    }
-    ret.setParam(PARAM.NAME, name);
+    throw sthis.logger.Error().Url(ret).Any("ctx", ctx).Msg("Ledger name is required").AsError();
   }
   if (ctx.idx) {
     ret.defParam(PARAM.INDEX, "idx");
@@ -4822,23 +4819,19 @@ function toStoreURIRuntime(sthis, name, sopts) {
       sopts = { ...sopts, base: getDefaultURI(sthis).build().setParam(PARAM.URL_GEN, "default") };
     }
   }
-  const bbase = BuildURI2.from(sopts.base);
-  if (name) {
-    bbase.setParam(PARAM.NAME, name);
-  }
-  const base = bbase.URI();
+  const base = URI13.from(sopts.base);
   return {
     idx: {
-      data: defaultURI2(sthis, sopts.idx?.data, base, "data", { idx: true }),
-      file: defaultURI2(sthis, sopts.idx?.data, base, "data", { file: true, idx: true }),
-      meta: defaultURI2(sthis, sopts.idx?.meta, base, "meta", { idx: true }),
-      wal: defaultURI2(sthis, sopts.idx?.wal, base, "wal", { idx: true })
+      data: defaultURI2(sthis, name, sopts.idx?.data, base, "data", { idx: true }),
+      file: defaultURI2(sthis, name, sopts.idx?.data, base, "data", { file: true, idx: true }),
+      meta: defaultURI2(sthis, name, sopts.idx?.meta, base, "meta", { idx: true }),
+      wal: defaultURI2(sthis, name, sopts.idx?.wal, base, "wal", { idx: true })
     },
     data: {
-      data: defaultURI2(sthis, sopts.data?.data, base, "data"),
-      file: defaultURI2(sthis, sopts.data?.data, base, "data", { file: true }),
-      meta: defaultURI2(sthis, sopts.data?.meta, base, "meta"),
-      wal: defaultURI2(sthis, sopts.data?.wal, base, "wal")
+      data: defaultURI2(sthis, name, sopts.data?.data, base, "data"),
+      file: defaultURI2(sthis, name, sopts.data?.data, base, "data", { file: true }),
+      meta: defaultURI2(sthis, name, sopts.data?.meta, base, "meta"),
+      wal: defaultURI2(sthis, name, sopts.data?.wal, base, "wal")
     }
   };
 }
@@ -4902,7 +4895,7 @@ __export(file_exports, {
 
 // src/version.ts
 var PACKAGE_VERSION = Object.keys({
-  "0.20.0-dev-preview-26": "xxxx"
+  "0.20.0-dev-preview-28": "xxxx"
 })[0];
 export {
   CRDTImpl,