@signaldb/core 2.0.0-beta.0 → 2.0.0-beta.1

package/dist/.vite/manifest.json

@@ -59,6 +59,7 @@
       "src/DefaultDataAdapter.ts",
       "src/utils/modify.ts",
       "src/utils/deepClone.ts",
+      "src/utils/queryId.ts",
       "src/Collection/Cursor.ts"
     ]
   },
@@ -86,7 +87,8 @@
     "src": "src/WorkerDataAdapter.ts",
     "imports": [
       "src/utils/queryId.ts",
-      "src/utils/randomId.ts"
+      "src/utils/randomId.ts",
+      "src/utils/batchOnNextTick.ts"
     ]
   },
   "src/WorkerDataAdapterHost.ts": {
@@ -102,11 +104,12 @@
       "src/getIndexInfo.ts",
       "src/utils/getMatchingKeys.ts",
       "src/utils/sortItems.ts",
-      "src/utils/project.ts"
+      "src/utils/project.ts",
+      "src/utils/compact.ts"
     ]
   },
   "src/createIndex.ts": {
-    "file": "index.cjs20.js",
+    "file": "index.cjs21.js",
     "name": "createIndex",
     "src": "src/createIndex.ts",
     "imports": [
@@ -117,7 +120,7 @@
     ]
   },
   "src/createIndexProvider.ts": {
-    "file": "index.cjs27.js",
+    "file": "index.cjs30.js",
     "name": "createIndexProvider",
     "src": "src/createIndexProvider.ts"
   },
@@ -132,7 +135,7 @@
     "src": "src/createStorageAdapter.ts"
   },
   "src/getIndexInfo.ts": {
-    "file": "index.cjs21.js",
+    "file": "index.cjs22.js",
     "name": "getIndexInfo",
     "src": "src/getIndexInfo.ts",
     "imports": [
@@ -167,6 +170,16 @@
     "name": "utils/EventEmitter",
     "src": "src/utils/EventEmitter.ts"
   },
+  "src/utils/batchOnNextTick.ts": {
+    "file": "index.cjs27.js",
+    "name": "utils/batchOnNextTick",
+    "src": "src/utils/batchOnNextTick.ts"
+  },
+  "src/utils/compact.ts": {
+    "file": "index.cjs28.js",
+    "name": "utils/compact",
+    "src": "src/utils/compact.ts"
+  },
   "src/utils/createSignal.ts": {
     "file": "index.cjs18.js",
     "name": "utils/createSignal",
@@ -192,7 +205,7 @@
     ]
   },
   "src/utils/intersection.ts": {
-    "file": "index.cjs28.js",
+    "file": "index.cjs31.js",
     "name": "utils/intersection",
     "src": "src/utils/intersection.ts"
   },
@@ -202,12 +215,12 @@
     "src": "src/utils/isEqual.ts"
   },
   "src/utils/isFieldExpression.ts": {
-    "file": "index.cjs30.js",
+    "file": "index.cjs33.js",
     "name": "utils/isFieldExpression",
     "src": "src/utils/isFieldExpression.ts"
   },
   "src/utils/match.ts": {
-    "file": "index.cjs22.js",
+    "file": "index.cjs23.js",
     "name": "utils/match",
     "src": "src/utils/match.ts"
   },
@@ -220,7 +233,7 @@
     ]
   },
   "src/utils/project.ts": {
-    "file": "index.cjs23.js",
+    "file": "index.cjs24.js",
     "name": "utils/project",
     "src": "src/utils/project.ts",
     "imports": [
@@ -229,7 +242,7 @@
     ]
   },
   "src/utils/queryId.ts": {
-    "file": "index.cjs24.js",
+    "file": "index.cjs20.js",
     "name": "utils/queryId",
     "src": "src/utils/queryId.ts"
   },
@@ -244,7 +257,7 @@
     "src": "src/utils/serializeValue.ts"
   },
   "src/utils/set.ts": {
-    "file": "index.cjs29.js",
+    "file": "index.cjs32.js",
     "name": "utils/set",
     "src": "src/utils/set.ts"
   },
