@fireproof/core 0.20.0-dev-preview-05 → 0.20.0-dev-preview-10

package/react/metafile-esm.json

@@ -1 +1 @@
-{"inputs":{"src/react/useFireproof.ts":{"bytes":11322,"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true}],"format":"esm"},"src/react/useDocument.ts":{"bytes":1656,"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"src/react/useFireproof.ts","kind":"import-statement","original":"./useFireproof.js"}],"format":"esm"},"src/react/useLiveQuery.ts":{"bytes":1387,"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"src/react/useFireproof.ts","kind":"import-statement","original":"./useFireproof.js"}],"format":"esm"},"src/react/useAllDocs.ts":{"bytes":1126,"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"src/react/useFireproof.ts","kind":"import-statement","original":"./useFireproof.js"}],"format":"esm"},"src/react/useChanges.ts":{"bytes":1171,"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"src/react/useFireproof.ts","kind":"import-statement","original":"./useFireproof.js"}],"format":"esm"},"src/react/index.ts":{"bytes":971,"imports":[{"path":"src/react/useDocument.ts","kind":"import-statement","original":"./useDocument.js"},{"path":"src/react/useFireproof.ts","kind":"import-statement","original":"./useFireproof.js"},{"path":"src/react/useLiveQuery.ts","kind":"import-statement","original":"./useLiveQuery.js"},{"path":"src/react/useAllDocs.ts","kind":"import-statement","original":"./useAllDocs.js"},{"path":"src/react/useChanges.ts","kind":"import-statement","original":"./useChanges.js"}],"format":"esm"}},"outputs":{"dist/fireproof-core/react/index.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":21356},"dist/fireproof-core/react/index.js":{"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true}],"exports":["FireproofCtx","useAllDocs","useChanges","useDocument","useFireproof","useLiveQuery"],"entryPoint":"src/react/index.ts","inputs":{"src/react/useFireproof.ts":{"bytesInOutput":3861},"src/react/useDocument.ts":{"bytesInOutput":216},"src/react/index.ts":{"bytesInOutput":0},"src/react/useLiveQuery.ts":{"bytesInOutput":223},"src/react/useAllDocs.ts":{"bytesInOutput":209},"src/react/useChanges.ts":{"bytesInOutput":209}},"bytes":4964}}}
+{"inputs":{"src/react/useFireproof.ts":{"bytes":11393,"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true}],"format":"esm"},"src/react/useDocument.ts":{"bytes":1680,"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"src/react/useFireproof.ts","kind":"import-statement","original":"./useFireproof.js"}],"format":"esm"},"src/react/useLiveQuery.ts":{"bytes":1409,"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"src/react/useFireproof.ts","kind":"import-statement","original":"./useFireproof.js"}],"format":"esm"},"src/react/useAllDocs.ts":{"bytes":1146,"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"src/react/useFireproof.ts","kind":"import-statement","original":"./useFireproof.js"}],"format":"esm"},"src/react/useChanges.ts":{"bytes":1191,"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"src/react/useFireproof.ts","kind":"import-statement","original":"./useFireproof.js"}],"format":"esm"},"src/react/index.ts":{"bytes":971,"imports":[{"path":"src/react/useDocument.ts","kind":"import-statement","original":"./useDocument.js"},{"path":"src/react/useFireproof.ts","kind":"import-statement","original":"./useFireproof.js"},{"path":"src/react/useLiveQuery.ts","kind":"import-statement","original":"./useLiveQuery.js"},{"path":"src/react/useAllDocs.ts","kind":"import-statement","original":"./useAllDocs.js"},{"path":"src/react/useChanges.ts","kind":"import-statement","original":"./useChanges.js"}],"format":"esm"}},"outputs":{"dist/fireproof-core/react/index.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":21518},"dist/fireproof-core/react/index.js":{"imports":[{"path":"@fireproof/core","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true}],"exports":["FireproofCtx","useAllDocs","useChanges","useDocument","useFireproof","useLiveQuery"],"entryPoint":"src/react/index.ts","inputs":{"src/react/useFireproof.ts":{"bytesInOutput":3892},"src/react/useDocument.ts":{"bytesInOutput":222},"src/react/index.ts":{"bytesInOutput":0},"src/react/useLiveQuery.ts":{"bytesInOutput":229},"src/react/useAllDocs.ts":{"bytesInOutput":215},"src/react/useChanges.ts":{"bytesInOutput":215}},"bytes":5019}}}

