@esportsplus/reactivity 0.11.0 → 0.11.2

package/build/reactive/index.d.ts

@@ -1,7 +1,8 @@
+import { NeverAsync } from '@esportsplus/utilities';
 import array from './array.js';
 import object from './object.js';
 type API<T> = T extends Record<PropertyKey, unknown> ? ReturnType<typeof object<T>> : T extends unknown[] ? ReturnType<typeof array<T>> : never;
-type Input<T> = T extends (...args: unknown[]) => Promise<unknown> ? T : T extends {
+type Input<T> = T extends (...args: unknown[]) => unknown ? NeverAsync<T> : T extends {
     dispose: any;
 } | {
     signals: any;

package/build/system.js

@@ -1,4 +1,4 @@
-import { isArray, isObject, isPromise } from '@esportsplus/utilities';
+import { isArray, isObject } from '@esportsplus/utilities';
 import { REACTIVE, STABILIZER_IDLE, STABILIZER_RUNNING, STABILIZER_SCHEDULED, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING } from './constants.js';
 let depth = 0, heap = new Array(2000), index = 0, length = 0, notified = false, observer = null, scheduler = queueMicrotask, stabilizer = STABILIZER_IDLE, version = 0;
 function cleanup(node) {
@@ -138,7 +138,6 @@ function recompute(computed, del) {
     catch (e) {
         ok = false;
     }
-    depth--;
     observer = o;
     computed.state = STATE_NONE;
     let depsTail = computed.depsTail, toRemove = depsTail !== null ? depsTail.nextDep : computed.deps;
@@ -153,28 +152,17 @@ function recompute(computed, del) {
             computed.deps = null;
         }
     }
-    if (ok) {
-        if (isPromise(value)) {
-            value.then(v => set(computed, v));
-        }
-        else {
-            set(computed, value);
-        }
-    }
-}
-function set(computed, value) {
-    if (computed.value === value) {
-        return;
-    }
-    computed.value = value;
-    for (let c = computed.subs; c !== null; c = c.nextSub) {
-        let o = c.sub, state = o.state;
-        if (state & STATE_CHECK) {
-            o.state = state | STATE_DIRTY;
+    if (ok && value !== computed.value) {
+        computed.value = value;
+        for (let c = computed.subs; c !== null; c = c.nextSub) {
+            let o = c.sub, state = o.state;
+            if (state & STATE_CHECK) {
+                o.state = state | STATE_DIRTY;
+            }
+            insertIntoHeap(o);
         }
-        insertIntoHeap(o);
     }
-    if (!depth && stabilizer === STABILIZER_IDLE) {
+    if (!--depth && stabilizer === STABILIZER_IDLE) {
         stabilizer = STABILIZER_SCHEDULED;
         scheduler(stabilize);
     }

package/build/types.d.ts

@@ -2,18 +2,19 @@ import { REACTIVE, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RE
 import { onCleanup } from './system.js';
 import { ReactiveArray } from './reactive/array.js';
 import { ReactiveObject } from './reactive/object.js';
+import { NeverAsync } from '@esportsplus/utilities';
 interface Computed<T> extends Signal<T> {
     [REACTIVE]: true;
     cleanup: VoidFunction | VoidFunction[] | null;
     deps: Link | null;
     depsTail: Link | null;
-    fn: (oc?: typeof onCleanup) => T;
+    fn: NeverAsync<(oc?: typeof onCleanup) => T>;
     height: number;
     nextHeap: Computed<unknown> | undefined;
     prevHeap: Computed<unknown>;
     state: typeof STATE_CHECK | typeof STATE_DIRTY | typeof STATE_IN_HEAP | typeof STATE_NONE | typeof STATE_RECOMPUTING;
 }
-type Infer<T> = T extends (...args: unknown[]) => unknown ? ReturnType<Awaited<T>> : T extends (infer U)[] ? ReactiveArray<U> : T extends ReactiveObject<any> ? T : T extends Record<PropertyKey, unknown> ? {
+type Infer<T> = T extends (...args: unknown[]) => unknown ? ReturnType<T> : T extends (infer U)[] ? ReactiveArray<U> : T extends ReactiveObject<any> ? T : T extends Record<PropertyKey, unknown> ? {
     [K in keyof T]: T[K];
 } : T;
 interface Link {

package/package.json

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

package/src/reactive/index.ts

@@ -1,4 +1,4 @@
-import { isArray, isObject } from '@esportsplus/utilities';
+import { isArray, isObject, NeverAsync } from '@esportsplus/utilities';
 import array from './array';
 import object from './object';
 
@@ -11,8 +11,8 @@ type API<T> =
             : never;
 
 type Input<T> =
-    T extends (...args: unknown[]) => Promise<unknown>
-        ? T
+    T extends (...args: unknown[]) => unknown
+        ? NeverAsync<T>
         : T extends { dispose: any } | { signals: any }
             ? { never: '[ dispose, signals ] are reserved keys' }
             : T extends Record<PropertyKey, unknown> | unknown[]

package/src/system.ts

@@ -1,4 +1,4 @@
-import { isArray, isObject, isPromise } from '@esportsplus/utilities';
+import { isArray, isObject } from '@esportsplus/utilities';
 import {
     REACTIVE,
     STABILIZER_IDLE, STABILIZER_RUNNING, STABILIZER_SCHEDULED,
@@ -207,7 +207,6 @@ function recompute<T>(computed: Computed<T>, del: boolean) {
         ok = false;
     }
 
-    depth--;
     observer = o;
     computed.state = STATE_NONE;
 
@@ -228,35 +227,22 @@ function recompute<T>(computed: Computed<T>, del: boolean) {
         }
     }
 
-    if (ok) {
-        if (isPromise(value)) {
-            value.then(v => set(computed, v));
-        }
-        else {
-            set(computed, value);
-        }
-    }
-}
+    if (ok && value !== computed.value) {
+        computed.value = value as T;
 
-function set<T>(computed: Computed<T>, value: T) {
-    if (computed.value === value) {
-        return;
-    }
-
-    computed.value = value;
+        for (let c = computed.subs; c !== null; c = c.nextSub) {
+            let o = c.sub,
+                state = o.state;
 
-    for (let c = computed.subs; c !== null; c = c.nextSub) {
-        let o = c.sub,
-            state = o.state;
+            if (state & STATE_CHECK) {
+                o.state = state | STATE_DIRTY;
+            }
 
-        if (state & STATE_CHECK) {
-            o.state = state | STATE_DIRTY;
+            insertIntoHeap(o);
         }
-
-        insertIntoHeap(o);
     }
 
-    if (!depth && stabilizer === STABILIZER_IDLE) {
+    if (!--depth && stabilizer === STABILIZER_IDLE) {
         stabilizer = STABILIZER_SCHEDULED;
         scheduler(stabilize);
     }

package/src/types.ts

@@ -2,6 +2,7 @@ import { REACTIVE, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RE
 import { onCleanup } from './system';
 import { ReactiveArray } from './reactive/array';
 import { ReactiveObject } from './reactive/object';
+import { NeverAsync } from '@esportsplus/utilities';
 
 
 interface Computed<T> extends Signal<T> {
@@ -9,7 +10,7 @@ interface Computed<T> extends Signal<T> {
     cleanup: VoidFunction | VoidFunction[] | null;
     deps: Link | null;
     depsTail: Link | null;
-    fn: (oc?: typeof onCleanup) => T;
+    fn: NeverAsync<(oc?: typeof onCleanup) => T>;
     height: number;
     nextHeap: Computed<unknown> | undefined;
     prevHeap: Computed<unknown>;
@@ -23,7 +24,7 @@ interface Computed<T> extends Signal<T> {
 
 type Infer<T> =
     T extends (...args: unknown[]) => unknown
-        ? ReturnType<Awaited<T>>
+        ? ReturnType<T>
         : T extends (infer U)[]
             ? ReactiveArray<U>
             : T extends ReactiveObject<any>