@signaldb/core 1.7.0 → 1.7.1

package/dist/index.cjs13.js

@@ -1,15 +1,10 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class EventEmitter {
-  constructor() {
-    __publicField(this, "_maxListeners", 100);
-    /**
-     * We store a set of the listeners for each event.
-     */
-    __publicField(this, "_listenerStore", /* @__PURE__ */ new Map());
-  }
+  _maxListeners = 100;
+  /**
+   * We store a set of the listeners for each event.
+   */
+  _listenerStore = /* @__PURE__ */ new Map();
   setMaxListeners(max) {
     this._maxListeners = max;
     return this;
@@ -49,10 +44,10 @@ class EventEmitter {
    * @returns         The emitter instance (for chaining).
    */
   once(eventName, listener) {
-    const onceWrapper = (...args) => {
+    const onceWrapper = ((...args) => {
       listener(...args);
       this.off(eventName, onceWrapper);
-    };
+    });
     return this.on(eventName, onceWrapper);
   }
   /**

package/dist/index.cjs17.js

@@ -1,19 +1,16 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 const isEqual = require("./index.cjs10.js");
 const uniqueBy = require("./index.cjs26.js");
 class Observer {
+  previousItems = [];
+  callbacks;
+  unbindEvents;
   /**
    * Creates a new instance of the `Observer` class.
    * Sets up event bindings and initializes the callbacks for tracking changes in a collection.
    * @param bindEvents - A function to bind external events to the observer. Must return a cleanup function to unbind those events.
    */
   constructor(bindEvents) {
-    __publicField(this, "previousItems", []);
-    __publicField(this, "callbacks");
-    __publicField(this, "unbindEvents");
     this.callbacks = {
       added: [],
       addedBefore: [],
@@ -64,7 +61,6 @@ class Observer {
     ]));
     if (this.hasCallbacks(["changed", "changedField", "movedBefore", "removed"])) {
       oldItemsMap.forEach(({ item: oldItem, index, beforeItem: oldBeforeItem }) => {
-        var _a;
         const newItem = newItemsMap.get(oldItem.id);
         if (newItem) {
           if (this.hasCallbacks(["changed", "changedField"]) && !isEqual(newItem.item, oldItem)) {
@@ -81,7 +77,7 @@ class Observer {
               });
             }
           }
-          if (newItem.index !== index && ((_a = newItem.beforeItem) == null ? void 0 : _a.id) !== (oldBeforeItem == null ? void 0 : oldBeforeItem.id)) {
+          if (newItem.index !== index && newItem.beforeItem?.id !== oldBeforeItem?.id) {
             this.call("movedBefore", newItem.item, newItem.beforeItem);
           }
         } else {

package/dist/index.cjs2.js

@@ -1,7 +1,4 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const sortItems = require("./index.cjs15.js");
 const project = require("./index.cjs16.js");
@@ -14,6 +11,10 @@ function isInReactiveScope(reactivity) {
   return reactivity.isInScope();
 }
 class Cursor {
+  observer;
+  getFilteredItems;
+  options;
+  onCleanupCallbacks = [];
   /**
    * Creates a new instance of the `Cursor` class.
    * Provides utilities for querying, observing, and transforming items from a collection.
@@ -31,10 +32,6 @@ class Cursor {
    * @param options.fieldTracking - A boolean to enable fine-grained field tracking for reactivity.
    */
   constructor(getItems, options) {
-    __publicField(this, "observer");
-    __publicField(this, "getFilteredItems");
-    __publicField(this, "options");
-    __publicField(this, "onCleanupCallbacks", []);
     this.getFilteredItems = getItems;
     this.options = options || {};
   }

package/dist/index.cjs21.js

@@ -1,9 +1,9 @@
 "use strict";
 function createSignal(reactivityAdapter, initialValue, isEqual = Object.is) {
   let value = initialValue;
-  const dependency = reactivityAdapter == null ? void 0 : reactivityAdapter.create();
+  const dependency = reactivityAdapter?.create();
   const isInReactiveScope = () => {
-    if (!(reactivityAdapter == null ? void 0 : reactivityAdapter.isInScope))
+    if (!reactivityAdapter?.isInScope)
       return true;
     return reactivityAdapter.isInScope();
   };

package/dist/index.cjs22.js

@@ -45,6 +45,9 @@ function getIndexInfo(indexProviders, selector) {
   }
   if (Array.isArray($or)) {
     const $orNew = [];
+    const matchedBefore = matched;
+    const positionsBefore = positions;
+    let hasNonIndexField = false;
     for (const sel of $or) {
       const { matched: selMatched, positions: selPositions, optimizedSelector } = getIndexInfo(indexProviders, sel);
       if (selMatched) {
@@ -55,10 +58,16 @@ function getIndexInfo(indexProviders, selector) {
         }
       } else {
         $orNew.push(sel);
+        hasNonIndexField = true;
       }
     }
     if ($orNew.length > 0)
       newSelector.$or = $orNew;
+    if (hasNonIndexField) {
+      newSelector.$or = $or;
+      matched = matchedBefore;
+      positions = positionsBefore;
+    }
   }
   return {
     matched,

package/dist/index.cjs23.js

@@ -1,7 +1,4 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const index = require("./index.cjs3.js");
 const combinePersistenceAdapters = require("./index.cjs5.js");
@@ -23,6 +20,8 @@ function createReplicationAdapter(options) {
   });
 }
 class ReplicatedCollection extends index.default {
+  isPullingRemoteSignal;
+  isPushingRemoteSignal;
   /**
    * Creates a new instance of the `ReplicatedCollection` class.
    * Sets up the replication adapter, combining it with an optional persistence adapter, and
@@ -59,13 +58,11 @@ class ReplicatedCollection extends index.default {
         }
       } : void 0
     });
-    const persistenceAdapter = (options == null ? void 0 : options.persistence) ? combinePersistenceAdapters.default(replicationAdapter, options.persistence) : replicationAdapter;
+    const persistenceAdapter = options?.persistence ? combinePersistenceAdapters.default(replicationAdapter, options.persistence) : replicationAdapter;
     super({
       ...options,
       persistence: persistenceAdapter
     });
-    __publicField(this, "isPullingRemoteSignal");
-    __publicField(this, "isPushingRemoteSignal");
     this.isPullingRemoteSignal = createSignal(options.reactivity, false);
     this.isPushingRemoteSignal = createSignal(options.reactivity, false);
   }

package/dist/index.cjs3.js

@@ -1,7 +1,4 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const EventEmitter = require("./index.cjs13.js");
 const match = require("./index.cjs18.js");
@@ -36,7 +33,67 @@ function applyUpdates(currentItems, { added, modified, removed }) {
   });
   return items;
 }
-const _Collection = class _Collection extends EventEmitter {
+class Collection extends EventEmitter {
+  static collections = [];
+  static debugMode = false;
+  static batchOperationInProgress = false;
+  static fieldTracking = false;
+  static onCreationCallbacks = [];
+  static onDisposeCallbacks = [];
+  static getCollections() {
+    return Collection.collections;
+  }
+  static onCreation(callback) {
+    Collection.onCreationCallbacks.push(callback);
+  }
+  static onDispose(callback) {
+    Collection.onDisposeCallbacks.push(callback);
+  }
+  /**
+   * Enables debug mode for all collections.
+   */
+  static enableDebugMode = () => {
+    Collection.debugMode = true;
+    Collection.collections.forEach((collection) => {
+      collection.setDebugMode(true);
+    });
+  };
+  /**
+   * Enables field tracking for all collections.
+   * @param enable - A boolean indicating whether to enable field tracking.
+   */
+  static setFieldTracking = (enable) => {
+    Collection.fieldTracking = enable;
+    Collection.collections.forEach((collection) => {
+      collection.setFieldTracking(enable);
+    });
+  };
+  /**
+   * Executes a batch operation, allowing multiple modifications to the collection
+   * while deferring index rebuilding until all operations in the batch are completed.
+   * This improves performance by avoiding repetitive index recalculations and
+   * provides atomicity for the batch of operations.
+   * @param callback - The batch operation to execute.
+   */
+  static batch(callback) {
+    Collection.batchOperationInProgress = true;
+    Collection.collections.reduce((memo, collection) => () => collection.batch(() => memo()), callback)();
+    Collection.batchOperationInProgress = false;
+  }
+  name;
+  options;
+  persistenceAdapter = null;
+  isPullingSignal;
+  isPushingSignal;
+  indexProviders = [];
+  indicesOutdated = false;
+  idIndex = /* @__PURE__ */ new Map();
+  debugMode;
+  batchOperationInProgress = false;
+  isDisposed = false;
+  postBatchCallbacks = /* @__PURE__ */ new Set();
+  fieldTracking = false;
+  persistenceReadyPromise;
   /**
    * Initializes a new instance of the `Collection` class with optional configuration.
    * Sets up memory, persistence, reactivity, and indices as specified in the options.
@@ -55,34 +112,20 @@ const _Collection = class _Collection extends EventEmitter {
    */
   constructor(options) {
     super();
-    __publicField(this, "name");
-    __publicField(this, "options");
-    __publicField(this, "persistenceAdapter", null);
-    __publicField(this, "isPullingSignal");
-    __publicField(this, "isPushingSignal");
-    __publicField(this, "indexProviders", []);
-    __publicField(this, "indicesOutdated", false);
-    __publicField(this, "idIndex", /* @__PURE__ */ new Map());
-    __publicField(this, "debugMode");
-    __publicField(this, "batchOperationInProgress", false);
-    __publicField(this, "isDisposed", false);
-    __publicField(this, "postBatchCallbacks", /* @__PURE__ */ new Set());
-    __publicField(this, "fieldTracking", false);
-    __publicField(this, "persistenceReadyPromise");
-    _Collection.collections.push(this);
-    this.name = (options == null ? void 0 : options.name) ?? `${this.constructor.name}-${randomId()}`;
+    Collection.collections.push(this);
+    this.name = options?.name ?? `${this.constructor.name}-${randomId()}`;
     this.options = {
       memory: [],
       ...options
     };
-    this.fieldTracking = this.options.fieldTracking ?? _Collection.fieldTracking;
-    this.debugMode = this.options.enableDebugMode ?? _Collection.debugMode;
+    this.fieldTracking = this.options.fieldTracking ?? Collection.fieldTracking;
+    this.debugMode = this.options.enableDebugMode ?? Collection.debugMode;
     this.indexProviders = [
       createIndex.createExternalIndex("id", this.idIndex),
       ...this.options.indices || []
     ];
     this.rebuildIndices();
-    this.isPullingSignal = createSignal(this.options.reactivity, !!(options == null ? void 0 : options.persistence));
+    this.isPullingSignal = createSignal(this.options.reactivity, !!options?.persistence);
     this.isPushingSignal = createSignal(this.options.reactivity, false);
     this.on("persistence.pullStarted", () => {
       this.isPullingSignal.set(true);
@@ -227,28 +270,7 @@ const _Collection = class _Collection extends EventEmitter {
       this.once("persistence.init", resolve);
       this.once("persistence.error", reject);
     });
-    _Collection.onCreationCallbacks.forEach((callback) => callback(this));
-  }
-  static getCollections() {
-    return _Collection.collections;
-  }
-  static onCreation(callback) {
-    _Collection.onCreationCallbacks.push(callback);
-  }
-  static onDispose(callback) {
-    _Collection.onDisposeCallbacks.push(callback);
-  }
-  /**
-   * Executes a batch operation, allowing multiple modifications to the collection
-   * while deferring index rebuilding until all operations in the batch are completed.
-   * This improves performance by avoiding repetitive index recalculations and
-   * provides atomicity for the batch of operations.
-   * @param callback - The batch operation to execute.
-   */
-  static batch(callback) {
-    _Collection.batchOperationInProgress = true;
-    _Collection.collections.reduce((memo, collection) => () => collection.batch(() => memo()), callback)();
-    _Collection.batchOperationInProgress = false;
+    Collection.onCreationCallbacks.forEach((callback) => callback(this));
   }
   /**
    * Checks whether the collection is currently performing a pull operation
@@ -434,8 +456,7 @@ const _Collection = class _Collection extends EventEmitter {
    * @returns A promise that resolves when the collection is disposed.
    */
   async dispose() {
-    var _a;
-    if ((_a = this.persistenceAdapter) == null ? void 0 : _a.unregister)
+    if (this.persistenceAdapter?.unregister)
       await this.persistenceAdapter.unregister();
     this.persistenceAdapter = null;
     this.memory().map(() => this.memory().pop());
@@ -443,8 +464,8 @@ const _Collection = class _Collection extends EventEmitter {
     this.indexProviders = [];
     this.isDisposed = true;
     this.removeAllListeners();
-    _Collection.collections = _Collection.collections.filter((collection) => collection !== this);
-    _Collection.onDisposeCallbacks.forEach((callback) => callback(this));
+    Collection.collections = Collection.collections.filter((collection) => collection !== this);
+    Collection.onDisposeCallbacks.forEach((callback) => callback(this));
   }
   /**
    * Finds multiple items in the collection based on a selector and optional options.
@@ -590,7 +611,7 @@ const _Collection = class _Collection extends EventEmitter {
     const { $setOnInsert, ...restModifier } = modifier;
     const { item, index } = this.getItemAndIndex(selector);
     if (item == null) {
-      if (options == null ? void 0 : options.upsert) {
+      if (options?.upsert) {
         const newItem = modify({}, {
           ...restModifier,
           $set: {
@@ -615,7 +636,7 @@ const _Collection = class _Collection extends EventEmitter {
     }
     this.emit("updateOne", selector, modifier);
     this.executeInDebugMode((callstack) => this.emit("_debug.updateOne", callstack, selector, modifier));
-    if (item == null && !(options == null ? void 0 : options.upsert))
+    if (item == null && !options?.upsert)
       return 0;
     return 1;
   }
@@ -637,7 +658,7 @@ const _Collection = class _Collection extends EventEmitter {
       throw new Error("Invalid modifier");
     const { $setOnInsert, ...restModifier } = modifier;
     const items = this.getItems(selector);
-    if (items.length === 0 && (options == null ? void 0 : options.upsert)) {
+    if (items.length === 0 && options?.upsert) {
       const newItem = modify({}, {
         ...restModifier,
         $set: {
@@ -673,7 +694,7 @@ const _Collection = class _Collection extends EventEmitter {
     });
     this.emit("updateMany", selector, modifier);
     this.executeInDebugMode((callstack) => this.emit("_debug.updateMany", callstack, selector, modifier));
-    return changes.length === 0 && (options == null ? void 0 : options.upsert) ? 1 : changes.length;
+    return changes.length === 0 && options?.upsert ? 1 : changes.length;
   }
   /**
    * Replaces a single item in the collection that matches the given selector.
@@ -691,7 +712,7 @@ const _Collection = class _Collection extends EventEmitter {
       throw new Error("Invalid selector");
     const { item, index } = this.getItemAndIndex(selector);
     if (item == null) {
-      if (options == null ? void 0 : options.upsert) {
+      if (options?.upsert) {
         if (replacement.id != null && this.getItemAndIndex({ id: replacement.id }).item != null) {
           throw new Error("Item with same id already exists");
         }
@@ -709,7 +730,7 @@ const _Collection = class _Collection extends EventEmitter {
     }
     this.emit("replaceOne", selector, replacement);
     this.executeInDebugMode((callstack) => this.emit("_debug.replaceOne", callstack, selector, replacement));
-    if (item == null && !(options == null ? void 0 : options.upsert))
+    if (item == null && !options?.upsert)
       return 0;
     return 1;
   }
@@ -762,32 +783,6 @@ const _Collection = class _Collection extends EventEmitter {
     this.executeInDebugMode((callstack) => this.emit("_debug.removeMany", callstack, selector));
     return items.length;
   }
-};
-__publicField(_Collection, "collections", []);
-__publicField(_Collection, "debugMode", false);
-__publicField(_Collection, "batchOperationInProgress", false);
-__publicField(_Collection, "fieldTracking", false);
-__publicField(_Collection, "onCreationCallbacks", []);
-__publicField(_Collection, "onDisposeCallbacks", []);
-/**
- * Enables debug mode for all collections.
- */
-__publicField(_Collection, "enableDebugMode", () => {
-  _Collection.debugMode = true;
-  _Collection.collections.forEach((collection) => {
-    collection.setDebugMode(true);
-  });
-});
-/**
- * Enables field tracking for all collections.
- * @param enable - A boolean indicating whether to enable field tracking.
- */
-__publicField(_Collection, "setFieldTracking", (enable) => {
-  _Collection.fieldTracking = enable;
-  _Collection.collections.forEach((collection) => {
-    collection.setFieldTracking(enable);
-  });
-});
-let Collection = _Collection;
+}
 exports.createIndex = createIndex.default;
 exports.default = Collection;

package/dist/index.cjs4.js

@@ -1,10 +1,18 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 const ReplicatedCollection = require("./index.cjs23.js");
 const createSignal = require("./index.cjs21.js");
 class AutoFetchCollection extends ReplicatedCollection.default {
+  activeObservers = /* @__PURE__ */ new Map();
+  observerTimeouts = /* @__PURE__ */ new Map();
+  purgeDelay;
+  idQueryCache = /* @__PURE__ */ new Map();
+  itemsCache = /* @__PURE__ */ new Map();
+  fetchQueryItems;
+  triggerReload = null;
+  reactivityAdapter = null;
+  loadingSignals = /* @__PURE__ */ new Map();
+  isFetchingSignal;
+  mergeItems;
   /**
    * @param options {Object} - Options for the collection.
    * @param options.fetchQueryItems {Function} - A function that fetches items from the server. It takes the selector as an argument and returns a promise that resolves to an object with an `items` property.
@@ -32,17 +40,6 @@ class AutoFetchCollection extends ReplicatedCollection.default {
         triggerRemoteChange = onChange;
       }
     });
-    __publicField(this, "activeObservers", /* @__PURE__ */ new Map());
-    __publicField(this, "observerTimeouts", /* @__PURE__ */ new Map());
-    __publicField(this, "purgeDelay");
-    __publicField(this, "idQueryCache", /* @__PURE__ */ new Map());
-    __publicField(this, "itemsCache", /* @__PURE__ */ new Map());
-    __publicField(this, "fetchQueryItems");
-    __publicField(this, "triggerReload", null);
-    __publicField(this, "reactivityAdapter", null);
-    __publicField(this, "loadingSignals", /* @__PURE__ */ new Map());
-    __publicField(this, "isFetchingSignal");
-    __publicField(this, "mergeItems");
     this.mergeItems = options.mergeItems ?? ((itemA, itemB) => ({ ...itemA, ...itemB }));
     this.purgeDelay = options.purgeDelay ?? 1e4;
     this.isFetchingSignal = createSignal(options.reactivity, false);
@@ -103,8 +100,7 @@ class AutoFetchCollection extends ReplicatedCollection.default {
     });
   }
   handleObserverCreation(selector) {
-    var _a;
-    const activeObservers = ((_a = this.activeObservers.get(this.getKeyForSelector(selector))) == null ? void 0 : _a.count) ?? 0;
+    const activeObservers = this.activeObservers.get(this.getKeyForSelector(selector))?.count ?? 0;
     this.activeObservers.set(this.getKeyForSelector(selector), {
       selector,
       count: activeObservers + 1
@@ -116,8 +112,7 @@ class AutoFetchCollection extends ReplicatedCollection.default {
       void this.fetchSelector(selector);
   }
   handleObserverDisposal(selector) {
-    var _a;
-    const currentObservers = ((_a = this.activeObservers.get(this.getKeyForSelector(selector))) == null ? void 0 : _a.count) ?? 0;
+    const currentObservers = this.activeObservers.get(this.getKeyForSelector(selector))?.count ?? 0;
     const activeObservers = currentObservers - 1;
     if (activeObservers > 0) {
       this.activeObservers.set(this.getKeyForSelector(selector), {

package/dist/index.cjs5.js

@@ -2,7 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const createPersistenceAdapter = require("./index.cjs8.js");
 function createTemporaryFallbackExecutor(firstResolvingPromiseFunction, secondResolvingPromiseFunction, options) {
-  const cacheTimeout = options == null ? void 0 : options.cacheTimeout;
+  const cacheTimeout = options?.cacheTimeout;
   let isResolved = false;
   let resolvedValue = null;
   let timeout = null;
@@ -23,7 +23,7 @@ function createTemporaryFallbackExecutor(firstResolvingPromiseFunction, secondRe
         }
         isResolved = true;
         resolvedValue = result;
-        if (options == null ? void 0 : options.onResolve)
+        if (options?.onResolve)
           options.onResolve(resolvedValue);
         return result;
       });
@@ -38,13 +38,12 @@ function combinePersistenceAdapters(slowAdapter, fastAdapter) {
   const readExecutor = createTemporaryFallbackExecutor(() => fastAdapter.load(), () => slowAdapter.load(), {
     cacheTimeout: 100,
     onResolve: (result) => {
-      var _a, _b, _c;
       if (handleChange)
         void handleChange();
       void fastAdapter.save(result.items || [], {
-        added: ((_a = result.changes) == null ? void 0 : _a.added) || [],
-        modified: ((_b = result.changes) == null ? void 0 : _b.modified) || [],
-        removed: ((_c = result.changes) == null ? void 0 : _c.removed) || []
+        added: result.changes?.added || [],
+        modified: result.changes?.modified || [],
+        removed: result.changes?.removed || []
       });
     }
   });

package/dist/index13.mjs

@@ -1,14 +1,9 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class EventEmitter {
-  constructor() {
-    __publicField(this, "_maxListeners", 100);
-    /**
-     * We store a set of the listeners for each event.
-     */
-    __publicField(this, "_listenerStore", /* @__PURE__ */ new Map());
-  }
+  _maxListeners = 100;
+  /**
+   * We store a set of the listeners for each event.
+   */
+  _listenerStore = /* @__PURE__ */ new Map();
   setMaxListeners(max) {
     this._maxListeners = max;
     return this;
@@ -48,10 +43,10 @@ class EventEmitter {
    * @returns         The emitter instance (for chaining).
    */
   once(eventName, listener) {
-    const onceWrapper = (...args) => {
+    const onceWrapper = ((...args) => {
       listener(...args);
       this.off(eventName, onceWrapper);
-    };
+    });
     return this.on(eventName, onceWrapper);
   }
   /**

package/dist/index17.mjs

@@ -1,18 +1,15 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import isEqual from "./index10.mjs";
 import uniqueBy from "./index26.mjs";
 class Observer {
+  previousItems = [];
+  callbacks;
+  unbindEvents;
   /**
    * Creates a new instance of the `Observer` class.
    * Sets up event bindings and initializes the callbacks for tracking changes in a collection.
    * @param bindEvents - A function to bind external events to the observer. Must return a cleanup function to unbind those events.
    */
   constructor(bindEvents) {
-    __publicField(this, "previousItems", []);
-    __publicField(this, "callbacks");
-    __publicField(this, "unbindEvents");
     this.callbacks = {
       added: [],
       addedBefore: [],
@@ -63,7 +60,6 @@ class Observer {
     ]));
     if (this.hasCallbacks(["changed", "changedField", "movedBefore", "removed"])) {
       oldItemsMap.forEach(({ item: oldItem, index, beforeItem: oldBeforeItem }) => {
-        var _a;
         const newItem = newItemsMap.get(oldItem.id);
         if (newItem) {
           if (this.hasCallbacks(["changed", "changedField"]) && !isEqual(newItem.item, oldItem)) {
@@ -80,7 +76,7 @@ class Observer {
               });
             }
           }
-          if (newItem.index !== index && ((_a = newItem.beforeItem) == null ? void 0 : _a.id) !== (oldBeforeItem == null ? void 0 : oldBeforeItem.id)) {
+          if (newItem.index !== index && newItem.beforeItem?.id !== oldBeforeItem?.id) {
             this.call("movedBefore", newItem.item, newItem.beforeItem);
           }
         } else {

package/dist/index2.mjs

@@ -1,6 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import sortItems from "./index15.mjs";
 import project from "./index16.mjs";
 import Observer from "./index17.mjs";
@@ -12,6 +9,10 @@ function isInReactiveScope(reactivity) {
   return reactivity.isInScope();
 }
 class Cursor {
+  observer;
+  getFilteredItems;
+  options;
+  onCleanupCallbacks = [];
   /**
    * Creates a new instance of the `Cursor` class.
    * Provides utilities for querying, observing, and transforming items from a collection.
@@ -29,10 +30,6 @@ class Cursor {
    * @param options.fieldTracking - A boolean to enable fine-grained field tracking for reactivity.
    */
   constructor(getItems, options) {
-    __publicField(this, "observer");
-    __publicField(this, "getFilteredItems");
-    __publicField(this, "options");
-    __publicField(this, "onCleanupCallbacks", []);
     this.getFilteredItems = getItems;
     this.options = options || {};
   }

package/dist/index21.mjs

@@ -1,8 +1,8 @@
 function createSignal(reactivityAdapter, initialValue, isEqual = Object.is) {
   let value = initialValue;
-  const dependency = reactivityAdapter == null ? void 0 : reactivityAdapter.create();
+  const dependency = reactivityAdapter?.create();
   const isInReactiveScope = () => {
-    if (!(reactivityAdapter == null ? void 0 : reactivityAdapter.isInScope))
+    if (!reactivityAdapter?.isInScope)
       return true;
     return reactivityAdapter.isInScope();
   };

package/dist/index22.mjs

@@ -43,6 +43,9 @@ function getIndexInfo(indexProviders, selector) {
   }
   if (Array.isArray($or)) {
     const $orNew = [];
+    const matchedBefore = matched;
+    const positionsBefore = positions;
+    let hasNonIndexField = false;
     for (const sel of $or) {
       const { matched: selMatched, positions: selPositions, optimizedSelector } = getIndexInfo(indexProviders, sel);
       if (selMatched) {
@@ -53,10 +56,16 @@ function getIndexInfo(indexProviders, selector) {
         }
       } else {
         $orNew.push(sel);
+        hasNonIndexField = true;
       }
     }
     if ($orNew.length > 0)
       newSelector.$or = $orNew;
+    if (hasNonIndexField) {
+      newSelector.$or = $or;
+      matched = matchedBefore;
+      positions = positionsBefore;
+    }
   }
   return {
     matched,

package/dist/index23.mjs

@@ -1,6 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import Collection from "./index3.mjs";
 import combinePersistenceAdapters from "./index5.mjs";
 import createPersistenceAdapter from "./index8.mjs";
@@ -21,6 +18,8 @@ function createReplicationAdapter(options) {
   });
 }
 class ReplicatedCollection extends Collection {
+  isPullingRemoteSignal;
+  isPushingRemoteSignal;
   /**
    * Creates a new instance of the `ReplicatedCollection` class.
    * Sets up the replication adapter, combining it with an optional persistence adapter, and
@@ -57,13 +56,11 @@ class ReplicatedCollection extends Collection {
         }
       } : void 0
     });
-    const persistenceAdapter = (options == null ? void 0 : options.persistence) ? combinePersistenceAdapters(replicationAdapter, options.persistence) : replicationAdapter;
+    const persistenceAdapter = options?.persistence ? combinePersistenceAdapters(replicationAdapter, options.persistence) : replicationAdapter;
     super({
       ...options,
       persistence: persistenceAdapter
     });
-    __publicField(this, "isPullingRemoteSignal");
-    __publicField(this, "isPushingRemoteSignal");
     this.isPullingRemoteSignal = createSignal(options.reactivity, false);
     this.isPushingRemoteSignal = createSignal(options.reactivity, false);
   }

package/dist/index3.mjs

@@ -1,6 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import EventEmitter from "./index13.mjs";
 import match from "./index18.mjs";
 import modify from "./index11.mjs";
@@ -35,7 +32,67 @@ function applyUpdates(currentItems, { added, modified, removed }) {
   });
   return items;
 }
-const _Collection = class _Collection extends EventEmitter {
+class Collection extends EventEmitter {
+  static collections = [];
+  static debugMode = false;
+  static batchOperationInProgress = false;
+  static fieldTracking = false;
+  static onCreationCallbacks = [];
+  static onDisposeCallbacks = [];
+  static getCollections() {
+    return Collection.collections;
+  }
+  static onCreation(callback) {
+    Collection.onCreationCallbacks.push(callback);
+  }
+  static onDispose(callback) {
+    Collection.onDisposeCallbacks.push(callback);
+  }
+  /**
+   * Enables debug mode for all collections.
+   */
+  static enableDebugMode = () => {
+    Collection.debugMode = true;
+    Collection.collections.forEach((collection) => {
+      collection.setDebugMode(true);
+    });
+  };
+  /**
+   * Enables field tracking for all collections.
+   * @param enable - A boolean indicating whether to enable field tracking.
+   */
+  static setFieldTracking = (enable) => {
+    Collection.fieldTracking = enable;
+    Collection.collections.forEach((collection) => {
+      collection.setFieldTracking(enable);
+    });
+  };
+  /**
+   * Executes a batch operation, allowing multiple modifications to the collection
+   * while deferring index rebuilding until all operations in the batch are completed.
+   * This improves performance by avoiding repetitive index recalculations and
+   * provides atomicity for the batch of operations.
+   * @param callback - The batch operation to execute.
+   */
+  static batch(callback) {
+    Collection.batchOperationInProgress = true;
+    Collection.collections.reduce((memo, collection) => () => collection.batch(() => memo()), callback)();
+    Collection.batchOperationInProgress = false;
+  }
+  name;
+  options;
+  persistenceAdapter = null;
+  isPullingSignal;
+  isPushingSignal;
+  indexProviders = [];
+  indicesOutdated = false;
+  idIndex = /* @__PURE__ */ new Map();
+  debugMode;
+  batchOperationInProgress = false;
+  isDisposed = false;
+  postBatchCallbacks = /* @__PURE__ */ new Set();
+  fieldTracking = false;
+  persistenceReadyPromise;
   /**
    * Initializes a new instance of the `Collection` class with optional configuration.
    * Sets up memory, persistence, reactivity, and indices as specified in the options.
@@ -54,34 +111,20 @@ const _Collection = class _Collection extends EventEmitter {
    */
   constructor(options) {
     super();
-    __publicField(this, "name");
-    __publicField(this, "options");
-    __publicField(this, "persistenceAdapter", null);
-    __publicField(this, "isPullingSignal");
-    __publicField(this, "isPushingSignal");
-    __publicField(this, "indexProviders", []);
-    __publicField(this, "indicesOutdated", false);
-    __publicField(this, "idIndex", /* @__PURE__ */ new Map());
-    __publicField(this, "debugMode");
-    __publicField(this, "batchOperationInProgress", false);
-    __publicField(this, "isDisposed", false);
-    __publicField(this, "postBatchCallbacks", /* @__PURE__ */ new Set());
-    __publicField(this, "fieldTracking", false);
-    __publicField(this, "persistenceReadyPromise");
-    _Collection.collections.push(this);
-    this.name = (options == null ? void 0 : options.name) ?? `${this.constructor.name}-${randomId()}`;
+    Collection.collections.push(this);
+    this.name = options?.name ?? `${this.constructor.name}-${randomId()}`;
     this.options = {
       memory: [],
       ...options
     };
-    this.fieldTracking = this.options.fieldTracking ?? _Collection.fieldTracking;
-    this.debugMode = this.options.enableDebugMode ?? _Collection.debugMode;
+    this.fieldTracking = this.options.fieldTracking ?? Collection.fieldTracking;
+    this.debugMode = this.options.enableDebugMode ?? Collection.debugMode;
     this.indexProviders = [
       createExternalIndex("id", this.idIndex),
       ...this.options.indices || []
     ];
     this.rebuildIndices();
-    this.isPullingSignal = createSignal(this.options.reactivity, !!(options == null ? void 0 : options.persistence));
+    this.isPullingSignal = createSignal(this.options.reactivity, !!options?.persistence);
     this.isPushingSignal = createSignal(this.options.reactivity, false);
     this.on("persistence.pullStarted", () => {
       this.isPullingSignal.set(true);
@@ -226,28 +269,7 @@ const _Collection = class _Collection extends EventEmitter {
       this.once("persistence.init", resolve);
       this.once("persistence.error", reject);
     });
-    _Collection.onCreationCallbacks.forEach((callback) => callback(this));
-  }
-  static getCollections() {
-    return _Collection.collections;
-  }
-  static onCreation(callback) {
-    _Collection.onCreationCallbacks.push(callback);
-  }
-  static onDispose(callback) {
-    _Collection.onDisposeCallbacks.push(callback);
-  }
-  /**
-   * Executes a batch operation, allowing multiple modifications to the collection
-   * while deferring index rebuilding until all operations in the batch are completed.
-   * This improves performance by avoiding repetitive index recalculations and
-   * provides atomicity for the batch of operations.
-   * @param callback - The batch operation to execute.
-   */
-  static batch(callback) {
-    _Collection.batchOperationInProgress = true;
-    _Collection.collections.reduce((memo, collection) => () => collection.batch(() => memo()), callback)();
-    _Collection.batchOperationInProgress = false;
+    Collection.onCreationCallbacks.forEach((callback) => callback(this));
   }
   /**
    * Checks whether the collection is currently performing a pull operation
@@ -433,8 +455,7 @@ const _Collection = class _Collection extends EventEmitter {
    * @returns A promise that resolves when the collection is disposed.
    */
   async dispose() {
-    var _a;
-    if ((_a = this.persistenceAdapter) == null ? void 0 : _a.unregister)
+    if (this.persistenceAdapter?.unregister)
       await this.persistenceAdapter.unregister();
     this.persistenceAdapter = null;
     this.memory().map(() => this.memory().pop());
@@ -442,8 +463,8 @@ const _Collection = class _Collection extends EventEmitter {
     this.indexProviders = [];
     this.isDisposed = true;
     this.removeAllListeners();
-    _Collection.collections = _Collection.collections.filter((collection) => collection !== this);
-    _Collection.onDisposeCallbacks.forEach((callback) => callback(this));
+    Collection.collections = Collection.collections.filter((collection) => collection !== this);
+    Collection.onDisposeCallbacks.forEach((callback) => callback(this));
   }
   /**
    * Finds multiple items in the collection based on a selector and optional options.
@@ -589,7 +610,7 @@ const _Collection = class _Collection extends EventEmitter {
     const { $setOnInsert, ...restModifier } = modifier;
     const { item, index } = this.getItemAndIndex(selector);
     if (item == null) {
-      if (options == null ? void 0 : options.upsert) {
+      if (options?.upsert) {
         const newItem = modify({}, {
           ...restModifier,
           $set: {
@@ -614,7 +635,7 @@ const _Collection = class _Collection extends EventEmitter {
     }
     this.emit("updateOne", selector, modifier);
     this.executeInDebugMode((callstack) => this.emit("_debug.updateOne", callstack, selector, modifier));
-    if (item == null && !(options == null ? void 0 : options.upsert))
+    if (item == null && !options?.upsert)
       return 0;
     return 1;
   }
@@ -636,7 +657,7 @@ const _Collection = class _Collection extends EventEmitter {
       throw new Error("Invalid modifier");
     const { $setOnInsert, ...restModifier } = modifier;
     const items = this.getItems(selector);
-    if (items.length === 0 && (options == null ? void 0 : options.upsert)) {
+    if (items.length === 0 && options?.upsert) {
       const newItem = modify({}, {
         ...restModifier,
         $set: {
@@ -672,7 +693,7 @@ const _Collection = class _Collection extends EventEmitter {
     });
     this.emit("updateMany", selector, modifier);
     this.executeInDebugMode((callstack) => this.emit("_debug.updateMany", callstack, selector, modifier));
-    return changes.length === 0 && (options == null ? void 0 : options.upsert) ? 1 : changes.length;
+    return changes.length === 0 && options?.upsert ? 1 : changes.length;
   }
   /**
    * Replaces a single item in the collection that matches the given selector.
@@ -690,7 +711,7 @@ const _Collection = class _Collection extends EventEmitter {
       throw new Error("Invalid selector");
     const { item, index } = this.getItemAndIndex(selector);
     if (item == null) {
-      if (options == null ? void 0 : options.upsert) {
+      if (options?.upsert) {
         if (replacement.id != null && this.getItemAndIndex({ id: replacement.id }).item != null) {
           throw new Error("Item with same id already exists");
         }
@@ -708,7 +729,7 @@ const _Collection = class _Collection extends EventEmitter {
     }
     this.emit("replaceOne", selector, replacement);
     this.executeInDebugMode((callstack) => this.emit("_debug.replaceOne", callstack, selector, replacement));
-    if (item == null && !(options == null ? void 0 : options.upsert))
+    if (item == null && !options?.upsert)
       return 0;
     return 1;
   }
@@ -761,33 +782,7 @@ const _Collection = class _Collection extends EventEmitter {
     this.executeInDebugMode((callstack) => this.emit("_debug.removeMany", callstack, selector));
     return items.length;
   }
-};
-__publicField(_Collection, "collections", []);
-__publicField(_Collection, "debugMode", false);
-__publicField(_Collection, "batchOperationInProgress", false);
-__publicField(_Collection, "fieldTracking", false);
-__publicField(_Collection, "onCreationCallbacks", []);
-__publicField(_Collection, "onDisposeCallbacks", []);
-/**
- * Enables debug mode for all collections.
- */
-__publicField(_Collection, "enableDebugMode", () => {
-  _Collection.debugMode = true;
-  _Collection.collections.forEach((collection) => {
-    collection.setDebugMode(true);
-  });
-});
-/**
- * Enables field tracking for all collections.
- * @param enable - A boolean indicating whether to enable field tracking.
- */
-__publicField(_Collection, "setFieldTracking", (enable) => {
-  _Collection.fieldTracking = enable;
-  _Collection.collections.forEach((collection) => {
-    collection.setFieldTracking(enable);
-  });
-});
-let Collection = _Collection;
+}
 export {
   default2 as createIndex,
   Collection as default

package/dist/index4.mjs

@@ -1,9 +1,17 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import ReplicatedCollection from "./index23.mjs";
 import createSignal from "./index21.mjs";
 class AutoFetchCollection extends ReplicatedCollection {
+  activeObservers = /* @__PURE__ */ new Map();
+  observerTimeouts = /* @__PURE__ */ new Map();
+  purgeDelay;
+  idQueryCache = /* @__PURE__ */ new Map();
+  itemsCache = /* @__PURE__ */ new Map();
+  fetchQueryItems;
+  triggerReload = null;
+  reactivityAdapter = null;
+  loadingSignals = /* @__PURE__ */ new Map();
+  isFetchingSignal;
+  mergeItems;
   /**
    * @param options {Object} - Options for the collection.
    * @param options.fetchQueryItems {Function} - A function that fetches items from the server. It takes the selector as an argument and returns a promise that resolves to an object with an `items` property.
@@ -31,17 +39,6 @@ class AutoFetchCollection extends ReplicatedCollection {
         triggerRemoteChange = onChange;
       }
     });
-    __publicField(this, "activeObservers", /* @__PURE__ */ new Map());
-    __publicField(this, "observerTimeouts", /* @__PURE__ */ new Map());
-    __publicField(this, "purgeDelay");
-    __publicField(this, "idQueryCache", /* @__PURE__ */ new Map());
-    __publicField(this, "itemsCache", /* @__PURE__ */ new Map());
-    __publicField(this, "fetchQueryItems");
-    __publicField(this, "triggerReload", null);
-    __publicField(this, "reactivityAdapter", null);
-    __publicField(this, "loadingSignals", /* @__PURE__ */ new Map());
-    __publicField(this, "isFetchingSignal");
-    __publicField(this, "mergeItems");
     this.mergeItems = options.mergeItems ?? ((itemA, itemB) => ({ ...itemA, ...itemB }));
     this.purgeDelay = options.purgeDelay ?? 1e4;
     this.isFetchingSignal = createSignal(options.reactivity, false);
@@ -102,8 +99,7 @@ class AutoFetchCollection extends ReplicatedCollection {
     });
   }
   handleObserverCreation(selector) {
-    var _a;
-    const activeObservers = ((_a = this.activeObservers.get(this.getKeyForSelector(selector))) == null ? void 0 : _a.count) ?? 0;
+    const activeObservers = this.activeObservers.get(this.getKeyForSelector(selector))?.count ?? 0;
     this.activeObservers.set(this.getKeyForSelector(selector), {
       selector,
       count: activeObservers + 1
@@ -115,8 +111,7 @@ class AutoFetchCollection extends ReplicatedCollection {
       void this.fetchSelector(selector);
   }
   handleObserverDisposal(selector) {
-    var _a;
-    const currentObservers = ((_a = this.activeObservers.get(this.getKeyForSelector(selector))) == null ? void 0 : _a.count) ?? 0;
+    const currentObservers = this.activeObservers.get(this.getKeyForSelector(selector))?.count ?? 0;
     const activeObservers = currentObservers - 1;
     if (activeObservers > 0) {
       this.activeObservers.set(this.getKeyForSelector(selector), {

package/dist/index5.mjs

@@ -1,6 +1,6 @@
 import createPersistenceAdapter from "./index8.mjs";
 function createTemporaryFallbackExecutor(firstResolvingPromiseFunction, secondResolvingPromiseFunction, options) {
-  const cacheTimeout = options == null ? void 0 : options.cacheTimeout;
+  const cacheTimeout = options?.cacheTimeout;
   let isResolved = false;
   let resolvedValue = null;
   let timeout = null;
@@ -21,7 +21,7 @@ function createTemporaryFallbackExecutor(firstResolvingPromiseFunction, secondRe
         }
         isResolved = true;
         resolvedValue = result;
-        if (options == null ? void 0 : options.onResolve)
+        if (options?.onResolve)
           options.onResolve(resolvedValue);
         return result;
       });
@@ -36,13 +36,12 @@ function combinePersistenceAdapters(slowAdapter, fastAdapter) {
   const readExecutor = createTemporaryFallbackExecutor(() => fastAdapter.load(), () => slowAdapter.load(), {
     cacheTimeout: 100,
     onResolve: (result) => {
-      var _a, _b, _c;
       if (handleChange)
         void handleChange();
       void fastAdapter.save(result.items || [], {
-        added: ((_a = result.changes) == null ? void 0 : _a.added) || [],
-        modified: ((_b = result.changes) == null ? void 0 : _b.modified) || [],
-        removed: ((_c = result.changes) == null ? void 0 : _c.removed) || []
+        added: result.changes?.added || [],
+        modified: result.changes?.modified || [],
+        removed: result.changes?.removed || []
       });
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signaldb/core",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "SignalDB is a client-side database that provides a simple MongoDB-like interface to the data with first-class typescript support to achieve an optimistic UI. Data persistence can be achieved by using storage providers that store the data through a JSON interface to places such as localStorage.",
   "scripts": {
     "build": "rimraf dist && vite build",
@@ -58,6 +58,6 @@
     "mingo": "^6.5.1"
   },
   "devDependencies": {
-    "zod": "^3.24.2"
+    "zod": "^4.0.14"
   }
 }