@fireproof/core 0.20.3-dev-preview-1 → 0.20.4-dev-preview-1

package/index.d.cts

@@ -1160,7 +1160,6 @@ declare class Index<K extends IndexKeyType, T extends DocTypes, R extends DocFra
     byKey: IndexTree<K, R>;
     byId: IndexTree<K, R>;
     indexHead?: ClockHead;
-    includeDocsDefault: boolean;
     initError?: Error;
     ready(): Promise<void>;
     readonly logger: Logger;

package/index.d.ts

@@ -1160,7 +1160,6 @@ declare class Index<K extends IndexKeyType, T extends DocTypes, R extends DocFra
     byKey: IndexTree<K, R>;
     byId: IndexTree<K, R>;
     indexHead?: ClockHead;
-    includeDocsDefault: boolean;
     initError?: Error;
     ready(): Promise<void>;
     readonly logger: Logger;

package/index.js

@@ -1851,7 +1851,6 @@ var Index = class {
     this.mapFnString = "";
     this.byKey = new IndexTree();
     this.byId = new IndexTree();
-    this.includeDocsDefault = true;
     this.logger = ensureLogger(sthis, "Index");
     this.blockstore = crdt.indexBlockstore;
     this.crdt = crdt;
@@ -1867,18 +1866,20 @@ var Index = class {
     if (mapFn && meta) throw this.logger.Error().Msg("cannot provide both mapFn and meta").AsError();
     if (this.name && this.name !== name) throw this.logger.Error().Msg("cannot change name").AsError();
     try {
+      let mapFnChanged = false;
       if (meta) {
         if (this.indexHead && this.indexHead.map((c) => c.toString()).join() !== meta.head.map((c) => c.toString()).join()) {
           throw this.logger.Error().Msg("cannot apply different head meta").AsError();
         }
         if (this.mapFnString) {
           if (this.mapFnString !== meta.map) {
-            this.logger.Warn().Msg(`cannot apply different mapFn meta: old mapFnString ${this.mapFnString} new mapFnString ${meta.map}`);
-          } else {
-            this.byId.cid = meta.byId;
-            this.byKey.cid = meta.byKey;
-            this.indexHead = meta.head;
+            this.logger.Warn().Msg(`applying different mapFn meta: old mapFnString ${this.mapFnString} new mapFnString ${meta.map}`);
+            this.mapFnString = meta.map;
+            mapFnChanged = true;
           }
+          this.byId.cid = meta.byId;
+          this.byKey.cid = meta.byKey;
+          this.indexHead = meta.head;
         } else {
           this.mapFnString = meta.map;
           this.byId.cid = meta.byId;
@@ -1889,7 +1890,10 @@ var Index = class {
         if (this.mapFn) {
           if (mapFn) {
             if (this.mapFn.toString() !== mapFn.toString()) {
-              this.logger.Error().Msg("cannot apply different mapFn app2");
+              this.logger.Warn().Msg("applying different mapFn, resetting index");
+              this.mapFn = mapFn;
+              this.mapFnString = mapFn.toString();
+              mapFnChanged = true;
             }
           }
         } else {
@@ -1898,7 +1902,8 @@ var Index = class {
           }
           if (this.mapFnString) {
             if (this.mapFnString !== mapFn.toString()) {
-              this.logger.Error().Str("mapFnString", this.mapFnString).Str("mapFn", mapFn.toString()).Msg("cannot apply different mapFn app");
+              this.logger.Warn().Str("old mapFnString", this.mapFnString).Str("new mapFn", mapFn.toString()).Msg("applying different mapFn, resetting index");
+              mapFnChanged = true;
             }
           } else {
             this.mapFnString = mapFn.toString();
@@ -1906,8 +1911,9 @@ var Index = class {
           this.mapFn = mapFn;
         }
       }
-      const matches = /=>\s*(.*)/.test(this.mapFnString);
-      this.includeDocsDefault = matches;
+      if (mapFnChanged) {
+        this._resetIndex();
+      }
     } catch (e) {
       this.initError = e;
     }
@@ -1923,7 +1929,7 @@ var Index = class {
     if (!this.byKey.root) {
       return await applyQuery(this.crdt, { result: [] }, opts);
     }
-    if (this.includeDocsDefault && opts.includeDocs === void 0) opts.includeDocs = true;
+    if (opts.includeDocs === void 0) opts.includeDocs = true;
     if (opts.range) {
       const eRange = encodeRange(opts.range);
       return await applyQuery(this.crdt, await throwFalsy(this.byKey.root).range(eRange[0], eRange[1]), opts);
@@ -7220,7 +7226,7 @@ function buildResDelWAL(msgCtx, req, ctx) {
 
 // src/version.ts
 var PACKAGE_VERSION = Object.keys({
-  "0.20.3-dev-preview-1": "xxxx"
+  "0.20.4-dev-preview-1": "xxxx"
 })[0];
 export {
   CRDTImpl,