@esportsplus/reactivity 0.0.15 → 0.0.17

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) => 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);
+    reactive: <T_1>(value: T_1) => import("./types").Infer<T_1>;
     scheduler: {
         add: (scheduler: import("./types").Scheduler) => void;
         delete: (scheduler: import("./types").Scheduler) => void;

package/build/methods/reactive.d.ts

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

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/reactive.js

@@ -10,10 +10,7 @@ function mark(instances, state) {
             if (instance.effect && instance.state === CLEAN) {
                 queue.push(instance);
                 if (!scheduled) {
-                    for (let scheduler of schedulers) {
-                        scheduler.schedule();
-                    }
-                    scheduled = true;
+                    schedule();
                 }
             }
             instance.state = state;
@@ -23,12 +20,25 @@ function mark(instances, state) {
         }
     }
 }
-async function task() {
-    for (let i = 0, n = queue.length; i < n; i++) {
-        await queue[i].get();
+function schedule() {
+    if (scheduled) {
+        return;
+    }
+    for (let scheduler of schedulers) {
+        scheduler.schedule();
     }
+    scheduled = true;
+}
+async function task() {
+    let tasks = queue;
     queue.length = 0;
+    for (let i = 0, n = tasks.length; i < n; i++) {
+        await tasks[i].get();
+    }
     scheduled = false;
+    if (queue.length) {
+        schedule();
+    }
 }
 class Reactive {
     fn;

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.15"
+    "version": "0.0.17"
 }

package/src/methods/reactive.ts

@@ -1,27 +1,19 @@
+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();
 
@@ -29,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;
     };
 }
 
@@ -68,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);
+export default <T>(value: T) => {
+    if (typeof value === 'function') {
+        return fn(value) as Infer<T>;
+    }
+
+    return factory(value) as Infer<T>;
+};

package/src/reactive.ts

@@ -24,11 +24,7 @@ function mark(instances: Reactive<any>[] | null, state: typeof CHECK | typeof DI
                 queue.push(instance);
 
                 if (!scheduled) {
-                    for (let scheduler of schedulers) {
-                        scheduler.schedule();
-                    }
-
-                    scheduled = true;
+                    schedule();
                 }
             }
 
@@ -41,13 +37,32 @@ function mark(instances: Reactive<any>[] | null, state: typeof CHECK | typeof DI
     }
 }
 
-async function task() {
-    for (let i = 0, n = queue.length; i < n; i++) {
-        await queue[i].get();
+function schedule() {
+    if (scheduled) {
+        return;
     }
 
+    for (let scheduler of schedulers) {
+        scheduler.schedule();
+    }
+
+    scheduled = true;
+}
+
+async function task() {
+    let tasks = queue;
+
     queue.length = 0;
+
+    for (let i = 0, n = tasks.length; i < n; i++) {
+        await tasks[i].get();
+    }
+
     scheduled = false;
+
+    if (queue.length) {
+        schedule();
+    }
 }
 
 

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 = {

package/build/obj.d.ts

@@ -1,2 +0,0 @@
-declare const factory: <T>(values: T) => T;
-export default factory;

package/build/obj.js

@@ -1,28 +0,0 @@
-import { reactive } from './index';
-function setup(value) {
-    if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
-        return factory(value);
-    }
-    return reactive(value);
-}
-const factory = (values) => {
-    let lazy = {}, properties = {};
-    for (let key in values) {
-        properties[key] = {
-            get() {
-                if (!lazy[key]) {
-                    lazy[key] = setup(values[key]);
-                }
-                return lazy[key].get();
-            },
-            set(value) {
-                if (!lazy[key]) {
-                    lazy[key] = setup(values[key]);
-                }
-                lazy[key].set(value);
-            }
-        };
-    }
-    return Object.defineProperties({}, properties);
-};
-export default factory;