@esportsplus/reactivity 0.1.2 → 0.1.3

package/build/reactive/object.d.ts

@@ -1,7 +1,8 @@
 import { Computed, Object, Options, Signal } from '../types';
 import { ReactiveArray, ReactiveObjectArray } from './array';
+type Node = Computed<unknown> | ReactiveArray<unknown> | ReactiveObjectArray<Object> | Signal<unknown>;
 declare class ReactiveObject<T extends Object> {
-    nodes: Record<PropertyKey, Computed<unknown> | ReactiveObjectArray<Object> | ReactiveArray<unknown> | Signal<unknown>>;
+    nodes: Record<PropertyKey, Node>;
     constructor(data: T, options?: Options);
     dispose(): void;
     reset(): void;

package/build/reactive/object.js

@@ -10,6 +10,7 @@ class ReactiveObject {
             if (typeof input === 'function') {
                 let node = nodes[key] = computed(input, options);
                 defineProperty(this, key, {
+                    enumerable: true,
                     get() {
                         return read(node);
                     }
@@ -17,13 +18,14 @@ class ReactiveObject {
             }
             else if (isArray(input)) {
                 let node, test = input[0];
-                if (typeof test === 'object' && test !== null && test.constructor.name === 'Object') {
+                if (typeof test === 'object' && test !== null && test?.constructor?.name === 'Object') {
                     node = nodes[key] = new ReactiveObjectArray(input, options);
                 }
                 else {
                     node = nodes[key] = new ReactiveArray(input);
                 }
                 defineProperty(this, key, {
+                    enumerable: true,
                     get() {
                         node.track();
                         return node;
@@ -33,6 +35,7 @@ class ReactiveObject {
             else {
                 let node = nodes[key] = signal(input, options);
                 defineProperty(this, key, {
+                    enumerable: true,
                     get() {
                         return read(node);
                     },

package/build/signal.js

@@ -216,12 +216,17 @@ const dispose = (dispose) => {
     return dispose;
 };
 const effect = (fn, options = {}) => {
-    if (!scope) {
+    let node = new Signal(undefined, DIRTY, EFFECT, options);
+    if (scope !== null) {
+        node.root = scope;
+    }
+    else if (observer !== null && observer.type === EFFECT && observer.root !== null) {
+        node.root = observer.root;
+    }
+    else {
         throw new Error('Reactivity: `effects` cannot be created without a reactive root');
     }
-    let node = new Signal(undefined, DIRTY, EFFECT, options);
     node.fn = fn;
-    node.root = scope;
     node.task = () => read(node);
     node.root.scheduler(node.task);
     return node;
@@ -230,8 +235,8 @@ const read = (node) => {
     if (node.state === DISPOSED) {
         return node.value;
     }
-    if (observer) {
-        if (!observers) {
+    if (observer !== null) {
+        if (observers === null) {
             if (observer.sources !== null && observer.sources[index] == node) {
                 index++;
             }
@@ -243,7 +248,7 @@ const read = (node) => {
             observers.push(node);
         }
     }
-    if (node.fn) {
+    if (node.fn !== null) {
         sync(node);
     }
     return node.value;

package/package.json

@@ -16,5 +16,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "build/index.d.ts",
-    "version": "0.1.2"
+    "version": "0.1.3"
 }

package/src/reactive/object.ts

@@ -4,8 +4,11 @@ import { defineProperty, isArray } from '~/utilities';
 import { ReactiveArray, ReactiveObjectArray } from './array';
 
 
+type Node = Computed<unknown> | ReactiveArray<unknown> | ReactiveObjectArray<Object> | Signal<unknown>;
+
+
 class ReactiveObject<T extends Object> {
-    nodes: Record<PropertyKey, Computed<unknown> | ReactiveObjectArray<Object> | ReactiveArray<unknown> | Signal<unknown>> = {};
+    nodes: Record<PropertyKey, Node> = {};
 
 
     constructor(data: T, options: Options = {}) {
@@ -18,6 +21,7 @@ class ReactiveObject<T extends Object> {
                 let node = nodes[key] = computed(input as Computed<unknown>['fn'], options);
 
                 defineProperty(this, key, {
+                    enumerable: true,
                     get() {
                         return read(node);
                     }
@@ -27,7 +31,7 @@ class ReactiveObject<T extends Object> {
                 let node: ReactiveArray<unknown> | ReactiveObjectArray<Object>,
                     test = input[0];
 
-                if (typeof test === 'object' && test !== null && test.constructor.name === 'Object') {
+                if (typeof test === 'object' && test !== null && test?.constructor?.name === 'Object') {
                     node = nodes[key] = new ReactiveObjectArray(input, options);
                 }
                 else {
@@ -35,6 +39,7 @@ class ReactiveObject<T extends Object> {
                 }
 
                 defineProperty(this, key, {
+                    enumerable: true,
                     get() {
                         node.track();
 
@@ -46,6 +51,7 @@ class ReactiveObject<T extends Object> {
                 let node = nodes[key] = signal(input, options);
 
                 defineProperty(this, key, {
+                    enumerable: true,
                     get() {
                         return read(node);
                     },

package/src/signal.ts

@@ -286,14 +286,19 @@ const dispose = <T extends { dispose: () => void }>(dispose?: T[] | T) => {
 };
 
 const effect = <T>(fn: Effect<T>['fn'], options: Omit<Options, 'value'> = {}) => {
-    if (!scope) {
+    let node = new Signal(undefined as any, DIRTY, EFFECT, options);
+
+    if (scope !== null) {
+        node.root = scope;
+    }
+    else if (observer !== null && observer.type === EFFECT && observer.root !== null) {
+        node.root = observer.root;
+    }
+    else {
         throw new Error('Reactivity: `effects` cannot be created without a reactive root');
     }
 
-    let node = new Signal(undefined as any, DIRTY, EFFECT, options);
-
     node.fn = fn;
-    node.root = scope;
     node.task = () => read(node);
 
     node.root.scheduler(node.task);
@@ -306,8 +311,8 @@ const read = <T>(node: Signal<T>): typeof node['value'] => {
         return node.value;
     }
 
-    if (observer) {
-        if (!observers) {
+    if (observer !== null) {
+        if (observers === null) {
             if (observer.sources !== null && observer.sources[index] == node) {
                 index++;
             }
@@ -320,7 +325,7 @@ const read = <T>(node: Signal<T>): typeof node['value'] => {
         }
     }
 
-    if (node.fn) {
+    if (node.fn !== null) {
         sync(node);
     }