@praxisjs/core 1.5.0 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @praxisjs/core
 
+## 1.6.0
+
+### Minor Changes
+
+- 74d414a: Rewrite the reactivity engine for clarity and performance.
+
+  **signal()** — subscribers are now stored in a compact `SubList` representation (`null | Effect | Effect[]`) that avoids `Set` allocation for the common zero- and single-subscriber cases. `set`, `update` and `subscribe` are defined as regular closures, making the signal factory straightforward to read and extend.
+
+  **computed()** — the factory now uses a plain closure instead of the previous property-on-function pattern. Downstream computeds (chain propagation) and leaf effects from `.subscribe()` are tracked in separate holders so dirty notification never needs to inspect subscriber types. The `recompute` callback is created lazily — only when the computed is first read inside a reactive context.
+
+  **effect()** — simplified to a standard closure with named `run` and `stop` functions. The `stopped` and `cleanup` state is held naturally in the closure scope.
+
+  **batch()** — uses a pre-allocated, module-level effects array that is reused across batch calls, eliminating one `Set` allocation per `batch()` invocation.
+
+  No breaking changes to the public API (`signal`, `computed`, `effect`, `batch`, `untrack`, `peek`).
+
 ## 1.5.0
 
 ### Minor Changes
@@ -62,7 +78,6 @@
 - 6c353ba: Add `untrack` utility and isolate component mounting from outer reactive contexts
 
   **`@praxisjs/core`** exports two new functions from the public API:
-
   - `peek(signal)` — reads a signal once without subscribing to it (was already in `/internal`, now public)
   - `untrack(fn)` — runs a function with no active effect, suppressing all signal tracking inside it
 
