dexie 4.0.5 → 4.0.8

package/dist/modern/dexie.mjs

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.5, Sat May 25 2024
+ * Version 4.0.8, Wed Jul 10 2024
  *
  * https://dexie.org
  *
@@ -1094,7 +1094,7 @@ function tempTransaction(db, mode, storeNames, fn) {
     }
 }
 
-const DEXIE_VERSION = '4.0.5';
+const DEXIE_VERSION = '4.0.8';
 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>.";
@@ -2054,6 +2054,12 @@ class Collection {
                 }
             };
             return this.clone().primaryKeys().then(keys => {
+                const criteria = isPlainKeyRange(ctx) &&
+                    ctx.limit === Infinity &&
+                    (typeof changes !== 'function' || changes === deleteCallback) && {
+                    index: ctx.index,
+                    range: ctx.range
+                };
                 const nextChunk = (offset) => {
                     const count = Math.min(limit, keys.length - offset);
                     return coreTable.getMany({
@@ -2086,12 +2092,6 @@ class Collection {
                                 }
                             }
                         }
-                        const criteria = isPlainKeyRange(ctx) &&
-                            ctx.limit === Infinity &&
-                            (typeof changes !== 'function' || changes === deleteCallback) && {
-                            index: ctx.index,
-                            range: ctx.range
-                        };
                         return Promise.resolve(addValues.length > 0 &&
                             coreTable.mutate({ trans, type: 'add', values: addValues })
                                 .then(res => {
@@ -2107,13 +2107,15 @@ class Collection {
                                 values: putValues,
                                 criteria,
                                 changeSpec: typeof changes !== 'function'
-                                    && changes
+                                    && changes,
+                                isAdditionalChunk: offset > 0
                             }).then(res => applyMutateResult(putValues.length, res))).then(() => (deleteKeys.length > 0 || (criteria && changes === deleteCallback)) &&
                             coreTable.mutate({
                                 trans,
                                 type: 'delete',
                                 keys: deleteKeys,
-                                criteria
+                                criteria,
+                                isAdditionalChunk: offset > 0
                             }).then(res => applyMutateResult(deleteKeys.length, res))).then(() => {
                             return keys.length > offset + count && nextChunk(offset + limit);
                         });
@@ -3651,6 +3653,10 @@ props(RangeSet.prototype, {
         keys.forEach(key => addRange(this, key, key));
         return this;
     },
+    hasKey(key) {
+        const node = getRangeSetIterator(this).next(key).value;
+        return node && cmp(node.from, key) <= 0 && cmp(node.to, key) >= 0;
+    },
     [iteratorSymbol]() {
         return getRangeSetIterator(this);
     }
@@ -4742,19 +4748,23 @@ function applyOptimisticOps(result, req, ops, table, cacheEntry, immutable) {
     const extractLowLevelIndex = (index.lowLevelIndex || index).extractKey;
     let finalResult = ops.reduce((result, op) => {
         let modifedResult = result;
-        const includedValues = op.type === 'add' || op.type === 'put'
-            ? op.values.filter((v) => {
-                const key = extractIndex(v);
-                return multiEntry && isArray(key)
+        const includedValues = [];
+        if (op.type === 'add' || op.type === 'put') {
+            const includedPKs = new RangeSet();
+            for (let i = op.values.length - 1; i >= 0; --i) {
+                const value = op.values[i];
+                const pk = extractPrimKey(value);
+                if (includedPKs.hasKey(pk))
+                    continue;
+                const key = extractIndex(value);
+                if (multiEntry && isArray(key)
                     ? key.some((k) => isWithinRange(k, queryRange))
-                    : isWithinRange(key, queryRange);
-            }).map(v => {
-                v = deepClone(v);
-                if (immutable)
-                    Object.freeze(v);
-                return v;
-            })
-            : [];
+                    : isWithinRange(key, queryRange)) {
+                    includedPKs.addKey(pk);
+                    includedValues.push(value);
+                }
+            }
+        }
         switch (op.type) {
             case 'add':
                 modifedResult = result.concat(req.values
@@ -4764,20 +4774,16 @@ function applyOptimisticOps(result, req, ops, table, cacheEntry, immutable) {
             case 'put':
                 const keySet = new RangeSet().addKeys(op.values.map((v) => extractPrimKey(v)));
                 modifedResult = result
-                    .filter((item) => {
-                    const key = req.values ? extractPrimKey(item) : item;
-                    return !rangesOverlap(new RangeSet(key), keySet);
-                })
-                    .concat(req.values
+                    .filter(
+                (item) => !keySet.hasKey(req.values ? extractPrimKey(item) : item))
+                    .concat(
+                req.values
                     ? includedValues
                     : includedValues.map((v) => extractPrimKey(v)));
                 break;
             case 'delete':
                 const keysToDelete = new RangeSet().addKeys(op.keys);
-                modifedResult = result.filter((item) => {
-                    const key = req.values ? extractPrimKey(item) : item;
-                    return !rangesOverlap(new RangeSet(key), keysToDelete);
-                });
+                modifedResult = result.filter((item) => !keysToDelete.hasKey(req.values ? extractPrimKey(item) : item));
                 break;
             case 'deleteRange':
                 const range = op.range;