async-reactivity 1.1.2 → 1.1.3

package/lib/ref.js

@@ -1,23 +1,23 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const tracker_js_1 = __importDefault(require("./tracker.js"));
-class Ref extends tracker_js_1.default {
-    constructor(_value) {
-        super();
-        this._value = _value;
-    }
-    set value(_value) {
-        const lastValue = this._value;
-        this._value = _value;
-        if (lastValue !== _value) {
-            this.invalidate();
-        }
-    }
-    get value() {
-        return super.value;
-    }
-}
-exports.default = Ref;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const tracker_js_1 = __importDefault(require("./tracker.js"));
+class Ref extends tracker_js_1.default {
+    constructor(_value) {
+        super();
+        this._value = _value;
+    }
+    set value(_value) {
+        const lastValue = this._value;
+        this._value = _value;
+        if (lastValue !== _value) {
+            this.invalidate();
+        }
+    }
+    get value() {
+        return super.value;
+    }
+}
+exports.default = Ref;

package/lib/tracker.js

@@ -1,22 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class Tracker {
-    constructor() {
-        this.dependents = new Set();
-    }
-    addDependent(dependent) {
-        this.dependents.add(dependent);
-    }
-    removeDependent(dependent) {
-        this.dependents.delete(dependent);
-    }
-    invalidate() {
-        for (const dependent of [...this.dependents.keys()]) {
-            dependent.invalidate();
-        }
-    }
-    get value() {
-        return this._value;
-    }
-}
-exports.default = Tracker;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Tracker {
+    constructor() {
+        this.dependents = new Set();
+    }
+    addDependent(dependent) {
+        this.dependents.add(dependent);
+    }
+    removeDependent(dependent) {
+        this.dependents.delete(dependent);
+    }
+    invalidate() {
+        for (const dependent of [...this.dependents.keys()]) {
+            dependent.invalidate();
+        }
+    }
+    get value() {
+        return this._value;
+    }
+}
+exports.default = Tracker;

package/lib/watcher.js

@@ -1,41 +1,41 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const tracker_js_1 = __importDefault(require("./tracker.js"));
-var WatchState;
-(function (WatchState) {
-    WatchState[WatchState["Uncertain"] = 0] = "Uncertain";
-    WatchState[WatchState["Valid"] = 1] = "Valid";
-})(WatchState || (WatchState = {}));
-;
-class Watcher extends tracker_js_1.default {
-    constructor(dependency, onChange, immediate = true) {
-        super();
-        this.state = WatchState.Valid;
-        this.onChange = onChange;
-        this.dependency = dependency;
-        dependency.addDependent(this);
-        this._value = dependency.value;
-        if (immediate) {
-            onChange(this._value);
-        }
-    }
-    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;
-        }
-    }
-    validate() {
-        this.state = WatchState.Valid;
-    }
-    dispose() {
-        this.dependency.removeDependent(this);
-    }
-}
-exports.default = Watcher;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const tracker_js_1 = __importDefault(require("./tracker.js"));
+var WatchState;
+(function (WatchState) {
+    WatchState[WatchState["Uncertain"] = 0] = "Uncertain";
+    WatchState[WatchState["Valid"] = 1] = "Valid";
+})(WatchState || (WatchState = {}));
+;
+class Watcher extends tracker_js_1.default {
+    constructor(dependency, onChange, immediate = true) {
+        super();
+        this.state = WatchState.Valid;
+        this.onChange = onChange;
+        this.dependency = dependency;
+        dependency.addDependent(this);
+        this._value = dependency.value;
+        if (immediate) {
+            onChange(this._value);
+        }
+    }
+    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;
+        }
+    }
+    validate() {
+        this.state = WatchState.Valid;
+    }
+    dispose() {
+        this.dependency.removeDependent(this);
+    }
+}
+exports.default = Watcher;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "async-reactivity",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "",
   "main": "lib/index.js",
   "types": "types/index.d.ts",
@@ -17,9 +17,9 @@
   "author": "Donatas Lučiūnas",
   "license": "ISC",
   "devDependencies": {
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^17.0.41",
-    "mocha": "^10.0.0",
-    "typescript": "^4.7.3"
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^20.10.5",
+    "mocha": "^10.2.0",
+    "typescript": "^5.3.3"
   }
 }

