@esportsplus/reactivity 0.0.9 → 0.0.11

package/build/methods/reactive.d.ts

@@ -1,3 +1,3 @@
 import { Infer } from '../types';
-declare const reactive: <T>(value: T) => Infer<T>;
-export default reactive;
+declare const _default: <T>(value: T) => Infer<T>;
+export default _default;

package/build/methods/reactive.js

@@ -5,13 +5,13 @@ function obj(values) {
         properties[key] = {
             get() {
                 if (!lazy[key]) {
-                    lazy[key] = setup(values[key]);
+                    lazy[key] = reactive(values[key]);
                 }
                 return lazy[key].get();
             },
             set(value) {
                 if (!lazy[key]) {
-                    lazy[key] = setup(values[key]);
+                    lazy[key] = reactive(values[key]);
                 }
                 lazy[key].set(value);
             }
@@ -20,20 +20,10 @@ function obj(values) {
     return Object.defineProperties({}, properties);
 }
 ;
-function setup(value) {
+function reactive(value) {
     if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
         return obj(value);
     }
-    return reactive(value);
+    return new Reactive(value);
 }
-const reactive = (value) => {
-    let v;
-    if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
-        v = obj(value);
-    }
-    else {
-        v = new Reactive(value);
-    }
-    return v;
-};
-export default reactive;
+export default (value) => reactive(value);

package/build/types.d.ts

@@ -2,7 +2,8 @@ import { CLEAN, CHECK, DIRTY } from './symbols';
 import Reactive from './reactive';
 type Fn = () => Promise<unknown> | unknown;
 type Infer<T> = T extends (...args: any[]) => any ? Reactive<T> : T extends Record<string, any> ? InferNested<T> : Reactive<T>;
-type InferNested<T> = T extends (...args: any[]) => any ? ReturnType<T> : T extends Record<string, any> ? {
+type Primitives = any[] | boolean | number | string | null | undefined | ((...args: any[]) => any);
+type InferNested<T> = T extends (...args: any[]) => any ? ReturnType<T> : T extends Record<string, Primitives> ? {
     [K in keyof T]: InferNested<T[K]>;
 } : T;
 type Scheduler = {

package/package.json

@@ -15,5 +15,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "./build/index.d.ts",
-    "version": "0.0.9"
+    "version": "0.0.11"
 }

package/src/methods/reactive.ts

@@ -11,14 +11,14 @@ function obj<T>(values: T) {
         properties[key] = {
             get() {
                 if (!lazy[key]) {
-                    lazy[key] = setup(values[key]);
+                    lazy[key] = reactive(values[key]);
                 }
 
                 return lazy[key].get();
             },
             set(value: unknown) {
                 if (!lazy[key]) {
-                    lazy[key] = setup(values[key]);
+                    lazy[key] = reactive(values[key]);
                 }
 
                 lazy[key].set(value);
@@ -29,7 +29,7 @@ function obj<T>(values: T) {
     return Object.defineProperties({}, properties) as T;
 };
 
-function setup<T>(value: T) {
+function reactive<T>(value: T) {
     // if (Array.isArray(value)) {
     // TODO
     // }
@@ -38,22 +38,8 @@ function setup<T>(value: T) {
         return obj(value);
     }
 
-    return reactive(value) as T;
+    return new Reactive(value) as T;
 }
 
 
-const reactive = <T>(value: T) => {
-    let v: unknown;
-
-    if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
-        v = obj(value);
-    }
-    else {
-        v = new Reactive(value);
-    }
-
-    return v as Infer<T>;
-};
-
-
-export default reactive;
+export default <T>(value: T) => reactive(value) as Infer<T>;

package/src/types.ts

@@ -11,10 +11,12 @@ type Infer<T> =
                 ? InferNested<T>
                 : Reactive<T>;
 
+type Primitives = any[] | boolean | number | string | null | undefined | ((...args: any[]) => any);
+
 type InferNested<T> =
     T extends (...args: any[]) => any
         ? ReturnType<T>
-        : T extends Record<string, any>
+        : T extends Record<string, Primitives>
             ? { [K in keyof T]: InferNested<T[K]> }
             : T;