@esportsplus/reactivity 0.16.0 → 0.16.2

package/build/system.d.ts

@@ -7,7 +7,7 @@ declare const isSignal: (value: unknown) => value is Signal<unknown>;
 declare const onCleanup: (fn: VoidFunction) => typeof fn;
 declare const read: <T>(node: Signal<T> | Computed<T>) => T;
 declare const root: {
-    <T>(fn: (dispose?: VoidFunction) => T): T;
+    <T>(fn: ((dispose: VoidFunction) => T) | (() => T)): T;
     disposables: number;
 };
 declare const set: <T>(signal: Signal<T>, value: T) => void;

package/build/system.js

@@ -332,14 +332,23 @@ const read = (node) => {
     return node.value;
 };
 const root = (fn) => {
-    let d = root.disposables, o = observer, s = scope, self = null, tracking = fn.length;
+    let c, d = root.disposables, o = observer, s = scope, self = null, tracking = fn.length, value;
     observer = null;
     root.disposables = 0;
-    scope = tracking ? (self = { cleanup: null }) : null;
-    let value = fn(tracking ? () => dispose(self) : undefined);
+    if (tracking) {
+        scope = self = { cleanup: null };
+        value = fn(c = () => dispose(self));
+    }
+    else {
+        scope = null;
+        value = fn();
+    }
     observer = o;
     root.disposables = d;
     scope = s;
+    if (c) {
+        onCleanup(c);
+    }
     return value;
 };
 root.disposables = 0;

package/package.json

@@ -12,7 +12,7 @@
   "private": false,
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.16.0",
+  "version": "0.16.2",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/system.ts

@@ -464,23 +464,35 @@ const read = <T>(node: Signal<T> | Computed<T>): T => {
     return node.value;
 };
 
-const root = <T>(fn: (dispose?: VoidFunction) => T) => {
-    let d = root.disposables,
+const root = <T>(fn: ((dispose: VoidFunction) => T) | (() => T)) => {
+    let c,
+        d = root.disposables,
         o = observer,
         s = scope,
         self: Computed<unknown> | null = null,
-        tracking = fn.length;
+        tracking = fn.length,
+        value: T;
 
     observer = null;
     root.disposables = 0;
-    scope = tracking ? (self = { cleanup: null } as Computed<unknown>) : null;
 
-    let value = fn( tracking ? () => dispose(self!) : undefined);
+    if (tracking) {
+        scope = self = { cleanup: null } as Computed<unknown>;
+        value = (fn as (dispose: VoidFunction) => T)(c = () => dispose(self!));
+    }
+    else {
+        scope = null;
+        value = (fn as () => T)();
+    }
 
     observer = o;
     root.disposables = d;
     scope = s;
 
+    if (c) {
+        onCleanup(c);
+    }
+
     return value;
 };