async-reactivity 2.0.6 → 2.0.8

package/lib/computed.js

@@ -1,4 +1,5 @@
 import Tracker from "./tracker.js";
+import defaultIsEqual from "./defaultIsEqual.js";
 var ComputedState;
 (function (ComputedState) {
     ComputedState[ComputedState["Invalid"] = 0] = "Invalid";
@@ -11,14 +12,16 @@ class CircularDependencyError extends Error {
 }
 export default class Computed extends Tracker {
     getter;
+    isEqual;
     state = ComputedState.Invalid;
     dependencies = new Map();
     computePromise;
     computePromiseActions;
     lastComputeAttemptPromise;
-    constructor(getter) {
+    constructor(getter, isEqual = (defaultIsEqual)) {
         super();
         this.getter = getter;
+        this.isEqual = isEqual;
         this.prepareComputePromise();
     }
     prepareComputePromise() {
@@ -59,20 +62,21 @@ export default class Computed extends Tracker {
         }
         this.state = ComputedState.Computing;
         this.clearDependencies();
-        const lastValue = this._value;
-        this._value = this.getter(this.trackDependency);
-        if (this._value instanceof Promise) {
-            const computeAttemptPromise = this._value
+        const newValue = this.getter(this.trackDependency);
+        if (this.isEqual(newValue, this._value)) {
+            this.handlePromiseThen(this.lastComputeAttemptPromise, this._value);
+            this.validateDependents();
+        }
+        else if (newValue instanceof Promise) {
+            const computeAttemptPromise = newValue
                 .then(result => this.handlePromiseThen(computeAttemptPromise, result))
                 .catch(error => this.handlePromiseCatch(computeAttemptPromise, error));
             this.lastComputeAttemptPromise = computeAttemptPromise;
             this._value = this.computePromise;
         }
         else {
+            this._value = newValue;
             this.handlePromiseThen(this.lastComputeAttemptPromise, this._value);
-            if (lastValue === this._value) {
-                this.validateDependents();
-            }
         }
         return this._value;
     }

package/lib/computed.test.js

@@ -130,6 +130,15 @@ describe('computed', function () {
         assert.strictEqual(c.value, 6);
         assert.strictEqual(gate, 2);
     });
+    it('isEqual', function () {
+        const a = new Ref(1);
+        const b = new Computed((value) => {
+            return value(a);
+        }, (_newValue, oldValue) => oldValue !== undefined);
+        assert.strictEqual(b.value, 1);
+        a.value = 2;
+        assert.strictEqual(b.value, 1);
+    });
 });
 describe('async computed', function () {
     it('getter', async function () {

package/lib/defaultIsEqual.js

@@ -0,0 +1 @@
+export default (v1, v2) => v1 === v2;

package/lib/isEqual.js

@@ -0,0 +1 @@
+export default (v1, v2) => v1 === v2;

package/lib/ref.js

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

package/package.json

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

package/src/computed.test.ts

@@ -152,6 +152,18 @@ describe('computed', function () {
         assert.strictEqual(c.value, 6);
         assert.strictEqual(gate, 2);
     });
+
+    it('isEqual', function() {
+        const a = new Ref(1);
+        const b = new Computed((value) => {
+            return value(a);
+        }, (_newValue, oldValue) => oldValue !== undefined);
+
+        assert.strictEqual(b.value, 1);
+
+        a.value = 2;
+        assert.strictEqual(b.value, 1);
+    });
 });
 
 describe('async computed', function () {

package/src/computed.ts

@@ -1,6 +1,7 @@
 import Dependency from "./dependency.js";
 import Dependent from "./dependent.js";
 import Tracker from "./tracker.js";
+import defaultIsEqual from "./defaultIsEqual.js";
 
 declare type TrackValue = <T>(dependency: Dependency<T>) => T;
 export declare type ComputeFunc<T> = (value: TrackValue) => T;
@@ -17,15 +18,17 @@ class CircularDependencyError extends Error { }
 
 export default class Computed<T> extends Tracker<T> implements Dependent, Dependency<T> {
     getter: ComputeFunc<T>;
+    isEqual: typeof defaultIsEqual<T>;
     private state = ComputedState.Invalid;
     private dependencies = new Map<Dependency<any>, boolean>();
     private computePromise?: T;
     private computePromiseActions?: { resolve: Function, reject: Function };
     private lastComputeAttemptPromise?: Promise<void>;
 
-    constructor(getter: ComputeFunc<T>) {
+    constructor(getter: ComputeFunc<T>, isEqual = defaultIsEqual<T>) {
         super();
         this.getter = getter;
+        this.isEqual = isEqual;
         this.prepareComputePromise();
     }
 
@@ -71,19 +74,19 @@ export default class Computed<T> extends Tracker<T> implements Dependent, Depend
         this.state = ComputedState.Computing;
         this.clearDependencies();
 
-        const lastValue = this._value;
-        this._value = this.getter(this.trackDependency);
-        if (this._value instanceof Promise) {
-            const computeAttemptPromise = this._value
+        const newValue: T = this.getter(this.trackDependency);
+        if (this.isEqual(newValue, this._value)) {
+            this.handlePromiseThen(this.lastComputeAttemptPromise!, this._value);
+            this.validateDependents();
+        } else if (newValue instanceof Promise) {
+            const computeAttemptPromise = newValue
                 .then(result => this.handlePromiseThen(computeAttemptPromise, result))
                 .catch(error => this.handlePromiseCatch(computeAttemptPromise, error)) as Promise<void>;
             this.lastComputeAttemptPromise = computeAttemptPromise;
             this._value = this.computePromise!;
         } else {
+            this._value = newValue;
             this.handlePromiseThen(this.lastComputeAttemptPromise!, this._value);
-            if (lastValue === this._value) {
-                this.validateDependents();
-            }
         }
         return this._value!;
     }

package/src/defaultIsEqual.ts

@@ -0,0 +1 @@
+export default <T>(v1?: T, v2?: T) => v1 === v2;

package/src/ref.ts

@@ -1,10 +1,9 @@
 import Dependency from "./dependency.js";
 import Tracker from "./tracker.js";
-
-const defaultIsEqual = <T>(v1?: T, v2?: T) => v1 === v2;
+import defaultIsEqual from "./defaultIsEqual.js";
 
 export default class Ref<T> extends Tracker<T> implements Dependency<T> {
-    private isEqual: (a?: T, b?: T) => boolean;
+    private isEqual: typeof defaultIsEqual<T>;
 
     constructor(_value: T, isEqual = defaultIsEqual<T>) {
         super();

package/types/computed.d.ts

@@ -1,17 +1,19 @@
 import Dependency from "./dependency.js";
 import Dependent from "./dependent.js";
 import Tracker from "./tracker.js";
+import defaultIsEqual from "./defaultIsEqual.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>;
+    isEqual: typeof defaultIsEqual<T>;
     private state;
     private dependencies;
     private computePromise?;
     private computePromiseActions?;
     private lastComputeAttemptPromise?;
-    constructor(getter: ComputeFunc<T>);
+    constructor(getter: ComputeFunc<T>, isEqual?: (v1?: T | undefined, v2?: T | undefined) => boolean);
     private prepareComputePromise;
     get value(): T;
     private compute;

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;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,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,EAAE,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC;IAClC,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,sDAAoB;IAO/D,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/defaultIsEqual.d.ts

@@ -0,0 +1,3 @@
+declare const _default: <T>(v1?: T, v2?: T) => boolean;
+export default _default;
+//# sourceMappingURL=defaultIsEqual.d.ts.map

package/types/defaultIsEqual.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultIsEqual.d.ts","sourceRoot":"","sources":["../src/defaultIsEqual.ts"],"names":[],"mappings":"yBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC;AAAjC,wBAAgD"}

package/types/isEqual.d.ts

@@ -0,0 +1,3 @@
+declare const _default: <T>(v1?: T, v2?: T) => boolean;
+export default _default;
+//# sourceMappingURL=isEqual.d.ts.map

package/types/isEqual.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isEqual.d.ts","sourceRoot":"","sources":["../src/isEqual.ts"],"names":[],"mappings":"yBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC;AAAjC,wBAAgD"}

package/types/ref.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ref.d.ts","sourceRoot":"","sources":["../src/ref.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,OAAO,MAAM,cAAc,CAAC;AAInC,MAAM,CAAC,OAAO,OAAO,GAAG,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAE,YAAW,UAAU,CAAC,CAAC,CAAC;IACnE,OAAO,CAAC,OAAO,CAA4B;gBAE/B,MAAM,EAAE,CAAC,EAAE,OAAO,sDAAoB;IAMlD,IAAW,KAAK,CAAC,MAAM,EAAE,CAAC,EAMzB;IAED,IAAW,KAAK,IAAI,CAAC,CAEpB;CACJ"}
+{"version":3,"file":"ref.d.ts","sourceRoot":"","sources":["../src/ref.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,OAAO,MAAM,cAAc,CAAC;AAGnC,MAAM,CAAC,OAAO,OAAO,GAAG,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAE,YAAW,UAAU,CAAC,CAAC,CAAC;IACnE,OAAO,CAAC,OAAO,CAA2B;gBAE9B,MAAM,EAAE,CAAC,EAAE,OAAO,sDAAoB;IAMlD,IAAW,KAAK,CAAC,MAAM,EAAE,CAAC,EAMzB;IAED,IAAW,KAAK,IAAI,CAAC,CAEpB;CACJ"}