@fireproof/core 0.5.9 → 0.5.10

package/dist/src/fireproof.mjs

@@ -32,9 +32,17 @@ function getAugmentedNamespace(n) {
 	return a;
 }
 
-var browser$d = {exports: {}};
+var browserExports$1 = {};
+var browser$d = {
+  get exports(){ return browserExports$1; },
+  set exports(v){ browserExports$1 = v; },
+};
 
-var safeBuffer$1 = {exports: {}};
+var safeBufferExports = {};
+var safeBuffer$1 = {
+  get exports(){ return safeBufferExports; },
+  set exports(v){ safeBufferExports = v; },
+};
 
 var global$1 = (typeof global !== "undefined" ? global :
   typeof self !== "undefined" ? self :
@@ -2099,10 +2107,8 @@ var require$$6$1 = /*@__PURE__*/getAugmentedNamespace(_polyfillNode_buffer);
 	    throw new TypeError('Argument must be a number')
 	  }
 	  return buffer.SlowBuffer(size)
-	}; 
-} (safeBuffer$1, safeBuffer$1.exports));
-
-var safeBufferExports = safeBuffer$1.exports;
+	};
+} (safeBuffer$1, safeBufferExports));
 
 // limit of Crypto.getRandomValues()
 // https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues
@@ -2153,9 +2159,6 @@ function randomBytes$2 (size, cb) {
   return bytes
 }
 
-var browserExports$1 = browser$d.exports;
-var randomBytes$3 = /*@__PURE__*/getDefaultExportFromCjs(browserExports$1);
-
 var encode_1$2 = encode$9;
 
 var MSB$4 = 0x80
@@ -2238,13 +2241,13 @@ var length$2 = function (value) {
   )
 };
 
