dexie-cloud-addon 4.0.1-beta.40 → 4.0.1-beta.42

package/dist/umd/service-worker.js

@@ -335,7 +335,10 @@
                 }));
             })));
             // Sort by time to get a true order of the operations (between tables)
-            const sorted = flatten(allMutsOnTables).sort((a, b) => a.mut.ts - b.mut.ts);
+            const sorted = flatten(allMutsOnTables).sort((a, b) => a.mut.txid === b.mut.txid
+                ? a.mut.opNo - b.mut.opNo // Within same transaction, sort by opNo
+                : a.mut.ts - b.mut.ts // Different transactions - sort by timestamp when mutation resolved
+            );
             const result = [];
             let currentEntry = null;
             let currentTxid = null;
@@ -3005,6 +3008,7 @@
                         if (mode === 'readwrite') {
                             // Give each transaction a globally unique id.
                             tx.txid = randomString$1(16);
+                            tx.opCount = 0;
                             // Introduce the concept of current user that lasts through the entire transaction.
                             // This is important because the tracked mutations must be connected to the user.
                             tx.currentUser = currentUserObservable.value;
@@ -3111,6 +3115,7 @@
                             trans.mutationsAdded = true;
                             const { txid, currentUser: { userId } } = trans;
                             const { type } = req;
+                            const opNo = ++trans.opCount;
                             return table.mutate(req).then((res) => {
                                 const { numFailures: hasFailures, failures } = res;
                                 let keys = type === 'delete' ? req.keys : res.results;
@@ -3125,6 +3130,7 @@
                                     ? {
                                         type: 'delete',
                                         ts,
+                                        opNo,
                                         keys,
                                         criteria: req.criteria,
                                         txid,
@@ -4440,7 +4446,7 @@
         });
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
-            version: '4.0.1-beta.40',
+            version: '4.0.1-beta.42',
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -4701,7 +4707,7 @@
             });
         }
     }
-    dexieCloud.version = '4.0.1-beta.40';
+    dexieCloud.version = '4.0.1-beta.42';
     Dexie__default["default"].Cloud = dexieCloud;
 
     // In case the SW lives for a while, let it reuse already opened connections: