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

package/tests/fireproof/indexer.test.ts

@@ -1,16 +1,17 @@
 import {
   Index,
   index,
-  Ledger,
   CRDT,
   IndexRows,
   toStoreURIRuntime,
   bs,
   rt,
-  LedgerFactory,
   defaultWriteQueueOpts,
   ensureSuperThis,
   LedgerOpts,
+  Database,
+  CRDTImpl,
+  fireproof,
 } from "@fireproof/core";
 
 interface TestType {
@@ -19,7 +20,7 @@ interface TestType {
 }
 
 describe("basic Index", () => {
-  let db: Ledger<TestType>;
+  let db: Database;
   let indexer: Index<string, TestType>;
   let didMap: boolean;
   const sthis = ensureSuperThis();
@@ -31,18 +32,18 @@ describe("basic Index", () => {
   });
   beforeEach(async function () {
     await sthis.start();
-    db = LedgerFactory("test-indexer");
+    db = fireproof.DB("test-indexer");
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index<string, TestType>(sthis, db.crdt, "hello", (doc) => {
+    indexer = new Index<string, TestType>(sthis, db.ledger.crdt, "hello", (doc) => {
       didMap = true;
       return doc.title;
     });
     await indexer.ready();
   });
   it("should have properties", function () {
-    expect(indexer.crdt).toBe(db.crdt);
+    expect(indexer.crdt).toBe(db.ledger.crdt);
     // expect(indexer.crdt.name).toBe("test-indexer");
     expect(indexer.name).toBe("hello");
     expect(indexer.mapFn).toBeTruthy();
@@ -107,7 +108,7 @@ describe("basic Index", () => {
 });
 
 describe("Index query with compound key", function () {
-  let db: Ledger<TestType>;
+  let db: Database;
   let indexer: Index<[string, number], TestType>;
   const sthis = ensureSuperThis();
   afterEach(async function () {
@@ -118,12 +119,12 @@ describe("Index query with compound key", function () {
   });
   beforeEach(async function () {
     await sthis.start();
-    db = LedgerFactory("test-indexer");
+    db = fireproof.DB("test-indexer");
     await db.put({ title: "amazing", score: 1 });
     await db.put({ title: "creative", score: 2 });
     await db.put({ title: "creative", score: 20 });
     await db.put({ title: "bazillas", score: 3 });
-    indexer = new Index<[string, number], TestType>(sthis, db.crdt, "hello", (doc) => {
+    indexer = new Index<[string, number], TestType>(sthis, db.ledger.crdt, "hello", (doc) => {
       return [doc.title, doc.score];
     });
     await indexer.ready();
@@ -137,7 +138,7 @@ describe("Index query with compound key", function () {
 });
 
 describe("basic Index with map fun", function () {
-  let db: Ledger<TestType>;
+  let db: Database;
   let indexer: Index<string, TestType>;
   const sthis = ensureSuperThis();
   afterEach(async function () {
@@ -148,11 +149,11 @@ describe("basic Index with map fun", function () {
   });
   beforeEach(async function () {
     await sthis.start();
-    db = LedgerFactory("test-indexer");
+    db = fireproof.DB("test-indexer");
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index<string, TestType>(sthis, db.crdt, "hello", (doc, map) => {
+    indexer = new Index<string, TestType>(sthis, db.ledger.crdt, "hello", (doc, map) => {
       map(doc.title);
     });
     await indexer.ready();
@@ -167,7 +168,7 @@ describe("basic Index with map fun", function () {
 });
 
 describe("basic Index with map fun with value", function () {
-  let db: Ledger<TestType>;
+  let db: Database;
   let indexer: Index<string, TestType, number>;
   const sthis = ensureSuperThis();
   afterEach(async function () {
@@ -176,11 +177,11 @@ describe("basic Index with map fun with value", function () {
   });
   beforeEach(async function () {
     await sthis.start();
-    db = LedgerFactory("test-indexer");
+    db = fireproof.DB("test-indexer");
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index<string, TestType, number>(sthis, db.crdt, "hello", (doc, map) => {
+    indexer = new Index<string, TestType, number>(sthis, db.ledger.crdt, "hello", (doc, map) => {
       map(doc.title, doc.title.length);
     });
   });
@@ -205,7 +206,7 @@ describe("basic Index with map fun with value", function () {
 });
 
 describe("Index query with map and compound key", function () {
-  let db: Ledger<TestType>;
+  let db: Database;
   let indexer: Index<[string, number], TestType>;
   const sthis = ensureSuperThis();
   afterEach(async function () {
@@ -216,12 +217,12 @@ describe("Index query with map and compound key", function () {
   });
   beforeEach(async function () {
     await sthis.start();
-    db = LedgerFactory("test-indexer");
+    db = fireproof.DB("test-indexer");
     await db.put({ title: "amazing", score: 1 });
     await db.put({ title: "creative", score: 2 });
     await db.put({ title: "creative", score: 20 });
     await db.put({ title: "bazillas", score: 3 });
-    indexer = new Index<[string, number], TestType>(sthis, db.crdt, "hello", (doc, emit) => {
+    indexer = new Index<[string, number], TestType>(sthis, db.ledger.crdt, "hello", (doc, emit) => {
       emit([doc.title, doc.score]);
     });
     await indexer.ready();
@@ -235,7 +236,7 @@ describe("Index query with map and compound key", function () {
 });
 
 describe("basic Index with string fun", function () {
-  let db: Ledger<TestType>;
+  let db: Database;
   let indexer: Index<string, TestType>;
   const sthis = ensureSuperThis();
   afterEach(async function () {
@@ -246,11 +247,11 @@ describe("basic Index with string fun", function () {
   });
   beforeEach(async function () {
     await sthis.start();
-    db = LedgerFactory("test-indexer");
+    db = fireproof.DB("test-indexer");
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index(sthis, db.crdt, "title");
+    indexer = new Index<string, TestType>(sthis, db.ledger.crdt, "title");
     await indexer.ready();
   });
   it("should get results", async function () {
@@ -271,7 +272,7 @@ describe("basic Index upon cold start", function () {
     title: string;
     score?: number;
   }
-  let crdt: CRDT<TestType>;
+  let crdt: CRDT;
   let indexer: Index<string, TestType>;
   let didMap: number;
   let mapFn: (doc: TestType) => string;
@@ -295,7 +296,7 @@ describe("basic Index upon cold start", function () {
       storeUrls: toStoreURIRuntime(sthis, "test-indexer-cold"),
       storeEnDe: bs.ensureStoreEnDeFile({}),
     };
-    crdt = new CRDT<TestType>(sthis, dbOpts);
+    crdt = new CRDTImpl(sthis, dbOpts);
     await crdt.bulk([
       { id: "abc1", value: { title: "amazing" } },
       { id: "abc2", value: { title: "creative" } },
@@ -307,7 +308,7 @@ describe("basic Index upon cold start", function () {
       didMap++;
       return doc.title;
     };
-    indexer = await index<string, TestType>({ crdt: crdt }, "hello", mapFn);
+    indexer = await index<string, TestType>(crdt, "hello", mapFn);
     logger.Debug().Msg("post index beforeEach");
     await indexer.ready();
     logger.Debug().Msg("post indexer.ready beforeEach");
@@ -327,12 +328,12 @@ describe("basic Index upon cold start", function () {
     expect(result.rows.length).toEqual(3);
   });
   it("should work on cold load", async function () {
-    const crdt2 = new CRDT<TestType>(sthis, dbOpts);
+    const crdt2 = new CRDTImpl(sthis, dbOpts);
     await crdt2.ready();
     const { result, head } = await crdt2.changes();
     expect(result).toBeTruthy();
     await crdt2.ready();
-    const indexer2 = await index<string, TestType>({ crdt: crdt2 }, "hello", mapFn);
+    const indexer2 = await index<string, TestType>(crdt2, "hello", mapFn);
     await indexer2.ready();
     const result2 = await indexer2.query();
     expect(indexer2.indexHead).toEqual(head);
@@ -342,8 +343,8 @@ describe("basic Index upon cold start", function () {
   });
   it.skip("should not rerun the map function on seen changes", async function () {
     didMap = 0;
-    const crdt2 = new CRDT<TestType>(sthis, dbOpts);
-    const indexer2 = await index({ crdt: crdt2 }, "hello", mapFn);
+    const crdt2 = new CRDTImpl(sthis, dbOpts);
+    const indexer2 = await index(crdt2, "hello", mapFn);
     const { result, head } = await crdt2.changes([]);
     expect(result.length).toEqual(3);
     expect(head.length).toEqual(1);
@@ -367,15 +368,15 @@ describe("basic Index upon cold start", function () {
     expect(didMap).toEqual(1);
   });
   it("should ignore meta when map function definiton changes", async function () {
-    const crdt2 = new CRDT<TestType>(sthis, dbOpts);
-    const result = await index<string, TestType>({ crdt: crdt2 }, "hello", (doc) => doc.title.split("").reverse().join("")).query();
+    const crdt2 = new CRDTImpl(sthis, dbOpts);
+    const result = await index<string, TestType>(crdt2, "hello", (doc) => doc.title.split("").reverse().join("")).query();
     expect(result.rows.length).toEqual(3);
     expect(result.rows[0].key).toEqual("evitaerc"); // creative
   });
 });
 
 describe("basic Index with no data", function () {
-  let db: Ledger<TestType>;
+  let db: Database;
   let indexer: Index<string, TestType>;
   let didMap: boolean;
   const sthis = ensureSuperThis();
@@ -387,15 +388,15 @@ describe("basic Index with no data", function () {
   });
   beforeEach(async function () {
     await sthis.start();
-    db = LedgerFactory("test-indexer");
-    indexer = new Index<string, TestType>(sthis, db.crdt, "hello", (doc) => {
+    db = fireproof.DB("test-indexer");
+    indexer = new Index<string, TestType>(sthis, db.ledger.crdt, "hello", (doc) => {
       didMap = true;
       return doc.title;
     });
     await indexer.ready();
   });
   it("should have properties", function () {
-    expect(indexer.crdt).toEqual(db.crdt);
+    expect(indexer.crdt).toEqual(db.ledger.crdt);
     expect(indexer.name).toEqual("hello");
     expect(indexer.mapFn).toBeTruthy();
   });

package/tests/fireproof/multiple-ledger.test.ts

@@ -1,7 +1,7 @@
-import { Ledger, ensureSuperThis, fireproof } from "@fireproof/core";
+import { Database, ensureSuperThis, fireproof } from "@fireproof/core";
 
 interface DBItem {
-  readonly db: Ledger;
+  readonly db: Database;
   readonly name: string;
 }
 
@@ -26,7 +26,7 @@ describe("Multiple Databases", () => {
         .fill(0)
         .map(async (_, i) => {
           const name = `db-${group}-${i}`;
-          const db = fireproof(name);
+          const db = fireproof.DB(name);
           dbs.push({ db, name });
           for (let i = 0; i < rows; i++) {
             await db.put({ _id: `${name}-${i}`, hello: "world" });

package/tests/gateway/file/loader-config.test.ts

@@ -33,11 +33,11 @@ describe("config file gateway", () => {
   });
 
   it("loader", async () => {
-    const db = fireproof(my_app());
+    const db = fireproof.DB(my_app());
     await db.put({ name: "my-app" });
-    expect(db.name).toBe(my_app());
+    expect(db.ledger.name).toBe(my_app());
 
-    const fileStore = await db.crdt.blockstore.loader?.fileStore();
+    const fileStore = await db.ledger.crdt.blockstore.loader?.fileStore();
     expect(fileStore?.url().asObj()).toEqual({
       pathname: "./dist/fp-dir-file",
       protocol: "file:",
@@ -52,7 +52,7 @@ describe("config file gateway", () => {
       style: "path",
     });
 
-    const dataStore = await db.crdt.blockstore.loader?.carStore();
+    const dataStore = await db.ledger.crdt.blockstore.loader?.carStore();
     expect(dataStore?.url().asObj()).toEqual({
       pathname: "./dist/fp-dir-file",
       protocol: "file:",
@@ -67,7 +67,7 @@ describe("config file gateway", () => {
       },
       style: "path",
     });
-    const metaStore = await db.crdt.blockstore.loader?.metaStore();
+    const metaStore = await db.ledger.crdt.blockstore.loader?.metaStore();
     expect(metaStore?.url().asObj()).toEqual({
       pathname: "./dist/fp-dir-file",
       protocol: "file:",
@@ -81,7 +81,7 @@ describe("config file gateway", () => {
       },
       style: "path",
     });
-    const WALStore = await db.crdt.blockstore.loader?.WALStore();
+    const WALStore = await db.ledger.crdt.blockstore.loader?.WALStore();
     expect(WALStore?.url().asObj()).toEqual({
       pathname: "./dist/fp-dir-file",
       protocol: "file:",
@@ -110,11 +110,11 @@ describe("config file gateway", () => {
       /* */
     });
 
-    const db = fireproof(my_app(), { storeUrls: { base } });
+    const db = fireproof.DB(my_app(), { storeUrls: { base } });
     // console.log(`>>>>>>>>>>>>>>>file-path`)
     await db.put({ name: "my-app" });
-    expect(db.name).toBe(my_app());
-    const carStore = await db.crdt.blockstore.loader?.carStore();
+    expect(db.ledger.name).toBe(my_app());
+    const carStore = await db.ledger.crdt.blockstore.loader?.carStore();
     expect(carStore?.url().asObj()).toEqual({
       pathname: "./dist/data",
       protocol: "file:",
@@ -128,7 +128,7 @@ describe("config file gateway", () => {
       },
       style: "path",
     });
-    const fileStore = await db.crdt.blockstore.loader?.fileStore();
+    const fileStore = await db.ledger.crdt.blockstore.loader?.fileStore();
     expect(fileStore?.url().asObj()).toEqual({
       pathname: "./dist/data",
       protocol: "file:",
@@ -142,7 +142,7 @@ describe("config file gateway", () => {
       style: "path",
     });
     expect((await sysfs.stat(sthis.pathOps.join(baseDir, "data"))).isDirectory()).toBeTruthy();
-    const metaStore = await db.crdt.blockstore.loader?.metaStore();
+    const metaStore = await db.ledger.crdt.blockstore.loader?.metaStore();
     expect(metaStore?.url().asObj()).toEqual({
       pathname: "./dist/data",
       protocol: "file:",
@@ -177,10 +177,10 @@ describe("config file gateway", () => {
 
     expect(baseDir).toMatch(new RegExp(`/\\.fireproof/${rt.FILESTORE_VERSION.replace(/-file/, "")}/${my_app()}`));
 
-    const db = fireproof(my_app());
+    const db = fireproof.DB(my_app());
     await db.put({ name: "my-app" });
-    expect(db.name).toBe(my_app());
-    const carStore = await db.crdt.blockstore.loader?.carStore();
+    expect(db.ledger.name).toBe(my_app());
+    const carStore = await db.ledger.crdt.blockstore.loader?.carStore();
 
     expect(carStore?.url().asObj()).toEqual({
       pathname: `${sthis.env.get("HOME")}/.fireproof/v0.19`,
@@ -200,7 +200,7 @@ describe("config file gateway", () => {
 
     expect((await sysfs.stat(sthis.pathOps.join(baseDir, "data"))).isDirectory()).toBeTruthy();
 
-    const fileStore = await db.crdt.blockstore.loader?.fileStore();
+    const fileStore = await db.ledger.crdt.blockstore.loader?.fileStore();
     expect(fileStore?.url().asObj()).toEqual({
       pathname: `${sthis.env.get("HOME")}/.fireproof/v0.19`,
       protocol: "file:",
@@ -215,7 +215,7 @@ describe("config file gateway", () => {
         version: rt.FILESTORE_VERSION,
       },
     });
-    const metaStore = await db.crdt.blockstore.loader?.metaStore();
+    const metaStore = await db.ledger.crdt.blockstore.loader?.metaStore();
     expect(metaStore?.url().asObj()).toEqual({
       pathname: `${sthis.env.get("HOME")}/.fireproof/v0.19`,
       protocol: "file:",
@@ -250,10 +250,10 @@ describe("config file gateway", () => {
       /* */
     });
 
-    const db = fireproof(my_app());
+    const db = fireproof.DB(my_app());
     await db.put({ name: "my-app" });
-    expect(db.name).toBe(my_app());
-    const carStore = await db.crdt.blockstore.loader.carStore();
+    expect(db.ledger.name).toBe(my_app());
+    const carStore = await db.ledger.crdt.blockstore.loader.carStore();
     expect(carStore?.url().asObj()).toEqual({
       pathname: "./dist/fp-dir-file",
       protocol: "file:",
@@ -271,7 +271,7 @@ describe("config file gateway", () => {
     });
 
     expect((await sysfs.stat(sthis.pathOps.join(baseDir, "data"))).isDirectory()).toBeTruthy();
-    const fileStore = await db.crdt.blockstore.loader?.fileStore();
+    const fileStore = await db.ledger.crdt.blockstore.loader?.fileStore();
     expect(fileStore?.url().asObj()).toEqual({
       pathname: `./dist/fp-dir-file`,
       protocol: "file:",
@@ -286,7 +286,7 @@ describe("config file gateway", () => {
       },
     });
 
-    const metaStore = await db.crdt.blockstore.loader?.metaStore();
+    const metaStore = await db.ledger.crdt.blockstore.loader?.metaStore();
     expect(metaStore?.url().asObj()).toEqual({
       pathname: `./dist/fp-dir-file`,
       protocol: "file:",

package/tests/gateway/indexdb/loader-config.test.ts

@@ -12,11 +12,11 @@ describe("fireproof config indexdb", () => {
   });
 
   it("indexdb-loader", async () => {
-    const db = fireproof(my_app());
+    const db = fireproof.DB(my_app());
     await db.put({ name: "my-app" });
-    expect(db.name).toBe(my_app());
+    expect(db.ledger.name).toBe(my_app());
 
-    const fileStore = await db.crdt.blockstore.loader.fileStore();
+    const fileStore = await db.ledger.crdt.blockstore.loader.fileStore();
     expect(fileStore?.url().asObj()).toEqual({
       pathname: "fp",
       protocol: "indexdb:",
@@ -31,7 +31,7 @@ describe("fireproof config indexdb", () => {
       style: "path",
     });
 
-    const dataStore = await db.crdt.blockstore.loader.carStore();
+    const dataStore = await db.ledger.crdt.blockstore.loader.carStore();
     expect(dataStore?.url().asObj()).toEqual({
       pathname: "fp",
       protocol: "indexdb:",
@@ -46,7 +46,7 @@ describe("fireproof config indexdb", () => {
       },
       style: "path",
     });
-    const metaStore = await db.crdt.blockstore.loader.metaStore();
+    const metaStore = await db.ledger.crdt.blockstore.loader.metaStore();
     expect(metaStore?.url().asObj()).toEqual({
       pathname: "fp",
       protocol: "indexdb:",
@@ -60,7 +60,7 @@ describe("fireproof config indexdb", () => {
       },
       style: "path",
     });
-    const WALStore = await db.crdt.blockstore.loader.WALStore();
+    const WALStore = await db.ledger.crdt.blockstore.loader.WALStore();
     expect(WALStore?.url().asObj()).toEqual({
       pathname: "fp",
       protocol: "indexdb:",

package/tests/react/useFireproof.test.tsx

@@ -10,10 +10,10 @@ describe("HOOK: useFireproof", () => {
 
   it("renders the hook correctly and checks types", () => {
     renderHook(() => {
-      const { ledger, useLiveQuery, useDocument } = useFireproof("dbname");
+      const { database, useLiveQuery, useDocument } = useFireproof("dbname");
       expect(typeof useLiveQuery).toBe("function");
       expect(typeof useDocument).toBe("function");
-      expect(ledger?.constructor.name).toMatch(/^Ledger/);
+      expect(database?.constructor.name).toMatch(/^Database/);
     });
   });
 });