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

package/dist/modern/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
  *
@@ -1226,7 +1226,7 @@ function tempTransaction(db, mode, storeNames, fn) {
     }
 }
 
-const DEXIE_VERSION = '4.0.1-alpha.19';
+const DEXIE_VERSION = '4.0.1-alpha.21+test1';
 const maxString = String.fromCharCode(65535);
 const minKey = -Infinity;
 const INVALID_KEY_ARGUMENT = "Invalid key provided. Keys must be of type string, number, Date or Array<string | number | Date>.";
@@ -1388,13 +1388,23 @@ class Table {
             return this
                 .where(keyPaths[0])
                 .equals(indexOrCrit[keyPaths[0]]);
-        const compoundIndex = this.schema.indexes.concat(this.schema.primKey).filter(ix => ix.compound &&
-            keyPaths.every(keyPath => ix.keyPath.indexOf(keyPath) >= 0) &&
-            ix.keyPath.every(keyPath => keyPaths.indexOf(keyPath) >= 0))[0];
-        if (compoundIndex && this.db._maxKey !== maxString)
+        const compoundIndex = this.schema.indexes.concat(this.schema.primKey).filter(ix => {
+            if (ix.compound &&
+                keyPaths.every(keyPath => ix.keyPath.indexOf(keyPath) >= 0)) {
+                for (let i = 0; i < keyPaths.length; ++i) {
+                    if (keyPaths.indexOf(ix.keyPath[i]) === -1)
+                        return false;
+                }
+                return true;
+            }
+            return false;
+        }).sort((a, b) => a.keyPath.length - b.keyPath.length)[0];
+        if (compoundIndex && this.db._maxKey !== maxString) {
+            const keyPathsInValidOrder = compoundIndex.keyPath.slice(0, keyPaths.length);
             return this
-                .where(compoundIndex.name)
-                .equals(compoundIndex.keyPath.map(kp => indexOrCrit[kp]));
+                .where(keyPathsInValidOrder)
+                .equals(keyPathsInValidOrder.map(kp => indexOrCrit[kp]));
+        }
         if (!compoundIndex && debug)
             console.warn(`The query ${JSON.stringify(indexOrCrit)} on ${this.name} would benefit of a ` +
                 `compound index [${keyPaths.join('+')}]`);
@@ -4481,9 +4491,6 @@ const observabilityMiddleware = {
                             ? req.obsSet = {}
                             : subscr;
                         if (isLiveQuery) {
-                            const { signal } = PSD;
-                            if (signal && signal.aborted)
-                                throw new exceptions.Abort();
                             const getRangeSet = (indexName) => {
                                 const part = `idb://${dbName}/${tableName}/${indexName}`;
                                 return (obsSet[part] ||
@@ -4829,15 +4836,10 @@ const cacheMiddleware = {
             ...core,
             transaction: (stores, mode, options) => {
                 const idbtrans = core.transaction(stores, mode, options);
-                const { txs } = PSD;
-                if (txs || mode === 'readwrite') {
-                    if (txs)
-                        txs.push(idbtrans);
+                if (mode === 'readwrite') {
                     const ac = new AbortController();
                     const { signal } = ac;
                     const endTransaction = (wasCommitted) => () => {
-                        if (txs)
-                            delArrayItem(txs, idbtrans);
                         ac.abort();
                         if (mode === 'readwrite') {
                             const affectedSubscribers = new Set();
@@ -4965,13 +4967,7 @@ const cacheMiddleware = {
                             });
                             cacheEntry = {
                                 obsSet: req.obsSet,
-                                promise: promise.catch(error => {
-                                    if (req.trans.aborted) {
-                                        const trans = coreMW.transaction([tableName], 'readonly');
-                                        return tableMW.query({ ...req, trans });
-                                    }
-                                    return Promise.reject(error);
-                                }),
+                                promise,
                                 subscribers: new Set(),
                                 type: 'query',
                                 req,
@@ -5352,7 +5348,6 @@ function liveQuery(querier) {
         }
         let closed = false;
         let abortController;
-        const txs = [];
         let accumMuts = {};
         let currentObs = {};
         const subscription = {
@@ -5367,13 +5362,6 @@ function liveQuery(querier) {
                     abortController.abort();
                 if (startedListening)
                     globalEvents.storagemutated.unsubscribe(mutationListener);
-                txs.forEach(idbtrans => {
-                    idbtrans.aborted = true;
-                    try {
-                        idbtrans.abort();
-                    }
-                    catch (_a) { }
-                });
             },
         };
         observer.start && observer.start(subscription);
@@ -5398,19 +5386,8 @@ function liveQuery(querier) {
             if (abortController)
                 abortController.abort();
             abortController = new AbortController();
-            if (txs.length) {
-                txs.forEach(idbtrans => {
-                    idbtrans.aborted = true;
-                    try {
-                        idbtrans.abort();
-                    }
-                    catch (_a) { }
-                });
-                txs.length = 0;
-            }
             const ctx = {
                 subscr,
-                txs,
                 signal: abortController.signal,
                 requery: doQuery,
                 trans: null