@signaldb/core 2.0.0-beta.17 → 2.0.0-beta.19

package/dist/.vite/manifest.json

@@ -1,13 +1,13 @@
 {
   "src/AsyncDataAdapter.ts": {
-    "file": "index32.cjs.js",
+    "file": "index34.cjs.js",
     "name": "AsyncDataAdapter",
     "src": "src/AsyncDataAdapter.ts",
     "isDynamicEntry": true,
     "imports": [
       "src/getIndexInfo.ts",
       "src/utils/deepClone.ts",
-      "src/utils/getMatchingKeys.ts",
+      "src/utils/idIndexQuery.ts",
       "src/utils/incrementalQueryUpdate.ts",
       "src/utils/isEqual.ts",
       "src/utils/match.ts",
@@ -15,24 +15,26 @@
       "src/utils/projectItems.ts",
       "src/utils/queryDelta.ts",
       "src/utils/queryId.ts",
-      "src/utils/sortItems.ts"
+      "src/utils/sortItems.ts",
+      "src/utils/storageIndexQuery.ts"
     ]
   },
   "src/AutoFetchDataAdapter.ts": {
-    "file": "index37.cjs.js",
+    "file": "index39.cjs.js",
     "name": "AutoFetchDataAdapter",
     "src": "src/AutoFetchDataAdapter.ts",
     "isDynamicEntry": true,
     "imports": [
       "src/getIndexInfo.ts",
       "src/utils/deepClone.ts",
-      "src/utils/getMatchingKeys.ts",
+      "src/utils/idIndexQuery.ts",
       "src/utils/isEqual.ts",
       "src/utils/match.ts",
       "src/utils/modify.ts",
       "src/utils/project.ts",
       "src/utils/queryId.ts",
-      "src/utils/sortItems.ts"
+      "src/utils/sortItems.ts",
+      "src/utils/storageIndexQuery.ts"
     ]
   },
   "src/Collection/Cursor.ts": {
@@ -56,7 +58,7 @@
     ]
   },
   "src/Collection/index.ts": {
-    "file": "index28.cjs.js",
+    "file": "index29.cjs.js",
     "name": "Collection/index",
     "src": "src/Collection/index.ts",
     "isDynamicEntry": true,
@@ -73,7 +75,7 @@
     ]
   },
   "src/DefaultDataAdapter.ts": {
-    "file": "index27.cjs.js",
+    "file": "index28.cjs.js",
     "name": "DefaultDataAdapter",
     "src": "src/DefaultDataAdapter.ts",
     "isDynamicEntry": true,
@@ -82,6 +84,7 @@
       "src/getIndexInfo.ts",
       "src/utils/EventEmitter.ts",
       "src/utils/deepClone.ts",
+      "src/utils/idIndexQuery.ts",
       "src/utils/incrementalQueryUpdate.ts",
       "src/utils/isEqual.ts",
       "src/utils/match.ts",
@@ -94,7 +97,7 @@
     ]
   },
   "src/WorkerDataAdapter.ts": {
-    "file": "index34.cjs.js",
+    "file": "index36.cjs.js",
     "name": "WorkerDataAdapter",
     "src": "src/WorkerDataAdapter.ts",
     "isDynamicEntry": true,
@@ -110,7 +113,7 @@
     ]
   },
   "src/WorkerDataAdapterHost.ts": {
-    "file": "index36.cjs.js",
+    "file": "index38.cjs.js",
     "name": "WorkerDataAdapterHost",
     "src": "src/WorkerDataAdapterHost.ts",
     "isDynamicEntry": true,
@@ -118,7 +121,7 @@
       "src/getIndexInfo.ts",
       "src/utils/compact.ts",
       "src/utils/deepClone.ts",
-      "src/utils/getMatchingKeys.ts",
+      "src/utils/idIndexQuery.ts",
       "src/utils/incrementalQueryUpdate.ts",
       "src/utils/isEqual.ts",
       "src/utils/match.ts",
@@ -126,7 +129,8 @@
       "src/utils/projectItems.ts",
       "src/utils/queryDelta.ts",
       "src/utils/queryId.ts",
-      "src/utils/sortItems.ts"
+      "src/utils/sortItems.ts",
+      "src/utils/storageIndexQuery.ts"
     ]
   },
   "src/createIndex.ts": {
@@ -148,13 +152,13 @@
     "isDynamicEntry": true
   },
   "src/createReactivityAdapter.ts": {
-    "file": "index30.cjs.js",
+    "file": "index31.cjs.js",
     "name": "createReactivityAdapter",
     "src": "src/createReactivityAdapter.ts",
     "isDynamicEntry": true
   },
   "src/createStorageAdapter.ts": {
-    "file": "index29.cjs.js",
+    "file": "index30.cjs.js",
     "name": "createStorageAdapter",
     "src": "src/createStorageAdapter.ts",
     "isDynamicEntry": true
@@ -199,13 +203,13 @@
     "isDynamicEntry": true
   },
   "src/utils/batchOnNextTick.ts": {
-    "file": "index33.cjs.js",
+    "file": "index35.cjs.js",
     "name": "utils/batchOnNextTick",
     "src": "src/utils/batchOnNextTick.ts",
     "isDynamicEntry": true
   },
   "src/utils/compact.ts": {
-    "file": "index35.cjs.js",
+    "file": "index37.cjs.js",
     "name": "utils/compact",
     "src": "src/utils/compact.ts",
     "isDynamicEntry": true
@@ -238,6 +242,15 @@
       "src/utils/serializeValue.ts"
     ]
   },
