@fireproof/core 0.19.8-dev-global → 0.19.8-dev-series-2

package/tests/fireproof/crdt.test.ts

@@ -1,21 +1,19 @@
-import { itSkip } from "../helpers.js";
-
-import { uuidv4 } from "uuidv7";
-
 import { CRDT } from "@fireproof/core";
-import { bs, rt } from "@fireproof/core";
+import { bs } from "@fireproof/core";
 import { CRDTMeta, DocValue } from "@fireproof/core";
 import { Index, index } from "@fireproof/core";
+import { mockSuperThis } from "../helpers";
 
 describe("Fresh crdt", function () {
   let crdt: CRDT<{ hello: string } | { points: number }>;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
-    crdt = new CRDT();
+    await sthis.start();
+    crdt = new CRDT(sthis);
   });
   it("should have an empty head", async function () {
     const head = crdt.clock.head;
@@ -43,6 +41,7 @@ describe("CRDT with one record", function () {
   }
   let crdt: CRDT<Partial<CRDTTestType>>;
   let firstPut: CRDTMeta;
+  const sthis = mockSuperThis();
 
   afterEach(async function () {
     await crdt.close();
@@ -50,8 +49,8 @@ describe("CRDT with one record", function () {
   });
 
   beforeEach(async function () {
-    await rt.SysContainer.start();
-    crdt = new CRDT(`test@${uuidv4()}`);
+    await sthis.start();
+    crdt = new CRDT(sthis, `test@${sthis.nextId()}`);
     firstPut = await crdt.bulk([{ id: "hello", value: { hello: "world" } }]);
   });
   it("should have a one-element head", async function () {
@@ -93,14 +92,15 @@ describe("CRDT with a multi-write", function () {
   }
   let crdt: CRDT<CRDTTestType>;
   let firstPut: CRDTMeta;
+  const sthis = mockSuperThis();
 
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
-    crdt = new CRDT();
+    await sthis.start();
+    crdt = new CRDT(sthis);
     firstPut = await crdt.bulk([
       { id: "ace", value: { points: 11 } },
       { id: "king", value: { points: 10 } },
@@ -158,13 +158,14 @@ describe("CRDT with two multi-writes", function () {
   let crdt: CRDT<CRDTTestType>;
   let firstPut: CRDTMeta;
   let secondPut: CRDTMeta;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
   });
   beforeEach(async () => {
-    await rt.SysContainer.start();
-    crdt = new CRDT();
+    await sthis.start();
+    crdt = new CRDT(sthis);
     firstPut = await crdt.bulk([
       { id: "ace", value: { points: 11 } },
       { id: "king", value: { points: 10 } },
@@ -205,13 +206,14 @@ describe("CRDT with two multi-writes", function () {
 
 describe("Compact a named CRDT with writes", function () {
   let crdt: CRDT<CRDTTestType>;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
-    crdt = new CRDT("named-crdt-compaction");
+    await sthis.start();
+    crdt = new CRDT(sthis, "named-crdt-compaction");
     for (let i = 0; i < 10; i++) {
       const bulk = [
         { id: "ace", value: { points: 11 } },
@@ -237,7 +239,7 @@ describe("Compact a named CRDT with writes", function () {
     expect(result.length).toBe(2);
     expect(result[0].id).toBe("ace");
   });
-  itSkip("should have fewer blocks after compact", async function () {
+  it.skip("should have fewer blocks after compact", async function () {
     await crdt.compact();
     const blz: bs.AnyBlock[] = [];
     for await (const blk of crdt.blockstore.entries()) {
@@ -260,18 +262,19 @@ describe("Compact a named CRDT with writes", function () {
 describe("CRDT with an index", function () {
   let crdt: CRDT<CRDTTestType>;
   let idx: Index<number, CRDTTestType>;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
-    crdt = new CRDT<CRDTTestType>();
+    await sthis.start();
+    crdt = new CRDT<CRDTTestType>(sthis);
     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>(sthis, { _crdt: crdt }, "points");
   });
   it("should query the data", async function () {
     const got = await idx.query({ range: [9, 12] });
@@ -280,7 +283,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>(sthis, { _crdt: crdt }, "points");
     expect(rIdx).toBeTruthy();
     expect(rIdx.name).toBe("points");
     const got = await rIdx.query({ range: [9, 12] });
@@ -289,7 +292,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(sthis, { _crdt: crdt }, "points", (doc) => doc._id)
       .query()
       .catch((err) => err);
     expect(e.message).toMatch(/cannot apply/);
@@ -305,13 +308,14 @@ describe("Loader with a committed transaction", function () {
   let crdt: CRDT<CRDTTestType>;
   let done: CRDTMeta;
   const dbname = "test-loader";
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
-    crdt = new CRDT(dbname);
+    await sthis.start();
+    crdt = new CRDT(sthis, dbname);
     blockstore = crdt.blockstore as bs.EncryptedBlockstore;
     expect(blockstore.loader).toBeTruthy();
     loader = blockstore.loader;
@@ -325,7 +329,7 @@ describe("Loader with a committed transaction", function () {
     // expect(done.cars).toBeTruthy();
     expect(loader.carLog.length).toBe(1);
   });
-  it("can load the car", async function () {
+  it("can load the car", async () => {
     const blk = loader.carLog[0][0];
     expect(blk).toBeTruthy();
     const reader = await loader.loadCar(blk);
@@ -347,13 +351,14 @@ describe("Loader with two committed transactions", function () {
   let blockstore: bs.EncryptedBlockstore;
   let done1: CRDTMeta;
   let done2: CRDTMeta;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
-    crdt = new CRDT("test-loader");
+    await sthis.start();
+    crdt = new CRDT(sthis, "test-loader");
     blockstore = crdt.blockstore as bs.EncryptedBlockstore;
     expect(blockstore.loader).toBeTruthy();
     loader = blockstore.loader;
@@ -396,13 +401,14 @@ describe("Loader with many committed transactions", function () {
   let crdt: CRDT<Doc>;
   let dones: CRDTMeta[];
   const count = 10;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
-    crdt = new CRDT("test-loader-many");
+    await sthis.start();
+    crdt = new CRDT(sthis, "test-loader-many");
     blockstore = crdt.blockstore as bs.EncryptedBlockstore;
     expect(blockstore.loader).toBeTruthy();
     loader = blockstore.loader;

package/tests/fireproof/database.test.ts

@@ -1,14 +1,15 @@
-import { buildBlobFiles, FileWithCid } from "../helpers.js";
-import { rt, bs, Database, DocResponse, DocFileMeta, DocWithId, DocFiles } from "@fireproof/core";
+import { buildBlobFiles, FileWithCid, mockSuperThis } from "../helpers.js";
+import { bs, Database, DocResponse, DocFileMeta, DocWithId, DocFiles } from "@fireproof/core";
 
 describe("basic Database", () => {
   let db: Database;
+  const sthis = mockSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
   });
   beforeEach(async () => {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database();
   });
   it("should put", async () => {
@@ -38,12 +39,13 @@ describe("basic Database with record", function () {
     readonly value: string;
   }
   let db: Database;
+  const sthis = mockSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database();
     const ok = await db.put<Doc>({ _id: "hello", value: "world" });
     expect(ok.id).toBe("hello");
@@ -91,12 +93,13 @@ describe("named Database with record", function () {
     readonly value: string;
   }
   let db: Database;
+  const sthis = mockSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database("test-db-name");
     /** @type {Doc} */
     const doc = { _id: "hello", value: "world" };
@@ -137,9 +140,10 @@ describe("named Database with record", function () {
     const loader = blocks.loader;
     expect(loader).toBeTruthy();
     await loader.ready();
-    expect(loader.key?.length).toBe(64);
-    expect(loader.keyId?.length).toBe(64);
-    expect(loader.key).not.toBe(loader.keyId);
+
+    // expect(loader.key?.length).toBe(64);
+    // expect(loader.keyId?.length).toBe(64);
+    // expect(loader.key).not.toBe(loader.keyId);
   });
   it("should work right with a sequence of changes", async function () {
     const numDocs = 10;
@@ -216,12 +220,13 @@ describe("named Database with record", function () {
 describe("basic Database parallel writes / public", function () {
   let db: Database;
   const writes: Promise<DocResponse>[] = [];
+  const sthis = mockSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database("test-parallel-writes", { public: true });
     for (let i = 0; i < 10; i++) {
       const doc = { _id: `id-${i}`, hello: "world" };
@@ -284,8 +289,8 @@ describe("basic Database parallel writes / public", function () {
     const loader = blocks.loader;
     expect(loader).toBeTruthy();
     await loader.ready();
-    expect(loader.key).toBeUndefined();
-    expect(loader.keyId).toBeUndefined();
+    // expect(loader.key).toBeUndefined();
+    // expect(loader.keyId).toBeUndefined();
   });
 });
 
@@ -295,12 +300,13 @@ describe("basic Database with subscription", function () {
   let unsubscribe: () => void;
   let lastDoc: DocWithId<NonNullable<unknown>>;
   let waitForSub: Promise<void>;
+  const sthis = mockSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database();
     didRun = 0;
     waitForSub = new Promise((resolve) => {
@@ -338,12 +344,13 @@ describe("basic Database with no update subscription", function () {
   let db: Database;
   let didRun: number;
   let unsubscribe: () => void;
+  const sthis = mockSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database();
     didRun = 0;
 
@@ -374,13 +381,14 @@ describe("database with files input", () => {
   let db: Database;
   let imagefiles: FileWithCid[] = [];
   let result: DocResponse;
+  const sthis = mockSuperThis();
 
   afterEach(async () => {
     await db.close();
     await db.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     imagefiles = await buildBlobFiles();
     db = new Database("fireproof-with-images");
     const doc = {

package/tests/fireproof/fireproof.test.fixture.ts

@@ -0,0 +1,133 @@
+export const docs = [
+  {
+    _id: "02pkji8",
+    type: "todo",
+    title: "On the browser",
+    listId: "0k23ulso",
+    completed: false,
+    createdAt: "2024-06-30T15:15:01.482Z",
+  },
+  { _id: "0k23ulso", type: "list", title: "Building Apps" },
+  { _id: "1ctdt28g", type: "list", title: "Having Fun" },
+  { _id: "294n3m2o", type: "list", title: "Getting Groceries" },
+  {
+    _id: "63eheg8",
+    type: "todo",
+    title: "Macadamia nut milk",
+    listId: "294n3m2o",
+    completed: false,
+    createdAt: "2024-06-30T15:15:03.282Z",
+  },
+  {
+    _id: "65e459g",
+    type: "todo",
+    title: "Fruit salad",
+    listId: "294n3m2o",
+    completed: false,
+    createdAt: "2024-06-30T15:15:04.144Z",
+  },
+  {
+    _id: "6icqlvg",
+    type: "todo",
+    title: "Bacon",
+    listId: "294n3m2o",
+    completed: false,
+    createdAt: "2024-06-30T15:15:05.282Z",
+  },
+  {
+    _id: "7terjo",
+    type: "todo",
+    title: "Rollerskating meetup",
+    listId: "1ctdt28g",
+    completed: false,
+    createdAt: "2024-06-30T15:15:06.282Z",
+  },
+  {
+    _id: "8vr6cc",
+    type: "todo",
+    title: "With or without Redux",
+    listId: "0k23ulso",
+    completed: false,
+    createdAt: "2024-06-30T15:15:07.282Z",
+  },
+  {
+    _id: "ck2sb08",
+    type: "todo",
+    title: "Write a sci-fi story with ChatGPT",
+    listId: "1ctdt28g",
+    completed: true,
+    createdAt: "2024-06-30T15:15:08.282Z",
+  },
+  {
+    _id: "dlkeeoo",
+    type: "todo",
+    title: "Avocado toast",
+    listId: "294n3m2o",
+    completed: false,
+    createdAt: "2024-06-30T15:15:09.282Z",
+  },
+  {
+    _id: "f9i8tx7nxswo",
+    type: "todo",
+    title: "nice",
+    listId: "0k23ulso",
+    completed: true,
+    createdAt: "2024-06-30T15:15:01.482Z",
+  },
+  {
+    _id: "fkgjmbg",
+    type: "todo",
+    title: "Automatic replication and versioning",
+    listId: "0k23ulso",
+    completed: true,
+    createdAt: "2024-06-30T15:15:10.282Z",
+  },
+  {
+    _id: "fks8hig",
+    type: "todo",
+    title: "Motorcycle ride",
+    listId: "1ctdt28g",
+    completed: false,
+    createdAt: "2024-06-30T15:15:11.282Z",
+  },
+  {
+    _id: "hf60rf",
+    type: "todo",
+    title: "Sourdough bread",
+    listId: "294n3m2o",
+    completed: true,
+    createdAt: "2024-06-30T15:15:12.282Z",
+  },
+  {
+    _id: "n219un",
+    type: "todo",
+    title: "Login components",
+    listId: "0k23ulso",
+    completed: true,
+    createdAt: "2024-06-30T15:15:13.282Z",
+  },
+  {
+    _id: "phr936g",
+    type: "todo",
+    title: "Coffee",
+    listId: "294n3m2o",
+    completed: false,
+    createdAt: "2024-06-30T15:15:14.282Z",
+  },
+  {
+    _id: "vcj2fv8",
+    type: "todo",
+    title: "On the phone",
+    listId: "0k23ulso",
+    completed: false,
+    createdAt: "2024-06-30T15:15:15.282Z",
+  },
+  {
+    _id: "vqmbes8",
+    type: "todo",
+    title: "GraphQL queries",
+    listId: "0k23ulso",
+    completed: false,
+    createdAt: "2024-06-30T15:15:16.282Z",
+  },
+];