-var varint$3 = {
+var varint$2 = {
     encode: encode_1$2
   , decode: decode$d
   , encodingLength: length$2
 };
 
-var _brrp_varint$1 = varint$3;
+var _brrp_varint$1 = varint$2;
 
 /**
  * @param {Uint8Array} data
@@ -7073,8 +7076,6 @@ var varint$1 = {
   , encodingLength: length$1
 };
 
-var varint$2 = /*@__PURE__*/getDefaultExportFromCjs(varint$1);
-
 const CIDV0_BYTES = {
   SHA2_256: 0x12,
   LENGTH: 0x20,
@@ -7099,8 +7100,8 @@ function decodeVarint (bytes, seeker) {
   if (!bytes.length) {
     throw new Error('Unexpected end of data')
   }
-  const i = varint$2.decode(bytes);
-  seeker.seek(/** @type {number} */(varint$2.decode.bytes));
+  const i = varint$1.decode(bytes);
+  seeker.seek(/** @type {number} */(varint$1.decode.bytes));
   return i
   /* c8 ignore next 2 */
   // Node.js 12 c8 bug
@@ -7151,10 +7152,10 @@ function getMultihashLength (bytes) {
   // where both code and length are varints, so we have to decode
   // them first before we can know total length
 
-  varint$2.decode(bytes); // code
-  const codeLength = /** @type {number} */(varint$2.decode.bytes);
-  const length = varint$2.decode(bytes.subarray(varint$2.decode.bytes));
-  const lengthLength = /** @type {number} */(varint$2.decode.bytes);
+  varint$1.decode(bytes); // code
+  const codeLength = /** @type {number} */(varint$1.decode.bytes);
+  const length = varint$1.decode(bytes.subarray(varint$1.decode.bytes));
+  const lengthLength = /** @type {number} */(varint$1.decode.bytes);
   const mhLength = codeLength + lengthLength + length;
 
   return mhLength
@@ -7862,7 +7863,7 @@ const addRoot = (writer, root, options = {}) => {
  */
 const blockLength = ({ cid, bytes }) => {
   const size = cid.bytes.byteLength + bytes.byteLength;
-  return varint$2.encodingLength(size) + size
+  return varint$1.encodingLength(size) + size
 };
 
 /**
@@ -7871,7 +7872,7 @@ const blockLength = ({ cid, bytes }) => {
  */
 const addBlock = (writer, { cid, bytes }) => {
   const byteLength = cid.bytes.byteLength + bytes.byteLength;
-  const size = varint$2.encode(byteLength);
+  const size = varint$1.encode(byteLength);
   if (writer.byteOffset + size.length + byteLength > writer.bytes.byteLength) {
     throw new RangeError('Buffer has no capacity for this block')
   } else {
@@ -7891,7 +7892,7 @@ const close = (writer, options = {}) => {
   const { roots, bytes, byteOffset, headerSize } = writer;
 
   const headerBytes = encode$5({ version: 1, roots });
-  const varintBytes = varint$2.encode(headerBytes.length);
+  const varintBytes = varint$1.encode(headerBytes.length);
 
   const size = varintBytes.length + headerBytes.byteLength;
   const offset = headerSize - size;
@@ -7968,7 +7969,7 @@ const calculateHeaderLength = (rootLengths) => {
     tokens.push(new Token(Type.bytes, { length: rootLength + 1 }));
   }
   const length = tokensToLength(tokens); // no options needed here because we have simple tokens
-  return varint$2.encodingLength(length) + length
+  return varint$1.encodingLength(length) + length
 };
 
 /**
@@ -8311,11 +8312,23 @@ replaceTraps((oldTraps) => ({
     has: (target, prop) => !!getMethod(target, prop) || oldTraps.has(target, prop),
 }));
 
-var cargoQueue$1 = {exports: {}};
+var cargoQueueExports = {};
+var cargoQueue$1 = {
+  get exports(){ return cargoQueueExports; },
+  set exports(v){ cargoQueueExports = v; },
+};
 
-var queue$1 = {exports: {}};
+var queueExports = {};
+var queue$1 = {
+  get exports(){ return queueExports; },
+  set exports(v){ queueExports = v; },
+};
 
-var onlyOnce = {exports: {}};
+var onlyOnceExports = {};
+var onlyOnce = {
+  get exports(){ return onlyOnceExports; },
+  set exports(v){ onlyOnceExports = v; },
+};
 
 (function (module, exports) {
 
@@ -8331,10 +8344,8 @@ var onlyOnce = {exports: {}};
 	        callFn.apply(this, args);
 	    };
 	}
-	module.exports = exports["default"]; 
-} (onlyOnce, onlyOnce.exports));
-
-var onlyOnceExports = onlyOnce.exports;
+	module.exports = exports["default"];
+} (onlyOnce, onlyOnceExports));
 
 var setImmediate$1 = {};
 
@@ -8371,7 +8382,11 @@ if (hasQueueMicrotask) {
 
 setImmediate$1.default = wrap(_defer);
 
-var DoublyLinkedList = {exports: {}};
+var DoublyLinkedListExports = {};
+var DoublyLinkedList = {
+  get exports(){ return DoublyLinkedListExports; },
+  set exports(v){ DoublyLinkedListExports = v; },
+};
 
 (function (module, exports) {
 
@@ -8464,16 +8479,22 @@ var DoublyLinkedList = {exports: {}};
 	    dll.length = 1;
 	    dll.head = dll.tail = node;
 	}
-	module.exports = exports["default"]; 
-} (DoublyLinkedList, DoublyLinkedList.exports));
-
-var DoublyLinkedListExports = DoublyLinkedList.exports;
+	module.exports = exports["default"];
+} (DoublyLinkedList, DoublyLinkedListExports));
 
 var wrapAsync = {};
 
-var asyncify = {exports: {}};
+var asyncifyExports = {};
+var asyncify = {
+  get exports(){ return asyncifyExports; },
+  set exports(v){ asyncifyExports = v; },
+};
 
-var initialParams = {exports: {}};
+var initialParamsExports = {};
+var initialParams = {
+  get exports(){ return initialParamsExports; },
+  set exports(v){ initialParamsExports = v; },
+};
 
 (function (module, exports) {
 
@@ -8488,15 +8509,13 @@ var initialParams = {exports: {}};
 	    };
 	};
 
-	module.exports = exports["default"]; 
-} (initialParams, initialParams.exports));
-
-var initialParamsExports = initialParams.exports;
+	module.exports = exports["default"];
+} (initialParams, initialParamsExports));
 
 var hasRequiredAsyncify;
 
 function requireAsyncify () {
-	if (hasRequiredAsyncify) return asyncify.exports;
+	if (hasRequiredAsyncify) return asyncifyExports;
 	hasRequiredAsyncify = 1;
 	(function (module, exports) {
 
@@ -8615,9 +8634,9 @@ function requireAsyncify () {
 		        }, err);
 		    }
 		}
-		module.exports = exports['default']; 
-	} (asyncify, asyncify.exports));
-	return asyncify.exports;
+		module.exports = exports['default'];
+} (asyncify, asyncifyExports));
+	return asyncifyExports;
 }
 
 var hasRequiredWrapAsync;
@@ -8954,10 +8973,8 @@ function requireWrapAsync () {
 	    });
 	    return q;
 	}
-	module.exports = exports['default']; 
-} (queue$1, queue$1.exports));
-
-var queueExports = queue$1.exports;
+	module.exports = exports['default'];
+} (queue$1, queueExports));
 
 (function (module, exports) {
 
@@ -9029,10 +9046,9 @@ var queueExports = queue$1.exports;
 	function cargo(worker, concurrency, payload) {
 	  return (0, _queue2.default)(worker, concurrency, payload);
 	}
-	module.exports = exports['default']; 
-} (cargoQueue$1, cargoQueue$1.exports));
+	module.exports = exports['default'];
+} (cargoQueue$1, cargoQueueExports));
 
-var cargoQueueExports = cargoQueue$1.exports;
 var cargoQueue = /*@__PURE__*/getDefaultExportFromCjs(cargoQueueExports);
 
 var cryptoBrowserify = {};
@@ -9069,7 +9085,11 @@ var _polyfillNode_inherits = /*#__PURE__*/Object.freeze({
 
 var require$$3$1 = /*@__PURE__*/getAugmentedNamespace(_polyfillNode_inherits);
 
-var readableBrowser = {exports: {}};
+var readableBrowserExports = {};
+var readableBrowser = {
+  get exports(){ return readableBrowserExports; },
+  set exports(v){ readableBrowserExports = v; },
+};
 
 var domain;
 
@@ -13466,10 +13486,8 @@ var pipeline_1 = pipeline;
 	exports.Transform = _stream_transform;
 	exports.PassThrough = _stream_passthrough;
 	exports.finished = endOfStream;
-	exports.pipeline = pipeline_1; 
-} (readableBrowser, readableBrowser.exports));
-
-var readableBrowserExports = readableBrowser.exports;
+	exports.pipeline = pipeline_1;
+} (readableBrowser, readableBrowserExports));
 
 var Buffer$E = safeBufferExports.Buffer;
 var Transform$6 = readableBrowserExports.Transform;
@@ -13875,7 +13893,11 @@ function fn5 (a, b, c, d, e, m, k, s) {
 
 var ripemd160 = RIPEMD160$4;
 
-var sha_js = {exports: {}};
+var sha_jsExports = {};
+var sha_js = {
+  get exports(){ return sha_jsExports; },
+  set exports(v){ sha_jsExports = v; },
+};
 
 var Buffer$B = safeBufferExports.Buffer;
 
@@ -14679,8 +14701,6 @@ exports.sha256 = sha256$1;
 exports.sha384 = sha384$1;
 exports.sha512 = sha512$1;
 
-var sha_jsExports = sha_js.exports;
-
 function BufferList() {
   this.head = null;
   this.tail = null;
@@ -16631,6 +16651,12 @@ var browser$9 = function createHmac (alg, key) {
   return new Hmac$2(alg, key)
 };
 
+var algosExports = {};
+var algos = {
+  get exports(){ return algosExports; },
+  set exports(v){ algosExports = v; },
+};
+
 var sha224WithRSAEncryption = {
 	sign: "rsa",
 	hash: "sha224",
@@ -16795,7 +16821,9 @@ var require$$6 = {
 }
 };
 
-var algos = require$$6;
+(function (module) {
+	module.exports = require$$6;
+} (algos));
 
 var browser$8 = {};
 
@@ -19035,7 +19063,7 @@ var modes = {};
 	exports['des-ede'] = {
 	  key: 16,
 	  iv: 0
-	}; 
+	};
 } (modes));
 
 var DES = browserifyDes;
@@ -19108,9 +19136,11 @@ browser$7.listCiphers = browser$7.getCiphers = getCiphers;
 
 var browser$5 = {};
 
-var bn$1 = {exports: {}};
-
-bn$1.exports;
+var bnExports$1 = {};
+var bn$1 = {
+  get exports(){ return bnExports$1; },
+  set exports(v){ bnExports$1 = v; },
+};
 
 (function (module) {
 	(function (module, exports) {
@@ -22555,17 +22585,19 @@ bn$1.exports;
 	    var res = this.imod(a._invmp(this.m).mul(this.r2));
 	    return res._forceRed(this);
 	  };
-	})(module, commonjsGlobal); 
+	})(module, commonjsGlobal);
 } (bn$1));
 
-var bnExports$1 = bn$1.exports;
-
-var brorand = {exports: {}};
+var brorandExports = {};
+var brorand = {
+  get exports(){ return brorandExports; },
+  set exports(v){ brorandExports = v; },
+};
 
 var hasRequiredBrorand;
 
 function requireBrorand () {
-	if (hasRequiredBrorand) return brorand.exports;
+	if (hasRequiredBrorand) return brorandExports;
 	hasRequiredBrorand = 1;
 	var r;
 
@@ -22579,7 +22611,7 @@ function requireBrorand () {
 	function Rand(rand) {
 	  this.rand = rand;
 	}
-	brorand.exports.Rand = Rand;
+	brorandExports.Rand = Rand;
 
 	Rand.prototype.generate = function generate(len) {
 	  return this._rand(len);
@@ -22632,7 +22664,7 @@ function requireBrorand () {
 	  } catch (e) {
 	  }
 	}
-	return brorand.exports;
+	return brorandExports;
 }
 
 var mr;
@@ -23139,11 +23171,17 @@ function requireBrowser$2 () {
 	return browser$5;
 }
 
-var sign = {exports: {}};
-
-var bn = {exports: {}};
+var signExports = {};
+var sign = {
+  get exports(){ return signExports; },
+  set exports(v){ signExports = v; },
+};
 
-bn.exports;
+var bnExports = {};
+var bn = {
+  get exports(){ return bnExports; },
+  set exports(v){ bnExports = v; },
+};
 
 (function (module) {
 	(function (module, exports) {
@@ -26493,11 +26531,9 @@ bn.exports;
 	    var res = this.imod(a._invmp(this.m).mul(this.r2));
 	    return res._forceRed(this);
 	  };
-	})(module, commonjsGlobal); 
+	})(module, commonjsGlobal);
 } (bn));
 
