dexie 4.0.1-alpha.15 → 4.0.1-alpha.17

package/dist/dexie.d.ts

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.15, Thu Jun 01 2023
+ * Version 4.0.1-alpha.17, Thu Jun 01 2023
  *
  * https://dexie.org
  *
@@ -656,6 +656,8 @@ export interface DBCoreIndex {
 	readonly multiEntry?: boolean;
 	/** Extract (using keyPath) a key from given value (object). Null for outbound primary keys */
 	readonly extractKey: ((value: any) => any) | null;
+	/** If this index is a virtual index, lowLevelIndex represents the actual IndexedDB index behind it */
+	readonly lowLevelIndex?: DBCoreIndex;
 }
 export interface DBCore {
 	stack: "dbcore";

package/dist/dexie.js

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.15, Thu Jun 01 2023
+ * Version 4.0.1-alpha.17, Thu Jun 01 2023
  *
  * https://dexie.org
  *
@@ -232,10 +232,24 @@
     function flatten(a) {
         return concat.apply([], a);
     }
-    var intrinsicTypeNames = "Boolean,String,Date,RegExp,Blob,File,FileList,FileSystemFileHandle,FileSystemDirectoryHandle,ArrayBuffer,DataView,Uint8ClampedArray,ImageBitmap,ImageData,Map,Set,CryptoKey"
+    var intrinsicTypeNames = "Array,Boolean,String,Date,RegExp,Blob,File,FileList,FileSystemFileHandle,FileSystemDirectoryHandle,ArrayBuffer,DataView,Uint8ClampedArray,ImageBitmap,ImageData,Map,Set,CryptoKey"
         .split(',').concat(flatten([8, 16, 32, 64].map(function (num) { return ["Int", "Uint", "Float"].map(function (t) { return t + num + "Array"; }); }))).filter(function (t) { return _global[t]; });
-    var intrinsicTypes = intrinsicTypeNames.map(function (t) { return _global[t]; });
-    arrayToObject(intrinsicTypeNames, function (x) { return [x, true]; });
+    var intrinsicTypes = new Set(intrinsicTypeNames.map(function (t) { return _global[t]; }));
+    function cloneSimpleObjectTree(o) {
+        var rv = {};
+        for (var k in o)
+            if (hasOwn(o, k)) {
+                var v = o[k];
+                rv[k] = !v || typeof v !== 'object' || intrinsicTypes.has(v.constructor) ? v : cloneSimpleObjectTree(v);
+            }
+        return rv;
+    }
+    function objectIsEmpty(o) {
+        for (var k in o)
+            if (hasOwn(o, k))
+                return false;
+        return true;
+    }
     var circularRefs = null;
     function deepClone(any) {
         circularRefs = new WeakMap();
@@ -256,7 +270,7 @@
                 rv.push(innerDeepClone(x[i]));
             }
         }
-        else if (intrinsicTypes.indexOf(x.constructor) >= 0) {
+        else if (intrinsicTypes.has(x.constructor)) {
             rv = x;
         }
         else {
@@ -1270,7 +1284,7 @@
         }
     }
 
-    var DEXIE_VERSION = '4.0.1-alpha.15';
+    var DEXIE_VERSION = '4.0.1-alpha.17';
     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>.";
@@ -3976,7 +3990,9 @@
                     var indexList = (indexLookup[keyPathAlias] = indexLookup[keyPathAlias] || []);
                     var keyLength = keyPath == null ? 0 : typeof keyPath === 'string' ? 1 : keyPath.length;
                     var isVirtual = keyTail > 0;
