@esportsplus/reactivity 0.0.8 → 0.0.10

package/build/index.d.ts

@@ -1,7 +1,7 @@
 import { scheduler } from './reactive';
 import { effect, reactive } from './methods';
 declare const _default: {
-    effect: <T>(value: () => T) => void;
+    effect: <T>(fn: () => T) => void;
     reactive: <T_1>(value: T_1) => import("./types").Infer<T_1>;
     scheduler: {
         add: (scheduler: import("./types").Scheduler) => void;

package/build/methods/effect.d.ts

@@ -1,2 +1,2 @@
-declare const _default: <T>(value: () => T) => void;
+declare const _default: <T>(fn: () => T) => void;
 export default _default;

package/build/methods/effect.js

@@ -1,4 +1,4 @@
 import Reactive from '../reactive';
-export default (value) => {
-    new Reactive(value, true);
+export default (fn) => {
+    new Reactive(fn, true);
 };

package/build/reactive.d.ts

@@ -1,4 +1,5 @@
 import { Scheduler } from './types';
+type Fn<T> = (onCleanup?: (fn: VoidFunction) => void) => T;
 declare class Reactive<T> {
     private effect;
     private fn?;
@@ -7,8 +8,8 @@ declare class Reactive<T> {
     private state;
     private value;
     cleanup: ((old: T) => void)[] | null;
-    constructor(input: ((fn: VoidFunction) => T) | T, effect?: boolean);
-    get(): T;
+    constructor(data: Fn<T> | T, effect?: boolean);
+    get(): T extends (...args: any[]) => any ? ReturnType<T> : T;
     set(value: T): void;
     private mark;
     private removeParentObservers;

package/build/reactive.js

@@ -14,10 +14,10 @@ class Reactive {
     state;
     value;
     cleanup = null;
-    constructor(input, effect = false) {
+    constructor(data, effect = false) {
         this.effect = effect;
-        if (typeof input === 'function') {
-            this.fn = input;
+        if (typeof data === 'function') {
+            this.fn = data;
             this.state = DIRTY;
             this.value = undefined;
             if (effect) {
@@ -26,7 +26,7 @@ class Reactive {
         }
         else {
             this.state = CLEAN;
-            this.value = input;
+            this.value = data;
         }
     }
     get() {

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.8"
+    "version": "0.0.10"
 }

package/src/methods/effect.ts

@@ -1,6 +1,6 @@
 import Reactive from '~/reactive';
 
 
-export default <T>(value: () => T): void => {
-    new Reactive(value, true);
+export default <T>(fn: () => T): void => {
+    new Reactive(fn, true);
 };

package/src/reactive.ts

@@ -18,9 +18,12 @@ async function task() {
 }
 
 
+type Fn<T> = (onCleanup?: (fn: VoidFunction) => void) => T;
+
+
 class Reactive<T> {
     private effect: boolean;
-    private fn?: (onCleanup: (fn: VoidFunction) => void) => T;
+    private fn?: Fn<T>;
     private observers: Reactive<any>[] | null = null;
     private sources: Reactive<any>[] | null = null;
     private state: State;
@@ -30,11 +33,11 @@ class Reactive<T> {
     cleanup: ((old: T) => void)[] | null = null;
 
 
-    constructor(input: ((fn: VoidFunction) => T) | T, effect: boolean = false) {
+    constructor(data: Fn<T> | T, effect: boolean = false) {
         this.effect = effect;
 
-        if (typeof input === 'function') {
-            this.fn = input as (onCleanup: (fn: VoidFunction) => void) => T;
+        if (typeof data === 'function') {
+            this.fn = data as Fn<T>;
             this.state = DIRTY;
             this.value = undefined as any;
 
@@ -44,12 +47,12 @@ class Reactive<T> {
         }
         else {
             this.state = CLEAN;
-            this.value = input;
+            this.value = data;
         }
     }
 
 
-    get(): T {
+    get() {
         if (reaction) {
             if (!stack && reaction.sources && reaction.sources[index] == this) {
                 index++;
@@ -68,7 +71,7 @@ class Reactive<T> {
             this.sync();
         }
 
-        return this.value;
+        return this.value as T extends (...args: any[]) => any ? ReturnType<T> : T;
     }
 
     set(value: 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;