async-reactivity 2.0.2 → 2.0.3

package/lib/computed.js

@@ -10,11 +10,14 @@ var ComputedState;
 class CircularDependencyError extends Error {
 }
 export default class Computed extends Tracker {
+    getter;
+    state = ComputedState.Invalid;
+    dependencies = new Map();
+    computePromise;
+    computePromiseActions;
+    lastComputeAttemptPromise;
     constructor(getter) {
         super();
-        this.state = ComputedState.Invalid;
-        this.dependencies = new Map();
-        this.trackDependency = this.innerTrackDependency.bind(this);
         this.getter = getter;
         this.prepareComputePromise();
     }
@@ -91,6 +94,7 @@ export default class Computed extends Tracker {
         dependency.addDependent(this);
         return dependency.value;
     }
+    trackDependency = this.innerTrackDependency.bind(this);
     finalizeComputing() {
         this.state = ComputedState.Valid;
         this.lastComputeAttemptPromise = undefined;

package/lib/computed.test.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import 'mocha';
 import assert from 'assert';
 import { Computed, Ref } from './index.js';
@@ -107,139 +98,119 @@ describe('computed', function () {
     });
 });
 describe('async computed', function () {
-    it('getter', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const a = new Computed(() => __awaiter(this, void 0, void 0, function* () {
-                yield new Promise(resolve => setTimeout(resolve));
-                return 5;
-            }));
-            assert.strictEqual(yield a.value, 5);
-        });
-    });
-    it('tracks async dependencies', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const a = new Ref(5);
-            const b = new Computed((value) => __awaiter(this, void 0, void 0, function* () {
-                yield new Promise(resolve => setTimeout(resolve));
-                return value(a) + 5;
-            }));
-            assert.strictEqual(yield b.value, 10);
-            a.value = 6;
-            assert.strictEqual(yield b.value, 11);
-        });
-    });
-    it('get value while computing', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const a = new Computed(() => __awaiter(this, void 0, void 0, function* () {
-                yield new Promise(resolve => setTimeout(resolve));
-                return 5;
-            }));
-            a.value;
-            assert.strictEqual(yield a.value, 5);
+    it('getter', async function () {
+        const a = new Computed(async () => {
+            await new Promise(resolve => setTimeout(resolve));
+            return 5;
         });
+        assert.strictEqual(await a.value, 5);
     });
-    it('detect circular dependency', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            // @ts-expect-error
-            const a = new Computed((value) => __awaiter(this, void 0, void 0, function* () {
-                yield new Promise(resolve => setTimeout(resolve));
-                return value(b);
-            }));
-            // @ts-expect-error
-            const b = new Computed((value) => __awaiter(this, void 0, void 0, function* () {
-                yield new Promise(resolve => setTimeout(resolve));
-                return value(a);
-            }));
-            assert.rejects(() => __awaiter(this, void 0, void 0, function* () { return yield a.value; }));
-        });
-    });
-    it('dependency changed while computing', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const a = new Ref(5);
-            const b = new Computed((value) => __awaiter(this, void 0, void 0, function* () { return value(a) + 5; }));
-            b.value; // trigger compute
-            a.value = 8;
-            assert.strictEqual(yield b.value, 13);
-        });
-    });
-    it('old dependency changed while computing', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            let gate = 0;
-            const a = new Ref(5);
-            const b = new Computed((value) => __awaiter(this, void 0, void 0, function* () {
-                gate++;
-                yield new Promise(resolve => setTimeout(resolve));
-                return value(a) + 2;
-            }));
-            assert.strictEqual(yield b.value, 7);
-            b.invalidate();
-            const promise = b.value;
-            a.value = 6;
-            assert.strictEqual(yield promise, 8);
-            assert.strictEqual(gate, 2);
-        });
-    });
-    it('new dependency changed while computing', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            let gate = 0;
-            const a = new Ref(5);
-            const b = new Ref(10);
-            const c = new Computed((value) => __awaiter(this, void 0, void 0, function* () {
-                gate++;
-                yield new Promise(resolve => setTimeout(resolve, 50));
-                let sum = value(a);
-                yield new Promise(resolve => setTimeout(resolve, 50));
-                sum += value(b);
-                return sum;
-            }));
-            assert.strictEqual(yield c.value, 15);
-            c.invalidate();
-            const promise = c.value;
-            yield new Promise(resolve => setTimeout(resolve, 60));
-            a.value = 10;
-            assert.strictEqual(yield promise, 20);
-            assert.strictEqual(gate, 3);
-        });
-    });
-    it('fallback to primitive while computing', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const a = new Ref(5);
-            const b = new Ref(10);
-            const c = new Computed((value) => __awaiter(this, void 0, void 0, function* () {
-                if (value(a) < 10) {
-                    yield new Promise(resolve => setTimeout(resolve, 50));
-                    return value(b) + 5;
-                }
-                return 2;
-            }));
-            const promise = c.value;
-            yield new Promise(resolve => setTimeout(resolve, 20));
-            a.value = 10;
-            assert.strictEqual(yield promise, 2);
+    it('tracks async dependencies', async function () {
+        const a = new Ref(5);
+        const b = new Computed(async (value) => {
+            await new Promise(resolve => setTimeout(resolve));
+            return value(a) + 5;
         });
+        assert.strictEqual(await b.value, 10);
+        a.value = 6;
+        assert.strictEqual(await b.value, 11);
     });
-    it('throw error', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const a = new Computed(() => __awaiter(this, void 0, void 0, function* () {
-                yield new Promise(resolve => setTimeout(resolve));
-                throw new Error();
-            }));
-            assert.rejects(() => a.value);
-        });
-    });
-    it('dispose computed', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const a = new Ref(5);
-            let gate = 0;
-            const b = new Computed(value => {
-                gate++;
-                return value(a) + 2;
-            });
-            b.value;
-            assert.strictEqual(gate, 1);
-            b.dispose();
-            b.value;
-            assert.strictEqual(gate, 2);
+    it('get value while computing', async function () {
+        const a = new Computed(async () => {
+            await new Promise(resolve => setTimeout(resolve));
+            return 5;
+        });
+        a.value;
+        assert.strictEqual(await a.value, 5);
+    });
+    it('detect circular dependency', async function () {
+        // @ts-expect-error
+        const a = new Computed(async (value) => {
+            await new Promise(resolve => setTimeout(resolve));
+            return value(b);
+        });
+        // @ts-expect-error
+        const b = new Computed(async (value) => {
+            await new Promise(resolve => setTimeout(resolve));
+            return value(a);
+        });
+        assert.rejects(async () => await a.value);
+    });
+    it('dependency changed while computing', async function () {
+        const a = new Ref(5);
+        const b = new Computed(async (value) => value(a) + 5);
+        b.value; // trigger compute
+        a.value = 8;
+        assert.strictEqual(await b.value, 13);
+    });
+    it('old dependency changed while computing', async function () {
+        let gate = 0;
+        const a = new Ref(5);
+        const b = new Computed(async (value) => {
+            gate++;
+            await new Promise(resolve => setTimeout(resolve));
+            return value(a) + 2;
+        });
+        assert.strictEqual(await b.value, 7);
+        b.invalidate();
+        const promise = b.value;
+        a.value = 6;
+        assert.strictEqual(await promise, 8);
+        assert.strictEqual(gate, 2);
+    });
+    it('new dependency changed while computing', async function () {
+        let gate = 0;
+        const a = new Ref(5);
+        const b = new Ref(10);
+        const c = new Computed(async (value) => {
+            gate++;
+            await new Promise(resolve => setTimeout(resolve, 50));
+            let sum = value(a);
+            await new Promise(resolve => setTimeout(resolve, 50));
+            sum += value(b);
+            return sum;
+        });
+        assert.strictEqual(await c.value, 15);
+        c.invalidate();
+        const promise = c.value;
+        await new Promise(resolve => setTimeout(resolve, 60));
+        a.value = 10;
+        assert.strictEqual(await promise, 20);
+        assert.strictEqual(gate, 3);
+    });
+    it('fallback to primitive while computing', async function () {
+        const a = new Ref(5);
+        const b = new Ref(10);
+        const c = new Computed(async (value) => {
+            if (value(a) < 10) {
+                await new Promise(resolve => setTimeout(resolve, 50));
+                return value(b) + 5;
+            }
+            return 2;
+        });
+        const promise = c.value;
+        await new Promise(resolve => setTimeout(resolve, 20));
+        a.value = 10;
+        assert.strictEqual(await promise, 2);
+    });
+    it('throw error', async function () {
+        const a = new Computed(async () => {
+            await new Promise(resolve => setTimeout(resolve));
+            throw new Error();
         });
+        assert.rejects(() => a.value);
+    });
+    it('dispose computed', async function () {
+        const a = new Ref(5);
+        let gate = 0;
+        const b = new Computed(value => {
+            gate++;
+            return value(a) + 2;
+        });
+        b.value;
+        assert.strictEqual(gate, 1);
+        b.dispose();
+        b.value;
+        assert.strictEqual(gate, 2);
     });
 });

