@fireproof/core 0.20.0-dev-preview-27 → 0.20.0-dev-preview-29

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,8 +15,8 @@ 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) {
@@ -124,7 +124,7 @@ describe("database fullconfig", () => {
     if (url) {
       protocol = URI.from(url).protocol;
     }
-    const base = getDefaultURI(sthis, protocol);
+    const base = bs.getDefaultURI(sthis, protocol);
     const db = fireproof("my-funky-name", {
       storeUrls: {
         base: base,
@@ -142,6 +142,14 @@ describe("database fullconfig", () => {
         // 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" });