+  "src/utils/idIndexQuery.ts": {
+    "file": "index27.cjs.js",
+    "name": "utils/idIndexQuery",
+    "src": "src/utils/idIndexQuery.ts",
+    "isDynamicEntry": true,
+    "imports": [
+      "src/utils/isFieldExpression.ts"
+    ]
+  },
   "src/utils/incrementalQueryUpdate.ts": {
     "file": "index25.cjs.js",
     "name": "utils/incrementalQueryUpdate",
@@ -323,7 +336,7 @@
     "isDynamicEntry": true
   },
   "src/utils/reactiveOrAsync.ts": {
-    "file": "index31.cjs.js",
+    "file": "index32.cjs.js",
     "name": "utils/reactiveOrAsync",
     "src": "src/utils/reactiveOrAsync.ts",
     "isDynamicEntry": true
@@ -349,6 +362,15 @@
       "src/utils/get.ts"
     ]
   },
+  "src/utils/storageIndexQuery.ts": {
+    "file": "index33.cjs.js",
+    "name": "utils/storageIndexQuery",
+    "src": "src/utils/storageIndexQuery.ts",
+    "isDynamicEntry": true,
+    "imports": [
+      "src/utils/getMatchingKeys.ts"
+    ]
+  },
   "src/utils/uniqueBy.ts": {
     "file": "index3.cjs.js",
     "name": "utils/uniqueBy",

package/dist/WorkerDataAdapter.d.ts

@@ -42,10 +42,15 @@ export default class WorkerDataAdapter implements DataAdapter {
     private execInBackground;
     private queryItemsById;
     private flattenPendingWrites;
+    private static pushPendingEntry;
+    private static dropPendingEntry;
+    private static writeFlatEntry;
     private static providesFullItems;
     private observableItems;
     private observableItemsByIds;
     private servedResult;
+    private advanceServedResult;
+    private changesetForIds;
     private computeServedResult;
     /**
      * Registers a write's effect locally and notifies every active query it

package/dist/index.cjs.js

@@ -6,15 +6,15 @@ const require_randomId = require("./index9.cjs.js");
 const require_get = require("./index11.cjs.js");
 const require_serializeValue = require("./index13.cjs.js");
 const require_modify = require("./index20.cjs.js");
-const require_DefaultDataAdapter = require("./index27.cjs.js");
-const require_index = require("./index28.cjs.js");
-const require_createStorageAdapter = require("./index29.cjs.js");
-const require_createReactivityAdapter = require("./index30.cjs.js");
-const require_reactiveOrAsync = require("./index31.cjs.js");
-const require_AsyncDataAdapter = require("./index32.cjs.js");
-const require_WorkerDataAdapter = require("./index34.cjs.js");
-const require_WorkerDataAdapterHost = require("./index36.cjs.js");
-const require_AutoFetchDataAdapter = require("./index37.cjs.js");
+const require_DefaultDataAdapter = require("./index28.cjs.js");
+const require_index = require("./index29.cjs.js");
+const require_createStorageAdapter = require("./index30.cjs.js");
+const require_createReactivityAdapter = require("./index31.cjs.js");
+const require_reactiveOrAsync = require("./index32.cjs.js");
+const require_AsyncDataAdapter = require("./index34.cjs.js");
+const require_WorkerDataAdapter = require("./index36.cjs.js");
+const require_WorkerDataAdapterHost = require("./index38.cjs.js");
+const require_AutoFetchDataAdapter = require("./index39.cjs.js");
 exports.AsyncDataAdapter = require_AsyncDataAdapter.default;
 exports.AutoFetchDataAdapter = require_AutoFetchDataAdapter.default;
 exports.Collection = require_index.default;

package/dist/index.mjs

@@ -5,13 +5,13 @@ import randomId from "./index9.mjs";
 import get from "./index11.mjs";
 import serializeValue from "./index13.mjs";
 import modify from "./index20.mjs";
-import DefaultDataAdapter from "./index27.mjs";
-import Collection from "./index28.mjs";
-import createStorageAdapter from "./index29.mjs";
-import createReactivityAdapter from "./index30.mjs";
-import reactiveOrAsync, { unwrap } from "./index31.mjs";
-import AsyncDataAdapter from "./index32.mjs";
-import WorkerDataAdapter from "./index34.mjs";
-import WorkerDataAdapterHost from "./index36.mjs";
-import AutoFetchDataAdapter from "./index37.mjs";
+import DefaultDataAdapter from "./index28.mjs";
+import Collection from "./index29.mjs";
+import createStorageAdapter from "./index30.mjs";
+import createReactivityAdapter from "./index31.mjs";
+import reactiveOrAsync, { unwrap } from "./index32.mjs";
+import AsyncDataAdapter from "./index34.mjs";
+import WorkerDataAdapter from "./index36.mjs";
+import WorkerDataAdapterHost from "./index38.mjs";
+import AutoFetchDataAdapter from "./index39.mjs";
 export { AsyncDataAdapter, AutoFetchDataAdapter, Collection, Cursor, DefaultDataAdapter, EventEmitter, WorkerDataAdapter, WorkerDataAdapterHost, createReactivityAdapter, createStorageAdapter, get, isEqual, modify, randomId, reactiveOrAsync, serializeValue, unwrap };

package/dist/index17.cjs.js

@@ -105,11 +105,16 @@ function getIndexInfo(queryFunctions, selector) {
 			let hasNonIndexField = false;
 			const matchedBefore = matched;
 			const idsBefore = ids;
+			let orIds = [];
+			let orMatched = false;
 			const process$or = ($orNew) => {
 				if (hasNonIndexField || $orNew && $orNew.length > 0) {
 					newSelector.$or = $or;
 					matched = matchedBefore;
 					ids = idsBefore;
+				} else if (orMatched) {
+					ids = matchedBefore ? require_intersection.default(idsBefore, orIds) : orIds;
+					matched = true;
 				}
 				return {
 					matched,
@@ -119,8 +124,8 @@ function getIndexInfo(queryFunctions, selector) {
 			};
 			const $orNewOrPromise = Array.isArray($or) ? optimizeLogicGate(queryFunctions, $or, (match, selIds) => {
 				if (match) {
-					ids = [...new Set([...ids, ...selIds])];
-					matched = true;
+					orIds = [...new Set([...orIds, ...selIds])];
+					orMatched = true;
 				} else hasNonIndexField = true;
 			}) : void 0;
 			if ($orNewOrPromise instanceof Promise) return $orNewOrPromise.then(($orNew) => process$or($orNew));

package/dist/index17.mjs

@@ -105,11 +105,16 @@ function getIndexInfo(queryFunctions, selector) {
 			let hasNonIndexField = false;
 			const matchedBefore = matched;
 			const idsBefore = ids;
+			let orIds = [];
+			let orMatched = false;
 			const process$or = ($orNew) => {
 				if (hasNonIndexField || $orNew && $orNew.length > 0) {
 					newSelector.$or = $or;
 					matched = matchedBefore;
 					ids = idsBefore;
+				} else if (orMatched) {
+					ids = matchedBefore ? intersection(idsBefore, orIds) : orIds;
+					matched = true;
 				}
 				return {
 					matched,
@@ -119,8 +124,8 @@ function getIndexInfo(queryFunctions, selector) {
 			};
 			const $orNewOrPromise = Array.isArray($or) ? optimizeLogicGate(queryFunctions, $or, (match, selIds) => {
 				if (match) {
-					ids = [...new Set([...ids, ...selIds])];
-					matched = true;
+					orIds = [...new Set([...orIds, ...selIds])];
+					orMatched = true;
 				} else hasNonIndexField = true;
 			}) : void 0;
 			if ($orNewOrPromise instanceof Promise) return $orNewOrPromise.then(($orNew) => process$or($orNew));