@@ -79,7 +94,6 @@
   ```
 
   **`@praxisjs/runtime`** — `mountComponent` now runs entirely inside `untrack`. This fixes a bug where components mounted inside a reactive context (e.g. the router) would accidentally subscribe the outer effect to any signal read during construction or render. The symptoms were:
-
   - Eager reads like `description={this.count}` in JSX causing the router to re-mount the component on every state change, resetting state to its initial value
   - `@Debug()` (and any decorator that reads a signal in its `addInitializer`) triggering the same re-mount loop
 
@@ -103,39 +117,31 @@
 - 3372878: Migrate all packages from functional APIs to a decorator-first design.
 
   **`@praxisjs/core`**
-
   - Added `Composable` abstract base class for building class-based composables
   - Removed `resource`, `createResource`, `Resource`, `ResourceStatus`, `ResourceOptions` from public exports — use `@Resource` from `@praxisjs/decorators` instead
 
   **`@praxisjs/motion`**
-
   - Replaced `useMotion`, `tween`, `spring`, `createTransition`, `Animate`, `easings`, `resolveEasing` with `@Tween` and `@Spring` decorators
 
   **`@praxisjs/di`**
-
   - Replaced `useService` and `createScope` with a `@Scope` decorator
   - Renamed exported type `Scope` to `ScopeType` to free the name for the new decorator
 
   **`@praxisjs/fsm`**
-
   - Removed `createMachine` — use the `@StateMachine` and `@Transition` decorators directly
 
   **`@praxisjs/router`**
-
   - Removed `createRouter`, `lazy`, `useRouter`, `useParams`, `useQuery`, `useLocation`
   - Added `@RouterConfig`, `@Lazy`, `@InjectRouter`, `@Params`, `@Query`, `@Location` decorators
 
   **`@praxisjs/store`**
-
   - Removed `createStore` — use the `@Store` and `@UseStore` decorators directly
 
   **`@praxisjs/composables`**
-
   - Replaced all `use*` composable functions with class-based composables extending `Composable`:
     `WindowSize`, `ScrollPosition`, `ElementSize`, `Intersection`, `Focus`, `MediaQuery`, `ColorScheme`, `Mouse`, `KeyCombo`, `Idle`, `Clipboard`, `Geolocation`, `TimeAgo`, `Pagination`
 
   **`@praxisjs/concurrent`**
-
   - Removed `task`, `queue`, `pool` and their instance types — use `@Task`, `@Queue`, `@Pool` decorators instead
 
 ## 0.4.2
@@ -173,7 +179,6 @@
 ### Minor Changes
 
 - bb0d4f8: **Refactor decorator system and component architecture across PraxisJS packages**
-
   - Replaced legacy decorator signatures (`constructor`, `target`, `propertyKey`, method descriptor) with the standard TC39 decorator context API (`ClassDecoratorContext`, `ClassFieldDecoratorContext`, `ClassMethodDecoratorContext`) across `@praxisjs/decorators`, `@praxisjs/store`, `@praxisjs/concurrent`, `@praxisjs/router`, `@praxisjs/motion`, `@praxisjs/di`, and `@praxisjs/fsm`.
   - Introduced `StatefulComponent` and `StatelessComponent` as the new base classes, replacing the deprecated `BaseComponent`/`Function Component` pattern, across `@praxisjs/core`, `@praxisjs/runtime`, `@praxisjs/devtools`, and templates.
   - Implemented core rendering functionality in `@praxisjs/runtime` (`mountChildren`, `mountComponent`, reactive scope management) and removed the deprecated `renderer.ts`.

package/dist/signal/batch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batch.d.ts","sourceRoot":"","sources":["../../src/signal/batch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIvC,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAElD;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,IAAI,QAgBnC"}
+{"version":3,"file":"batch.d.ts","sourceRoot":"","sources":["../../src/signal/batch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKvC,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAElD;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,IAAI,QAWnC"}

package/dist/signal/batch.js

@@ -1,25 +1,23 @@
-let batchQueue = null;
+const batchEffects = [];
+let batchDepth = 0;
 export function isBatching() {
-    return batchQueue !== null;
+    return batchDepth > 0;
 }
 export function enqueueEffect(effect) {
-    batchQueue?.add(effect);
+    if (!batchEffects.includes(effect))
+        batchEffects.push(effect);
 }
 export function batch(fn) {
-    const isOuter = batchQueue === null;
-    if (isOuter) {
-        batchQueue = new Set();
-    }
+    batchDepth++;
     try {
         fn();
     }
     finally {
-        if (isOuter && batchQueue) {
-            const effectsToRun = batchQueue;
-            batchQueue = null;
-            effectsToRun.forEach((eff) => {
-                eff();
-            });
+        if (--batchDepth === 0) {
+            const n = batchEffects.length;
+            for (let i = 0; i < n; i++)
+                batchEffects[i]();
+            batchEffects.length = 0;
         }
     }
 }

package/dist/signal/batch.js.map

@@ -1 +1 @@
-{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../src/signal/batch.ts"],"names":[],"mappings":"AAEA,IAAI,UAAU,GAAuB,IAAI,CAAC;AAE1C,MAAM,UAAU,UAAU;IACxB,OAAO,UAAU,KAAK,IAAI,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,EAAc;IAClC,MAAM,OAAO,GAAG,UAAU,KAAK,IAAI,CAAC;IACpC,IAAI,OAAO,EAAE,CAAC;QACZ,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;IACzB,CAAC;IACD,IAAI,CAAC;QACH,EAAE,EAAE,CAAC;IACP,CAAC;YAAS,CAAC;QACT,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;YAC1B,MAAM,YAAY,GAAG,UAAU,CAAC;YAChC,UAAU,GAAG,IAAI,CAAC;YAClB,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3B,GAAG,EAAE,CAAC;YACR,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../src/signal/batch.ts"],"names":[],"mappings":"AAEA,MAAM,YAAY,GAAa,EAAE,CAAC;AAClC,IAAI,UAAU,GAAG,CAAC,CAAC;AAEnB,MAAM,UAAU,UAAU;IACxB,OAAO,UAAU,GAAG,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,EAAc;IAClC,UAAU,EAAE,CAAC;IACb,IAAI,CAAC;QACH,EAAE,EAAE,CAAC;IACP,CAAC;YAAS,CAAC;QACT,IAAI,EAAE,UAAU,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC;YAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9C,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/signal/computed.d.ts

@@ -1,3 +1,3 @@
 import type { Computed } from "@praxisjs/shared";
-export declare function computed<T>(computeFn: () => T): Computed<T>;
+export declare function computed<T>(getter: () => T): Computed<T>;
 //# sourceMappingURL=computed.d.ts.map

package/dist/signal/computed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computed.d.ts","sourceRoot":"","sources":["../../src/signal/computed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAMjD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CA8D3D"}
+{"version":3,"file":"computed.d.ts","sourceRoot":"","sources":["../../src/signal/computed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAWjD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CA4DxD"}

package/dist/signal/computed.js

@@ -1,37 +1,50 @@
 import { activeEffect, runEffect } from "./effect";
-export function computed(computeFn) {
+import { addSub, removeSub, notifySubs } from "./signal";
+function isComputedRecompute(eff) {
+    return eff.__isComputedRecompute === true;
+}
+export function computed(getter) {
     let cachedValue;
     let dirty = true;
-    const subscribers = new Set();
+    const computedHolder = { subs: null };
+    const leafHolder = { subs: null };
     let scheduled = false;
-    const recompute = Object.assign(() => {
-        dirty = true;
-        for (const sub of [...subscribers]) {
-            if (sub.__isComputedRecompute) {
-                sub(); // propagate dirty synchronously through computed chain
+    let recompute = null;
+    function getRecompute() {
+        if (recompute !== null)
+            return recompute;
+        recompute = function markDirty() {
+            if (dirty)
+                return;
+            dirty = true;
+            if (computedHolder.subs !== null)
+                notifySubs(computedHolder.subs, false);
+            if (leafHolder.subs !== null && !scheduled) {
+                scheduled = true;
+                queueMicrotask(() => {
+                    scheduled = false;
+                    if (leafHolder.subs !== null)
+                        notifySubs(leafHolder.subs, false);
+                });
             }
-        }
-        if (!scheduled) {
-            scheduled = true;
-            queueMicrotask(() => {
-                scheduled = false;
-                for (const sub of [...subscribers]) {
-                    if (!sub.__isComputedRecompute) {
-                        sub(); // notify leaf effects (DOM, @Watch, subscribe)
-                    }
-                }
-            });
-        }
-    }, { __isComputedRecompute: true });
+        };
+        recompute.__isComputedRecompute = true;
+        return recompute;
+    }
     function read() {
-        if (activeEffect) {
-            subscribers.add(activeEffect);
+        if (activeEffect !== null) {
+            if (isComputedRecompute(activeEffect)) {
+                addSub(computedHolder, activeEffect);
+            }
+            else {
+                addSub(leafHolder, activeEffect);
+            }
         }
         if (dirty) {
             const prevEffect = activeEffect;
-            runEffect(recompute);
+            runEffect(getRecompute());
             try {
-                cachedValue = computeFn();
+                cachedValue = getter();
                 dirty = false;
             }
             finally {
@@ -40,17 +53,14 @@ export function computed(computeFn) {
         }
         return cachedValue;
     }
-    function subscribe(fn) {
-        const wrappedEffect = () => {
-            fn(read());
-        };
-        subscribers.add(wrappedEffect);
-        wrappedEffect();
-        return () => subscribers.delete(wrappedEffect);
-    }
-    const computedSignal = read;
-    computedSignal.subscribe = subscribe;
-    computedSignal.__isComputed = true;
-    return computedSignal;
+    const c = read;
+    c.subscribe = (fn) => {
+        const wrapped = () => { fn(read()); };
+        addSub(leafHolder, wrapped);
+        wrapped();
+        return () => { removeSub(leafHolder, wrapped); };
+    };
+    c.__isComputed = true;
+    return c;
 }
 //# sourceMappingURL=computed.js.map

package/dist/signal/computed.js.map

@@ -1 +1 @@
-{"version":3,"file":"computed.js","sourceRoot":"","sources":["../../src/signal/computed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAe,MAAM,UAAU,CAAC;AAIhE,MAAM,UAAU,QAAQ,CAAI,SAAkB;IAC5C,IAAI,WAAc,CAAC;IACnB,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,MAAM,SAAS,GAAsB,MAAM,CAAC,MAAM,CAChD,GAAG,EAAE;QACH,KAAK,GAAG,IAAI,CAAC;QACb,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,WAAW,CAAC,EAAE,CAAC;YACnC,IAAK,GAAkC,CAAC,qBAAqB,EAAE,CAAC;gBAC9D,GAAG,EAAE,CAAC,CAAC,uDAAuD;YAChE,CAAC;QACH,CAAC;QACD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,SAAS,GAAG,IAAI,CAAC;YACjB,cAAc,CAAC,GAAG,EAAE;gBAClB,SAAS,GAAG,KAAK,CAAC;gBAClB,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,WAAW,CAAC,EAAE,CAAC;oBACnC,IAAI,CAAE,GAAkC,CAAC,qBAAqB,EAAE,CAAC;wBAC/D,GAAG,EAAE,CAAC,CAAC,+CAA+C;oBACxD,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,EACD,EAAE,qBAAqB,EAAE,IAAa,EAAE,CACzC,CAAC;IAEF,SAAS,IAAI;QACX,IAAI,YAAY,EAAE,CAAC;YACjB,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,UAAU,GAAG,YAAY,CAAC;YAChC,SAAS,CAAC,SAAS,CAAC,CAAC;YACrB,IAAI,CAAC;gBACH,WAAW,GAAG,SAAS,EAAE,CAAC;gBAC1B,KAAK,GAAG,KAAK,CAAC;YAChB,CAAC;oBAAS,CAAC;gBACT,SAAS,CAAC,UAAU,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,SAAS,SAAS,CAAC,EAAsB;QACvC,MAAM,aAAa,GAAG,GAAG,EAAE;YACzB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QACb,CAAC,CAAC;QACF,WAAW,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC/B,aAAa,EAAE,CAAC;QAChB,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,cAAc,GAAG,IAAmB,CAAC;IAC3C,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC;IACrC,cAAc,CAAC,YAAY,GAAG,IAAI,CAAC;IAEnC,OAAO,cAAc,CAAC;AACxB,CAAC"}
+{"version":3,"file":"computed.js","sourceRoot":"","sources":["../../src/signal/computed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAe,MAAM,UAAU,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAgB,MAAM,UAAU,CAAC;AAIvE,SAAS,mBAAmB,CAAC,GAAW;IACtC,OAAQ,GAAkC,CAAC,qBAAqB,KAAK,IAAI,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,QAAQ,CAAI,MAAe;IACzC,IAAI,WAA0B,CAAC;IAC/B,IAAI,KAAK,GAAG,IAAI,CAAC;IAEjB,MAAM,cAAc,GAAG,EAAE,IAAI,EAAE,IAAe,EAAE,CAAC;IACjD,MAAM,UAAU,GAAG,EAAE,IAAI,EAAE,IAAe,EAAE,CAAC;IAC7C,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,IAAI,SAAS,GAA6B,IAAI,CAAC;IAE/C,SAAS,YAAY;QACnB,IAAI,SAAS,KAAK,IAAI;YAAE,OAAO,SAAS,CAAC;QACzC,SAAS,GAAG,SAAS,SAAS;YAC5B,IAAI,KAAK;gBAAE,OAAO;YAClB,KAAK,GAAG,IAAI,CAAC;YACb,IAAI,cAAc,CAAC,IAAI,KAAK,IAAI;gBAAE,UAAU,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACzE,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC3C,SAAS,GAAG,IAAI,CAAC;gBACjB,cAAc,CAAC,GAAG,EAAE;oBAClB,SAAS,GAAG,KAAK,CAAC;oBAClB,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI;wBAAE,UAAU,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACnE,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAsB,CAAC;QACvB,SAAS,CAAC,qBAAqB,GAAG,IAAI,CAAC;QACvC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,SAAS,IAAI;QACX,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,IAAI,mBAAmB,CAAC,YAAY,CAAC,EAAE,CAAC;gBACtC,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;YACvC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,UAAU,GAAG,YAAY,CAAC;YAChC,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC;YAC1B,IAAI,CAAC;gBACH,WAAW,GAAG,MAAM,EAAE,CAAC;gBACvB,KAAK,GAAG,KAAK,CAAC;YAChB,CAAC;oBAAS,CAAC;gBACT,SAAS,CAAC,UAAU,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;QACD,OAAO,WAAgB,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,GAAG,IAAmB,CAAC;IAE9B,CAAC,CAAC,SAAS,GAAG,CAAC,EAAsB,EAAE,EAAE;QACvC,MAAM,OAAO,GAAW,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC5B,OAAO,EAAE,CAAC;QACV,OAAO,GAAG,EAAE,GAAG,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC;IAEF,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,CAAC;AACX,CAAC"}

package/dist/signal/effect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"effect.d.ts","sourceRoot":"","sources":["../../src/signal/effect.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC;AAEhC,eAAO,IAAI,YAAY,EAAE,MAAM,GAAG,IAAW,CAAC;AAG9C,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,QAUnC;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,QAE9C;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAQzC;AAGD,KAAK,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAC;AAEnC,wBAAgB,MAAM,CAAC,EAAE,EAAE,MAAM,OAAO,cAuBvC"}
+{"version":3,"file":"effect.d.ts","sourceRoot":"","sources":["../../src/signal/effect.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC;AAEhC,eAAO,IAAI,YAAY,EAAE,MAAM,GAAG,IAAW,CAAC;AAG9C,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,QASnC;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,QAE9C;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAQzC;AAGD,KAAK,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAC;AAEnC,wBAAgB,MAAM,CAAC,EAAE,EAAE,MAAM,OAAO,SAkBd,IAAI,CAK7B"}

package/dist/signal/effect.js

@@ -1,15 +1,14 @@
 export let activeEffect = null;
 const effectStack = [];
 export function track(effect) {
-    const subscriber = effect;
-    effectStack.push(subscriber);
-    activeEffect = subscriber;
+    effectStack.push(effect);
+    activeEffect = effect;
     try {
-        subscriber();
+        effect();
     }
     finally {
         effectStack.pop();
-        activeEffect = effectStack[effectStack.length - 1] || null;
+        activeEffect = effectStack[effectStack.length - 1] ?? null;
     }
 }
 export function runEffect(effect) {
@@ -28,21 +27,21 @@ export function untrack(fn) {
 export function effect(fn) {
     let cleanup;
     let stopped = false;
-    const wrappedEffect = () => {
+    function run() {
         if (stopped)
             return;
         cleanup?.();
-        const prevEffect = activeEffect;
-        activeEffect = wrappedEffect;
+        const prev = activeEffect;
+        activeEffect = run;
         try {
             cleanup = fn();
         }
         finally {
-            activeEffect = prevEffect;
+            activeEffect = prev;
         }
-    };
-    wrappedEffect();
-    return () => {
+    }
+    run();
+    return function stop() {
         stopped = true;
         cleanup?.();
         cleanup = undefined;

package/dist/signal/effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"effect.js","sourceRoot":"","sources":["../../src/signal/effect.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAI,YAAY,GAAkB,IAAI,CAAC;AAC9C,MAAM,WAAW,GAAa,EAAE,CAAC;AAEjC,MAAM,UAAU,KAAK,CAAC,MAAc;IAClC,MAAM,UAAU,GAAG,MAAM,CAAC;IAC1B,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7B,YAAY,GAAG,UAAU,CAAC;IAC1B,IAAI,CAAC;QACH,UAAU,EAAE,CAAC;IACf,CAAC;YAAS,CAAC;QACT,WAAW,CAAC,GAAG,EAAE,CAAC;QAClB,YAAY,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;IAC7D,CAAC;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,MAAqB;IAC7C,YAAY,GAAG,MAAM,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,OAAO,CAAI,EAAW;IACpC,MAAM,IAAI,GAAG,YAAY,CAAC;IAC1B,YAAY,GAAG,IAAI,CAAC;IACpB,IAAI,CAAC;QACH,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;YAAS,CAAC;QACT,YAAY,GAAG,IAAI,CAAC;IACtB,CAAC;AACH,CAAC;AAKD,MAAM,UAAU,MAAM,CAAC,EAAiB;IACtC,IAAI,OAAgB,CAAC;IACrB,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,IAAI,OAAO;YAAE,OAAO;QACpB,OAAO,EAAE,EAAE,CAAC;QACZ,MAAM,UAAU,GAAG,YAAY,CAAC;QAChC,YAAY,GAAG,aAAa,CAAC;QAC7B,IAAI,CAAC;YACH,OAAO,GAAG,EAAE,EAAE,CAAC;QACjB,CAAC;gBAAS,CAAC;YACT,YAAY,GAAG,UAAU,CAAC;QAC5B,CAAC;IACH,CAAC,CAAC;IAEF,aAAa,EAAE,CAAC;IAEhB,OAAO,GAAG,EAAE;QACV,OAAO,GAAG,IAAI,CAAC;QACf,OAAO,EAAE,EAAE,CAAC;QACZ,OAAO,GAAG,SAAS,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"effect.js","sourceRoot":"","sources":["../../src/signal/effect.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAI,YAAY,GAAkB,IAAI,CAAC;AAC9C,MAAM,WAAW,GAAa,EAAE,CAAC;AAEjC,MAAM,UAAU,KAAK,CAAC,MAAc;IAClC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzB,YAAY,GAAG,MAAM,CAAC;IACtB,IAAI,CAAC;QACH,MAAM,EAAE,CAAC;IACX,CAAC;YAAS,CAAC;QACT,WAAW,CAAC,GAAG,EAAE,CAAC;QAClB,YAAY,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;IAC7D,CAAC;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,MAAqB;IAC7C,YAAY,GAAG,MAAM,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,OAAO,CAAI,EAAW;IACpC,MAAM,IAAI,GAAG,YAAY,CAAC;IAC1B,YAAY,GAAG,IAAI,CAAC;IACpB,IAAI,CAAC;QACH,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;YAAS,CAAC;QACT,YAAY,GAAG,IAAI,CAAC;IACtB,CAAC;AACH,CAAC;AAKD,MAAM,UAAU,MAAM,CAAC,EAAiB;IACtC,IAAI,OAAgB,CAAC;IACrB,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,SAAS,GAAG;QACV,IAAI,OAAO;YAAE,OAAO;QACpB,OAAO,EAAE,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,YAAY,CAAC;QAC1B,YAAY,GAAG,GAAG,CAAC;QACnB,IAAI,CAAC;YACH,OAAO,GAAG,EAAE,EAAE,CAAC;QACjB,CAAC;gBAAS,CAAC;YACT,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;IACH,CAAC;IAED,GAAG,EAAE,CAAC;IAEN,OAAO,SAAS,IAAI;QAClB,OAAO,GAAG,IAAI,CAAC;QACf,OAAO,EAAE,EAAE,CAAC;QACZ,OAAO,GAAG,SAAS,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC"}

package/dist/signal/signal.d.ts

@@ -1,3 +1,12 @@
 import type { Signal } from "@praxisjs/shared";
+import { type Effect } from "./effect";
+export type SubList = Effect | Effect[] | null;
+export declare function addSub(holder: {
+    subs: SubList;
+}, eff: Effect): void;
+export declare function removeSub(holder: {
+    subs: SubList;
+}, eff: Effect): void;
+export declare function notifySubs(subs: Exclude<SubList, null>, batching: boolean): void;
 export declare function signal<T>(initialValue: T): Signal<T>;
 //# sourceMappingURL=signal.d.ts.map

package/dist/signal/signal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signal.d.ts","sourceRoot":"","sources":["../../src/signal/signal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAK/C,wBAAgB,MAAM,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAiDpD"}
+{"version":3,"file":"signal.d.ts","sourceRoot":"","sources":["../../src/signal/signal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAErD,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC;AAE/C,wBAAgB,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CASnE;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAStE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI,CAoBhF;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CA4BpD"}

package/dist/signal/signal.js

@@ -1,50 +1,84 @@
 import { isBatching, enqueueEffect } from "./batch";
 import { activeEffect } from "./effect";
+export function addSub(holder, eff) {
+    const subs = holder.subs;
+    if (subs === null) {
+        holder.subs = eff;
+    }
+    else if (typeof subs === "function") {
+        if (subs !== eff)
+            holder.subs = [subs, eff];
+    }
+    else {
+        if (!subs.includes(eff))
+            subs.push(eff);
+    }
+}
+export function removeSub(holder, eff) {
+    const subs = holder.subs;
+    if (subs === null)
+        return;
+    if (typeof subs === "function") {
+        if (subs === eff)
+            holder.subs = null;
+    }
+    else {
+        const idx = subs.indexOf(eff);
+        if (idx >= 0)
+            subs.splice(idx, 1);
+    }
+}
+export function notifySubs(subs, batching) {
+    if (typeof subs === "function") {
+        if (batching)
+            enqueueEffect(subs);
+        else
+            subs();
+        return;
+    }
+    if (batching) {
+        for (const sub of subs)
+            enqueueEffect(sub);
+        return;
+    }
+    let lastError;
+    let hasError = false;
+    for (const sub of subs) {
+        try {
+            sub();
+        }
+        catch (e) {
+            lastError = e;
+            hasError = true;
+        }
+    }
+    if (hasError)
+        throw lastError;
+}
 export function signal(initialValue) {
     let value = initialValue;
-    const subscribers = new Set();
+    const holder = { subs: null };
     function read() {
-        if (activeEffect) {
-            subscribers.add(activeEffect);
-        }
+        if (activeEffect !== null)
+            addSub(holder, activeEffect);
         return value;
     }
-    function set(newValue) {
+    const s = read;
+    s.set = (newValue) => {
         if (Object.is(value, newValue))
             return;
         value = newValue;
-        if (isBatching()) {
-            [...subscribers].forEach((sub) => { enqueueEffect(sub); });
-            return;
-        }
-        const errors = [];
-        [...subscribers].forEach((sub) => {
-            try {
-                sub();
-            }
-            catch (e) {
-                errors.push(e);
-            }
-        });
-        if (errors.length > 0)
-            throw errors[errors.length - 1];
-    }
-    function update(fn) {
-        set(fn(value));
-    }
-    function subscribe(fn) {
-        const wrapped = () => {
-            fn(value);
-        };
-        subscribers.add(wrapped);
+        if (holder.subs !== null)
+            notifySubs(holder.subs, isBatching());
+    };
+    s.update = (fn) => { s.set(fn(value)); };
+    s.subscribe = (fn) => {
+        const wrapped = () => { fn(value); };
+        addSub(holder, wrapped);
         wrapped();
-        return () => subscribers.delete(wrapped);
-    }
-    const signal = read;
-    signal.set = set;
-    signal.update = update;
-    signal.subscribe = subscribe;
-    signal.__isSignal = true;
-    return signal;
+        return () => { removeSub(holder, wrapped); };
+    };
+    s.__isSignal = true;
+    return s;
 }
 //# sourceMappingURL=signal.js.map

package/dist/signal/signal.js.map

@@ -1 +1 @@
-{"version":3,"file":"signal.js","sourceRoot":"","sources":["../../src/signal/signal.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,YAAY,EAAe,MAAM,UAAU,CAAC;AAErD,MAAM,UAAU,MAAM,CAAI,YAAe;IACvC,IAAI,KAAK,GAAG,YAAY,CAAC;IACzB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IAEtC,SAAS,IAAI;QACX,IAAI,YAAY,EAAE,CAAC;YACjB,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,SAAS,GAAG,CAAC,QAAW;QACtB,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;YAAE,OAAO;QACvC,KAAK,GAAG,QAAQ,CAAC;QACjB,IAAI,UAAU,EAAE,EAAE,CAAC;YACjB,CAAC,GAAG,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAc,EAAE,CAAC;QAC7B,CAAC,GAAG,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,CAAC;gBACH,GAAG,EAAE,CAAC;YACR,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,SAAS,MAAM,CAAC,EAAkB;QAChC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACjB,CAAC;IAED,SAAS,SAAS,CAAC,EAAsB;QACvC,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,EAAE,CAAC,KAAK,CAAC,CAAC;QACZ,CAAC,CAAC;QACF,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzB,OAAO,EAAE,CAAC;QACV,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,MAAM,GAAG,IAAiB,CAAC;IACjC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;IAEzB,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"signal.js","sourceRoot":"","sources":["../../src/signal/signal.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@praxisjs/core",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/signal/batch.ts

@@ -1,29 +1,25 @@
 import type { Effect } from "./effect";
 
-let batchQueue: Set<Effect> | null = null;
+const batchEffects: Effect[] = [];
+let batchDepth = 0;
 
 export function isBatching(): boolean {
-  return batchQueue !== null;
+  return batchDepth > 0;
 }
 
 export function enqueueEffect(effect: Effect): void {
-  batchQueue?.add(effect);
+  if (!batchEffects.includes(effect)) batchEffects.push(effect);
 }
 
 export function batch(fn: () => void) {
-  const isOuter = batchQueue === null;
-  if (isOuter) {
-    batchQueue = new Set();
-  }
+  batchDepth++;
   try {
     fn();
   } finally {
-    if (isOuter && batchQueue) {
-      const effectsToRun = batchQueue;
-      batchQueue = null;
-      effectsToRun.forEach((eff) => {
-        eff();
-      });
+    if (--batchDepth === 0) {
+      const n = batchEffects.length;
+      for (let i = 0; i < n; i++) batchEffects[i]();
+      batchEffects.length = 0;
     }
   }
 }

package/src/signal/computed.ts

@@ -1,69 +1,72 @@
 import type { Computed } from "@praxisjs/shared";
 
 import { activeEffect, runEffect, type Effect } from "./effect";
+import { addSub, removeSub, notifySubs, type SubList } from "./signal";
 
 type ComputedRecompute = Effect & { __isComputedRecompute: true };
 
-export function computed<T>(computeFn: () => T): Computed<T> {
-  let cachedValue: T;
+function isComputedRecompute(eff: Effect): boolean {
+  return (eff as Partial<ComputedRecompute>).__isComputedRecompute === true;
+}
+
+export function computed<T>(getter: () => T): Computed<T> {
+  let cachedValue: T | undefined;
   let dirty = true;
-  const subscribers = new Set<Effect>();
+
+  const computedHolder = { subs: null as SubList };
+  const leafHolder = { subs: null as SubList };
   let scheduled = false;
 
-  const recompute: ComputedRecompute = Object.assign(
-    () => {
+  let recompute: ComputedRecompute | null = null;
+
+  function getRecompute(): ComputedRecompute {
+    if (recompute !== null) return recompute;
+    recompute = function markDirty(): void {
+      if (dirty) return;
       dirty = true;
-      for (const sub of [...subscribers]) {
-        if ((sub as Partial<ComputedRecompute>).__isComputedRecompute) {
-          sub(); // propagate dirty synchronously through computed chain
-        }
-      }
-      if (!scheduled) {
+      if (computedHolder.subs !== null) notifySubs(computedHolder.subs, false);
+      if (leafHolder.subs !== null && !scheduled) {
         scheduled = true;
         queueMicrotask(() => {
           scheduled = false;
-          for (const sub of [...subscribers]) {
-            if (!(sub as Partial<ComputedRecompute>).__isComputedRecompute) {
-              sub(); // notify leaf effects (DOM, @Watch, subscribe)
-            }
-          }
+          if (leafHolder.subs !== null) notifySubs(leafHolder.subs, false);
         });
       }
-    },
-    { __isComputedRecompute: true as const },
-  );
+    } as ComputedRecompute;
+    recompute.__isComputedRecompute = true;
+    return recompute;
+  }
 
-  function read() {
-    if (activeEffect) {
-      subscribers.add(activeEffect);
+  function read(): T {
+    if (activeEffect !== null) {
+      if (isComputedRecompute(activeEffect)) {
+        addSub(computedHolder, activeEffect);
+      } else {
+        addSub(leafHolder, activeEffect);
+      }
     }
-
     if (dirty) {
       const prevEffect = activeEffect;
-      runEffect(recompute);
+      runEffect(getRecompute());
       try {
-        cachedValue = computeFn();
+        cachedValue = getter();
         dirty = false;
       } finally {
         runEffect(prevEffect);
       }
     }
-
-    return cachedValue;
+    return cachedValue as T;
   }
 
-  function subscribe(fn: (value: T) => void) {
-    const wrappedEffect = () => {
-      fn(read());
-    };
-    subscribers.add(wrappedEffect);
-    wrappedEffect();
-    return () => subscribers.delete(wrappedEffect);
-  }
+  const c = read as Computed<T>;
 
-  const computedSignal = read as Computed<T>;
-  computedSignal.subscribe = subscribe;
-  computedSignal.__isComputed = true;
+  c.subscribe = (fn: (value: T) => void) => {
+    const wrapped: Effect = () => { fn(read()); };
+    addSub(leafHolder, wrapped);
+    wrapped();
+    return () => { removeSub(leafHolder, wrapped); };
+  };
 
-  return computedSignal;
+  c.__isComputed = true;
+  return c;
 }

package/src/signal/effect.ts

@@ -4,14 +4,13 @@ export let activeEffect: Effect | null = null;
 const effectStack: Effect[] = [];
 
 export function track(effect: Effect) {
-  const subscriber = effect;
-  effectStack.push(subscriber);
-  activeEffect = subscriber;
+  effectStack.push(effect);
+  activeEffect = effect;
   try {
-    subscriber();
+    effect();
   } finally {
     effectStack.pop();
-    activeEffect = effectStack[effectStack.length - 1] || null;
+    activeEffect = effectStack[effectStack.length - 1] ?? null;
   }
 }
 
@@ -36,21 +35,21 @@ export function effect(fn: () => Cleanup) {
   let cleanup: Cleanup;
   let stopped = false;
 
-  const wrappedEffect = () => {
+  function run(): void {
     if (stopped) return;
     cleanup?.();
-    const prevEffect = activeEffect;
-    activeEffect = wrappedEffect;
+    const prev = activeEffect;
+    activeEffect = run;
     try {
       cleanup = fn();
     } finally {
-      activeEffect = prevEffect;
+      activeEffect = prev;
     }
-  };
+  }
 
-  wrappedEffect();
+  run();
 
-  return () => {
+  return function stop(): void {
     stopped = true;
     cleanup?.();
     cleanup = undefined;

package/src/signal/signal.ts

@@ -3,53 +3,78 @@ import type { Signal } from "@praxisjs/shared";
 import { isBatching, enqueueEffect } from "./batch";
 import { activeEffect, type Effect } from "./effect";
 
+export type SubList = Effect | Effect[] | null;
+
+export function addSub(holder: { subs: SubList }, eff: Effect): void {
+  const subs = holder.subs;
+  if (subs === null) {
+    holder.subs = eff;
+  } else if (typeof subs === "function") {
+    if (subs !== eff) holder.subs = [subs, eff];
+  } else {
+    if (!subs.includes(eff)) subs.push(eff);
+  }
+}
+
+export function removeSub(holder: { subs: SubList }, eff: Effect): void {
+  const subs = holder.subs;
+  if (subs === null) return;
+  if (typeof subs === "function") {
+    if (subs === eff) holder.subs = null;
+  } else {
+    const idx = subs.indexOf(eff);
+    if (idx >= 0) subs.splice(idx, 1);
+  }
+}
+
+export function notifySubs(subs: Exclude<SubList, null>, batching: boolean): void {
+  if (typeof subs === "function") {
+    if (batching) enqueueEffect(subs); else subs();
+    return;
+  }
+  if (batching) {
+    for (const sub of subs) enqueueEffect(sub);
+    return;
+  }
+  let lastError: unknown;
+  let hasError = false;
+  for (const sub of subs) {
+    try {
+      sub();
+    } catch (e) {
+      lastError = e;
+      hasError = true;
+    }
+  }
+  if (hasError) throw lastError;
+}
+
 export function signal<T>(initialValue: T): Signal<T> {
   let value = initialValue;
-  const subscribers = new Set<Effect>();
+  const holder = { subs: null as SubList };
 
-  function read() {
-    if (activeEffect) {
-      subscribers.add(activeEffect);
-    }
+  function read(): T {
+    if (activeEffect !== null) addSub(holder, activeEffect);
     return value;
   }
 
-  function set(newValue: T) {
+  const s = read as Signal<T>;
+
+  s.set = (newValue: T) => {
     if (Object.is(value, newValue)) return;
     value = newValue;
-    if (isBatching()) {
-      [...subscribers].forEach((sub) => { enqueueEffect(sub); });
-      return;
-    }
-    const errors: unknown[] = [];
-    [...subscribers].forEach((sub) => {
-      try {
-        sub();
-      } catch (e) {
-        errors.push(e);
-      }
-    });
-    if (errors.length > 0) throw errors[errors.length - 1];
-  }
+    if (holder.subs !== null) notifySubs(holder.subs, isBatching());
+  };
 
-  function update(fn: (prev: T) => T) {
-    set(fn(value));
-  }
+  s.update = (fn: (prev: T) => T) => { s.set(fn(value)); };
 
-  function subscribe(fn: (value: T) => void) {
-    const wrapped = () => {
-      fn(value);
-    };
-    subscribers.add(wrapped);
+  s.subscribe = (fn: (value: T) => void) => {
+    const wrapped: Effect = () => { fn(value); };
+    addSub(holder, wrapped);
     wrapped();
-    return () => subscribers.delete(wrapped);
-  }
-
-  const signal = read as Signal<T>;
-  signal.set = set;
-  signal.update = update;
-  signal.subscribe = subscribe;
-  signal.__isSignal = true;
+    return () => { removeSub(holder, wrapped); };
+  };
 
-  return signal;
+  s.__isSignal = true;
+  return s;
 }