@esportsplus/reactivity 0.0.5 → 0.0.6

package/build/index.d.ts

@@ -1,7 +1,6 @@
 import { Queue } from './types';
-type Infer<T> = T extends (...args: any[]) => any ? Infer<ReturnType<T>> : T extends Record<string, any> ? {
-    [K in keyof T]: Infer<T[K]>;
-} : Reactive<T>;
+type Infer<T> = T extends (...args: any[]) => any ? InferValue<ReturnType<T>> : InferValue<T>;
+type InferValue<T> = T extends Record<string, any> ? T : Reactive<T>;
 declare class Reactive<T> {
     private effect;
     private fn?;

package/build/index.js

@@ -167,7 +167,11 @@ const effect = (queue) => {
 };
 const reactive = (value) => {
     let v;
-    if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+    if (typeof value === 'function') {
+        let fn = new Reactive(value);
+        v = (...args) => fn.get()(...args);
+    }
+    else if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
         v = obj(value);
     }
     else {

package/package.json

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

package/src/index.ts

@@ -3,13 +3,13 @@ import { Queue, State } from './types';
 import obj from './obj';
 
 
+// We only unwrap the top level function
 type Infer<T> =
     T extends (...args: any[]) => any
-        ? Infer<ReturnType<T>>
-        : T extends Record<string, any>
-            ? { [K in keyof T]: Infer<T[K]> }
-            // Requires class type
-            : Reactive<T>;
+        ? InferValue<ReturnType<T>>
+        : InferValue<T>;
+
+type InferValue<T> = T extends Record<string, any> ? T : Reactive<T>;
 
 
 let index = 0,
@@ -241,7 +241,12 @@ const effect = (queue: Queue) => {
 const reactive = <T>(value: T) => {
     let v;
 
-    if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+    if (typeof value === 'function') {
+        let fn = new Reactive(value);
+
+        v = (...args: any[]) => fn.get()(...args);
+    }
+    else if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
         v = obj(value);
     }
     else {