chore: remove scoped blockstore, assert is now gone

.gitignore

@@ -21,3 +21,4 @@ logs
 smoke/package.json
 smoke/pnpm-lock.yaml
 smoke/react/package.json
+smoke/react/pnpm-lock.yaml

.prettierignore

@@ -1 +1,2 @@
 **/pnpm-lock.yaml
+scripts/

package-fireproof-core.json

@@ -13,17 +13,11 @@
       "require": "./index.cjs",
       "script": "./index.global.js",
       "types": "./index.d.ts"
-    },
-    "./blockstore": {
-      "import": "./blockstore/index.js",
-      "require": "./blockstore/index.cjs",
-      "script": "./blockstore/index.global.js",
-      "types": "./blockstore/index.d.ts"
     }
   },
   "scripts": {},
   "keywords": ["database", "JSON", "document", "IPLD", "CID", "IPFS"],
-  "contributors": ["J Chris Anderson", "Alan Shaw", "Travis Vachon", "Mikeal Rogers"],
+  "contributors": ["J Chris Anderson", "Alan Shaw", "Travis Vachon", "Mikeal Rogers", "Meno Abels"],
   "author": "J Chris Anderson",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://use-fireproof.com",

src/crdt.ts

@@ -29,6 +29,7 @@ import type {
   IndexKeyType,
   DocWithId,
   DocTypes,
+  Falsy,
 } from "./types.js";
 import { index, type Index } from "./indexer.js";
 import { CRDTClock } from "./crdt-clock.js";
@@ -142,10 +143,10 @@ export class CRDT<T extends DocTypes> {
     return await getBlock(this.blockstore, cidString);
   }
 
-  async get(key: string): Promise<DocValue<T> | null> {
+  async get(key: string): Promise<DocValue<T> | Falsy> {
     await this.ready();
     const result = await getValueFromCrdt<T>(this.blockstore, this.clock.head, key);
-    if (result.del) return null;
+    if (result.del) return undefined;
     return result;
   }
 

src/index.ts

@@ -1,6 +1,11 @@
 export * from "./database.js";
 export * from "./types.js";
 
-export { CRDT } from "./crdt.js";
+export * from "./crdt.js";
 
 export * from "./indexer.js";
+
+export * as blockstore from "./blockstore/index.js";
+
+export * as bs from "./blockstore/index.js";
+export * as rt from "./runtime/index.js";

src/indexer.ts

@@ -15,6 +15,7 @@ import {
   IndexTransactionMeta,
 } from "./types.js";
 import { BaseBlockstore } from "./blockstore/index.js";
+
 import {
   bulkIndex,
   indexEntriesForChanges,

src/runtime/node-sys-container.ts

@@ -6,7 +6,7 @@ export async function createNodeSysContainer(): Promise<NodeMap> {
   const nodeURL = "node:url";
   const nodeFS = "node:fs";
   const fs = (await saveImport(nodeFS)).promises;
-  const assert = "assert";
+  // const assert = "assert";
   const path = await saveImport(nodePath);
   return {
     state: "node",
@@ -18,6 +18,6 @@ export async function createNodeSysContainer(): Promise<NodeMap> {
     readdir: fs.readdir as NodeMap["readdir"],
     readfile: fs.readFile as NodeMap["readfile"],
     writefile: fs.writeFile as NodeMap["writefile"],
-    assert: (await saveImport(assert)).default,
+    // assert: (await saveImport(assert)).default,
   };
 }

src/runtime/sys-container.ts

@@ -12,7 +12,7 @@ export interface NodeMap {
   dirname: (path: string) => string;
   homedir: () => string;
   fileURLToPath: (url: string | URL) => string;
-  assert: (condition: unknown, message?: string | Error) => void;
+  // assert: (condition: unknown, message?: string | Error) => void;
 
   mkdir: (path: PathLike, options?: { recursive: boolean }) => Promise<string | undefined>;
   readdir: (path: PathLike, options?: unknown) => Promise<unknown[]>;
@@ -26,9 +26,9 @@ export interface NodeMap {
   writefile: (path: PathLike, data: Uint8Array | string) => Promise<void>;
 }
 
-export function assert(condition: unknown, message?: string | Error): asserts condition {
-  SysContainer.freight?.assert(condition, message);
-}
+// export function assert(condition: unknown, message?: string | Error): asserts condition {
+//   SysContainer.freight?.assert(condition, message);
+// }
 
 const onceStart = new ResolveOnce<void>();
 
@@ -53,15 +53,15 @@ class sysContainer {
       }
       return url.pathname;
     },
-    assert: (condition: unknown, message?: string | Error) => {
-      if (!condition) {
-        if (message instanceof Error) {
-          throw message;
-        } else {
-          throw new Error(message);
-        }
-      }
-    },
+    // assert: (condition: unknown, message?: string | Error) => {
+    //   if (!condition) {
+    //     if (message instanceof Error) {
+    //       throw message;
+    //     } else {
+    //       throw new Error(message);
+    //     }
+    //   }
+    // },
     mkdir: () => Promise.reject(new Error("SysContainer:mkdir is not available in seeded state")),
     readdir: () => Promise.reject(new Error("SysContainer:readdir is not available in seeded state")),
     rm: () => Promise.reject(new Error("SysContainer:rm is not available in seeded state")),