@esportsplus/reactivity 0.6.0 → 0.6.2

package/build/reactive/array.d.ts

@@ -27,12 +27,12 @@ type Events<T> = {
         items: Item<T>[];
     };
 };
-type Item<T> = Computed<T> | ReactiveArray<T> | ReactiveObject<T extends Record<PropertyKey, unknown> ? T : never> | T;
+type Item<T> = Computed<T> | API<T> | ReactiveObject<T extends Record<PropertyKey, unknown> ? T : never> | T;
 type Listener<V> = {
     once?: boolean;
     (value: V): void;
 };
-type Value<T> = T extends Record<PropertyKey, unknown> ? ReactiveObject<T> : T extends Array<infer U> ? ReactiveArray<U> : T;
+type Value<T> = T extends Record<PropertyKey, unknown> ? ReactiveObject<T> : T extends Array<infer U> ? API<U> : T;
 declare class ReactiveArray<T> extends Disposable {
     private data;
     private listeners;
@@ -40,12 +40,12 @@ declare class ReactiveArray<T> extends Disposable {
     constructor(data: Item<T>[], proxy: API<T>);
     get length(): number;
     set length(n: number);
-    at(i: number): ReactiveArray<T> | T | ReactiveObject<T extends Record<PropertyKey, unknown> ? T : never>;
-    dispatch<D>(event: keyof Events<T>, value?: D): void;
+    at(i: number): T | API<T> | ReactiveObject<T extends Record<PropertyKey, unknown> ? T : never>;
+    dispatch<K extends keyof Events<T>, V>(event: K, value?: V): void;
     dispose(): void;
     map<R>(fn: (this: API<T>, value: Value<T>, i: number) => R, i?: number, n?: number): R[];
-    on<T>(event: keyof Events<T>, listener: Listener<T>): void;
-    once<T>(event: keyof Events<T>, listener: Listener<T>): void;
+    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;
     pop(): Item<T> | undefined;
     push(...input: T[]): number;
     reverse(): this;
@@ -55,4 +55,4 @@ declare class ReactiveArray<T> extends Disposable {
     unshift(...input: T[]): number;
 }
 export default function array<T>(input: T[]): API<T>;
-export { ReactiveArray };
+export type { API as ReactiveArray };

package/build/reactive/array.js

@@ -213,4 +213,3 @@ export default function array(input) {
     return proxy;
 }
 ;
-export { ReactiveArray };

package/build/reactive/index.d.ts

@@ -1,4 +1,7 @@
-import { Reactive } from '../types.js';
+import array from './array.js';
+import object from './object.js';
+import promise from './promise.js';
+type API<T> = T extends (...args: infer A) => Promise<infer R> ? ReturnType<typeof promise<A, Promise<R>>> : T extends Record<PropertyKey, unknown> ? ReturnType<typeof object<T>> : T extends unknown[] ? ReturnType<typeof array<T>> : never;
 type Guard<T> = T extends (...args: unknown[]) => Promise<unknown> ? T : T extends {
     dispose: any;
 } | {
@@ -6,5 +9,5 @@ type Guard<T> = T extends (...args: unknown[]) => Promise<unknown> ? T : T exten
 } ? {
     never: '[ dispose, signals ] are reserved keys';
 } : T extends Record<PropertyKey, unknown> | unknown[] ? T : never;
-declare const _default: <T>(data: Guard<T>) => Reactive<T>;
+declare const _default: <T>(data: Guard<T>) => API<T>;
 export default _default;

package/build/reactive/index.js

@@ -3,18 +3,14 @@ import array from './array.js';
 import object from './object.js';
 import promise from './promise.js';
 export default (data) => {
-    let value;
     if (isArray(data)) {
-        value = array(data);
+        return array(data);
     }
     else if (isObject(data)) {
-        value = object(data);
+        return object(data);
     }
     else if (isPromise(data)) {
-        value = promise(data);
+        return promise(data);
     }
-    else {
-        throw new Error(`@esportsplus/reactivity: 'reactive' received invalid input - ${JSON.stringify(data)}`);
-    }
-    return value;
+    throw new Error(`@esportsplus/reactivity: 'reactive' received invalid input - ${JSON.stringify(data)}`);
 };

package/build/reactive/object.d.ts

@@ -10,4 +10,4 @@ declare class ReactiveObject<T extends Record<PropertyKey, unknown>> extends Dis
     dispose(): void;
 }
 export default function object<T extends Record<PropertyKey, unknown>>(input: T): API<T>;
-export { ReactiveObject };
+export type { API as ReactiveObject };

package/build/reactive/object.js

@@ -91,4 +91,3 @@ export default function object(input) {
     return new ReactiveObject(input);
 }
 ;
-export { ReactiveObject };

package/package.json

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

package/src/reactive/array.ts

@@ -33,7 +33,7 @@ type Events<T> = {
     };
 };
 