-                    var virtualIndex = __assign(__assign({}, lowLevelIndex), { isVirtual: isVirtual, keyTail: keyTail, keyLength: keyLength, extractKey: getKeyExtractor(keyPath), unique: !isVirtual && lowLevelIndex.unique });
+                    var virtualIndex = __assign(__assign({}, lowLevelIndex), { name: isVirtual
+                            ? "".concat(keyPathAlias, "(virtual-from:").concat(lowLevelIndex.name, ")")
+                            : lowLevelIndex.name, lowLevelIndex: lowLevelIndex, isVirtual: isVirtual, keyTail: keyTail, keyLength: keyLength, extractKey: getKeyExtractor(keyPath), unique: !isVirtual && lowLevelIndex.unique });
                     indexList.push(virtualIndex);
                     if (!virtualIndex.isPrimaryKey) {
                         allVirtualIndexes.push(virtualIndex);
@@ -4014,7 +4030,7 @@
                 function translateRequest(req) {
                     var index = req.query.index;
                     return index.isVirtual ? __assign(__assign({}, req), { query: {
-                            index: index,
+                            index: index.lowLevelIndex,
                             range: translateRange(req.query.range, index.keyTail)
                         } }) : req;
                 }
@@ -4480,15 +4496,17 @@
 
     function extendObservabilitySet(target, newSet) {
         keys(newSet).forEach(function (part) {
-            var rangeSet = target[part] || (target[part] = new RangeSet());
-            mergeRanges(rangeSet, newSet[part]);
+            if (target[part])
+                mergeRanges(target[part], newSet[part]);
+            else
+                target[part] = cloneSimpleObjectTree(newSet[part]);
         });
         return target;
     }
 
     var observabilityMiddleware = {
         stack: "dbcore",
-        level: 0,
+        level: 10,
         name: "Observability",
         create: function (core) {
             var dbName = core.schema.name;
@@ -4697,10 +4715,11 @@
     function applyOptimisticOps(result, req, ops, table, cacheEntry, immutable) {
         if (!ops || ops.length === 0)
             return result;
-        var sortIndex = req.query.index;
+        var index = req.query.index;
         var primaryKey = table.schema.primaryKey;
         var extractPrimKey = primaryKey.extractKey;
-        var extractIndex = sortIndex.extractKey;
+        var extractIndex = index.extractKey;
+        var extractLowLevelIndex = (index.lowLevelIndex || index).extractKey;
         var finalResult = ops.reduce(function (result, op) {
             var modifedResult = result;
             var includedValues = op.type === 'add' || op.type === 'put'
@@ -4739,13 +4758,7 @@
                     break;
                 case 'deleteRange':
                     var range_1 = op.range;
-                    var rangeSet_1 = new RangeSet(range_1.lower, range_1.upper);
-                    modifedResult = result.filter(function (item) {
-                        var key = primaryKey.extractKey(item);
-                        return !((rangesOverlap(new RangeSet(key), rangeSet_1) &&
-                            isWithinRange(key, range_1))
-                        );
-                    });
+                    modifedResult = result.filter(function (item) { return !isWithinRange(extractPrimKey(item), range_1); });
                     break;
             }
             return modifedResult;
@@ -4753,10 +4766,10 @@
         if (finalResult === result)
             return result;
         finalResult.sort(function (a, b) {
-            return cmp(extractIndex(a), extractIndex(b)) ||
+            return cmp(extractLowLevelIndex(a), extractLowLevelIndex(b)) ||
                 cmp(extractPrimKey(a), extractPrimKey(b));
         });
-        if (req.limit) {
+        if (req.limit && req.limit < Infinity) {
             if (finalResult.length > req.limit) {
                 finalResult.length = req.limit;
             }
@@ -4767,45 +4780,7 @@
         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 &&
@@ -4891,28 +4866,61 @@
         }
     }
 
-    function signalSubscribers(tblCache, mutatedParts) {
-        extendObservabilitySet(tblCache.unsignaledParts, mutatedParts);
-        if (!tblCache.signalTimer) {
-            tblCache.signalTimer = setTimeout(function () {
-                tblCache.signalTimer = null;
-                signalSubscribersNow(tblCache);
-            }, 0);
+    function obsSetsOverlap(os1, os2) {
+        return Object.keys(os1).some(function (key) { return os2[key] && rangesOverlap(os2[key], os1[key]); });
+    }
+
+    var unsignaledParts = {};
+    var isTaskEnqueued = false;
+    function signalSubscribersLazily(part) {
+        extendObservabilitySet(unsignaledParts, part);
+        if (!isTaskEnqueued) {
+            isTaskEnqueued = true;
+            queueMicrotask(function () {
+                isTaskEnqueued = false;
+                var parts = unsignaledParts;
+                unsignaledParts = {};
+                signalSubscribersNow(parts);
+            });
         }
     }
-    function signalSubscribersNow(tblCache) {
-        var collectedSubscribers = new Set();
-        for (var _i = 0, _a = Object.values(tblCache.queries.query); _i < _a.length; _i++) {
-            var entries = _a[_i];
-            for (var _b = 0, entries_1 = entries; _b < entries_1.length; _b++) {
-                var entry = entries_1[_b];
-                if (entry.obsSet && obsSetsOverlap(entry.obsSet, tblCache.unsignaledParts)) {
-                    entry.subscribers.forEach(function (requery) { return collectedSubscribers.add(requery); });
+    function signalSubscribersNow(updatedParts, deleteAffectedCacheEntries) {
+        if (deleteAffectedCacheEntries === void 0) { deleteAffectedCacheEntries = false; }
+        var queriesToSignal = new Set();
+        for (var key in updatedParts) {
+            var parts = /^idb\:\/\/(.*)\/(.*)\//.exec(key);
+            if (parts) {
+                var dbName = parts[1], tableName = parts[2];
+                var tblCache = cache["idb://".concat(dbName, "/").concat(tableName)];
+                if (tblCache)
+                    signalTableSubscribersNow(tblCache, updatedParts, queriesToSignal, deleteAffectedCacheEntries);
+            }
+        }
+        queriesToSignal.forEach(function (requery) { return requery(); });
+    }
+    function signalTableSubscribersNow(tblCache, updatedParts, outQueriesToSignal, deleteAffectedCacheEntries) {
+        var updatedEntryLists = deleteAffectedCacheEntries && [];
+        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 = deleteAffectedCacheEntries && [];
+            for (var _c = 0, entries_1 = entries; _c < entries_1.length; _c++) {
+                var entry = entries_1[_c];
+                if (entry.obsSet && obsSetsOverlap(updatedParts, entry.obsSet)) {
+                    entry.subscribers.forEach(function (requery) { return outQueriesToSignal.add(requery); });
+                }
+                else if (deleteAffectedCacheEntries) {
+                    filteredEntries.push(entry);
                 }
             }
+            if (deleteAffectedCacheEntries)
+                updatedEntryLists.push([indexName, filteredEntries]);
+        }
+        if (deleteAffectedCacheEntries) {
+            for (var _d = 0, updatedEntryLists_1 = updatedEntryLists; _d < updatedEntryLists_1.length; _d++) {
+                var _e = updatedEntryLists_1[_d], indexName = _e[0], filteredEntries = _e[1];
+                tblCache.queries.query[indexName] = filteredEntries;
+            }
         }
-        tblCache.unsignaledParts = {};
-        collectedSubscribers.forEach(function (requery) { return requery(); });
     }
 
     function subscribeToCacheEntry(cacheEntry, container, requery, signal) {
@@ -4934,7 +4942,7 @@
 
     var cacheMiddleware = {
         stack: 'dbcore',
-        level: 0,
+        level: 10,
         name: 'Cache',
         create: function (core) {
             var dbName = core.schema.name;
@@ -5018,7 +5026,7 @@
                             if (!tblCache)
                                 return downTable.mutate(req);
                             var promise = downTable.mutate(req);
-                            if (primKey.autoIncrement && (req.type === 'add' || req.type === 'put') && (req.values.length < 50 || getEffectiveKeys(primKey, req).some(function (key) { return key == null; }))) {
+                            if (primKey.autoIncrement && (req.type === 'add' || req.type === 'put') && (req.values.length >= 50 || getEffectiveKeys(primKey, req).some(function (key) { return key == null; }))) {
                                 promise.then(function (res) {
                                     var reqWithResolvedKeys = __assign(__assign({}, req), { values: req.values.map(function (value, i) {
                                             var valueWithKey = primKey.keyPath.includes('.')
@@ -5028,15 +5036,15 @@
                                             return valueWithKey;
                                         }) });
                                     tblCache.optimisticOps.push(reqWithResolvedKeys);
-                                    queueMicrotask(function () { return signalSubscribers(tblCache, req.mutatedParts); });
+                                    queueMicrotask(function () { return signalSubscribersLazily(req.mutatedParts); });
                                 });
                             }
                             else {
                                 tblCache.optimisticOps.push(req);
-                                signalSubscribers(tblCache, req.mutatedParts);
+                                signalSubscribersLazily(req.mutatedParts);
                                 promise.catch(function () {
                                     delArrayItem(tblCache.optimisticOps, req);
-                                    signalSubscribers(tblCache, req.mutatedParts);
+                                    signalSubscribersLazily(req.mutatedParts);
                                 });
                             }
                             return promise;
@@ -5208,11 +5216,11 @@
                     .filter(function (c) { return c.name === _this.name && c !== _this && !c._state.vcFired; })
                     .map(function (c) { return c.on("versionchange").fire(ev); });
             };
+            this.use(cacheExistingValuesMiddleware);
             this.use(virtualIndexMiddleware);
             this.use(hooksMiddleware);
             this.use(cacheMiddleware);
             this.use(observabilityMiddleware);
-            this.use(cacheExistingValuesMiddleware);
             this.vip = Object.create(this, { _vip: { value: true } });
             addons.forEach(function (addon) { return addon(_this); });
         }
@@ -5451,7 +5459,7 @@
 
     function liveQuery(querier) {
         var hasValue = false;
-        var currentValue = undefined;
+        var currentValue;
         var observable = new Observable(function (observer) {
             var scopeFuncIsAsync = isAsyncFunction(querier);
             function execute(ctx) {
@@ -5460,7 +5468,7 @@
                 }
                 var rv = newScope(querier, ctx);
                 if (scopeFuncIsAsync) {
-                    rv.then(decrementExpectedAwaits, decrementExpectedAwaits);
+                    rv.finally(decrementExpectedAwaits);
                 }
                 return rv;
             }
@@ -5538,7 +5546,7 @@
                     }
                     accumMuts = {};
                     currentObs = subscr;
-                    if (keys(currentObs).length > 0 && !startedListening) {
+                    if (!objectIsEmpty(currentObs) && !startedListening) {
                         globalEvents(DEXIE_STORAGE_MUTATED_EVENT_NAME, mutationListener);
                         startedListening = true;
                     }
@@ -5673,7 +5681,7 @@
         try {
             propagatingLocally = true;
             globalEvents.storagemutated.fire(updateParts);
-            invalidateCachedQueries(updateParts);
+            signalSubscribersNow(updateParts, true);
         }
         finally {
             propagatingLocally = wasMe;