dexie 4.0.1-alpha.18 → 4.0.1-alpha.20

package/dist/dexie.d.ts

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.18, Sun Jun 04 2023
+ * Version 4.0.1-alpha.20, Mon Jun 12 2023
  *
  * https://dexie.org
  *

package/dist/dexie.js

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.18, Sun Jun 04 2023
+ * Version 4.0.1-alpha.20, Mon Jun 12 2023
  *
  * https://dexie.org
  *
@@ -1284,7 +1284,7 @@
         }
     }
 
-    var DEXIE_VERSION = '4.0.1-alpha.18';
+    var DEXIE_VERSION = '4.0.1-alpha.20';
     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>.";
@@ -1450,14 +1450,22 @@
                     .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('+'), "]"));
@@ -4562,7 +4570,7 @@
                                 schema.indexes.forEach(function (idx) { return getRangeSet(idx.name).add(FULL_RANGE); });
                             }
                             return table.mutate(req).then(function (res) {
-                                if (keys && primaryKey.autoIncrement && (req.type === 'add' || req.type === 'put')) {
+                                if (keys && (req.type === 'add' || req.type === 'put')) {
                                     pkRangeSet.addKeys(res.results);
                                 }
                                 trans.mutatedParts = extendObservabilitySet(trans.mutatedParts || {}, mutatedParts);