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

package/tests/fireproof/hello.test.ts

@@ -1,4 +1,4 @@
-import { rt, fireproof as database, Database, DocResponse, DocWithId, index, Index, IndexRows } from "@fireproof/core";
+import { fireproof as database, Database, DocResponse, DocWithId } from "@fireproof/core";
 
 describe("Hello World Test", function () {
   it("should pass the hello world test", function () {
@@ -7,37 +7,26 @@ describe("Hello World Test", function () {
   });
 });
 
-describe("public API", function () {
+describe("hello public API", function () {
   interface TestDoc {
     foo: string;
   }
   let db: Database;
-  let idx: Index<string, TestDoc>;
   let ok: DocResponse;
   let doc: DocWithId<TestDoc>;
-  let query: IndexRows<string, TestDoc>;
   afterEach(async function () {
     await db.close();
     await db.destroy();
-    await idx.close();
-    await idx.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
     db = database("test-public-api");
-    idx = index<string, TestDoc>(db, "test-index", (doc) => doc.foo);
     ok = await db.put({ _id: "test", foo: "bar" });
     doc = await db.get("test");
-    query = await idx.query();
   });
   it("should have a database", function () {
     expect(db).toBeTruthy();
     expect(db instanceof Database).toBeTruthy();
   });
-  it("should have an index", function () {
-    expect(idx).toBeTruthy();
-    expect(idx instanceof Index).toBeTruthy();
-  });
   it("should put", function () {
     expect(ok).toBeTruthy();
     expect(ok.id).toBe("test");
@@ -45,10 +34,37 @@ describe("public API", function () {
   it("should get", function () {
     expect(doc.foo).toBe("bar");
   });
-  it("should query", function () {
-    expect(query).toBeTruthy();
-    expect(query.rows).toBeTruthy();
-    expect(query.rows.length).toBe(1);
-    expect(query.rows[0].key).toBe("bar");
+  it("should get when you open it again", async function () {
+    await db.close();
+    await db.destroy();
+    const db2 = database("test-public-api");
+    doc = await db2.get("test");
+    expect(doc.foo).toBe("bar");
+  });
+});
+
+describe("Simplified Reopening a database", function () {
+  let db: Database;
+  afterEach(async function () {
+    await db.close();
+    await db.destroy();
+  });
+  beforeEach(async function () {
+    db = new Database("test-reopen-simple");
+    const ok = await db.put({ _id: "test", foo: "bar" });
+    expect(ok).toBeTruthy();
+    expect(ok.id).toBe("test");
+  });
+
+  it("should persist data", async function () {
+    const doc = await db.get<{ foo: string }>("test");
+    expect(doc.foo).toBe("bar");
+  });
+
+  it("should have the same data on reopen", async function () {
+    const db2 = new Database("test-reopen-simple");
+    const doc = await db2.get<{ foo: string }>("test");
+    expect(doc.foo).toBe("bar");
+    await db2.close();
   });
 });

package/tests/fireproof/indexer.test.ts

@@ -1,6 +1,5 @@
-import { itSkip } from "../helpers.js";
-
-import { rt, Index, index, Database, CRDT, IndexRows } from "@fireproof/core";
+import { Index, index, Database, CRDT, IndexRows } from "@fireproof/core";
+import { mockSuperThis } from "../helpers";
 
 interface TestType {
   readonly title: string;
@@ -11,6 +10,7 @@ describe("basic Index", () => {
   let db: Database<TestType>;
   let indexer: Index<string, TestType>;
   let didMap: boolean;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -18,12 +18,12 @@ describe("basic Index", () => {
     await indexer.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database("test-indexer");
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index<string, TestType>(db._crdt, "hello", (doc) => {
+    indexer = new Index<string, TestType>(sthis, db._crdt, "hello", (doc) => {
       didMap = true;
       return doc.title;
     });
@@ -97,6 +97,7 @@ describe("basic Index", () => {
 describe("Index query with compound key", function () {
   let db: Database<TestType>;
   let indexer: Index<[string, number], TestType>;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -104,13 +105,13 @@ describe("Index query with compound key", function () {
     await indexer.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database("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>(db._crdt, "hello", (doc) => {
+    indexer = new Index<[string, number], TestType>(sthis, db._crdt, "hello", (doc) => {
       return [doc.title, doc.score];
     });
     await indexer.ready();
@@ -126,6 +127,7 @@ describe("Index query with compound key", function () {
 describe("basic Index with map fun", function () {
   let db: Database<TestType>;
   let indexer: Index<string, TestType>;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -133,12 +135,12 @@ describe("basic Index with map fun", function () {
     await indexer.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database("test-indexer");
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index<string, TestType>(db._crdt, "hello", (doc, map) => {
+    indexer = new Index<string, TestType>(sthis, db._crdt, "hello", (doc, map) => {
       map(doc.title);
     });
     await indexer.ready();
@@ -155,17 +157,18 @@ describe("basic Index with map fun", function () {
 describe("basic Index with map fun with value", function () {
   let db: Database<TestType>;
   let indexer: Index<string, TestType, number>;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database("test-indexer");
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index<string, TestType, number>(db._crdt, "hello", (doc, map) => {
+    indexer = new Index<string, TestType, number>(sthis, db._crdt, "hello", (doc, map) => {
       map(doc.title, doc.title.length);
     });
   });
@@ -192,6 +195,7 @@ describe("basic Index with map fun with value", function () {
 describe("Index query with map and compound key", function () {
   let db: Database<TestType>;
   let indexer: Index<[string, number], TestType>;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -199,13 +203,13 @@ describe("Index query with map and compound key", function () {
     await indexer.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database("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>(db._crdt, "hello", (doc, emit) => {
+    indexer = new Index<[string, number], TestType>(sthis, db._crdt, "hello", (doc, emit) => {
       emit([doc.title, doc.score]);
     });
     await indexer.ready();
@@ -221,6 +225,7 @@ describe("Index query with map and compound key", function () {
 describe("basic Index with string fun", function () {
   let db: Database<TestType>;
   let indexer: Index<string, TestType>;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -228,12 +233,12 @@ describe("basic Index with string fun", function () {
     await indexer.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database("test-indexer");
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index(db._crdt, "title");
+    indexer = new Index(sthis, db._crdt, "title");
     await indexer.ready();
   });
   it("should get results", async function () {
@@ -259,6 +264,7 @@ describe("basic Index upon cold start", function () {
   let didMap: number;
   let mapFn: (doc: TestType) => string;
   let result: IndexRows<string, TestType>;
+  const sthis = mockSuperThis();
   // result, mapFn;
   afterEach(async function () {
     await crdt.close();
@@ -267,9 +273,9 @@ describe("basic Index upon cold start", function () {
     await indexer.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     // db = database()
-    crdt = new CRDT<TestType>("test-indexer-cold", { persistIndexes: true });
+    crdt = new CRDT<TestType>(sthis, "test-indexer-cold", { persistIndexes: true });
     await crdt.bulk([
       { id: "abc1", value: { title: "amazing" } },
       { id: "abc2", value: { title: "creative" } },
@@ -280,7 +286,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>(sthis, { _crdt: crdt }, "hello", mapFn);
     await indexer.ready();
     // new Index(db._crdt.indexBlockstore, db._crdt, 'hello', mapFn)
     result = await indexer.query();
@@ -296,12 +302,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>("test-indexer-cold", { persistIndexes: true });
+    const crdt2 = new CRDT<TestType>(sthis, "test-indexer-cold", { persistIndexes: true });
     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>(sthis, { _crdt: crdt2 }, "hello", mapFn);
     await indexer2.ready();
     const result2 = await indexer2.query();
     expect(indexer2.indexHead).toEqual(head);
@@ -309,10 +315,10 @@ describe("basic Index upon cold start", function () {
     expect(result2.rows.length).toEqual(3);
     expect(indexer2.indexHead).toEqual(head);
   });
-  itSkip("should not rerun the map function on seen changes", async function () {
+  it.skip("should not rerun the map function on seen changes", async function () {
     didMap = 0;
-    const crdt2 = new CRDT<TestType>("test-indexer-cold", { persistIndexes: true });
-    const indexer2 = await index({ _crdt: crdt2 }, "hello", mapFn);
+    const crdt2 = new CRDT<TestType>(sthis, "test-indexer-cold", { persistIndexes: true });
+    const indexer2 = await index(sthis, { _crdt: crdt2 }, "hello", mapFn);
     const { result, head } = await crdt2.changes([]);
     expect(result.length).toEqual(3);
     expect(head.length).toEqual(1);
@@ -336,8 +342,8 @@ 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>("test-indexer-cold");
-    const result = await index<string, TestType>({ _crdt: crdt2 }, "hello", (doc) =>
+    const crdt2 = new CRDT<TestType>(sthis, "test-indexer-cold");
+    const result = await index<string, TestType>(sthis, { _crdt: crdt2 }, "hello", (doc) =>
       doc.title.split("").reverse().join(""),
     ).query();
     expect(result.rows.length).toEqual(3);
@@ -349,6 +355,7 @@ describe("basic Index with no data", function () {
   let db: Database<TestType>;
   let indexer: Index<string, TestType>;
   let didMap: boolean;
+  const sthis = mockSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -356,9 +363,9 @@ describe("basic Index with no data", function () {
     await indexer.destroy();
   });
   beforeEach(async function () {
-    await rt.SysContainer.start();
+    await sthis.start();
     db = new Database("test-indexer");
-    indexer = new Index<string, TestType>(db._crdt, "hello", (doc) => {
+    indexer = new Index<string, TestType>(sthis, db._crdt, "hello", (doc) => {
       didMap = true;
       return doc.title;
     });

package/tests/fireproof/utils.test.ts

@@ -0,0 +1,84 @@
+import { URI } from "@adviser/cement";
+import { rt, getStore, ensureSuperLog } from "@fireproof/core";
+import { mockSuperThis } from "../helpers";
+
+// only for test
+import { UUID } from "uuidv7";
+
+describe("utils", () => {
+  const sthis = mockSuperThis({});
+  const logger = ensureSuperLog(sthis, "getfilename");
+
+  beforeAll(async () => {
+    await sthis.start();
+  });
+
+  it("sorts search params", () => {
+    const url = URI.from("http://example.com?z=1&y=2&x=3");
+    expect(url.toString()).toEqual("http://example.com/?x=3&y=2&z=1");
+  });
+
+  const storeOpts = [
+    {
+      type: "data",
+      suffix: ".car",
+    },
+    {
+      type: "wal",
+      suffix: ".json",
+    },
+    {
+      type: "meta",
+      suffix: ".json",
+    },
+  ];
+  it("getfilename plain", () => {
+    for (const store of storeOpts) {
+      const url = URI.from(`file://./x/path?store=${store.type}&name=name&key=key&version=version`);
+      expect(rt.getFileName(url, logger)).toEqual(`${store.type}/key${store.suffix}`);
+    }
+  });
+
+  it("getfilename index", () => {
+    for (const store of storeOpts) {
+      const url = URI.from(`file://./x/path?index=idx&store=${store.type}&name=name&key=key&version=version`);
+      expect(rt.getFileName(url, logger)).toEqual(`idx-${store.type}/key${store.suffix}`);
+    }
+  });
+
+  it("getstore", () => {
+    for (const store of storeOpts) {
+      const url = URI.from(`file://./x/path?store=${store.type}&name=name&key=key&version=version`);
+      expect(getStore(url, logger, (...toJoin) => toJoin.join("+"))).toEqual({
+        name: store.type,
+        store: store.type,
+      });
+    }
+  });
+
+  it("getstore idx", () => {
+    for (const store of storeOpts) {
+      const url = URI.from(`file://./x/path?index=ix&store=${store.type}&name=name&key=key&version=version`);
+      expect(getStore(url, logger, (...toJoin) => toJoin.join("+"))).toEqual({
+        name: `ix+${store.type}`,
+        store: store.type,
+      });
+    }
+  });
+
+  it("order timeorderednextid", () => {
+    let last = sthis.timeOrderedNextId().str;
+    for (let i = 0; i < 10; i++) {
+      const id = sthis.timeOrderedNextId().str;
+      const x = UUID.parse(id);
+      expect(x.getVariant()).toBe("VAR_10");
+      assert(id !== last, "id should be greater than last");
+      assert(id.slice(0, 13) >= last.slice(0, 13), `id should be greater than last ${id.slice(0, 13)} ${last.slice(0, 13)}`);
+      last = id;
+    }
+  });
+  it("timeorderednextid is uuidv7", () => {
+    const id = sthis.timeOrderedNextId(0xcafebabebeef).str;
+    expect(id.slice(0, 15)).toBe("cafebabe-beef-7");
+  });
+});

package/tests/helpers.ts

@@ -1,66 +1,12 @@
-import { rt } from "@fireproof/core";
+import { LogCollector, MockLogger, runtimeFn, toCryptoRuntime, URI } from "@adviser/cement";
+import { dataDir, ensureSuperThis, rt, SuperThis, SuperThisOpts } from "@fireproof/core";
 
-const dataDir = rt.dataDir;
 export { dataDir };
 
 export function sleep(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-export function itSkip(value: string, fn: () => unknown, options?: number) {
-  if (typeof it !== "function") {
-    return;
-  }
-  const mit = it as unknown as { skip: (value: string, fn: () => unknown, options?: unknown) => unknown };
-  if (mit && typeof mit.skip === "function") {
-    mit.skip(value, fn, options);
-    return;
-  }
-  console.warn("itSkip of " + value);
-}
-
-//
-
-// // Function to copy a directory
-// export async function copyDirectory(source: string, destination: string) {
-//   // Ensure the destination directory exists
-//   await rt.SysContainer.mkdir(destination, { recursive: true });
-
-//   // Read the source directory
-//   const entries = await SysContainer.readdirent(source, { withFileTypes: true });
-
-//   // Iterate through each entry in the directory
-//   for (const entry of entries) {
-//     const sourcePath = SysContainer.join(source, entry.name);
-//     const destinationPath = SysContainer.join(destination, entry.name);
-
-//     if (entry.isDirectory()) {
-//       // If the entry is a directory, copy it recursively
-//       await copyDirectory(sourcePath, destinationPath);
-//     } else if (entry.isFile()) {
-//       // If the entry is a file, copy it
-//       await SysContainer.copyFile(sourcePath, destinationPath);
-//     }
-//   }
-// }
-
-// export function getDirectoryName(url: string) {
-//   let path: string;
-//   try {
-//     path = SysContainer.fileURLToPath(url);
-//   } catch (e) {
-//     path = url;
-//   }
-//   if (process && typeof process.cwd === "function") {
-//     const cwd = process.cwd();
-//     if (cwd.endsWith("dist/esm")) {
-//       path = "../../" + path;
-//     }
-//   }
-//   const dir_name = SysContainer.dirname(path);
-//   return dir_name;
-// }
-
 async function toFileWithCid(buffer: Uint8Array, name: string, opts: FilePropertyBag): Promise<FileWithCid> {
   return {
     file: new File([new Blob([buffer])], name, opts),
@@ -73,9 +19,34 @@ export interface FileWithCid {
   cid: string;
 }
 export async function buildBlobFiles(): Promise<FileWithCid[]> {
-  const cp = rt.crypto.toCryptoOpts();
+  const cp = toCryptoRuntime();
   return [
     await toFileWithCid(cp.randomBytes(Math.random() * 51283), `image.jpg`, { type: "image/jpeg" }),
     await toFileWithCid(cp.randomBytes(Math.random() * 51283), `fireproof.png`, { type: "image/png" }),
   ];
 }
+
+export function storageURL(sthis: SuperThis): URI {
+  const old = sthis.env.get("FP_STORAGE_URL");
+  let merged: URI;
+  if (runtimeFn().isBrowser) {
+    merged = URI.merge(`indexdb://fp`, old, "indexdb:");
+  } else {
+    merged = URI.merge(`./dist/env`, old);
+  }
+  return merged;
+}
+
+export type MockSuperThis = SuperThis & { logCollector: LogCollector };
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function mockSuperThis(sthis?: Partial<SuperThisOpts>): MockSuperThis {
+  const mockLog = MockLogger();
+  const ethis = ensureSuperThis({
+    logger: mockLog.logger,
+    ctx: {
+      logCollector: mockLog.logCollector,
+    },
+  }) as MockSuperThis;
+  ethis.logCollector = mockLog.logCollector;
+  return ethis;
+}

package/tests/www/todo-local.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Fireproof Test</title>
-    <script src="./fireproof.iife.js"></script>
+    <script src="index.global.js"></script>
     <script type="text/javascript">
       function todoApp() {
         const actorTag = Math.random().toString(36).substring(2, 7);

package/tests/www/todo.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Fireproof Test</title>
-    <script src="./fireproof.iife.js"></script>
-    <script src="./connect-partykit.iife.js"></script>
+    <script src="index.global.js"></script>
+    <script src="partykit.global.js"></script>
     <script type="text/javascript">
       function todoApp() {
         const actorTag = Math.random().toString(36).substring(2, 7);
         const { fireproof, index } = Fireproof;
-        const { connect } = FireproofConnect;
+        const { connect } = Connect;
 
         // console.log('connect', connect)
 
@@ -38,10 +38,11 @@
           } else {
             dbName = name;
             db = fireproof(name, { autoCompact: 100, threshold: 50000 });
-            cx = connect.partykitRest(db);
-            cx.ready.then(async () => {
+            cx = connect(db);
+            cx.loaded.then(async () => {
               const span = document.querySelector("#cxInfo");
-              span.innerText = `📡 ${cx.party.id}`;
+              console.log("cx", cx);
+              span.innerText = `📡 ${cx.url.toString()}`;
             });
           }
 
@@ -52,7 +53,7 @@
             if (changes.clock.length > 0) {
               input.disabled = false;
             } else {
-              cx.ready.then(async () => {
+              cx.loaded.then(async () => {
                 input.disabled = false;
               });
             }
@@ -75,16 +76,12 @@
         let compactor = "🚗";
         function drawInfo() {
           document.querySelector("#carLog").innerText =
-            ` ⏰ ${db._crdt.clock.head.length} ${compactor} ${cx.loader.carLog.length}  📩 ${cx.loader.remoteWAL.walState.operations.length}`;
+            ` ⏰ ${db._crdt.clock.head.length} ${compactor} ${cx.loader.carLog.length}  📩 ${1}`;
         }
         const doRedraw = async () => {
           drawInfo();
           const result = await db.allDocs().catch((e) => {
-            console.error(
-              "allDocs error",
-              e,
-              ` ⏰ ${db._crdt.clock.head.length} ${compactor} ${cx.loader.carLog.length}  📩 ${cx.loader.remoteWAL.walState.operations.length}`,
-            );
+            console.error("allDocs error", e, ` ⏰ ${db._crdt.clock.head.length} ${compactor} ${cx.loader.carLog.length}  📩 ${1}`);
             return { rows: [] };
           });
           drawInfo();
@@ -166,8 +163,8 @@
         const goWorker = (dcs) => {
           const timeout =
             10 +
-            Math.pow(db._crdt.clock.head.length + cx.loader.remoteWAL.walState.operations.length, 2) *
-              (Math.floor(Math.random() * 1000) + 1000);
+            Math.pow(db._crdt.clock.head.length + cx.loader.taskManager.queue.length, 2) *
+              (Math.floor(Math.random() * 2000) + 2000);
           // console.log('go worker', timeout/ 1000)
           worker = setTimeout(async () => {
             await Promise.all(

package/utils-QO2HIWGI.js

@@ -0,0 +1,14 @@
+import {
+  getFileName,
+  getFileSystem,
+  getPath,
+  toArrayBuffer
+} from "./chunk-WS3YRPIA.js";
+import "./chunk-OFGPKRCM.js";
+export {
+  getFileName,
+  getFileSystem,
+  getPath,
+  toArrayBuffer
+};
+//# sourceMappingURL=utils-QO2HIWGI.js.map

package/utils-QO2HIWGI.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}