package/tests/blockstore/interceptor-gateway.test.ts

@@ -54,7 +54,7 @@ class TestInterceptor extends bs.PassThroughGateway {
 describe("InterceptorGateway", () => {
   it("passthrough", async () => {
     const gwi = new TestInterceptor();
-    const db = fireproof("interceptor-gateway", {
+    const db = fireproof.DB("interceptor-gateway", {
       gatewayInterceptor: gwi,
     });
     expect(

package/tests/blockstore/loader.test.ts

@@ -3,7 +3,7 @@ import { sha256 as hasher } from "multiformats/hashes/sha2";
 import { BlockView } from "multiformats";
 import { CID } from "multiformats/cid";
 import { MemoryBlockstore } from "@fireproof/vendor/@web3-storage/pail/block";
-import { CRDTMeta, IndexTransactionMeta, SuperThis, bs, ensureSuperThis, rt } from "@fireproof/core";
+import { CRDTMeta, CarTransaction, IndexTransactionMeta, SuperThis, bs, ensureSuperThis, rt } from "@fireproof/core";
 import { simpleBlockOpts } from "../helpers.js";
 
 class MyMemoryBlockStore extends bs.EncryptedBlockstore {
@@ -23,7 +23,7 @@ class MyMemoryBlockStore extends bs.EncryptedBlockstore {
   close(): Promise<void> {
     return this.loader.close();
   }
-  readonly transactions = new Set<bs.CarTransaction>();
+  readonly transactions = new Set<CarTransaction>();
   // readonly lastTxMeta?: TransactionMeta;
   readonly compacting: boolean = false;
 
@@ -51,7 +51,7 @@ class MyMemoryBlockStore extends bs.EncryptedBlockstore {
 describe("basic Loader simple", function () {
   let loader: bs.Loader;
   let block: BlockView;
-  let t: bs.CarTransaction;
+  let t: CarTransaction;
   const sthis = ensureSuperThis();
 
   afterEach(async function () {
@@ -63,7 +63,7 @@ describe("basic Loader simple", function () {
     const testDbName = "test-loader-commit";
     await sthis.start();
     const mockM = new MyMemoryBlockStore(sthis);
-    t = new bs.CarTransaction(mockM as bs.EncryptedBlockstore);
+    t = new bs.CarTransactionImpl(mockM as bs.EncryptedBlockstore);
     loader = new bs.Loader(sthis, {
       ...simpleBlockOpts(sthis, testDbName),
       public: true,
@@ -99,7 +99,7 @@ describe("basic Loader with two commits", function () {
   let block2: BlockView;
   let block3: BlockView;
   let block4: BlockView;
-  let t: bs.CarTransaction;
+  let t: CarTransaction;
   let carCid: bs.CarGroup;
   let carCid0: bs.CarGroup;
 
@@ -113,7 +113,7 @@ describe("basic Loader with two commits", function () {
   beforeEach(async () => {
     await sthis.start();
     const mockM = new MyMemoryBlockStore(sthis);
-    t = new bs.CarTransaction(mockM);
+    t = new bs.CarTransactionImpl(mockM);
     loader = new bs.Loader(sthis, {
       ...simpleBlockOpts(sthis, "test-loader-two-commit"),
       public: true,

package/tests/blockstore/transaction.test.ts

@@ -1,12 +1,12 @@
 import { CID } from "multiformats";
-import { bs, ensureSuperThis, SuperThis } from "@fireproof/core";
+import { BaseBlockstore, bs, CarTransaction, ensureSuperThis, SuperThis } from "@fireproof/core";
 import { simpleBlockOpts } from "../helpers.js";
 
 describe("Fresh TransactionBlockstore", function () {
-  let blocks: bs.BaseBlockstore;
+  let blocks: BaseBlockstore;
   const sthis = ensureSuperThis();
   beforeEach(function () {
-    blocks = new bs.BaseBlockstore(simpleBlockOpts(sthis));
+    blocks = new bs.BaseBlockstoreImpl(simpleBlockOpts(sthis));
   });
   // it("should not have a name", function () {
   //   expect(blocks.name).toBeFalsy();
@@ -22,7 +22,7 @@ describe("Fresh TransactionBlockstore", function () {
   it("should yield a transaction", async function () {
     const txR = await blocks.transaction(async (tblocks) => {
       expect(tblocks).toBeTruthy();
-      expect(tblocks instanceof bs.CarTransaction).toBeTruthy();
+      expect(tblocks instanceof bs.CarTransactionImpl).toBeTruthy();
       return { head: [] };
     });
     expect(txR).toBeTruthy();
@@ -55,12 +55,12 @@ describe("TransactionBlockstore with name", function () {
 });
 
 describe("A transaction", function () {
-  let tblocks: bs.CarTransaction;
+  let tblocks: CarTransaction;
   let blocks: bs.EncryptedBlockstore;
   const sthis = ensureSuperThis();
   beforeEach(async function () {
     blocks = new bs.EncryptedBlockstore(sthis, simpleBlockOpts(sthis, "test"));
-    tblocks = new bs.CarTransaction(blocks);
+    tblocks = new bs.CarTransactionImpl(blocks);
     blocks.transactions.add(tblocks);
   });
   it("should put and get", async function () {
@@ -80,7 +80,7 @@ function asUInt8Array(str: string, sthis: SuperThis) {
 }
 
 describe("TransactionBlockstore with a completed transaction", function () {
-  let blocks: bs.BaseBlockstore;
+  let blocks: BaseBlockstore;
   let cid: CID;
   let cid2: CID;
   const sthis = ensureSuperThis();
@@ -89,7 +89,7 @@ describe("TransactionBlockstore with a completed transaction", function () {
     cid = CID.parse("bafybeia4luuns6dgymy5kau5rm7r4qzrrzg6cglpzpogussprpy42cmcn4");
     cid2 = CID.parse("bafybeibgouhn5ktecpjuovt52zamzvm4dlve5ak7x6d5smms3itkhplnhm");
 
-    blocks = new bs.BaseBlockstore(simpleBlockOpts(sthis));
+    blocks = new bs.BaseBlockstoreImpl(simpleBlockOpts(sthis));
     await blocks.transaction(async (tblocks) => {
       await tblocks.put(cid, asUInt8Array("value", sthis));
       await tblocks.put(cid, asUInt8Array("value", sthis));

package/tests/fireproof/all-gateway.test.ts

@@ -1,4 +1,4 @@
-import { Ledger, LedgerFactory, PARAM, bs, ensureSuperThis } from "@fireproof/core";
+import { Database, Ledger, LedgerFactory, PARAM, bs, ensureSuperThis, fireproof } from "@fireproof/core";
 
 import { fileContent } from "./cars/bafkreidxwt2nhvbl4fnqfw3ctlt6zbrir4kqwmjo5im6rf4q5si27kgo2i.js";
 import { simpleCID } from "../helpers.js";
@@ -363,7 +363,7 @@ describe("noop Gateway", function () {
 });
 
 describe("noop Gateway subscribe", function () {
-  let db: Ledger;
+  let db: Database;
 
   let metaStore: bs.MetaStore;
 
@@ -375,10 +375,10 @@ describe("noop Gateway subscribe", function () {
     await db.destroy();
   });
   beforeEach(async function () {
-    db = LedgerFactory("test-gateway-" + sthis.nextId().str);
+    db = fireproof.DB("test-gateway-" + sthis.nextId().str);
 
     // Extract stores from the loader
-    metaStore = (await db.crdt.blockstore.loader?.metaStore()) as bs.MetaStore;
+    metaStore = (await db.ledger.crdt.blockstore.loader?.metaStore()) as bs.MetaStore;
 
     metaGateway = metaStore.realGateway;
   });
@@ -409,7 +409,7 @@ describe("noop Gateway subscribe", function () {
 });
 
 describe("Gateway", function () {
-  let db: Ledger;
+  let db: Database;
   // let carStore: ExtendedStore;
   let metaStore: bs.MetaStore;
   // let fileStore: ExtendedStore;
@@ -425,14 +425,14 @@ describe("Gateway", function () {
     await db.destroy();
   });
   beforeEach(async function () {
-    db = LedgerFactory("test-gateway-" + sthis.nextId().str);
+    db = fireproof.DB("test-gateway-" + sthis.nextId().str);
     const ok = await db.put({ _id: "test", foo: "bar" });
     expect(ok).toBeTruthy();
     expect(ok.id).toBe("test");
 
     // Extract stores from the loader
     // carStore = (await db.blockstore.loader.carStore()) as unknown as ExtendedStore;
-    metaStore = (await db.crdt.blockstore.loader?.metaStore()) as bs.MetaStore;
+    metaStore = (await db.ledger.crdt.blockstore.loader?.metaStore()) as bs.MetaStore;
     // fileStore = (await db.blockstore.loader.fileStore()) as unknown as ExtendedStore;
     // walStore = (await db.blockstore.loader.WALStore()) as unknown as ExtendedStore;
 

package/tests/fireproof/crdt.test.ts

@@ -1,10 +1,10 @@
-import { CRDT, defaultWriteQueueOpts, ensureSuperThis, LedgerOpts, toStoreURIRuntime, rt } from "@fireproof/core";
+import { CRDT, defaultWriteQueueOpts, ensureSuperThis, LedgerOpts, toStoreURIRuntime, rt, CRDTImpl } from "@fireproof/core";
 import { bs } from "@fireproof/core";
 import { CRDTMeta, DocValue } from "@fireproof/core";
 import { Index, index } from "@fireproof/core";
 
 describe("Fresh crdt", function () {
-  let crdt: CRDT<{ hello: string } | { points: number }>;
+  let crdt: CRDT;
   const sthis = ensureSuperThis();
   afterEach(async function () {
     await crdt.close();
@@ -18,7 +18,7 @@ describe("Fresh crdt", function () {
       storeUrls: toStoreURIRuntime(sthis, "test-crdt-cold"),
       storeEnDe: bs.ensureStoreEnDeFile({}),
     };
-    crdt = new CRDT(sthis, dbOpts);
+    crdt = new CRDTImpl(sthis, dbOpts);
   });
   it("should have an empty head", async function () {
     const head = crdt.clock.head;
@@ -44,7 +44,7 @@ describe("CRDT with one record", function () {
     readonly hello: string;
     readonly nice: string;
   }
-  let crdt: CRDT<Partial<CRDTTestType>>;
+  let crdt: CRDT;
   let firstPut: CRDTMeta;
   const sthis = ensureSuperThis();
 
@@ -61,7 +61,7 @@ describe("CRDT with one record", function () {
       storeUrls: toStoreURIRuntime(sthis, `test@${sthis.nextId().str}`),
       storeEnDe: bs.ensureStoreEnDeFile({}),
     };
-    crdt = new CRDT(sthis, dbOpts);
+    crdt = new CRDTImpl(sthis, dbOpts);
     firstPut = await crdt.bulk([{ id: "hello", value: { hello: "world" } }]);
   });
   it("should have a one-element head", async function () {
@@ -90,7 +90,7 @@ describe("CRDT with one record", function () {
     expect(got).toBeFalsy();
   });
   it("should offer changes", async function () {
-    const { result } = await crdt.changes([]);
+    const { result } = await crdt.changes<Partial<CRDTTestType>>([]);
     expect(result.length).toBe(1);
     expect(result[0].id).toBe("hello");
     expect(result[0].value?.hello).toBe("world");
@@ -101,7 +101,7 @@ describe("CRDT with a multi-write", function () {
   interface CRDTTestType {
     readonly points: number;
   }
-  let crdt: CRDT<CRDTTestType>;
+  let crdt: CRDT;
   let firstPut: CRDTMeta;
   const sthis = ensureSuperThis();
 
@@ -117,7 +117,7 @@ describe("CRDT with a multi-write", function () {
       storeUrls: toStoreURIRuntime(sthis, "test-crdt-cold"),
       storeEnDe: bs.ensureStoreEnDeFile({}),
     };
-    crdt = new CRDT(sthis, dbOpts);
+    crdt = new CRDTImpl(sthis, dbOpts);
     firstPut = await crdt.bulk([
       { id: "ace", value: { points: 11 } },
       { id: "king", value: { points: 10 } },
@@ -145,7 +145,7 @@ describe("CRDT with a multi-write", function () {
     expect(got.doc.points).toBe(10);
   });
   it("should offer changes", async function () {
-    const { result } = await crdt.changes([]);
+    const { result } = await crdt.changes<CRDTTestType>([]);
     expect(result.length).toBe(2);
     expect(result[0].id).toBe("ace");
     expect(result[0].value?.points).toBe(11);
@@ -158,7 +158,7 @@ describe("CRDT with a multi-write", function () {
       { id: "jack", value: { points: 10 } },
     ]);
     expect(secondPut.head).toBeTruthy();
-    const { result: r2, head: h2 } = await crdt.changes();
+    const { result: r2, head: h2 } = await crdt.changes<CRDTTestType>();
     expect(r2.length).toBe(4);
     const { result: r3 } = await crdt.changes(firstPut.head);
     expect(r3.length).toBe(2);
@@ -171,8 +171,7 @@ interface CRDTTestType {
   readonly points: number;
 }
 describe("CRDT with two multi-writes", function () {
-  /** @type {CRDT} */
-  let crdt: CRDT<CRDTTestType>;
+  let crdt: CRDT;
   let firstPut: CRDTMeta;
   let secondPut: CRDTMeta;
   const sthis = ensureSuperThis();
@@ -188,7 +187,7 @@ describe("CRDT with two multi-writes", function () {
       storeUrls: toStoreURIRuntime(sthis, `test-multiple-writes@${sthis.nextId().str}`),
       storeEnDe: bs.ensureStoreEnDeFile({}),
     };
-    crdt = new CRDT(sthis, dbOpts);
+    crdt = new CRDTImpl(sthis, dbOpts);
     firstPut = await crdt.bulk([
       { id: "ace", value: { points: 11 } },
       { id: "king", value: { points: 10 } },
@@ -217,7 +216,7 @@ describe("CRDT with two multi-writes", function () {
     }
   });
   it("should offer changes", async function () {
-    const { result } = await crdt.changes();
+    const { result } = await crdt.changes<CRDTTestType>();
     expect(result.length).toBe(4);
     expect(result[0].id).toBe("ace");
     expect(result[0].value?.points).toBe(11);
@@ -228,7 +227,7 @@ describe("CRDT with two multi-writes", function () {
 });
 
 describe("Compact a named CRDT with writes", function () {
-  let crdt: CRDT<CRDTTestType>;
+  let crdt: CRDT;
   const sthis = ensureSuperThis();
   afterEach(async function () {
     await crdt.close();
@@ -242,7 +241,7 @@ describe("Compact a named CRDT with writes", function () {
       storeUrls: toStoreURIRuntime(sthis, `named-crdt-compaction`),
       storeEnDe: bs.ensureStoreEnDeFile({}),
     };
-    crdt = new CRDT(sthis, dbOpts);
+    crdt = new CRDTImpl(sthis, dbOpts);
     for (let i = 0; i < 10; i++) {
       const bulk = [
         { id: "ace", value: { points: 11 } },
@@ -289,7 +288,7 @@ describe("Compact a named CRDT with writes", function () {
 });
 
 describe("CRDT with an index", function () {
-  let crdt: CRDT<CRDTTestType>;
+  let crdt: CRDT;
   let idx: Index<number, CRDTTestType>;
   const sthis = ensureSuperThis();
   afterEach(async function () {
@@ -304,12 +303,12 @@ describe("CRDT with an index", function () {
       storeUrls: toStoreURIRuntime(sthis, "test-crdt-cold"),
       storeEnDe: bs.ensureStoreEnDeFile({}),
     };
-    crdt = new CRDT<CRDTTestType>(sthis, dbOpts);
+    crdt = new CRDTImpl(sthis, dbOpts);
     await crdt.bulk([
       { id: "ace", value: { points: 11 } },
       { id: "king", value: { points: 10 } },
     ]);
-    idx = await index<number, CRDTTestType>({ crdt: crdt }, "points");
+    idx = await index<number, CRDTTestType>(crdt, "points");
   });
   it("should query the data", async function () {
     const got = await idx.query({ range: [9, 12] });
@@ -318,7 +317,7 @@ describe("CRDT with an index", function () {
     expect(got.rows[0].key).toBe(10);
   });
   it("should register the index", async function () {
-    const rIdx = await index<number, CRDTTestType>({ crdt: crdt }, "points");
+    const rIdx = await index<number, CRDTTestType>(crdt, "points");
     expect(rIdx).toBeTruthy();
     expect(rIdx.name).toBe("points");
     const got = await rIdx.query({ range: [9, 12] });
@@ -327,7 +326,7 @@ describe("CRDT with an index", function () {
     expect(got.rows[0].key).toBe(10);
   });
   it("creating a different index with same name should not work", async function () {
-    const e = await index({ crdt: crdt }, "points", (doc) => doc._id)
+    const e = await index(crdt, "points", (doc) => doc._id)
       .query()
       .catch((err) => err);
     expect(e.message).toMatch(/cannot apply/);
@@ -335,12 +334,9 @@ describe("CRDT with an index", function () {
 });
 
 describe("Loader with a committed transaction", function () {
-  interface CRDTTestType {
-    readonly foo: string;
-  }
   let loader: bs.Loader;
   let blockstore: bs.EncryptedBlockstore;
-  let crdt: CRDT<CRDTTestType>;
+  let crdt: CRDT;
   let done: CRDTMeta;
   const dbname = "test-loader";
   const sthis = ensureSuperThis();
@@ -356,7 +352,7 @@ describe("Loader with a committed transaction", function () {
       storeUrls: toStoreURIRuntime(sthis, dbname),
       storeEnDe: bs.ensureStoreEnDeFile({}),
     };
-    crdt = new CRDT(sthis, dbOpts);
+    crdt = new CRDTImpl(sthis, dbOpts);
     blockstore = crdt.blockstore as bs.EncryptedBlockstore;
     expect(blockstore.loader).toBeTruthy();
     loader = blockstore.loader as bs.Loader;
@@ -389,11 +385,8 @@ describe("Loader with a committed transaction", function () {
 });
 
 describe("Loader with two committed transactions", function () {
-  interface CRDTTestType {
-    readonly foo: string;
-  }
   let loader: bs.Loader;
-  let crdt: CRDT<CRDTTestType>;
+  let crdt: CRDT;
   let blockstore: bs.EncryptedBlockstore;
   let done1: CRDTMeta;
   let done2: CRDTMeta;
@@ -410,7 +403,7 @@ describe("Loader with two committed transactions", function () {
       storeUrls: toStoreURIRuntime(sthis, "test-loader"),
       storeEnDe: bs.ensureStoreEnDeFile({}),
     };
-    crdt = new CRDT(sthis, dbOpts);
+    crdt = new CRDTImpl(sthis, dbOpts);
     blockstore = crdt.blockstore as bs.EncryptedBlockstore;
     expect(blockstore.loader).toBeTruthy();
     loader = blockstore.loader as bs.Loader;
@@ -445,12 +438,9 @@ describe("Loader with two committed transactions", function () {
 });
 
 describe("Loader with many committed transactions", function () {
-  interface Doc {
-    foo: string;
-  }
   let loader: bs.Loader;
   let blockstore: bs.EncryptedBlockstore;
-  let crdt: CRDT<Doc>;
+  let crdt: CRDT;
   let dones: CRDTMeta[];
   const count = 10;
   const sthis = ensureSuperThis();
@@ -466,7 +456,7 @@ describe("Loader with many committed transactions", function () {
       storeUrls: toStoreURIRuntime(sthis, "test-loader-many"),
       storeEnDe: bs.ensureStoreEnDeFile({}),
     };
-    crdt = new CRDT(sthis, dbOpts);
+    crdt = new CRDTImpl(sthis, dbOpts);
     blockstore = crdt.blockstore as bs.EncryptedBlockstore;
     expect(blockstore.loader).toBeTruthy();
     loader = blockstore.loader as bs.Loader;

package/tests/fireproof/{ledger.test.ts → database.test.ts}

@@ -2,20 +2,20 @@ import { URI } from "@adviser/cement";
 import { buildBlobFiles, FileWithCid, mockSuperThis } from "../helpers.js";
 import {
   bs,
-  Ledger,
   DocResponse,
   DocFileMeta,
   DocWithId,
   DocFiles,
   toStoreURIRuntime,
   keyConfigOpts,
-  LedgerFactory,
-  LedgerShell,
   ensureSuperThis,
+  Database,
+  fireproof,
+  LedgerShell,
 } from "@fireproof/core";
 
 describe("basic Ledger", () => {
-  let db: Ledger;
+  let db: Database;
   const sthis = mockSuperThis();
   afterEach(async () => {
     await db.close();
@@ -23,7 +23,7 @@ describe("basic Ledger", () => {
   });
   beforeEach(async () => {
     await sthis.start();
-    db = LedgerFactory(undefined, {
+    db = fireproof.DB(undefined as unknown as string, {
       logger: sthis.logger,
     });
   });
@@ -53,7 +53,7 @@ describe("basic Ledger with record", function () {
   interface Doc {
     readonly value: string;
   }
-  let db: LedgerShell;
+  let db: Database;
   const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
@@ -61,7 +61,7 @@ describe("basic Ledger with record", function () {
   });
   beforeEach(async function () {
     await sthis.start();
-    db = LedgerFactory("factory-name") as LedgerShell;
+    db = fireproof.DB("factory-name");
     const ok = await db.put<Doc>({ _id: "hello", value: "world" });
     expect(ok.id).toBe("hello");
   });
@@ -93,10 +93,11 @@ describe("basic Ledger with record", function () {
     expect(rows[0].value._id).toBe("hello");
   });
   it("is not persisted", async function () {
-    const db2 = LedgerFactory("factory-name") as LedgerShell;
+    const db2 = fireproof.DB("factory-name");
     const { rows } = await db2.changes([]);
     expect(rows.length).toBe(1);
-    expect(db2.ref).toBe(db.ref);
+    // assert((db.ledger.ref === db2.ledger.ref, "should be the same ledger");
+    expect((db.ledger as LedgerShell).ref).toBe((db2.ledger as LedgerShell).ref);
     const doc = await db2.get<Doc>("hello").catch((e) => e);
     expect(doc.value).toBe("world");
     await db2.close();
@@ -107,7 +108,7 @@ describe("named Ledger with record", function () {
   interface Doc {
     readonly value: string;
   }
-  let db: Ledger;
+  let db: Database;
   const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
@@ -115,7 +116,7 @@ describe("named Ledger with record", function () {
   });
   beforeEach(async function () {
     await sthis.start();
-    db = LedgerFactory("test-db-name");
+    db = fireproof.DB("test-db-name");
     /** @type {Doc} */
     const doc = { _id: "hello", value: "world" };
     const ok = await db.put(doc);
@@ -151,7 +152,7 @@ describe("named Ledger with record", function () {
   it("should have a key", async function () {
     const { rows } = await db.changes([]);
     expect(rows.length).toBe(1);
-    const blocks = db.crdt.blockstore as bs.EncryptedBlockstore;
+    const blocks = db.ledger.crdt.blockstore as bs.EncryptedBlockstore;
     const loader = blocks.loader;
     expect(loader).toBeTruthy();
     await loader.ready();
@@ -233,7 +234,7 @@ describe("named Ledger with record", function () {
 //   })
 
 describe("basic Ledger parallel writes / public ordered", () => {
-  let db: Ledger;
+  let db: Database;
   const writes: Promise<DocResponse>[] = [];
   const sthis = mockSuperThis();
   afterEach(async () => {
@@ -242,7 +243,7 @@ describe("basic Ledger parallel writes / public ordered", () => {
   });
   beforeEach(async () => {
     await sthis.start();
-    db = LedgerFactory("test-parallel-writes-ordered", { writeQueue: { chunkSize: 1 } });
+    db = fireproof.DB("test-parallel-writes-ordered", { writeQueue: { chunkSize: 1 } });
     for (let i = 0; i < 10; i++) {
       const doc = { _id: `id-${i}`, hello: "world" };
       writes.push(db.put(doc));
@@ -251,13 +252,13 @@ describe("basic Ledger parallel writes / public ordered", () => {
   });
 
   it("should have one head", () => {
-    const crdt = db.crdt;
+    const crdt = db.ledger.crdt;
     expect(crdt.clock.head.length).toBe(1);
   });
 
   it("has changes ordered", async function () {
     const { rows, clock } = await db.changes([]);
-    expect(clock[0]).toBe(db.crdt.clock.head[0]);
+    expect(clock[0]).toBe(db.ledger.crdt.clock.head[0]);
     expect(rows.length).toBe(10);
     for (let i = 0; i < 10; i++) {
       expect(rows[i].key).toBe("id-" + i);
@@ -267,7 +268,7 @@ describe("basic Ledger parallel writes / public ordered", () => {
 });
 
 describe("basic Ledger parallel writes / public", () => {
-  let db: Ledger;
+  let db: Database;
   const writes: Promise<DocResponse>[] = [];
   const sthis = ensureSuperThis();
   afterEach(async () => {
@@ -276,7 +277,7 @@ describe("basic Ledger parallel writes / public", () => {
   });
   beforeEach(async () => {
     await sthis.start();
-    db = LedgerFactory("test-parallel-writes", { writeQueue: { chunkSize: 32 } });
+    db = fireproof.DB("test-parallel-writes", { writeQueue: { chunkSize: 32 } });
     for (let i = 0; i < 10; i++) {
       const doc = { _id: `id-${i}`, hello: "world" };
       writes.push(db.put(doc));
@@ -284,7 +285,7 @@ describe("basic Ledger parallel writes / public", () => {
     await Promise.all(writes);
   });
   it("should resolve to one head", async () => {
-    const crdt = db.crdt;
+    const crdt = db.ledger.crdt;
     expect(crdt.clock.head.length).toBe(9);
     await db.put({ _id: "id-10", hello: "world" });
     expect(crdt.clock.head.length).toBe(1);
@@ -323,7 +324,7 @@ describe("basic Ledger parallel writes / public", () => {
   });
   it("has changes not ordered", async function () {
     const { rows, clock } = await db.changes([]);
-    expect(clock[0]).toBe(db.crdt.clock.head[0]);
+    expect(clock[0]).toBe(db.ledger.crdt.clock.head[0]);
     expect(rows.length).toBe(10);
     rows.sort((a, b) => a.key.localeCompare(b.key));
     // console.log(rows);
@@ -337,7 +338,7 @@ describe("basic Ledger parallel writes / public", () => {
     expect(rows.length).toBe(10);
     // expect(db.opts.public).toBeTruthy();
     // expect(db._crdt.opts.public).toBeTruthy();
-    const blocks = db.crdt.blockstore as bs.EncryptedBlockstore;
+    const blocks = db.ledger.crdt.blockstore as bs.EncryptedBlockstore;
     const loader = blocks.loader;
     expect(loader).toBeTruthy();
     await loader.ready();
@@ -347,7 +348,7 @@ describe("basic Ledger parallel writes / public", () => {
 });
 
 describe("basic Ledger with subscription", function () {
-  let db: Ledger;
+  let db: Database;
   let didRun: number;
   let unsubscribe: () => void;
   let lastDoc: DocWithId<NonNullable<unknown>>;
@@ -359,7 +360,7 @@ describe("basic Ledger with subscription", function () {
   });
   beforeEach(async function () {
     await sthis.start();
-    db = LedgerFactory("factory-name");
+    db = fireproof.DB("factory-name");
     didRun = 0;
     waitForSub = new Promise((resolve) => {
       unsubscribe = db.subscribe((docs) => {
@@ -393,17 +394,16 @@ describe("basic Ledger with subscription", function () {
 });
 
 describe("basic Ledger with no update subscription", function () {
-  let db: Ledger;
+  let db: Database;
   let didRun: number;
   let unsubscribe: () => void;
-  const sthis = ensureSuperThis();
+  // const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
   });
   beforeEach(async function () {
-    await sthis.start();
-    db = LedgerFactory("factory-name");
+    db = fireproof.DB("factory-name");
     didRun = 0;
     unsubscribe = db.subscribe(() => {
       didRun++;
@@ -429,7 +429,7 @@ describe("basic Ledger with no update subscription", function () {
 });
 
 describe("ledger with files input", () => {
-  let db: Ledger;
+  let db: Database;
   let imagefiles: FileWithCid[] = [];
   let result: DocResponse;
   const sthis = ensureSuperThis();
@@ -441,7 +441,7 @@ describe("ledger with files input", () => {
   beforeEach(async function () {
     await sthis.start();
     imagefiles = await buildBlobFiles();
-    db = LedgerFactory("fireproof-with-images");
+    db = fireproof.DB("fireproof-with-images");
     const doc = {
       _id: "images-main",
       type: "files",
@@ -532,6 +532,7 @@ describe("StoreURIRuntime", () => {
     await sthis.start();
     safeEnv = sthis.env.get("FP_STORAGE_URL");
     sthis.env.set("FP_STORAGE_URL", "my://bla/storage");
+    // console.log(">>>>>>>>>>", bs, bs.registerStoreProtocol)
     unreg = bs.registerStoreProtocol({
       protocol: "murks",
       isDefault: true,