dexie 4.0.1-alpha.11 → 4.0.1-alpha.13

package/dist/dexie.d.ts

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.11, Wed May 24 2023
+ * Version 4.0.1-alpha.13, Wed May 31 2023
  *
  * https://dexie.org
  *
@@ -987,6 +987,8 @@ export interface Unsubscribable {
 export interface Observable<T = any> {
 	subscribe(observerOrNext?: Observer<T> | ((value: T) => void)): Subscription;
 	subscribe(next?: ((value: T) => void) | null, error?: ((error: any) => void) | null, complete?: (() => void) | null): Subscription;
+	getValue?(): T;
+	hasValue?(): boolean;
 	[Symbol.observable]: () => Subscribable<T>;
 }
 export interface Subscription {

package/dist/dexie.js

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.11, Wed May 24 2023
+ * Version 4.0.1-alpha.13, Wed May 31 2023
  *
  * https://dexie.org
  *
@@ -282,6 +282,12 @@
         var i;
         return x != null && (i = x[iteratorSymbol]) && i.apply(x);
     } : function () { return null; };
+    function delArrayItem(a, x) {
+        var i = a.indexOf(x);
+        if (i >= 0)
+            a.splice(i, 1);
+        return i >= 0;
+    }
     var NO_CHAR_ARRAY = {};
     function getArrayOf(arrayLike) {
         var i, a, x, it;
@@ -1254,13 +1260,17 @@
                     return fn(resolve, reject, trans);
                 });
             }).then(function (result) {
-                trans.idbtrans.commit();
+                if (mode === 'readwrite')
+                    try {
+                        trans.idbtrans.commit();
+                    }
+                    catch (_a) { }
                 return mode === 'readonly' ? result : trans._completion.then(function () { return result; });
             });
         }
     }
 
-    var DEXIE_VERSION = '4.0.1-alpha.11';
+    var DEXIE_VERSION = '4.0.1-alpha.13';
     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>.";
@@ -4756,7 +4766,45 @@
         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 &&
@@ -4842,10 +4890,6 @@
         }
     }
 
