@esportsplus/reactivity 0.4.7 → 0.5.0

package/src/constants.ts

@@ -1,19 +1,14 @@
-const CLEAN = 0;
+const REACTIVE = Symbol('reactive');
 
-const CHECK = 1;
+const STATE_NONE = 0;
 
-const DIRTY = 2;
+const STATE_CHECK = 1 << 0;
 
-const DISPOSED = 3;
+const STATE_DIRTY = 1 << 1;
 
+const STATE_RECOMPUTING = 1 << 2;
 
-const COMPUTED = 0;
+const STATE_IN_HEAP = 1 << 3;
 
-const EFFECT = 1;
 
-const ROOT = 2;
-
-const SIGNAL = 3;
-
-
-export { CHECK, CLEAN, COMPUTED, DIRTY, DISPOSED, EFFECT, ROOT, SIGNAL };
+export { REACTIVE, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING };

package/src/index.ts

@@ -1,5 +1,3 @@
-export { default as macro } from './macro';
 export { default as reactive } from './reactive';
-export { computed, dispose, effect, root, signal } from './signal';
-export * from './constants';
+export { computed, dispose, oncleanup, root, signal, stabilize } from './signal';
 export * from './types';

package/src/reactive/array.ts

@@ -1,8 +1,8 @@
-import { Infer } from '~/types';
-import { isInstanceOf, isNumber, isObject } from '@esportsplus/utilities';
-import { dispose, signal, Reactive } from '~/signal';
-import { Listener, Options, ReactiveObject, Signal } from '~/types';
-import object from './object';
+import { isArray, isFunction, isInstanceOf, isNumber, isObject } from '@esportsplus/utilities';
+import { computed, dispose, isComputed, read } from '~/signal';
+import { Computed, Infer } from '~/types';
+import object, { ReactiveObject } from './object';
+import { Disposable } from './disposable';
 
 
 type API<T> = Infer<T>[] & ReactiveArray<T>;
@@ -33,21 +33,32 @@ type Events<T> = {
     };
 };
 
