@spooky-sync/core 0.0.1-canary.20 → 0.0.1-canary.22

package/dist/index.js

@@ -1514,7 +1514,6 @@ var ArraySyncer = class {
 			this.localArray.sort((a, b) => a[0].localeCompare(b[0]));
 			this.needsSort = false;
 		}
-		console.log("xxxx555", this.localArray, this.remoteArray);
 		return diffRecordVersionArray(this.localArray, this.remoteArray);
 	}
 };
@@ -1609,18 +1608,18 @@ var SyncEngine = class {
 		if (removed.length > 0) await this.handleRemovedRecords(removed);
 		const idsToFetch = [...added, ...updated].map((x) => x.id);
 		if (idsToFetch.length === 0) return;
-		const [remoteResults] = await this.remote.query("SELECT (SELECT * FROM ONLY <record>$parent.id) AS record, (SELECT version FROM ONLY _spooky_version WHERE record_id = <record>$parent.id)['version'] as spooky_rv FROM $idsToFetch", { idsToFetch });
-		console.log("remoteResults>", remoteResults);
+		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 cacheBatch = [];
-		for (const { spooky_rv, record } of remoteResults) {
-			if (!record?.id) {
+		for (const result of remoteResults) {
+			if (!result?.id) {
 				this.logger.warn({
-					record,
+					result,
 					idsToFetch,
 					Category: "spooky-client::SyncEngine::syncRecords"
-				}, "Remote record has no id. Skipping record");
+				}, "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);
@@ -1854,7 +1853,6 @@ var SpookySync = class {
 			event,
 			Category: "spooky-client::SpookySync::processUpEvent"
 		}, "Processing up event");
-		console.log("xx1", event);
 		switch (event.type) {
 			case "create":
 				const dataKeys = Object.keys(event.data).map((key) => ({

package/package.json

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

package/src/modules/sync/engine.ts

@@ -57,26 +57,29 @@ export class SyncEngine {
       return;
     }
 
-    const [remoteResults] = await this.remote.query<[RecordWithId[]]>(
-      "SELECT (SELECT * FROM ONLY <record>$parent.id) AS record, (SELECT version FROM ONLY _spooky_version WHERE record_id = <record>$parent.id)['version'] as spooky_rv FROM $idsToFetch",
+    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",
       { idsToFetch }
     );
-    console.log('remoteResults>', remoteResults);
+
     // Prepare batch for cache (which handles both DB and DBSP)
     const cacheBatch: CacheRecord[] = [];
 
-    for (const { spooky_rv, record } of remoteResults) {
-      if (!record?.id) {
+    for (const result of remoteResults) {
+      if (!result?.id) {
         this.logger.warn(
           {
-            record,
+            result,
             idsToFetch,
             Category: 'spooky-client::SyncEngine::syncRecords',
           },
-          'Remote record has no id. Skipping record'
+          '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);

package/src/modules/sync/sync.ts

@@ -169,7 +169,6 @@ export class SpookySync<S extends SchemaStructure> {
       { event, Category: 'spooky-client::SpookySync::processUpEvent' },
       'Processing up event'
     );
-    console.log('xx1', event);
     switch (event.type) {
       case 'create':
         const dataKeys = Object.keys(event.data).map((key) => ({ key, variable: `data_${key}` }));

package/src/modules/sync/utils.ts

@@ -49,7 +49,6 @@ export class ArraySyncer {
       this.localArray.sort((a, b) => a[0].localeCompare(b[0]));
       this.needsSort = false;
     }
-    console.log('xxxx555', this.localArray, this.remoteArray);
     const diff = diffRecordVersionArray(this.localArray, this.remoteArray);
     return diff;
   }