@foretag/tanstack-db-surrealdb 0.6.11 → 0.7.0

package/dist/index.mjs

@@ -1,6 +1,8 @@
+import { persistedCollectionOptions } from '@tanstack/db-sqlite-persistence-core';
 import { queryCollectionOptions } from '@tanstack/query-db-collection';
 import { LoroDoc } from 'loro-crdt';
 import { Table, RecordId, Features } from 'surrealdb';
+import { hashKey } from '@tanstack/query-core';
 import { parseOrderByExpression, parseWhereExpression } from '@tanstack/db';
 
 // src/index.ts
@@ -288,12 +290,313 @@ var toRecordId = (tableName, id) => {
   const key = normalized.startsWith(prefixed) ? normalized.slice(prefixed.length) : normalized;
   return new RecordId(tableName, key);
 };
-var IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
-var firstRow = (res) => {
-  if (!res) return void 0;
-  if (Array.isArray(res)) return res[0];
-  return res;
+var SURREAL_COLLECTION_ID_PREFIX = "surreal";
+var patchedCollections = /* @__PURE__ */ new WeakSet();
+var normalizeDeleteKeyAgainstState = (state, key) => {
+  if (state.has(key)) return key;
+  const canonical = asCanonicalRecordIdString(key);
+  if (!canonical) return key;
+  return state.has(canonical) ? canonical : key;
+};
+var patchCollectionDeleteForRecordIds = (collection) => {
+  if (!collection || typeof collection !== "object") return;
+  if (patchedCollections.has(collection)) return;
+  const candidate = collection;
+  if (typeof candidate.delete !== "function") return;
+  const originalDelete = candidate.delete.bind(collection);
+  Object.defineProperty(collection, "delete", {
+    configurable: true,
+    writable: true,
+    value: (keys, config) => {
+      const state = collection.state ?? /* @__PURE__ */ new Map();
+      const normalizedKeys = Array.isArray(keys) ? keys.map((key) => normalizeDeleteKeyAgainstState(state, key)) : normalizeDeleteKeyAgainstState(state, keys);
+      return originalDelete(normalizedKeys, config);
+    }
+  });
+  patchedCollections.add(collection);
+};
+var deriveCollectionId = (tableName, queryKey) => `${SURREAL_COLLECTION_ID_PREFIX}:${tableName}:${hashKey(queryKey)}`;
+
+// src/util.ts
+var encoder = new TextEncoder();
+var decoder = new TextDecoder();
+var hasBuffer = typeof Buffer !== "undefined";
+function toBytes(value) {
+  if (typeof value === "string") return encoder.encode(value);
+  return encoder.encode(JSON.stringify(value));
+}
+function fromBytes(bytes, deserialize = false) {
+  if (deserialize) return JSON.parse(decoder.decode(bytes));
+  return decoder.decode(bytes);
+}
+function toBase64(bytes) {
+  if (hasBuffer) return Buffer.from(bytes).toString("base64");
+  return btoa(String.fromCharCode(...bytes));
+}
+function fromBase64(base64) {
+  if (hasBuffer) return new Uint8Array(Buffer.from(base64, "base64"));
+  const bin = atob(base64);
+  const out = new Uint8Array(bin.length);
+  for (let i = 0; i < bin.length; i++) {
+    out[i] = bin.charCodeAt(i);
+  }
+  return out;
+}
+
+// src/internal/envelope.ts
+var ENVELOPE_FIELDS = [
+  "version",
+  "algorithm",
+  "key_id",
+  "nonce",
+  "ciphertext"
+];
+function defaultAad(ctx) {
+  if (ctx.kind === "base") return toBytes(`${ctx.table}:${ctx.id}`);
+  const base = ctx.baseTable ?? ctx.table;
+  return toBytes(`${ctx.table}:${base}:${ctx.id}`);
+}
+var toEnvelope = (value) => {
+  const version = value.version;
+  const algorithm = value.algorithm;
+  const keyId = value.key_id;
+  const nonce = value.nonce;
+  const ciphertext = value.ciphertext;
+  if (typeof version !== "number" || typeof algorithm !== "string" || typeof keyId !== "string" || typeof nonce !== "string" || typeof ciphertext !== "string") {
+    return null;
+  }
+  return {
+    v: version,
+    alg: algorithm,
+    kid: keyId,
+    n: nonce,
+    ct: ciphertext
+  };
+};
+var toStoredEnvelope = (envelope) => ({
+  version: envelope.v,
+  algorithm: envelope.alg,
+  key_id: envelope.kid,
+  nonce: envelope.n,
+  ciphertext: envelope.ct
+});
+var stripEnvelopeFields = (value) => {
+  const copy = { ...value };
+  for (const key of ENVELOPE_FIELDS) delete copy[key];
+  return copy;
+};
+
+// src/internal/records.ts
+var firstRow = (result) => {
+  if (!result) return void 0;
+  if (Array.isArray(result)) return result[0];
+  return result;
+};
+var toRecordArray = (rows) => {
+  if (!rows) return [];
+  return Array.isArray(rows) ? rows : [rows];
+};
+var omitUndefined = (obj) => Object.fromEntries(
+  Object.entries(obj).filter(([, value]) => value !== void 0)
+);
+var isPlainObject2 = (value) => typeof value === "object" && value !== null && Object.getPrototypeOf(value) === Object.prototype;
+async function queryRows(db, sql, bindings) {
+  const result = await db.query(sql, bindings ?? {});
+  if (Array.isArray(result)) {
+    const first = result[0];
+    if (Array.isArray(first)) return first;
+  }
+  return [];
+}
+var TEMP_ID_PREFIX = "__temp__";
+var createTempRecordId = (tableName) => {
+  const suffix = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+  return new RecordId(tableName, `${TEMP_ID_PREFIX}${suffix}`);
 };
+var isTempId = (id, tableName) => {
+  const normalized = toRecordIdString(id);
+  const key = normalized.startsWith(`${tableName}:`) ? normalized.slice(tableName.length + 1) : normalized;
+  return key.startsWith(TEMP_ID_PREFIX);
+};
+function createInsertSchema(tableName) {
+  return {
+    "~standard": {
+      version: 1,
+      vendor: "tanstack-db-surrealdb",
+      validate: (value) => {
+        if (!value || typeof value !== "object" || Array.isArray(value)) {
+          return {
+            issues: [{ message: "Insert data must be an object." }]
+          };
+        }
+        const data = normalizeRecordIdLikeFields({
+          ...value
+        });
+        if (!data.id)
+          data.id = createTempRecordId(tableName);
+        return { value: data };
+      },
+      types: void 0
+    }
+  };
+}
+var subsetCacheKey = (subset) => {
+  const seen = /* @__PURE__ */ new WeakSet();
+  return JSON.stringify(subset, (_key, value) => {
+    if (value instanceof Date) return value.toISOString();
+    if (value instanceof RecordId) return toRecordIdString(value);
+    if (typeof value === "bigint") return value.toString();
+    if (typeof value === "function")
+      return `[fn:${value.name || "anonymous"}]`;
+    if (value && typeof value === "object") {
+      const canonical = asCanonicalRecordIdString(value);
+      if (canonical) return canonical;
+      if (seen.has(value)) return "[Circular]";
+      seen.add(value);
+    }
+    return value;
+  }) ?? "";
+};
+var normalizeSubsetValuesInPlace = (value, seen = /* @__PURE__ */ new WeakSet(), preferredByCanonical = /* @__PURE__ */ new Map()) => {
+  if (Array.isArray(value)) {
+    for (const entry of value) {
+      normalizeSubsetValuesInPlace(entry, seen, preferredByCanonical);
+    }
+    return preferredByCanonical;
+  }
+  if (!value || typeof value !== "object") return preferredByCanonical;
+  if (seen.has(value)) return preferredByCanonical;
+  seen.add(value);
+  const obj = value;
+  if (obj.type === "val" && "value" in obj) {
+    const canonical = asCanonicalRecordIdString(obj.value);
+    if (canonical) {
+      const preferred = preferRecordIdLikeIdentity(obj.value);
+      obj.value = preferred;
+      preferredByCanonical.set(canonical, preferred);
+    } else {
+      obj.value = preferRecordIdLikeIdentityDeep(obj.value);
+    }
+  }
+  for (const child of Object.values(obj)) {
+    normalizeSubsetValuesInPlace(child, seen, preferredByCanonical);
+  }
+  return preferredByCanonical;
+};
+var primeRecordIdIdentityFromSubset = (subset) => {
+  if (!subset) return /* @__PURE__ */ new Map();
+  return normalizeSubsetValuesInPlace(subset);
+};
+var rebindRecordIdIdentityDeep = (value, preferredByCanonical) => {
+  const canonical = asCanonicalRecordIdString(value);
+  if (canonical && preferredByCanonical.has(canonical)) {
+    const preferred = preferredByCanonical.get(canonical);
+    return {
+      value: preferred,
+      changed: value !== preferred
+    };
+  }
+  if (Array.isArray(value)) {
+    let changed2 = false;
+    const out2 = value.map((entry) => {
+      const rebound = rebindRecordIdIdentityDeep(
+        entry,
+        preferredByCanonical
+      );
+      changed2 = changed2 || rebound.changed;
+      return rebound.value;
+    });
+    return changed2 ? { value: out2, changed: true } : { value, changed: false };
+  }
+  if (!isPlainObject2(value)) return { value, changed: false };
+  let changed = false;
+  const out = {};
+  for (const [key, entry] of Object.entries(value)) {
+    const rebound = rebindRecordIdIdentityDeep(entry, preferredByCanonical);
+    if (rebound.changed) changed = true;
+    out[key] = rebound.value;
+  }
+  return changed ? { value: out, changed: true } : { value, changed: false };
+};
+var applyPreferredRecordIdIdentityToCollection = (ctx, preferredByCanonical) => {
+  if (!preferredByCanonical.size) return;
+  const collection = ctx.collection;
+  if (!collection || typeof collection.entries !== "function") return;
+  const rebound = [];
+  for (const [, row] of collection.entries()) {
+    const updated = rebindRecordIdIdentityDeep(row, preferredByCanonical);
+    if (!updated.changed) continue;
+    rebound.push(updated.value);
+  }
+  if (!rebound.length) return;
+  ctx.begin();
+  try {
+    for (const row of rebound) {
+      ctx.write({
+        type: "delete",
+        value: { id: row.id }
+      });
+      ctx.write({ type: "insert", value: row });
+    }
+  } finally {
+    ctx.commit();
+  }
+  const collectionWithInternals = collection;
+  const entries = collectionWithInternals._state?.entries?.();
+  const indexes = collectionWithInternals._indexes?.indexes;
+  if (entries && indexes) {
+    for (const index of indexes.values()) {
+      index.build?.(entries);
+    }
+  }
+};
+
+// src/internal/subset-tracker.ts
+var ActiveSubsetTracker = class {
+  subsetIds = /* @__PURE__ */ new Map();
+  activeIds = /* @__PURE__ */ new Set();
+  get size() {
+    return this.subsetIds.size;
+  }
+  has(id) {
+    return this.activeIds.has(id);
+  }
+  set(key, ids) {
+    this.subsetIds.set(key, ids);
+    this.rebuildActiveIds();
+  }
+  delete(key) {
+    this.subsetIds.delete(key);
+    this.rebuildActiveIds();
+  }
+  deleteId(id) {
+    for (const ids of this.subsetIds.values()) ids.delete(id);
+    this.rebuildActiveIds();
+  }
+  clear() {
+    this.subsetIds.clear();
+    this.rebuildActiveIds();
+  }
+  rebuildActiveIds() {
+    this.activeIds.clear();
+    for (const ids of this.subsetIds.values()) {
+      for (const id of ids) this.activeIds.add(id);
+    }
+  }
+};
+var isTableObject = (value) => typeof value === "object" && value !== null && "name" in value && typeof value.name === "string";
+var toTableOptions = (table) => {
+  if (typeof table === "string") return { name: table };
+  if (table instanceof Table) return { name: table.name };
+  if (isTableObject(table)) return table;
+  throw new Error("Expected table as string, Table, or { name }.");
+};
+var toTableResource = (table) => {
+  const normalized = toTableOptions(table);
+  return new Table(normalized.name);
+};
+var tableNameOf = (table) => toTableOptions(table).name;
+var IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
 var toFieldPath = (value) => {
   if (!Array.isArray(value)) {
     throw new Error("Expected a field path array in where expression.");
@@ -503,43 +806,17 @@ function manageTable(db, config) {
       if (killed) return;
       killed = true;
       if (live) void live.kill();
-    };
-  };
-  return {
-    listAll,
-    loadSubset,
-    create,
-    update,
-    remove,
-    softDelete: remove,
-    subscribe
-  };
-}
-
-// src/util.ts
-var encoder = new TextEncoder();
-var decoder = new TextDecoder();
-var hasBuffer = typeof Buffer !== "undefined";
-function toBytes(value) {
-  if (typeof value === "string") return encoder.encode(value);
-  return encoder.encode(JSON.stringify(value));
-}
-function fromBytes(bytes, deserialize = false) {
-  if (deserialize) return JSON.parse(decoder.decode(bytes));
-  return decoder.decode(bytes);
-}
-function toBase64(bytes) {
-  if (hasBuffer) return Buffer.from(bytes).toString("base64");
-  return btoa(String.fromCharCode(...bytes));
-}
-function fromBase64(base64) {
-  if (hasBuffer) return new Uint8Array(Buffer.from(base64, "base64"));
-  const bin = atob(base64);
-  const out = new Uint8Array(bin.length);
-  for (let i = 0; i < bin.length; i++) {
-    out[i] = bin.charCodeAt(i);
-  }
-  return out;
+    };
+  };
+  return {
+    listAll,
+    loadSubset,
+    create,
+    update,
+    remove,
+    softDelete: remove,
+    subscribe
+  };
 }
 
 // src/encryption/index.ts
