@esportsplus/reactivity 0.12.3 → 0.13.0

package/build/system.js

@@ -1,6 +1,6 @@
 import { isArray, isObject } from '@esportsplus/utilities';
-import { COMPUTED, SIGNAL, STABILIZER_IDLE, STABILIZER_RESCHEDULE, STABILIZER_RUNNING, STABILIZER_SCHEDULED, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING } from './constants.js';
-let depth = 0, heap = new Array(2048), index = 0, length = 0, microtask = queueMicrotask, notified = false, observer = null, stabilizer = STABILIZER_IDLE, version = 0;
+import { COMPUTED, SIGNAL, STABILIZER_IDLE, STABILIZER_RESCHEDULE, STABILIZER_RUNNING, STABILIZER_SCHEDULED, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_NOTIFY_MASK, STATE_RECOMPUTING } from './constants.js';
+let depth = 0, heap = new Array(64), heap_i = 0, heap_n = 0, microtask = queueMicrotask, notified = false, observer = null, stabilizer = STABILIZER_IDLE, version = 0;
 function cleanup(computed) {
     if (!computed.cleanup) {
         return;
@@ -55,10 +55,10 @@ function insertIntoHeap(computed) {
         computed.prevHeap = tail;
         heapAtHeight.prevHeap = computed;
     }
-    if (height > length) {
-        length = height;
+    if (height > heap_n) {
+        heap_n = height;
         if (height >= heap.length) {
-            heap.length = Math.round(heap.length * 1.5);
+            heap.length = Math.max(height + 1, Math.ceil(heap.length * 2));
         }
     }
 }
@@ -106,7 +106,7 @@ function link(dep, sub) {
 }
 function notify(computed, newState = STATE_DIRTY) {
     let state = computed.state;
-    if ((state & (STATE_CHECK | STATE_DIRTY)) >= newState) {
+    if ((state & STATE_NOTIFY_MASK) >= newState) {
         return;
     }
     computed.state = state | newState;
@@ -122,7 +122,9 @@ function recompute(computed, del) {
         computed.nextHeap = undefined;
         computed.prevHeap = computed;
     }
-    cleanup(computed);
+    if (computed.cleanup) {
+        cleanup(computed);
+    }
     let o = observer, ok = true, value;
     observer = computed;
     computed.depsTail = null;
@@ -175,15 +177,18 @@ function stabilize() {
     let o = observer;
     observer = null;
     stabilizer = STABILIZER_RUNNING;
-    for (index = 0; index <= length; index++) {
-        let computed = heap[index];
-        heap[index] = undefined;
+    for (heap_i = 0; heap_i <= heap_n; heap_i++) {
+        let computed = heap[heap_i];
+        heap[heap_i] = undefined;
         while (computed !== undefined) {
             let next = computed.nextHeap;
             recompute(computed, false);
             computed = next;
         }
     }
+    while (heap_n > 0 && heap[heap_n] === undefined) {
+        heap_n--;
+    }
     observer = o;
     if (stabilizer === STABILIZER_RESCHEDULE) {
         microtask(stabilize);
@@ -193,7 +198,7 @@ function stabilize() {
     }
 }
 function unlink(link) {
-    let { dep, nextDep, nextSub, prevSub } = link;
+    let dep = link.dep, nextDep = link.nextDep, nextSub = link.nextSub, prevSub = link.prevSub;
     if (nextSub !== null) {
         nextSub.prevSub = prevSub;
     }
@@ -267,7 +272,9 @@ const dispose = (computed) => {
         dep = unlink(dep);
     }
     computed.deps = null;
-    cleanup(computed);
+    if (computed.cleanup) {
+        cleanup(computed);
+    }
 };
 const effect = (fn) => {
     let c = computed(fn);
@@ -285,14 +292,15 @@ const onCleanup = (fn) => {
     if (!observer) {
         return fn;
     }
-    if (!observer.cleanup) {
+    let cleanup = observer.cleanup;
+    if (!cleanup) {
         observer.cleanup = fn;
     }
-    else if (isArray(observer.cleanup)) {
-        observer.cleanup.push(fn);
+    else if (isArray(cleanup)) {
+        cleanup.push(fn);
     }
     else {
-        observer.cleanup = [observer.cleanup, fn];
+        observer.cleanup = [cleanup, fn];
     }
     return fn;
 };
@@ -304,11 +312,10 @@ const read = (node) => {
             if (height >= observer.height) {
                 observer.height = height + 1;
             }
-            if (height >= index ||
-                node.state & (STATE_DIRTY | STATE_CHECK)) {
+            if (height >= heap_i || node.state & STATE_NOTIFY_MASK) {
                 if (!notified) {
                     notified = true;
-                    for (let i = 0; i <= length; i++) {
+                    for (let i = 0; i <= heap_n; i++) {
                         for (let computed = heap[i]; computed !== undefined; computed = computed.nextHeap) {
                             notify(computed);
                         }

package/build/types.d.ts

@@ -1,5 +1,4 @@
 import { COMPUTED, SIGNAL, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING } from './constants.js';
-import { ReactiveArray } from './reactive/array.js';
 import { ReactiveObject } from './reactive/object.js';
 interface Computed<T> {
     [COMPUTED]: true;
@@ -15,7 +14,7 @@ interface Computed<T> {
     subsTail: Link | null;
     value: T;
 }
-type Infer<T> = T extends (...args: unknown[]) => Promise<infer R> ? R | undefined : T extends (...args: any[]) => infer R ? R : T extends (infer U)[] ? ReactiveArray<U> : T extends ReactiveObject<any> ? T : T extends Record<PropertyKey, unknown> ? {
+type Infer<T> = T extends (...args: unknown[]) => Promise<infer R> ? R | undefined : T extends (...args: any[]) => infer R ? R : T extends (infer U)[] ? Infer<U>[] : T extends ReactiveObject<any> ? T : T extends Record<PropertyKey, unknown> ? {
     [K in keyof T]: T[K];
 } : T;
 interface Link {
@@ -26,11 +25,10 @@ interface Link {
     prevSub: Link | null;
     version: number;
 }
-type Reactive<T> = T extends Record<PropertyKey, unknown> ? ReactiveObject<T> : ReactiveArray<T>;
 type Signal<T> = {
     [SIGNAL]: true;
     subs: Link | null;
     subsTail: Link | null;
     value: T;
 };
-export type { Computed, Infer, Link, Signal, Reactive, ReactiveArray, ReactiveObject };
+export type { Computed, Infer, Link, Signal, ReactiveObject };

package/package.json

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

package/src/constants.ts

@@ -26,6 +26,8 @@ const STATE_RECOMPUTING = 1 << 2;
 
 const STATE_IN_HEAP = 1 << 3;
 
+const STATE_NOTIFY_MASK = (STATE_CHECK | STATE_DIRTY);
+
 
 export {
     COMPUTED,
@@ -33,6 +35,7 @@ export {
     REACTIVE_OBJECT,
     SIGNAL,
     STABILIZER_IDLE,
+    STATE_NOTIFY_MASK,
     STABILIZER_RESCHEDULE,
     STABILIZER_RUNNING,
     STABILIZER_SCHEDULED,