@foretag/tanstack-db-surrealdb 0.6.3 → 0.6.4

package/dist/index.js

@@ -192,6 +192,44 @@ var toNativeRecordIdLikeValue = (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);
@@ -718,6 +756,27 @@ var subsetCacheKey = (subset) => {
     return value;
   }) ?? "";
 };
+var normalizeSubsetValuesInPlace = (value, seen = /* @__PURE__ */ new WeakSet()) => {
+  if (Array.isArray(value)) {
+    for (const entry of value) normalizeSubsetValuesInPlace(entry, seen);
+    return;
+  }
+  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,
@@ -735,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);
@@ -1028,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(
@@ -1061,7 +1121,7 @@ function modernSurrealCollectionOptions(config) {
       await ensureUpdateLive();
     };
     const unloadSubset = (subset) => {
-      if (!isOnDemandLike) return;
+      primeRecordIdIdentityFromSubset(subset);
       const key = subsetCacheKey(subset);
       subsetIds.delete(key);
       updateActiveOnDemandIds();
@@ -1099,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
           );
@@ -1124,7 +1175,7 @@ function modernSurrealCollectionOptions(config) {
           );
           return decoded;
         }
-        if (isOnDemandLike) return [];
+        if (queryDrivenUsesSubsets) return [];
         if (!updatesTableName) return [];
         const updates = await queryRows(
           db,