dexie 4.0.1-alpha.21 → 4.0.1-alpha.23

package/dist/modern/dexie.mjs

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.21+test1, Wed Jun 14 2023
+ * Version 4.0.1-alpha.23, Tue Jul 04 2023
  *
  * https://dexie.org
  *
@@ -1226,7 +1226,7 @@ function tempTransaction(db, mode, storeNames, fn) {
     }
 }
 
-const DEXIE_VERSION = '4.0.1-alpha.21+test1';
+const DEXIE_VERSION = '4.0.1-alpha.23';
 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>.";
@@ -3642,6 +3642,228 @@ function idbReady() {
     }).finally(function () { return clearInterval(intervalId); });
 }
 
+function isEmptyRange(node) {
+    return !("from" in node);
+}
+const RangeSet = function (fromOrTree, to) {
+    if (this) {
+        extend(this, arguments.length ? { d: 1, from: fromOrTree, to: arguments.length > 1 ? to : fromOrTree } : { d: 0 });
+    }
+    else {
+        const rv = new RangeSet();
+        if (fromOrTree && ("d" in fromOrTree)) {
+            extend(rv, fromOrTree);
+        }
+        return rv;
+    }
+};
+props(RangeSet.prototype, {
+    add(rangeSet) {
+        mergeRanges(this, rangeSet);
+        return this;
+    },
+    addKey(key) {
+        addRange(this, key, key);
+        return this;
+    },
+    addKeys(keys) {
+        keys.forEach(key => addRange(this, key, key));
+        return this;
+    },
+    [iteratorSymbol]() {
+        return getRangeSetIterator(this);
+    }
+});
+function addRange(target, from, to) {
+    const diff = cmp(from, to);
+    if (isNaN(diff))
+        return;
+    if (diff > 0)
+        throw RangeError();
+    if (isEmptyRange(target))
+        return extend(target, { from, to, d: 1 });
+    const left = target.l;
+    const right = target.r;
+    if (cmp(to, target.from) < 0) {
+        left
+            ? addRange(left, from, to)
+            : (target.l = { from, to, d: 1, l: null, r: null });
+        return rebalance(target);
+    }
+    if (cmp(from, target.to) > 0) {
+        right
+            ? addRange(right, from, to)
+            : (target.r = { from, 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;
+    }
+    const rightWasCutOff = !target.r;
+    if (left && !target.l) {
+        mergeRanges(target, left);
+    }
+    if (right && rightWasCutOff) {
+        mergeRanges(target, right);
+    }
+}
+function mergeRanges(target, newSet) {
+    function _addRangeSet(target, { from, to, l, 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) {
+    const i1 = getRangeSetIterator(rangeSet2);
+    let nextResult1 = i1.next();
+    if (nextResult1.done)
+        return false;
+    let a = nextResult1.value;
+    const i2 = getRangeSetIterator(rangeSet1);
+    let nextResult2 = i2.next(a.from);
+    let 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) {
+    let state = isEmptyRange(node) ? null : { s: 0, n: node };
+    return {
+        next(key) {
+            const 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;
+    const 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);
+    const r = diff > 1 ? "r" : diff < -1 ? "l" : "";
+    if (r) {
+        const l = r === "r" ? "l" : "r";
+        const rootClone = { ...target };
+        const 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({ r, l }) {
+    return (r ? (l ? Math.max(r.d, l.d) : r.d) : l ? l.d : 0) + 1;
+}
+
+function extendObservabilitySet(target, newSet) {
+    keys(newSet).forEach(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((key) => os2[key] && rangesOverlap(os2[key], os1[key]));
+}
+
+const cache = {};
+
+let unsignaledParts = {};
+let isTaskEnqueued = false;
+function signalSubscribersLazily(part) {
+    extendObservabilitySet(unsignaledParts, part);
+    if (!isTaskEnqueued) {
+        isTaskEnqueued = true;
+        queueMicrotask(() => {
+            isTaskEnqueued = false;
+            const parts = unsignaledParts;
+            unsignaledParts = {};
+            signalSubscribersNow(parts);
+        });
+    }
+}
+function signalSubscribersNow(updatedParts, deleteAffectedCacheEntries = false) {
+    const queriesToSignal = new Set();
+    for (const key in updatedParts) {
+        const parts = /^idb\:\/\/(.*)\/(.*)\//.exec(key);
+        if (parts) {
+            const [, dbName, tableName] = parts;
+            const tblCache = cache[`idb://${dbName}/${tableName}`];
+            if (tblCache)
+                signalTableSubscribersNow(tblCache, updatedParts, queriesToSignal, deleteAffectedCacheEntries);
+        }
+    }
+    queriesToSignal.forEach((requery) => requery());
+}
+function signalTableSubscribersNow(tblCache, updatedParts, outQueriesToSignal, deleteAffectedCacheEntries) {
+    const updatedEntryLists = deleteAffectedCacheEntries && [];
+    for (const [indexName, entries] of Object.entries(tblCache.queries.query)) {
+        const filteredEntries = deleteAffectedCacheEntries && [];
+        for (const entry of entries) {
+            if (entry.obsSet && obsSetsOverlap(updatedParts, entry.obsSet)) {
+                entry.subscribers.forEach((requery) => outQueriesToSignal.add(requery));
+            }
+            else if (deleteAffectedCacheEntries) {
+                filteredEntries.push(entry);
+            }
+        }
+        if (deleteAffectedCacheEntries)
+            updatedEntryLists.push([indexName, filteredEntries]);
+    }
+    if (deleteAffectedCacheEntries) {
+        for (const [indexName, filteredEntries] of updatedEntryLists) {
+            tblCache.queries.query[indexName] = filteredEntries;
+        }
+    }
+}
+
 function dexieOpen(db) {
     const state = db._state;
     const { indexedDB } = db._deps;
@@ -3733,10 +3955,10 @@ function dexieOpen(db) {
             }
         });
     }).finally(() => {
-        state.onReadyBeingFired = null;
-        state.isBeingOpened = false;
-    }).then(() => {
-        return db;
+        if (state.openCanceller === openCanceller) {
+            state.onReadyBeingFired = null;
+            state.isBeingOpened = false;
+        }
     }).catch(err => {
         state.dbOpenError = err;
         try {
@@ -3750,6 +3972,20 @@ function dexieOpen(db) {
     }).finally(() => {
         state.openComplete = true;
         resolveDbReady();
+    }).then(() => {
+        if (wasCreated) {
+            const everything = {};
+            db.tables.forEach(table => {
+                table.schema.indexes.forEach(idx => {
+                    if (idx.name)
+                        everything[`idb://${db.name}/${table.name}/${idx.name}`] = new RangeSet(-Infinity, [[[]]]);
+                });
+                everything[`idb://${db.name}/${table.name}/`] = everything[`idb://${db.name}/${table.name}/:dels`] = new RangeSet(-Infinity, [[[]]]);
+            });
+            globalEvents(DEXIE_STORAGE_MUTATED_EVENT_NAME).fire(everything);
+            signalSubscribersNow(everything, true);
+        }
+        return db;
     });
 }
 
@@ -4207,163 +4443,6 @@ const cacheExistingValuesMiddleware = {
     },
 };
 
-function isEmptyRange(node) {
-    return !("from" in node);
-}
-const RangeSet = function (fromOrTree, to) {
-    if (this) {
-        extend(this, arguments.length ? { d: 1, from: fromOrTree, to: arguments.length > 1 ? to : fromOrTree } : { d: 0 });
-    }
-    else {
-        const rv = new RangeSet();
-        if (fromOrTree && ("d" in fromOrTree)) {
-            extend(rv, fromOrTree);
-        }
-        return rv;
-    }
-};
-props(RangeSet.prototype, {
-    add(rangeSet) {
-        mergeRanges(this, rangeSet);
-        return this;
-    },
-    addKey(key) {
-        addRange(this, key, key);
-        return this;
-    },
-    addKeys(keys) {
-        keys.forEach(key => addRange(this, key, key));
-        return this;
-    },
-    [iteratorSymbol]() {
-        return getRangeSetIterator(this);
-    }
-});
-function addRange(target, from, to) {
-    const diff = cmp(from, to);
-    if (isNaN(diff))
-        return;
-    if (diff > 0)
-        throw RangeError();
-    if (isEmptyRange(target))
-        return extend(target, { from, to, d: 1 });
-    const left = target.l;
-    const right = target.r;
-    if (cmp(to, target.from) < 0) {
-        left
-            ? addRange(left, from, to)
-            : (target.l = { from, to, d: 1, l: null, r: null });
-        return rebalance(target);
-    }
-    if (cmp(from, target.to) > 0) {
-        right
-            ? addRange(right, from, to)
-            : (target.r = { from, 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;
-    }
-    const rightWasCutOff = !target.r;
-    if (left && !target.l) {
-        mergeRanges(target, left);
-    }
-    if (right && rightWasCutOff) {
-        mergeRanges(target, right);
-    }
-}
-function mergeRanges(target, newSet) {
-    function _addRangeSet(target, { from, to, l, 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) {
-    const i1 = getRangeSetIterator(rangeSet2);
-    let nextResult1 = i1.next();
-    if (nextResult1.done)
-        return false;
-    let a = nextResult1.value;
-    const i2 = getRangeSetIterator(rangeSet1);
-    let nextResult2 = i2.next(a.from);
-    let 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) {
-    let state = isEmptyRange(node) ? null : { s: 0, n: node };
-    return {
-        next(key) {
-            const 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;
-    const 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);
-    const r = diff > 1 ? "r" : diff < -1 ? "l" : "";
-    if (r) {
-        const l = r === "r" ? "l" : "r";
-        const rootClone = { ...target };
-        const 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({ r, 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 &&
@@ -4387,19 +4466,9 @@ function isCachableRequest(type, req) {
     }
 }
 
-function extendObservabilitySet(target, newSet) {
-    keys(newSet).forEach(part => {
-        if (target[part])
-            mergeRanges(target[part], newSet[part]);
-        else
-            target[part] = cloneSimpleObjectTree(newSet[part]);
-    });
-    return target;
-}
-
 const observabilityMiddleware = {
     stack: "dbcore",
-    level: 10,
+    level: 0,
     name: "Observability",
     create: (core) => {
         const dbName = core.schema.name;
@@ -4407,10 +4476,9 @@ const observabilityMiddleware = {
         return {
             ...core,
             transaction: (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: ${PSD.querier}`);
+                }
                 return core.transaction(stores, mode, options);
             },
             table: (tableName) => {
@@ -4674,8 +4742,6 @@ function applyOptimisticOps(result, req, ops, table, cacheEntry, immutable) {
     return immutable ? Object.freeze(finalResult) : finalResult;
 }
 
-const cache = {};
-
 function areRangesEqual(r1, r2) {
     return (cmp(r1.lower, r2.lower) === 0 &&
         cmp(r1.upper, r2.upper) === 0 &&
@@ -4756,59 +4822,6 @@ function findCompatibleQuery(dbName, tableName, type, req) {
     }
 }
 
-function obsSetsOverlap(os1, os2) {
-    return Object.keys(os1).some((key) => os2[key] && rangesOverlap(os2[key], os1[key]));
-}
-
-let unsignaledParts = {};
-let isTaskEnqueued = false;
-function signalSubscribersLazily(part) {
-    extendObservabilitySet(unsignaledParts, part);
-    if (!isTaskEnqueued) {
-        isTaskEnqueued = true;
-        queueMicrotask(() => {
-            isTaskEnqueued = false;
-            const parts = unsignaledParts;
-            unsignaledParts = {};
-            signalSubscribersNow(parts);
-        });
-    }
-}
-function signalSubscribersNow(updatedParts, deleteAffectedCacheEntries = false) {
-    const queriesToSignal = new Set();
-    for (const key in updatedParts) {
-        const parts = /^idb\:\/\/(.*)\/(.*)\//.exec(key);
-        if (parts) {
-            const [, dbName, tableName] = parts;
-            const tblCache = cache[`idb://${dbName}/${tableName}`];
-            if (tblCache)
-                signalTableSubscribersNow(tblCache, updatedParts, queriesToSignal, deleteAffectedCacheEntries);
-        }
-    }
-    queriesToSignal.forEach((requery) => requery());
-}
-function signalTableSubscribersNow(tblCache, updatedParts, outQueriesToSignal, deleteAffectedCacheEntries) {
-    const updatedEntryLists = deleteAffectedCacheEntries && [];
-    for (const [indexName, entries] of Object.entries(tblCache.queries.query)) {
-        const filteredEntries = deleteAffectedCacheEntries && [];
-        for (const entry of entries) {
-            if (entry.obsSet && obsSetsOverlap(updatedParts, entry.obsSet)) {
-                entry.subscribers.forEach((requery) => outQueriesToSignal.add(requery));
-            }
-            else if (deleteAffectedCacheEntries) {
-                filteredEntries.push(entry);
-            }
-        }
-        if (deleteAffectedCacheEntries)
-            updatedEntryLists.push([indexName, filteredEntries]);
-    }
-    if (deleteAffectedCacheEntries) {
-        for (const [indexName, filteredEntries] of updatedEntryLists) {
-            tblCache.queries.query[indexName] = filteredEntries;
-        }
-    }
-}
-
 function subscribeToCacheEntry(cacheEntry, container, requery, signal) {
     cacheEntry.subscribers.add(requery);
     signal.addEventListener("abort", () => {
@@ -4828,7 +4841,7 @@ function enqueForDeletion(cacheEntry, container) {
 
 const cacheMiddleware = {
     stack: 'dbcore',
-    level: 10,
+    level: 0,
     name: 'Cache',
     create: (core) => {
         const dbName = core.schema.name;
@@ -5089,7 +5102,8 @@ class Dexie$1 {
                 console.warn(`Another connection wants to upgrade database '${this.name}'. Closing db now to resume the upgrade.`);
             else
                 console.warn(`Another connection wants to delete database '${this.name}'. Closing db now to resume the delete request.`);
-            this.close();
+            this.close({ disableAutoOpen: false });
+            this._state.openComplete = false;
         });
         this.on("blocked", ev => {
             if (!ev.newVersion || ev.newVersion < ev.oldVersion)
@@ -5106,10 +5120,10 @@ class Dexie$1 {
                 .map(c => c.on("versionchange").fire(ev));
         };
         this.use(cacheExistingValuesMiddleware);
-        this.use(virtualIndexMiddleware);
-        this.use(hooksMiddleware);
         this.use(cacheMiddleware);
         this.use(observabilityMiddleware);
+        this.use(virtualIndexMiddleware);
+        this.use(hooksMiddleware);
         this.vip = Object.create(this, { _vip: { value: true } });
         addons.forEach(addon => addon(this));
     }
@@ -5185,10 +5199,11 @@ class Dexie$1 {
             state.cancelOpen = reject;
         });
     }
-    close() {
+    close({ disableAutoOpen } = { disableAutoOpen: true }) {
         this._close();
         const 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);
@@ -5198,7 +5213,7 @@ class Dexie$1 {
         const state = this._state;
         return new DexiePromise((resolve, reject) => {
             const doDelete = () => {
-                this.close();
+                this.close({ disableAutoOpen: false });
                 var req = this._deps.indexedDB.deleteDatabase(this.name);
                 req.onsuccess = wrap(() => {
                     _onDatabaseDeleted(this._deps, this.name);
@@ -5390,6 +5405,7 @@ function liveQuery(querier) {
                 subscr,
                 signal: abortController.signal,
                 requery: doQuery,
+                querier,
                 trans: null
             };
             const ret = execute(ctx);