package/lib/ref.js

@@ -1,6 +1,7 @@
 import Tracker from "./tracker.js";
 const defaultIsEqual = (v1, v2) => v1 === v2;
 export default class Ref extends Tracker {
+    isEqual;
     constructor(_value, isEqual = (defaultIsEqual)) {
         super();
         this._value = _value;

package/lib/tracker.js

@@ -1,7 +1,6 @@
 export default class Tracker {
-    constructor() {
-        this.dependents = new Set();
-    }
+    dependents = new Set();
+    _value;
     addDependent(dependent) {
         this.dependents.add(dependent);
     }

package/lib/watcher.js

@@ -6,9 +6,11 @@ var WatchState;
 })(WatchState || (WatchState = {}));
 ;
 export default class Watcher extends Tracker {
+    onChange;
+    dependency;
+    state = WatchState.Valid;
     constructor(dependency, onChange, immediate = true) {
         super();
-        this.state = WatchState.Valid;
         this.onChange = onChange;
         this.dependency = dependency;
         dependency.addDependent(this);
@@ -18,13 +20,18 @@ export default class Watcher extends Tracker {
         }
     }
     invalidate() {
-        this.state = WatchState.Uncertain;
-        const oldValue = this._value;
-        this._value = this.dependency.value;
         if (this.state === WatchState.Uncertain) {
-            this.onChange(this._value, oldValue);
-            this.state = WatchState.Valid;
+            return;
         }
+        this.state = WatchState.Uncertain;
+        Promise.resolve().then(() => {
+            const oldValue = this._value;
+            this._value = this.dependency.value;
+            if (this.state === WatchState.Uncertain) {
+                this.onChange(this._value, oldValue);
+                this.state = WatchState.Valid;
+            }
+        });
     }
     validate() {
         this.state = WatchState.Valid;

package/lib/watcher.test.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import 'mocha';
 import assert from 'assert';
 import { Computed, Ref, Watcher } from './index.js';
@@ -19,55 +10,53 @@ describe('watcher', function () {
         }, false);
         a.value = 6;
     });
-    it('async', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const a = new Computed(() => __awaiter(this, void 0, void 0, function* () {
-                yield new Promise(resolve => setTimeout(resolve));
-                return 10;
-            }));
-            const result = yield new Promise(resolve => new Watcher(a, resolve));
-            assert.strictEqual(result, 10);
+    it('async', async function () {
+        const a = new Computed(async () => {
+            await new Promise(resolve => setTimeout(resolve));
+            return 10;
         });
+        const result = await new Promise(resolve => new Watcher(a, resolve));
+        assert.strictEqual(result, 10);
     });
-    it('sync cancel', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const a = new Ref(5);
-            const b = new Computed((value) => {
-                return value(a) % 2;
-            });
-            let gate = 0;
-            new Watcher(b, () => {
-                gate++;
-            }, false);
-            a.value = 6;
-            assert.strictEqual(gate, 1);
-            a.value = 7;
-            a.value = 9;
-            a.value = 11;
-            assert.strictEqual(gate, 2);
+    it('sync cancel', async function () {
+        const a = new Ref(5);
+        const b = new Computed((value) => {
+            return value(a) % 2;
         });
+        let gate = 0;
+        new Watcher(b, () => {
+            gate++;
+        }, false);
+        a.value = 6;
+        await new Promise(resolve => setTimeout(resolve));
+        assert.strictEqual(gate, 1);
+        a.value = 7;
+        a.value = 9;
+        a.value = 11;
+        await new Promise(resolve => setTimeout(resolve));
+        assert.strictEqual(gate, 2);
     });
-    it('async sync cancel', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const a = new Ref(5);
-            const b = new Computed((value) => __awaiter(this, void 0, void 0, function* () {
-                new Promise(resolve => setTimeout(resolve));
-                return value(a) % 2;
-            }));
-            let gate = 0;
-            new Watcher(b, () => {
-                gate++;
-            }, false);
-            yield new Promise(resolve => setTimeout(resolve, 10));
-            a.value = 6;
-            yield new Promise(resolve => setTimeout(resolve, 10));
-            assert.strictEqual(gate, 1);
-            a.value = 7;
-            yield new Promise(resolve => setTimeout(resolve, 10));
-            assert.strictEqual(gate, 2);
-            a.value = 9;
-            yield new Promise(resolve => setTimeout(resolve, 10));
-            assert.strictEqual(gate, 3);
+    it('async sync cancel', async function () {
+        const a = new Ref(5);
+        let computedGate = 0;
+        const b = new Computed(async (value) => {
+            computedGate++;
+            new Promise(resolve => setTimeout(resolve));
+            return value(a) % 2;
         });
+        let watcherGate = 0;
+        new Watcher(b, () => {
+            watcherGate++;
+        }, false);
+        await new Promise(resolve => setTimeout(resolve, 10));
+        a.value = 6;
+        await new Promise(resolve => setTimeout(resolve, 10));
+        assert.strictEqual(computedGate, 2);
+        assert.strictEqual(watcherGate, 1);
+        a.value = 7;
+        a.value = 9;
+        await new Promise(resolve => setTimeout(resolve, 10));
+        assert.strictEqual(computedGate, 3);
+        assert.strictEqual(watcherGate, 2);
     });
 });

package/package.json

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

package/src/tsconfig.json

@@ -9,7 +9,7 @@
     // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
     /* Language and Environment */
-    "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ESNext", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */

package/src/watcher.test.ts

@@ -31,32 +31,36 @@ describe('watcher', function () {
             gate++;
         }, false);
         a.value = 6;
+        await new Promise(resolve => setTimeout(resolve));
         assert.strictEqual(gate, 1);
         a.value = 7;
         a.value = 9;
         a.value = 11;
+        await new Promise(resolve => setTimeout(resolve));
         assert.strictEqual(gate, 2);
     });
 
     it('async sync cancel', async function () {
         const a = new Ref(5);
+        let computedGate = 0;
         const b = new Computed(async (value) => {
+            computedGate++;
             new Promise(resolve => setTimeout(resolve));
             return value(a) % 2;
         });
-        let gate = 0;
+        let watcherGate = 0;
         new Watcher(b, () => {
-            gate++;
+            watcherGate++;
         }, false);
         await new Promise(resolve => setTimeout(resolve, 10));
         a.value = 6;
         await new Promise(resolve => setTimeout(resolve, 10));
-        assert.strictEqual(gate, 1);
+        assert.strictEqual(computedGate, 2);
+        assert.strictEqual(watcherGate, 1);
         a.value = 7;
-        await new Promise(resolve => setTimeout(resolve, 10));
-        assert.strictEqual(gate, 2);
         a.value = 9;
         await new Promise(resolve => setTimeout(resolve, 10));
-        assert.strictEqual(gate, 3);
+        assert.strictEqual(computedGate, 3);
+        assert.strictEqual(watcherGate, 2);
     });
 });

