@signaldb/core 2.0.0-beta.16 → 2.0.0-beta.18

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/index34.cjs.js

@@ -185,24 +185,44 @@ var WorkerDataAdapter = class WorkerDataAdapter {
 		return query.itemsById;
 	}
 	flattenPendingWrites(collectionName) {
-		const pending = this.pendingWrites.get(collectionName);
-		if (!pending || pending.size === 0) return null;
-		const upserts = /* @__PURE__ */ new Map();
-		const deletes = /* @__PURE__ */ new Set();
-		[...pending.entries()].sort(([a], [b]) => a - b).forEach(([, write]) => {
-			write.upserts.forEach((item, id) => {
-				upserts.set(id, item);
-				deletes.delete(id);
-			});
-			write.deletes.forEach((id) => {
-				deletes.add(id);
-				upserts.delete(id);
-			});
+		const state = this.pendingWrites.get(collectionName);
+		if (!state || state.writes.size === 0) return null;
+		return state.flat;
+	}
+	static pushPendingEntry(state, id, item, seq) {
+		const stack = state.byId.get(id);
+		if (stack) stack.push({
+			seq,
+			item
 		});
-		return {
-			upserts,
-			deletes
-		};
+		else state.byId.set(id, [{
+			seq,
+			item
+		}]);
+		WorkerDataAdapter.writeFlatEntry(state, id, item);
+	}
+	static dropPendingEntry(state, id, seq) {
+		const stack = state.byId.get(id);
+		if (!stack) return;
+		const index = stack.findIndex((entry) => entry.seq === seq);
+		if (index !== -1) stack.splice(index, 1);
+		const top = stack.at(-1);
+		if (!top) {
+			state.byId.delete(id);
+			state.flat.upserts.delete(id);
+			state.flat.deletes.delete(id);
+			return;
+		}
+		WorkerDataAdapter.writeFlatEntry(state, id, top.item);
+	}
+	static writeFlatEntry(state, id, item) {
+		if (item === null) {
+			state.flat.deletes.add(id);
+			state.flat.upserts.delete(id);
+			return;
+		}
+		state.flat.upserts.set(id, item);
+		state.flat.deletes.delete(id);
 	}
 	static providesFullItems(query) {
 		return query.options?.fields == null;
@@ -246,7 +266,7 @@ var WorkerDataAdapter = class WorkerDataAdapter {
 	servedResult(collectionName, query) {
 		const pendingVersion = this.pendingWriteVersions.get(collectionName) ?? 0;
 		if (query.served && query.served.fromItems === query.items && query.served.pendingVersion === pendingVersion) return query.served.items;
-		const items = this.computeServedResult(collectionName, query);
+		const items = this.advanceServedResult(collectionName, query, pendingVersion) ?? this.computeServedResult(collectionName, query);
 		query.served = {
 			items,
 			fromItems: query.items,
@@ -254,6 +274,39 @@ var WorkerDataAdapter = class WorkerDataAdapter {
 		};
 		return items;
 	}
+	advanceServedResult(collectionName, query, pendingVersion) {
+		const served = query.served;
+		if (!served || served.fromItems !== query.items) return null;
+		if (served.pendingVersion !== pendingVersion - 1) return null;
+		if (!WorkerDataAdapter.providesFullItems(query) || query.options?.limit != null) return null;
+		const state = this.pendingWrites.get(collectionName);
+		if (state?.lastChange == null || state.lastChange.version !== pendingVersion) return null;
+		return require_incrementalQueryUpdate.mergeChangesetIntoResult(served.items, query.selector, query.options, this.changesetForIds(collectionName, query, state.lastChange.ids));
+	}
+	changesetForIds(collectionName, query, ids) {
+		const pending = this.flattenPendingWrites(collectionName);
+		const stored = this.queryItemsById(query);
+		const upserts = [];
+		const deletes = [];
+		ids.forEach((id) => {
+			const pendingItem = pending?.upserts.get(id);
+			if (pendingItem) {
+				upserts.push(pendingItem);
+				return;
+			}
+			if (pending?.deletes.has(id)) {
+				deletes.push(id);
+				return;
+			}
+			const storedItem = stored.get(id);
+			if (storedItem) upserts.push(storedItem);
+			else deletes.push(id);
+		});
+		return {
+			upserts,
+			deletes
+		};
+	}
 	computeServedResult(collectionName, query) {
 		const pending = this.flattenPendingWrites(collectionName);
 		if (!pending) return query.items;
@@ -288,22 +341,45 @@ var WorkerDataAdapter = class WorkerDataAdapter {
 		const affected = this.affectedQueries(collectionName, upserts, affectedIds);
 		const servedBefore = this.servedResults(collectionName, affected);
 		const seq = this.pendingWriteSeq += 1;
-		const pending = this.pendingWrites.get(collectionName) ?? /* @__PURE__ */ new Map();
-		pending.set(seq, {
+		const state = this.pendingWrites.get(collectionName) ?? {
+			writes: /* @__PURE__ */ new Map(),
+			byId: /* @__PURE__ */ new Map(),
+			flat: {
+				upserts: /* @__PURE__ */ new Map(),
+				deletes: /* @__PURE__ */ new Set()
+			},
+			lastChange: null
+		};
+		const write = {
 			upserts: new Map(upserts.map((item) => [item.id, item])),
 			deletes: new Set(deletes)
-		});
-		this.pendingWrites.set(collectionName, pending);
+		};
+		state.writes.set(seq, write);
+		write.upserts.forEach((item, id) => WorkerDataAdapter.pushPendingEntry(state, id, item, seq));
+		write.deletes.forEach((id) => WorkerDataAdapter.pushPendingEntry(state, id, null, seq));
+		this.pendingWrites.set(collectionName, state);
 		this.bumpPendingWriteVersion(collectionName);
+		state.lastChange = {
+			version: this.pendingWriteVersions.get(collectionName) ?? 0,
+			ids: [...affectedIds]
+		};
 		this.notifyWithDeltas(collectionName, affected, servedBefore);
 		return () => {
 			const current = this.pendingWrites.get(collectionName);
 			if (!current) return;
+			const settled = current.writes.get(seq);
+			if (!settled) return;
 			const affectedOnDrop = this.affectedQueries(collectionName, upserts, affectedIds);
 			const beforeDrop = this.servedResults(collectionName, affectedOnDrop);
-			current.delete(seq);
-			if (current.size === 0) this.pendingWrites.delete(collectionName);
+			current.writes.delete(seq);
+			settled.upserts.forEach((item, id) => WorkerDataAdapter.dropPendingEntry(current, id, seq));
+			settled.deletes.forEach((id) => WorkerDataAdapter.dropPendingEntry(current, id, seq));
+			if (current.writes.size === 0) this.pendingWrites.delete(collectionName);
 			this.bumpPendingWriteVersion(collectionName);
+			if (current.writes.size > 0) current.lastChange = {
+				version: this.pendingWriteVersions.get(collectionName) ?? 0,
+				ids: [...affectedIds]
+			};
 			this.notifyWithDeltas(collectionName, affectedOnDrop, beforeDrop);
 		};
 	}

package/dist/index34.mjs

@@ -185,24 +185,44 @@ var WorkerDataAdapter = class WorkerDataAdapter {
 		return query.itemsById;
 	}
 	flattenPendingWrites(collectionName) {
-		const pending = this.pendingWrites.get(collectionName);
-		if (!pending || pending.size === 0) return null;
-		const upserts = /* @__PURE__ */ new Map();
-		const deletes = /* @__PURE__ */ new Set();
-		[...pending.entries()].sort(([a], [b]) => a - b).forEach(([, write]) => {
-			write.upserts.forEach((item, id) => {
-				upserts.set(id, item);
-				deletes.delete(id);
-			});
-			write.deletes.forEach((id) => {
-				deletes.add(id);
-				upserts.delete(id);
-			});
+		const state = this.pendingWrites.get(collectionName);
+		if (!state || state.writes.size === 0) return null;
+		return state.flat;
+	}
+	static pushPendingEntry(state, id, item, seq) {
+		const stack = state.byId.get(id);
+		if (stack) stack.push({
+			seq,
+			item
 		});
-		return {
-			upserts,
-			deletes
-		};
+		else state.byId.set(id, [{
+			seq,
+			item
+		}]);
+		WorkerDataAdapter.writeFlatEntry(state, id, item);
+	}
+	static dropPendingEntry(state, id, seq) {
+		const stack = state.byId.get(id);
+		if (!stack) return;
+		const index = stack.findIndex((entry) => entry.seq === seq);
+		if (index !== -1) stack.splice(index, 1);
+		const top = stack.at(-1);
+		if (!top) {
+			state.byId.delete(id);
+			state.flat.upserts.delete(id);
+			state.flat.deletes.delete(id);
+			return;
+		}
+		WorkerDataAdapter.writeFlatEntry(state, id, top.item);
+	}
+	static writeFlatEntry(state, id, item) {
+		if (item === null) {
+			state.flat.deletes.add(id);
+			state.flat.upserts.delete(id);
+			return;
+		}
+		state.flat.upserts.set(id, item);
+		state.flat.deletes.delete(id);
 	}
 	static providesFullItems(query) {
 		return query.options?.fields == null;
@@ -246,7 +266,7 @@ var WorkerDataAdapter = class WorkerDataAdapter {
 	servedResult(collectionName, query) {
 		const pendingVersion = this.pendingWriteVersions.get(collectionName) ?? 0;
 		if (query.served && query.served.fromItems === query.items && query.served.pendingVersion === pendingVersion) return query.served.items;
-		const items = this.computeServedResult(collectionName, query);
+		const items = this.advanceServedResult(collectionName, query, pendingVersion) ?? this.computeServedResult(collectionName, query);
 		query.served = {
 			items,
 			fromItems: query.items,
@@ -254,6 +274,39 @@ var WorkerDataAdapter = class WorkerDataAdapter {
 		};
 		return items;
 	}
+	advanceServedResult(collectionName, query, pendingVersion) {
+		const served = query.served;
+		if (!served || served.fromItems !== query.items) return null;
+		if (served.pendingVersion !== pendingVersion - 1) return null;
+		if (!WorkerDataAdapter.providesFullItems(query) || query.options?.limit != null) return null;
+		const state = this.pendingWrites.get(collectionName);
+		if (state?.lastChange == null || state.lastChange.version !== pendingVersion) return null;
+		return mergeChangesetIntoResult(served.items, query.selector, query.options, this.changesetForIds(collectionName, query, state.lastChange.ids));
+	}
+	changesetForIds(collectionName, query, ids) {
+		const pending = this.flattenPendingWrites(collectionName);
+		const stored = this.queryItemsById(query);
+		const upserts = [];
+		const deletes = [];
+		ids.forEach((id) => {
+			const pendingItem = pending?.upserts.get(id);
+			if (pendingItem) {
+				upserts.push(pendingItem);
+				return;
+			}
+			if (pending?.deletes.has(id)) {
+				deletes.push(id);
+				return;
+			}
+			const storedItem = stored.get(id);
+			if (storedItem) upserts.push(storedItem);
+			else deletes.push(id);
+		});
+		return {
+			upserts,
+			deletes
+		};
+	}
 	computeServedResult(collectionName, query) {
 		const pending = this.flattenPendingWrites(collectionName);
 		if (!pending) return query.items;
@@ -288,22 +341,45 @@ var WorkerDataAdapter = class WorkerDataAdapter {
 		const affected = this.affectedQueries(collectionName, upserts, affectedIds);
 		const servedBefore = this.servedResults(collectionName, affected);
 		const seq = this.pendingWriteSeq += 1;
-		const pending = this.pendingWrites.get(collectionName) ?? /* @__PURE__ */ new Map();
-		pending.set(seq, {
+		const state = this.pendingWrites.get(collectionName) ?? {
+			writes: /* @__PURE__ */ new Map(),
+			byId: /* @__PURE__ */ new Map(),
+			flat: {
+				upserts: /* @__PURE__ */ new Map(),
+				deletes: /* @__PURE__ */ new Set()
+			},
+			lastChange: null
+		};
+		const write = {
 			upserts: new Map(upserts.map((item) => [item.id, item])),
 			deletes: new Set(deletes)
-		});
-		this.pendingWrites.set(collectionName, pending);
+		};
+		state.writes.set(seq, write);
+		write.upserts.forEach((item, id) => WorkerDataAdapter.pushPendingEntry(state, id, item, seq));
+		write.deletes.forEach((id) => WorkerDataAdapter.pushPendingEntry(state, id, null, seq));
+		this.pendingWrites.set(collectionName, state);
 		this.bumpPendingWriteVersion(collectionName);
+		state.lastChange = {
+			version: this.pendingWriteVersions.get(collectionName) ?? 0,
+			ids: [...affectedIds]
+		};
 		this.notifyWithDeltas(collectionName, affected, servedBefore);
 		return () => {
 			const current = this.pendingWrites.get(collectionName);
 			if (!current) return;
+			const settled = current.writes.get(seq);
+			if (!settled) return;
 			const affectedOnDrop = this.affectedQueries(collectionName, upserts, affectedIds);
 			const beforeDrop = this.servedResults(collectionName, affectedOnDrop);
-			current.delete(seq);
-			if (current.size === 0) this.pendingWrites.delete(collectionName);
+			current.writes.delete(seq);
+			settled.upserts.forEach((item, id) => WorkerDataAdapter.dropPendingEntry(current, id, seq));
+			settled.deletes.forEach((id) => WorkerDataAdapter.dropPendingEntry(current, id, seq));
+			if (current.writes.size === 0) this.pendingWrites.delete(collectionName);
 			this.bumpPendingWriteVersion(collectionName);
+			if (current.writes.size > 0) current.lastChange = {
+				version: this.pendingWriteVersions.get(collectionName) ?? 0,
+				ids: [...affectedIds]
+			};
 			this.notifyWithDeltas(collectionName, affectedOnDrop, beforeDrop);
 		};
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signaldb/core",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.18",
   "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",