package/src/computed.ts

@@ -121,7 +121,8 @@ export default class Computed<T> extends Tracker<T> implements Dependent, Depend
 
     public invalidate() {
         if (this.state === ComputedState.Computing) {
-            setTimeout(this.compute.bind(this));
+            this.lastComputeAttemptPromise = undefined;     // prevent finalizeComputing if it is in the event loop already
+            Promise.resolve().then(this.compute.bind(this));
         } else if (this.state === ComputedState.Valid) {
             this.state = ComputedState.Uncertain;
             super.invalidate();

package/src/index.test.ts

@@ -173,6 +173,14 @@ describe('async reactivity', function () {
             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);

package/types/computed.d.ts

@@ -1,30 +1,30 @@
-import Dependency from "./dependency.js";
-import Dependent from "./dependent.js";
-import Tracker from "./tracker.js";
-declare type TrackValue = <T>(dependency: Dependency<T>) => T;
-export declare type ComputeFunc<T> = (value: TrackValue) => T;
-export declare type ComputeFuncScoped<T1, T2> = (value: TrackValue, scope: T1) => T2;
-export default class Computed<T> extends Tracker<T> implements Dependent, Dependency<T> {
-    getter: ComputeFunc<T>;
-    private state;
-    private dependencies;
-    private computePromise?;
-    private computePromiseActions?;
-    private lastComputeAttemptPromise?;
-    constructor(getter: ComputeFunc<T>);
-    private prepareComputePromise;
-    get value(): T;
-    private compute;
-    private clearDependencies;
-    private handlePromiseThen;
-    private handlePromiseCatch;
-    private innerTrackDependency;
-    private trackDependency;
-    private finalizeComputing;
-    invalidate(): void;
-    validate(dependency: Dependency<any>): void;
-    private validateDependents;
-    dispose(): void;
-}
-export {};
+import Dependency from "./dependency.js";
+import Dependent from "./dependent.js";
+import Tracker from "./tracker.js";
+declare type TrackValue = <T>(dependency: Dependency<T>) => T;
+export declare type ComputeFunc<T> = (value: TrackValue) => T;
+export declare type ComputeFuncScoped<T1, T2> = (value: TrackValue, scope: T1) => T2;
+export default class Computed<T> extends Tracker<T> implements Dependent, Dependency<T> {
+    getter: ComputeFunc<T>;
+    private state;
+    private dependencies;
+    private computePromise?;
+    private computePromiseActions?;
+    private lastComputeAttemptPromise?;
+    constructor(getter: ComputeFunc<T>);
+    private prepareComputePromise;
+    get value(): T;
+    private compute;
+    private clearDependencies;
+    private handlePromiseThen;
+    private handlePromiseCatch;
+    private innerTrackDependency;
+    private trackDependency;
+    private finalizeComputing;
+    invalidate(): void;
+    validate(dependency: Dependency<any>): void;
+    private validateDependents;
+    dispose(): void;
+}
+export {};
 //# sourceMappingURL=computed.d.ts.map

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;AAEnC,OAAO,MAAM,UAAU,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAC9D,MAAM,CAAC,OAAO,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,KAAK,CAAC,CAAC;AAC9D,MAAM,CAAC,OAAO,MAAM,iBAAiB,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC;AAWrF,MAAM,CAAC,OAAO,OAAO,QAAQ,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAE,YAAW,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IACnF,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACvB,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;IAMlC,OAAO,CAAC,qBAAqB;IAS7B,IAAW,KAAK,IAAI,CAAC,CAMpB;IAED,OAAO,CAAC,OAAO;IAmCf,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;IASV,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;AAEnC,OAAO,MAAM,UAAU,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAC9D,MAAM,CAAC,OAAO,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,KAAK,CAAC,CAAC;AAC9D,MAAM,CAAC,OAAO,MAAM,iBAAiB,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC;AAWrF,MAAM,CAAC,OAAO,OAAO,QAAQ,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAE,YAAW,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IACnF,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACvB,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;IAMlC,OAAO,CAAC,qBAAqB;IAS7B,IAAW,KAAK,IAAI,CAAC,CAMpB;IAED,OAAO,CAAC,OAAO;IAmCf,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,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC;IAI3C,OAAO,CAAC,kBAAkB;IAMnB,OAAO;CAOjB"}

package/types/dependency.d.ts

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

package/types/dependent.d.ts

@@ -1,7 +1,7 @@
-import Dependency from "./dependency.js";
-export default interface Dependent {
-    invalidate(): void;
-    validate(dependency: Dependency<any>): void;
-    dispose(): void;
-}
+import Dependency from "./dependency.js";
+export default interface Dependent {
+    invalidate(): void;
+    validate(dependency: Dependency<any>): void;
+    dispose(): void;
+}
 //# sourceMappingURL=dependent.d.ts.map

package/types/index.d.ts

@@ -1,6 +1,6 @@
-export { default as Computed, ComputeFunc, ComputeFuncScoped } from './computed.js';
-export { default as Ref } from './ref.js';
-export { default as Watcher } from './watcher.js';
-export { default as Dependency } from './dependency.js';
-export { default as Dependent } from './dependent.js';
+export { default as Computed, ComputeFunc, ComputeFuncScoped } from './computed.js';
+export { default as Ref } from './ref.js';
+export { default as Watcher } from './watcher.js';
+export { default as Dependency } from './dependency.js';
+export { default as Dependent } from './dependent.js';
 //# sourceMappingURL=index.d.ts.map

package/types/index.test.d.ts

@@ -1,2 +1,2 @@
-import 'mocha';
+import 'mocha';
 //# sourceMappingURL=index.test.d.ts.map

package/types/ref.d.ts

@@ -1,8 +1,8 @@
-import Dependency from "./dependency.js";
-import Tracker from "./tracker.js";
-export default class Ref<T> extends Tracker<T> implements Dependency<T> {
-    constructor(_value: T);
-    set value(_value: T);
-    get value(): T;
-}
+import Dependency from "./dependency.js";
+import Tracker from "./tracker.js";
+export default class Ref<T> extends Tracker<T> implements Dependency<T> {
+    constructor(_value: T);
+    set value(_value: T);
+    get value(): T;
+}
 //# sourceMappingURL=ref.d.ts.map

package/types/tracker.d.ts

@@ -1,13 +1,13 @@
-import Computed from "./computed.js";
-import Watcher from "./watcher.js";
-type Dependent = Computed<any> | Watcher<any>;
-export default class Tracker<T> {
-    protected dependents: Set<Dependent>;
-    protected _value?: T;
-    addDependent(dependent: Dependent): void;
-    removeDependent(dependent: Dependent): void;
-    invalidate(): void;
-    get value(): T | undefined;
-}
-export {};
+import Computed from "./computed.js";
+import Watcher from "./watcher.js";
+type Dependent = Computed<any> | Watcher<any>;
+export default class Tracker<T> {
+    protected dependents: Set<Dependent>;
+    protected _value?: T;
+    addDependent(dependent: Dependent): void;
+    removeDependent(dependent: Dependent): void;
+    invalidate(): void;
+    get value(): T | undefined;
+}
+export {};
 //# sourceMappingURL=tracker.d.ts.map

package/types/watcher.d.ts

@@ -1,15 +1,15 @@
-import Dependency from "./dependency.js";
-import Dependent from "./dependent.js";
-import Tracker from "./tracker.js";
-type onChangeFunc<T> = (newValue: T, oldValue?: T) => void;
-export default class Watcher<T> extends Tracker<T> implements Dependent {
-    private onChange;
-    private dependency;
-    private state;
-    constructor(dependency: Dependency<T>, onChange: onChangeFunc<T>, immediate?: boolean);
-    invalidate(): void;
-    validate(): void;
-    dispose(): void;
-}
-export {};
+import Dependency from "./dependency.js";
+import Dependent from "./dependent.js";
+import Tracker from "./tracker.js";
+type onChangeFunc<T> = (newValue: T, oldValue?: T) => void;
+export default class Watcher<T> extends Tracker<T> implements Dependent {
+    private onChange;
+    private dependency;
+    private state;
+    constructor(dependency: Dependency<T>, onChange: onChangeFunc<T>, immediate?: boolean);
+    invalidate(): void;
+    validate(): void;
+    dispose(): void;
+}
+export {};
 //# sourceMappingURL=watcher.d.ts.map