@esportsplus/reactivity 0.0.14 → 0.0.16

package/build/methods/reactive.js

@@ -1,18 +1,12 @@
 import Reactive from '../reactive';
-function factory(value, wrap = false) {
-    if (typeof value === 'function') {
-        return fn(value, wrap);
-    }
+function factory(value) {
     if (typeof value === 'object' && value !== null && (value.constructor === Object)) {
         return obj(value);
     }
     return new Reactive(value);
 }
-function fn(value, wrap) {
+function fn(value) {
     let fn = new Reactive(value);
-    if (!wrap) {
-        return fn;
-    }
     return (...args) => {
         let value = fn.get();
         if (args.length && typeof value === 'function') {
@@ -50,4 +44,9 @@ function obj(values) {
     return Object.defineProperties({}, properties);
 }
 ;
-export default (value) => factory(value, true);
+export default (value) => {
+    if (typeof value === 'function') {
+        return fn(value);
+    }
+    return factory(value);
+};

package/build/types.d.ts

@@ -1,11 +1,9 @@
 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 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]>;
+type Infer<T> = T extends (...args: any[]) => any ? ReturnType<T> : T extends Record<string, Primitives> ? {
+    [K in keyof T]: Infer<T[K]>;
 } : T;
+type Primitives = any[] | boolean | number | string | null | undefined | ((...args: any[]) => any);
 type ReactiveFn<T> = (onCleanup?: (fn: VoidFunction) => void) => T;
 type Scheduler = {
     schedule(): void;

package/package.json

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

package/src/methods/reactive.ts

@@ -2,27 +2,18 @@ import { Infer } from '~/types';
 import Reactive from '~/reactive';
 
 
-function factory<T>(value: T, wrap = false) {
-    if (typeof value === 'function') {
-        return fn(value, wrap);
-    }
-
+function factory<T>(value: T) {
     if (typeof value === 'object' && value !== null && (value.constructor === Object)) {
         return obj(value);
     }
 
-    return new Reactive(value) as T;
+    return new Reactive(value);
 }
 
-function fn<T>(value: T, wrap: boolean) {
+// Functions are wrapped to remove '.get' usage
+function fn<T>(value: T) {
     let fn = new Reactive(value);
 
-    // We're inside an object, it will unwrap reactive values
-    if (!wrap) {
-        return fn;
-    }
-
-    // Factory functions are wrapped to remove '.get' usage
     return (...args: any[]) => {
         let value = fn.get();
 
@@ -30,9 +21,7 @@ function fn<T>(value: T, wrap: boolean) {
             value = value(...args);
         }
 
-        return value as typeof value extends (...args: any[]) => any
-            ? ReturnType<typeof value>
-            : typeof value;
+        return value;
     };
 }
 
@@ -69,8 +58,14 @@ function obj<T>(values: T) {
         };
     }
 
-    return Object.defineProperties({}, properties) as T;
+    return Object.defineProperties({}, properties);
 };
 
 
-export default <T>(value: T) => factory(value, true) as Infer<T>;
+export default <T>(value: T) => {
+    if (typeof value === 'function') {
+        return fn(value) as Infer<T>;
+    }
+
+    return factory(value) as Infer<T>;
+};

package/src/types.ts

@@ -1,25 +1,17 @@
 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 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]> }
+            ? { [K in keyof T]: Infer<T[K]> }
             : T;
 
+type Primitives = any[] | boolean | number | string | null | undefined | ((...args: any[]) => any);
+
 type ReactiveFn<T> = (onCleanup?: (fn: VoidFunction) => void) => T;
 
 type Scheduler = {