@fireproof/core 0.5.14 → 0.5.16

package/dist/src/prolly.js

@@ -125,6 +125,9 @@ const bulkFromEvents = (sorted, event) => {
     const bulk = new Map();
     for (const { value: event } of sorted) {
         const { data: { type, value, key } } = event;
+        if (!key) {
+            throw new Error('key is required');
+        }
         const bulkEvent = type === 'put' ? { key, value } : { key, del: true };
         bulk.set(bulkEvent.key, bulkEvent); // last wins
     }

package/dist/src/sync.js

@@ -181,14 +181,15 @@ export class Sync {
         const allCIDs = await database.allCIDs();
         const blocks = database.blocks;
         const rootCIDs = database.clock;
-        const syncCIDs = [...new Set([...rootCIDs, ...allCIDs])].filter(cid => !skip.includes(cid.toString()));
+        const newCIDs = [...new Set([...rootCIDs, ...allCIDs])].filter(cid => !skip.includes(cid.toString()));
+        const syncCIDs = [...new Set([...rootCIDs, ...allCIDs.filter(cid => !skip.includes(cid.toString()))])];
         // console.log(
         //   'makeCar',
         //   rootCIDs.map(c => c.toString()),
         //   syncCIDs.map(c => c.toString()),
         //   allCIDs.map(c => c.toString())
         // )
-        if (syncCIDs.length === 0) {
+        if (newCIDs.length === 0) {
             return null;
         }
         if (typeof key === 'undefined') {

package/package.json

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

package/src/blockstore.js

@@ -127,8 +127,8 @@ export class TransactionBlockstore {
    */
   async * entries () {
     for (const transaction of this.inflightTransactions) {
-      for (const [str, bytes] of transaction) {
-        yield { cid: str, bytes }
+      for (const [cid, bytes] of transaction.entries()) { // test for this?
+        yield { cid: cid.toString(), bytes }
       }
     }
     for (const [str, bytes] of this.committedBlocks) {
@@ -179,7 +179,7 @@ export class TransactionBlockstore {
   doCommit = async innerBlockstore => {
     const cids = new Set()
     for (const { cid, bytes } of innerBlockstore.entries()) {
-      const stringCid = cid.toString() // unnecessary string conversion, can we fix upstream?
+      const stringCid = cid.toString()
       if (this.committedBlocks.has(stringCid)) {
         // console.log('Duplicate block: ' + stringCid) // todo some of this can be avoided, cost is extra size on car files
       } else {

package/src/clock.js

@@ -242,7 +242,7 @@ export async function findEventsToSync (blocks, head) {
 
   const toSync = ancestor ? await asyncFilter(sorted, async uks => !(await contains(events, ancestor, uks.cid))) : sorted
   // console.timeEnd(callTag + '.contains')
-  console.log('toSync', !!ancestor, sorted.length - toSync.length)
+  // console.log('optimize sorted', !!ancestor, sorted.length - toSync.length)
 
   return { cids: events, events: toSync }
 }

package/src/db-index.js

@@ -144,6 +144,8 @@ export class DbIndex {
       this.mapFn = mapFn
       this.mapFnString = mapFn.toString()
     }
+    const matches = /=>\s*(.*)/.exec(this.mapFnString)
+    this.includeDocsDefault = matches && matches.length > 0
     this.name = name || this.makeName()
   }
 
@@ -157,7 +159,6 @@ export class DbIndex {
       return this.mapFnString
     } else {
       // it's a consise arrow function, match everythign after the arrow
-      this.includeDocsDefault = true
       return matches[1]
     }
   }

package/src/prolly.js

@@ -143,6 +143,9 @@ const bulkFromEvents = (sorted, event) => {
     const {
       data: { type, value, key }
     } = event
+    if (!key) {
+      throw new Error('key is required')
+    }
     const bulkEvent = type === 'put' ? { key, value } : { key, del: true }
     bulk.set(bulkEvent.key, bulkEvent) // last wins
   }

package/src/sync.js

@@ -193,14 +193,15 @@ export class Sync {
     const blocks = database.blocks
     const rootCIDs = database.clock
 
-    const syncCIDs = [...new Set([...rootCIDs, ...allCIDs])].filter(cid => !skip.includes(cid.toString()))
+    const newCIDs = [...new Set([...rootCIDs, ...allCIDs])].filter(cid => !skip.includes(cid.toString()))
+    const syncCIDs = [...new Set([...rootCIDs, ...allCIDs.filter(cid => !skip.includes(cid.toString()))])]
     // console.log(
     //   'makeCar',
     //   rootCIDs.map(c => c.toString()),
     //   syncCIDs.map(c => c.toString()),
     //   allCIDs.map(c => c.toString())
     // )
-    if (syncCIDs.length === 0) {
+    if (newCIDs.length === 0) {
       return null
     }