-    function obsSetsOverlap(os1, os2) {
-        return Object.keys(os1).some(function (key) { return os2[key] && rangesOverlap(os2[key], os1[key]); });
-    }
-
     function signalSubscribers(tblCache, mutatedParts) {
         extendObservabilitySet(tblCache.unsignaledParts, mutatedParts);
         if (!tblCache.signalTimer) {
@@ -4882,9 +4926,7 @@
     function enqueForDeletion(cacheEntry, container) {
         setTimeout(function () {
             if (cacheEntry.subscribers.size === 0) {
-                var pos = container.indexOf(cacheEntry);
-                if (pos > -1)
-                    container.splice(pos, 1);
+                delArrayItem(container, cacheEntry);
             }
         }, 3000);
     }
@@ -4895,7 +4937,7 @@
         name: 'Cache',
         create: function (core) {
             var dbName = core.schema.name;
-            return __assign(__assign({}, core), { transaction: function (stores, mode, options) {
+            var coreMW = __assign(__assign({}, core), { transaction: function (stores, mode, options) {
                     var idbtrans = core.transaction(stores, mode, options);
                     var txs = PSD.txs;
                     if (txs || mode === 'readwrite') {
@@ -4904,13 +4946,11 @@
                         var ac_1 = new AbortController();
                         var signal = ac_1.signal;
                         var endTransaction = function (wasCommitted) { return function () {
-                            if (txs) {
-                                var idx = txs.indexOf(idbtrans);
-                                if (idx > -1)
-                                    txs.splice(idx, 1);
-                            }
+                            if (txs)
+                                delArrayItem(txs, idbtrans);
                             ac_1.abort();
                             if (mode === 'readwrite') {
+                                var affectedSubscribers_1 = new Set();
                                 for (var _i = 0, stores_1 = stores; _i < stores_1.length; _i++) {
                                     var storeName = stores_1[_i];
                                     var tblCache = cache["idb://".concat(dbName, "/").concat(storeName)];
@@ -4930,8 +4970,8 @@
                                                             var freezeResults = Object.isFrozen(entry.res);
                                                             var modRes = applyOptimisticOps(entry.res, entry.req, ops, table, entry, freezeResults);
                                                             if (entry.dirty) {
-                                                                entries.splice(entries.indexOf(entry), 1);
-                                                                entry.subscribers.forEach(function (requery) { return requery(); });
+                                                                delArrayItem(entries, entry);
+                                                                entry.subscribers.forEach(function (requery) { return affectedSubscribers_1.add(requery); });
                                                             }
                                                             else if (modRes !== entry.res) {
                                                                 entry.res = modRes;
@@ -4940,9 +4980,9 @@
                                                         }
                                                         else {
                                                             if (entry.dirty) {
-                                                                entries.splice(entries.indexOf(entry), 1);
+                                                                delArrayItem(entries, entry);
                                                             }
-                                                            entry.subscribers.forEach(function (requery) { return requery(); });
+                                                            entry.subscribers.forEach(function (requery) { return affectedSubscribers_1.add(requery); });
                                                         }
                                                     }
                                                 }
@@ -4950,6 +4990,7 @@
                                         }
                                     }
                                 }
+                                affectedSubscribers_1.forEach(function (requery) { return requery(); });
                             }
                         }; };
                         idbtrans.addEventListener('abort', endTransaction(false), {
@@ -4966,7 +5007,7 @@
                 }, table: function (tableName) {
                     var downTable = core.table(tableName);
                     var primKey = downTable.schema.primaryKey;
-                    return __assign(__assign({}, downTable), { mutate: function (req) {
+                    var tableMW = __assign(__assign({}, downTable), { mutate: function (req) {
                             if (primKey.outbound ||
                                 PSD.trans.db._options.cache === 'disabled'
                             ) {
@@ -4993,7 +5034,7 @@
                                 tblCache.optimisticOps.push(req);
                                 signalSubscribers(tblCache, req.mutatedParts);
                                 promise.catch(function () {
-                                    tblCache.optimisticOps.splice(tblCache.optimisticOps.indexOf(req), 1);
+                                    delArrayItem(tblCache.optimisticOps, req);
                                     signalSubscribers(tblCache, req.mutatedParts);
                                 });
                             }
@@ -5021,10 +5062,20 @@
                                         res.result = deepClone(result);
                                     }
                                     return res;
+                                }).catch(function (error) {
+                                    if (container && cacheEntry)
+                                        delArrayItem(container, cacheEntry);
+                                    return Promise.reject(error);
                                 });
                                 cacheEntry = {
                                     obsSet: req.obsSet,
-                                    promise: promise,
+                                    promise: promise.catch(function (error) {
+                                        if (req.trans.aborted) {
+                                            var trans = coreMW.transaction([tableName], 'readonly');
+                                            return tableMW.query(__assign(__assign({}, req), { trans: trans }));
+                                        }
+                                        return Promise.reject(error);
+                                    }),
                                     subscribers: new Set(),
                                     type: 'query',
                                     req: req,
@@ -5056,7 +5107,9 @@
                                 };
                             });
                         } });
+                    return tableMW;
                 } });
+            return coreMW;
         },
     };
 
@@ -5394,7 +5447,9 @@
     }
 
     function liveQuery(querier) {
-        return new Observable(function (observer) {
+        var hasValue = false;
+        var currentValue = undefined;
+        var observable = new Observable(function (observer) {
             var scopeFuncIsAsync = isAsyncFunction(querier);
             function execute(ctx) {
                 if (scopeFuncIsAsync) {
@@ -5416,14 +5471,20 @@
                     return closed;
                 },
                 unsubscribe: function () {
+                    if (closed)
+                        return;
                     closed = true;
                     if (abortController)
                         abortController.abort();
-                    globalEvents.storagemutated.unsubscribe(mutationListener);
-                    txs.forEach(function (idbtrans) { try {
-                        idbtrans.abort();
-                    }
-                    catch (_a) { } });
+                    if (startedListening)
+                        globalEvents.storagemutated.unsubscribe(mutationListener);
+                    txs.forEach(function (idbtrans) {
+                        idbtrans.aborted = true;
+                        try {
+                            idbtrans.abort();
+                        }
+                        catch (_a) { }
+                    });
                 },
             };
             observer.start && observer.start(subscription);
@@ -5449,10 +5510,13 @@
                     abortController.abort();
                 abortController = new AbortController();
                 if (txs.length) {
-                    txs.forEach(function (idbtrans) { try {
-                        idbtrans.abort();
-                    }
-                    catch (_a) { } });
+                    txs.forEach(function (idbtrans) {
+                        idbtrans.aborted = true;
+                        try {
+                            idbtrans.abort();
+                        }
+                        catch (_a) { }
+                    });
                     txs.length = 0;
                 }
                 var ctx = {
@@ -5463,18 +5527,21 @@
                     trans: null
                 };
                 var ret = execute(ctx);
-                if (!startedListening) {
-                    globalEvents(DEXIE_STORAGE_MUTATED_EVENT_NAME, mutationListener);
-                    startedListening = true;
-                }
                 Promise.resolve(ret).then(function (result) {
+                    hasValue = true;
+                    currentValue = result;
                     if (closed || ctx.signal.aborted) {
                         return;
                     }
                     accumMuts = {};
                     currentObs = subscr;
+                    if (keys(currentObs).length > 0 && !startedListening) {
+                        globalEvents(DEXIE_STORAGE_MUTATED_EVENT_NAME, mutationListener);
+                        startedListening = true;
+                    }
                     observer.next && observer.next(result);
                 }, function (err) {
+                    hasValue = false;
                     if (!['DatabaseClosedError', 'AbortError'].includes(err === null || err === void 0 ? void 0 : err.name)) {
                         if (closed)
                             return;
@@ -5485,6 +5552,9 @@
             doQuery();
             return subscription;
         });
+        observable.hasValue = function () { return hasValue; };
+        observable.getValue = function () { return currentValue; };
+        return observable;
     }
 
     var Dexie = Dexie$1;
@@ -5600,6 +5670,7 @@
         try {
             propagatingLocally = true;
             globalEvents.storagemutated.fire(updateParts);
+            invalidateCachedQueries(updateParts);
         }
         finally {
             propagatingLocally = wasMe;