@esportsplus/reactivity 0.0.13 → 0.0.15

package/build/index.d.ts

@@ -2,7 +2,7 @@ import { scheduler } from './reactive';
 import { effect, reactive } from './methods';
 declare const _default: {
     effect: <T>(fn: () => T) => void;
-    reactive: <T_1>(value: T_1) => import("./types").Infer<T_1>;
+    reactive: <T_1>(value: T_1) => T_1 | import("./reactive").default<T_1 & Function> | ((...args: any[]) => (T_1 & Function extends infer T_2 ? T_2 extends T_1 & Function ? T_2 extends (...args: any[]) => any ? ReturnType<T_2> : T_2 : never : never) extends (...args: any[]) => any ? ReturnType<((...args: any[]) => any) & (T_1 & Function extends infer T_2 ? T_2 extends T_1 & Function ? T_2 extends (...args: any[]) => any ? ReturnType<T_2> : T_2 : never : never)> : T_1 & Function extends infer T_2 ? T_2 extends T_1 & Function ? T_2 extends (...args: any[]) => any ? ReturnType<T_2> : T_2 : never : never);
     scheduler: {
         add: (scheduler: import("./types").Scheduler) => void;
         delete: (scheduler: import("./types").Scheduler) => void;

package/build/methods/reactive.d.ts

@@ -1,3 +1,3 @@
-import { Infer } from '../types';
-declare const _default: <T>(value: T) => Infer<T>;
+import Reactive from '../reactive';
+declare const _default: <T>(value: T) => T | Reactive<T & Function> | ((...args: any[]) => (T & Function extends infer T_1 ? T_1 extends T & Function ? T_1 extends (...args: any[]) => any ? ReturnType<T_1> : T_1 : never : never) extends (...args: any[]) => any ? ReturnType<((...args: any[]) => any) & (T & Function extends infer T_1 ? T_1 extends T & Function ? T_1 extends (...args: any[]) => any ? ReturnType<T_1> : T_1 : never : never)> : T & Function extends infer T_1 ? T_1 extends T & Function ? T_1 extends (...args: any[]) => any ? ReturnType<T_1> : T_1 : never : never);
 export default _default;

package/build/methods/reactive.js

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

package/package.json

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

package/src/methods/reactive.ts

@@ -1,10 +1,9 @@
-import { Infer } from '~/types';
 import Reactive from '~/reactive';
 
 
-function factory<T>(value: T) {
+function factory<T>(value: T, wrap = false) {
     if (typeof value === 'function') {
-        return fn(value);
+        return fn(value, wrap);
     }
 
     if (typeof value === 'object' && value !== null && (value.constructor === Object)) {
@@ -14,9 +13,15 @@ function factory<T>(value: T) {
     return new Reactive(value) as T;
 }
 
-function fn<T>(value: T) {
+function fn<T>(value: T, wrap: boolean) {
     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();
 
@@ -42,10 +47,6 @@ function obj<T>(values: T) {
                     lazy[key] = factory(values[key]);
                 }
 
-                if (typeof values[key] === 'function') {
-                    return lazy[key]();
-                }
-
                 if (lazy[key] instanceof Reactive) {
                     return lazy[key].get();
                 }
@@ -71,4 +72,4 @@ function obj<T>(values: T) {
 };
 
 
-export default <T>(value: T) => factory(value) as Infer<T>;
+export default <T>(value: T) => factory(value, true);