@fireproof/core 0.7.0-alpha.0 → 0.7.0-alpha.10

package/dist/storage/base.js

@@ -39,7 +39,7 @@ export class Base {
         // currently we don't do that, because we only use
         // the config for first run, and then we use the headers
         // once they exist
-        this.ready = this.getHeaders().then((blocksReady) => {
+        this.ready = this.getHeaders().then(blocksReady => {
             // console.log('blocksReady base', this.name, blocksReady)
             return blocksReady;
         });
@@ -243,8 +243,10 @@ export class Base {
             };
             const { blocks } = await blocksFromEncryptedCarBlock(roots[0], readerGetWithCodec, this.keyMaterial);
             const rootBlock = blocks[blocks.length - 1];
-            const blocksIterable = function* () { for (const block of blocks)
-                yield block; };
+            const blocksIterable = function* () {
+                for (const block of blocks)
+                    yield block;
+            };
             const gat = async (dataCID) => {
                 dataCID = dataCID.toString();
                 return blocks.find(b => b.cid.toString() === dataCID);

package/dist/storage/filesystem.js

@@ -1,8 +1,11 @@
-import { readFileSync } from 'node:fs';
-import { mkdir, writeFile } from 'node:fs/promises';
+// import { mkdir, writeFile } from 'fs/promises'
 import { join, dirname } from 'path';
 import { homedir } from 'os';
 import { Base } from './base.js';
+// import { readFileSync } from 'node:fs'
+// const { readFileSync } = require('fs')
+import fs from 'fs';
+const readFileSync = fs.readFileSync;
 export const defaultConfig = {
     dataDir: join(homedir(), '.fireproof')
 };
@@ -59,7 +62,7 @@ function loadSync(filename) {
     }
 }
 async function writeSync(fullpath, stringValue) {
-    await mkdir(dirname(fullpath), { recursive: true });
+    await fs.promises.mkdir(dirname(fullpath), { recursive: true });
     // writeFileSync(fullpath, stringValue)
-    await writeFile(fullpath, stringValue);
+    await fs.promises.writeFile(fullpath, stringValue);
 }

package/dist/storage/rest.js

@@ -1,4 +1,4 @@
-import fetch from 'node-fetch';
+import fetch from 'cross-fetch';
 import { Base } from './base.js';
 const defaultConfig = {
     url: 'http://localhost:4000'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fireproof/core",
-  "version": "0.7.0-alpha.0",
+  "version": "0.7.0-alpha.10",
   "description": "Live data for React, accelerated by proofs, powered by IPFS",
   "main": "dist/src/fireproof.js",
   "module": "dist/src/fireproof.mjs",
@@ -41,27 +41,21 @@
     "@ipld/car": "^5.1.0",
     "@ipld/dag-cbor": "^9.0.0",
     "@jsonlines/core": "^1.0.2",
-    "@rollup/plugin-commonjs": "^24.0.1",
-    "archy": "^1.0.0",
     "async": "^3.2.4",
-    "car-transaction": "^1.0.1",
     "charwise": "^3.0.1",
-    "cli-color": "^2.0.3",
+    "cross-fetch": "^3.1.6",
     "crypto-browserify": "^3.12.0",
-    "encrypted-block": "^0.0.3",
+    "encrypted-block": "jchris/encrypted-block#update",
     "idb": "^7.1.1",
     "ipld-hashmap": "^2.1.18",
     "multiformats": "^11.0.1",
-    "node-fetch": "^3.3.1",
-    "node-polyfill-webpack-plugin": "^2.0.1",
     "prolly-trees": "1.0.4",
     "randombytes": "^2.1.0",
-    "rollup-plugin-commonjs": "^10.1.0",
-    "sade": "^1.8.1",
     "simple-peer": "^9.11.1"
   },
   "devDependencies": {
     "@rollup/plugin-alias": "^5.0.0",
+    "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.2",
     "c8": "^7.12.0",
@@ -70,11 +64,11 @@
     "flexsearch": "^0.7.31",
     "mocha": "^10.2.0",
     "nanoid": "^4.0.0",
+    "node-polyfill-webpack-plugin": "^2.0.1",
     "rollup": "^3.20.2",
     "rollup-plugin-auto-external": "^2.0.0",
     "rollup-plugin-dts": "^5.3.0",
     "rollup-plugin-esbuild": "^5.0.0",
-    "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-polyfill-node": "^0.12.0",
     "rollup-plugin-visualizer": "^5.9.0",
     "standard": "^17.0.0",
@@ -117,7 +111,6 @@
   "files": [
     "src",
     "dist",
-    "hooks",
     "README.md"
   ]
 }

package/src/fireproof.js

@@ -11,22 +11,10 @@ export class Fireproof {
    * Creates a new Fireproof instance with default storage settings
    * Most apps should use this and not worry about the details.
    * @static
-   * @returns {Database|Promise<Database>} - a new Fireproof instance or a promise for remote loaders
+   * @returns {Database} - a new Fireproof instance
    */
   static storage = (name = null, opts = {}) => {
-    if (!name) {
-      return new Database(null, opts)
-    } else {
-      // const primaryLoader = Loader.appropriate(name, opts.primary, { key: null })
-      // const secondaryLoader = opts.secondary ? Loader.appropriate(name, opts.secondary, { key: null }) : null
-      const db = new Database(name, opts)
-      return db
-      // const loaders = [pr]
-
-      // todo we need branch names here
-
-      // console.log('storage', name, opts, primaryLoader, secondaryLoader)
-    }
+    return new Database(name, opts)
   }
 
   // static fromConfig (name, primary, secondary, opts = {}) {
@@ -62,7 +50,7 @@ export class Fireproof {
           clock: {
             byId: byId ? parseCID(byId) : null,
             byKey: byKey ? parseCID(byKey) : null,
-            db: (db && db.length > 0) ? db.map(c => parseCID(c)) : null
+            db: db && db.length > 0 ? db.map(c => parseCID(c)) : null
           },
           code,
           name
@@ -85,7 +73,9 @@ export class Fireproof {
 
     const withBlocks = new Database(database.name)
     withBlocks.blocks = database.blocks
-    withBlocks.clock = definition.clock
+    withBlocks.ready.then(() => {
+      withBlocks.clock = definition.clock.map(c => parseCID(c))
+    })
 
     const snappedDb = Fireproof.fromJSON(definition, null, withBlocks)
     ;[...database.indexes.values()].forEach(index => {

package/src/loader.js

@@ -1,26 +1,16 @@
 import { Browser } from './storage/browser.js'
-import { Filesystem } from './storage/filesystem.js'
 import { Rest } from './storage/rest.js'
 
-const FORCE_IDB = typeof process !== 'undefined' && !!process.env?.FORCE_IDB
-
-/* global window */
-
 export const Loader = {
   appropriate: (name, config = {}) => {
-    let isBrowser = false
-    try {
-      isBrowser = window.localStorage && true
-    } catch (e) {}
+    if (config.StorageClass) {
+      return new config.StorageClass(name, config)
+    }
 
     if (config.type === 'rest') {
       return new Rest(name, config)
     }
 
-    if (FORCE_IDB || isBrowser) {
-      return new Browser(name, config)
-    } else {
-      return new Filesystem(name, config)
-    }
+    return new Browser(name, config)
   }
 }

package/src/storage/base.js

@@ -45,7 +45,7 @@ export class Base {
     // currently we don't do that, because we only use
     // the config for first run, and then we use the headers
     // once they exist
-    this.ready = this.getHeaders().then((blocksReady) => {
+    this.ready = this.getHeaders().then(blocksReady => {
       // console.log('blocksReady base', this.name, blocksReady)
       return blocksReady
     })
@@ -258,7 +258,9 @@ export class Base {
       }
       const { blocks } = await blocksFromEncryptedCarBlock(roots[0], readerGetWithCodec, this.keyMaterial)
       const rootBlock = blocks[blocks.length - 1]
-      const blocksIterable = function * () { for (const block of blocks) yield block }
+      const blocksIterable = function * () {
+        for (const block of blocks) yield block
+      }
 
       const gat = async dataCID => {
         dataCID = dataCID.toString()
@@ -295,7 +297,7 @@ export class Base {
     }
   }
 
-  writeCars (cars) { }
+  writeCars (cars) {}
 
   async updateCarCidMap (carCid, cids) {
     // this hydrates the map if it has not been hydrated

package/src/storage/filesystem.js

@@ -1,8 +1,12 @@
-import { readFileSync } from 'node:fs'
-import { mkdir, writeFile } from 'node:fs/promises'
+
+// import { mkdir, writeFile } from 'fs/promises'
 import { join, dirname } from 'path'
 import { homedir } from 'os'
 import { Base } from './base.js'
+// import { readFileSync } from 'node:fs'
+// const { readFileSync } = require('fs')
+import fs from 'fs'
+const readFileSync = fs.readFileSync
 
 export const defaultConfig = {
   dataDir: join(homedir(), '.fireproof')
@@ -64,7 +68,7 @@ function loadSync (filename) {
 }
 
 async function writeSync (fullpath, stringValue) {
-  await mkdir(dirname(fullpath), { recursive: true })
+  await fs.promises.mkdir(dirname(fullpath), { recursive: true })
   // writeFileSync(fullpath, stringValue)
-  await writeFile(fullpath, stringValue)
+  await fs.promises.writeFile(fullpath, stringValue)
 }

package/src/storage/rest.js

@@ -1,4 +1,4 @@
-import fetch from 'node-fetch'
+import fetch from 'cross-fetch'
 import { Base } from './base.js'
 
 const defaultConfig = {