dexie 4.0.1-alpha.12 → 4.0.1-alpha.14

package/dist/dexie.d.ts

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.12, Tue May 30 2023
+ * Version 4.0.1-alpha.14, Wed May 31 2023
  *
  * https://dexie.org
  *

package/dist/dexie.js

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.12, Tue May 30 2023
+ * Version 4.0.1-alpha.14, Wed May 31 2023
  *
  * https://dexie.org
  *
@@ -1270,7 +1270,7 @@
         }
     }
 
-    var DEXIE_VERSION = '4.0.1-alpha.12';
+    var DEXIE_VERSION = '4.0.1-alpha.14';
     var maxString = String.fromCharCode(65535);
     var minKey = -Infinity;
     var INVALID_KEY_ARGUMENT = "Invalid key provided. Keys must be of type string, number, Date or Array<string | number | Date>.";
@@ -4753,7 +4753,8 @@
         if (finalResult === result)
             return result;
         finalResult.sort(function (a, b) {
-            return cmp(sortIndex.extractKey(a), sortIndex.extractKey(b));
+            return cmp(extractIndex(a), extractIndex(b)) ||
+                cmp(extractPrimKey(a), extractPrimKey(b));
         });
         if (req.limit) {
             if (finalResult.length > req.limit) {
@@ -4766,7 +4767,45 @@
         return immutable ? Object.freeze(finalResult) : finalResult;
     }
 
+    function obsSetsOverlap(os1, os2) {
+        return Object.keys(os1).some(function (key) { return os2[key] && rangesOverlap(os2[key], os1[key]); });
+    }
+
     var cache = {};
+    function invalidateCachedQueries(updateParts) {
+        var queriesToSignal = new Set();
+        for (var key in updateParts) {
+            var parts = /^idb\:\/\/(.*)\/(.*)\//.exec(key);
+            if (parts) {
+                var dbName = parts[1], tableName = parts[2];
+                var tblCache = cache["idb://".concat(dbName, "/").concat(tableName)];
+                if (tblCache)
+                    invalidateTableQueries(tblCache, updateParts, queriesToSignal);
+            }
+        }
+        queriesToSignal.forEach(function (requery) { return requery(); });
+    }
+    function invalidateTableQueries(tblCache, mutatedParts, queriesToSignal) {
+        var updatedEntryLists = [];
+        for (var _i = 0, _a = Object.entries(tblCache.queries.query); _i < _a.length; _i++) {
+            var _b = _a[_i], indexName = _b[0], entries = _b[1];
+            var filteredEntries = [];
+            for (var _c = 0, entries_1 = entries; _c < entries_1.length; _c++) {
+                var entry = entries_1[_c];
+                if (entry.obsSet && obsSetsOverlap(mutatedParts, entry.obsSet)) {
+                    entry.subscribers.forEach(function (requery) { return queriesToSignal.add(requery); });
+                }
+                else {
+                    filteredEntries.push(entry);
+                }
+            }
+            updatedEntryLists.push([indexName, filteredEntries]);
+        }
+        for (var _d = 0, updatedEntryLists_1 = updatedEntryLists; _d < updatedEntryLists_1.length; _d++) {
+            var _e = updatedEntryLists_1[_d], indexName = _e[0], newEntries = _e[1];
+            tblCache.queries.query[indexName] = newEntries;
+        }
+    }
 
     function areRangesEqual(r1, r2) {
         return (cmp(r1.lower, r2.lower) === 0 &&
@@ -4852,10 +4891,6 @@
         }
     }
 
-    function obsSetsOverlap(os1, os2) {
-        return Object.keys(os1).some(function (key) { return os2[key] && rangesOverlap(os2[key], os1[key]); });
-    }
-
     function signalSubscribers(tblCache, mutatedParts) {
         extendObservabilitySet(tblCache.unsignaledParts, mutatedParts);
         if (!tblCache.signalTimer) {
@@ -4916,6 +4951,7 @@
                                 delArrayItem(txs, idbtrans);
                             ac_1.abort();
                             if (mode === 'readwrite') {
+                                var affectedSubscribers_1 = new Set();
                                 for (var _i = 0, stores_1 = stores; _i < stores_1.length; _i++) {
                                     var storeName = stores_1[_i];
                                     var tblCache = cache["idb://".concat(dbName, "/").concat(storeName)];
@@ -4936,7 +4972,7 @@
                                                             var modRes = applyOptimisticOps(entry.res, entry.req, ops, table, entry, freezeResults);
                                                             if (entry.dirty) {
                                                                 delArrayItem(entries, entry);
-                                                                entry.subscribers.forEach(function (requery) { return requery(); });
+                                                                entry.subscribers.forEach(function (requery) { return affectedSubscribers_1.add(requery); });
                                                             }
                                                             else if (modRes !== entry.res) {
                                                                 entry.res = modRes;
@@ -4947,7 +4983,7 @@
                                                             if (entry.dirty) {
                                                                 delArrayItem(entries, entry);
                                                             }
-                                                            entry.subscribers.forEach(function (requery) { return requery(); });
+                                                            entry.subscribers.forEach(function (requery) { return affectedSubscribers_1.add(requery); });
                                                         }
                                                     }
                                                 }
@@ -4955,6 +4991,7 @@
                                         }
                                     }
                                 }
+                                affectedSubscribers_1.forEach(function (requery) { return requery(); });
                             }
                         }; };
                         idbtrans.addEventListener('abort', endTransaction(false), {
@@ -5435,10 +5472,13 @@
                     return closed;
                 },
                 unsubscribe: function () {
+                    if (closed)
+                        return;
                     closed = true;
                     if (abortController)
                         abortController.abort();
-                    globalEvents.storagemutated.unsubscribe(mutationListener);
+                    if (startedListening)
+                        globalEvents.storagemutated.unsubscribe(mutationListener);
                     txs.forEach(function (idbtrans) {
                         idbtrans.aborted = true;
                         try {
@@ -5488,10 +5528,6 @@
                     trans: null
                 };
                 var ret = execute(ctx);
-                if (!startedListening) {
-                    globalEvents(DEXIE_STORAGE_MUTATED_EVENT_NAME, mutationListener);
-                    startedListening = true;
-                }
                 Promise.resolve(ret).then(function (result) {
                     hasValue = true;
                     currentValue = result;
@@ -5500,6 +5536,10 @@
                     }
                     accumMuts = {};
                     currentObs = subscr;
+                    if (keys(currentObs).length > 0 && !startedListening) {
+                        globalEvents(DEXIE_STORAGE_MUTATED_EVENT_NAME, mutationListener);
+                        startedListening = true;
+                    }
                     observer.next && observer.next(result);
                 }, function (err) {
                     hasValue = false;
@@ -5631,6 +5671,7 @@
         try {
             propagatingLocally = true;
             globalEvents.storagemutated.fire(updateParts);
+            invalidateCachedQueries(updateParts);
         }
         finally {
             propagatingLocally = wasMe;