@fireproof/core 0.5.14 → 0.5.16

package/dist/src/blockstore.js

@@ -115,8 +115,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) {
@@ -164,7 +164,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
             }

package/dist/src/clock.js

@@ -227,7 +227,7 @@ export async function findEventsToSync(blocks, head) {
     // console.time(callTag + '.contains')
     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 };
 }
 const asyncFilter = async (arr, predicate) => Promise.all(arr.map(predicate)).then(results => arr.filter((_v, index) => results[index]));

package/dist/src/db-index.js

@@ -135,6 +135,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();
     }
     makeName() {
@@ -148,7 +150,6 @@ export class DbIndex {
         }
         else {
             // it's a consise arrow function, match everythign after the arrow
-            this.includeDocsDefault = true;
             return matches[1];
         }
     }

package/dist/src/fireproof.d.ts

@@ -233,9 +233,9 @@ declare class DbIndex {
     applyMapFn(mapFn: any, name: any): void;
     mapFnString: any;
     mapFn: any;
+    includeDocsDefault: boolean;
     name: any;
     makeName(): any;
-    includeDocsDefault: boolean;
     toJSON(): {
         name: any;
         code: any;

package/dist/src/fireproof.js

@@ -5720,7 +5720,7 @@ 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 }
 }
@@ -9659,7 +9659,15 @@ var _polyfillNode_events = /*#__PURE__*/Object.freeze({
 
 var require$$0$1 = /*@__PURE__*/getAugmentedNamespace(_polyfillNode_events);
 
-var streamBrowser = require$$0$1.EventEmitter;
+var streamBrowser;
+var hasRequiredStreamBrowser;
+
+function requireStreamBrowser () {
+	if (hasRequiredStreamBrowser) return streamBrowser;
+	hasRequiredStreamBrowser = 1;
+	streamBrowser = require$$0$1.EventEmitter;
+	return streamBrowser;
+}
 
 // shim for using process in browser
 // based off https://github.com/defunctzombie/node-process/blob/master/browser.js
@@ -9802,7 +9810,7 @@ var argv = [];
 var version$2 = ''; // empty string to avoid regexp issues
 var versions = {};
 var release = {};
-var config$1 = {};
+var config = {};
 
 function noop$2() {}
 
@@ -9879,7 +9887,7 @@ var browser$1$1 = {
   hrtime: hrtime,
   platform: platform,
   release: release,
-  config: config$1,
+  config: config,
   uptime: uptime
 };
 
@@ -9960,11 +9968,11 @@ function format(f) {
 // Mark that a method should not be used.
 // Returns a modified function which warns once by default.
 // If --no-deprecation is set, then it is a no-op.
-function deprecate$2(fn, msg) {
+function deprecate$1(fn, msg) {
   // Allow for deprecating things in the process of starting up.
   if (isUndefined(global$1.process)) {
     return function() {
-      return deprecate$2(fn, msg).apply(this, arguments);
+      return deprecate$1(fn, msg).apply(this, arguments);
     };
   }
 
@@ -10573,7 +10581,7 @@ var _polyfillNode_util = {
   isBoolean: isBoolean,
   isArray: isArray,
   inspect: inspect,
-  deprecate: deprecate$2,
+  deprecate: deprecate$1,
   format: format,
   debuglog: debuglog,
   promisify: promisify,
@@ -10586,7 +10594,7 @@ var _polyfillNode_util$1 = /*#__PURE__*/Object.freeze({
 	callbackify: callbackify,
 	debuglog: debuglog,
 	default: _polyfillNode_util,
-	deprecate: deprecate$2,
+	deprecate: deprecate$1,
 	format: format,
 	inherits: inherits$w,
 	inspect: inspect,
@@ -10774,99 +10782,108 @@ function requireBuffer_list () {
 	return buffer_list;
 }
 
-// undocumented cb() API, needed for core, not for public API
-function destroy(err, cb) {
-  const readableDestroyed = this._readableState && this._readableState.destroyed;
-  const writableDestroyed = this._writableState && this._writableState.destroyed;
-  if (readableDestroyed || writableDestroyed) {
-    if (cb) {
-      cb(err);
-    } else if (err) {
-      if (!this._writableState) {
-        process.nextTick(emitErrorNT, this, err);
-      } else if (!this._writableState.errorEmitted) {
-        this._writableState.errorEmitted = true;
-        process.nextTick(emitErrorNT, this, err);
-      }
-    }
-    return this;
-  }
-
-  // we set destroyed to true before firing error callbacks in order
-  // to make it re-entrance safe in case destroy() is called within callbacks
+var destroy_1;
+var hasRequiredDestroy;
+
+function requireDestroy () {
+	if (hasRequiredDestroy) return destroy_1;
+	hasRequiredDestroy = 1;
+
+	// undocumented cb() API, needed for core, not for public API
+	function destroy(err, cb) {
+	  const readableDestroyed = this._readableState && this._readableState.destroyed;
+	  const writableDestroyed = this._writableState && this._writableState.destroyed;
+	  if (readableDestroyed || writableDestroyed) {
+	    if (cb) {
+	      cb(err);
+	    } else if (err) {
+	      if (!this._writableState) {
+	        process.nextTick(emitErrorNT, this, err);
+	      } else if (!this._writableState.errorEmitted) {
+	        this._writableState.errorEmitted = true;
+	        process.nextTick(emitErrorNT, this, err);
+	      }
+	    }
+	    return this;
+	  }
 
-  if (this._readableState) {
-    this._readableState.destroyed = true;
-  }
+	  // we set destroyed to true before firing error callbacks in order
+	  // to make it re-entrance safe in case destroy() is called within callbacks
 
-  // if this is a duplex stream mark the writable part as destroyed as well
-  if (this._writableState) {
-    this._writableState.destroyed = true;
-  }
-  this._destroy(err || null, err => {
-    if (!cb && err) {
-      if (!this._writableState) {
-        process.nextTick(emitErrorAndCloseNT, this, err);
-      } else if (!this._writableState.errorEmitted) {
-        this._writableState.errorEmitted = true;
-        process.nextTick(emitErrorAndCloseNT, this, err);
-      } else {
-        process.nextTick(emitCloseNT, this);
-      }
-    } else if (cb) {
-      process.nextTick(emitCloseNT, this);
-      cb(err);
-    } else {
-      process.nextTick(emitCloseNT, this);
-    }
-  });
-  return this;
-}
-function emitErrorAndCloseNT(self, err) {
-  emitErrorNT(self, err);
-  emitCloseNT(self);
-}
-function emitCloseNT(self) {
-  if (self._writableState && !self._writableState.emitClose) return;
-  if (self._readableState && !self._readableState.emitClose) return;
-  self.emit('close');
-}
-function undestroy() {
-  if (this._readableState) {
-    this._readableState.destroyed = false;
-    this._readableState.reading = false;
-    this._readableState.ended = false;
-    this._readableState.endEmitted = false;
-  }
-  if (this._writableState) {
-    this._writableState.destroyed = false;
-    this._writableState.ended = false;
-    this._writableState.ending = false;
-    this._writableState.finalCalled = false;
-    this._writableState.prefinished = false;
-    this._writableState.finished = false;
-    this._writableState.errorEmitted = false;
-  }
-}
-function emitErrorNT(self, err) {
-  self.emit('error', err);
-}
-function errorOrDestroy(stream, err) {
-  // We have tests that rely on errors being emitted
-  // in the same tick, so changing this is semver major.
-  // For now when you opt-in to autoDestroy we allow
-  // the error to be emitted nextTick. In a future
-  // semver major update we should change the default to this.
+	  if (this._readableState) {
+	    this._readableState.destroyed = true;
+	  }
 
-  const rState = stream._readableState;
-  const wState = stream._writableState;
-  if (rState && rState.autoDestroy || wState && wState.autoDestroy) stream.destroy(err);else stream.emit('error', err);
+	  // if this is a duplex stream mark the writable part as destroyed as well
+	  if (this._writableState) {
+	    this._writableState.destroyed = true;
+	  }
+	  this._destroy(err || null, err => {
+	    if (!cb && err) {
+	      if (!this._writableState) {
+	        process.nextTick(emitErrorAndCloseNT, this, err);
+	      } else if (!this._writableState.errorEmitted) {
+	        this._writableState.errorEmitted = true;
+	        process.nextTick(emitErrorAndCloseNT, this, err);
+	      } else {
+	        process.nextTick(emitCloseNT, this);
+	      }
+	    } else if (cb) {
+	      process.nextTick(emitCloseNT, this);
+	      cb(err);
+	    } else {
+	      process.nextTick(emitCloseNT, this);
+	    }
+	  });
+	  return this;
+	}
+	function emitErrorAndCloseNT(self, err) {
+	  emitErrorNT(self, err);
+	  emitCloseNT(self);
+	}
+	function emitCloseNT(self) {
+	  if (self._writableState && !self._writableState.emitClose) return;
+	  if (self._readableState && !self._readableState.emitClose) return;
+	  self.emit('close');
+	}
+	function undestroy() {
+	  if (this._readableState) {
+	    this._readableState.destroyed = false;
+	    this._readableState.reading = false;
+	    this._readableState.ended = false;
+	    this._readableState.endEmitted = false;
+	  }
+	  if (this._writableState) {
+	    this._writableState.destroyed = false;
+	    this._writableState.ended = false;
+	    this._writableState.ending = false;
+	    this._writableState.finalCalled = false;
+	    this._writableState.prefinished = false;
+	    this._writableState.finished = false;
+	    this._writableState.errorEmitted = false;
+	  }
+	}
+	function emitErrorNT(self, err) {
+	  self.emit('error', err);
+	}
+	function errorOrDestroy(stream, err) {
+	  // We have tests that rely on errors being emitted
+	  // in the same tick, so changing this is semver major.
+	  // For now when you opt-in to autoDestroy we allow
+	  // the error to be emitted nextTick. In a future
+	  // semver major update we should change the default to this.
+
+	  const rState = stream._readableState;
+	  const wState = stream._writableState;
+	  if (rState && rState.autoDestroy || wState && wState.autoDestroy) stream.destroy(err);else stream.emit('error', err);
+	}
+	destroy_1 = {
+	  destroy,
+	  undestroy,
+	  errorOrDestroy
+	};
+	return destroy_1;
 }
-var destroy_1 = {
-  destroy,
-  undestroy,
-  errorOrDestroy
-};
 
 var errorsBrowser = {};
 
@@ -10996,92 +11013,109 @@ createErrorType('ERR_UNKNOWN_ENCODING', function (arg) {
 createErrorType('ERR_STREAM_UNSHIFT_AFTER_END_EVENT', 'stream.unshift() after end event');
 errorsBrowser.codes = codes;
 
-const ERR_INVALID_OPT_VALUE = errorsBrowser.codes.ERR_INVALID_OPT_VALUE;
-function highWaterMarkFrom(options, isDuplex, duplexKey) {
-  return options.highWaterMark != null ? options.highWaterMark : isDuplex ? options[duplexKey] : null;
-}
-function getHighWaterMark(state, options, duplexKey, isDuplex) {
-  const hwm = highWaterMarkFrom(options, isDuplex, duplexKey);
-  if (hwm != null) {
-    if (!(isFinite(hwm) && Math.floor(hwm) === hwm) || hwm < 0) {
-      const name = isDuplex ? duplexKey : 'highWaterMark';
-      throw new ERR_INVALID_OPT_VALUE(name, hwm);
-    }
-    return Math.floor(hwm);
-  }
+var state;
+var hasRequiredState;
+
+function requireState () {
+	if (hasRequiredState) return state;
+	hasRequiredState = 1;
 
-  // Default value
-  return state.objectMode ? 16 : 16 * 1024;
+	const ERR_INVALID_OPT_VALUE = errorsBrowser.codes.ERR_INVALID_OPT_VALUE;
+	function highWaterMarkFrom(options, isDuplex, duplexKey) {
+	  return options.highWaterMark != null ? options.highWaterMark : isDuplex ? options[duplexKey] : null;
+	}
+	function getHighWaterMark(state, options, duplexKey, isDuplex) {
+	  const hwm = highWaterMarkFrom(options, isDuplex, duplexKey);
+	  if (hwm != null) {
+	    if (!(isFinite(hwm) && Math.floor(hwm) === hwm) || hwm < 0) {
+	      const name = isDuplex ? duplexKey : 'highWaterMark';
+	      throw new ERR_INVALID_OPT_VALUE(name, hwm);
+	    }
+	    return Math.floor(hwm);
+	  }
+
+	  // Default value
+	  return state.objectMode ? 16 : 16 * 1024;
+	}
+	state = {
+	  getHighWaterMark
+	};
+	return state;
 }
-var state = {
-  getHighWaterMark
-};
 
-/**
- * Module exports.
- */
+var browser$b;
+var hasRequiredBrowser$3;
 
-var browser$b = deprecate$1;
+function requireBrowser$3 () {
+	if (hasRequiredBrowser$3) return browser$b;
+	hasRequiredBrowser$3 = 1;
+	/**
+	 * Module exports.
+	 */
 
-/**
- * Mark that a method should not be used.
- * Returns a modified function which warns once by default.
- *
- * If `localStorage.noDeprecation = true` is set, then it is a no-op.
- *
- * If `localStorage.throwDeprecation = true` is set, then deprecated functions
- * will throw an Error when invoked.
- *
- * If `localStorage.traceDeprecation = true` is set, then deprecated functions
- * will invoke `console.trace()` instead of `console.error()`.
- *
- * @param {Function} fn - the function to deprecate
- * @param {String} msg - the string to print to the console when `fn` is invoked
- * @returns {Function} a new "deprecated" version of `fn`
- * @api public
- */
+	browser$b = deprecate;
 
-function deprecate$1 (fn, msg) {
-  if (config('noDeprecation')) {
-    return fn;
-  }
+	/**
+	 * Mark that a method should not be used.
+	 * Returns a modified function which warns once by default.
+	 *
+	 * If `localStorage.noDeprecation = true` is set, then it is a no-op.
+	 *
+	 * If `localStorage.throwDeprecation = true` is set, then deprecated functions
+	 * will throw an Error when invoked.
+	 *
+	 * If `localStorage.traceDeprecation = true` is set, then deprecated functions
+	 * will invoke `console.trace()` instead of `console.error()`.
+	 *
+	 * @param {Function} fn - the function to deprecate
+	 * @param {String} msg - the string to print to the console when `fn` is invoked
+	 * @returns {Function} a new "deprecated" version of `fn`
+	 * @api public
+	 */
 
-  var warned = false;
-  function deprecated() {
-    if (!warned) {
-      if (config('throwDeprecation')) {
-        throw new Error(msg);
-      } else if (config('traceDeprecation')) {
-        console.trace(msg);
-      } else {
-        console.warn(msg);
-      }
-      warned = true;
-    }
-    return fn.apply(this, arguments);
-  }
+	function deprecate (fn, msg) {
+	  if (config('noDeprecation')) {
+	    return fn;
+	  }
 
-  return deprecated;
-}
+	  var warned = false;
+	  function deprecated() {
+	    if (!warned) {
+	      if (config('throwDeprecation')) {
+	        throw new Error(msg);
+	      } else if (config('traceDeprecation')) {
+	        console.trace(msg);
+	      } else {
+	        console.warn(msg);
+	      }
+	      warned = true;
+	    }
+	    return fn.apply(this, arguments);
+	  }
 
-/**
- * Checks `localStorage` for boolean values for the given `name`.
- *
- * @param {String} name
- * @returns {Boolean}
- * @api private
- */
+	  return deprecated;
+	}
 
-function config (name) {
-  // accessing global.localStorage can trigger a DOMException in sandboxed iframes
-  try {
-    if (!commonjsGlobal.localStorage) return false;
-  } catch (_) {
-    return false;
-  }
-  var val = commonjsGlobal.localStorage[name];
-  if (null == val) return false;
-  return String(val).toLowerCase() === 'true';
+	/**
+	 * Checks `localStorage` for boolean values for the given `name`.
+	 *
+	 * @param {String} name
+	 * @returns {Boolean}
+	 * @api private
+	 */
+
+	function config (name) {
+	  // accessing global.localStorage can trigger a DOMException in sandboxed iframes
+	  try {
+	    if (!commonjsGlobal.localStorage) return false;
+	  } catch (_) {
+	    return false;
+	  }
+	  var val = commonjsGlobal.localStorage[name];
+	  if (null == val) return false;
+	  return String(val).toLowerCase() === 'true';
+	}
+	return browser$b;
 }
 
 var _stream_writable;
@@ -11112,12 +11146,12 @@ function require_stream_writable () {
 
 	/*<replacement>*/
 	const internalUtil = {
-	  deprecate: browser$b
+	  deprecate: requireBrowser$3()
 	};
 	/*</replacement>*/
 
 	/*<replacement>*/
-	var Stream = streamBrowser;
+	var Stream = requireStreamBrowser();
 	/*</replacement>*/
 
 	const Buffer = require$$6$1.Buffer;
@@ -11128,8 +11162,8 @@ function require_stream_writable () {
 	function _isUint8Array(obj) {
 	  return Buffer.isBuffer(obj) || obj instanceof OurUint8Array;
 	}
-	const destroyImpl = destroy_1;
-	const _require = state,
+	const destroyImpl = requireDestroy();
+	const _require = requireState(),
 	  getHighWaterMark = _require.getHighWaterMark;
 	const _require$codes = errorsBrowser.codes,
 	  ERR_INVALID_ARG_TYPE = _require$codes.ERR_INVALID_ARG_TYPE,
@@ -12323,7 +12357,7 @@ function require_stream_readable () {
 	/*</replacement>*/
 
 	/*<replacement>*/
-	var Stream = streamBrowser;
+	var Stream = requireStreamBrowser();
 	/*</replacement>*/
 
 	const Buffer = require$$6$1.Buffer;
@@ -12346,8 +12380,8 @@ function require_stream_readable () {
 	/*</replacement>*/
 
 	const BufferList = requireBuffer_list();
-	const destroyImpl = destroy_1;
-	const _require = state,
+	const destroyImpl = requireDestroy();
+	const _require = requireState(),
 	  getHighWaterMark = _require.getHighWaterMark;
 	const _require$codes = errorsBrowser.codes,
 	  ERR_INVALID_ARG_TYPE = _require$codes.ERR_INVALID_ARG_TYPE,
@@ -15713,7 +15747,7 @@ function WriteReq(chunk, encoding, cb) {
 
 function WritableState(options, stream) {
   Object.defineProperty(this, 'buffer', {
-    get: deprecate$2(function () {
+    get: deprecate$1(function () {
       return this.getBuffer();
     }, '_writableState.buffer is deprecated. Use _writableState.getBuffer ' + 'instead.')
   });
@@ -37425,8 +37459,8 @@ 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) {
@@ -37477,7 +37511,7 @@ 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)) ; else {
         this.committedBlocks.set(stringCid, bytes);
         cids.add(stringCid);
@@ -37698,6 +37732,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
   }
@@ -39014,6 +39051,8 @@ 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();
   }
 
@@ -39027,7 +39066,6 @@ class DbIndex {
       return this.mapFnString
     } else {
       // it's a consise arrow function, match everythign after the arrow
-      this.includeDocsDefault = true;
       return matches[1]
     }
   }
@@ -41338,14 +41376,15 @@ 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
     }