@spooky-sync/core 0.0.1-canary.25 → 0.0.1-canary.26

package/dist/index.js

@@ -534,12 +534,15 @@ var DataModule = class {
 		if (!this.schema.tables.find((t) => t.name === tableName)) throw new Error(`Table ${tableName} not found`);
 		const rid = parseRecordIdString(id);
 		const mutationId = parseRecordIdString(`_spooky_pending_mutations:${Date.now()}`);
+		const [beforeRecords] = await this.local.query("SELECT * FROM ONLY $id", { id: rid });
+		const beforeRecord = beforeRecords ?? {};
 		const query = surql.seal(surql.tx([surql.delete("id"), surql.createMutation("delete", "mid", "id")]));
 		await withRetry(this.logger, () => this.local.execute(query, {
 			id: rid,
 			mid: mutationId
 		}));
-		await this.cache.delete(table, id, true);
+		await this.cache.delete(table, id, true, beforeRecord);
+		for (const [queryHash, queryState] of this.activeQueries) if (queryState.config.tableName === tableName) await this.notifyQuerySynced(queryHash);
 		const mutationEvent = {
 			type: "delete",
 			mutation_id: mutationId,
@@ -1604,28 +1607,31 @@ var SyncEngine = class {
 			Category: "spooky-client::SyncEngine::syncRecords"
 		}, "SyncEngine.syncRecords diff");
 		if (removed.length > 0) await this.handleRemovedRecords(removed);
-		const idsToFetch = [...added, ...updated].map((x) => x.id);
+		const toFetch = [...added, ...updated];
+		const idsToFetch = toFetch.map((x) => x.id);
 		if (idsToFetch.length === 0) return;
-		const [remoteResults] = await this.remote.query("SELECT *, (SELECT version FROM ONLY _spooky_version WHERE record_id = $parent.id)['version'] as spooky_rv FROM $idsToFetch", { idsToFetch });
+		const versionMap = /* @__PURE__ */ new Map();
+		for (const item of toFetch) versionMap.set(encodeRecordId(item.id), item.version);
+		const [remoteResults] = await this.remote.query("SELECT * FROM $idsToFetch", { idsToFetch });
 		const cacheBatch = [];
-		for (const result of remoteResults) {
-			if (!result?.id) {
+		for (const record of remoteResults) {
+			if (!record?.id) {
 				this.logger.warn({
-					result,
+					record,
 					idsToFetch,
 					Category: "spooky-client::SyncEngine::syncRecords"
 				}, "Remote record has no id (possibly deleted). Skipping record");
 				continue;
 			}
-			const { spooky_rv, ...record } = result;
 			const fullId = encodeRecordId(record.id);
 			const table = record.id.table.toString();
 			const isAdded = added.some((item) => encodeRecordId(item.id) === fullId);
+			const version = versionMap.get(fullId) ?? 0;
 			const localVersion = this.cache.lookup(fullId);
-			if (localVersion && spooky_rv <= localVersion) {
+			if (localVersion && version <= localVersion) {
 				this.logger.info({
 					recordId: fullId,
-					version: spooky_rv,
+					version,
 					localVersion,
 					Category: "spooky-client::SyncEngine::syncRecords"
 				}, "Local version is higher than remote version. Skipping record");
@@ -1637,7 +1643,7 @@ var SyncEngine = class {
 				table,
 				op: isAdded ? "CREATE" : "UPDATE",
 				record: cleanedRecord,
-				version: spooky_rv
+				version
 			});
 		}
 		if (cacheBatch.length > 0) await this.cache.saveBatch(cacheBatch);
@@ -2755,7 +2761,7 @@ var CacheModule = class {
 	/**
 	* Delete a record from local DB and ingest deletion into DBSP
 	*/
-	async delete(table, id, skipDbDelete = false) {
+	async delete(table, id, skipDbDelete = false, recordData = {}) {
 		this.logger.debug({
 			table,
 			id,
@@ -2764,7 +2770,7 @@ var CacheModule = class {
 		try {
 			if (!skipDbDelete) await this.local.query("DELETE $id", { id: parseRecordIdString(id) });
 			delete this.versionLookups[id];
-			await this.streamProcessor.ingest(table, "DELETE", id, {});
+			this.streamProcessor.ingest(table, "DELETE", id, recordData);
 			this.logger.debug({
 				table,
 				id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spooky-sync/core",
-  "version": "0.0.1-canary.25",
+  "version": "0.0.1-canary.26",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/modules/cache/index.ts

@@ -137,7 +137,7 @@ export class CacheModule implements StreamUpdateReceiver {
   /**
    * Delete a record from local DB and ingest deletion into DBSP
    */
-  async delete(table: string, id: string, skipDbDelete: boolean = false): Promise<void> {
+  async delete(table: string, id: string, skipDbDelete: boolean = false, recordData: Record<string, any> = {}): Promise<void> {
     this.logger.debug(
       { table, id, Category: 'spooky-client::CacheModule::delete' },
       'Deleting record'
@@ -149,9 +149,9 @@ export class CacheModule implements StreamUpdateReceiver {
         await this.local.query('DELETE $id', { id: parseRecordIdString(id) });
       }
 
-      // 2. Ingest deletion into DBSP
+      // 2. Ingest deletion into DBSP (pass record data so predicates can be matched)
       delete this.versionLookups[id];
-      await this.streamProcessor.ingest(table, 'DELETE', id, {});
+      this.streamProcessor.ingest(table, 'DELETE', id, recordData);
 
       this.logger.debug(
         { table, id, Category: 'spooky-client::CacheModule::delete' },

package/src/modules/data/index.ts

@@ -549,12 +549,27 @@ export class DataModule<S extends SchemaStructure> {
     const rid = parseRecordIdString(id);
     const mutationId = parseRecordIdString(`_spooky_pending_mutations:${Date.now()}`);
 
+    // Fetch the record before deleting so DBSP can match it against query predicates
+    const [beforeRecords] = await this.local.query<[Record<string, any>[]]>(
+      'SELECT * FROM ONLY $id',
+      { id: rid }
+    );
+    const beforeRecord = beforeRecords ?? {};
+
     const query = surql.seal<void>(
       surql.tx([surql.delete('id'), surql.createMutation('delete', 'mid', 'id')])
     );
 
     await withRetry(this.logger, () => this.local.execute(query, { id: rid, mid: mutationId }));
-    await this.cache.delete(table, id, true);
+    await this.cache.delete(table, id, true, beforeRecord);
+
+    // DBSP may not emit view updates for DELETE ops —
+    // manually notify all queries that reference this table
+    for (const [queryHash, queryState] of this.activeQueries) {
+      if (queryState.config.tableName === tableName) {
+        await this.notifyQuerySynced(queryHash);
+      }
+    }
 
     // Emit mutation event
     const mutationEvent: DeleteEvent = {

package/src/modules/sync/engine.ts

@@ -57,21 +57,28 @@ export class SyncEngine {
       return;
     }
 
-    const [remoteResults] = await this.remote.query<
-      [(RecordWithId & { spooky_rv: number })[]]
-    >(
-      "SELECT *, (SELECT version FROM ONLY _spooky_version WHERE record_id = $parent.id)['version'] as spooky_rv FROM $idsToFetch",
+    // Build a version map from the diff (versions come from _spooky_list_ref)
+    const versionMap = new Map<string, number>();
+    for (const item of toFetch) {
+      versionMap.set(encodeRecordId(item.id), item.version);
+    }
+
+    // Fetch records from remote — avoid SELECT *, <subquery> FROM $param
+    // pattern which drops the * fields in SurrealDB v3 (known bug).
+    // Versions are already known from the diff's list_ref data.
+    const [remoteResults] = await this.remote.query<[RecordWithId[]]>(
+      'SELECT * FROM $idsToFetch',
       { idsToFetch }
     );
 
     // Prepare batch for cache (which handles both DB and DBSP)
     const cacheBatch: CacheRecord[] = [];
 
-    for (const result of remoteResults) {
-      if (!result?.id) {
+    for (const record of remoteResults) {
+      if (!record?.id) {
         this.logger.warn(
           {
-            result,
+            record,
             idsToFetch,
             Category: 'spooky-client::SyncEngine::syncRecords',
           },
@@ -79,17 +86,17 @@ export class SyncEngine {
         );
         continue;
       }
-      const { spooky_rv, ...record } = result;
       const fullId = encodeRecordId(record.id);
       const table = record.id.table.toString();
       const isAdded = added.some((item) => encodeRecordId(item.id) === fullId);
+      const version = versionMap.get(fullId) ?? 0;
 
       const localVersion = this.cache.lookup(fullId);
-      if (localVersion && spooky_rv <= localVersion) {
+      if (localVersion && version <= localVersion) {
         this.logger.info(
           {
             recordId: fullId,
-            version: spooky_rv,
+            version,
             localVersion,
             Category: 'spooky-client::SyncEngine::syncRecords',
           },
@@ -106,7 +113,7 @@ export class SyncEngine {
         table,
         op: isAdded ? 'CREATE' : 'UPDATE',
         record: cleanedRecord as RecordWithId,
-        version: spooky_rv,
+        version,
       });
     }