dexie 4.0.1-alpha.19 → 4.0.1-alpha.21

package/dist/dexie.mjs

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.19, Wed Jun 07 2023
+ * Version 4.0.1-alpha.21+test1, Wed Jun 14 2023
  *
  * https://dexie.org
  *
@@ -1278,7 +1278,7 @@ function tempTransaction(db, mode, storeNames, fn) {
     }
 }
 
-var DEXIE_VERSION = '4.0.1-alpha.19';
+var DEXIE_VERSION = '4.0.1-alpha.21+test1';
 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>.";
@@ -1444,14 +1444,22 @@ var Table =  (function () {
                 .where(keyPaths[0])
                 .equals(indexOrCrit[keyPaths[0]]);
         var compoundIndex = this.schema.indexes.concat(this.schema.primKey).filter(function (ix) {
-            return ix.compound &&
-                keyPaths.every(function (keyPath) { return ix.keyPath.indexOf(keyPath) >= 0; }) &&
-                ix.keyPath.every(function (keyPath) { return keyPaths.indexOf(keyPath) >= 0; });
-        })[0];
-        if (compoundIndex && this.db._maxKey !== maxString)
+            if (ix.compound &&
+                keyPaths.every(function (keyPath) { return ix.keyPath.indexOf(keyPath) >= 0; })) {
+                for (var i = 0; i < keyPaths.length; ++i) {
+                    if (keyPaths.indexOf(ix.keyPath[i]) === -1)
+                        return false;
+                }
+                return true;
+            }
+            return false;
+        }).sort(function (a, b) { return a.keyPath.length - b.keyPath.length; })[0];
+        if (compoundIndex && this.db._maxKey !== maxString) {
+            var keyPathsInValidOrder = compoundIndex.keyPath.slice(0, keyPaths.length);
             return this
-                .where(compoundIndex.name)
-                .equals(compoundIndex.keyPath.map(function (kp) { return indexOrCrit[kp]; }));
+                .where(keyPathsInValidOrder)
+                .equals(keyPathsInValidOrder.map(function (kp) { return indexOrCrit[kp]; }));
+        }
         if (!compoundIndex && debug)
             console.warn("The query ".concat(JSON.stringify(indexOrCrit), " on ").concat(this.name, " would benefit of a ") +
                 "compound index [".concat(keyPaths.join('+'), "]"));
@@ -4587,9 +4595,6 @@ var observabilityMiddleware = {
                             ? req.obsSet = {}
                             : subscr;
                         if (isLiveQuery) {
-                            var signal = PSD.signal;
-                            if (signal && signal.aborted)
-                                throw new exceptions.Abort();
                             var getRangeSet = function (indexName) {
                                 var part = "idb://".concat(dbName, "/").concat(tableName, "/").concat(indexName);
                                 return (obsSet[part] ||
@@ -4942,15 +4947,10 @@ var cacheMiddleware = {
         var dbName = core.schema.name;
         var coreMW = __assign(__assign({}, core), { transaction: function (stores, mode, options) {
                 var idbtrans = core.transaction(stores, mode, options);
-                var txs = PSD.txs;
-                if (txs || mode === 'readwrite') {
-                    if (txs)
-                        txs.push(idbtrans);
+                if (mode === 'readwrite') {
                     var ac_1 = new AbortController();
                     var signal = ac_1.signal;
                     var endTransaction = function (wasCommitted) { return function () {
-                        if (txs)
-                            delArrayItem(txs, idbtrans);
                         ac_1.abort();
                         if (mode === 'readwrite') {
                             var affectedSubscribers_1 = new Set();
@@ -5072,13 +5072,7 @@ var cacheMiddleware = {
                             });
                             cacheEntry = {
                                 obsSet: req.obsSet,
-                                promise: promise.catch(function (error) {
-                                    if (req.trans.aborted) {
-                                        var trans = coreMW.transaction([tableName], 'readonly');
-                                        return tableMW.query(__assign(__assign({}, req), { trans: trans }));
-                                    }
-                                    return Promise.reject(error);
-                                }),
+                                promise: promise,
                                 subscribers: new Set(),
                                 type: 'query',
                                 req: req,
@@ -5468,7 +5462,6 @@ function liveQuery(querier) {
         }
         var closed = false;
         var abortController;
-        var txs = [];
         var accumMuts = {};
         var currentObs = {};
         var subscription = {
@@ -5483,13 +5476,6 @@ function liveQuery(querier) {
                     abortController.abort();
                 if (startedListening)
                     globalEvents.storagemutated.unsubscribe(mutationListener);
-                txs.forEach(function (idbtrans) {
-                    idbtrans.aborted = true;
-                    try {
-                        idbtrans.abort();
-                    }
-                    catch (_a) { }
-                });
             },
         };
         observer.start && observer.start(subscription);
@@ -5514,19 +5500,8 @@ function liveQuery(querier) {
             if (abortController)
                 abortController.abort();
             abortController = new AbortController();
-            if (txs.length) {
-                txs.forEach(function (idbtrans) {
-                    idbtrans.aborted = true;
-                    try {
-                        idbtrans.abort();
-                    }
-                    catch (_a) { }
-                });
-                txs.length = 0;
-            }
             var ctx = {
                 subscr: subscr,
-                txs: txs,
                 signal: abortController.signal,
                 requery: doQuery,
                 trans: null