@esportsplus/reactivity 0.4.5 → 0.4.6

package/build/reactive/index.d.ts

@@ -1,4 +1,4 @@
-import { Options, ReactiveArray, ReactiveObject } from '../types.js';
+import { Options, Reactive } from '../types.js';
 type Guard<T> = T extends {
     dispose: any;
 } | {
@@ -6,5 +6,5 @@ type Guard<T> = T extends {
 } ? {
     never: '[ dispose, signals ] are reserved keys';
 } : T extends Record<PropertyKey, unknown> | unknown[] ? T : never;
-declare const _default: <T>(data: Guard<T>, options?: Options) => T extends Record<PropertyKey, unknown> ? ReactiveObject<T> : ReactiveArray<T>;
+declare const _default: <T>(data: Guard<T>, options?: Options) => Reactive<T>;
 export default _default;

package/build/types.d.ts

@@ -2,8 +2,8 @@ import { Function, NeverAsync, Prettify } from '@esportsplus/utilities';
 import { ReactiveArray } from './reactive/array.js';
 import { ReactiveObject } from './reactive/object.js';
 import { CHECK, CLEAN, COMPUTED, DIRTY, DISPOSED, EFFECT, ROOT, SIGNAL } from './constants.js';
-import { Reactive } from './signal.js';
-type Base<T> = Omit<Reactive<T>, 'changed' | 'fn' | 'get' | 'scheduler' | 'set' | 'task' | 'tracking'>;
+import { Reactive as ReactiveBase } from './signal.js';
+type Base<T> = Omit<ReactiveBase<T>, 'changed' | 'fn' | 'get' | 'scheduler' | 'set' | 'task' | 'tracking'>;
 type Changed = (a: unknown, b: unknown) => boolean;
 type Computed<T> = {
     changed: Changed;
@@ -26,11 +26,12 @@ type Listener<D> = {
 type Options = {
     changed?: Changed;
 };
+type Reactive<T> = T extends Record<PropertyKey, unknown> ? ReactiveObject<T> : ReactiveArray<T>;
 type Root = {
     scheduler: Scheduler;
     tracking: boolean;
     value: void;
-} & Omit<Reactive<void>, 'root'>;
+} & Omit<ReactiveBase<void>, 'root'>;
 type Scheduler = (fn: Function) => unknown;
 type Signal<T> = {
     changed: Changed;
@@ -39,4 +40,4 @@ type Signal<T> = {
 } & Base<T>;
 type State = typeof CHECK | typeof CLEAN | typeof DIRTY | typeof DISPOSED;
 type Type = typeof COMPUTED | typeof EFFECT | typeof ROOT | typeof SIGNAL;
-export type { Changed, Computed, Effect, Event, Function, Infer, Listener, NeverAsync, Options, Prettify, ReactiveArray, ReactiveObject, Root, Scheduler, Signal, State, Type };
+export type { Changed, Computed, Effect, Event, Function, Infer, Listener, NeverAsync, Options, Prettify, Reactive, ReactiveArray, ReactiveObject, Root, Scheduler, Signal, State, Type };

package/package.json

@@ -2,7 +2,7 @@
   "author": "ICJR",
   "dependencies": {
     "@esportsplus/custom-function": "^0.0.12",
-    "@esportsplus/utilities": "^0.13.2"
+    "@esportsplus/utilities": "^0.15.0"
   },
   "devDependencies": {
     "@esportsplus/typescript": "^0.9.1"
@@ -12,7 +12,7 @@
   "private": false,
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/reactive/index.ts

@@ -1,5 +1,5 @@
 import { isArray, isObject } from '@esportsplus/utilities';
-import { Options, ReactiveArray, ReactiveObject } from '~/types';
+import { Options, Reactive } from '~/types';
 import { default as array } from './array';
 import { default as object } from './object';
 
@@ -25,7 +25,5 @@ export default <T>(data: Guard<T>, options: Options = {}) => {
         throw new Error(`Reactivity: 'reactive' received invalid input - ${JSON.stringify(data)}`);
     }
 
-    return value as T extends Record<PropertyKey, unknown>
-        ? ReactiveObject<T>
-        : ReactiveArray<T>;
+    return value as Reactive<T>;
 };

package/src/types.ts

@@ -2,10 +2,10 @@ import { Function, NeverAsync, Prettify } from '@esportsplus/utilities'
 import { ReactiveArray } from './reactive/array';
 import { ReactiveObject } from './reactive/object';
 import { CHECK, CLEAN, COMPUTED, DIRTY, DISPOSED, EFFECT, ROOT, SIGNAL } from './constants';
-import { Reactive } from './signal';
+import { Reactive as ReactiveBase } from './signal';
 
 
-type Base<T> = Omit<Reactive<T>, 'changed' | 'fn' | 'get' | 'scheduler' | 'set' | 'task' | 'tracking'>;
+type Base<T> = Omit<ReactiveBase<T>, 'changed' | 'fn' | 'get' | 'scheduler' | 'set' | 'task' | 'tracking'>;
 
 type Changed = (a: unknown, b: unknown) => boolean;
 
@@ -44,11 +44,15 @@ type Options = {
     changed?: Changed;
 };
 
+type Reactive<T> = T extends Record<PropertyKey, unknown>
+    ? ReactiveObject<T>
+    : ReactiveArray<T>;
+
 type Root = {
     scheduler: Scheduler;
     tracking: boolean;
     value: void;
-} & Omit<Reactive<void>, 'root'>;
+} & Omit<ReactiveBase<void>, 'root'>;
 
 type Scheduler = (fn: Function) => unknown;
 
@@ -72,7 +76,7 @@ export type {
     NeverAsync,
     Options,
     Prettify,
-    ReactiveArray, ReactiveObject, Root,
+    Reactive, ReactiveArray, ReactiveObject, Root,
     Scheduler, Signal, State,
     Type
 };