cry-synced-db-client 0.1.134 → 0.1.135

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Versions
 
+## 0.1.135 (2026-04-20)
+
+- Conflict resolution: server wins on primitive field conflicts when `external._rev > local._rev`
+  - Previously local always won for overlapping primitive fields during conflict merge
+  - New rule applies recursively to object elements inside arrays (via `mergeObjectArrays` → `mergeObjects`)
+  - Arrays still unionize; nested objects without `_rev` keep local-wins behavior
+  - Affects dirty-conflict resolution path ([SyncEngine.resolveCollectionConflict](src/db/sync/SyncEngine.ts))
+
 ## 0.1.126 (2026-04-08)
 
 - Eviction: remove out-of-scope records from Dexie and in-mem cache

package/dist/index.js

@@ -2319,6 +2319,7 @@ function resolveConflict(local, external) {
 }
 function mergeObjects(local, external) {
   const result = __spreadValues({}, local);
+  const serverWinsOnConflict = typeof local._rev === "number" && typeof external._rev === "number" && external._rev > local._rev;
   for (const key of Object.keys(external)) {
     if (key === "_id" || key === "_dirty") {
       continue;
@@ -2336,6 +2337,8 @@ function mergeObjects(local, external) {
       result[key] = mergeArrays(localValue, externalValue);
     } else if (isPlainObject3(localValue) && isPlainObject3(externalValue)) {
       result[key] = mergeObjects(localValue, externalValue);
+    } else if (serverWinsOnConflict) {
+      result[key] = externalValue;
     }
   }
   return result;

package/dist/src/utils/conflictResolution.d.ts

@@ -5,13 +5,15 @@ import type { DbEntity } from "../types/DbEntity";
  * 1. Če ima lokalni objekt _rev in ima objekt s serverja nižji ali isti _rev, ignoriramo server
  * 2. Polja, ki niso array in niso object:
  *    - če lokalna verzija nima polja, zunanja pa ga ima, polje dodamo
- *    - če imata oba objekta polje, vrednost s serverja zavržemo
+ *    - če imata oba objekta polje:
+ *        - če external._rev > local._rev (oba definirana), zmaga server
+ *        - sicer ohranimo lokalno vrednost
  * 3. Polja tipa array:
  *    - če lokalni objekt nima polja, ga dodamo
  *    - če je tip podatkov string[], shranimo deduplicirano unijo
  *    - če je tip podatkov Object[]:
  *      - elemente brez _id dodamo v lokalni array
- *      - objekte z _id primerjamo rekurzivno
+ *      - objekte z _id primerjamo rekurzivno (rekurzija uporabi isto _rev pravilo)
  * 4. Če je tip podatkov Record<string, Object>:
  *    - za vsak key, ki ga ni v lokalnem objektu, dodamo vrednost
  *    - za vsak key, ki obstaja, primerjamo rekurzivno

package/package.json

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