@esportsplus/reactivity 0.1.29 → 0.1.31

package/build/reactive/array.d.ts

@@ -28,11 +28,10 @@ declare class ReactiveArray<T> extends Array<T> {
     private signal;
     constructor(data: T[]);
     set length(n: number);
-    private trigger;
     dispatch<E extends keyof Events<T>>(event: E, data?: Events<T>[E]): void;
     dispose(): void;
     fill(value: T, start?: number, end?: number): this;
-    map<U>(fn: (value: T, i: number, values: this) => U): U[];
+    map<U>(fn: (this: ReactiveArray<T>, value: T, i: number) => U): U[];
     on<E extends keyof Events<T>>(event: E, listener: Listener<Events<T>[E]>): void;
     once<E extends keyof Events<T>>(event: E, listener: Listener<Events<T>[E]>): void;
     pop(): T | undefined;
@@ -41,7 +40,8 @@ declare class ReactiveArray<T> extends Array<T> {
     shift(): T | undefined;
     sort(): this;
     splice(start: number, deleteCount?: number, ...items: T[]): T[];
-    track(): void;
+    track(index?: number): T | undefined;
+    trigger(): void;
     unshift(...items: T[]): number;
 }
 declare class ReactiveObjectArray<T extends Object> extends ReactiveArray<ReactiveObject<T>> {

package/build/reactive/array.js

@@ -13,7 +13,7 @@ function unsupported(method) {
 class ReactiveArray extends Array {
     signal;
     constructor(data) {
-        super(data);
+        super(...data);
         this.signal = signal(false);
     }
     set length(n) {
@@ -22,9 +22,6 @@ class ReactiveArray extends Array {
         }
         this.splice(n);
     }
-    trigger() {
-        this.signal.set(!this.signal.value);
-    }
     dispatch(event, data) {
         this.signal.dispatch(event, data);
     }
@@ -40,7 +37,7 @@ class ReactiveArray extends Array {
     map(fn) {
         let values = [];
         for (let i = 0, n = this.length; i < n; i++) {
-            values.push(fn(this[i], i, this));
+            values.push(fn.call(this, this[i], i));
         }
         return values;
     }
@@ -96,8 +93,12 @@ class ReactiveArray extends Array {
         }
         return removed;
     }
-    track() {
+    track(index) {
         this.signal.get();
+        return index === undefined ? undefined : this[index];
+    }
+    trigger() {
+        this.signal.set(!this.signal.value);
     }
     unshift(...items) {
         let length = super.unshift(...items);

package/build/reactive/index.d.ts

@@ -4,11 +4,11 @@ import { ReactiveObject } from './object';
 type Guard<T> = T extends Object ? {
     [K in keyof T]: Never<K, Guard<T[K]>>;
 } : T extends unknown[] ? Guard<T[number]>[] : T;
-type Infer<T> = T extends (...args: unknown[]) => unknown ? ReturnType<T> : T extends unknown[] ? Infer<T[number]>[] : T extends Object ? {
+type Infer<T> = T extends (...args: unknown[]) => unknown ? ReturnType<T> : T extends unknown[] ? T extends Object[] ? ReactiveObjectArray<T[0]> : ReactiveArray<T[0]> : T extends Object ? {
     [K in keyof T]: T[K];
 } : T;
 type Never<K, V> = K extends keyof ReactiveObject<Object> ? never : V;
-type Nodes<T> = T extends (...args: unknown[]) => unknown ? Computed<T> : T extends unknown[] ? T extends Object[] ? ReactiveObjectArray<T[0]> : ReactiveArray<T> : Signal<T>;
+type Nodes<T> = T extends (...args: unknown[]) => unknown ? Computed<T> : T extends unknown[] ? T extends Object[] ? ReactiveObjectArray<T[0]> : ReactiveArray<T[0]> : Signal<T>;
 type Signals<T extends Object> = {
     [K in keyof T]: Nodes<T[K]>;
 };

package/package.json

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

package/src/reactive/array.ts

@@ -35,8 +35,7 @@ class ReactiveArray<T> extends Array<T> {
 
 
     constructor(data: T[]) {
-        // @ts-ignore
-        super(data);
+        super(...data);
         this.signal = signal(false);
     }
 
@@ -50,11 +49,6 @@ class ReactiveArray<T> extends Array<T> {
     }
 
 
-    private trigger() {
-        this.signal.set(!this.signal.value);
-    }
-
-
     dispatch<E extends keyof Events<T>>(event: E, data?: Events<T>[E]) {
         this.signal.dispatch(event, data);
     }
@@ -72,11 +66,12 @@ class ReactiveArray<T> extends Array<T> {
         return this;
     }
 
-    map<U>(fn: (value: T, i: number, values: this) => U) {
+    // @ts-ignore
+    map<U>(fn: (this: ReactiveArray<T>, value: T, i: number) => U) {
         let values: U[] = [];
 
         for (let i = 0, n = this.length; i < n; i++) {
-            values.push( fn(this[i], i, this) );
+            values.push( fn.call(this, this[i], i) );
         }
 
         return values;
@@ -110,6 +105,7 @@ class ReactiveArray<T> extends Array<T> {
         return n;
     }
 
+    // @ts-ignore
     reverse() {
         super.reverse();
 
@@ -130,6 +126,7 @@ class ReactiveArray<T> extends Array<T> {
         return item;
     }
 
+    // @ts-ignore
     sort() {
         super.sort();
 
@@ -154,8 +151,13 @@ class ReactiveArray<T> extends Array<T> {
         return removed;
     }
 
-    track() {
+    track(index?: number) {
         this.signal.get();
+        return index === undefined ? undefined : this[index];
+    }
+
+    trigger() {
+        this.signal.set(!this.signal.value);
     }
 
     unshift(...items: T[]) {

package/src/reactive/index.ts

@@ -14,7 +14,7 @@ type Infer<T> =
     T extends (...args: unknown[]) => unknown
         ? ReturnType<T>
         : T extends unknown[]
-            ? Infer<T[number]>[]
+            ? T extends Object[] ? ReactiveObjectArray<T[0]> : ReactiveArray<T[0]>
             : T extends Object
                 ? { [K in keyof T]: T[K] }
                 : T;
@@ -25,7 +25,7 @@ type Nodes<T> =
     T extends (...args: unknown[]) => unknown
         ? Computed<T>
         : T extends unknown[]
-            ? T extends Object[] ? ReactiveObjectArray<T[0]> : ReactiveArray<T>
+            ? T extends Object[] ? ReactiveObjectArray<T[0]> : ReactiveArray<T[0]>
             : Signal<T>;
 
 type Signals<T extends Object> = {