async-reactivity 2.0.18 → 2.0.19

package/lib/computed.js

@@ -82,7 +82,7 @@ export default class Computed extends Tracker {
     }
     clearDependencies() {
         for (const dependency of this.dependencies.keys()) {
-            dependency.removeDependent(this);
+            dependency.removeDependent(this, this.computePromise);
         }
         this.dependencies.clear();
     }

package/lib/listener.js

@@ -4,6 +4,7 @@ export default class Listener extends Ref {
     start;
     stop;
     listening = false;
+    lastPromise;
     constructor(_value, start, stop, isEqual = (defaultIsEqual)) {
         super(_value, isEqual);
         this.start = start;
@@ -16,13 +17,16 @@ export default class Listener extends Ref {
             this.start();
         }
     }
-    removeDependent(dependent) {
+    removeDependent(dependent, promise = Promise.resolve()) {
         super.removeDependent(dependent);
-        Promise.resolve().then(() => {
-            if (this.dependents.size === 0) {
-                this.listening = false;
-                this.stop();
+        const currentPromise = Promise.all([promise, this.lastPromise]).finally(() => {
+            if (this.lastPromise === currentPromise) {
+                if (this.dependents.size === 0) {
+                    this.listening = false;
+                    this.stop();
+                }
             }
         });
+        this.lastPromise = currentPromise;
     }
 }

package/lib/listener.test.js

@@ -75,4 +75,24 @@ describe('listener', function () {
         b.value;
         assert.strictEqual(gate, 1);
     });
+    it('keep listening when recomputing async', async function () {
+        let gate = 0;
+        const listener = new Listener(1, () => {
+            gate++;
+        }, () => { });
+        const a = new Ref(5);
+        const b = new Computed(async (value) => {
+            await new Promise(resolve => setTimeout(resolve, 50));
+            return value(a) + value(listener);
+        });
+        const c = new Watcher(listener, () => { });
+        b.value;
+        await new Promise(resolve => setTimeout(resolve, 100));
+        assert.strictEqual(gate, 1);
+        a.value = 6;
+        b.value;
+        c.dispose();
+        await new Promise(resolve => setTimeout(resolve, 100));
+        assert.strictEqual(gate, 1);
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "async-reactivity",
-  "version": "2.0.18",
+  "version": "2.0.19",
   "description": "",
   "main": "lib/index.js",
   "types": "types/index.d.ts",

package/src/computed.ts

@@ -21,7 +21,7 @@ export default class Computed<T extends TBase, TBase = T> extends Tracker<T> imp
     isEqual: typeof defaultIsEqual<TBase>;
     private state = ComputedState.Invalid;
     private dependencies = new Map<Dependency<any>, boolean>();
-    private computePromise?: T;
+    private computePromise?: Promise<any>;
     private computePromiseActions?: { resolve: Function, reject: Function };
     private lastComputeAttemptPromise?: Promise<void>;
 
@@ -38,7 +38,7 @@ export default class Computed<T extends TBase, TBase = T> extends Tracker<T> imp
                 resolve,
                 reject
             };
-        }) as unknown as T;
+        });
     }
 
     public get value(): T {
@@ -83,7 +83,7 @@ export default class Computed<T extends TBase, TBase = T> extends Tracker<T> imp
                 .then(result => this.handlePromiseThen(computeAttemptPromise, result))
                 .catch(error => this.handlePromiseCatch(computeAttemptPromise, error)) as Promise<void>;
             this.lastComputeAttemptPromise = computeAttemptPromise;
-            this._value = this.computePromise!;
+            this._value = this.computePromise! as T;
         } else {
             this._value = newValue;
             this.handlePromiseThen(this.lastComputeAttemptPromise!, this._value);
@@ -93,7 +93,7 @@ export default class Computed<T extends TBase, TBase = T> extends Tracker<T> imp
 
     private clearDependencies() {
         for (const dependency of this.dependencies.keys()) {
-            dependency.removeDependent(this);
+            dependency.removeDependent(this, this.computePromise);
         }
         this.dependencies.clear();
     }

package/src/dependency.ts

@@ -3,5 +3,5 @@ import Dependent from "./dependent.js";
 export default interface Dependency<T> {
     get value(): T;
     addDependent(dependent: Dependent): void;
-    removeDependent(dependent: Dependent): void;
+    removeDependent(dependent: Dependent, promise?: Promise<any>): void;
 }

package/src/listener.test.ts

@@ -120,4 +120,34 @@ describe('listener', function () {
         b.value;
         assert.strictEqual(gate, 1);
     });
+
+    it('keep listening when recomputing async', async function() {
+        let gate = 0;
+        const listener = new Listener(
+            1,
+            () => {
+                gate++;
+            },
+            () => {}
+        );
+
+        const a = new Ref(5);
+
+        const b = new Computed(async value => {
+            await new Promise(resolve => setTimeout(resolve, 50));
+            return value(a) + value(listener);
+        });
+
+        const c = new Watcher(listener, () => {});
+
+        b.value;
+        await new Promise(resolve => setTimeout(resolve, 100));
+        assert.strictEqual(gate, 1);
+
+        a.value = 6;
+        b.value;
+        c.dispose();
+        await new Promise(resolve => setTimeout(resolve, 100));
+        assert.strictEqual(gate, 1);
+    });
 });

