cry-synced-db-client 2.0.13 → 2.0.15

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Versions
 
+## 2.0.15 (2026-08-18)
+
+### Fix: preserve explicit `save()` intent after direct live-row mutation
+
+`SyncedDb.save()` now computes its dirty delta against both the live in-memory
+row and the pending server state (the Dexie row with an existing dirty entry
+applied). A caller that mutates a live row before calling `save()` can no
+longer silently lose the update, or retain an older dirty value when reverting
+inside the Dexie debounce window.
+
+The combined delta is normalized with `mergeDirtyChanges`, preventing MongoDB
+parent/child `$set` conflicts such as `profile` together with
+`profile.colour`.
+
+**Regression coverage:** `test/saveAfterDirectInMemMutation.test.ts` covers
+live-row drag-style mutation, mixed changes, pending-intent reverts, scalar to
+object shape changes, and the unchanged meta-only dirty guard.
+
 ## 2.0.2 (2026-07-13)
 
 ### Fix: `PendingChangesManager.schedule` — deleted fields resurrected from prior pending save

package/dist/index.js

@@ -885,6 +885,119 @@ function childPathForArrayElement(prefix, element, index) {
   return prefix ? `${prefix}.${index}` : String(index);
 }
 
+// src/utils/computeDiff.ts
+function isDescendantOrEqual(path, candidate) {
+  if (path === candidate) return true;
+  if (!path.startsWith(candidate)) return false;
+  const next = path[candidate.length];
+  return next === "." || next === "[";
+}
+function pathsOverlap(a, b) {
+  return isDescendantOrEqual(a, b) || isDescendantOrEqual(b, a);
+}
+function isTerminalBracketKey(path) {
+  const tokens = tokenizePath(path);
+  const last = tokens[tokens.length - 1];
+  return !!(last && last.length >= 2 && last.charCodeAt(0) === 91 && last.charCodeAt(last.length - 1) === 93);
+}
+function canExpandArrayToBrackets(value) {
+  if (!Array.isArray(value) || value.length === 0) return false;
+  for (const el of value) {
+    if (el === null || typeof el !== "object") return false;
+    if (el._id == null) return false;
+  }
+  return true;
+}
+function unwrapWholeElement(value) {
+  if (Array.isArray(value)) {
+    return value.length === 1 && value[0] && typeof value[0] === "object" ? value[0] : null;
+  }
+  if (value && typeof value === "object") return value;
+  return null;
+}
+function pickLayerTarget(newPath, newValue) {
+  if (!isTerminalBracketKey(newPath)) return null;
+  if (newValue === void 0) return null;
+  if (Array.isArray(newValue) && newValue.length === 1 && newValue[0] && typeof newValue[0] === "object") {
+    return newValue[0];
+  }
+  if (newValue && typeof newValue === "object" && !Array.isArray(newValue)) {
+    return newValue;
+  }
+  return null;
+}
+function mergeDirtyPath(accumulated, newPath, newValue) {
+  for (const existingKey of Object.keys(accumulated)) {
+    if (existingKey === newPath) continue;
+    if (isDescendantOrEqual(newPath, existingKey)) {
+      const existingValue = accumulated[existingKey];
+      const existingIsTerminal = isTerminalBracketKey(existingKey);
+      if (existingIsTerminal && existingValue === void 0) {
+        return;
+      }
+      let mutationTarget = existingValue;
+      if (existingIsTerminal && Array.isArray(existingValue) && existingValue.length === 1) {
+        mutationTarget = existingValue[0];
+      }
+      if (!existingIsTerminal && (existingValue === null || existingValue === void 0)) {
+        accumulated[existingKey] = {};
+        mutationTarget = accumulated[existingKey];
+      }
+      if (!existingIsTerminal && newPath[existingKey.length] === "[" && canExpandArrayToBrackets(existingValue)) {
+        delete accumulated[existingKey];
+        for (const el of existingValue) {
+          accumulated[`${existingKey}[${String(el._id)}]`] = [el];
+        }
+        mergeDirtyPath(accumulated, newPath, newValue);
+        return;
+      }
+      const sepChar = newPath[existingKey.length];
+      const relativePath = sepChar === "[" ? newPath.substring(existingKey.length) : newPath.substring(existingKey.length + 1);
+      const ok = setByPath(mutationTarget, relativePath, newValue);
+      if (ok) return;
+      delete accumulated[existingKey];
+      accumulated[newPath] = newValue;
+      return;
+    }
+  }
+  const descendants = [];
+  for (const existingKey of Object.keys(accumulated)) {
+    if (existingKey === newPath) continue;
+    if (isDescendantOrEqual(existingKey, newPath)) {
+      descendants.push(existingKey);
+    }
+  }
+  const layerInto = pickLayerTarget(newPath, newValue);
+  if (layerInto && descendants.length > 0) {
+    for (const desc of descendants) {
+      const sepChar = desc[newPath.length];
+      const relativePath = sepChar === "[" ? desc.substring(newPath.length) : desc.substring(newPath.length + 1);
+      const descValue = accumulated[desc];
+      if (descValue === void 0) {
+        deleteByPath(layerInto, relativePath);
+      } else {
+        setByPath(layerInto, relativePath, descValue);
+      }
+    }
+  }
+  for (const k of descendants) delete accumulated[k];
+  if (newValue !== void 0 && isTerminalBracketKey(newPath) && Object.prototype.hasOwnProperty.call(accumulated, newPath)) {
+    const existingValue = accumulated[newPath];
+    const existingElement = unwrapWholeElement(existingValue);
+    const newElement = unwrapWholeElement(newValue);
+    if (existingElement && newElement && (Array.isArray(existingValue) || Array.isArray(newValue))) {
+      accumulated[newPath] = [newElement];
+      return;
+    }
+  }
+  accumulated[newPath] = newValue;
+}
+function mergeDirtyChanges(accumulated, newChanges) {
+  for (const path of Object.keys(newChanges)) {
+    mergeDirtyPath(accumulated, path, newChanges[path]);
+  }
+}
+
 // src/utils/networkError.ts
 function networkError(message, ...rest) {
   const isOnline = typeof navigator === "undefined" || navigator.onLine !== false;
@@ -6827,7 +6940,11 @@ var _SyncedDb = class _SyncedDb {
     const fullChanges = __spreadProps(__spreadValues({}, update), { _lastUpdaterId: this.updaterId });
     const currentMem = isWriteOnly ? null : this.inMemDb.getById(collection, id);
     const base = currentMem != null ? currentMem : existing;
-    const diff = computeObjDiff(base, fullChanges);
+    const pendingDirty = await this.dexieDb.getDirtyChange(collection, id);
+    const pendingServerState = pendingDirty ? applyObjDiff(existing != null ? existing : null, pendingDirty.changes, id, collection) : existing != null ? existing : null;
+    const diff = {};
+    mergeDirtyChanges(diff, computeObjDiff(base, fullChanges));
+    mergeDirtyChanges(diff, computeObjDiff(pendingServerState, fullChanges));
     await this.dexieDb.addDirtyChange(collection, id, diff, {
       _ts: existing == null ? void 0 : existing._ts,
       _rev: existing == null ? void 0 : existing._rev
@@ -8429,119 +8546,6 @@ import Dexie from "dexie";
 // src/types/I_DexieDb.ts
 var DIRTY_STUCK_AFTER_UPLOAD_ATTEMPTS = 2;
 
-// src/utils/computeDiff.ts
-function isDescendantOrEqual(path, candidate) {
-  if (path === candidate) return true;
-  if (!path.startsWith(candidate)) return false;
-  const next = path[candidate.length];
-  return next === "." || next === "[";
-}
-function pathsOverlap(a, b) {
-  return isDescendantOrEqual(a, b) || isDescendantOrEqual(b, a);
-}
-function isTerminalBracketKey(path) {
-  const tokens = tokenizePath(path);
-  const last = tokens[tokens.length - 1];
-  return !!(last && last.length >= 2 && last.charCodeAt(0) === 91 && last.charCodeAt(last.length - 1) === 93);
-}
-function canExpandArrayToBrackets(value) {
-  if (!Array.isArray(value) || value.length === 0) return false;
-  for (const el of value) {
-    if (el === null || typeof el !== "object") return false;
-    if (el._id == null) return false;
-  }
-  return true;
-}
-function unwrapWholeElement(value) {
-  if (Array.isArray(value)) {
-    return value.length === 1 && value[0] && typeof value[0] === "object" ? value[0] : null;
-  }
-  if (value && typeof value === "object") return value;
-  return null;
-}
-function pickLayerTarget(newPath, newValue) {
-  if (!isTerminalBracketKey(newPath)) return null;
-  if (newValue === void 0) return null;
-  if (Array.isArray(newValue) && newValue.length === 1 && newValue[0] && typeof newValue[0] === "object") {
-    return newValue[0];
-  }
-  if (newValue && typeof newValue === "object" && !Array.isArray(newValue)) {
-    return newValue;
-  }
-  return null;
-}
-function mergeDirtyPath(accumulated, newPath, newValue) {
-  for (const existingKey of Object.keys(accumulated)) {
-    if (existingKey === newPath) continue;
-    if (isDescendantOrEqual(newPath, existingKey)) {
-      const existingValue = accumulated[existingKey];
-      const existingIsTerminal = isTerminalBracketKey(existingKey);
-      if (existingIsTerminal && existingValue === void 0) {
-        return;
-      }
-      let mutationTarget = existingValue;
-      if (existingIsTerminal && Array.isArray(existingValue) && existingValue.length === 1) {
-        mutationTarget = existingValue[0];
-      }
-      if (!existingIsTerminal && (existingValue === null || existingValue === void 0)) {
-        accumulated[existingKey] = {};
-        mutationTarget = accumulated[existingKey];
-      }
-      if (!existingIsTerminal && newPath[existingKey.length] === "[" && canExpandArrayToBrackets(existingValue)) {
-        delete accumulated[existingKey];
-        for (const el of existingValue) {
-          accumulated[`${existingKey}[${String(el._id)}]`] = [el];
-        }
-        mergeDirtyPath(accumulated, newPath, newValue);
-        return;
-      }
-      const sepChar = newPath[existingKey.length];
-      const relativePath = sepChar === "[" ? newPath.substring(existingKey.length) : newPath.substring(existingKey.length + 1);
-      const ok = setByPath(mutationTarget, relativePath, newValue);
-      if (ok) return;
-      delete accumulated[existingKey];
-      accumulated[newPath] = newValue;
-      return;
-    }
-  }
-  const descendants = [];
-  for (const existingKey of Object.keys(accumulated)) {
-    if (existingKey === newPath) continue;
-    if (isDescendantOrEqual(existingKey, newPath)) {
-      descendants.push(existingKey);
-    }
-  }
-  const layerInto = pickLayerTarget(newPath, newValue);
-  if (layerInto && descendants.length > 0) {
-    for (const desc of descendants) {
-      const sepChar = desc[newPath.length];
-      const relativePath = sepChar === "[" ? desc.substring(newPath.length) : desc.substring(newPath.length + 1);
-      const descValue = accumulated[desc];
-      if (descValue === void 0) {
-        deleteByPath(layerInto, relativePath);
-      } else {
-        setByPath(layerInto, relativePath, descValue);
-      }
-    }
-  }
-  for (const k of descendants) delete accumulated[k];
-  if (newValue !== void 0 && isTerminalBracketKey(newPath) && Object.prototype.hasOwnProperty.call(accumulated, newPath)) {
-    const existingValue = accumulated[newPath];
-    const existingElement = unwrapWholeElement(existingValue);
-    const newElement = unwrapWholeElement(newValue);
-    if (existingElement && newElement && (Array.isArray(existingValue) || Array.isArray(newValue))) {
-      accumulated[newPath] = [newElement];
-      return;
-    }
-  }
-  accumulated[newPath] = newValue;
-}
-function mergeDirtyChanges(accumulated, newChanges) {
-  for (const path of Object.keys(newChanges)) {
-    mergeDirtyPath(accumulated, path, newChanges[path]);
-  }
-}
-
 // src/db/DexieDb.ts
 var SYNC_META_TABLE = "_sync_meta";
 var DIRTY_CHANGES_TABLE = "_dirty_changes";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cry-synced-db-client",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",