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

package/tests/fireproof/crdt.test.ts

@@ -13,6 +13,7 @@ describe("Fresh crdt", function () {
   beforeEach(async function () {
     await sthis.start();
     const dbOpts: LedgerOpts = {
+      name: "test-crdt",
       writeQueue: defaultWriteQueueOpts({}),
       keyBag: rt.defaultKeyBagOpts(sthis),
       storeUrls: toStoreURIRuntime(sthis, "test-crdt-cold"),
@@ -56,6 +57,7 @@ describe("CRDT with one record", function () {
   beforeEach(async function () {
     await sthis.start();
     const dbOpts: LedgerOpts = {
+      name: "test-crdt",
       writeQueue: defaultWriteQueueOpts({}),
       keyBag: rt.defaultKeyBagOpts(sthis),
       storeUrls: toStoreURIRuntime(sthis, `test@${sthis.nextId().str}`),
@@ -112,6 +114,7 @@ describe("CRDT with a multi-write", function () {
   beforeEach(async function () {
     await sthis.start();
     const dbOpts: LedgerOpts = {
+      name: "test-crdt",
       writeQueue: defaultWriteQueueOpts({}),
       keyBag: rt.defaultKeyBagOpts(sthis),
       storeUrls: toStoreURIRuntime(sthis, "test-crdt-cold"),
@@ -182,6 +185,7 @@ describe("CRDT with two multi-writes", function () {
   beforeEach(async () => {
     await sthis.start();
     const dbOpts: LedgerOpts = {
+      name: "test-crdt",
       writeQueue: defaultWriteQueueOpts({}),
       keyBag: rt.defaultKeyBagOpts(sthis),
       storeUrls: toStoreURIRuntime(sthis, `test-multiple-writes@${sthis.nextId().str}`),
@@ -236,6 +240,7 @@ describe("Compact a named CRDT with writes", function () {
   beforeEach(async function () {
     await sthis.start();
     const dbOpts: LedgerOpts = {
+      name: "test-crdt",
       writeQueue: defaultWriteQueueOpts({}),
       keyBag: rt.defaultKeyBagOpts(sthis),
       storeUrls: toStoreURIRuntime(sthis, `named-crdt-compaction`),
@@ -298,6 +303,7 @@ describe("CRDT with an index", function () {
   beforeEach(async function () {
     await sthis.start();
     const dbOpts: LedgerOpts = {
+      name: "test-crdt",
       writeQueue: defaultWriteQueueOpts({}),
       keyBag: rt.defaultKeyBagOpts(sthis),
       storeUrls: toStoreURIRuntime(sthis, "test-crdt-cold"),
@@ -347,6 +353,7 @@ describe("Loader with a committed transaction", function () {
   beforeEach(async function () {
     await sthis.start();
     const dbOpts: LedgerOpts = {
+      name: "test-crdt",
       writeQueue: defaultWriteQueueOpts({}),
       keyBag: rt.defaultKeyBagOpts(sthis),
       storeUrls: toStoreURIRuntime(sthis, dbname),
@@ -398,6 +405,7 @@ describe("Loader with two committed transactions", function () {
   beforeEach(async function () {
     await sthis.start();
     const dbOpts: LedgerOpts = {
+      name: "test-crdt",
       writeQueue: defaultWriteQueueOpts({}),
       keyBag: rt.defaultKeyBagOpts(sthis),
       storeUrls: toStoreURIRuntime(sthis, "test-loader"),
@@ -451,6 +459,7 @@ describe("Loader with many committed transactions", function () {
   beforeEach(async function () {
     await sthis.start();
     const dbOpts: LedgerOpts = {
+      name: "test-crdt",
       writeQueue: defaultWriteQueueOpts({}),
       keyBag: rt.defaultKeyBagOpts(sthis),
       storeUrls: toStoreURIRuntime(sthis, "test-loader-many"),

package/tests/fireproof/database.test.ts

@@ -565,19 +565,19 @@ describe("StoreURIRuntime", () => {
     });
     // keyConfigOpts(sthis: SuperThis, name: string, opts?: ConfigOpts): string {
   });
-  it("no name toStoreURIRuntime", () => {
-    expect(JSON.parse(JSON.stringify(toStoreURIRuntime(sthis)))).toEqual({
+  it("no name toStoreURIRuntime(not more)", () => {
+    expect(JSON.parse(JSON.stringify(toStoreURIRuntime(sthis, "gogo")))).toEqual({
       data: {
-        data: "my://bla/storage?name=storage&store=data&storekey=%40storage-data%40&suffix=.car&urlGen=fromEnv",
-        file: "my://bla/storage?name=storage&store=data&storekey=%40storage-data%40&urlGen=fromEnv",
-        meta: "my://bla/storage?name=storage&store=meta&storekey=%40storage-meta%40&urlGen=fromEnv",
-        wal: "my://bla/storage?name=storage&store=wal&storekey=%40storage-wal%40&urlGen=fromEnv",
+        data: "my://bla/storage?name=gogo&store=data&storekey=%40gogo-data%40&suffix=.car&urlGen=fromEnv",
+        file: "my://bla/storage?name=gogo&store=data&storekey=%40gogo-data%40&urlGen=fromEnv",
+        meta: "my://bla/storage?name=gogo&store=meta&storekey=%40gogo-meta%40&urlGen=fromEnv",
+        wal: "my://bla/storage?name=gogo&store=wal&storekey=%40gogo-wal%40&urlGen=fromEnv",
       },
       idx: {
-        data: "my://bla/storage?index=idx&name=storage&store=data&storekey=%40storage-data-idx%40&suffix=.car&urlGen=fromEnv",
-        file: "my://bla/storage?index=idx&name=storage&store=data&storekey=%40storage-data-idx%40&urlGen=fromEnv",
-        meta: "my://bla/storage?index=idx&name=storage&store=meta&storekey=%40storage-meta-idx%40&urlGen=fromEnv",
-        wal: "my://bla/storage?index=idx&name=storage&store=wal&storekey=%40storage-wal-idx%40&urlGen=fromEnv",
+        data: "my://bla/storage?index=idx&name=gogo&store=data&storekey=%40gogo-data-idx%40&suffix=.car&urlGen=fromEnv",
+        file: "my://bla/storage?index=idx&name=gogo&store=data&storekey=%40gogo-data-idx%40&urlGen=fromEnv",
+        meta: "my://bla/storage?index=idx&name=gogo&store=meta&storekey=%40gogo-meta-idx%40&urlGen=fromEnv",
+        wal: "my://bla/storage?index=idx&name=gogo&store=wal&storekey=%40gogo-wal-idx%40&urlGen=fromEnv",
       },
     });
   });
@@ -603,13 +603,13 @@ describe("StoreURIRuntime", () => {
       data: {
         data: "my://storage-data?name=yyy&store=data&storekey=%40yyy-data%40&suffix=.car",
         file: "my://storage-data?name=yyy&store=data&storekey=%40yyy-data%40",
-        meta: "my://storage-meta?name=storage-meta&store=meta&storekey=%40storage-meta-meta%40",
+        meta: "my://storage-meta?name=xxx&store=meta&storekey=%40xxx-meta%40",
         wal: "my://storage-base?name=xxx&store=wal&storekey=%40xxx-wal%40",
       },
       idx: {
         data: "my://storage-idx-data?index=bla&name=yyy&store=data&storekey=%40yyy-data-idx%40&suffix=.car",
         file: "my://storage-idx-data?index=bla&name=yyy&store=data&storekey=%40yyy-data-idx%40",
-        meta: "my://storage-idx-meta?index=idx&name=storage-idx-meta&store=meta&storekey=%40storage-idx-meta-meta-idx%40",
+        meta: "my://storage-idx-meta?index=idx&name=xxx&store=meta&storekey=%40xxx-meta-idx%40",
         wal: "my://storage-base?index=idx&name=xxx&store=wal&storekey=%40xxx-wal-idx%40",
       },
     });

package/tests/fireproof/fireproof.test.ts

@@ -15,7 +15,10 @@ import {
   fireproof,
   Database,
   isDatabase,
+  PARAM,
 } from "@fireproof/core";
+import { getDefaultURI } from "../../src/blockstore/register-store-protocol.js";
+import { URI } from "@adviser/cement";
 
 export function carLogIncludesGroup(list: bs.AnyLink[], cid: CID) {
   return list.some((c) => c.equals(cid));
@@ -114,6 +117,47 @@ describe("public API", function () {
   });
 });
 
+describe("database fullconfig", () => {
+  const sthis = ensureSuperThis();
+  it("have the right name", async () => {
+    let protocol: string | undefined;
+    const url = sthis.env.get("FP_STORAGE_URL");
+    if (url) {
+      protocol = URI.from(url).protocol;
+    }
+    const base = getDefaultURI(sthis, protocol);
+    const db = fireproof("my-funky-name", {
+      storeUrls: {
+        base: base,
+        // meta: `${base}/meta?taste=${taste}`,
+        data: {
+          meta: base.build().pathname("dist/full/meta"),
+          data: base.build().pathname("dist/full/data"),
+          wal: base.build().pathname("dist/full/wal"),
+        },
+        idx: {
+          meta: base.build().pathname("dist/full/idx-meta"),
+          data: base.build().pathname("dist/full/idx-data"),
+          wal: base.build().pathname("dist/full/idx-wal"),
+        },
+        // wal: `${base}/wal?taste=${taste}`,
+      },
+    });
+
+    const carStore = await db.ledger.crdt.blockstore.loader?.carStore();
+    expect(carStore.url().getParam(PARAM.NAME)).toBe("my-funky-name");
+    const metaStore = await db.ledger.crdt.blockstore.loader?.metaStore();
+    expect(metaStore.url().getParam(PARAM.NAME)).toBe("my-funky-name");
+    const walStore = await db.ledger.crdt.blockstore.loader?.WALStore();
+    expect(walStore.url().getParam(PARAM.NAME)).toBe("my-funky-name");
+
+    expect(db).toBeTruthy();
+    expect(db.name).toBe("my-funky-name");
+    await db.put({ _id: "test", foo: "bar" });
+    expect(db.name).toBe("my-funky-name");
+  });
+});
+
 describe("basic ledger", function () {
   interface Doc {
     foo: string;

package/tests/fireproof/indexer.test.ts

@@ -291,6 +291,7 @@ describe("basic Index upon cold start", function () {
     const logger = sthis.logger.With().Module("IndexerTest").Logger();
     logger.Debug().Msg("enter beforeEach");
     dbOpts = {
+      name: "test-indexer-cold",
       writeQueue: defaultWriteQueueOpts({}),
       keyBag: rt.kb.defaultKeyBagOpts(sthis),
       storeUrls: toStoreURIRuntime(sthis, "test-indexer-cold"),