@esportsplus/reactivity 0.17.0 → 0.17.1

package/build/reactive/object.js

@@ -1,4 +1,4 @@
-import { defineProperty, isArray, isObject, isPromise } from '@esportsplus/utilities';
+import { defineProperty, isArray, isPromise } from '@esportsplus/utilities';
 import { computed, dispose, effect, read, root, set, signal } from '../system.js';
 import { REACTIVE_OBJECT } from '../constants.js';
 import { ReactiveArray } from './array.js';
@@ -6,10 +6,9 @@ class ReactiveObject {
     [REACTIVE_OBJECT] = true;
     disposers = null;
     constructor(data) {
-        let keys = Object.keys(data);
-        for (let i = 0, n = keys.length; i < n; i++) {
-            let key = keys[i], value = data[key];
-            let type = typeof value;
+        let keys = Object.keys(data), key;
+        while (key = keys.pop()) {
+            let value = data[key], type = typeof value;
             if (type === 'function') {
                 let node;
                 defineProperty(this, key, {
@@ -75,6 +74,6 @@ class ReactiveObject {
     }
 }
 const isReactiveObject = (value) => {
-    return isObject(value) && REACTIVE_OBJECT in value;
+    return typeof value === 'object' && value !== null && REACTIVE_OBJECT in value;
 };
 export { isReactiveObject, ReactiveObject };

package/package.json

@@ -12,7 +12,7 @@
   "private": false,
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/reactive/object.ts

@@ -1,4 +1,4 @@
-import { defineProperty, isArray, isObject, isPromise } from '@esportsplus/utilities';
+import { defineProperty, isArray, isPromise } from '@esportsplus/utilities';
 import { computed, dispose, effect, read, root, set, signal } from '~/system';
 import { Computed, Signal } from '~/types';
 import { REACTIVE_OBJECT } from '~/constants';
@@ -13,13 +13,12 @@ class ReactiveObject<T extends Record<PropertyKey, unknown>> {
 
 
     constructor(data: T) {
-        let keys = Object.keys(data);
+        let keys = Object.keys(data),
+            key: keyof T | undefined;
 
-        for (let i = 0, n = keys.length; i < n; i++) {
-            let key = keys[i],
-                value = data[key];
-
-            let type = typeof value;
+        while (key = keys.pop()) {
+            let value = data[key],
+                type = typeof value;
 
             if (type === 'function') {
                 let node: Computed<T[typeof key]> | Signal<T[typeof key] | undefined> | undefined;
@@ -29,19 +28,19 @@ class ReactiveObject<T extends Record<PropertyKey, unknown>> {
                     get: () => {
                         if (node === undefined) {
                             root(() => {
-                                node = computed(value as Computed<T[typeof key]>['fn']);
+                                node = computed(value as Computed<T[keyof T]>['fn']);
 
                                 if (isPromise(node.value)) {
                                     let factory = node,
                                         version = 0;
 
-                                    node = signal<T[typeof key] | undefined>(undefined);
+                                    node = signal<T[keyof T] | undefined>(undefined);
 
                                     (this.disposers ??= []).push(
                                         effect(() => {
                                             let id = ++version;
 
-                                            (read(factory) as Promise<T[typeof key]>).then((v) => {
+                                            (read(factory) as Promise<T[keyof T]>).then((v) => {
                                                 if (id !== version) {
                                                     return;
                                                 }
@@ -52,7 +51,7 @@ class ReactiveObject<T extends Record<PropertyKey, unknown>> {
                                     )
                                 }
                                 else {
-                                    (this.disposers ??= []).push(() => dispose(node as Computed<T[typeof key]>));
+                                    (this.disposers ??= []).push(() => dispose(node as Computed<T[keyof T]>));
                                 }
                             });
                         }
@@ -65,7 +64,7 @@ class ReactiveObject<T extends Record<PropertyKey, unknown>> {
             }
 
             if (value == null || type !== 'object') {
-                // Avoid isArray when possible
+                // Skip isArray when possible
             }
             else if (isArray(value)) {
                 let node = new ReactiveArray(value);
@@ -111,7 +110,7 @@ class ReactiveObject<T extends Record<PropertyKey, unknown>> {
 
 
 const isReactiveObject = (value: any): value is ReactiveObject<any> => {
-    return isObject(value) && REACTIVE_OBJECT in value;
+    return typeof value === 'object' && value !== null && REACTIVE_OBJECT in value;
 };