async-reactivity 2.0.24 → 2.0.26

package/lib/computed.js

@@ -15,7 +15,7 @@ export default class Computed extends Tracker {
     getter;
     isEqual;
     state = ComputedState.Invalid;
-    dependencies = new Map(); // boolean indicates whether value is up to date in regards to the dependency (false - up to date, true - needs update)
+    dependencies = new Map(); // boolean indicates whether value is in sync with the dependency
     computePromise;
     computePromiseActions;
     lastComputeAttemptPromise;
@@ -50,14 +50,14 @@ export default class Computed extends Tracker {
     }
     compute() {
         if (this.state === ComputedState.Uncertain) {
-            const upToDate = ![...this.dependencies.entries()].some(([d, needsUpdate]) => {
-                if (needsUpdate && d instanceof Computed && d.state === ComputedState.Uncertain) {
+            const inSync = [...this.dependencies.entries()].every(([d, inSync]) => {
+                if (!inSync && d instanceof Computed && d.state === ComputedState.Uncertain) {
                     d.value;
                     return this.dependencies.get(d);
                 }
-                return needsUpdate;
+                return inSync;
             });
-            if (upToDate) {
+            if (inSync) {
                 this.finalizeComputing();
                 this.validateDependents();
                 return this._value;
@@ -112,7 +112,7 @@ export default class Computed extends Tracker {
         if (this.dependents.has(dependency)) {
             throw new CircularDependencyError();
         }
-        this.dependencies.set(dependency, false);
+        this.dependencies.set(dependency, true);
         dependency.addDependent(this);
         return dependency.value;
     }
@@ -124,20 +124,20 @@ export default class Computed extends Tracker {
         this.prepareComputePromise();
     }
     invalidate(dependency) {
+        if (dependency) {
+            this.dependencies.set(dependency, false);
+        }
+        else {
+            for (const dep of this.dependencies.keys()) {
+                this.dependencies.set(dep, false);
+            }
+        }
         if (this.state === ComputedState.Computing) {
             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;
-            if (dependency) {
-                this.dependencies.set(dependency, true);
-            }
-            else {
-                for (const dep of this.dependencies.keys()) {
-                    this.dependencies.set(dep, true);
-                }
-            }
             super.invalidate();
         }
     }
@@ -148,7 +148,7 @@ export default class Computed extends Tracker {
         }
     }
     validate(dependency) {
-        this.dependencies.set(dependency, false);
+        this.dependencies.set(dependency, true);
     }
     validateDependents() {
         for (const dependent of this.dependents.keys()) {

package/lib/watcher.js

@@ -34,7 +34,6 @@ export default class Watcher extends Tracker {
         });
     }
     validate() {
-        console.log('validate');
         this.state = WatchState.Valid;
     }
     dispose() {

package/package.json

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

package/src/computed.ts

@@ -22,7 +22,7 @@ export default class Computed<T> extends Tracker<T> implements Dependent, Depend
     getter: ComputeFunc<T>;
     isEqual: typeof defaultIsEqual<T>;
     private state = ComputedState.Invalid;
-    private dependencies = new Map<Dependency<unknown>, boolean>();   // boolean indicates whether value is up to date in regards to the dependency (false - up to date, true - needs update)
+    private dependencies = new Map<Dependency<unknown>, boolean>();   // boolean indicates whether value is in sync with the dependency
     private computePromise?: Promise<unknown>;
     private computePromiseActions?: { resolve: Function, reject: Function };
     private lastComputeAttemptPromise?: Promise<void>;
@@ -63,14 +63,14 @@ export default class Computed<T> extends Tracker<T> implements Dependent, Depend
 
     private compute() {
         if (this.state === ComputedState.Uncertain) {
-            const upToDate = ![...this.dependencies.entries()].some(([d, needsUpdate]) => {
-                if (needsUpdate && d instanceof Computed && d.state === ComputedState.Uncertain) {
+            const inSync = [...this.dependencies.entries()].every(([d, inSync]) => {
+                if (!inSync && d instanceof Computed && d.state === ComputedState.Uncertain) {
                     d.value;
                     return this.dependencies.get(d);
                 }
-                return needsUpdate;
+                return inSync;
             });
-            if (upToDate) {
+            if (inSync) {
                 this.finalizeComputing();
                 this.validateDependents();
                 return this._value!;
@@ -128,7 +128,7 @@ export default class Computed<T> extends Tracker<T> implements Dependent, Depend
         if (this.dependents.has(dependency as any)) {
             throw new CircularDependencyError();
         }
-        this.dependencies.set(dependency, false);
+        this.dependencies.set(dependency, true);
         dependency.addDependent(this);
         return dependency.value;
     }
@@ -143,18 +143,18 @@ export default class Computed<T> extends Tracker<T> implements Dependent, Depend
     }
 
     public invalidate(dependency?: Dependency<unknown>) {
+        if (dependency) {
+            this.dependencies.set(dependency, false);
+        } else {
+            for (const dep of this.dependencies.keys()) {
+                this.dependencies.set(dep, false);
+            }
+        }
         if (this.state === ComputedState.Computing) {
             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;
-            if (dependency) {
-                this.dependencies.set(dependency, true);
-            } else {
-                for (const dep of this.dependencies.keys()) {
-                    this.dependencies.set(dep, true);
-                }
-            }
             super.invalidate();
         }
     }
@@ -167,7 +167,7 @@ export default class Computed<T> extends Tracker<T> implements Dependent, Depend
     }
 
     public validate(dependency: Dependency<unknown>) {
-        this.dependencies.set(dependency, false);
+        this.dependencies.set(dependency, true);
     }
 
     private validateDependents() {

package/src/watcher.ts

@@ -43,7 +43,6 @@ export default class Watcher<T> extends Tracker<T> implements Dependent {
     }
 
     public validate() {
-        console.log('validate');
         this.state = WatchState.Valid;
     }
 

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;IAeV,QAAQ;IAKR,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"}