@esportsplus/reactivity 0.16.4 → 0.16.6

package/build/reactive/array.d.ts

@@ -1,11 +1,11 @@
 import { Prettify } from '@esportsplus/utilities';
-type ReactiveArray<T extends unknown[]> = Prettify<T & {
+type ReactiveArray<T> = Prettify<T[] & {
     clear: () => void;
     dispose: () => void;
-    dispatch: <K extends keyof Events<T[number]>, V>(event: K, value?: V) => void;
-    map: <R>(fn: (this: ReactiveArray<T>, value: T[number], i: number) => R) => R[];
-    on: <K extends keyof Events<T[number]>>(event: K, listener: Listener<Events<T[number]>[K]>) => void;
-    once: <K extends keyof Events<T[number]>>(event: K, listener: Listener<Events<T[number]>[K]>) => void;
+    dispatch: <K extends keyof Events<T>, V>(event: K, value?: V) => void;
+    map: <R>(fn: (this: ReactiveArray<T>, value: T, i: number) => R) => R[];
+    on: <K extends keyof Events<T>>(event: K, listener: Listener<Events<T>[K]>) => void;
+    once: <K extends keyof Events<T>>(event: K, listener: Listener<Events<T>[K]>) => void;
 }>;
 type Events<T> = {
     clear: undefined;
@@ -58,10 +58,10 @@ declare const _default: <T>(data: T[]) => {
     sort: (compareFn?: ((a: T, b: T) => number) | undefined) => T[] & {
         clear: () => void;
         dispose: () => void;
-        dispatch: <K extends keyof Events<T_1[number]>, V>(event: K, value?: V | undefined) => void;
+        dispatch: <K extends keyof Events<T_1>, V>(event: K, value?: V | undefined) => void;
         map: <R>(fn: (this: any, value: T, i: number) => R) => R[];
-        on: <K extends keyof Events<T_1[number]>>(event: K, listener: Listener<Events<T>[K]>) => void;
-        once: <K extends keyof Events<T_1[number]>>(event: K, listener: Listener<Events<T>[K]>) => void;
+        on: <K extends keyof Events<T_1>>(event: K, listener: Listener<Events<T>[K]>) => void;
+        once: <K extends keyof Events<T_1>>(event: K, listener: Listener<Events<T>[K]>) => void;
     };
     splice: {
         (start: number, deleteCount?: number): T[];
@@ -99,18 +99,18 @@ declare const _default: <T>(data: T[]) => {
     fill: (value: T, start?: number, end?: number) => T[] & {
         clear: () => void;
         dispose: () => void;
-        dispatch: <K extends keyof Events<T_1[number]>, V>(event: K, value?: V | undefined) => void;
+        dispatch: <K extends keyof Events<T_1>, V>(event: K, value?: V | undefined) => void;
         map: <R>(fn: (this: any, value: T, i: number) => R) => R[];
-        on: <K extends keyof Events<T_1[number]>>(event: K, listener: Listener<Events<T>[K]>) => void;
-        once: <K extends keyof Events<T_1[number]>>(event: K, listener: Listener<Events<T>[K]>) => void;
+        on: <K extends keyof Events<T_1>>(event: K, listener: Listener<Events<T>[K]>) => void;
+        once: <K extends keyof Events<T_1>>(event: K, listener: Listener<Events<T>[K]>) => void;
     };
     copyWithin: (target: number, start: number, end?: number) => T[] & {
         clear: () => void;
         dispose: () => void;
-        dispatch: <K extends keyof Events<T_1[number]>, V>(event: K, value?: V | undefined) => void;
+        dispatch: <K extends keyof Events<T_1>, V>(event: K, value?: V | undefined) => void;
         map: <R>(fn: (this: any, value: T, i: number) => R) => R[];
-        on: <K extends keyof Events<T_1[number]>>(event: K, listener: Listener<Events<T>[K]>) => void;
-        once: <K extends keyof Events<T_1[number]>>(event: K, listener: Listener<Events<T>[K]>) => void;
+        on: <K extends keyof Events<T_1>>(event: K, listener: Listener<Events<T>[K]>) => void;
+        once: <K extends keyof Events<T_1>>(event: K, listener: Listener<Events<T>[K]>) => void;
     };
     entries: () => ArrayIterator<[number, T]>;
     keys: () => ArrayIterator<number>;
@@ -178,9 +178,9 @@ declare const _default: <T>(data: T[]) => {
     };
     clear: () => void;
     dispose: () => void;
-    dispatch: <K extends keyof Events<T_1[number]>, V>(event: K, value?: V | undefined) => void;
-    on: <K extends keyof Events<T_1[number]>>(event: K, listener: Listener<Events<T>[K]>) => void;
-    once: <K extends keyof Events<T_1[number]>>(event: K, listener: Listener<Events<T>[K]>) => void;
+    dispatch: <K extends keyof Events<T_1>, V>(event: K, value?: V | undefined) => void;
+    on: <K extends keyof Events<T_1>>(event: K, listener: Listener<Events<T>[K]>) => void;
+    once: <K extends keyof Events<T_1>>(event: K, listener: Listener<Events<T>[K]>) => void;
 };
 export default _default;
 export type { ReactiveArray };

package/build/reactive/index.d.ts

@@ -1,6 +1,6 @@
-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;
+import { ReactiveArray } from './array.js';
+import { ReactiveObject } from './object.js';
+type API<T> = T extends Record<PropertyKey, unknown> ? ReactiveObject<T> : T extends (infer U)[] ? ReactiveArray<U> : never;
 declare const _default: <T extends Record<PropertyKey, any> | unknown[]>(input: T extends {
     dispose: any;
 } ? {

package/build/types.d.ts

@@ -15,9 +15,6 @@ interface Computed<T> {
     subsTail: Link | null;
     value: T;
 }
-type Infer<T> = T extends (...args: unknown[]) => Promise<infer R> ? R | undefined : T extends (...args: any[]) => infer R ? R : T extends (infer U)[] ? Infer<U>[] : T extends ReactiveObject<any> ? T : T extends Record<PropertyKey, unknown> ? {
-    [K in keyof T]: T[K];
-} : T;
 interface Link {
     dep: Signal<unknown> | Computed<unknown>;
     sub: Computed<unknown>;
@@ -32,4 +29,4 @@ type Signal<T> = {
     subsTail: Link | null;
     value: T;
 };
-export type { Computed, Infer, Link, Signal, ReactiveArray, ReactiveObject };
+export type { Computed, Link, Signal, ReactiveArray, ReactiveObject };

package/package.json

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

package/src/reactive/array.ts

@@ -3,14 +3,14 @@ import { REACTIVE_ARRAY } from '~/constants';
 import { isReactiveObject } from './object';
 
 
-type ReactiveArray<T extends unknown[]> = Prettify<
-    T & {
+type ReactiveArray<T> = Prettify<
+    T[] & {
         clear: () => void;
         dispose: () => void;
-        dispatch: <K extends keyof Events<T[number]>, V>(event: K, value?: V) => void;
-        map: <R>(fn: (this: ReactiveArray<T>, value: T[number], i: number) => R) => R[];
-        on: <K extends keyof Events<T[number]>>(event: K, listener: Listener<Events<T[number]>[K]>) => void;
-        once: <K extends keyof Events<T[number]>>(event: K, listener: Listener<Events<T[number]>[K]>) => void;
+        dispatch: <K extends keyof Events<T>, V>(event: K, value?: V) => void;
+        map: <R>(fn: (this: ReactiveArray<T>, value: T, i: number) => R) => R[];
+        on: <K extends keyof Events<T>>(event: K, listener: Listener<Events<T>[K]>) => void;
+        once: <K extends keyof Events<T>>(event: K, listener: Listener<Events<T>[K]>) => void;
     }
 >;
 
@@ -97,8 +97,8 @@ function dispose<T>(data: T[]) {
 
 function map<T, R>(
     data: T[],
-    proxy: ReactiveArray<typeof data>,
-    fn: (this: ReactiveArray<typeof data>, value: T, i: number) => R
+    proxy: ReactiveArray<T>,
+    fn: (this: ReactiveArray<T>, value: T, i: number) => R
 ) {
     let n = data.length,
         values: R[] = new Array(n);
@@ -242,7 +242,7 @@ export default <T>(data: T[]) => {
 
                 return true;
             }
-        }) as ReactiveArray<typeof data>,
+        }) as ReactiveArray<T>,
         wrapper = {
             [REACTIVE_ARRAY]: true,
             at: (i: number) => data[i],
@@ -258,7 +258,7 @@ export default <T>(data: T[]) => {
                 dispose(data);
                 return proxy;
             },
-            map: <R>(fn: (this: ReactiveArray<typeof data>, value: T, i: number) => R) => {
+            map: <R>(fn: (this: ReactiveArray<T>, value: T, i: number) => R) => {
                 return map(data, proxy, fn);
             },
             on: <K extends keyof Events<T>>(event: K, listener: Listener<Events<T>[K]>) => {

package/src/reactive/index.ts

@@ -1,14 +1,14 @@
 import { isArray, isObject } from '@esportsplus/utilities';
 import { onCleanup, root } from '~/system';
-import array from './array';
-import object from './object';
+import array, { ReactiveArray } from './array';
+import object, { ReactiveObject } from './object';
 
 
 type API<T> =
     T extends Record<PropertyKey, unknown>
-        ? ReturnType<typeof object<T>>
-        : T extends unknown[]
-            ? ReturnType<typeof array<T>>
+        ? ReactiveObject<T>
+        : T extends (infer U)[]
+            ? ReactiveArray<U>
             : never;
 
 

package/src/types.ts

@@ -23,19 +23,6 @@ interface Computed<T> {
     value: T;
 }
 
-type Infer<T> =
-    T extends (...args: unknown[]) => Promise<infer R>
-        ? R | undefined
-        : T extends (...args: any[]) => infer R
-            ? R
-            : T extends (infer U)[]
-                ? Infer<U>[]
-                : T extends ReactiveObject<any>
-                    ? T
-                    : T extends Record<PropertyKey, unknown>
-                        ? { [K in keyof T]: T[K] }
-                        : T;
-
 interface Link {
     dep: Signal<unknown> | Computed<unknown>;
     sub: Computed<unknown>;
@@ -55,7 +42,6 @@ type Signal<T> = {
 
 export type {
     Computed,
-    Infer,
     Link,
     Signal,
     ReactiveArray, ReactiveObject