-var bnExports = bn.exports;
-
 var BN$a = bnExports;
 var randomBytes$1 = browserExports$1;
 
@@ -26668,7 +26704,7 @@ var utils$k = {};
 	    return toHex(arr);
 	  else
 	    return arr;
-	}; 
+	};
 } (utils$k));
 
 (function (exports) {
@@ -26788,7 +26824,7 @@ var utils$k = {};
 	function intFromLE(bytes) {
 	  return new BN(bytes, 'hex', 'le');
 	}
-	utils.intFromLE = intFromLE; 
+	utils.intFromLE = intFromLE;
 } (utils$l));
 
 var curve = {};
@@ -28727,7 +28763,7 @@ Point.prototype.mixedAdd = Point.prototype.add;
 	curve.base = base$2;
 	curve.short = short;
 	curve.mont = mont;
-	curve.edwards = edwards; 
+	curve.edwards = edwards;
 } (curve));
 
 var curves$1 = {};
@@ -29940,7 +29976,7 @@ Hmac.prototype.digest = function digest(enc) {
 	hash.sha224 = hash.sha.sha224;
 	hash.sha384 = hash.sha.sha384;
 	hash.sha512 = hash.sha.sha512;
-	hash.ripemd160 = hash.ripemd.ripemd160; 
+	hash.ripemd160 = hash.ripemd.ripemd160;
 } (hash$2));
 
 var secp256k1;
