cry-synced-db-client 0.1.132 → 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;
@@ -2567,20 +2570,15 @@ var _SyncEngine = class _SyncEngine {
         dirtyChangesMap.set(String(dirtyItem._id), dirtyItem);
       }
       const updates = [];
-      const deletes = [];
       const ids = dirtyChanges.map((dc) => dc._id);
       const fullItems = await this.dexieDb.getByIds(collectionName, ids);
       for (let i = 0; i < fullItems.length; i++) {
         const fullItem = fullItems[i];
         const id = ids[i];
         if (fullItem) {
-          if (fullItem._deleted) {
-            deletes.push(fullItem);
-          } else {
-            const delta = dirtyChangesMap.get(String(fullItem._id));
-            if (delta) {
-              updates.push({ _id: fullItem._id, delta });
-            }
+          const delta = dirtyChangesMap.get(String(fullItem._id));
+          if (delta) {
+            updates.push({ _id: fullItem._id, delta });
           }
         } else if (id != null) {
           const delta = dirtyChangesMap.get(String(id));
@@ -2591,9 +2589,9 @@ var _SyncEngine = class _SyncEngine {
           }
         }
       }
-      if (updates.length === 0 && deletes.length === 0) {
+      if (updates.length === 0) {
         console.warn(
-          `uploadDirtyItems: ${collectionName} has ${dirtyChanges.length} dirty entries but 0 updates/deletes`
+          `uploadDirtyItems: ${collectionName} has ${dirtyChanges.length} dirty entries but 0 resolvable items`
         );
         continue;
       }
@@ -2607,7 +2605,7 @@ var _SyncEngine = class _SyncEngine {
               update: changes
             };
           }),
-          deletes: deletes.map((item) => ({ _id: item._id }))
+          deletes: []
         }
       }]);
     }
@@ -2650,14 +2648,19 @@ var _SyncEngine = class _SyncEngine {
           const dexieItems = await this.dexieDb.getByIds(collection, idsToCheck);
           const dexieSaveBatch = [];
           const inMemUpdateBatch = [];
+          const inMemDeleteIds = [];
+          const dexieDeleteIds = [];
           for (let i = 0; i < insertedAndUpdated.length; i++) {
             const entity = insertedAndUpdated[i];
             const dexieItem = dexieItems[i];
             if (dexieItem) {
               dexieItem._rev = entity._rev;
               dexieItem._ts = entity._ts;
-              dexieSaveBatch.push(dexieItem);
-              if (!dexieItem._deleted) {
+              if (dexieItem._deleted) {
+                inMemDeleteIds.push(entity._id);
+                dexieDeleteIds.push(entity._id);
+              } else {
+                dexieSaveBatch.push(dexieItem);
                 const inMemItem = this.deps.getInMemById(collection, entity._id);
                 if (inMemItem) {
                   inMemUpdateBatch.push(__spreadProps(__spreadValues({}, inMemItem), {
@@ -2671,9 +2674,19 @@ var _SyncEngine = class _SyncEngine {
           if (dexieSaveBatch.length > 0) {
             await this.dexieDb.saveMany(collection, dexieSaveBatch);
           }
+          if (dexieDeleteIds.length > 0) {
+            await this.dexieDb.deleteMany(collection, dexieDeleteIds);
+          }
           if (inMemUpdateBatch.length > 0) {
             this.deps.writeToInMemBatch(collection, inMemUpdateBatch, "upsert");
           }
+          if (inMemDeleteIds.length > 0) {
+            this.deps.writeToInMemBatch(
+              collection,
+              inMemDeleteIds.map((id) => ({ _id: id })),
+              "delete"
+            );
+          }
         }
         sentCount += insertedAndUpdated.length;
         collectionSentCount += insertedAndUpdated.length;
@@ -2756,19 +2769,14 @@ var _SyncEngine = class _SyncEngine {
       dirtyChangesMap.set(String(dirtyItem._id), dirtyItem);
     }
     const updates = [];
-    const deletes = [];
     for (const fullItem of fullItems) {
       if (!fullItem) continue;
-      if (fullItem._deleted) {
-        deletes.push(fullItem);
-      } else {
-        const delta = dirtyChangesMap.get(String(fullItem._id));
-        if (delta) {
-          updates.push({ _id: fullItem._id, delta });
-        }
+      const delta = dirtyChangesMap.get(String(fullItem._id));
+      if (delta) {
+        updates.push({ _id: fullItem._id, delta });
       }
     }
-    if (updates.length === 0 && deletes.length === 0) {
+    if (updates.length === 0) {
       return { sentCount: 0 };
     }
     const collectionBatches = [[{
@@ -2778,7 +2786,7 @@ var _SyncEngine = class _SyncEngine {
           const _a = item.delta, { _ts, _rev } = _a, changes = __objRest(_a, ["_ts", "_rev"]);
           return { _id: item._id, update: changes };
         }),
-        deletes: deletes.map((item) => ({ _id: item._id }))
+        deletes: []
       }
     }]];
     const results = await this.deps.withSyncTimeout(

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.132",
+  "version": "0.1.135",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",