@fireproof/core 0.5.4 → 0.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fireproof/core",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Cloudless database for apps, the browser, and IPFS",
   "main": "dist/src/fireproof.js",
   "module": "dist/src/fireproof.mjs",

package/src/database.js

@@ -3,12 +3,14 @@ import { visMerkleClock, visMerkleTree, vis, put, get, getAll, eventsSince } fro
 import { doTransaction } from './blockstore.js'
 import charwise from 'charwise'
 import { localSet } from './utils.js'
+import { CID } from 'multiformats'
 
 // TypeScript Types
 // eslint-disable-next-line no-unused-vars
 // import { CID } from 'multiformats/dist/types/src/cid.js'
 // eslint-disable-next-line no-unused-vars
 class Proof {}
+export const parseCID = cid => (typeof cid === 'string' ? CID.parse(cid) : cid)
 
 /**
  * @class Fireproof

package/src/db-index.js

@@ -17,7 +17,7 @@ import { TransactionBlockstore, doTransaction } from './blockstore.js'
 // @ts-ignore
 import charwise from 'charwise'
 
-const ALWAYS_REBUILD = false // todo: make false
+const ALWAYS_REBUILD = false // todo: remove
 
 const compare = (a, b) => {
   const [aKey, aRef] = a

package/src/fireproof.js

@@ -1,17 +1,14 @@
 import randomBytes from 'randombytes'
 
-import { Database } from './database.js'
+import { Database, parseCID } from './database.js'
 import { Listener } from './listener.js'
 import { DbIndex as Index } from './db-index.js'
-import { CID } from 'multiformats'
 import { TransactionBlockstore } from './blockstore.js'
 import { localGet } from './utils.js'
 import { blocksToCarBlock, blocksToEncryptedCarBlock } from './valet.js'
 
 export { Index, Listener, Database }
 
-const parseCID = cid => (typeof cid === 'string' ? CID.parse(cid) : cid)
-
 export class Fireproof {
   /**
    * @function storage
@@ -50,7 +47,7 @@ export class Fireproof {
           clock: {
             byId: byId ? parseCID(byId) : null,
             byKey: byKey ? parseCID(byKey) : null,
-            db: db ? db.map(c => parseCID(c)) : null
+            db: (db && db.length > 0) ? db.map(c => parseCID(c)) : null
           },
           code,
           name
@@ -95,7 +92,7 @@ export class Fireproof {
     const allCIDs = await database.allCIDs()
     const blocks = database.blocks
 
-    const rootCid = CID.parse(allCIDs[allCIDs.length - 1])
+    const rootCid = parseCID(allCIDs[allCIDs.length - 1])
     if (typeof key === 'undefined') {
       key = blocks.valet?.getKeyMaterial()
     }
@@ -113,7 +110,9 @@ export class Fireproof {
         allCIDs.map(async c => {
           const b = await blocks.get(c)
           // console.log('block', b)
-          if (typeof b.cid === 'string') { b.cid = CID.parse(b.cid) }
+          if (typeof b.cid === 'string') {
+            b.cid = parseCID(b.cid)
+          }
           // if (b.bytes.constructor.name === 'Buffer') console.log('conver vbuff')
           return b
         })