-type Item<T> = T extends Record<PropertyKey, unknown> ? ReactiveObject<T> : Signal<T>;
+type Item<T> = Computed<T> | ReactiveArray<T> | ReactiveObject<T extends Record<PropertyKey, unknown> ? T : never> | T;
+
+type Listener<V> = {
+    once?: boolean;
+    (value: V): void;
+};
+
+type Value<T> =
+    T extends Record<PropertyKey, unknown>
+        ? ReactiveObject<T>
+        : T extends Array<infer U>
+            ? ReactiveArray<U>
+            : T;
 
 
-class ReactiveArray<T> {
-    private data: Item<T>[]
-    private options: Options;
+class ReactiveArray<T> extends Disposable {
+    private data: Item<T>[];
+    private listeners: Record<string, (Listener<any> | null)[]> | null = null;
     private proxy: API<T>;
-    private signal: Signal<boolean>;
 
 
-    constructor(data: Item<T>[], proxy: API<T>, options: Options = {}) {
+    constructor(data: Item<T>[], proxy: API<T>) {
+        super();
+
         this.data = data;
-        this.options = options;
         this.proxy = proxy;
-        this.signal = signal(false);
     }
 
 
@@ -67,37 +78,64 @@ class ReactiveArray<T> {
     at(i: number) {
         let value = this.data[i];
 
-        if (isInstanceOf(value, Reactive)) {
-            return value.get();
+        if (isComputed(value)) {
+            return read(value);
         }
 
         return value;
     }
 
-    dispatch<E extends keyof Events<unknown>>(event: E, data?: Events<T>[E]) {
-        this.signal.dispatch(event, data);
-    }
+    dispatch<D>(event: keyof Events<T>, value?: D) {
+        if (this.listeners === null || this.listeners[event] === undefined) {
+            return;
+        }
 
-    dispose() {
-        this.signal.dispose();
-        dispose(this.data);
+        let listeners = this.listeners[event];
+
+        for (let i = 0, n = listeners.length; i < n; i++) {
+            let listener = listeners[i];
+
+            if (listener === null) {
+                continue;
+            }
+
+            try {
+                listener(value);
+
+                if (listener.once !== undefined) {
+                    listeners[i] = null;
+                }
+            }
+            catch {
+                listeners[i] = null;
+            }
+        }
     }
 
-    indexOf(value: T, fromIndex?: number) {
+    dispose() {
         let data = this.data;
 
-        for (let i = fromIndex ?? 0, n = data.length; i < n; i++) {
-            if (data[i].value === value) {
-                return i;
+        for (let i = 0, n = data.length; i < n; i++) {
+            let value = data[i];
+
+            if (isInstanceOf(value, Disposable)) {
+                value.dispose();
+            }
+            else if (isComputed(value)) {
+                dispose(value);
             }
         }
 
-        return -1;
+        this.listeners = null;
     }
 
-    map<U>(fn: (this: API<T>, value: T, i: number) => U, i?: number, n?: number) {
+    map<R>(
+        fn: (this: API<T>, value: Value<T>, i: number) => R,
+        i?: number,
+        n?: number
+    ) {
         let { data, proxy } = this,
-            values: U[] = [];
+            values: R[] = [];
 
         if (i === undefined) {
             i = 0;
@@ -113,44 +151,71 @@ class ReactiveArray<T> {
             let item = data[i];
 
             values.push(
-                fn.call(proxy, isInstanceOf(item, Reactive) ? item.value : item, i)
+                fn.call(
+                    proxy,
+                    (isComputed(item) ? item.value : item) as Value<T>,
+                    i
+                )
             );
         }
 
         return values;
     }
 
-    on<E extends keyof Events<unknown>>(event: E, listener: Listener<Events<T>[E]>) {
-        this.signal.on(event, listener);
+    on<T>(event: keyof Events<T>, listener: Listener<T>) {
+        if (this.listeners === null) {
+            this.listeners = { [event]: [listener] };
+        }
+        else {
+            let listeners = this.listeners[event];
+
+            if (listeners === undefined) {
+                this.listeners[event] = [listener];
+            }
+            else if (listeners.indexOf(listener) === -1) {
+                let i = listeners.indexOf(null);
+
+                if (i === -1) {
+                    listeners.push(listener);
+                }
+                else {
+                    listeners[i] = listener;
+                }
+            }
+        }
     }
 
-    once<E extends keyof Events<unknown>>(event: E, listener: Listener<Events<T>[E]>) {
-        this.signal.once(event, listener);
+    once<T>(event: keyof Events<T>, listener: Listener<T>) {
+        listener.once = true;
+        this.on(event, listener);
     }
 
     pop() {
         let item = this.data.pop();
 
         if (item !== undefined) {
-            dispose(item);
-            this.signal.dispatch('pop', { item });
+            if (isComputed(item)) {
+                dispose(item);
+            }
+
+            this.dispatch('pop', { item });
         }
 
         return item;
     }
 
     push(...input: T[]) {
-        let items = factory(input, this.options),
+        let items = factory(input),
             n = this.data.push(...items);
 
-        this.signal.dispatch('push', { items });
+        this.dispatch('push', { items });
 
         return n;
     }
 
     reverse() {
         this.data.reverse();
-        this.signal.dispatch('reverse');
+        this.dispatch('reverse');
 
         return this;
     }
@@ -159,30 +224,40 @@ class ReactiveArray<T> {
         let item = this.data.shift();
 
         if (item !== undefined) {
-            dispose(item);
-            this.signal.dispatch('shift', { item });
+            if (isComputed(item)) {
+                dispose(item);
+            }
+
+            this.dispatch('shift', { item });
         }
 
         return item;
     }
 
-    sort(fn: (a: T, b: T) => number) {
+    sort(fn: (a: Value<T>, b: Value<T>) => number) {
         this.data.sort((a, b) => fn(
-            isInstanceOf(a, Reactive) ? a.value : a,
-            isInstanceOf(b, Reactive) ? b.value : b
+            (isComputed(a) ? a.value : a) as Value<T>,
+            (isComputed(b) ? b.value : b) as Value<T>
         ));
-        this.signal.dispatch('sort');
+        this.dispatch('sort');
 
         return this;
     }
 
     splice(start: number, deleteCount: number = this.data.length, ...input: T[]) {
-        let items = factory(input, this.options),
+        let items = factory(input),
             removed = this.data.splice(start, deleteCount, ...items);
 
         if (items.length > 0 || removed.length > 0) {
-            dispose(removed);
-            this.signal.dispatch('splice', {
+            for (let i = 0, n = removed.length; i < n; i++) {
+                let item = removed[i];
+
+                if (isComputed(item)) {
+                    dispose(item);
+                }
+            }
+
+            this.dispatch('splice', {
                 deleteCount,
                 items,
                 start
@@ -193,29 +268,33 @@ class ReactiveArray<T> {
     }
 
     unshift(...input: T[]) {
-        let items = factory(input, this.options),
+        let items = factory(input),
             length = this.data.unshift(...items);
 
-        this.signal.dispatch('unshift', { items });
+        this.dispatch('unshift', { items });
 
         return length;
     }
 }
 
 
-function factory<T>(input: T[], options: Options = {}) {
+function factory<T>(input: T[]) {
     let items: Item<T>[] = [];
 
     for (let i = 0, n = input.length; i < n; i++) {
         let value = input[i];
 
-        if (isObject(value)) {
-            // @ts-ignore
-            items[i] = object(value, options);
+        if (isArray(value)) {
+            items[i] = array(value);
+        }
+        else if (isFunction(value)) {
+            items[i] = computed(value as Computed<T>['fn']);
+        }
+        else if (isObject(value)) {
+            items[i] = object(value);
         }
         else {
-            // @ts-ignore
-            items[i] = signal(value);
+            items[i] = value;
         }
     }
 
@@ -223,15 +302,14 @@ function factory<T>(input: T[], options: Options = {}) {
 }
 
 
-export default <T>(input: T[], options: Options = {}) => {
-    let wrapped = factory(input, options),
-        proxy = new Proxy({}, {
+export default function array<T>(input: T[]) {
+    let proxy = new Proxy({}, {
             get(_: any, key: any) {
                 if (isNumber(key)) {
                     let value = wrapped[key];
 
-                    if (isInstanceOf(value, Reactive)) {
-                        return value.get();
+                    if (isComputed(value)) {
+                        return read(value);
                     }
 
                     return value;
@@ -246,11 +324,8 @@ export default <T>(input: T[], options: Options = {}) => {
                 if (isNumber(key)) {
                     let host = wrapped[key];
 
-                    if (host === undefined) {
-                        wrapped[key] = factory([value] as T[], options)[0];
-                    }
-                    else if (isInstanceOf(host, Reactive)) {
-                        host.set(value);
+                    if (host === undefined || !isComputed(host)) {
+                        wrapped[key] = factory([value] as T[])[0];
                     }
                     else {
                         return false;
@@ -264,10 +339,11 @@ export default <T>(input: T[], options: Options = {}) => {
 
                 return false;
             }
-        }) as API<T>;
+        }) as API<T>,
+        wrapped = factory(input);
 
     let a = new ReactiveArray(wrapped, proxy);
 
     return proxy;
 };
-export type { API as ReactiveArray };
+export { ReactiveArray };

package/src/reactive/disposable.ts

@@ -0,0 +1,8 @@
+class Disposable {
+    dispose(): void {
+        throw new Error('@esportsplus/reactivity: Disposable should not be instantiated directly.');
+    }
+}
+
+
+export { Disposable };

package/src/reactive/index.ts

@@ -1,5 +1,5 @@
 import { isArray, isObject } from '@esportsplus/utilities';
-import { Options, Reactive } from '~/types';
+import { Reactive } from '~/types';
 import { default as array } from './array';
 import { default as object } from './object';
 
@@ -12,14 +12,14 @@ type Guard<T> =
             : never;
 
 
-export default <T>(data: Guard<T>, options: Options = {}) => {
+export default <T>(data: Guard<T>) => {
     let value;
 
     if (isArray(data)) {
-        value = array(data, options);
+        value = array(data);
     }
     else if (isObject(data)) {
-        value = object(data as { [K in keyof T]: T[K] }, options);
+        value = object(data as { [K in keyof T]: T[K] });
     }
     else {
         throw new Error(`@esportsplus/reactivity: 'reactive' received invalid input - ${JSON.stringify(data)}`);

package/src/reactive/object.ts

@@ -1,63 +1,88 @@
-import { defineProperty, isArray, isFunction, isObject } from '@esportsplus/utilities';
-import { computed, signal } from '~/signal';
-import { Computed, Infer, Options, Prettify, ReactiveArray, Signal } from '~/types';
-import { default as array } from './array';
+import { defineProperty, isArray, isFunction, isInstanceOf, isObject, Prettify } from '@esportsplus/utilities';
+import array, { ReactiveArray } from './array';
+import { computed, dispose, isComputed, read, signal } from '~/signal';
+import { Computed, Infer, Signal } from '~/types';
+import { Disposable } from './disposable';
 
 
-type API<T> = Prettify< { [K in keyof T]: Infer<T[K]> } & { dispose: VoidFunction } >;
+type API<T extends Record<PropertyKey, unknown>> = Prettify<{ [K in keyof T]: Infer<T[K]> }> & ReactiveObject<T>;
 
 
-class ReactiveObject<T extends Record<PropertyKey, unknown>> {
-    signals: Record<PropertyKey, Computed<any> | ReactiveArray<any> | ReactiveObject<any> | Signal<any>> = {};
+let { set } = signal;
 
 
-    constructor(data: T, options: Options = {}) {
-        let signals = this.signals;
+class ReactiveObject<T extends Record<PropertyKey, unknown>> extends Disposable {
+    private signals: Record<
+        PropertyKey,
+        Computed<any> | ReactiveArray<any> | ReactiveObject<any> | Signal<any>
+    > = {};
+
+
+    constructor(data: T) {
+        super();
+
+        let signals = this.signals,
+            triggers: Record<string, Signal<boolean>> = {};
 
         for (let key in data) {
             let value = data[key];
 
             if (isArray(value)) {
-                let s = signals[key] = array(value, options);
+                let s = signals[key] = array(value),
+                    t = triggers[key] = signal(false);
 
                 defineProperty(this, key, {
                     enumerable: true,
                     get() {
+                        read(t);
                         return s;
+                    },
+                    set(v: typeof value) {
+                        set(t, !!t.value);
+                        s = signals[key] = array(v);
                     }
                 });
             }
             else if (isFunction(value)) {
-                let s = signals[key] = computed(value as Computed<T>['fn'], options);
+                let s = signals[key] = computed(value as Computed<T>['fn']);
 
                 defineProperty(this, key, {
                     enumerable: true,
                     get() {
-                        return s.get();
+                        return read(s as Computed<T>);
                     }
                 });
             }
             else if (isObject(value)) {
-                // Type issue with factory function below, fix after testing, if this is kept
-                let s = signals[key] = new ReactiveObject(value, options);
+                let s = signals[key] = new ReactiveObject(value),
+                    t = triggers[key] = signal(false);
 
                 defineProperty(this, key, {
                     enumerable: true,
                     get() {
+                        read(t);
                         return s;
+                    },
+                    set(v: typeof value) {
+                        set(t, !!t.value);
+                        s = signals[key] = new ReactiveObject(v);
                     }
                 });
             }
             else {
-                let s = signals[key] = signal(value, options);
+                let s = signals[key] = signal(value);
 
                 defineProperty(this, key, {
                     enumerable: true,
                     get() {
-                        return s.get();
+                        if (s === undefined) {
+                            s = signals[key] = signal(value);
+                        }
+
+                        return read(s as Signal<typeof value>);
                     },
-                    set(value) {
-                        s.set(value);
+                    set(v: typeof value) {
+                        set(s, v);
                     }
                 });
             }
@@ -66,16 +91,23 @@ class ReactiveObject<T extends Record<PropertyKey, unknown>> {
 
 
     dispose() {
-        let signals = this.signals;
+        for (let key in this.signals) {
+            let value = this.signals[key];
 
-        for (let key in signals) {
-            signals[key].dispose();
+            if (isInstanceOf(value, Disposable)) {
+                value.dispose();
+            }
+            else if (isComputed(value)) {
+                dispose(value);
+            }
         }
+
+        this.signals = {};
     }
 }
 
 
-export default function object<T extends Record<PropertyKey, unknown>>(input: T, options: Options = {}) {
-    return new ReactiveObject(input, options) as API<T>;
+export default function object<T extends Record<PropertyKey, unknown>>(input: T) {
+    return new ReactiveObject(input) as API<T>;
 };
-export type { API as ReactiveObject };
+export { ReactiveObject };