dexie 4.0.1-beta.4 → 4.0.1-beta.6

package/README.md

@@ -250,6 +250,9 @@ Watch
 pnpm run watch
 ```
 
+<br/>
+
+[![Browser testing via LAMDBATEST](https://dexie.org/assets/images/lambdatest2.png)](https://www.lambdatest.com/)
 
 [npm-image]: https://img.shields.io/npm/v/dexie.svg?style=flat
 [npm-url]: https://npmjs.org/package/dexie

package/dist/dexie.d.ts

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-beta.4, Sat Dec 02 2023
+ * Version 4.0.1-beta.6, Mon Dec 18 2023
  *
  * https://dexie.org
  *

package/dist/dexie.js

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-beta.4, Sat Dec 02 2023
+ * Version 4.0.1-beta.6, Mon Dec 18 2023
  *
  * https://dexie.org
  *
@@ -1083,7 +1083,7 @@
         psd.ref = 0;
         psd.global = false;
         psd.id = ++zone_id_counter;
-        var globalEnv = globalPSD.env;
+        globalPSD.env;
         psd.env = patchGlobalPromise ? {
             Promise: DexiePromise,
             PromiseProp: { value: DexiePromise, configurable: true, writable: true },
@@ -1093,8 +1093,6 @@
             any: DexiePromise.any,
             resolve: DexiePromise.resolve,
             reject: DexiePromise.reject,
-            nthen: getPatchedPromiseThen(globalEnv.nthen, psd),
-            gthen: getPatchedPromiseThen(globalEnv.gthen, psd)
         } : {};
         if (props)
             extend(psd, props);
@@ -1141,7 +1139,7 @@
     function zoneEnterEcho(targetZone) {
         ++totalEchoes;
         if (!task.echoes || --task.echoes === 0) {
-            task.echoes = task.id = 0;
+            task.echoes = task.awaits = task.id = 0;
         }
         zoneStack.push(PSD);
         switchToZone(targetZone, true);
@@ -1162,20 +1160,18 @@
         if (currentZone === globalPSD)
             globalPSD.env = snapShot();
         if (patchGlobalPromise) {
-            var GlobalPromise_1 = globalPSD.env.Promise;
+            var GlobalPromise = globalPSD.env.Promise;
             var targetEnv = targetZone.env;
-            nativePromiseProto.then = targetEnv.nthen;
-            GlobalPromise_1.prototype.then = targetEnv.gthen;
             if (currentZone.global || targetZone.global) {
                 Object.defineProperty(_global, 'Promise', targetEnv.PromiseProp);
-                GlobalPromise_1.all = targetEnv.all;
-                GlobalPromise_1.race = targetEnv.race;
-                GlobalPromise_1.resolve = targetEnv.resolve;
-                GlobalPromise_1.reject = targetEnv.reject;
+                GlobalPromise.all = targetEnv.all;
+                GlobalPromise.race = targetEnv.race;
+                GlobalPromise.resolve = targetEnv.resolve;
+                GlobalPromise.reject = targetEnv.reject;
                 if (targetEnv.allSettled)
-                    GlobalPromise_1.allSettled = targetEnv.allSettled;
+                    GlobalPromise.allSettled = targetEnv.allSettled;
                 if (targetEnv.any)
-                    GlobalPromise_1.any = targetEnv.any;
+                    GlobalPromise.any = targetEnv.any;
             }
         }
     }
@@ -1190,8 +1186,6 @@
             any: GlobalPromise.any,
             resolve: GlobalPromise.resolve,
             reject: GlobalPromise.reject,
-            nthen: nativePromiseProto.then,
-            gthen: GlobalPromise.prototype.then
         } : {};
     }
     function usePSD(psd, fn, a1, a2, a3) {
@@ -1220,10 +1214,18 @@
             }
         };
     }
-    function getPatchedPromiseThen(origThen, zone) {
-        return function (onResolved, onRejected) {
-            return origThen.call(this, nativeAwaitCompatibleWrap(onResolved, zone), nativeAwaitCompatibleWrap(onRejected, zone));
-        };
+    function execInGlobalContext(cb) {
+        if (Promise === NativePromise && task.echoes === 0) {
+            if (zoneEchoes === 0) {
+                cb();
+            }
+            else {
+                enqueueNativeMicroTask(cb);
+            }
+        }
+        else {
+            setTimeout(cb, 0);
+        }
     }
     var rejection = DexiePromise.reject;
 
@@ -1269,7 +1271,7 @@
         }
     }
 
-    var DEXIE_VERSION = '4.0.1-beta.4';
+    var DEXIE_VERSION = '4.0.1-beta.6';
     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>.";
@@ -5538,15 +5540,7 @@
                     if (scopeFuncIsAsync) {
                         rv = rv.finally(decrementExpectedAwaits);
                     }
-                    return Promise.resolve(rv).finally(function () {
-                        if (PSD.subscr === ctx.subscr) {
-                            console.warn("Dexie liveQuery()'s querier callback did'nt await all of its spawned promises. Querier source: ".concat(querier));
-                            return new NativePromise(function (resolve) { return setTimeout(resolve, 0); });
-                        }
-                        else if (Promise.PSD) {
-                            return new NativePromise(function (resolve) { return setTimeout(resolve, 0); });
-                        }
-                    });
+                    return rv;
                 }
                 finally {
                     wasRootExec && endMicroTickScope();
@@ -5572,6 +5566,7 @@
             };
             observer.start && observer.start(subscription);
             var startedListening = false;
+            var doQuery = function () { return execInGlobalContext(_doQuery); };
             function shouldNotify() {
                 return obsSetsOverlap(currentObs, accumMuts);
             }
@@ -5612,23 +5607,20 @@
                         globalEvents(DEXIE_STORAGE_MUTATED_EVENT_NAME, mutationListener);
                         startedListening = true;
                     }
-                    observer.next && observer.next(result);
+                    execInGlobalContext(function () { return !closed && 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;
-                        observer.error && observer.error(err);
+                        if (!closed)
+                            execInGlobalContext(function () {
+                                if (closed)
+                                    return;
+                                observer.error && observer.error(err);
+                            });
                     }
                 });
             };
-            var doQuery = function () {
-                if (PSD.global && !Promise.PSD)
-                    _doQuery();
-                else
-                    setTimeout(_doQuery, 0);
-            };
-            doQuery();
+            setTimeout(doQuery, 0);
             return subscription;
         });
         observable.hasValue = function () { return hasValue; };