@spooky-sync/core 0.0.1-canary.130 → 0.0.1-canary.131

package/dist/index.js

@@ -1283,25 +1283,36 @@ var SurrealCacheEngine = class extends LocalDatabaseService {
 		}
 		return result;
 	}
-	async getById(_table, id) {
-		const [row] = await this.query("SELECT * FROM ONLY $__id;", { __id: id });
-		return row ?? null;
+	/**
+	* Coerce the contract's `Id` (a RecordId, a stable `table:id` string, or a
+	* bare id + the verb's `table` param) to a real RecordId. SurrealDB binds
+	* `$__id` verbatim: a plain string makes `FROM ONLY $__id` "select" the
+	* string itself (a truthy non-row) and `UPSERT $__id` an InternalError, so
+	* string ids silently broke every id-verb on this engine.
+	*/
+	toRecordId(table, id) {
+		if (typeof id !== "string") return id;
+		return new RecordId(table, id.startsWith(`${table}:`) ? id.slice(table.length + 1) : id);
+	}
+	async getById(table, id) {
+		const [row] = await this.query("SELECT * FROM ONLY $__id;", { __id: this.toRecordId(table, id) });
+		return row && typeof row === "object" ? row : null;
 	}
-	async upsert(_table, id, data, mode) {
+	async upsert(table, id, data, mode) {
 		const sql = mode === "merge" ? surql.upsertMerge("__id", "__data") : surql.upsert("__id", "__data");
 		await this.query(surql.seal(sql), {
-			__id: id,
+			__id: this.toRecordId(table, id),
 			__data: data
 		});
 	}
-	async patch(_table, id, patches) {
+	async patch(table, id, patches) {
 		await this.query(surql.seal("UPDATE ONLY $__id PATCH $__patches"), {
-			__id: id,
+			__id: this.toRecordId(table, id),
 			__patches: patches
 		});
 	}
-	async delete(_table, id) {
-		await this.query(surql.seal(surql.delete("__id")), { __id: id });
+	async delete(table, id) {
+		await this.query(surql.seal(surql.delete("__id")), { __id: this.toRecordId(table, id) });
 	}
 	/**
 	* Serialized (not strictly atomic) transaction: verbs run in order on the
@@ -2774,8 +2785,8 @@ var DataModule = class {
 	*/
 	async getPreloadMarker(hash) {
 		try {
-			const row = await this.local.getById("_00_preload", hash);
-			if (!row) return null;
+			const row = await this.local.getById("_00_preload", new RecordId("_00_preload", hash));
+			if (!row || typeof row !== "object") return null;
 			return {
 				fetchedAt: Number(row.fetchedAt) || 0,
 				rowCount: Number(row.rowCount) || 0
@@ -2796,7 +2807,7 @@ var DataModule = class {
 	}
 	/** Stamp the preload freshness marker after a successful snapshot fetch. */
 	async writePreloadMarker(hash, rowCount) {
-		await this.local.upsert("_00_preload", hash, {
+		await this.local.upsert("_00_preload", new RecordId("_00_preload", hash), {
 			fetchedAt: Date.now(),
 			rowCount
 		}, "replace");
@@ -5130,8 +5141,8 @@ function parseBackendInfo(raw) {
 
 //#endregion
 //#region src/modules/devtools/index.ts
-const CORE_VERSION = "0.0.1-canary.130";
-const WASM_VERSION = "0.0.1-canary.130";
+const CORE_VERSION = "0.0.1-canary.131";
+const WASM_VERSION = "0.0.1-canary.131";
 const SURREAL_VERSION = "3.0.3";
 var DevToolsService = class {
 	eventsHistory = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spooky-sync/core",
-  "version": "0.0.1-canary.130",
+  "version": "0.0.1-canary.131",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -59,8 +59,8 @@
     }
   },
   "dependencies": {
-    "@spooky-sync/query-builder": "0.0.1-canary.130",
-    "@spooky-sync/ssp-wasm": "0.0.1-canary.130",
+    "@spooky-sync/query-builder": "0.0.1-canary.131",
+    "@spooky-sync/ssp-wasm": "0.0.1-canary.131",
     "@sqlite.org/sqlite-wasm": "3.53.0-build1",
     "@surrealdb/wasm": "^3.0.3",
     "fast-json-patch": "^3.1.1",

package/src/modules/data/index.ts

@@ -876,8 +876,11 @@ export class DataModule<S extends SchemaStructure> {
     hash: string
   ): Promise<{ fetchedAt: number; rowCount: number } | null> {
     try {
-      const row = await this.local.getById('_00_preload', hash);
-      if (!row) return null;
+      // Pass a real RecordId: a bare string id hits the SurrealDB engine's
+      // `FROM ONLY $__id` as a plain string, which "selects" the string itself
+      // (a truthy non-row) instead of the record — misread as a warm marker.
+      const row = await this.local.getById('_00_preload', new RecordId('_00_preload', hash));
+      if (!row || typeof row !== 'object') return null;
       return {
         fetchedAt: Number((row as any).fetchedAt) || 0,
         rowCount: Number((row as any).rowCount) || 0,
@@ -900,9 +903,12 @@ export class DataModule<S extends SchemaStructure> {
 
   /** Stamp the preload freshness marker after a successful snapshot fetch. */
   async writePreloadMarker(hash: string, rowCount: number): Promise<void> {
+    // RecordId, not a bare string: the SurrealDB engine binds the id verbatim,
+    // and `UPSERT <string>` is an InternalError — the marker silently never
+    // landed (the write is awaited inside preload's best-effort catch).
     await this.local.upsert(
       '_00_preload',
-      hash,
+      new RecordId('_00_preload', hash),
       { fetchedAt: Date.now(), rowCount },
       'replace'
     );

package/src/services/database/surreal-cache-engine.ts

@@ -15,6 +15,7 @@ import type {
 } from './cache-engine';
 import { stableKey } from './relation-resolver';
 import { surql } from '../../utils/surql';
+import { RecordId } from 'surrealdb';
 
 /**
  * Default local cache backend: the in-browser SurrealDB-WASM store. Implemented
@@ -83,25 +84,41 @@ export class SurrealCacheEngine extends LocalDatabaseService implements LocalCac
     return result;
   }
 
-  async getById(_table: string, id: Id): Promise<Row | null> {
-    const [row] = await this.query<[Row | null]>('SELECT * FROM ONLY $__id;', { __id: id });
-    return row ?? null;
+  /**
+   * Coerce the contract's `Id` (a RecordId, a stable `table:id` string, or a
+   * bare id + the verb's `table` param) to a real RecordId. SurrealDB binds
+   * `$__id` verbatim: a plain string makes `FROM ONLY $__id` "select" the
+   * string itself (a truthy non-row) and `UPSERT $__id` an InternalError, so
+   * string ids silently broke every id-verb on this engine.
+   */
+  private toRecordId(table: string, id: Id): unknown {
+    if (typeof id !== 'string') return id;
+    const raw = id.startsWith(`${table}:`) ? id.slice(table.length + 1) : id;
+    return new RecordId(table, raw);
+  }
+
+  async getById(table: string, id: Id): Promise<Row | null> {
+    const [row] = await this.query<[Row | null]>('SELECT * FROM ONLY $__id;', {
+      __id: this.toRecordId(table, id),
+    });
+    // `FROM ONLY <non-record>` echoes the value back; only a real row counts.
+    return row && typeof row === 'object' ? row : null;
   }
 
-  async upsert(_table: string, id: Id, data: Row, mode: 'replace' | 'merge'): Promise<void> {
+  async upsert(table: string, id: Id, data: Row, mode: 'replace' | 'merge'): Promise<void> {
     const sql = mode === 'merge' ? surql.upsertMerge('__id', '__data') : surql.upsert('__id', '__data');
-    await this.query(surql.seal(sql), { __id: id, __data: data });
+    await this.query(surql.seal(sql), { __id: this.toRecordId(table, id), __data: data });
   }
 
-  async patch(_table: string, id: Id, patches: unknown[]): Promise<void> {
+  async patch(table: string, id: Id, patches: unknown[]): Promise<void> {
     await this.query(surql.seal('UPDATE ONLY $__id PATCH $__patches'), {
-      __id: id,
+      __id: this.toRecordId(table, id),
       __patches: patches,
     });
   }
 
-  async delete(_table: string, id: Id): Promise<void> {
-    await this.query(surql.seal(surql.delete('__id')), { __id: id });
+  async delete(table: string, id: Id): Promise<void> {
+    await this.query(surql.seal(surql.delete('__id')), { __id: this.toRecordId(table, id) });
   }
 
   /**