-type Item<T> = Computed<T> | ReactiveArray<T> | ReactiveObject<T extends Record<PropertyKey, unknown> ? T : never> | T;
+type Item<T> = Computed<T> | API<T> | ReactiveObject<T extends Record<PropertyKey, unknown> ? T : never> | T;
 
 type Listener<V> = {
     once?: boolean;
@@ -44,7 +44,7 @@ type Value<T> =
     T extends Record<PropertyKey, unknown>
         ? ReactiveObject<T>
         : T extends Array<infer U>
-            ? ReactiveArray<U>
+            ? API<U>
             : T;
 
 
@@ -85,7 +85,7 @@ class ReactiveArray<T> extends Disposable {
         return value;
     }
 
-    dispatch<D>(event: keyof Events<T>, value?: D) {
+    dispatch<K extends keyof Events<T>, V>(event: K, value?: V) {
         if (this.listeners === null || this.listeners[event] === undefined) {
             return;
         }
@@ -162,7 +162,7 @@ class ReactiveArray<T> extends Disposable {
         return values;
     }
 
-    on<T>(event: keyof Events<T>, listener: Listener<T>) {
+    on<K extends keyof Events<T>>(event: K, listener: Listener<Events<T>[K]>) {
         if (this.listeners === null) {
             this.listeners = { [event]: [listener] };
         }
@@ -185,7 +185,7 @@ class ReactiveArray<T> extends Disposable {
         }
     }
 
-    once<T>(event: keyof Events<T>, listener: Listener<T>) {
+    once<K extends keyof Events<T>>(event: K, listener: Listener<Events<T>[K]>) {
         listener.once = true;
         this.on(event, listener);
     }
@@ -291,7 +291,7 @@ function factory<T>(input: T[]) {
             items[i] = computed(value as Computed<T>['fn']);
         }
         else if (isObject(value)) {
-            items[i] = object(value);
+            items[i] = object(value) as Item<T>;
         }
         else {
             items[i] = value;
@@ -346,4 +346,4 @@ export default function array<T>(input: T[]) {
 
     return proxy;
 };
-export { ReactiveArray };
+export type { API as ReactiveArray };

package/src/reactive/index.ts

@@ -1,10 +1,18 @@
 import { isArray, isObject, isPromise } from '@esportsplus/utilities';
-import { Reactive } from '~/types';
 import array from './array';
 import object from './object';
 import promise from './promise';
 
 
+type API<T> =
+    T extends (...args: infer A) => Promise<infer R>
+        ? ReturnType<typeof promise<A, Promise<R>>>
+        : T extends Record<PropertyKey, unknown>
+            ? ReturnType<typeof object<T>>
+            : T extends unknown[]
+                ? ReturnType<typeof array<T>>
+                : never;
+
 type Guard<T> =
     T extends (...args: unknown[]) => Promise<unknown>
         ? T
@@ -15,21 +23,16 @@ type Guard<T> =
                 : never;
 
 
-export default <T>(data: Guard<T>) => {
-    let value;
-
+export default <T>(data: Guard<T>): API<T> => {
     if (isArray(data)) {
-        value = array(data);
+        return array(data) as API<T>;
     }
     else if (isObject(data)) {
-        value = object(data);
+        return object(data) as API<T>;
     }
     else if (isPromise(data)) {
-        value = promise(data);
-    }
-    else {
-        throw new Error(`@esportsplus/reactivity: 'reactive' received invalid input - ${JSON.stringify(data)}`);
+        return promise(data) as API<T>;
     }
 
-    return value as Reactive<T>;
+    throw new Error(`@esportsplus/reactivity: 'reactive' received invalid input - ${JSON.stringify(data)}`);
 };

package/src/reactive/object.ts

@@ -121,4 +121,4 @@ class ReactiveObject<T extends Record<PropertyKey, unknown>> extends Disposable
 export default function object<T extends Record<PropertyKey, unknown>>(input: T) {
     return new ReactiveObject(input) as API<T>;
 };
-export { ReactiveObject };
+export type { API as ReactiveObject };