@@ -257,7 +270,7 @@
     ]
   },
   "src/utils/uniqueBy.ts": {
-    "file": "index.cjs31.js",
+    "file": "index.cjs29.js",
     "name": "utils/uniqueBy",
     "src": "src/utils/uniqueBy.ts"
   }

package/dist/AutoFetchDataAdapter.d.ts

@@ -72,7 +72,6 @@ export default class AutoFetchDataAdapter implements DataAdapter {
     private autoloadIds;
     constructor(options: AutoFetchDataAdapterOptions);
     createCollectionBackend<T extends BaseItem<I>, I = any, U = T>(collection: Collection<T, I, U>, indices: string[]): CollectionBackend<T, I>;
-    private selectorKey;
     private forceRefetchAll;
     private fetchAndIngest;
     private purgeSelector;

package/dist/Collection/index.d.ts

@@ -102,6 +102,7 @@ export default class Collection<T extends BaseItem<I> = BaseItem, I = any, U = T
     private isDisposed;
     private postBatchCallbacks;
     private fieldTracking;
+    private queryListenersMap;
     /**
      * Initializes a new instance of the `Collection` class with optional configuration.
      * Sets up memory, persistence, reactivity, and indices as specified in the options.
@@ -186,6 +187,7 @@ export default class Collection<T extends BaseItem<I> = BaseItem, I = any, U = T
     private getItem;
     private getItems;
     private withPushState;
+    private queryListeners;
     /**
      * Disposes the collection, unregisters persistence adapters, clears memory, and
      * cleans up all resources used by the collection.

package/dist/DataAdapter.d.ts

@@ -19,12 +19,13 @@ export interface CollectionBackend<T extends BaseItem<I>, I> {
     replaceOne(selector: Selector<T>, replacement: Omit<T, 'id'> & Partial<Pick<T, 'id'>>): Promise<T[]>;
     removeOne(selector: Selector<T>): Promise<T[]>;
     removeMany(selector: Selector<T>): Promise<T[]>;
-    registerQuery<O extends QueryOptions<T>>(selector: Selector<T>, options?: O): void;
-    unregisterQuery<O extends QueryOptions<T>>(selector: Selector<T>, options?: O): void;
-    getQueryState<O extends QueryOptions<T>>(selector: Selector<T>, options?: O): 'active' | 'complete' | 'error';
-    getQueryError<O extends QueryOptions<T>>(selector: Selector<T>, options?: O): Error | null;
-    getQueryResult<O extends QueryOptions<T>>(selector: Selector<T>, options?: O): T[];
-    onQueryStateChange<O extends QueryOptions<T>>(selector: Selector<T> | undefined, options: O | undefined, callback: (state: 'active' | 'complete' | 'error') => void): () => void;
+    registerQuery<O extends QueryOptions<T>>(selector: Selector<T>, options: O): void;
+    unregisterQuery<O extends QueryOptions<T>>(selector: Selector<T>, options: O): void;
+    getQueryState<O extends QueryOptions<T>>(selector: Selector<T>, options: O): 'active' | 'complete' | 'error';
+    getQueryError<O extends QueryOptions<T>>(selector: Selector<T>, options: O): Error | null;
+    getQueryResult<O extends QueryOptions<T>>(selector: Selector<T>, options: O): T[];
+    executeQuery<O extends QueryOptions<T>>(selector: Selector<T>, options: O): Promise<T[]>;
+    onQueryStateChange<O extends QueryOptions<T>>(selector: Selector<T>, options: O, callback: (state: 'active' | 'complete' | 'error') => void): () => void;
     dispose(): Promise<void>;
     isReady(): Promise<void>;
 }

package/dist/DefaultDataAdapter.d.ts

@@ -26,6 +26,7 @@ export default class DefaultDataAdapter implements DataAdapter {
     private queryItems;
     private executeQuery;
     private flushQueuedQueryUpdates;
+    private executeAndCacheQuery;
     private updateQueries;
     createCollectionBackend<T extends BaseItem<I>, I = any, U = T>(collection: Collection<T, I, U>, indices: string[]): CollectionBackend<T, I>;
 }

package/dist/WorkerDataAdapter.d.ts

@@ -4,6 +4,7 @@ import type DataAdapter from './DataAdapter';
 import type { CollectionBackend } from './DataAdapter';
 interface WorkerDataAdapterOptions {
     id?: string;
+    log?: (message: string, ...args: any[]) => void;
 }
 export default class WorkerDataAdapter implements DataAdapter {
     private worker;
@@ -11,11 +12,13 @@ export default class WorkerDataAdapter implements DataAdapter {
     private id;
     private isDisposed;
     private workerReady;
+    private log;
     private collectionReady;
+    private batchExecutionHelpers;
     private queries;
     constructor(worker: Worker, options: WorkerDataAdapterOptions);
     private exec;
-    private queryListeners;
+    private enqueueBatched;
     private updateQuery;
     createCollectionBackend<T extends BaseItem<I>, I = any, U = T>(collection: Collection<T, I, U>, indices?: string[]): CollectionBackend<T, I>;
 }

package/dist/WorkerDataAdapterHost.d.ts

@@ -11,24 +11,27 @@ interface WorkerDataAdapterHostOptions {
     id?: string;
     storage: (name: string) => StorageAdapter<any, any>;
     onError?: (error: Error) => void;
+    log?: (message: string, ...args: any[]) => void;
 }
 type CollectionMethods<T extends BaseItem<I>, I = any> = {
     registerCollection: (collectionName: string, indices: string[]) => Promise<void>;
     unregisterCollection: (collectionName: string) => Promise<void>;
     registerQuery: <O extends QueryOptions<T>>(collectionName: string, selector: Selector<T>, options?: O) => Promise<void>;
     unregisterQuery: <O extends QueryOptions<T>>(collectionName: string, selector: Selector<T>, options?: O) => Promise<void>;
-    insert: (collectionName: string, item: T) => Promise<T>;
-    updateOne: (collectionName: string, selector: Selector<T>, modifier: Modifier<T>) => Promise<T[]>;
-    updateMany: (collectionName: string, selector: Selector<T>, modifier: Modifier<T>) => Promise<T[]>;
-    replaceOne: (collectionName: string, selector: Selector<T>, replacement: Omit<T, 'id'> & Partial<Pick<T, 'id'>>) => Promise<T[]>;
-    removeOne: (collectionName: string, selector: Selector<T>) => Promise<T[]>;
-    removeMany: (collectionName: string, selector: Selector<T>) => Promise<T[]>;
+    executeQuery: <O extends QueryOptions<T>>(collectionName: string, selector: Selector<T>, options?: O) => Promise<T[]>;
+    insert: (collectionName: string, items: [T][]) => Promise<(T | Error)[]>;
+    updateOne: (collectionName: string, args: [Selector<T>, Modifier<T>][]) => Promise<(T[] | Error)[]>;
+    updateMany: (collectionName: string, args: [Selector<T>, Modifier<T>][]) => Promise<(T[] | Error)[]>;
+    replaceOne: (collectionName: string, args: [Selector<T>, Omit<T, 'id'> & Partial<Pick<T, 'id'>>][]) => Promise<(T[] | Error)[]>;
+    removeOne: (collectionName: string, selectors: [Selector<T>][]) => Promise<(T[] | Error)[]>;
+    removeMany: (collectionName: string, selectors: [Selector<T>][]) => Promise<(T[] | Error)[]>;
     isReady: (collectionName: string) => Promise<void>;
 };
 export default class WorkerDataAdapterHost<T extends BaseItem<I>, I = any> {
     private workerContext;
     private options;
     private id;
+    private log;
     private storageAdapters;
     private storageAdapterReady;
     private collectionIndices;

package/dist/index.cjs12.js

@@ -1,13 +1,13 @@
 "use strict";
-const createIndex = require("./index.cjs20.js");
-const getIndexInfo = require("./index.cjs21.js");
+const createIndex = require("./index.cjs21.js");
+const getIndexInfo = require("./index.cjs22.js");
 const deepClone = require("./index.cjs19.js");
 const EventEmitter = require("./index.cjs9.js");
 const isEqual = require("./index.cjs6.js");
-const match = require("./index.cjs22.js");
+const match = require("./index.cjs23.js");
 const modify = require("./index.cjs7.js");
-const project = require("./index.cjs23.js");
-const queryId = require("./index.cjs24.js");
+const project = require("./index.cjs24.js");
+const queryId = require("./index.cjs20.js");
 const serializeValue = require("./index.cjs11.js");
 const sortItems = require("./index.cjs25.js");
 function hasPendingUpdates(pendingUpdates) {
@@ -143,14 +143,28 @@ class DefaultDataAdapter {
       return;
     this.queuedQueryUpdates.set(collection.name, { added: [], modified: [], removed: [] });
     const flatItems = [...changes.added, ...changes.modified, ...changes.removed];
-    const queries = [...this.activeQueries.get(collection.name)?.values() ?? []].filter(({ selector }) => flatItems.some((item) => match(item, selector)));
+    const itemIds = new Set(flatItems.map((i) => i.id));
+    const queries = [
+      ...this.activeQueries.get(collection.name)?.values() ?? []
+    ].filter(({ selector, options }) => {
+      const idsInQuery = this.cachedQueryResults.get(collection.name)?.get(queryId(selector, options))?.map((i) => i.id) ?? [];
+      if (idsInQuery.some((id) => itemIds.has(id)))
+        return true;
+      return flatItems.some((item) => match(item, selector));
+    });
     queries.forEach(({ selector, options }) => {
-      const emitter = this.queryEmitters.get(collection.name);
-      if (!emitter)
-        return;
-      emitter.emit("change", selector, options, "complete");
+      this.executeAndCacheQuery(collection, selector, options);
     });
   }
+  executeAndCacheQuery(collection, selector, options) {
+    const result = this.executeQuery(collection, selector, options);
+    this.cachedQueryResults.set(collection.name, this.cachedQueryResults.get(collection.name) || /* @__PURE__ */ new Map());
+    this.cachedQueryResults.get(collection.name)?.set(queryId(selector, options), result);
+    const emitter = this.queryEmitters.get(collection.name);
+    if (!emitter)
+      return;
+    emitter.emit("change", selector, options, "complete");
+  }
   updateQueries(collection, changes) {
     this.queuedQueryUpdates.set(collection.name, this.queuedQueryUpdates.get(collection.name) || { added: [], modified: [], removed: [] });
     this.queuedQueryUpdates.get(collection.name)?.added.push(...changes.added);
@@ -162,6 +176,7 @@ class DefaultDataAdapter {
     this.ensureStorageAdapter(collection.name);
     this.items.set(collection.name, this.items.get(collection.name) ?? /* @__PURE__ */ new Map());
     this.queryEmitters.set(collection.name, this.queryEmitters.get(collection.name) ?? new EventEmitter());
+    this.queryEmitters.get(collection.name)?.setMaxListeners(Infinity);
     this.activeQueries.set(collection.name, this.activeQueries.get(collection.name) || /* @__PURE__ */ new Map());
     this.indices.set(collection.name, indices.map((field) => createIndex(field)));
     this.rebuildIndices(collection);
@@ -207,7 +222,7 @@ class DefaultDataAdapter {
       },
       updateMany: async (selector, modifier) => {
         const { $setOnInsert, ...restModifier } = modifier;
-        const items = backend.getQueryResult(selector);
+        const items = this.executeQuery(collection, selector, {});
         const changedItems = items.map((item) => {
           const modifiedItem = modify(deepClone.default(item), restModifier);
           const hasItemWithSameId = item.id !== modifiedItem.id && this.getItem(collection, { id: modifiedItem.id }) != null;
@@ -263,7 +278,7 @@ class DefaultDataAdapter {
         return [item];
       },
       removeMany: async (selector) => {
-        const items = backend.getQueryResult(selector);
+        const items = backend.getQueryResult(selector, {});
         items.forEach((item) => {
           this.items.get(collection.name)?.delete(serializeValue(item.id));
         });
@@ -283,10 +298,7 @@ class DefaultDataAdapter {
           selector,
           options
         });
-        const emitter = this.queryEmitters.get(collection.name);
-        if (!emitter)
-          throw new Error(`Query emitter not found for collection ${collection.name}`);
-        emitter.emit("change", selector, options, "complete");
+        this.executeAndCacheQuery(collection, selector, options);
       },
       unregisterQuery: (selector, options) => {
         if (!this.activeQueries.get(collection.name))
@@ -299,7 +311,7 @@ class DefaultDataAdapter {
         if (!emitter)
           throw new Error(`Query emitter not found for collection ${collection.name}`);
         const handler = (querySelector, queryOptions, state) => {
-          if (querySelector !== selector || queryOptions !== options)
+          if (queryId(querySelector, queryOptions) !== queryId(selector, options))
             return;
           callback(state);
         };
@@ -310,14 +322,13 @@ class DefaultDataAdapter {
       },
       getQueryError: () => null,
       getQueryResult: (selector, options) => {
-        const result = this.executeQuery(collection, selector, options);
         const isQueryActive = this.activeQueries.get(collection.name)?.has(queryId(selector, options));
         if (isQueryActive) {
-          this.cachedQueryResults.set(collection.name, this.cachedQueryResults.get(collection.name) || /* @__PURE__ */ new Map());
-          this.cachedQueryResults.get(collection.name)?.set(queryId(selector, options), result);
+          return this.cachedQueryResults.get(collection.name)?.get(queryId(selector, options)) ?? [];
         }
-        return result;
+        return this.executeQuery(collection, selector, options);
       },
+      executeQuery: (selector, options) => Promise.resolve(this.executeQuery(collection, selector, options)),
       // lifecycle methods
       dispose: async () => {
         const adapter = this.storageAdapters.get(collection.name);

package/dist/index.cjs13.js

@@ -1,13 +1,13 @@
 "use strict";
 const deepClone = require("./index.cjs19.js");
-const match = require("./index.cjs22.js");
+const match = require("./index.cjs23.js");
 const modify = require("./index.cjs7.js");
-const queryId = require("./index.cjs24.js");
+const queryId = require("./index.cjs20.js");
 const isEqual = require("./index.cjs6.js");
-const getIndexInfo = require("./index.cjs21.js");
+const getIndexInfo = require("./index.cjs22.js");
 const getMatchingKeys = require("./index.cjs26.js");
 const sortItems = require("./index.cjs25.js");
-const project = require("./index.cjs23.js");
+const project = require("./index.cjs24.js");
 class AsyncDataAdapter {
   options;
   id;
@@ -120,6 +120,13 @@ class AsyncDataAdapter {
       getQueryError,
       getQueryResult,
       onQueryStateChange,
+      executeQuery: async (selector, options) => {
+        await ready;
+        registerQuery(selector, options);
+        const result = getQueryResult(selector, options);
+        unregisterQuery(selector, options);
+        return result;
+      },
       dispose: async () => {
         this.storageAdapters.delete(collection.name);
         this.queries.delete(collection.name);
@@ -135,10 +142,7 @@ class AsyncDataAdapter {
     const storage = this.storageAdapters.get(collectionName);
     if (!storage)
       throw new Error(`No persistence adapter for collection ${collectionName}`);
-    await Promise.all([
-      storage.createIndex("id"),
-      ...indices.map((index) => storage.createIndex(index))
-    ]);
+    await Promise.all(indices.map((index) => storage.createIndex(index)));
     await storage.setup();
   }
   ensureStorageAdapter(name) {
@@ -200,20 +204,28 @@ class AsyncDataAdapter {
     rec.items = items;
   }
   async getIndexInfo(collectionName, selector) {
-    const storage = this.storageAdapters.get(collectionName);
-    if (!storage)
+    const storageAdapter = this.storageAdapters.get(collectionName);
+    if (!storageAdapter)
       throw new Error(`No persistence adapter for collection ${collectionName}`);
     if (selector != null && Object.keys(selector).length === 1 && "id" in selector && typeof selector.id !== "object") {
-      return { matched: true, ids: [selector.id], optimizedSelector: {} };
+      return {
+        matched: true,
+        ids: [selector.id].filter(Boolean),
+        optimizedSelector: {}
+      };
     }
     if (selector == null) {
-      return { matched: false, ids: [], optimizedSelector: {} };
+      return {
+        matched: false,
+        ids: [],
+        optimizedSelector: {}
+      };
     }
     const indices = this.collectionIndices.get(collectionName) ?? [];
     return getIndexInfo.default(indices.map((field) => async (flatSelector) => {
       if (!Object.hasOwnProperty.call(flatSelector, field))
         return { matched: false };
-      const index = await storage.readIndex(field);
+      const index = await storageAdapter.readIndex(field);
       const fieldSelector = flatSelector[field];
       const filtersForNull = fieldSelector == null || fieldSelector.$exists === false;
       const keys = filtersForNull ? { include: null, exclude: [...index.keys()].filter((key) => key != null) } : getMatchingKeys(field, flatSelector);

package/dist/index.cjs14.js

@@ -1,18 +1,24 @@
 "use strict";
-const queryId = require("./index.cjs24.js");
+const queryId = require("./index.cjs20.js");
 const randomId = require("./index.cjs8.js");
+const batchOnNextTick = require("./index.cjs27.js");
 class WorkerDataAdapter {
   worker;
   options;
   id;
   isDisposed = false;
   workerReady;
+  log = () => {
+  };
   collectionReady = /* @__PURE__ */ new Map();
+  batchExecutionHelpers = /* @__PURE__ */ new Map();
   queries = {};
   constructor(worker, options) {
     this.worker = worker;
     this.options = options;
     this.id = this.options.id || "default-worker-data-adapter";
+    if (this.options.log)
+      this.log = this.options.log;
     this.workerReady = new Promise((resolve, reject) => {
       const timeoutId = setTimeout(() => {
         reject(new Error("WorkerDataAdapter initialization timed out"));
@@ -51,6 +57,7 @@ class WorkerDataAdapter {
           return;
         if (id !== messageId)
           return;
+        this.log(method, "result", data ?? error);
         if (error) {
           reject(error);
         } else {
@@ -67,74 +74,61 @@ class WorkerDataAdapter {
       });
     });
   }
-  queryListeners(collectionName, query, listeners) {
-    if (listeners != null) {
-      return this.updateQuery(collectionName, query, { listeners });
-    }
-    const id = queryId(query.selector, query.options);
-    const collectionQueries = this.queries[collectionName];
-    if (!collectionQueries)
-      return 0;
-    const existing = collectionQueries.get(id);
-    return existing?.listeners || 0;
+  enqueueBatched(collectionName, method, args) {
+    const helper = this.batchExecutionHelpers.get(collectionName);
+    if (!helper)
+      throw new Error(`Collection "${collectionName}" is not registered in WorkerDataAdapter`);
+    return helper.enqueue(method, args);
   }
+  // ---------- end batching integration ----------
   updateQuery(collectionName, query, update) {
     const id = queryId(query.selector, query.options);
     const collectionQueries = this.queries[collectionName];
     if (!collectionQueries)
       return;
     const existing = collectionQueries.get(id);
-    collectionQueries.set(id, {
-      listeners: 0,
+    const newState = {
       state: "active",
       error: null,
       items: [],
       ...existing,
       ...update
-    });
+    };
+    collectionQueries.set(id, newState);
     this.queries[collectionName] = collectionQueries;
   }
   createCollectionBackend(collection, indices = []) {
     this.queries[collection.name] = /* @__PURE__ */ new Map();
     void this.exec("registerCollection", collection.name, indices);
     this.collectionReady.set(collection.name, this.exec("isReady", collection.name));
+    this.batchExecutionHelpers.set(collection.name, batchOnNextTick(async (method, args) => this.exec(method, collection.name, args)));
     return {
       insert: async (item) => {
-        return this.exec("insert", collection.name, item);
+        return this.enqueueBatched(collection.name, "insert", [item]);
       },
       updateOne: async (selector, modifier) => {
-        return this.exec("updateOne", collection.name, selector, modifier);
+        return this.enqueueBatched(collection.name, "updateOne", [selector, modifier]);
       },
       updateMany: async (selector, modifier) => {
-        return this.exec("updateMany", collection.name, selector, modifier);
+        return this.enqueueBatched(collection.name, "updateMany", [selector, modifier]);
       },
       replaceOne: async (selector, replacement) => {
-        return this.exec("replaceOne", collection.name, selector, replacement);
+        return this.enqueueBatched(collection.name, "replaceOne", [selector, replacement]);
       },
       removeOne: async (selector) => {
-        return this.exec("removeOne", collection.name, selector);
+        return this.enqueueBatched(collection.name, "removeOne", [selector]);
       },
       removeMany: async (selector) => {
-        return this.exec("removeMany", collection.name, selector);
+        return this.enqueueBatched(collection.name, "removeMany", [selector]);
       },
       // methods for registering and unregistering queries that will be called from the collection during find/findOne
       registerQuery: (selector, options) => {
-        const listeners = this.queryListeners(collection.name, { selector, options });
-        if (listeners === 0) {
-          this.updateQuery(collection.name, { selector, options }, { state: "active", error: null, items: [] });
-          void this.exec("registerQuery", collection.name, selector, options);
-        }
-        this.queryListeners(collection.name, { selector, options }, listeners + 1);
+        this.updateQuery(collection.name, { selector, options }, { state: "active", error: null, items: [] });
+        void this.exec("registerQuery", collection.name, selector, options);
       },
       unregisterQuery: (selector, options) => {
-        setTimeout(() => {
-          const listeners = this.queryListeners(collection.name, { selector, options });
-          const newListeners = Math.max(0, listeners - 1);
-          if (newListeners === 0) {
-            this.queries[collection.name]?.delete(queryId(selector, options));
-            void this.exec("unregisterQuery", collection.name, selector, options);
-          }
-        }, 0);
+        this.queries[collection.name]?.delete(queryId(selector, options));
+        void this.exec("unregisterQuery", collection.name, selector, options);
       },
       getQueryState: (selector, options) => {
         const query = this.queries[collection.name]?.get(queryId(selector, options));
@@ -160,10 +154,9 @@ class WorkerDataAdapter {
             return;
           if (collectionName !== collection.name)
             return;
-          if (JSON.stringify(responseSelector) !== JSON.stringify(selector))
-            return;
-          if (JSON.stringify(responseOptions) !== JSON.stringify(options))
+          if (queryId(responseSelector, responseOptions) !== queryId(selector, options))
             return;
+          this.log("queryUpdate", responseSelector, responseOptions, state, data ?? error);
           this.updateQuery(collection.name, {
             selector: responseSelector,
             options: responseOptions
@@ -175,6 +168,7 @@ class WorkerDataAdapter {
           this.worker.removeEventListener("message", handler);
         };
       },
+      executeQuery: (selector, options) => this.exec("executeQuery", collection.name, selector, options),
       // lifecycle methods
       dispose: async () => {
         await this.exec("unregisterCollection", collection.name);