@foretag/tanstack-db-surrealdb 0.6.4 → 0.6.6

package/dist/index.js

@@ -756,26 +756,99 @@ var subsetCacheKey = (subset) => {
     return value;
   }) ?? "";
 };
-var normalizeSubsetValuesInPlace = (value, seen = /* @__PURE__ */ new WeakSet()) => {
+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);
-    return;
+    for (const entry of value) {
+      normalizeSubsetValuesInPlace(entry, seen, preferredByCanonical);
+    }
+    return preferredByCanonical;
   }
-  if (!value || typeof value !== "object") return;
-  if (seen.has(value)) return;
+  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) {
-    obj.value = preferRecordIdLikeIdentityDeep(obj.value);
+    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);
+    normalizeSubsetValuesInPlace(child, seen, preferredByCanonical);
   }
+  return preferredByCanonical;
 };
 var primeRecordIdIdentityFromSubset = (subset) => {
-  if (!subset) return;
-  normalizeSubsetValuesInPlace(subset);
-  preferRecordIdLikeIdentityDeep(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 {
@@ -1088,7 +1161,8 @@ function modernSurrealCollectionOptions(config) {
       };
     };
     const loadSubset = async (subset) => {
-      primeRecordIdIdentityFromSubset(subset);
+      const preferredFromSubset = primeRecordIdIdentityFromSubset(subset);
+      applyPreferredRecordIdIdentityToCollection(ctx, preferredFromSubset);
       const key = subsetCacheKey(subset);
       const rows = await tableAccess.loadSubset(subset);
       const ids = new Set(