@fireproof/core 0.5.3 → 0.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fireproof/core",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "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

@@ -244,7 +244,7 @@ export class DbIndex {
       let removeByIdIndexEntries = []
       await loadIndex(blocks, this.indexById, idIndexOpts)
       await loadIndex(blocks, this.indexByKey, dbIndexOpts)
-      console.log('head', this.dbHead, this.indexById)
+      // console.log('head', this.dbHead, this.indexById)
       if (this.indexById.root) {
         const oldChangeEntries = await this.indexById.root.getMany(result.rows.map(({ key }) => key))
         oldIndexEntries = oldChangeEntries.result.map((key) => ({ key, del: true }))
@@ -293,13 +293,18 @@ async function bulkIndex (blocks, inIndex, indexEntries, opts) {
     inIndex.root = await load({ cid, get: getBlock, ...dbIndexOpts })
   }
   const { root, blocks: newBlocks } = await inIndex.root.bulk(indexEntries)
-  returnRootBlock = await root.block
-  returnNode = root
-  for await (const block of newBlocks) {
-    await putBlock(block.cid, block.bytes)
+  if (root) {
+    returnRootBlock = await root.block
+    returnNode = root
+    for await (const block of newBlocks) {
+      await putBlock(block.cid, block.bytes)
+    }
+    await putBlock(returnRootBlock.cid, returnRootBlock.bytes)
+    return { root: returnNode, cid: returnRootBlock.cid }
+  } else {
+    // throw new Error('test for index after delete')
+    return { root: null, cid: null }
   }
-  await putBlock(returnRootBlock.cid, returnRootBlock.bytes)
-  return { root: returnNode, cid: returnRootBlock.cid }
 }
 
 async function loadIndex (blocks, index, indexOpts) {

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
@@ -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
         })

package/src/listener.js

@@ -41,9 +41,9 @@ export class Listener {
    * @returns {Function} A function to unsubscribe from the topic.
    * @memberof Listener
    * @instance
-   * @param {any} since
+   * @param {any} [since] - clock to flush from on launch
    */
-  on (topic, subscriber, since) {
+  on (topic, subscriber, since = undefined) {
     const listOfTopicSubscribers = getTopicList(this.subcribers, topic)
     listOfTopicSubscribers.push(subscriber)
     if (typeof since !== 'undefined') {