@foretag/tanstack-db-surrealdb 0.6.2 → 0.6.4

package/dist/index.js

@@ -124,20 +124,14 @@ var isRecordIdString = (value) => {
   return idx > 0 && idx < value.length - 1;
 };
 var looksLikeTableName = (value) => /^[A-Za-z_][A-Za-z0-9_-]*$/.test(value);
-var getCtorName = (value) => {
-  if (!value || typeof value !== "object") return void 0;
-  const ctor = value.constructor;
-  return typeof ctor?.name === "string" ? ctor.name : void 0;
-};
 var isCrossRuntimeRecordIdObject = (value) => {
   if (!value || typeof value !== "object" || value instanceof surrealdb.RecordId) {
     return false;
   }
   const obj = value;
   if (typeof obj.toString !== "function") return false;
+  if (obj.toString === Object.prototype.toString) return false;
   if (!("table" in obj) || !("id" in obj)) return false;
-  const ctorName = getCtorName(value);
-  if (!ctorName || !/^RecordId\d*$/.test(ctorName)) return false;
   const tableValue = obj.table;
   const table = typeof tableValue === "string" ? tableValue : tableValue != null ? String(tableValue) : "";
   const idValue = obj.id;
@@ -163,11 +157,11 @@ var unwrapIdWrapper = (value) => {
 var asCanonicalRecordIdFromCrossRuntimeObject = (value) => {
   if (!isCrossRuntimeRecordIdObject(value)) return void 0;
   const obj = value;
-  const tableRaw = typeof obj.table === "string" ? obj.table : String(obj.table);
-  const table = stripOuterQuotes(tableRaw).trim();
-  const id = String(obj.id);
-  const fromFields = table && id && looksLikeTableName(table) ? `${table}:${id}` : void 0;
-  if (fromFields) return toCanonicalRecordIdString(fromFields);
+  const table = typeof obj.table === "string" ? stripOuterQuotes(obj.table).trim() : void 0;
+  const id = typeof obj.id === "string" || typeof obj.id === "number" || typeof obj.id === "bigint" ? String(obj.id) : void 0;
+  if (table && id && looksLikeTableName(table)) {
+    return toCanonicalRecordIdString(`${table}:${id}`);
+  }
   return toCanonicalRecordIdString(String(obj.toString()));
 };
 var asCanonicalRecordIdString = (value) => {
@@ -187,12 +181,55 @@ var toNativeRecordIdLikeValue = (value) => {
   if (value instanceof surrealdb.RecordId) {
     const canonical2 = asCanonicalRecordIdString(value);
     if (!canonical2) return value;
-    return getNativeRecordId(canonical2);
+    recordIdIdentityPool.set(canonical2, value);
+    nativeRecordIdPool.set(canonical2, value);
+    return value;
   }
   const canonical = asCanonicalRecordIdString(value);
   if (!canonical) return value;
+  if (isCrossRuntimeRecordIdObject(value)) {
+    recordIdIdentityPool.set(canonical, value);
+  }
   return getNativeRecordId(canonical);
 };
+var preferRecordIdLikeIdentity = (value) => {
+  const canonical = asCanonicalRecordIdString(value);
+  if (!canonical) return normalizeRecordIdLikeValue(value);
+  if (value instanceof surrealdb.RecordId) {
+    recordIdIdentityPool.set(canonical, value);
+    return value;
+  }
+  if (isCrossRuntimeRecordIdObject(value)) {
+    recordIdIdentityPool.set(canonical, value);
+    return value;
+  }
+  const wrappedId = unwrapIdWrapper(value);
+  if (wrappedId instanceof surrealdb.RecordId) {
+    recordIdIdentityPool.set(canonical, wrappedId);
+    return wrappedId;
+  }
+  if (isCrossRuntimeRecordIdObject(wrappedId)) {
+    recordIdIdentityPool.set(canonical, wrappedId);
+    return wrappedId;
+  }
+  return internRecordIdIdentity(canonical);
+};
+var preferRecordIdLikeIdentityDeep = (value) => {
+  const preferred = preferRecordIdLikeIdentity(value);
+  if (Array.isArray(preferred)) {
+    return preferred.map(
+      (item) => preferRecordIdLikeIdentityDeep(item)
+    );
+  }
+  if (isPlainObject(preferred)) {
+    const out = {};
+    for (const [k, v] of Object.entries(preferred)) {
+      out[k] = preferRecordIdLikeIdentityDeep(v);
+    }
+    return out;
+  }
+  return preferred;
+};
 var normalizeRecordIdLikeValue = (value) => {
   if (value instanceof surrealdb.RecordId) {
     const canonical2 = asCanonicalRecordIdString(value);
@@ -703,19 +740,43 @@ function defaultAad(ctx) {
   return toBytes(`${ctx.table}:${base}:${ctx.id}`);
 }
 var syncModeFrom = (syncMode) => syncMode ?? "eager";
-var subsetCacheKey = (subset) => JSON.stringify(subset, (_key, value) => {
-  if (value instanceof Date) return value.toISOString();
-  if (value instanceof surrealdb.RecordId) return toRecordIdString(value);
-  if (typeof value === "function") return void 0;
-  if (value && typeof value === "object" && "table" in value && "id" in value) {
-    try {
-      return toRecordIdString(String(value));
-    } catch {
-      return value;
+var subsetCacheKey = (subset) => {
+  const seen = /* @__PURE__ */ new WeakSet();
+  return JSON.stringify(subset, (_key, value) => {
+    if (value instanceof Date) return value.toISOString();
+    if (value instanceof surrealdb.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()) => {
+  if (Array.isArray(value)) {
+    for (const entry of value) normalizeSubsetValuesInPlace(entry, seen);
+    return;
   }
-  return value;
-});
+  if (!value || typeof value !== "object") return;
+  if (seen.has(value)) return;
+  seen.add(value);
+  const obj = value;
+  if (obj.type === "val" && "value" in obj) {
+    obj.value = preferRecordIdLikeIdentityDeep(obj.value);
+  }
+  for (const child of Object.values(obj)) {
+    normalizeSubsetValuesInPlace(child, seen);
+  }
+};
+var primeRecordIdIdentityFromSubset = (subset) => {
+  if (!subset) return;
+  normalizeSubsetValuesInPlace(subset);
+  preferRecordIdLikeIdentityDeep(subset);
+};
 function modernSurrealCollectionOptions(config) {
   const {
     db,
@@ -733,7 +794,8 @@ function modernSurrealCollectionOptions(config) {
   const syncMode = syncModeFrom(inputSyncMode);
   const isOnDemandLike = syncMode === "on-demand" || syncMode === "progressive";
   const isStrictOnDemand = syncMode === "on-demand";
-  const queryDrivenSyncMode = isOnDemandLike ? "on-demand" : "eager";
+  const queryDrivenSyncMode = "on-demand";
+  const queryDrivenUsesSubsets = queryDrivenSyncMode === "on-demand";
   const tableOptions = toTableOptions(table);
   const tableName = tableOptions.name;
   const tableResource = toTableResource(table);
@@ -1026,7 +1088,7 @@ function modernSurrealCollectionOptions(config) {
       };
     };
     const loadSubset = async (subset) => {
-      if (!isOnDemandLike) return;
+      primeRecordIdIdentityFromSubset(subset);
       const key = subsetCacheKey(subset);
       const rows = await tableAccess.loadSubset(subset);
       const ids = new Set(
@@ -1059,7 +1121,7 @@ function modernSurrealCollectionOptions(config) {
       await ensureUpdateLive();
     };
     const unloadSubset = (subset) => {
-      if (!isOnDemandLike) return;
+      primeRecordIdIdentityFromSubset(subset);
       const key = subsetCacheKey(subset);
       subsetIds.delete(key);
       updateActiveOnDemandIds();
@@ -1097,21 +1159,12 @@ function modernSurrealCollectionOptions(config) {
     syncMode: queryDrivenSyncMode,
     queryFn: async ({ meta }) => {
       try {
-        if (isOnDemandLike && !meta?.loadSubsetOptions) {
+        primeRecordIdIdentityFromSubset(meta?.loadSubsetOptions);
+        if (queryDrivenUsesSubsets && !meta?.loadSubsetOptions) {
           return [];
         }
         if (!crdtEnabled) {
-          if (!isOnDemandLike) {
-            const rows2 = await toRecordArray(
-              await db.select(tableResource)
-            );
-            const decoded2 = await Promise.all(
-              rows2.map(
-                (row) => decodeBaseRow(row)
-              )
-            );
-            return decoded2;
-          }
+          if (!queryDrivenUsesSubsets) ;
           const rows = await tableAccess.loadSubset(
             meta?.loadSubsetOptions
           );
@@ -1122,7 +1175,7 @@ function modernSurrealCollectionOptions(config) {
           );
           return decoded;
         }
-        if (isOnDemandLike) return [];
+        if (queryDrivenUsesSubsets) return [];
         if (!updatesTableName) return [];
         const updates = await queryRows(
           db,