@@ -30937,7 +30973,7 @@ function requireSecp256k1 () {
 	    '483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8',
 	    pre,
 	  ],
-	}); 
+	});
 } (curves$1));
 
 var hash$1 = hash$2;
@@ -31880,8 +31916,8 @@ function requireElliptic () {
 
 		// Protocols
 		elliptic.ec = requireEc();
-		elliptic.eddsa = eddsa; 
-	} (elliptic));
+		elliptic.eddsa = eddsa;
+} (elliptic));
 	return elliptic;
 }
 
@@ -32941,7 +32977,7 @@ var der$2 = {};
 	  0x1d: 'charstr',
 	  0x1e: 'bmpstr'
 	};
-	exports.tagByName = reverse(exports.tag); 
+	exports.tagByName = reverse(exports.tag);
 } (der$2));
 
 const inherits$3 = require$$3$1;
@@ -33265,7 +33301,7 @@ PEMEncoder.prototype.encode = function encode(data, options) {
 	const encoders = exports;
 
 	encoders.der = der_1$1;
-	encoders.pem = pem$1; 
+	encoders.pem = pem$1;
 } (encoders));
 
 var decoders = {};
@@ -33659,7 +33695,7 @@ PEMDecoder.prototype.decode = function decode(data, options) {
 	const decoders = exports;
 
 	decoders.der = der_1;
-	decoders.pem = pem; 
+	decoders.pem = pem;
 } (decoders));
 
 (function (exports) {
@@ -33718,7 +33754,7 @@ PEMDecoder.prototype.decode = function decode(data, options) {
 
 	Entity.prototype.encode = function encode(data, enc, /* internal */ reporter) {
 	  return this._getEncoder(enc).encode(data, reporter);
-	}; 
+	};
 } (api));
 
 var base$1 = {};
