@spooky-sync/core 0.0.1-canary.314 → 0.0.1-canary.315

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as renderOrderSql, c as serializeMergeRow, d as stableKey, i as projectedDataSql, l as serializeRow, o as renderWhereSql, r as project, s as reviveRow, t as PROMOTION_OPEN_OPTIONS, u as resolveRelations } from "./sqlite-open.js";
+import { a as renderOrderSql, c as serializeMergeRow, d as resolveRelations, f as stableKey, i as projectedDataSql, l as serializeRow, o as renderWhereSql, r as project, s as reviveRow, t as PROMOTION_OPEN_OPTIONS, u as recordIdKey } from "./sqlite-open.js";
 import { QueryBuilder, RecordId, baseFieldOfParam, cyrb53 } from "@spooky-sync/query-builder";
 import { DateTime, Duration, RecordId as RecordId$1, Surreal, Uuid, applyDiagnostics, createRemoteEngines } from "surrealdb";
 import pino from "pino";
@@ -2178,8 +2178,8 @@ function trimHistory(history, cap) {
 
 //#endregion
 //#region src/modules/devtools/index.ts
-const CORE_VERSION = "0.0.1-canary.314";
-const WASM_VERSION = "0.0.1-canary.314";
+const CORE_VERSION = "0.0.1-canary.315";
+const WASM_VERSION = "0.0.1-canary.315";
 const SURREAL_VERSION = "3.0.3";
 var DevToolsService = class DevToolsService {
 	version = CORE_VERSION;
@@ -11212,7 +11212,7 @@ var StreamProcessorService = class {
 			const hasToString = typeof value.toString === "function";
 			const isNotPlainObject = value.constructor !== Object;
 			if (hasTable && hasId && hasToString && isNotPlainObject) {
-				const result = value.toString();
+				const result = recordIdKey(value) ?? value.toString();
 				this.logger.trace({
 					result,
 					Category: "sp00ky-client::StreamProcessorService::normalizeValue"
@@ -14603,7 +14603,7 @@ function createTabsCoordinator(config, s, host) {
 	return new TabsCoordinator({
 		tabId: s.tabId,
 		fingerprint: computeTabsFingerprint({
-			coreVersion: "0.0.1-canary.314",
+			coreVersion: "0.0.1-canary.315",
 			schemaHash: hash53(config.schemaSurql),
 			endpoint: config.database.endpoint ?? "",
 			namespace: config.database.namespace,

package/dist/sqlite-open.js

@@ -88,13 +88,32 @@ async function resolveOne(parents, relation, fetcher, depth, path) {
 function looksLikeRecordId(value) {
 	if (value == null) return false;
 	if (typeof value === "string") return /^[A-Za-z_][A-Za-z0-9_]*:.+/.test(value);
-	if (typeof value === "object") {
-		const rid = value;
-		return rid.tb !== void 0 && rid.id !== void 0;
-	}
+	if (typeof value === "object") return recordIdKey(value) !== null;
 	return false;
 }
 /**
+* The raw `table:id` key of a RecordId, duck-typed: the SDK 1.x shape
+* `{ tb, id }` or the SDK 2.x one, whose `table` is a `Table` (both behind
+* getters). `null` for anything else.
+*
+* Never the SDK's `toString()`: that is SurrealQL, escaped. SDK 2.1.0 escapes
+* every key that starts with a digit (`game:⟨476g…⟩`), while the store and
+* server membership spell the same id `game:476g…`, so a key built from
+* `toString()` silently missed about a quarter of random ids. A complex
+* (array/object) key has no raw spelling and returns `null`.
+*/
+function recordIdKey(value) {
+	const rid = value;
+	if (rid.id === void 0) return null;
+	if (rid.tb !== void 0) return `${String(rid.tb)}:${stableKey(rid.id)}`;
+	const proto = Object.getPrototypeOf(value);
+	if (proto === Object.prototype || proto === null) return null;
+	const name = rid.table?.name;
+	if (typeof rid.table !== "object" || typeof name !== "string") return null;
+	if (typeof rid.id === "string" || typeof rid.id === "number" || typeof rid.id === "bigint") return `${name}:${String(rid.id)}`;
+	return null;
+}
+/**
 * Stable grouping key for a correlation value. A `RecordId` (duck-typed to
 * avoid a hard surrealdb dependency here) and its `table:id` string form must
 * collapse to the same key so a parent FK stored either way matches the child.
@@ -104,8 +123,9 @@ function stableKey(value) {
 	if (typeof value === "string") return value;
 	if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") return String(value);
 	if (typeof value === "object") {
+		const key = recordIdKey(value);
+		if (key !== null) return key;
 		const rid = value;
-		if (rid.tb !== void 0 && rid.id !== void 0) return `${String(rid.tb)}:${stableKey(rid.id)}`;
 		if (typeof rid.toString === "function") {
 			const s = rid.toString();
 			if (s !== "[object Object]") return s;
@@ -173,11 +193,12 @@ function scalar(value) {
 	return value;
 }
 function serializeRow(row) {
-	return JSON.stringify(row, (_k, v) => {
+	return JSON.stringify(row, function(k, v) {
 		if (v instanceof Uint8Array) return { __u8: toBase64(v) };
-		if (v && typeof v === "object") {
-			const rid = v;
-			if (rid.tb !== void 0 && rid.id !== void 0) return stableKey(v);
+		const raw = this[k];
+		if (raw && typeof raw === "object") {
+			const key = recordIdKey(raw);
+			if (key !== null) return key;
 		}
 		return v;
 	});
@@ -355,4 +376,4 @@ async function openDb(sqlite3, dbName, useOpfs, opts = {}) {
 }
 
 //#endregion
-export { renderOrderSql as a, serializeMergeRow as c, stableKey as d, projectedDataSql as i, serializeRow as l, openDb as n, renderWhereSql as o, project as r, reviveRow as s, PROMOTION_OPEN_OPTIONS as t, resolveRelations as u };
+export { renderOrderSql as a, serializeMergeRow as c, resolveRelations as d, stableKey as f, projectedDataSql as i, serializeRow as l, openDb as n, renderWhereSql as o, project as r, reviveRow as s, PROMOTION_OPEN_OPTIONS as t, recordIdKey as u };

package/dist/sqlite-worker.js

@@ -1,4 +1,4 @@
-import { a as renderOrderSql, d as stableKey, i as projectedDataSql, n as openDb, o as renderWhereSql, r as project, s as reviveRow, u as resolveRelations } from "./sqlite-open.js";
+import { a as renderOrderSql, d as resolveRelations, f as stableKey, i as projectedDataSql, n as openDb, o as renderWhereSql, r as project, s as reviveRow } from "./sqlite-open.js";
 import sqlite3InitModule from "@sqlite.org/sqlite-wasm";
 
 //#region src/services/database/sqlite-lock-verify.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spooky-sync/core",
-  "version": "0.0.1-canary.314",
+  "version": "0.0.1-canary.315",
   "type": "module",
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -75,8 +75,8 @@
     }
   },
   "dependencies": {
-    "@spooky-sync/query-builder": "0.0.1-canary.314",
-    "@spooky-sync/ssp-wasm": "0.0.1-canary.314",
+    "@spooky-sync/query-builder": "0.0.1-canary.315",
+    "@spooky-sync/ssp-wasm": "0.0.1-canary.315",
     "@sqlite.org/sqlite-wasm": "3.53.0-build1",
     "@surrealdb/wasm": "^3.0.3",
     "blurhash": "^2.0.5",

package/src/services/database/relation-resolver.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect } from 'vitest';
+import { RecordId } from 'surrealdb';
 import type { RelationPlan, WhereNode } from '@spooky-sync/query-builder';
 import { looksLikeRecordId, resolveRelations, sortRows, stableKey } from './relation-resolver';
 import {
@@ -306,6 +307,22 @@ describe('stableKey', () => {
     expect(stableKey({ tb: 'user', id: '1' })).toBe('user:1');
     expect(stableKey('user:1')).toBe('user:1');
   });
+
+  it('spells an SDK RecordId raw, never as escaped SurrealQL', () => {
+    // SDK 2.1.0 `toString()`s these as `game:⟨476g…⟩`, `t:⟨123⟩`, `t:⟨a-b⟩`.
+    expect(stableKey(new RecordId('game', '476gsdlvro7cme8nwied'))).toBe('game:476gsdlvro7cme8nwied');
+    expect(stableKey(new RecordId('t', '123'))).toBe('t:123');
+    expect(stableKey(new RecordId('t', 'a-b'))).toBe('t:a-b');
+    expect(stableKey(new RecordId('t', 7))).toBe('t:7');
+    expect(looksLikeRecordId(new RecordId('game', '476gsdlvro7cme8nwied'))).toBe(true);
+  });
+
+  it('leaves a complex key to toString and a plain row with table/id columns alone', () => {
+    const complex = new RecordId('t', [1, 'x']);
+    expect(stableKey(complex)).toBe(complex.toString());
+    const row = { table: { name: 'x' }, id: 'y' };
+    expect(stableKey(row)).toBe(JSON.stringify(row));
+  });
 });
 
 /**

package/src/services/database/sqlite-plan-sql.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect } from 'vitest';
+import { RecordId } from 'surrealdb';
 import type { WhereNode } from '@spooky-sync/query-builder';
 import {
   comparisonSql,
@@ -96,6 +97,11 @@ describe('serializeRow / reviveRow round-trip', () => {
     const json = serializeRow({ id: 't:1', author: { tb: 'user', id: 'u1' }, n: 2 });
     expect(reviveRow(json)).toEqual({ id: 't:1', author: 'user:u1', n: 2 });
   });
+
+  it('stores an SDK RecordId link raw, not as its escaped toJSON', () => {
+    const json = serializeRow({ id: 'game:1', white: new RecordId('player_name', '3abc'), tags: [new RecordId('t', '9z')] });
+    expect(reviveRow(json)).toEqual({ id: 'game:1', white: 'player_name:3abc', tags: ['t:9z'] });
+  });
 });
 
 describe('project', () => {

package/src/services/database/sqlite-plan-sql.ts

@@ -1,5 +1,5 @@
 import type { WhereComparison, WhereNode } from '@spooky-sync/query-builder';
-import { stableKey } from './relation-resolver';
+import { recordIdKey, stableKey } from './relation-resolver';
 import type { OrderBy, Row } from './cache-engine';
 
 /**
@@ -60,11 +60,14 @@ export function scalar(value: unknown): unknown {
 }
 
 export function serializeRow(row: Row): string {
-  return JSON.stringify(row, (_k, v) => {
+  return JSON.stringify(row, function (this: Record<string, unknown>, k, v) {
     if (v instanceof Uint8Array) return { __u8: toBase64(v) };
-    if (v && typeof v === 'object') {
-      const rid = v as { tb?: unknown; id?: unknown };
-      if (rid.tb !== undefined && rid.id !== undefined) return stableKey(v);
+    // `v` has already been through `toJSON()`, and a RecordId's is escaped
+    // SurrealQL (`game:⟨476g…⟩`), so key the original value instead.
+    const raw = this[k];
+    if (raw && typeof raw === 'object') {
+      const key = recordIdKey(raw);
+      if (key !== null) return key;
     }
     return v;
   });

package/src/services/database/sqlite-select.test.ts

@@ -45,6 +45,10 @@ const FIXTURE: Record<string, Row[]> = {
     { id: 'comment:2', thread: 'thread:B', body: 'second' },
     { id: 'comment:3', thread: 'thread:A', body: 'other thread' },
   ],
+  game: [
+    { id: 'game:476gsdlvro7cme8nwied', white: 'player_name:a' },
+    { id: 'game:stgyqp7fm3sc4tmyc8fm', white: 'player_name:b' },
+  ],
 };
 
 /** The `.one()` detail-view plan shape: id baked as a literal AND slaved to
@@ -187,12 +191,23 @@ describe('SqliteCacheEngine.select via worker (one hop)', () => {
     const rid = new RecordId('comment', '2');
     const { engine, calls } = makeEngine({ workerSelect: true, answerSelect: true });
     await engine.connect('anon');
-    await engine.select({ table: 'comment', ids: [rid, 'comment:1'] }, {});
+    const rows = await engine.select({ table: 'comment', ids: [rid, 'comment:1'] }, {});
     const sel = calls.find((c) => c.type === 'select')!;
-    // stableKey output (surrealdb may escape the id part, e.g. comment:⟨2⟩) —
-    // identical to what the legacy `selectByIds` binds, so stored rows match.
-    expect(sel.payload.plan.ids).toEqual([stableKey(rid), 'comment:1']);
-    expect(sel.payload.plan.ids.every((i: unknown) => typeof i === 'string')).toBe(true);
+    // The raw spelling the rows are stored under, never the SDK's escaped
+    // `comment:⟨2⟩`: that one matched no stored row.
+    expect(sel.payload.plan.ids).toEqual(['comment:2', 'comment:1']);
+    expect(rows.map((r) => r.id)).toEqual(['comment:2', 'comment:1']);
+  });
+
+  it('finds a window row whose id starts with a digit (SDK 2.1.0 escapes it)', async () => {
+    // `materializeEffect` parses every window id into a RecordId, and SDK
+    // 2.1.0's `toString()` spells this one `game:⟨476g…⟩`. Keyed that way the
+    // row went missing, the window came back short and read as the list end.
+    const { engine } = makeEngine({ workerSelect: true, answerSelect: true });
+    await engine.connect('anon');
+    const ids = [new RecordId('game', '476gsdlvro7cme8nwied'), new RecordId('game', 'stgyqp7fm3sc4tmyc8fm')];
+    const rows = await engine.select({ table: 'game', ids }, {});
+    expect(rows.map((r) => r.id)).toEqual(['game:476gsdlvro7cme8nwied', 'game:stgyqp7fm3sc4tmyc8fm']);
   });
 
   it('normalizes RecordId values baked inside the plan\'s where tree', async () => {

package/src/services/stream-processor/index.ts

@@ -7,6 +7,7 @@ import type { WasmProcessor, WasmStreamUpdate } from './wasm-types';
 import type { Duration } from 'surrealdb';
 import type { QueryTimeToLive, RecordVersionArray } from '../../types';
 import { encodeRecordId } from '../../utils/index';
+import { recordIdKey } from '../database/relation-resolver';
 
 // Simple interface for query plan registration (replaces Incantation class)
 interface QueryPlanConfig {
@@ -1044,7 +1045,9 @@ export class StreamProcessorService {
       const isNotPlainObject = value.constructor !== Object;
 
       if (hasTable && hasId && hasToString && isNotPlainObject) {
-        const result = value.toString();
+        // The raw `table:id`, as the store spells it. `toString()` is escaped
+        // SurrealQL (SDK 2.1.0: `game:⟨476g…⟩`); only a complex key uses it.
+        const result = recordIdKey(value) ?? value.toString();
         this.logger.trace(
           { result, Category: 'sp00ky-client::StreamProcessorService::normalizeValue' },
           'RecordId detected'