cry-synced-db-client 0.1.132 → 0.1.134

package/dist/index.js

@@ -2567,20 +2567,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 +2586,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 +2602,7 @@ var _SyncEngine = class _SyncEngine {
               update: changes
             };
           }),
-          deletes: deletes.map((item) => ({ _id: item._id }))
+          deletes: []
         }
       }]);
     }
@@ -2650,14 +2645,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 +2671,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 +2766,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 +2783,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/package.json

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