@@ -33730,7 +33766,7 @@ var base$1 = {};
 	base.Reporter = reporter.Reporter;
 	base.DecoderBuffer = buffer.DecoderBuffer;
 	base.EncoderBuffer = buffer.EncoderBuffer;
-	base.Node = node; 
+	base.Node = node;
 } (base$1));
 
 var constants = {};
@@ -33755,7 +33791,7 @@ var constants = {};
 	  return res;
 	};
 
-	constants.der = der$2; 
+	constants.der = der$2;
 } (constants));
 
 (function (exports) {
@@ -33768,7 +33804,7 @@ var constants = {};
 	asn1.base = base$1;
 	asn1.constants = constants;
 	asn1.decoders = decoders;
-	asn1.encoders = encoders; 
+	asn1.encoders = encoders;
 } (asn1$2));
 
 var asn = asn1$2;
@@ -34142,7 +34178,7 @@ var require$$4 = {
 var hasRequiredSign;
 
 function requireSign () {
-	if (hasRequiredSign) return sign.exports;
+	if (hasRequiredSign) return signExports;
 	hasRequiredSign = 1;
 	// much of this based on https://github.com/indutny/self-signed/blob/gh-pages/lib/rsa.js
 	var Buffer = safeBufferExports.Buffer;
@@ -34285,9 +34321,9 @@ function requireSign () {
 	}
 
 	sign.exports = sign$1;
-	sign.exports.getKey = getKey;
-	sign.exports.makeKey = makeKey;
-	return sign.exports;
+	signExports.getKey = getKey;
+	signExports.makeKey = makeKey;
+	return signExports;
 }
 
 var verify_1;
@@ -34866,7 +34902,7 @@ function compare$3 (a, b) {
 
 	exports.publicDecrypt = function publicDecrypt (key, buf) {
 	  return exports.privateDecrypt(key, buf, true)
-	}; 
+	};
 } (browser$2));
 
 var browser$1 = {};
@@ -34988,8 +35024,8 @@ function requireCryptoBrowserify () {
 	cryptoBrowserify.createHash = cryptoBrowserify.Hash = browser$a;
 	cryptoBrowserify.createHmac = cryptoBrowserify.Hmac = browser$9;
 
-	var algos$1 = algos;
-	var algoKeys = Object.keys(algos$1);
+	var algos = algosExports;
+	var algoKeys = Object.keys(algos);
 	var hashes = ['sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'md5', 'rmd160'].concat(algoKeys);
 	cryptoBrowserify.getHashes = function () {
 	  return hashes
@@ -37851,7 +37887,7 @@ async function visMerkleClock (blocks, head) {
   return { vis: lines.join('\n') }
 }
 
-var charwise$1 = {};
+var charwise = {};
 
 var number = {};
 
@@ -38079,10 +38115,8 @@ object.factory = function (codec) {
 
 	//for leveldb, request strings
 	exports.buffer = false;
-	exports.type = 'charwise'; 
-} (charwise$1));
-
-var charwise = /*@__PURE__*/getDefaultExportFromCjs(charwise$1);
+	exports.type = 'charwise';
+} (charwise));
 
 /* global localStorage */
 let storageSupported = false;
@@ -38180,9 +38214,9 @@ class Database {
   }
 
   // used be indexes etc to notify database listeners of new availability
-  async notifyExternal (source = 'unknown') {
-    await this.notifyListeners({ _external: source, _clock: this.clockToJSON() });
-  }
+  // async notifyExternal (source = 'unknown') {
+  //   // await this.notifyListeners({ _external: source, _clock: this.clockToJSON() })
+  // }
 
   /**
    * Returns the changes made to the Fireproof instance since the specified event.
@@ -38442,13 +38476,23 @@ class Database {
    * @returns {Function} - A function that can be called to unregister the listener.
    * @memberof Fireproof
    */