@@ -562,7 +839,9 @@ var WebCryptoAESGCM = class _WebCryptoAESGCM {
     this.kid = options.kid ?? DEFAULT_KID;
     this.resolveKey = options.resolveKey ?? ((incomingKid) => {
       if (incomingKid !== this.kid) {
-        throw new Error(`No key configured for kid '${incomingKid}'.`);
+        throw new Error(
+          `No key configured for kid '${incomingKid}'.`
+        );
       }
       return key;
     });
@@ -628,251 +907,10 @@ var WebCryptoAESGCM = class _WebCryptoAESGCM {
 };
 
 // src/index.ts
-var TEMP_ID_PREFIX = "__temp__";
-var ENVELOPE_FIELDS = [
-  "version",
-  "algorithm",
-  "key_id",
-  "nonce",
-  "ciphertext"
-];
 var NOOP = () => {
 };
-var patchedCollections = /* @__PURE__ */ new WeakSet();
-var normalizeDeleteKeyAgainstState = (state, key) => {
-  if (state.has(key)) return key;
-  const canonical = asCanonicalRecordIdString(key);
-  if (!canonical) return key;
-  return state.has(canonical) ? canonical : key;
-};
-var patchCollectionDeleteForRecordIds = (collection) => {
-  if (!collection || typeof collection !== "object") return;
-  if (patchedCollections.has(collection)) return;
-  const candidate = collection;
-  if (typeof candidate.delete !== "function") return;
-  const originalDelete = candidate.delete.bind(collection);
-  Object.defineProperty(collection, "delete", {
-    configurable: true,
-    writable: true,
-    value: (keys, config) => {
-      const state = collection.state ?? /* @__PURE__ */ new Map();
-      const normalizedKeys = Array.isArray(keys) ? keys.map((key) => normalizeDeleteKeyAgainstState(state, key)) : normalizeDeleteKeyAgainstState(state, keys);
-      return originalDelete(normalizedKeys, config);
-    }
-  });
-  patchedCollections.add(collection);
-};
-var isTableObject = (value) => typeof value === "object" && value !== null && "name" in value && typeof value.name === "string";
-var toTableOptions = (table) => {
-  if (typeof table === "string") return { name: table };
-  if (table instanceof Table) return { name: table.name };
-  if (isTableObject(table)) return table;
-  throw new Error("Expected table as string, Table, or { name }.");
-};
-var toTableResource = (table) => {
-  const normalized = toTableOptions(table);
-  return new Table(normalized.name);
-};
-var tableNameOf = (table) => toTableOptions(table).name;
 var getWriteUtils = (utils) => typeof utils === "object" && utils !== null ? utils : {};
-var firstRow2 = (result) => {
-  if (!result) return void 0;
-  if (Array.isArray(result)) return result[0];
-  return result;
-};
-var omitUndefined = (obj) => Object.fromEntries(
-  Object.entries(obj).filter(([, value]) => value !== void 0)
-);
-var createTempRecordId = (tableName) => {
-  const suffix = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
-  return new RecordId(tableName, `${TEMP_ID_PREFIX}${suffix}`);
-};
-var isTempId = (id, tableName) => {
-  const normalized = toRecordIdString(id);
-  const key = normalized.startsWith(`${tableName}:`) ? normalized.slice(tableName.length + 1) : normalized;
-  return key.startsWith(TEMP_ID_PREFIX);
-};
-var toEnvelope = (value) => {
-  const version = value.version;
-  const algorithm = value.algorithm;
-  const keyId = value.key_id;
-  const nonce = value.nonce;
-  const ciphertext = value.ciphertext;
-  if (typeof version !== "number" || typeof algorithm !== "string" || typeof keyId !== "string" || typeof nonce !== "string" || typeof ciphertext !== "string") {
-    return null;
-  }
-  return {
-    v: version,
-    alg: algorithm,
-    kid: keyId,
-    n: nonce,
-    ct: ciphertext
-  };
-};
-var toStoredEnvelope = (envelope) => ({
-  version: envelope.v,
-  algorithm: envelope.alg,
-  key_id: envelope.kid,
-  nonce: envelope.n,
-  ciphertext: envelope.ct
-});
-var stripEnvelopeFields = (value) => {
-  const copy = { ...value };
-  for (const key of ENVELOPE_FIELDS) delete copy[key];
-  return copy;
-};
-var toRecordArray = (rows) => {
-  if (!rows) return [];
-  return Array.isArray(rows) ? rows : [rows];
-};
-async function queryRows(db, sql, bindings) {
-  const result = await db.query(sql, bindings ?? {});
-  if (Array.isArray(result)) {
-    const first = result[0];
-    if (Array.isArray(first)) return first;
-    return [];
-  }
-  return [];
-}
-function createInsertSchema(tableName) {
-  return {
-    "~standard": {
-      version: 1,
-      vendor: "tanstack-db-surrealdb",
-      validate: (value) => {
-        if (!value || typeof value !== "object" || Array.isArray(value)) {
-          return {
-            issues: [{ message: "Insert data must be an object." }]
-          };
-        }
-        const data = normalizeRecordIdLikeFields({
-          ...value
-        });
-        if (!data.id)
-          data.id = createTempRecordId(tableName);
-        return { value: data };
-      },
-      types: void 0
-    }
-  };
-}
-function defaultAad(ctx) {
-  if (ctx.kind === "base") return toBytes(`${ctx.table}:${ctx.id}`);
-  const base = ctx.baseTable ?? ctx.table;
-  return toBytes(`${ctx.table}:${base}:${ctx.id}`);
-}
 var syncModeFrom = (syncMode) => syncMode ?? "eager";
-var subsetCacheKey = (subset) => {
-  const seen = /* @__PURE__ */ new WeakSet();
-  return JSON.stringify(subset, (_key, value) => {
-    if (value instanceof Date) return value.toISOString();
-    if (value instanceof RecordId) return toRecordIdString(value);
-    if (typeof value === "bigint") return value.toString();
-    if (typeof value === "function")
-      return `[fn:${value.name || "anonymous"}]`;
-    if (value && typeof value === "object") {
-      const canonical = asCanonicalRecordIdString(value);
-      if (canonical) return canonical;
-      if (seen.has(value)) return "[Circular]";
-      seen.add(value);
-    }
-    return value;
-  }) ?? "";
-};
-var isPlainObject2 = (value) => typeof value === "object" && value !== null && Object.getPrototypeOf(value) === Object.prototype;
-var normalizeSubsetValuesInPlace = (value, seen = /* @__PURE__ */ new WeakSet(), preferredByCanonical = /* @__PURE__ */ new Map()) => {
-  if (Array.isArray(value)) {
-    for (const entry of value) {
-      normalizeSubsetValuesInPlace(entry, seen, preferredByCanonical);
-    }
-    return preferredByCanonical;
-  }
-  if (!value || typeof value !== "object") return preferredByCanonical;
-  if (seen.has(value)) return preferredByCanonical;
-  seen.add(value);
-  const obj = value;
-  if (obj.type === "val" && "value" in obj) {
-    const canonical = asCanonicalRecordIdString(obj.value);
-    if (canonical) {
-      const preferred = preferRecordIdLikeIdentity(obj.value);
-      obj.value = preferred;
-      preferredByCanonical.set(canonical, preferred);
-    } else {
-      obj.value = preferRecordIdLikeIdentityDeep(obj.value);
-    }
-  }
-  for (const child of Object.values(obj)) {
-    normalizeSubsetValuesInPlace(child, seen, preferredByCanonical);
-  }
-  return preferredByCanonical;
-};
-var primeRecordIdIdentityFromSubset = (subset) => {
-  if (!subset) return /* @__PURE__ */ new Map();
-  return normalizeSubsetValuesInPlace(subset);
-};
-var rebindRecordIdIdentityDeep = (value, preferredByCanonical) => {
-  const canonical = asCanonicalRecordIdString(value);
-  if (canonical && preferredByCanonical.has(canonical)) {
-    const preferred = preferredByCanonical.get(canonical);
-    return {
-      value: preferred,
-      changed: value !== preferred
-    };
-  }
-  if (Array.isArray(value)) {
-    let changed2 = false;
-    const out2 = value.map((entry) => {
-      const rebound = rebindRecordIdIdentityDeep(
-        entry,
-        preferredByCanonical
-      );
-      changed2 = changed2 || rebound.changed;
-      return rebound.value;
-    });
-    return changed2 ? { value: out2, changed: true } : { value, changed: false };
-  }
-  if (!isPlainObject2(value)) return { value, changed: false };
-  let changed = false;
-  const out = {};
-  for (const [key, entry] of Object.entries(value)) {
-    const rebound = rebindRecordIdIdentityDeep(entry, preferredByCanonical);
-    if (rebound.changed) changed = true;
-    out[key] = rebound.value;
-  }
-  return changed ? { value: out, changed: true } : { value, changed: false };
-};
-var applyPreferredRecordIdIdentityToCollection = (ctx, preferredByCanonical) => {
-  if (!preferredByCanonical.size) return;
-  const collection = ctx.collection;
-  if (!collection || typeof collection.entries !== "function") return;
-  const rebound = [];
-  for (const [, row] of collection.entries()) {
-    const updated = rebindRecordIdIdentityDeep(row, preferredByCanonical);
-    if (!updated.changed) continue;
-    rebound.push(updated.value);
-  }
-  if (!rebound.length) return;
-  ctx.begin();
-  try {
-    for (const row of rebound) {
-      ctx.write({
-        type: "delete",
-        value: { id: row.id }
-      });
-      ctx.write({ type: "insert", value: row });
-    }
-  } finally {
-    ctx.commit();
-  }
-  const collectionWithInternals = collection;
-  const entries = collectionWithInternals._state?.entries?.();
-  const indexes = collectionWithInternals._indexes?.indexes;
-  if (entries && indexes) {
-    for (const index of indexes.values()) {
-      index.build?.(entries);
-    }
-  }
-};
 function modernSurrealCollectionOptions(config) {
   const {
     db,
@@ -894,9 +932,9 @@ function modernSurrealCollectionOptions(config) {
   const queryDrivenUsesSubsets = queryDrivenSyncMode === "on-demand";
   const tableOptions = toTableOptions(table);
   const tableName = tableOptions.name;
+  const collectionId = config.id ?? deriveCollectionId(tableName, queryKey);
   const tableResource = toTableResource(table);
-  const subsetIds = /* @__PURE__ */ new Map();
-  const activeOnDemandIds = /* @__PURE__ */ new Set();
+  const activeSubsets = new ActiveSubsetTracker();
   const e2eeEnabled = e2ee?.enabled === true;
   const crdtEnabled = crdt?.enabled === true;
   const defaultCrdtProfile = crdtEnabled ? createLoroProfile(crdt.profile) : void 0;
@@ -949,7 +987,6 @@ function modernSurrealCollectionOptions(config) {
   const updatesTableName = crdtEnabled ? tableNameOf(crdt.updatesTable) : void 0;
   const updatesTable = crdtEnabled ? toTableResource(crdt.updatesTable) : void 0;
   const snapshotsTableName = crdtEnabled && crdt.snapshotsTable ? tableNameOf(crdt.snapshotsTable) : void 0;
-  crdtEnabled && crdt.snapshotsTable ? toTableResource(crdt.snapshotsTable) : void 0;
   const getDoc = (id) => {
     const existing = docs.get(id);
     if (existing) return existing;
@@ -1090,12 +1127,6 @@ function modernSurrealCollectionOptions(config) {
       commit();
     }
   };
-  const updateActiveOnDemandIds = () => {
-    activeOnDemandIds.clear();
-    for (const ids of subsetIds.values()) {
-      for (const id of ids) activeOnDemandIds.add(id);
-    }
-  };
   const createSyncRuntime = (ctx) => {
     let cleanupBaseLive = NOOP;
     let cleanupUpdateLive = NOOP;
@@ -1114,12 +1145,11 @@ function modernSurrealCollectionOptions(config) {
         if (message.action === "KILLED") return;
         const row = message.value;
         const id = toRecordKeyString(row.id);
-        const wasVisible = activeOnDemandIds.has(id);
+        const wasVisible = activeSubsets.has(id);
         if (isStrictOnDemand && !wasVisible && message.action !== "DELETE")
           return;
         if (message.action === "DELETE") {
-          for (const ids of subsetIds.values()) ids.delete(id);
-          updateActiveOnDemandIds();
+          activeSubsets.deleteId(id);
           if (isStrictOnDemand && !wasVisible) return;
           ctx.begin();
           try {
@@ -1165,7 +1195,7 @@ function modernSurrealCollectionOptions(config) {
         const value = message.value;
         const id = idFromDocRef(value.doc);
         if (value.actor && value.actor === resolveActor(id)) return;
-        if (isStrictOnDemand && !activeOnDemandIds.has(id)) return;
+        if (isStrictOnDemand && !activeSubsets.has(id)) return;
         const doc = getDoc(id);
         const bytes = await decodeUpdateBytes(value, "update");
         if (!bytes.byteLength) return;
@@ -1196,8 +1226,7 @@ function modernSurrealCollectionOptions(config) {
           (row) => toRecordKeyString(row.id)
         )
       );
-      subsetIds.set(key, ids);
-      updateActiveOnDemandIds();
+      activeSubsets.set(key, ids);
       if (!crdtEnabled) {
         await hydratePlainRows(
           rows,
@@ -1223,9 +1252,8 @@ function modernSurrealCollectionOptions(config) {
     const unloadSubset = (subset) => {
       primeRecordIdIdentityFromSubset(subset);
       const key = subsetCacheKey(subset);
-      subsetIds.delete(key);
-      updateActiveOnDemandIds();
-      if (subsetIds.size === 0) {
+      activeSubsets.delete(key);
+      if (activeSubsets.size === 0) {
         cleanupBaseLive();
         cleanupUpdateLive();
       }
@@ -1239,8 +1267,7 @@ function modernSurrealCollectionOptions(config) {
     };
     const cleanup = () => {
       killed = true;
-      subsetIds.clear();
-      updateActiveOnDemandIds();
+      activeSubsets.clear();
       cleanupBaseLive();
       cleanupUpdateLive();
     };
@@ -1252,6 +1279,7 @@ function modernSurrealCollectionOptions(config) {
     };
   };
   const base = queryCollectionOptions({
+    id: collectionId,
     schema: createInsertSchema(tableName),
     getKey,
     queryKey,
@@ -1312,7 +1340,7 @@ function modernSurrealCollectionOptions(config) {
           const recordPayload = await encodeBaseRow(payload, idKey);
           if (isTempId(normalized.id, tableName)) {
             const created = await db.create(tableResource).content(recordPayload);
-            const createdRow = firstRow2(
+            const createdRow = firstRow(
               toRecordArray(created)
             );
             const createdId = createdRow && createdRow.id ? createdRow.id : normalized.id;
@@ -1524,7 +1552,15 @@ function modernSurrealCollectionOptions(config) {
 function surrealCollectionOptions(config) {
   return modernSurrealCollectionOptions(config);
 }
+function persistedSurrealCollectionOptions(config) {
+  const { persistence, schemaVersion, ...surrealConfig } = config;
+  return persistedCollectionOptions({
+    persistence,
+    schemaVersion,
+    ...modernSurrealCollectionOptions(surrealConfig)
+  });
+}
 
-export { WebCryptoAESGCM, applyLoroJsonChange, applyLoroRichtextChange, createLoroProfile, materializeLoroJson, materializeLoroRichtext, surrealCollectionOptions, toRecordKeyString };
+export { WebCryptoAESGCM, applyLoroJsonChange, applyLoroRichtextChange, createLoroProfile, materializeLoroJson, materializeLoroRichtext, persistedSurrealCollectionOptions, surrealCollectionOptions, toRecordKeyString };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map