package/src/watcher.ts

@@ -28,13 +28,18 @@ export default class Watcher<T> extends Tracker<T> implements Dependent {
     }
 
     public invalidate() {
-        this.state = WatchState.Uncertain;
-        const oldValue = this._value;
-        this._value = this.dependency.value;
         if (this.state === WatchState.Uncertain) {
-            this.onChange(this._value, oldValue);
-            this.state = WatchState.Valid;
+            return;
         }
+        this.state = WatchState.Uncertain;
+        Promise.resolve().then(() => {
+            const oldValue = this._value;
+            this._value = this.dependency.value;
+            if (this.state === WatchState.Uncertain) {
+                this.onChange(this._value, oldValue);
+                this.state = WatchState.Valid;
+            }
+        });
     }
 
     public validate() {

package/types/watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,OAAO,MAAM,cAAc,CAAC;AAOnC,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,OAAO,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAE,YAAW,SAAS;IAEnE,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,KAAK,CAAoB;gBAErB,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,SAAS,GAAE,OAAc;IAYpF,UAAU;IAUV,QAAQ;IAIR,OAAO;CAGjB"}
+{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,OAAO,MAAM,cAAc,CAAC;AAOnC,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,OAAO,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAE,YAAW,SAAS;IAEnE,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,KAAK,CAAoB;gBAErB,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,SAAS,GAAE,OAAc;IAYpF,UAAU;IAeV,QAAQ;IAIR,OAAO;CAGjB"}