-  registerListener (listener) {
+  subscribe (listener) {
     this.listeners.add(listener);
     return () => {
       this.listeners.delete(listener);
     }
   }
 
+  /**
+   * @deprecated 0.7.0 - renamed subscribe(listener)
+   * @param {Function} listener - The listener to be called when the clock is updated.
+   * @returns {Function} - A function that can be called to unregister the listener.
+   * @memberof Fireproof
+   */
+  registerListener (listener) {
+    return this.subscribe(listener)
+  }
+
   async notifyListeners (changes) {
     // await sleep(10)
     await this.maybeSaveClock();
@@ -38497,7 +38541,9 @@ function encodeEvent (event) {
  * @param {Function} routingFn - The routing function to apply to each entry in the database.
  */
 // import { ChangeEvent } from './db-index'
-
+/**
+ * @deprecated since version 0.7.0
+ */
 class Listener {
   subcribers = new Map()
   doStopListening = null
@@ -38781,14 +38827,23 @@ const makeDoc = ({ key, value }) => ({ _id: key, ...value });
 const indexEntriesForChanges = (changes, mapFn) => {
   const indexEntries = [];
   changes.forEach(({ key, value, del }) => {
+    // key is _id, value is the document
     if (del || !value) return
-    mapFn(makeDoc({ key, value }), (k, v) => {
+    let mapCalled = false;
+    const mapReturn = mapFn(makeDoc({ key, value }), (k, v) => {
+      mapCalled = true;
       if (typeof k === 'undefined') return
       indexEntries.push({
         key: [charwise.encode(k), key],
         value: v || null
       });
     });
+    if (!mapCalled && mapReturn) {
+      indexEntries.push({
+        key: [charwise.encode(mapReturn), key],
+        value: null
+      });
+    }
   });
   return indexEntries
 };
@@ -38810,7 +38865,10 @@ class DbIndex {
   constructor (database, name, mapFn, clock = null, opts = {}) {
     this.database = database;
     if (!database.indexBlocks) {
-      database.indexBlocks = new TransactionBlockstore(database?.name + '.indexes', database.blocks.valet?.getKeyMaterial());
+      database.indexBlocks = new TransactionBlockstore(
+        database?.name + '.indexes',
+        database.blocks.valet?.getKeyMaterial()
+      );
     }
     if (typeof name === 'function') {
       // app is using deprecated API, remove in 0.7
@@ -38819,13 +38877,8 @@ class DbIndex {
       mapFn = name;
       name = null;
     }
-    if (typeof mapFn === 'string') {
-      this.mapFnString = mapFn;
-    } else {
-      this.mapFn = mapFn;
-      this.mapFnString = mapFn.toString();
-    }
-    this.name = name || this.makeName();
+    this.applyMapFn(mapFn, name);
+
     this.indexById = { root: null, cid: null };
     this.indexByKey = { root: null, cid: null };
     this.dbHead = null;
@@ -38836,13 +38889,34 @@ class DbIndex {
     }
     this.instanceId = this.database.instanceId + `.DbIndex.${Math.random().toString(36).substring(2, 7)}`;
     this.updateIndexPromise = null;
-    if (!opts.temporary) { DbIndex.registerWithDatabase(this, this.database); }
+    if (!opts.temporary) {
+      DbIndex.registerWithDatabase(this, this.database);
+    }
+  }
+
+  applyMapFn (mapFn, name) {
+    if (typeof mapFn === 'string') {
+      this.mapFnString = mapFn;
+    } else {
+      this.mapFn = mapFn;
+      this.mapFnString = mapFn.toString();
+    }
+    this.name = name || this.makeName();
   }
 
   makeName () {
     const regex = /\(([^,()]+,\s*[^,()]+|\[[^\]]+\],\s*[^,()]+)\)/g;
-    const matches = Array.from(this.mapFnString.matchAll(regex), match => match[1].trim());
-    return matches[1]
+    let matches = Array.from(this.mapFnString.matchAll(regex), match => match[1].trim());
+    if (matches.length === 0) {
+      matches = /=>\s*(.*)/.exec(this.mapFnString);
+    }
+    if (matches.length === 0) {
+      return this.mapFnString
+    } else {
+      // it's a consise arrow function, match everythign after the arrow
+      this.includeDocsDefault = true;
+      return matches[1]
+    }
   }
 
   static registerWithDatabase (inIndex, database) {
@@ -38852,7 +38926,8 @@ class DbIndex {
       // merge our inIndex code with the inIndex clock or vice versa
       const existingIndex = database.indexes.get(inIndex.mapFnString);
       // keep the code instance, discard the clock instance
-      if (existingIndex.mapFn) { // this one also has other config
+      if (existingIndex.mapFn) {
+        // this one also has other config
         existingIndex.dbHead = inIndex.dbHead;
         existingIndex.indexById.cid = inIndex.indexById.cid;
         existingIndex.indexByKey.cid = inIndex.indexByKey.cid;
@@ -38896,7 +38971,7 @@ class DbIndex {
   /**
    * Query object can have {range}
    * @param {DbQuery} query - the query range to use
-   * @returns {Promise<{proof: {}, rows: Array<{id: string, key: string, value: any}>}>}
+   * @returns {Promise<{proof: {}, rows: Array<{id: string, key: string, value: any, doc?: any}>}>}
    * @memberof DbIndex
    * @instance
    */
@@ -38904,20 +38979,63 @@ class DbIndex {
     // const callId = Math.random().toString(36).substring(2, 7)
     // todo pass a root to query a snapshot
     // console.time(callId + '.updateIndex')
-    update && await this.updateIndex(this.database.indexBlocks);
+    update && (await this.updateIndex(this.database.indexBlocks));
     // console.timeEnd(callId + '.updateIndex')
     // console.time(callId + '.doIndexQuery')
     // console.log('query', query)
-    const response = await doIndexQuery(this.database.indexBlocks, this.indexByKey, query);
+    const response = await this.doIndexQuery(query);
     // console.timeEnd(callId + '.doIndexQuery')
     return {
       proof: { index: await cidsToProof(response.cids) },
-      rows: response.result.map(({ id, key, row }) => {
-        return ({ id, key: charwise.decode(key), value: row })
+      rows: response.result.map(({ id, key, row, doc }) => {
+        return { id, key: charwise.decode(key), value: row, doc }
       })
     }
   }
 
+  /**
+   *
+   * @param {any} resp
+   * @param {any} query
+   * @returns
+   */
+  async applyQuery (resp, query) {
+    if (query.descending) {
+      resp.result = resp.result.reverse();
+    }
+    if (query.limit) {
+      resp.result = resp.result.slice(0, query.limit);
+    }
+    if (query.includeDocs) {
+      resp.result = await Promise.all(
+        resp.result.map(async row => {
+          const doc = await this.database.get(row.id);
+          return { ...row, doc }
+        })
+      );
+    }
+    return resp
+  }
+
+  async doIndexQuery (query = {}) {
+    await loadIndex(this.database.indexBlocks, this.indexByKey, dbIndexOpts);
+    if (!this.indexByKey.root) return { result: [] }
+    if (query.includeDocs === undefined) query.includeDocs = this.includeDocsDefault;
+    if (query.range) {
+      const encodedRange = query.range.map(key => charwise.encode(key));
+      return await this.applyQuery(await this.indexByKey.root.range(...encodedRange), query)
+    } else if (query.key) {
+      const encodedKey = charwise.encode(query.key);
+      return await this.applyQuery(this.indexByKey.root.get(encodedKey), query)
+    } else {
+      const { result, ...all } = await this.indexByKey.root.getAllEntries();
+      return await this.applyQuery(
+        { result: result.map(({ key: [k, id], value }) => ({ key: k, id, row: value })), ...all },
+        query
+      )
+    }
+  }
+
   /**
    * Update the DbIndex with the latest changes
    * @private
@@ -38934,7 +39052,9 @@ class DbIndex {
       })
     }
     this.updateIndexPromise = this.innerUpdateIndex(blocks);
-    this.updateIndexPromise.finally(() => { this.updateIndexPromise = null; });
+    this.updateIndexPromise.finally(() => {
+      this.updateIndexPromise = null;
+    });
     return this.updateIndexPromise
   }
 
@@ -38953,7 +39073,7 @@ class DbIndex {
       this.dbHead = result.clock;
       return
     }
-    const didT = await doTransaction('updateIndex', inBlocks, async (blocks) => {
+    const didT = await doTransaction('updateIndex', inBlocks, async blocks => {
       let oldIndexEntries = [];
       let removeByIdIndexEntries = [];
       await loadIndex(blocks, this.indexById, idIndexOpts);
@@ -38961,19 +39081,28 @@ class DbIndex {
       // 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 }));
+        oldIndexEntries = oldChangeEntries.result.map(key => ({ key, del: true }));
         removeByIdIndexEntries = oldIndexEntries.map(({ key }) => ({ key: key[1], del: true }));
       }
       if (!this.mapFn) {
-        throw new Error('No live map function installed for index, cannot update. Make sure your index definition runs before any queries.' + (this.mapFnString ? ' Your code should match the stored map function source:\n' + this.mapFnString : ''))
+        throw new Error(
+          'No live map function installed for index, cannot update. Make sure your index definition runs before any queries.' +
+            (this.mapFnString ? ' Your code should match the stored map function source:\n' + this.mapFnString : '')
+        )
       }
       const indexEntries = indexEntriesForChanges(result.rows, this.mapFn);
       const byIdIndexEntries = indexEntries.map(({ key }) => ({ key: key[1], value: key }));
-      this.indexById = await bulkIndex(blocks, this.indexById, removeByIdIndexEntries.concat(byIdIndexEntries), idIndexOpts);
+      this.indexById = await bulkIndex(
+        blocks,
+        this.indexById,
+        removeByIdIndexEntries.concat(byIdIndexEntries),
+        idIndexOpts
+      );
       this.indexByKey = await bulkIndex(blocks, this.indexByKey, oldIndexEntries.concat(indexEntries), dbIndexOpts);
       this.dbHead = result.clock;
     });
-    this.database.notifyExternal('dbIndex');
+    // todo index subscriptions
+    // this.database.notifyExternal('dbIndex')
     // console.timeEnd(callTag + '.doTransactionupdateIndex')
     // console.log(`updateIndex ${callTag} <`, this.instanceId, this.dbHead?.toString(), this.indexByKey.cid?.toString(), this.indexById.cid?.toString())
     return didT
@@ -39035,27 +39164,11 @@ async function loadIndex (blocks, index, indexOpts) {
   return index.root
 }
 
-async function applyLimit (results, limit) {
-  results.result = results.result.slice(0, limit);
-  return results
-}
-
-async function doIndexQuery (blocks, indexByKey, query = {}) {
-  await loadIndex(blocks, indexByKey, dbIndexOpts);
-  if (!indexByKey.root) return { result: [] }
-  if (query.range) {
-    const encodedRange = query.range.map((key) => charwise.encode(key));
-    return applyLimit(await indexByKey.root.range(...encodedRange), query.limit)
-  } else if (query.key) {
-    const encodedKey = charwise.encode(query.key);
-    return indexByKey.root.get(encodedKey)
-  } else {
-    const { result, ...all } = await indexByKey.root.getAllEntries();
-    return applyLimit({ result: result.map(({ key: [k, id], value }) => ({ key: k, id, row: value })), ...all }, query.limit)
-  }
-}
-
-var browser = {exports: {}};
+var browserExports = {};
+var browser = {
+  get exports(){ return browserExports; },
+  set exports(v){ browserExports = v; },
+};
 
 /**
  * Helpers.
@@ -39771,10 +39884,8 @@ var common = setup;
 		} catch (error) {
 			return '[UnexpectedJSONParseError]: ' + error.message;
 		}
-	}; 
-} (browser, browser.exports));
-
-var browserExports = browser.exports;
+	};
+} (browser, browserExports));
 
 // originally pulled out of simple-peer
 
@@ -40925,8 +41036,6 @@ Peer.channelConfig = {};
 
 var simplePeer = Peer;
 
-var SimplePeer = /*@__PURE__*/getDefaultExportFromCjs(simplePeer);
-
 /**
  * @typedef {import('./database.js').Database} Database
  */
@@ -40937,7 +41046,7 @@ class Sync {
    * @memberof Sync
    * @static
    */
-  constructor (database, PeerClass = SimplePeer) {
+  constructor (database, PeerClass = simplePeer) {
     this.database = database;
     this.database.blocks.syncs.add(this); // should this happen during setup?
     this.PeerClass = PeerClass;
@@ -41145,7 +41254,7 @@ class Fireproof {
         const fp = new Database(new TransactionBlockstore(name, existingConfig.key), [], opts);
         return Fireproof.fromJSON(existingConfig, fp)
       } else {
-        const instanceKey = randomBytes$3(32).toString('hex'); // pass null to disable encryption
+        const instanceKey = browserExports$1(32).toString('hex'); // pass null to disable encryption
         return new Database(new TransactionBlockstore(name, instanceKey), [], opts)
       }
     } else {