@esportsplus/reactivity 0.2.0 → 0.2.2

package/build/reactive/array.js

@@ -1,5 +1,5 @@
+import { isInstanceOf, isNumber, isObject } from '@esportsplus/utilities';
 import { dispose, signal, Reactive } from '../signal';
-import { isInstanceOf, isNumber, isObject } from '../utilities';
 import { ReactiveObject } from './object';
 let handler = {
     get(target, prop) {

package/build/reactive/index.d.ts

@@ -4,7 +4,7 @@ import { ReactiveArray } from './array';
 import { ReactiveObject } from './object';
 type Guard<T> = T extends Record<PropertyKey, unknown> ? {
     [K in keyof T]: Never<K, Guard<T[K]>>;
-} : T extends unknown[] ? T : never;
+} : T extends unknown[] ? T : T extends Function ? never : T;
 type Infer<T> = T extends (...args: unknown[]) => unknown ? ReturnType<T> : T extends (infer U)[] ? Prettify<Omit<U[], 'map'> & Pick<ReactiveArray<U>, 'dispatch' | 'dispose' | 'map' | 'on' | 'once'>> : T extends Record<PropertyKey, unknown> ? {
     [K in keyof T]: T[K];
 } : T;

package/build/reactive/index.js

@@ -1,6 +1,6 @@
+import { isArray, isObject } from '@esportsplus/utilities';
 import { default as array } from './array';
 import { default as object } from './object';
-import { isArray, isObject } from '../utilities';
 export default (data, options = {}) => {
     let value;
     if (isArray(data)) {
@@ -10,7 +10,7 @@ export default (data, options = {}) => {
         value = object(data, options);
     }
     else {
-        throw new Error('Reactivity: received invalid input for `reactive()`', data);
+        throw new Error(`Reactivity: 'reactive' received invalid input - ${JSON.stringify(data)}`);
     }
     return value;
 };

package/build/reactive/object.js

@@ -1,5 +1,5 @@
+import { defineProperty, isArray, isFunction } from '@esportsplus/utilities';
 import { computed, signal } from '../signal';
-import { defineProperty, isArray, isFunction } from '../utilities';
 import { default as array } from './array';
 class ReactiveObject {
     signals = {};

package/build/signal.js

@@ -1,5 +1,5 @@
+import { isArray } from '@esportsplus/utilities';
 import { CHECK, CLEAN, COMPUTED, DIRTY, DISPOSED, EFFECT, ROOT, SIGNAL } from './constants';
-import { isArray } from './utilities';
 let index = 0, observer = null, observers = null, scope = null;
 class Reactive {
     changed = null;

package/package.json

@@ -1,7 +1,8 @@
 {
     "author": "ICJR",
     "dependencies": {
-        "@esportsplus/custom-function": "^0.0.7"
+        "@esportsplus/custom-function": "^0.0.7",
+        "@esportsplus/utilities": "^0.0.7"
     },
     "devDependencies": {
         "@esportsplus/typescript": "^0.4.9"
@@ -16,5 +17,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "build/index.d.ts",
-    "version": "0.2.0"
+    "version": "0.2.2"
 }

package/src/reactive/array.ts

@@ -1,6 +1,6 @@
+import { isInstanceOf, isNumber, isObject } from '@esportsplus/utilities';
 import { dispose, signal, Reactive } from '~/signal';
 import { Listener, Options, Signal } from '~/types';
-import { isInstanceOf, isNumber, isObject } from '~/utilities';
 import { ReactiveObject } from './object';
 
 

package/src/reactive/index.ts

@@ -1,8 +1,8 @@
 import { Prettify } from '@esportsplus/typescript';
+import { isArray, isObject } from '@esportsplus/utilities';
 import { Options } from '~/types';
 import { default as array, ReactiveArray } from './array';
 import { default as object, ReactiveObject } from './object';
-import { isArray, isObject } from '~/utilities';
 
 
 type Guard<T> =
@@ -10,7 +10,9 @@ type Guard<T> =
         ? { [K in keyof T]: Never<K, Guard<T[K]>> }
         : T extends unknown[]
             ? T
-            : never;
+            : T extends Function
+                ? never
+                : T;
 
 type Infer<T> =
     T extends (...args: unknown[]) => unknown
@@ -34,7 +36,7 @@ export default <T>(data: Guard<T>, options: Options = {}) => {
         value = object(data as { [K in keyof T]: T[K] }, options);
     }
     else {
-        throw new Error('Reactivity: received invalid input for `reactive()`', data);
+        throw new Error(`Reactivity: 'reactive' received invalid input - ${JSON.stringify(data)}`);
     }
 
     return value as T extends Record<PropertyKey, unknown> ? { [K in keyof T]: Infer<T[K]> } : Infer<T>;

package/src/reactive/object.ts

@@ -1,6 +1,6 @@
+import { defineProperty, isArray, isFunction } from '@esportsplus/utilities';
 import { computed, signal } from '~/signal';
 import { Computed, Options, Signal } from '~/types';
-import { defineProperty, isArray, isFunction } from '~/utilities';
 import { default as array, ReactiveArray } from './array';
 
 

package/src/signal.ts

@@ -1,6 +1,6 @@
+import { isArray } from '@esportsplus/utilities';
 import { CHECK, CLEAN, COMPUTED, DIRTY, DISPOSED, EFFECT, ROOT, SIGNAL } from './constants';
 import { Computed, Changed, Effect, Event, Function, Listener, NeverAsync, Options, Root, Scheduler, Signal, State, Type } from './types';
-import { isArray } from './utilities';
 
 
 let index = 0,

package/build/utilities.d.ts

@@ -1,8 +0,0 @@
-declare const defineProperty: <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T;
-declare const isArray: (arg: any) => arg is any[];
-declare const isFunction: (value: unknown) => value is Function;
-declare const isInstanceOf: <T>(instance: unknown, match: new (...args: any) => T) => instance is T;
-declare const isNumber: (value: any) => value is number;
-declare const isObject: (value: unknown) => value is Record<PropertyKey, unknown>;
-declare const isString: (value: unknown) => value is string;
-export { defineProperty, isArray, isFunction, isInstanceOf, isNumber, isObject, isString };

package/build/utilities.js

@@ -1,18 +0,0 @@
-const { defineProperty } = Object;
-const { isArray } = Array;
-const isFunction = (value) => {
-    return typeof value === 'function';
-};
-const isInstanceOf = (instance, match) => {
-    return typeof instance === 'object' && instance !== null && instance.constructor === match;
-};
-const isNumber = (value) => {
-    return !isNaN(value);
-};
-const isObject = (value) => {
-    return typeof value === 'object' && value !== null && value.constructor === Object;
-};
-const isString = (value) => {
-    return typeof value === 'string';
-};
-export { defineProperty, isArray, isFunction, isInstanceOf, isNumber, isObject, isString };

package/src/utilities.ts

@@ -1,26 +0,0 @@
-const { defineProperty } = Object;
-
-const { isArray } = Array;
-
-const isFunction = (value: unknown): value is Function => {
-    return typeof value === 'function';
-};
-
-const isInstanceOf = <T>(instance: unknown, match: new (...args: any) => T): instance is T => {
-    return typeof instance === 'object' && instance !== null && instance.constructor === match;
-};
-
-const isNumber = (value: any): value is number => {
-    return !isNaN(value);
-};
-
-const isObject = (value: unknown): value is Record<PropertyKey, unknown> => {
-    return typeof value === 'object' && value !== null && value.constructor === Object;
-};
-
-const isString = (value: unknown): value is string => {
-    return typeof value === 'string';
-};
-
-
-export { defineProperty, isArray, isFunction, isInstanceOf, isNumber, isObject, isString };