@esportsplus/reactivity 0.30.1 → 0.30.3

package/build/compiler/object.js

@@ -17,6 +17,15 @@ function analyzeProperty(prop, sourceFile) {
     while (ts.isAsExpression(unwrapped) || ts.isTypeAssertionExpression(unwrapped) || ts.isParenthesizedExpression(unwrapped)) {
         unwrapped = unwrapped.expression;
     }
+    if (ts.isAsExpression(value) || ts.isTypeAssertionExpression(value)) {
+        let type = value.type;
+        if (ts.isArrayTypeNode(type) ||
+            (ts.isTypeReferenceNode(type) &&
+                ts.isIdentifier(type.typeName) &&
+                type.typeName.text === 'Array')) {
+            return { isStatic: false, key, type: TYPES.Array, valueText };
+        }
+    }
     if (ts.isArrowFunction(unwrapped) || ts.isFunctionExpression(unwrapped)) {
         return { isStatic: false, key, type: TYPES.Computed, valueText };
     }

package/build/reactive/array.js

@@ -18,10 +18,10 @@ class ReactiveArray extends Array {
         return read(this._length);
     }
     set $length(value) {
-        if (value > super.length) {
+        if (value > this.length) {
             throw Error(`@esportsplus/reactivity: cannot set length to a value larger than the current length, use splice instead.`);
         }
-        this.splice(value, super.length);
+        this.splice(value, this.length);
     }
     $set(i, value) {
         let prev = this[i];
@@ -29,7 +29,7 @@ class ReactiveArray extends Array {
             return;
         }
         this[i] = value;
-        if (i >= super.length) {
+        if (i >= this.length) {
             write(this._length, i + 1);
         }
         this.dispatch('set', { index: i, item: value });
@@ -55,7 +55,7 @@ class ReactiveArray extends Array {
             }
         }
         if (added.length) {
-            write(this._length, super.length);
+            write(this._length, this.length);
             this.dispatch('concat', { items: added });
         }
         return this;
@@ -65,6 +65,7 @@ class ReactiveArray extends Array {
         if (!listeners) {
             return;
         }
+        let dirty = false;
         for (let i = 0, n = listeners.length; i < n; i++) {
             let listener = listeners[i];
             if (listener === null) {
@@ -73,15 +74,19 @@ class ReactiveArray extends Array {
             try {
                 listener(value);
                 if (listener.once !== undefined) {
+                    dirty = true;
                     listeners[i] = null;
                 }
             }
             catch {
+                dirty = true;
                 listeners[i] = null;
             }
         }
-        while (listeners.length && listeners[listeners.length - 1] === null) {
-            listeners.pop();
+        if (dirty) {
+            while (listeners.length && listeners[listeners.length - 1] === null) {
+                listeners.pop();
+            }
         }
     }
     dispose() {
@@ -120,14 +125,14 @@ class ReactiveArray extends Array {
         let item = super.pop();
         if (item !== undefined) {
             dispose(item);
-            write(this._length, super.length);
+            write(this._length, this.length);
             this.dispatch('pop', { item });
         }
         return item;
     }
     push(...items) {
         if (!items.length) {
-            return super.length;
+            return this.length;
         }
         let length = super.push(...items);
         write(this._length, length);
@@ -143,19 +148,19 @@ class ReactiveArray extends Array {
         let item = super.shift();
         if (item !== undefined) {
             dispose(item);
-            write(this._length, super.length);
+            write(this._length, this.length);
             this.dispatch('shift', { item });
         }
         return item;
     }
     sort(fn) {
-        let before = new Array(this.length);
-        for (let i = 0, n = before.length; i < n; i++) {
+        let n = this.length, before = new Array(n);
+        for (let i = 0; i < n; i++) {
             before[i] = this[i];
         }
         super.sort(fn);
-        let buckets = new Map(), cursors = new Map(), order = new Array(this.length);
-        for (let i = 0, n = before.length; i < n; i++) {
+        let buckets = new Map(), order = new Array(n);
+        for (let i = 0; i < n; i++) {
             let value = before[i], list = buckets.get(value);
             if (!list) {
                 buckets.set(value, [i]);
@@ -164,15 +169,12 @@ class ReactiveArray extends Array {
                 list.push(i);
             }
         }
-        for (let i = 0, n = this.length; i < n; i++) {
-            let value = this[i], list = buckets.get(value);
-            if (!list) {
-                order[i] = i;
-                continue;
+        for (let i = 0; i < n; i++) {
+            let list = buckets.get(this[i]);
+            order[i] = list.length === 1 ? list[0] : list[list.length - 1];
+            if (list.length > 1) {
+                list.pop();
             }
-            let cursor = cursors.get(value) || 0;
-            order[i] = list[cursor];
-            cursors.set(value, cursor + 1);
         }
         this.dispatch('sort', { order });
         return this;
@@ -180,7 +182,7 @@ class ReactiveArray extends Array {
     splice(start, deleteCount = this.length, ...items) {
         let removed = super.splice(start, deleteCount, ...items);
         if (items.length > 0 || removed.length > 0) {
-            write(this._length, super.length);
+            write(this._length, this.length);
             for (let i = 0, n = removed.length; i < n; i++) {
                 dispose(removed[i]);
             }

package/build/reactive/object.js

@@ -8,8 +8,9 @@ class ReactiveObject {
         if (data == null) {
             return;
         }
-        for (let key in data) {
-            let value = data[key], type = typeof value;
+        let keys = Object.keys(data);
+        for (let i = 0, n = keys.length; i < n; i++) {
+            let key = keys[i], value = data[key], type = typeof value;
             if (type === 'function') {
                 let node = this[COMPUTED](value);
                 defineProperty(this, key, {

package/build/system.js

@@ -112,7 +112,7 @@ function link(dep, sub) {
         dep.subs = newLink;
     }
 }
-function notify(computed, newState = STATE_DIRTY) {
+function notify(computed, newState) {
     let state = computed.state;
     if ((state & STATE_NOTIFY_MASK) >= newState) {
         return;
@@ -202,6 +202,7 @@ function stabilize() {
     }
     observer = o;
     if (stabilizer === STABILIZER_RESCHEDULE) {
+        stabilizer = STABILIZER_SCHEDULED;
         microtask(stabilize);
     }
     else {
@@ -337,7 +338,7 @@ const read = (node) => {
                     notified = true;
                     for (let i = 0; i <= heap_n; i++) {
                         for (let computed = heap[i]; computed !== undefined; computed = computed.nextHeap) {
-                            notify(computed);
+                            notify(computed, STATE_DIRTY);
                         }
                     }
                 }
@@ -380,11 +381,11 @@ const write = (signal, value) => {
     if (signal.value === value) {
         return;
     }
-    notified = false;
     signal.value = value;
     if (signal.subs === null) {
         return;
     }
+    notified = false;
     for (let link = signal.subs; link; link = link.nextSub) {
         insertIntoHeap(link.sub);
     }

package/package.json

@@ -6,7 +6,8 @@
   "devDependencies": {
     "@esportsplus/typescript": "^0.29.0",
     "@types/node": "^25.0.9",
-    "vite": "^7.3.1"
+    "vite": "^7.3.1",
+    "vitest": "^4.0.18"
   },
   "exports": {
     ".": {
@@ -35,7 +36,7 @@
   },
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.30.1",
+  "version": "0.30.3",
   "scripts": {
     "build": "tsc",
     "build:test": "pnpm build && vite build --config test/vite.config.ts",

package/src/compiler/object.ts

@@ -55,6 +55,21 @@ function analyzeProperty(prop: ts.ObjectLiteralElementLike, sourceFile: ts.Sourc
         unwrapped = unwrapped.expression;
     }
 
+    if (ts.isAsExpression(value) || ts.isTypeAssertionExpression(value)) {
+        let type = (value as ts.AsExpression).type;
+
+        if (
+            ts.isArrayTypeNode(type) ||
+            (
+                ts.isTypeReferenceNode(type) &&
+                ts.isIdentifier(type.typeName) &&
+                type.typeName.text === 'Array'
+            )
+        ) {
+            return { isStatic: false, key, type: TYPES.Array, valueText };
+        }
+    }
+
     if (ts.isArrowFunction(unwrapped) || ts.isFunctionExpression(unwrapped)) {
         return { isStatic: false, key, type: TYPES.Computed, valueText };
     }

package/src/reactive/array.ts

@@ -69,11 +69,11 @@ class ReactiveArray<T> extends Array<T> {
     }
 
     set $length(value: number) {
-        if (value > super.length) {
+        if (value > this.length) {
             throw Error(`@esportsplus/reactivity: cannot set length to a value larger than the current length, use splice instead.`);
         }
 
-        this.splice(value, super.length);
+        this.splice(value, this.length);
     }
 
 
@@ -86,7 +86,7 @@ class ReactiveArray<T> extends Array<T> {
 
         this[i] = value;
 
-        if (i >= super.length) {
+        if (i >= this.length) {
             write(this._length, i + 1);
         }
 
@@ -121,7 +121,7 @@ class ReactiveArray<T> extends Array<T> {
         }
 
         if (added.length) {
-            write(this._length, super.length);
+            write(this._length, this.length);
             this.dispatch('concat', { items: added });
         }
 
@@ -135,6 +135,8 @@ class ReactiveArray<T> extends Array<T> {
             return;
         }
 
+        let dirty = false;
+
         for (let i = 0, n = listeners.length; i < n; i++) {
             let listener = listeners[i];
 
@@ -146,16 +148,20 @@ class ReactiveArray<T> extends Array<T> {
                 listener(value);
 
                 if (listener.once !== undefined) {
+                    dirty = true;
                     listeners[i] = null;
                 }
             }
             catch {
+                dirty = true;
                 listeners[i] = null;
             }
         }
 
-        while (listeners.length && listeners[listeners.length - 1] === null) {
-            listeners.pop();
+        if (dirty) {
+            while (listeners.length && listeners[listeners.length - 1] === null) {
+                listeners.pop();
+            }
         }
     }
 
@@ -205,7 +211,7 @@ class ReactiveArray<T> extends Array<T> {
 
         if (item !== undefined) {
             dispose(item);
-            write(this._length, super.length);
+            write(this._length, this.length);
 
             this.dispatch('pop', { item });
         }
@@ -215,7 +221,7 @@ class ReactiveArray<T> extends Array<T> {
 
     push(...items: T[]) {
         if (!items.length) {
-            return super.length;
+            return this.length;
         }
 
         let length = super.push(...items);
@@ -238,7 +244,7 @@ class ReactiveArray<T> extends Array<T> {
 
         if (item !== undefined) {
             dispose(item);
-            write(this._length, super.length);
+            write(this._length, this.length);
 
             this.dispatch('shift', { item });
         }
@@ -247,19 +253,19 @@ class ReactiveArray<T> extends Array<T> {
     }
 
     sort(fn?: (a: T, b: T) => number) {
-        let before = new Array(this.length) as T[];
+        let n = this.length,
+            before = new Array(n) as T[];
 
-        for (let i = 0, n = before.length; i < n; i++) {
+        for (let i = 0; i < n; i++) {
             before[i] = this[i];
         }
 
         super.sort(fn);
 
         let buckets = new Map<any, number[]>(),
-            cursors = new Map<any, number>(),
-            order = new Array(this.length);
+            order = new Array(n);
 
-        for (let i = 0, n = before.length; i < n; i++) {
+        for (let i = 0; i < n; i++) {
             let value = before[i],
                 list = buckets.get(value);
 
@@ -271,19 +277,14 @@ class ReactiveArray<T> extends Array<T> {
             }
         }
 
-        for (let i = 0, n = this.length; i < n; i++) {
-            let value = this[i],
-                list = buckets.get(value);
-
-            if (!list) {
-                order[i] = i;
-                continue;
-            }
+        for (let i = 0; i < n; i++) {
+            let list = buckets.get(this[i])!;
 
-            let cursor = cursors.get(value) || 0;
+            order[i] = list.length === 1 ? list[0] : list[list.length - 1];
 
-            order[i] = list[cursor];
-            cursors.set(value, cursor + 1);
+            if (list.length > 1) {
+                list.pop();
+            }
         }
 
         this.dispatch('sort', { order });
@@ -295,7 +296,7 @@ class ReactiveArray<T> extends Array<T> {
         let removed = super.splice(start, deleteCount, ...items);
 
         if (items.length > 0 || removed.length > 0) {
-            write(this._length, super.length);
+            write(this._length, this.length);
 
             for (let i = 0, n = removed.length; i < n; i++) {
                 dispose(removed[i]);

package/src/reactive/object.ts

@@ -14,8 +14,11 @@ class ReactiveObject<T extends Record<PropertyKey, unknown>> {
             return;
         }
 
-        for (let key in data) {
-            let value = data[key as keyof T],
+        let keys = Object.keys(data);
+
+        for (let i = 0, n = keys.length; i < n; i++) {
+            let key = keys[i],
+                value = data[key as keyof T],
                 type = typeof value;
 
             if (type === 'function') {

package/src/system.ts

@@ -173,7 +173,7 @@ function link<T>(dep: Signal<T> | Computed<T>, sub: Computed<T>) {
     }
 }
 
-function notify<T>(computed: Computed<T>, newState = STATE_DIRTY) {
+function notify<T>(computed: Computed<T>, newState: number) {
     let state = computed.state;
 
     if ((state & STATE_NOTIFY_MASK) >= newState) {
@@ -298,6 +298,7 @@ function stabilize() {
     observer = o;
 
     if (stabilizer === STABILIZER_RESCHEDULE) {
+        stabilizer = STABILIZER_SCHEDULED;
         microtask(stabilize);
     }
     else {
@@ -474,7 +475,7 @@ const read = <T>(node: Signal<T> | Computed<T>): T => {
 
                     for (let i = 0; i <= heap_n; i++) {
                         for (let computed = heap[i]; computed !== undefined; computed = computed.nextHeap) {
-                            notify(computed);
+                            notify(computed, STATE_DIRTY);
                         }
                     }
                 }
@@ -535,13 +536,14 @@ const write = <T>(signal: Signal<T>, value: T) => {
         return;
     }
 
-    notified = false;
     signal.value = value;
 
     if (signal.subs === null) {
         return;
     }
 
+    notified = false;
+
     for (let link: Link | null = signal.subs; link; link = link.nextSub) {
         insertIntoHeap(link.sub);
     }