@esportsplus/reactivity 0.7.0 → 0.8.0

package/build/reactive/array.js

@@ -1,4 +1,4 @@
-import { isArray, isFunction, isInstanceOf, isNumber, isObject } from '@esportsplus/utilities';
+import { isFunction, isInstanceOf, isNumber, isObject } from '@esportsplus/utilities';
 import { computed, dispose, isComputed, read } from '../signal.js';
 import object from './object.js';
 import { Disposable } from './disposable.js';
@@ -162,10 +162,7 @@ function factory(input) {
     let items = [];
     for (let i = 0, n = input.length; i < n; i++) {
         let value = input[i];
-        if (isArray(value)) {
-            items[i] = array(value);
-        }
-        else if (isFunction(value)) {
+        if (isFunction(value)) {
             items[i] = computed(value);
         }
         else if (isObject(value)) {
@@ -196,7 +193,7 @@ export default function array(input) {
             if (isNumber(key)) {
                 let host = wrapped[key];
                 if (host === undefined || !isComputed(host)) {
-                    wrapped[key] = factory([value])[0];
+                    a.splice(key, 1, value);
                 }
                 else {
                     return false;

package/build/reactive/object.js

@@ -1,4 +1,4 @@
-import { defineProperty, isArray, isAsyncFunction, isFunction, isInstanceOf, isObject } from '@esportsplus/utilities';
+import { defineProperty, isArray, isAsyncFunction, isFunction, isInstanceOf } from '@esportsplus/utilities';
 import array from './array.js';
 import { computed, dispose, read, signal } from '../signal.js';
 import { Disposable } from './disposable.js';
@@ -20,12 +20,12 @@ class ReactiveObject extends Disposable {
                         return a;
                     },
                     set(v) {
-                        set(t, !!t.value);
                         a = disposable[key] = array(v);
+                        set(t, !!t.value);
                     }
                 });
             }
-            if (isAsyncFunction(value)) {
+            else if (isAsyncFunction(value)) {
                 let p = promise(value);
                 defineProperty(this, key, {
                     enumerable: true,
@@ -43,28 +43,11 @@ class ReactiveObject extends Disposable {
                     }
                 });
             }
-            else if (isObject(value)) {
-                let o = disposable[key] = new ReactiveObject(value), t = triggers[key] = signal(false);
-                defineProperty(this, key, {
-                    enumerable: true,
-                    get() {
-                        read(t);
-                        return o;
-                    },
-                    set(v) {
-                        set(t, !!t.value);
-                        o = disposable[key] = new ReactiveObject(v);
-                    }
-                });
-            }
             else {
                 let s = signal(value);
                 defineProperty(this, key, {
                     enumerable: true,
                     get() {
-                        if (s === undefined) {
-                            s = signal(value);
-                        }
                         return read(s);
                     },
                     set(v) {

package/build/signal.d.ts

@@ -11,5 +11,8 @@ declare const signal: {
     <T>(value: T): Signal<T>;
     set<T>(el: Signal<T>, v: T): void;
 };
-declare const stabilize: () => void;
+declare const stabilize: {
+    (): void;
+    state: Signal<number>;
+};
 export { computed, dispose, isComputed, isReactive, isSignal, oncleanup, read, root, signal, stabilize };

package/build/signal.js

@@ -1,6 +1,5 @@
 import { isArray, isObject } from '@esportsplus/utilities';
 import { REACTIVE, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING } from './constants.js';
-import { state } from './scheduler.js';
 let dirtyHeap = new Array(2000), maxDirty = 0, markedHeap = false, minDirty = 0, observer = null;
 function cleanup(node) {
     if (!node.cleanup) {
@@ -160,8 +159,8 @@ function recompute(el, del) {
             insertIntoHeap(o);
         }
     }
-    if (state.value === STATE_NONE) {
-        root(() => signal.set(state, STATE_DIRTY));
+    if (stabilize.state.value === STATE_NONE) {
+        root(() => signal.set(stabilize.state, STATE_DIRTY));
     }
 }
 function unlink(link) {
@@ -319,7 +318,8 @@ const stabilize = () => {
                 el = next;
             }
         }
-        signal.set(state, STATE_NONE);
+        signal.set(stabilize.state, STATE_NONE);
     });
 };
+stabilize.state = signal(STATE_NONE);
 export { computed, dispose, isComputed, isReactive, isSignal, oncleanup, read, root, signal, stabilize };

package/package.json

@@ -2,7 +2,7 @@
   "author": "ICJR",
   "dependencies": {
     "@esportsplus/custom-function": "^0.0.13",
-    "@esportsplus/utilities": "^0.19.1"
+    "@esportsplus/utilities": "^0.21.0"
   },
   "devDependencies": {
     "@esportsplus/typescript": "^0.9.2"
@@ -12,7 +12,7 @@
   "private": false,
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/reactive/array.ts

@@ -1,4 +1,4 @@
-import { isArray, isFunction, isInstanceOf, isNumber, isObject } from '@esportsplus/utilities';
+import { isFunction, isInstanceOf, isNumber, isObject } from '@esportsplus/utilities';
 import { computed, dispose, isComputed, read } from '~/signal';
 import { Computed, Infer } from '~/types';
 import object, { ReactiveObject } from './object';
@@ -284,10 +284,7 @@ function factory<T>(input: T[]) {
     for (let i = 0, n = input.length; i < n; i++) {
         let value = input[i];
 
-        if (isArray(value)) {
-            items[i] = array(value);
-        }
-        else if (isFunction(value)) {
+        if (isFunction(value)) {
             items[i] = computed(value as Computed<T>['fn']);
         }
         else if (isObject(value)) {
@@ -325,7 +322,7 @@ export default function array<T>(input: T[]) {
                     let host = wrapped[key];
 
                     if (host === undefined || !isComputed(host)) {
-                        wrapped[key] = factory([value] as T[])[0];
+                        a.splice(key, 1, value);
                     }
                     else {
                         return false;

package/src/reactive/object.ts

@@ -1,4 +1,4 @@
-import { defineProperty, isArray, isAsyncFunction, isFunction, isInstanceOf, isObject, Prettify } from '@esportsplus/utilities';
+import { defineProperty, isArray, isAsyncFunction, isFunction, isInstanceOf, Prettify } from '@esportsplus/utilities';
 import array, { ReactiveArray } from './array';
 import { computed, dispose, read, signal } from '~/signal';
 import { Computed, Infer, Signal } from '~/types';
@@ -39,12 +39,12 @@ class ReactiveObject<T extends Record<PropertyKey, unknown>> extends Disposable
                         return a;
                     },
                     set(v: typeof value) {
-                        set(t, !!t.value);
                         a = disposable[key] = array(v);
+                        set(t, !!t.value);
                     }
                 });
             }
-            if (isAsyncFunction(value)) {
+            else if (isAsyncFunction(value)) {
                 let p = promise(value);
 
                 defineProperty(this, key, {
@@ -64,32 +64,12 @@ class ReactiveObject<T extends Record<PropertyKey, unknown>> extends Disposable
                     }
                 });
             }
-            else if (isObject(value)) {
-                let o = disposable[key] = new ReactiveObject(value),
-                    t = triggers[key] = signal(false);
-
-                defineProperty(this, key, {
-                    enumerable: true,
-                    get() {
-                        read(t);
-                        return o;
-                    },
-                    set(v: typeof value) {
-                        set(t, !!t.value);
-                        o = disposable[key] = new ReactiveObject(v);
-                    }
-                });
-            }
             else {
                 let s = signal(value);
 
                 defineProperty(this, key, {
                     enumerable: true,
                     get() {
-                        if (s === undefined) {
-                            s = signal(value);
-                        }
-
                         return read(s as Signal<typeof value>);
                     },
                     set(v: typeof value) {

package/src/signal.ts

@@ -1,7 +1,6 @@
 import { isArray, isObject } from '@esportsplus/utilities';
 import { REACTIVE, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING } from './constants';
 import { Computed, Link, Signal, } from './types';
-import { state } from './scheduler';
 
 
 let dirtyHeap: (Computed<unknown> | undefined)[] = new Array(2000),
@@ -228,8 +227,8 @@ function recompute<T>(el: Computed<T>, del: boolean) {
         }
     }
 
-    if (state.value === STATE_NONE) {
-        root(() => signal.set(state, STATE_DIRTY));
+    if (stabilize.state.value === STATE_NONE) {
+        root(() => signal.set(stabilize.state, STATE_DIRTY));
     }
 }
 
@@ -441,10 +440,12 @@ const stabilize = () => {
             }
         }
 
-        signal.set(state, STATE_NONE);
+        signal.set(stabilize.state, STATE_NONE);
     });
 };
 
+stabilize.state = signal(STATE_NONE);
+
 
 export {
     computed,