watch-state 3.5.2 → 3.6.1

package/Compute/Compute.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from '../Observable';
-import type { Destructor, Observer, Watcher } from '../types';
+import type { Destructor, Observer, Reaction, Watcher } from '../types';
 export declare function forceQueueWatchers(): void;
 export declare function queueWatchers(observers: Set<Observer>): void;
 export declare function invalidateCompute(observer: Observer): void;
@@ -41,10 +41,12 @@ export declare function invalidateCompute(observer: Observer): void;
  * // Triggers part of chain: fullName → name
  */
 export declare class Compute<V = unknown> extends Observable<V> implements Observer {
+    readonly reaction: Watcher<V> | Reaction<V>;
     /** Indicates if computed value is stale and needs recalculation. */
     invalid: boolean;
     /** Tracks if the computation has run at least once. */
     updated: boolean;
+    raw: V;
     /**
      * Indicates if observer has been destroyed.
      * Prevents accidental use after cleanup.
@@ -55,11 +57,16 @@ export declare class Compute<V = unknown> extends Observable<V> implements Obser
     /** Cleanup functions to run on destroy (e.g., unsubscribes). */
     readonly destructors: Set<Destructor>;
     /** Child watchers created within this watcher's scope */
-    readonly childrenObservers: Set<Observer>;
+    readonly children: Set<Observer>;
+    /** @deprecated Use `children` */
+    get childrenObservers(): Set<Observer>;
     /** @deprecated Use `childrenObservers` */
     get childWatchers(): Set<Observer>;
-    readonly watcher: Watcher<V>;
-    constructor(watcher: Watcher<V>, freeParent?: boolean, fireImmediately?: boolean);
+    /** @deprecated Use `reaction` */
+    get watcher(): Watcher<V> | Reaction<V>;
+    constructor(reaction: Reaction<V>, freeParent?: boolean, fireImmediately?: boolean);
+    /** @deprecated `update` argument is deprecated, use `Reaction` */
+    constructor(reaction: Watcher<V>, freeParent?: boolean, fireImmediately?: boolean);
     /** Mark computation as invalid and trigger propagation to parent observers. */
     update(): void;
     forceUpdate(): void;

package/Compute/Compute.es6.js

@@ -101,13 +101,24 @@ function invalidateCompute(observer) {
  * // Triggers part of chain: fullName → name
  */
 class Compute extends Observable {
+    // TODO: remove in major release
+    /** @deprecated Use `children` */
+    get childrenObservers() {
+        return this.children;
+    }
     // TODO: remove in major release
     /** @deprecated Use `childrenObservers` */
     get childWatchers() {
-        return this.childrenObservers;
+        return this.children;
+    }
+    // TODO: remove in major release
+    /** @deprecated Use `reaction` */
+    get watcher() {
+        return this.reaction;
     }
-    constructor(watcher, freeParent, fireImmediately) {
+    constructor(reaction, freeParent, fireImmediately) {
         super();
+        this.reaction = reaction;
         /** Indicates if computed value is stale and needs recalculation. */
         this.invalid = true;
         /** Tracks if the computation has run at least once. */
@@ -123,8 +134,7 @@ class Compute extends Observable {
         /** Cleanup functions to run on destroy (e.g., unsubscribes). */
         this.destructors = new Set();
         /** Child watchers created within this watcher's scope */
-        this.childrenObservers = new Set();
-        this.watcher = watcher;
+        this.children = new Set();
         if (!freeParent) {
             bindObserver(this);
         }
@@ -148,9 +158,10 @@ class Compute extends Observable {
         if (!this.destroyed) {
             this.invalid = false;
             watchWithScope(this, () => {
-                const newValue = this.watcher(this.updated ? this.updated = true : false);
-                if (newValue !== this.rawValue) {
-                    this.rawValue = newValue;
+                const newValue = this.reaction(this.updated); // TODO: remove `this.updated` in major release
+                this.updated = true;
+                if (newValue !== this.raw) {
+                    this.raw = newValue;
                     queueWatchers(this.observers);
                 }
             });
@@ -173,7 +184,7 @@ class Compute extends Observable {
         if (this.invalid) {
             this.forceUpdate();
         }
-        return this.destroyed ? this.rawValue : super.value;
+        return this.destroyed ? this.raw : super.value;
     }
     /** Stop observation and remove all dependencies. */
     destroy() {

package/Compute/Compute.js

@@ -105,13 +105,24 @@ function invalidateCompute(observer) {
  * // Triggers part of chain: fullName → name
  */
 class Compute extends Observable.Observable {
+    // TODO: remove in major release
+    /** @deprecated Use `children` */
+    get childrenObservers() {
+        return this.children;
+    }
     // TODO: remove in major release
     /** @deprecated Use `childrenObservers` */
     get childWatchers() {
-        return this.childrenObservers;
+        return this.children;
+    }
+    // TODO: remove in major release
+    /** @deprecated Use `reaction` */
+    get watcher() {
+        return this.reaction;
     }
-    constructor(watcher, freeParent, fireImmediately) {
+    constructor(reaction, freeParent, fireImmediately) {
         super();
+        this.reaction = reaction;
         /** Indicates if computed value is stale and needs recalculation. */
         this.invalid = true;
         /** Tracks if the computation has run at least once. */
@@ -127,8 +138,7 @@ class Compute extends Observable.Observable {
         /** Cleanup functions to run on destroy (e.g., unsubscribes). */
         this.destructors = new Set();
         /** Child watchers created within this watcher's scope */
-        this.childrenObservers = new Set();
-        this.watcher = watcher;
+        this.children = new Set();
         if (!freeParent) {
             bindObserver.bindObserver(this);
         }
@@ -152,9 +162,10 @@ class Compute extends Observable.Observable {
         if (!this.destroyed) {
             this.invalid = false;
             watchWithScope.watchWithScope(this, () => {
-                const newValue = this.watcher(this.updated ? this.updated = true : false);
-                if (newValue !== this.rawValue) {
-                    this.rawValue = newValue;
+                const newValue = this.reaction(this.updated); // TODO: remove `this.updated` in major release
+                this.updated = true;
+                if (newValue !== this.raw) {
+                    this.raw = newValue;
                     queueWatchers(this.observers);
                 }
             });
@@ -177,7 +188,7 @@ class Compute extends Observable.Observable {
         if (this.invalid) {
             this.forceUpdate();
         }
-        return this.destroyed ? this.rawValue : super.value;
+        return this.destroyed ? this.raw : super.value;
     }
     /** Stop observation and remove all dependencies. */
     destroy() {

package/Observable/Observable.d.ts

@@ -11,7 +11,11 @@ export declare abstract class Observable<V> {
     /** Set of registered observers */
     readonly observers: Set<Observer>;
     /** Raw value. No auto-subscription on direct access (unlike `value`). */
-    rawValue: V;
+    abstract raw: V;
+    /** @deprecated Use raw field */
+    get rawValue(): V;
+    /** @deprecated Use raw field */
+    set rawValue(raw: V);
     /**
      * Current value with automatic subscription.
      *

package/Observable/Observable.es6.js

@@ -13,6 +13,14 @@ class Observable {
         /** Set of registered observers */
         this.observers = new Set();
     }
+    /** @deprecated Use raw field */
+    get rawValue() {
+        return this.raw;
+    }
+    /** @deprecated Use raw field */
+    set rawValue(raw) {
+        this.raw = raw;
+    }
     /**
      * Current value with automatic subscription.
      *
@@ -29,7 +37,7 @@ class Observable {
                 this.observers.delete(activeWatcher);
             });
         }
-        return this.rawValue;
+        return this.raw;
     }
 }
 

package/Observable/Observable.js

@@ -17,6 +17,14 @@ class Observable {
         /** Set of registered observers */
         this.observers = new Set();
     }
+    /** @deprecated Use raw field */
+    get rawValue() {
+        return this.raw;
+    }
+    /** @deprecated Use raw field */
+    set rawValue(raw) {
+        this.raw = raw;
+    }
     /**
      * Current value with automatic subscription.
      *
@@ -33,7 +41,7 @@ class Observable {
                 this.observers.delete(activeWatcher);
             });
         }
-        return this.rawValue;
+        return this.raw;
     }
 }