async-reactivity 2.0.4 → 2.0.6

package/lib/computed.js

@@ -41,8 +41,16 @@ export default class Computed extends Tracker {
                 this.dependencies.set(dependency, true);
             }
             if ([...this.dependencies.keys()].every(d => {
-                d.value;
-                return !this.dependencies.get(d);
+                if (d instanceof Computed) {
+                    if (d.state === ComputedState.Valid) {
+                        return true;
+                    }
+                    else if (d.state === ComputedState.Uncertain) {
+                        d.value;
+                        return !this.dependencies.get(d);
+                    }
+                }
+                return false;
             })) {
                 this.finalizeComputing();
                 this.validateDependents();
@@ -110,6 +118,10 @@ export default class Computed extends Tracker {
             super.invalidate();
         }
     }
+    forceInvalidate() {
+        this.invalidate();
+        this.state = ComputedState.Invalid;
+    }
     validate(dependency) {
         this.dependencies.set(dependency, false);
     }

package/lib/computed.test.js

@@ -92,10 +92,44 @@ describe('computed', function () {
             return value(b) + 5;
         });
         assert.strictEqual(c.value, 6);
+        assert.strictEqual(gate, 1);
+        a.value = 7;
+        assert.strictEqual(c.value, 6);
+        assert.strictEqual(gate, 1);
+    });
+    it('ignore same computed values', function () {
+        let gate = 0;
+        const a = new Ref(5);
+        const b1 = new Computed((value) => {
+            return value(a) % 2;
+        });
+        const b2 = new Computed(() => 5);
+        const c = new Computed((value) => {
+            gate++;
+            return value(b1) + value(b2);
+        });
+        assert.strictEqual(c.value, 6);
+        assert.strictEqual(gate, 1);
         a.value = 7;
         assert.strictEqual(c.value, 6);
         assert.strictEqual(gate, 1);
     });
+    it('compute when forced', function () {
+        let gate = 0;
+        const a = new Ref(5);
+        const b = new Computed((value) => {
+            return value(a) % 2;
+        });
+        const c = new Computed((value) => {
+            gate++;
+            return value(b) + 5;
+        });
+        assert.strictEqual(c.value, 6);
+        assert.strictEqual(gate, 1);
+        c.forceInvalidate();
+        assert.strictEqual(c.value, 6);
+        assert.strictEqual(gate, 2);
+    });
 });
 describe('async computed', function () {
     it('getter', async function () {

package/package.json

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

package/src/computed.test.ts

@@ -107,11 +107,51 @@ describe('computed', function () {
         });
 
         assert.strictEqual(c.value, 6);
+        assert.strictEqual(gate, 1);
+
+        a.value = 7;
+        assert.strictEqual(c.value, 6);
+        assert.strictEqual(gate, 1);
+    });
+
+    it('ignore same computed values', function () {
+        let gate = 0;
+        const a = new Ref(5);
+        const b1 = new Computed((value) => {
+            return value(a) % 2;
+        });
+        const b2 = new Computed(() => 5);
+        const c = new Computed((value) => {
+            gate++;
+            return value(b1) + value(b2);
+        });
+
+        assert.strictEqual(c.value, 6);
+        assert.strictEqual(gate, 1);
 
         a.value = 7;
         assert.strictEqual(c.value, 6);
         assert.strictEqual(gate, 1);
     });
+
+    it('compute when forced', function () {
+        let gate = 0;
+        const a = new Ref(5);
+        const b = new Computed((value) => {
+            return value(a) % 2;
+        });
+        const c = new Computed((value) => {
+            gate++;
+            return value(b) + 5;
+        });
+
+        assert.strictEqual(c.value, 6);
+        assert.strictEqual(gate, 1);
+
+        c.forceInvalidate();
+        assert.strictEqual(c.value, 6);
+        assert.strictEqual(gate, 2);
+    });
 });
 
 describe('async computed', function () {

package/src/computed.ts

@@ -52,8 +52,15 @@ export default class Computed<T> extends Tracker<T> implements Dependent, Depend
                 this.dependencies.set(dependency, true);
             }
             if ([...this.dependencies.keys()].every(d => {
-                d.value;
-                return !this.dependencies.get(d);
+                if (d instanceof Computed) {
+                    if (d.state === ComputedState.Valid) {
+                        return true;
+                    } else if (d.state === ComputedState.Uncertain) {
+                        d.value;
+                        return !this.dependencies.get(d);
+                    }
+                }
+                return false;
             })) {
                 this.finalizeComputing();
                 this.validateDependents();
@@ -129,6 +136,11 @@ export default class Computed<T> extends Tracker<T> implements Dependent, Depend
         }
     }
 
+    public forceInvalidate() {
+        this.invalidate();
+        this.state = ComputedState.Invalid;
+    }
+
     public validate(dependency: Dependency<any>) {
         this.dependencies.set(dependency, false);
     }

package/types/computed.d.ts

@@ -22,6 +22,7 @@ export default class Computed<T> extends Tracker<T> implements Dependent, Depend
     private trackDependency;
     private finalizeComputing;
     invalidate(): void;
+    forceInvalidate(): void;
     validate(dependency: Dependency<any>): void;
     private validateDependents;
     dispose(): void;

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;IAUV,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;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"}