cry-synced-db-client 2.0.3 → 2.0.5

package/dist/index.js

@@ -509,6 +509,9 @@ function computeObjDiff(existing, update) {
       continue;
     computeDiffInto(existing[key], update[key], key, diff);
   }
+  if (Object.prototype.hasOwnProperty.call(update, "_lastUpdaterId")) {
+    diff._lastUpdaterId = update._lastUpdaterId;
+  }
   return diff;
 }
 function tokenizePath(path) {
@@ -4794,8 +4797,7 @@ var ServerUpdateHandler = class {
       return "ignore";
     }
     if (incomingRev === localRev + 1) {
-      const updaterId = incomingUpdaterId != null ? incomingUpdaterId : localItem._lastUpdaterId;
-      if (updaterId === this.updaterId) {
+      if (incomingUpdaterId !== void 0 && incomingUpdaterId === this.updaterId) {
         return "bump-meta";
       }
       return "apply";
@@ -4876,7 +4878,7 @@ var ServerUpdateHandler = class {
     }
     const pendingChange = this.deps.getPendingChange(collection, serverDelta._id);
     if (pendingChange) {
-      const newFields = this.getNewFieldsFromServer(localItem, serverDelta);
+      const newFields = this.getNewFieldsFromServer(pendingChange.data, serverDelta);
       if (Object.keys(newFields).length > 0) {
         Object.assign(pendingChange.data, newFields);
       }
@@ -4973,10 +4975,26 @@ var ServerUpdateHandler = class {
     }
     return local;
   }
-  getNewFieldsFromServer(local, server) {
+  /**
+   * Fields from an incoming server delta that our OWN in-flight pending
+   * change doesn't already touch — safe to backfill into it so a later
+   * merge doesn't clobber a concurrent server-side edit to an unrelated
+   * field.
+   *
+   * Checked against `pendingChange.data`'s own keys (not the dexie-persisted
+   * `local` snapshot): a field we're deliberately clearing shows up as
+   * `undefined` on `local` too (once `applyObjDiff` deletes it), which is
+   * indistinguishable from "local never knew about this field" if you test
+   * `local[key] === undefined`. That conflation let a slower, older echo
+   * (e.g. a lock-write's own confirmation arriving after we've already
+   * locally reverted it) resurrect a field our pending change had just
+   * unset — reproduced with izdajRacun.vue's sedajObdeluje lock/unlock race
+   * (2026-07-14).
+   */
+  getNewFieldsFromServer(pendingData, server) {
     const newFields = {};
     for (const key of Object.keys(server)) {
-      if (key !== "_id" && key !== "_dirty" && local[key] === void 0) {
+      if (key !== "_id" && key !== "_dirty" && !Object.prototype.hasOwnProperty.call(pendingData, key)) {
         newFields[key] = server[key];
       }
     }

package/dist/src/db/sync/ServerUpdateHandler.d.ts

@@ -81,6 +81,22 @@ export declare class ServerUpdateHandler implements I_ServerUpdateHandler {
     private timestampsEqual;
     /** @mutates local — mutira vhodni objekt namesto kopiranja */
     private mergeLocalWithDelta;
+    /**
+     * Fields from an incoming server delta that our OWN in-flight pending
+     * change doesn't already touch — safe to backfill into it so a later
+     * merge doesn't clobber a concurrent server-side edit to an unrelated
+     * field.
+     *
+     * Checked against `pendingChange.data`'s own keys (not the dexie-persisted
+     * `local` snapshot): a field we're deliberately clearing shows up as
+     * `undefined` on `local` too (once `applyObjDiff` deletes it), which is
+     * indistinguishable from "local never knew about this field" if you test
+     * `local[key] === undefined`. That conflation let a slower, older echo
+     * (e.g. a lock-write's own confirmation arriving after we've already
+     * locally reverted it) resurrect a field our pending change had just
+     * unset — reproduced with izdajRacun.vue's sedajObdeluje lock/unlock race
+     * (2026-07-14).
+     */
     private getNewFieldsFromServer;
     private callOnWsNotification;
     private callOnEbusNotificationReceived;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cry-synced-db-client",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -37,7 +37,7 @@
     "vitest": "^4.1.10"
   },
   "dependencies": {
-    "cry-db": "^2.6.2",
+    "cry-db": "^2.6.3",
     "cry-helpers": "^2.1.207",
     "msgpackr": "^2.0.4",
     "superjson": "^2.2.6"