@fireproof/core 0.19.118 → 0.19.119-dev-log

package/tests/blockstore/loader.test.ts

@@ -3,8 +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, rt } from "@fireproof/core";
-import { mockSuperThis } from "../helpers.js";
+import { CRDTMeta, IndexTransactionMeta, SuperThis, bs, ensureSuperThis, rt } from "@fireproof/core";
 
 class MyMemoryBlockStore extends bs.EncryptedBlockstore {
   readonly memblock = new MemoryBlockstore();
@@ -51,7 +50,7 @@ describe("basic Loader simple", function () {
   let loader: bs.Loader;
   let block: BlockView;
   let t: bs.CarTransaction;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async function () {
     await loader.close();
@@ -99,7 +98,7 @@ describe("basic Loader with two commits", function () {
   let carCid: bs.CarGroup;
   let carCid0: bs.CarGroup;
 
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async function () {
     await loader.close();
@@ -201,7 +200,7 @@ describe("basic Loader with index commits", function () {
   let indexerResult: IndexTransactionMeta;
   let cid: CID;
   // let indexMap: Map<string, CID>;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async function () {
     await ib.close();

package/tests/blockstore/store.test.ts

@@ -1,6 +1,5 @@
 import { CID } from "multiformats";
-import { bs, NotFoundError, SuperThis } from "@fireproof/core";
-import { mockSuperThis } from "../helpers.js";
+import { bs, ensureSuperThis, NotFoundError, SuperThis } from "@fireproof/core";
 
 function runtime(sthis: SuperThis) {
   return bs.toStoreRuntime({}, sthis);
@@ -20,7 +19,7 @@ describe("DataStore", function () {
   let store: bs.DataStore;
   let raw: bs.TestGateway;
 
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async () => {
     await store.close();
     await store.destroy();
@@ -53,7 +52,7 @@ describe("DataStore with a saved car", function () {
   let raw: bs.TestGateway;
   let car: bs.AnyBlock;
 
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async () => {
     await store.close();
@@ -95,7 +94,7 @@ describe("MetaStore", function () {
   let store: bs.MetaStore;
   let raw: bs.TestGateway;
 
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async () => {
     await store.close();
@@ -133,7 +132,7 @@ describe("MetaStore with a saved header", function () {
   let store: bs.MetaStore;
   let raw: bs.TestGateway;
   let cid: CID;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async () => {
     await store.close();

package/tests/blockstore/transaction.test.ts

@@ -1,10 +1,9 @@
 import { CID } from "multiformats";
-import { bs, SuperThis } from "@fireproof/core";
-import { mockSuperThis } from "../helpers.js";
+import { bs, ensureSuperThis, SuperThis } from "@fireproof/core";
 
 describe("Fresh TransactionBlockstore", function () {
   let blocks: bs.BaseBlockstore;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   beforeEach(function () {
     blocks = new bs.BaseBlockstore();
   });
@@ -33,7 +32,7 @@ describe("Fresh TransactionBlockstore", function () {
 
 describe("TransactionBlockstore with name", function () {
   let blocks: bs.EncryptedBlockstore;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   beforeEach(function () {
     blocks = new bs.EncryptedBlockstore(sthis, { name: "test" });
   });
@@ -57,7 +56,7 @@ describe("TransactionBlockstore with name", function () {
 describe("A transaction", function () {
   let tblocks: bs.CarTransaction;
   let blocks: bs.EncryptedBlockstore;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   beforeEach(async function () {
     blocks = new bs.EncryptedBlockstore(sthis, { name: "test" });
     tblocks = new bs.CarTransaction(blocks);
@@ -83,7 +82,7 @@ describe("TransactionBlockstore with a completed transaction", function () {
   let blocks: bs.BaseBlockstore;
   let cid: CID;
   let cid2: CID;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   beforeEach(async function () {
     cid = CID.parse("bafybeia4luuns6dgymy5kau5rm7r4qzrrzg6cglpzpogussprpy42cmcn4");

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

@@ -1,8 +1,7 @@
-import { Database, bs } from "@fireproof/core";
+import { Database, bs, ensureSuperThis } from "@fireproof/core";
 import { URI } from "@adviser/cement";
 
 import { fileContent } from "./cars/bafkreidxwt2nhvbl4fnqfw3ctlt6zbrir4kqwmjo5im6rf4q5si27kgo2i.js";
-import { mockSuperThis } from "../helpers.js";
 
 function customExpect(value: unknown, matcher: (val: unknown) => void, message: string): void {
   try {
@@ -37,7 +36,7 @@ describe("noop Gateway", function () {
   let fileGateway: ExtendedGateway;
   let walGateway: ExtendedGateway;
 
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async function () {
     await db.close();
@@ -302,7 +301,7 @@ describe("noop Gateway subscribe", function () {
   let metaStore: ExtendedStore;
 
   let metaGateway: ExtendedGateway;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async function () {
     await db.close();
@@ -352,7 +351,7 @@ describe("Gateway", function () {
   let metaGateway: ExtendedGateway;
   // let fileGateway: ExtendedGateway;
   // let walGateway: ExtendedGateway;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async function () {
     await db.close();

package/tests/fireproof/config.test.ts

@@ -1,7 +1,6 @@
 import { describe, it, expect, beforeAll } from "vitest";
-import { dataDir, fireproof, rt } from "@fireproof/core";
+import { dataDir, ensureSuperThis, fireproof, rt } from "@fireproof/core";
 import { runtimeFn, URI } from "@adviser/cement";
-import { mockSuperThis } from "../helpers.js";
 
 describe("runtime", () => {
   it("runtime", () => {
@@ -28,7 +27,7 @@ describe("fireproof/config", () => {
       version: rt.FILESTORE_VERSION,
     });
   }
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   beforeAll(async () => {
     await sthis.start();
     if (runtimeFn().isNodeIsh) {

package/tests/fireproof/crdt.test.ts

@@ -1,12 +1,11 @@
-import { CRDT } from "@fireproof/core";
+import { CRDT, ensureSuperThis } from "@fireproof/core";
 import { bs } from "@fireproof/core";
 import { CRDTMeta, DocValue } from "@fireproof/core";
 import { Index, index } from "@fireproof/core";
-import { mockSuperThis } from "../helpers.js";
 
 describe("Fresh crdt", function () {
   let crdt: CRDT<{ hello: string } | { points: number }>;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
@@ -41,7 +40,7 @@ describe("CRDT with one record", function () {
   }
   let crdt: CRDT<Partial<CRDTTestType>>;
   let firstPut: CRDTMeta;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async function () {
     await crdt.close();
@@ -92,7 +91,7 @@ describe("CRDT with a multi-write", function () {
   }
   let crdt: CRDT<CRDTTestType>;
   let firstPut: CRDTMeta;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async function () {
     await crdt.close();
@@ -158,7 +157,7 @@ describe("CRDT with two multi-writes", function () {
   let crdt: CRDT<CRDTTestType>;
   let firstPut: CRDTMeta;
   let secondPut: CRDTMeta;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
@@ -206,7 +205,7 @@ describe("CRDT with two multi-writes", function () {
 
 describe("Compact a named CRDT with writes", function () {
   let crdt: CRDT<CRDTTestType>;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
@@ -262,7 +261,7 @@ 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();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
@@ -308,7 +307,7 @@ describe("Loader with a committed transaction", function () {
   let crdt: CRDT<CRDTTestType>;
   let done: CRDTMeta;
   const dbname = "test-loader";
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
@@ -351,7 +350,7 @@ describe("Loader with two committed transactions", function () {
   let blockstore: bs.EncryptedBlockstore;
   let done1: CRDTMeta;
   let done2: CRDTMeta;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();
@@ -401,7 +400,7 @@ describe("Loader with many committed transactions", function () {
   let crdt: CRDT<Doc>;
   let dones: CRDTMeta[];
   const count = 10;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await crdt.close();
     await crdt.destroy();

package/tests/fireproof/database.test.ts

@@ -1,9 +1,9 @@
-import { buildBlobFiles, FileWithCid, mockSuperThis } from "../helpers.js";
-import { bs, Database, DocResponse, DocFileMeta, DocWithId, DocFiles } from "@fireproof/core";
+import { buildBlobFiles, FileWithCid } from "../helpers.js";
+import { bs, Database, DocResponse, DocFileMeta, DocWithId, DocFiles, ensureSuperThis } from "@fireproof/core";
 
 describe("basic Database", () => {
   let db: Database;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
@@ -39,7 +39,7 @@ describe("basic Database with record", function () {
     readonly value: string;
   }
   let db: Database;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
@@ -93,7 +93,7 @@ describe("named Database with record", function () {
     readonly value: string;
   }
   let db: Database;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
@@ -220,7 +220,7 @@ describe("named Database with record", function () {
 describe("basic Database parallel writes / public", function () {
   let db: Database;
   const writes: Promise<DocResponse>[] = [];
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
@@ -300,7 +300,7 @@ describe("basic Database with subscription", function () {
   let unsubscribe: () => void;
   let lastDoc: DocWithId<NonNullable<unknown>>;
   let waitForSub: Promise<void>;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
@@ -344,7 +344,7 @@ describe("basic Database with no update subscription", function () {
   let db: Database;
   let didRun: number;
   let unsubscribe: () => void;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
     await db.destroy();
@@ -381,7 +381,7 @@ describe("database with files input", () => {
   let db: Database;
   let imagefiles: FileWithCid[] = [];
   let result: DocResponse;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async () => {
     await db.close();

package/tests/fireproof/fireproof.test.ts

@@ -1,8 +1,8 @@
-import { mockSuperThis, sleep } from "../helpers.js";
+import { sleep } from "../helpers.js";
 import { docs } from "./fireproof.test.fixture.js";
 import { CID } from "multiformats/cid";
 
-import { Database, DocResponse, DocWithId, Index, IndexRows, MapFn, bs, fireproof, index } from "@fireproof/core";
+import { Database, DocResponse, DocWithId, Index, IndexRows, MapFn, bs, ensureSuperThis, fireproof, index } from "@fireproof/core";
 
 export function carLogIncludesGroup(list: bs.AnyLink[], cid: CID) {
   return list.some((c) => c.equals(cid));
@@ -25,7 +25,7 @@ describe("dreamcode", function () {
   let doc: DocWithId<Doc>;
   let result: IndexRows<string, Doc>;
   let db: Database;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -67,7 +67,7 @@ describe("public API", function () {
   let ok: DocResponse;
   let doc: DocWithId<Doc>;
   let query: IndexRows<string, Doc>;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
 
   afterEach(async () => {
     await db.close();
@@ -106,7 +106,7 @@ describe("basic database", function () {
     foo: string;
   }
   let db: Database<Doc>;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -170,7 +170,7 @@ describe("basic database", function () {
 
 describe("benchmarking with compaction", function () {
   let db: Database;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -225,7 +225,7 @@ describe("benchmarking with compaction", function () {
 describe("benchmarking a database", function () {
   /** @type {Database} */
   let db: Database;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -383,7 +383,7 @@ describe("Reopening a database", function () {
     foo: string;
   }
   let db: Database;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -488,7 +488,7 @@ describe("Reopening a database with indexes", function () {
   let idx: Index<string, Doc>;
   let didMap: boolean;
   let mapFn: MapFn<Doc>;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -585,7 +585,7 @@ describe("Reopening a database with indexes", function () {
 });
 
 describe("basic js verify", function () {
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   beforeAll(async function () {
     await sthis.start();
   });
@@ -617,7 +617,7 @@ describe("same workload twice, same CID", function () {
   let headA: string;
   let headB: string;
 
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   // let configA: any;
   // let configB: any;
 

package/tests/fireproof/indexer.test.ts

@@ -1,5 +1,4 @@
-import { Index, index, Database, CRDT, IndexRows } from "@fireproof/core";
-import { mockSuperThis } from "../helpers.js";
+import { Index, index, Database, CRDT, IndexRows, ensureSuperThis } from "@fireproof/core";
 
 interface TestType {
   readonly title: string;
@@ -10,7 +9,7 @@ describe("basic Index", () => {
   let db: Database<TestType>;
   let indexer: Index<string, TestType>;
   let didMap: boolean;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -97,7 +96,7 @@ describe("basic Index", () => {
 describe("Index query with compound key", function () {
   let db: Database<TestType>;
   let indexer: Index<[string, number], TestType>;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -127,7 +126,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();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -157,7 +156,7 @@ 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();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -195,7 +194,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();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -225,7 +224,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();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();
@@ -264,7 +263,7 @@ describe("basic Index upon cold start", function () {
   let didMap: number;
   let mapFn: (doc: TestType) => string;
   let result: IndexRows<string, TestType>;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   // result, mapFn;
   afterEach(async function () {
     await crdt.close();
@@ -355,7 +354,7 @@ describe("basic Index with no data", function () {
   let db: Database<TestType>;
   let indexer: Index<string, TestType>;
   let didMap: boolean;
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   afterEach(async function () {
     await db.close();
     await db.destroy();

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

@@ -1,5 +1,4 @@
-import { Database, fireproof } from "@fireproof/core";
-import { mockSuperThis } from "../helpers.js";
+import { Database, ensureSuperThis, fireproof } from "@fireproof/core";
 
 interface DBItem {
   readonly db: Database;
@@ -17,7 +16,7 @@ function shuffle(ina: DBItem[]): DBItem[] {
 
 describe("Multiple Databases", () => {
   const dbs: DBItem[] = [];
-  const sthis = mockSuperThis();
+  const sthis = ensureSuperThis();
   const rows = 10;
   const concurrentDbs = 7;
   beforeEach(async () => {

package/tests/fireproof/utils.test.ts

@@ -1,12 +1,11 @@
 import { URI } from "@adviser/cement";
-import { rt, getStore, ensureSuperLog } from "@fireproof/core";
-import { mockSuperThis } from "../helpers.js";
+import { rt, getStore, ensureSuperLog, ensureSuperThis } from "@fireproof/core";
 
 // only for test
 import { UUID } from "uuidv7";
 
 describe("utils", () => {
-  const sthis = mockSuperThis({});
+  const sthis = ensureSuperThis();
   const logger = ensureSuperLog(sthis, "getfilename");
 
   beforeAll(async () => {

package/tests/helpers.ts

@@ -1,5 +1,5 @@
-import { LogCollector, MockLogger, runtimeFn, toCryptoRuntime, URI } from "@adviser/cement";
-import { dataDir, ensureSuperThis, rt, SuperThis, SuperThisOpts } from "@fireproof/core";
+import { runtimeFn, toCryptoRuntime, URI } from "@adviser/cement";
+import { dataDir, rt, SuperThis } from "@fireproof/core";
 
 export { dataDir };
 
@@ -37,16 +37,16 @@ export function storageURL(sthis: SuperThis): URI {
   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;
-}
+// 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/web/gateway-impl.d.cts

@@ -18,6 +18,7 @@ interface SuperThisOpts {
 }
 interface SuperThis {
     readonly logger: Logger;
+    readonly loggerCollector?: Logger;
     readonly env: Env;
     readonly pathOps: PathOps;
     readonly ctx: Record<string, unknown>;

package/web/gateway-impl.d.ts

@@ -18,6 +18,7 @@ interface SuperThisOpts {
 }
 interface SuperThis {
     readonly logger: Logger;
+    readonly loggerCollector?: Logger;
     readonly env: Env;
     readonly pathOps: PathOps;
     readonly ctx: Record<string, unknown>;