@fireproof/core 0.7.0-alpha.4 → 0.7.0-alpha.6

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fireproof/core",
-  "version": "0.7.0-alpha.4",
+  "version": "0.7.0-alpha.6",
   "description": "Live data for React, accelerated by proofs, powered by IPFS",
   "main": "dist/src/fireproof.js",
   "module": "dist/src/fireproof.mjs",
@@ -49,7 +49,6 @@
     "cli-color": "^2.0.3",
     "crypto-browserify": "^3.12.0",
     "encrypted-block": "^0.0.3",
-    "filer": "^1.4.1",
     "idb": "^7.1.1",
     "ipld-hashmap": "^2.1.18",
     "multiformats": "^11.0.1",
@@ -81,8 +80,7 @@
     "standard": "^17.0.0",
     "typescript": "^5.0.2",
     "webpack": "^5.78.0",
-    "webpack-cli": "^5.0.1",
-    "webpack-node-externals": "^3.0.0"
+    "webpack-cli": "^5.0.1"
   },
   "mocha": {
     "require": [

package/src/fireproof.js

@@ -50,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
@@ -73,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 */
+// import { Rest } from './storage/rest.js'
 
 export const Loader = {
   appropriate: (name, config = {}) => {
-    let isBrowser = false
-    try {
-      isBrowser = window.localStorage && true
-    } catch (e) {}
-
-    if (config.type === 'rest') {
-      return new Rest(name, config)
+    if (config.StorageClass) {
+      return new config.StorageClass(name, config)
     }
 
-    if (FORCE_IDB || isBrowser) {
-      return new Browser(name, config)
-    } else {
-      return new Filesystem(name, config)
-    }
+    // if (config.type === 'rest') {
+    //   return new Rest(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