package/src/listener.ts

@@ -6,6 +6,7 @@ export default class Listener<T extends TBase, TBase = T> extends Ref<T> {
     private start: () => void;
     private stop: () => void;
     private listening = false;
+    private lastPromise: Promise<any> | undefined;
 
     constructor(_value: T, start: () => void, stop: () => void, isEqual = defaultIsEqual<TBase>) {
         super(_value, isEqual);
@@ -22,13 +23,17 @@ export default class Listener<T extends TBase, TBase = T> extends Ref<T> {
         }
     }
 
-    public removeDependent(dependent: Dependent): void {
+    public removeDependent(dependent: Dependent, promise = Promise.resolve()): void {
         super.removeDependent(dependent);
-        Promise.resolve().then(() => {
-            if (this.dependents.size === 0) {
-                this.listening = false;
-                this.stop();
+
+        const currentPromise = Promise.all([promise, this.lastPromise]).finally(() => {
+            if (this.lastPromise === currentPromise) {
+                if (this.dependents.size === 0) {
+                    this.listening = false;
+                    this.stop();
+                }
             }
-        })
+        });
+        this.lastPromise = currentPromise;
     }
 }

package/types/computed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computed.d.ts","sourceRoot":"","sources":["../src/computed.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,MAAM,CAAC,OAAO,MAAM,UAAU,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AACrE,MAAM,CAAC,OAAO,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;AACjF,MAAM,CAAC,OAAO,MAAM,iBAAiB,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;AAWzG,MAAM,CAAC,OAAO,OAAO,QAAQ,CAAC,CAAC,SAAS,KAAK,EAAE,KAAK,GAAG,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAE,YAAW,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IAC5G,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACvB,OAAO,EAAE,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;IACtC,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,cAAc,CAAC,CAAI;IAC3B,OAAO,CAAC,qBAAqB,CAAC,CAA0C;IACxE,OAAO,CAAC,yBAAyB,CAAC,CAAgB;gBAEtC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,oCAAwB;IAOnE,OAAO,CAAC,qBAAqB;IAS7B,IAAW,KAAK,IAAI,CAAC,CAMpB;IAED,OAAO,CAAC,OAAO;IA0Cf,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,eAAe,CAAwC;IAE/D,OAAO,CAAC,iBAAiB;IAMlB,UAAU;IAUV,eAAe;IAKf,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC;IAI3C,OAAO,CAAC,kBAAkB;IAMnB,OAAO;CAOjB"}
+{"version":3,"file":"computed.d.ts","sourceRoot":"","sources":["../src/computed.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,MAAM,CAAC,OAAO,MAAM,UAAU,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AACrE,MAAM,CAAC,OAAO,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;AACjF,MAAM,CAAC,OAAO,MAAM,iBAAiB,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;AAWzG,MAAM,CAAC,OAAO,OAAO,QAAQ,CAAC,CAAC,SAAS,KAAK,EAAE,KAAK,GAAG,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAE,YAAW,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IAC5G,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACvB,OAAO,EAAE,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;IACtC,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,cAAc,CAAC,CAAe;IACtC,OAAO,CAAC,qBAAqB,CAAC,CAA0C;IACxE,OAAO,CAAC,yBAAyB,CAAC,CAAgB;gBAEtC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,oCAAwB;IAOnE,OAAO,CAAC,qBAAqB;IAS7B,IAAW,KAAK,IAAI,CAAC,CAMpB;IAED,OAAO,CAAC,OAAO;IA0Cf,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,eAAe,CAAwC;IAE/D,OAAO,CAAC,iBAAiB;IAMlB,UAAU;IAUV,eAAe;IAKf,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC;IAI3C,OAAO,CAAC,kBAAkB;IAMnB,OAAO;CAOjB"}

package/types/dependency.d.ts

@@ -2,6 +2,6 @@ import Dependent from "./dependent.js";
 export default interface Dependency<T> {
     get value(): T;
     addDependent(dependent: Dependent): void;
-    removeDependent(dependent: Dependent): void;
+    removeDependent(dependent: Dependent, promise?: Promise<any>): void;
 }
 //# sourceMappingURL=dependency.d.ts.map

package/types/dependency.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependency.d.ts","sourceRoot":"","sources":["../src/dependency.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAEvC,MAAM,CAAC,OAAO,WAAW,UAAU,CAAC,CAAC;IACjC,IAAI,KAAK,IAAI,CAAC,CAAC;IACf,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACzC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;CAC/C"}
+{"version":3,"file":"dependency.d.ts","sourceRoot":"","sources":["../src/dependency.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAEvC,MAAM,CAAC,OAAO,WAAW,UAAU,CAAC,CAAC;IACjC,IAAI,KAAK,IAAI,CAAC,CAAC;IACf,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACzC,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;CACvE"}

package/types/listener.d.ts

@@ -4,8 +4,9 @@ export default class Listener<T extends TBase, TBase = T> extends Ref<T> {
     private start;
     private stop;
     private listening;
+    private lastPromise;
     constructor(_value: T, start: () => void, stop: () => void, isEqual?: (v1: TBase, v2: TBase) => boolean);
     addDependent(dependent: Dependent): void;
-    removeDependent(dependent: Dependent): void;
+    removeDependent(dependent: Dependent, promise?: Promise<void>): void;
 }
 //# sourceMappingURL=listener.d.ts.map

package/types/listener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listener.d.ts","sourceRoot":"","sources":["../src/listener.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,GAAG,MAAM,UAAU,CAAC;AAG3B,MAAM,CAAC,OAAO,OAAO,QAAQ,CAAC,CAAC,SAAS,KAAK,EAAE,KAAK,GAAG,CAAC,CAAE,SAAQ,GAAG,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,IAAI,CAAa;IACzB,OAAO,CAAC,SAAS,CAAS;gBAEd,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE,MAAM,IAAI,EAAE,OAAO,oCAAwB;IAOpF,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAQxC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;CASrD"}
+{"version":3,"file":"listener.d.ts","sourceRoot":"","sources":["../src/listener.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,GAAG,MAAM,UAAU,CAAC;AAG3B,MAAM,CAAC,OAAO,OAAO,QAAQ,CAAC,CAAC,SAAS,KAAK,EAAE,KAAK,GAAG,CAAC,CAAE,SAAQ,GAAG,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,IAAI,CAAa;IACzB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAA2B;gBAElC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE,MAAM,IAAI,EAAE,OAAO,oCAAwB;IAOpF,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAQxC,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,gBAAoB,GAAG,IAAI;CAalF"}