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

package/dist/modern/service-worker.js

@@ -329,7 +329,10 @@ function listClientChanges(mutationTables, db, { since = {}, limit = Infinity }
             }));
         })));
         // 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;
@@ -2999,6 +3002,7 @@ function createMutationTrackingMiddleware({ currentUserObservable, db }) {
                     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;
@@ -3105,6 +3109,7 @@ function createMutationTrackingMiddleware({ currentUserObservable, db }) {
                         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;
@@ -3119,6 +3124,7 @@ function createMutationTrackingMiddleware({ currentUserObservable, db }) {
                                 ? {
                                     type: 'delete',
                                     ts,
+                                    opNo,
                                     keys,
                                     criteria: req.criteria,
                                     txid,
@@ -4434,7 +4440,7 @@ function dexieCloud(dexie) {
     });
     const syncComplete = new Subject();
     dexie.cloud = {
-        version: '4.0.1-beta.40',
+        version: '4.0.1-beta.42',
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -4695,7 +4701,7 @@ function dexieCloud(dexie) {
         });
     }
 }
-dexieCloud.version = '4.0.1-beta.40';
+dexieCloud.version = '4.0.1-beta.42';
 Dexie.Cloud = dexieCloud;
 
 // In case the SW lives for a while, let it reuse already opened connections: