dexie 4.0.1-alpha.22 → 4.0.1-alpha.23

package/README.md

@@ -1,7 +1,7 @@
 Dexie.js
 ========
 
-[![NPM Version][npm-image]][npm-url] [![Build Status](https://travis-ci.com/dexie/Dexie.js.svg?branch=master)](https://travis-ci.com/dexie/Dexie.js)[![Tested with Browserstack](https://dexie.org/assets/images/tested-with-browserstack2.png)](https://www.browserstack.com)
+[![NPM Version][npm-image]][npm-url] ![Build Status](https://github.com/dexie/Dexie.js/actions/workflows/main.yml/badge.svg)
 
 Dexie.js is a wrapper library for indexedDB - the standard database in the browser. https://dexie.org
 

package/dist/dexie.d.ts

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.22, Wed Jun 14 2023
+ * Version 4.0.1-alpha.23, Tue Jul 04 2023
  *
  * https://dexie.org
  *
@@ -801,7 +801,9 @@ export interface Dexie {
 	transaction<U>(mode: TransactionMode, table: string | Table, table2: string | Table, table3: string | Table, scope: (trans: TXWithTables<this>) => PromiseLike<U> | U): PromiseExtended<U>;
 	transaction<U>(mode: TransactionMode, table: string | Table, table2: string | Table, table3: string | Table, table4: string | Table, scope: (trans: TXWithTables<this>) => PromiseLike<U> | U): PromiseExtended<U>;
 	transaction<U>(mode: TransactionMode, table: string | Table, table2: string | Table, table3: string | Table, table5: string | Table, scope: (trans: TXWithTables<this>) => PromiseLike<U> | U): PromiseExtended<U>;
-	close(): void;
+	close(closeOptions?: {
+		disableAutoOpen: boolean;
+	}): void;
 	delete(): PromiseExtended<void>;
 	isOpen(): boolean;
 	hasBeenClosed(): boolean;

package/dist/dexie.js

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.22, Wed Jun 14 2023
+ * Version 4.0.1-alpha.23, Tue Jul 04 2023
  *
  * https://dexie.org
  *
@@ -1284,7 +1284,7 @@
         }
     }
 
-    var DEXIE_VERSION = '4.0.1-alpha.22';
+    var DEXIE_VERSION = '4.0.1-alpha.23';
     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>.";
@@ -3787,6 +3787,237 @@
         }).finally(function () { return clearInterval(intervalId); });
     }
 
+    var _a;
+    function isEmptyRange(node) {
+        return !("from" in node);
+    }
+    var RangeSet = function (fromOrTree, to) {
+        if (this) {
+            extend(this, arguments.length ? { d: 1, from: fromOrTree, to: arguments.length > 1 ? to : fromOrTree } : { d: 0 });
+        }
+        else {
+            var rv = new RangeSet();
+            if (fromOrTree && ("d" in fromOrTree)) {
+                extend(rv, fromOrTree);
+            }
+            return rv;
+        }
+    };
+    props(RangeSet.prototype, (_a = {
+            add: function (rangeSet) {
+                mergeRanges(this, rangeSet);
+                return this;
+            },
+            addKey: function (key) {
+                addRange(this, key, key);
+                return this;
+            },
+            addKeys: function (keys) {
+                var _this = this;
+                keys.forEach(function (key) { return addRange(_this, key, key); });
+                return this;
+            }
+        },
+        _a[iteratorSymbol] = function () {
+            return getRangeSetIterator(this);
+        },
+        _a));
+    function addRange(target, from, to) {
+        var diff = cmp(from, to);
+        if (isNaN(diff))
+            return;
+        if (diff > 0)
+            throw RangeError();
+        if (isEmptyRange(target))
+            return extend(target, { from: from, to: to, d: 1 });
+        var left = target.l;
+        var right = target.r;
+        if (cmp(to, target.from) < 0) {
+            left
+                ? addRange(left, from, to)
+                : (target.l = { from: from, to: to, d: 1, l: null, r: null });
+            return rebalance(target);
+        }
+        if (cmp(from, target.to) > 0) {
+            right
+                ? addRange(right, from, to)
+                : (target.r = { from: from, to: to, d: 1, l: null, r: null });
+            return rebalance(target);
+        }
+        if (cmp(from, target.from) < 0) {
+            target.from = from;
+            target.l = null;
+            target.d = right ? right.d + 1 : 1;
+        }
+        if (cmp(to, target.to) > 0) {
+            target.to = to;
+            target.r = null;
+            target.d = target.l ? target.l.d + 1 : 1;
+        }
+        var rightWasCutOff = !target.r;
+        if (left && !target.l) {
+            mergeRanges(target, left);
+        }
+        if (right && rightWasCutOff) {
+            mergeRanges(target, right);
+        }
+    }
+    function mergeRanges(target, newSet) {
+        function _addRangeSet(target, _a) {
+            var from = _a.from, to = _a.to, l = _a.l, r = _a.r;
+            addRange(target, from, to);
+            if (l)
+                _addRangeSet(target, l);
+            if (r)
+                _addRangeSet(target, r);
+        }
+        if (!isEmptyRange(newSet))
+            _addRangeSet(target, newSet);
+    }
+    function rangesOverlap(rangeSet1, rangeSet2) {
+        var i1 = getRangeSetIterator(rangeSet2);
+        var nextResult1 = i1.next();
+        if (nextResult1.done)
+            return false;
+        var a = nextResult1.value;
+        var i2 = getRangeSetIterator(rangeSet1);
+        var nextResult2 = i2.next(a.from);
+        var b = nextResult2.value;
+        while (!nextResult1.done && !nextResult2.done) {
+            if (cmp(b.from, a.to) <= 0 && cmp(b.to, a.from) >= 0)
+                return true;
+            cmp(a.from, b.from) < 0
+                ? (a = (nextResult1 = i1.next(b.from)).value)
+                : (b = (nextResult2 = i2.next(a.from)).value);
+        }
+        return false;
+    }
+    function getRangeSetIterator(node) {
+        var state = isEmptyRange(node) ? null : { s: 0, n: node };
+        return {
+            next: function (key) {
+                var keyProvided = arguments.length > 0;
+                while (state) {
+                    switch (state.s) {
+                        case 0:
+                            state.s = 1;
+                            if (keyProvided) {
+                                while (state.n.l && cmp(key, state.n.from) < 0)
+                                    state = { up: state, n: state.n.l, s: 1 };
+                            }
+                            else {
+                                while (state.n.l)
+                                    state = { up: state, n: state.n.l, s: 1 };
+                            }
+                        case 1:
+                            state.s = 2;
+                            if (!keyProvided || cmp(key, state.n.to) <= 0)
+                                return { value: state.n, done: false };
+                        case 2:
+                            if (state.n.r) {
+                                state.s = 3;
+                                state = { up: state, n: state.n.r, s: 0 };
+                                continue;
+                            }
+                        case 3:
+                            state = state.up;
+                    }
+                }
+                return { done: true };
+            },
+        };
+    }
+    function rebalance(target) {
+        var _a, _b;
+        var diff = (((_a = target.r) === null || _a === void 0 ? void 0 : _a.d) || 0) - (((_b = target.l) === null || _b === void 0 ? void 0 : _b.d) || 0);
+        var r = diff > 1 ? "r" : diff < -1 ? "l" : "";
+        if (r) {
+            var l = r === "r" ? "l" : "r";
+            var rootClone = __assign({}, target);
+            var oldRootRight = target[r];
+            target.from = oldRootRight.from;
+            target.to = oldRootRight.to;
+            target[r] = oldRootRight[r];
+            rootClone[r] = oldRootRight[l];
+            target[l] = rootClone;
+            rootClone.d = computeDepth(rootClone);
+        }
+        target.d = computeDepth(target);
+    }
+    function computeDepth(_a) {
+        var r = _a.r, l = _a.l;
+        return (r ? (l ? Math.max(r.d, l.d) : r.d) : l ? l.d : 0) + 1;
+    }
+
+    function extendObservabilitySet(target, newSet) {
+        keys(newSet).forEach(function (part) {
+            if (target[part])
+                mergeRanges(target[part], newSet[part]);
+            else
+                target[part] = cloneSimpleObjectTree(newSet[part]);
+        });
+        return target;
+    }
+
+    function obsSetsOverlap(os1, os2) {
+        return Object.keys(os1).some(function (key) { return os2[key] && rangesOverlap(os2[key], os1[key]); });
+    }
+
+    var cache = {};
+
+    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(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;
+            }
+        }
+    }
+
     function dexieOpen(db) {
         var state = db._state;
         var indexedDB = db._deps.indexedDB;
@@ -3878,10 +4109,10 @@
                 }
             });
         }).finally(function () {
-            state.onReadyBeingFired = null;
-            state.isBeingOpened = false;
-        }).then(function () {
-            return db;
+            if (state.openCanceller === openCanceller) {
+                state.onReadyBeingFired = null;
+                state.isBeingOpened = false;
+            }
         }).catch(function (err) {
             state.dbOpenError = err;
             try {
@@ -3895,6 +4126,20 @@
         }).finally(function () {
             state.openComplete = true;
             resolveDbReady();
+        }).then(function () {
+            if (wasCreated) {
+                var everything_1 = {};
+                db.tables.forEach(function (table) {
+                    table.schema.indexes.forEach(function (idx) {
+                        if (idx.name)
+                            everything_1["idb://".concat(db.name, "/").concat(table.name, "/").concat(idx.name)] = new RangeSet(-Infinity, [[[]]]);
+                    });
+                    everything_1["idb://".concat(db.name, "/").concat(table.name, "/")] = everything_1["idb://".concat(db.name, "/").concat(table.name, "/:dels")] = new RangeSet(-Infinity, [[[]]]);
+                });
+                globalEvents(DEXIE_STORAGE_MUTATED_EVENT_NAME).fire(everything_1);
+                signalSubscribersNow(everything_1, true);
+            }
+            return db;
         });
     }
 
@@ -4317,168 +4562,6 @@
         },
     };
 
-    var _a;
-    function isEmptyRange(node) {
-        return !("from" in node);
-    }
-    var RangeSet = function (fromOrTree, to) {
-        if (this) {
-            extend(this, arguments.length ? { d: 1, from: fromOrTree, to: arguments.length > 1 ? to : fromOrTree } : { d: 0 });
-        }
-        else {
-            var rv = new RangeSet();
-            if (fromOrTree && ("d" in fromOrTree)) {
-                extend(rv, fromOrTree);
-            }
-            return rv;
-        }
-    };
-    props(RangeSet.prototype, (_a = {
-            add: function (rangeSet) {
-                mergeRanges(this, rangeSet);
-                return this;
-            },
-            addKey: function (key) {
-                addRange(this, key, key);
-                return this;
-            },
-            addKeys: function (keys) {
-                var _this = this;
-                keys.forEach(function (key) { return addRange(_this, key, key); });
-                return this;
-            }
-        },
-        _a[iteratorSymbol] = function () {
-            return getRangeSetIterator(this);
-        },
-        _a));
-    function addRange(target, from, to) {
-        var diff = cmp(from, to);
-        if (isNaN(diff))
-            return;
-        if (diff > 0)
-            throw RangeError();
-        if (isEmptyRange(target))
-            return extend(target, { from: from, to: to, d: 1 });
-        var left = target.l;
-        var right = target.r;
-        if (cmp(to, target.from) < 0) {
-            left
-                ? addRange(left, from, to)
-                : (target.l = { from: from, to: to, d: 1, l: null, r: null });
-            return rebalance(target);
-        }
-        if (cmp(from, target.to) > 0) {
-            right
-                ? addRange(right, from, to)
-                : (target.r = { from: from, to: to, d: 1, l: null, r: null });
-            return rebalance(target);
-        }
-        if (cmp(from, target.from) < 0) {
-            target.from = from;
-            target.l = null;
-            target.d = right ? right.d + 1 : 1;
-        }
-        if (cmp(to, target.to) > 0) {
-            target.to = to;
-            target.r = null;
-            target.d = target.l ? target.l.d + 1 : 1;
-        }
-        var rightWasCutOff = !target.r;
-        if (left && !target.l) {
-            mergeRanges(target, left);
-        }
-        if (right && rightWasCutOff) {
-            mergeRanges(target, right);
-        }
-    }
-    function mergeRanges(target, newSet) {
-        function _addRangeSet(target, _a) {
-            var from = _a.from, to = _a.to, l = _a.l, r = _a.r;
-            addRange(target, from, to);
-            if (l)
-                _addRangeSet(target, l);
-            if (r)
-                _addRangeSet(target, r);
-        }
-        if (!isEmptyRange(newSet))
-            _addRangeSet(target, newSet);
-    }
-    function rangesOverlap(rangeSet1, rangeSet2) {
-        var i1 = getRangeSetIterator(rangeSet2);
-        var nextResult1 = i1.next();
-        if (nextResult1.done)
-            return false;
-        var a = nextResult1.value;
-        var i2 = getRangeSetIterator(rangeSet1);
-        var nextResult2 = i2.next(a.from);
-        var b = nextResult2.value;
-        while (!nextResult1.done && !nextResult2.done) {
-            if (cmp(b.from, a.to) <= 0 && cmp(b.to, a.from) >= 0)
-                return true;
-            cmp(a.from, b.from) < 0
-                ? (a = (nextResult1 = i1.next(b.from)).value)
-                : (b = (nextResult2 = i2.next(a.from)).value);
-        }
-        return false;
-    }
-    function getRangeSetIterator(node) {
-        var state = isEmptyRange(node) ? null : { s: 0, n: node };
-        return {
-            next: function (key) {
-                var keyProvided = arguments.length > 0;
-                while (state) {
-                    switch (state.s) {
-                        case 0:
-                            state.s = 1;
-                            if (keyProvided) {
-                                while (state.n.l && cmp(key, state.n.from) < 0)
-                                    state = { up: state, n: state.n.l, s: 1 };
-                            }
-                            else {
-                                while (state.n.l)
-                                    state = { up: state, n: state.n.l, s: 1 };
-                            }
-                        case 1:
-                            state.s = 2;
-                            if (!keyProvided || cmp(key, state.n.to) <= 0)
-                                return { value: state.n, done: false };
-                        case 2:
-                            if (state.n.r) {
-                                state.s = 3;
-                                state = { up: state, n: state.n.r, s: 0 };
-                                continue;
-                            }
-                        case 3:
-                            state = state.up;
-                    }
-                }
-                return { done: true };
-            },
-        };
-    }
-    function rebalance(target) {
-        var _a, _b;
-        var diff = (((_a = target.r) === null || _a === void 0 ? void 0 : _a.d) || 0) - (((_b = target.l) === null || _b === void 0 ? void 0 : _b.d) || 0);
-        var r = diff > 1 ? "r" : diff < -1 ? "l" : "";
-        if (r) {
-            var l = r === "r" ? "l" : "r";
-            var rootClone = __assign({}, target);
-            var oldRootRight = target[r];
-            target.from = oldRootRight.from;
-            target.to = oldRootRight.to;
-            target[r] = oldRootRight[r];
-            rootClone[r] = oldRootRight[l];
-            target[l] = rootClone;
-            rootClone.d = computeDepth(rootClone);
-        }
-        target.d = computeDepth(target);
-    }
-    function computeDepth(_a) {
-        var r = _a.r, l = _a.l;
-        return (r ? (l ? Math.max(r.d, l.d) : r.d) : l ? l.d : 0) + 1;
-    }
-
     function isCachableContext(ctx, table) {
         return (ctx.trans.mode === 'readonly' &&
             !!ctx.subscr &&
@@ -4502,16 +4585,6 @@
         }
     }
 
-    function extendObservabilitySet(target, newSet) {
-        keys(newSet).forEach(function (part) {
-            if (target[part])
-                mergeRanges(target[part], newSet[part]);
-            else
-                target[part] = cloneSimpleObjectTree(newSet[part]);
-        });
-        return target;
-    }
-
     var observabilityMiddleware = {
         stack: "dbcore",
         level: 0,
@@ -4520,10 +4593,9 @@
             var dbName = core.schema.name;
             var FULL_RANGE = new RangeSet(core.MIN_KEY, core.MAX_KEY);
             return __assign(__assign({}, core), { transaction: function (stores, mode, options) {
-                    if (!PSD.subscr)
-                        return core.transaction(stores, mode, options);
-                    if (mode !== 'readonly')
-                        throw new exceptions.ReadOnly('write transaction not allowed within liveQueries');
+                    if (PSD.subscr && mode !== 'readonly') {
+                        throw new exceptions.ReadOnly("Readwrite transaction in liveQuery context. Querier source: ".concat(PSD.querier));
+                    }
                     return core.transaction(stores, mode, options);
                 }, table: function (tableName) {
                     var table = core.table(tableName);
@@ -4785,8 +4857,6 @@
         return immutable ? Object.freeze(finalResult) : finalResult;
     }
 
-    var cache = {};
-
     function areRangesEqual(r1, r2) {
         return (cmp(r1.lower, r2.lower) === 0 &&
             cmp(r1.upper, r2.upper) === 0 &&
@@ -4871,63 +4941,6 @@
         }
     }
 
-    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(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;
-            }
-        }
-    }
-
     function subscribeToCacheEntry(cacheEntry, container, requery, signal) {
         cacheEntry.subscribers.add(requery);
         signal.addEventListener("abort", function () {
@@ -5194,7 +5207,8 @@
                     console.warn("Another connection wants to upgrade database '".concat(_this.name, "'. Closing db now to resume the upgrade."));
                 else
                     console.warn("Another connection wants to delete database '".concat(_this.name, "'. Closing db now to resume the delete request."));
-                _this.close();
+                _this.close({ disableAutoOpen: false });
+                _this._state.openComplete = false;
             });
             this.on("blocked", function (ev) {
                 if (!ev.newVersion || ev.newVersion < ev.oldVersion)
@@ -5296,10 +5310,12 @@
                 state.cancelOpen = reject;
             });
         };
-        Dexie.prototype.close = function () {
+        Dexie.prototype.close = function (_a) {
+            var _b = _a === void 0 ? { disableAutoOpen: true } : _a, disableAutoOpen = _b.disableAutoOpen;
             this._close();
             var state = this._state;
-            this._options.autoOpen = false;
+            if (disableAutoOpen)
+                this._options.autoOpen = false;
             state.dbOpenError = new exceptions.DatabaseClosed();
             if (state.isBeingOpened)
                 state.cancelOpen(state.dbOpenError);
@@ -5310,7 +5326,7 @@
             var state = this._state;
             return new DexiePromise(function (resolve, reject) {
                 var doDelete = function () {
-                    _this.close();
+                    _this.close({ disableAutoOpen: false });
                     var req = _this._deps.indexedDB.deleteDatabase(_this.name);
                     req.onsuccess = wrap(function () {
                         _onDatabaseDeleted(_this._deps, _this.name);
@@ -5510,6 +5526,7 @@
                     subscr: subscr,
                     signal: abortController.signal,
                     requery: doQuery,
+                    querier: querier,
                     trans: null
                 };
                 var ret = execute(ctx);