@oscarpalmer/mora 0.31.0 → 0.33.0

package/src/value/readonly.ts

@@ -1,71 +1,85 @@
-import {isPlainObject} from '@oscarpalmer/atoms/is';
-import type {GenericCallback} from '@oscarpalmer/atoms/models';
-import {NAME_MORA, NAME_READONLY} from '../constants';
-import {getSimpleValue} from '../helpers/value';
-import type {
-	ReactiveState,
-	ReadonlyFrozenSignal,
-	ReadonlyInstances,
-	ReadonlySignal,
-	ReadonlySignalValue,
-} from '../models';
+import {
+	NAME_MORA,
+	NAME_READONLY,
+	SUBSCRIPTION_TYPE_FROZEN,
+	SUBSCRIPTION_TYPE_ORIGINAL,
+	SYMBOL_STATE,
+} from '../constants';
+import {subscribeToReadonly} from '../helpers/subscription';
+import {getFrozenValue, getSignalValue, getStringValue, peekSignalValue} from '../helpers/value';
+import type {ReadonlyFrozenSignal, ReadonlySignal, SignalState, InternalSignal} from '../models';
+
+// #region Instance
+
+function Readonly(this: any, state: SignalState, frozen: boolean) {
+	this[SYMBOL_STATE] = state;
+
+	Object.defineProperty(this, SUBSCRIPTION_TYPE_FROZEN, {
+		enumerable: true,
+		value: frozen,
+	});
+}
+
+Readonly.prototype[NAME_MORA] = NAME_READONLY;
+
+Readonly.prototype.subscribe = subscribeToReadonly;
+Readonly.prototype.toString = getStringValue;
+
+Readonly.prototype.get = function () {
+	return getReadonlyValue(this, false, this[SUBSCRIPTION_TYPE_FROZEN]);
+};
+
+Readonly.prototype.peek = function (copy?: boolean) {
+	return getReadonlyValue(this, true, this[SUBSCRIPTION_TYPE_FROZEN], copy);
+};
+
+Readonly.prototype.toJSON = function () {
+	return this[SYMBOL_STATE].value;
+};
+
+// #endregion
+
+// #region Functions
 
 export function getReadonlyInstance<Value>(
-	state: ReactiveState<Value, never>,
-	instances: ReadonlyInstances<Value>,
-	handlers: Record<string, GenericCallback>,
-	frozen: boolean,
+	this: InternalSignal,
+	frozen?: never,
 ): ReadonlySignal<Value> {
-	const key = frozen ? 'frozen' : 'original';
+	const key = (frozen === true ? SUBSCRIPTION_TYPE_FROZEN : SUBSCRIPTION_TYPE_ORIGINAL) as never;
 
-	instances[key] ??= getReadonlySignal(state, handlers, frozen) as never;
+	this[SYMBOL_STATE].readonlies ??= {};
 
-	return instances[key] as ReadonlySignal<Value>;
+	this[SYMBOL_STATE].readonlies[key] ??= getReadonlySignal(
+		this[SYMBOL_STATE],
+		frozen === true,
+	) as never;
+
+	return this[SYMBOL_STATE].readonlies[key] as never;
 }
 
-export function getReadonlySignal<Value>(
-	state: ReactiveState<Value, never>,
-	handlers: Record<string, GenericCallback>,
+export function getReadonlySignal(
+	state: SignalState,
 	frozen: boolean,
-): ReadonlySignal<Value> | ReadonlyFrozenSignal<Value> {
-	const instance = {
-		...handlers,
-		get: () => getReadonlyValue(state, false, frozen),
-		peek: () => getReadonlyValue(state, true, frozen),
-	};
-
-	Object.defineProperties(instance, {
-		[NAME_MORA]: {
-			enumerable: false,
-			value: NAME_READONLY,
-		},
-		frozen: {
-			enumerable: true,
-			value: frozen,
-		},
-	});
-
-	return Object.freeze(instance) as ReadonlySignal<Value>;
+): ReadonlySignal<unknown> | ReadonlyFrozenSignal<unknown> {
+	// @ts-expect-error All good, no worries :-)
+	return new Readonly(state, frozen);
 }
 
-function getReadonlyValue<Value>(
-	state: ReactiveState<Value, never>,
+function getReadonlyValue(
+	instance: InternalSignal,
 	peek: boolean,
 	frozen: boolean,
-): Value | ReadonlySignalValue<Value> {
-	let value = peek ? state.value : getSimpleValue(state);
-
-	if (!frozen) {
-		return value;
-	}
+	copy?: boolean,
+): unknown {
+	let value: unknown;
 
-	if (Array.isArray(state.value)) {
-		value = [...state.value] as Value;
-	} else if (isPlainObject(state.value)) {
-		value = {...state.value} as Value;
+	if (peek) {
+		value = peekSignalValue.call(instance, copy === true);
 	} else {
-		value = state.value;
+		value = getSignalValue.call(instance);
 	}
 
-	return Object.freeze(value);
+	return frozen ? getFrozenValue(value) : value;
 }
+
+// #endregion

package/src/value/signal.ts

@@ -1,15 +1,56 @@
-import {NAME_MORA, NAME_SIGNAL} from '../constants';
-import {emitValue, getSimpleValue, handleSimpleValue} from '../helpers/value';
-import type {ReactiveOptions, ReactiveState, ReadonlyInstances, Signal} from '../models';
-import {subscribe} from '../subscription';
-import {reactive} from './reactive';
+import {NAME_MORA, NAME_SIGNAL, SYMBOL_STATE} from '../constants';
+import {getState} from '../helpers/misc';
+import {subscribeToSignal} from '../helpers/subscription';
+import {
+	emitValue,
+	getSignalValue,
+	getStringValue,
+	handleSignalValue,
+	peekSignalValue,
+	updateSignalValue,
+} from '../helpers/value';
+import type {ReactiveOptions, Signal, InternalSignal} from '../models';
 import {getReadonlyInstance} from './readonly';
 
-function setAndEmit<Value>(state: ReactiveState<Value, Value>, value: Value): void {
-	if (!state.equal(state.value, value)) {
+// #region Instance
+
+function Signal(this: any, value: unknown, options?: ReactiveOptions<unknown>) {
+	this[SYMBOL_STATE] = getState(undefined, options);
+
+	handleSignalValue(this, value, setAndEmit);
+}
+
+Signal.prototype[NAME_MORA] = NAME_SIGNAL;
+
+Signal.prototype.asReadonly = getReadonlyInstance;
+Signal.prototype.get = getSignalValue;
+Signal.prototype.peek = peekSignalValue;
+Signal.prototype.subscribe = subscribeToSignal;
+Signal.prototype.toString = getStringValue;
+
+Signal.prototype.set = function (value: never) {
+	return handleSignalValue(this, value, setAndEmit);
+};
+
+Signal.prototype.toJSON = function () {
+	return this[SYMBOL_STATE].value;
+};
+
+Signal.prototype.update = function (callback: never) {
+	return updateSignalValue(this, callback, setAndEmit);
+};
+
+// #endregion
+
+// #region Functions
+
+function setAndEmit(instance: InternalSignal, value: unknown): void {
+	const state = instance[SYMBOL_STATE];
+
+	if (!(state.equal ?? Object.is)(state.value as never, value as never)) {
 		state.value = value;
 
-		emitValue(state);
+		emitValue(instance);
 	}
 }
 
@@ -46,42 +87,9 @@ export function signal<Value>(
  */
 export function signal<Value>(value: Value, options?: ReactiveOptions<Value>): Signal<Value>;
 
-export function signal<Value>(
-	value: Value | (() => Value | Promise<Value>) | Promise<Value>,
-	options?: ReactiveOptions<Value>,
-): Signal<Value> {
-	const [rx, state] = reactive<Value>(undefined as unknown as Value, options);
-
-	const readonlies: ReadonlyInstances<Value> = {};
-
-	const handlers = {
-		...rx,
-		subscribe: (callback: (value: Value) => void) => subscribe(state, callback),
-		unsubscribe: (callback: (value: Value) => void) => {
-			state.subscriptions.delete(callback);
-		},
-	};
-
-	const instance = {
-		...handlers,
-		asReadonly: (frozen?: unknown) =>
-			getReadonlyInstance(state, readonlies, handlers, frozen === true),
-		get: () => getSimpleValue(state),
-		peek: () => state.value,
-		set: (value: Value | (() => Value | Promise<Value>) | Promise<Value>) => {
-			handleSimpleValue(state, value, setAndEmit);
-		},
-		update: (callback: (value: Value) => Value) => {
-			handleSimpleValue(state, callback(state.value), setAndEmit);
-		},
-	};
-
-	Object.defineProperty(instance, NAME_MORA, {
-		enumerable: false,
-		value: NAME_SIGNAL,
-	});
-
-	handleSimpleValue(state, value, setAndEmit);
-
-	return Object.freeze(instance) as Signal<Value>;
+export function signal(value: unknown, options?: ReactiveOptions<unknown>): Signal<unknown> {
+	// @ts-expect-error All good, no worries :-)
+	return new Signal(value, options);
 }
+
+// #endregion

package/src/value/store.ts

@@ -1,98 +1,55 @@
-import {isKey, isPlainObject} from '@oscarpalmer/atoms/is';
-import type {GenericCallback, Key, PlainObject} from '@oscarpalmer/atoms/models';
-import {startBatch, stopBatch} from '../batch';
-import {NAME_MORA, NAME_STORE} from '../constants';
+import type {PlainObject} from '@oscarpalmer/atoms/models';
+import {NAME_MORA, NAME_STORE, SYMBOL_STATE} from '../constants';
+import {getState} from '../helpers/misc';
 import {
-	emityProxyValues,
-	getReactiveValueInProxy,
+	emitProxyValues,
+	getValueInProxy,
+	peekValueInProxy,
 	setProxyValue,
 	setValueInProxy,
+	updateProxyValue,
 } from '../helpers/proxy';
-import {getSimpleValue} from '../helpers/value';
-import type {
-	Computed,
-	ComputedEffect,
-	ReactiveOptions,
-	ReactiveState,
-	ReactiveStore,
-	ReadonlyInstances,
-	Unsubscribe,
-} from '../models';
-import {noop, subscribe, unsubscribe} from '../subscription';
-import {reactive} from './reactive';
+import {subscribeToProxy} from '../helpers/subscription';
+import {getStringValue} from '../helpers/value';
+import type {ReactiveOptions, ReactiveStore} from '../models';
 import {getReadonlyInstance} from './readonly';
 
-function isStoreObject<Value extends PlainObject>(value: unknown): value is Value | undefined {
-	return value == null || isPlainObject(value);
-}
-
-function setObject(state: ReactiveState<PlainObject, never>, value: PlainObject | undefined): void {
-	startBatch();
-
-	const actual = value ?? {};
-	const proxy = state.value as PlainObject;
-
-	const proxyKeys = Object.keys(proxy);
-	const actualKeys = Object.keys(actual);
-
-	let {length} = proxyKeys;
-
-	for (let index = 0; index < length; index += 1) {
-		const key = proxyKeys[index];
-
-		proxy[key] = actualKeys.includes(key) ? actual[key] : undefined;
-	}
-
-	length = actualKeys.length;
-
-	for (let index = 0; index < length; index += 1) {
-		const key = actualKeys[index];
+// #region Instance
 
-		if (!proxyKeys.includes(key)) {
-			const keyedValue = actual[key];
+function ReactiveStore(this: any, value: never, options?: ReactiveOptions<unknown>) {
+	this[SYMBOL_STATE] = {
+		...getState(undefined, options),
+		isArray: false,
+	};
 
-			proxy[key] = keyedValue;
-		}
-	}
+	this[SYMBOL_STATE].value = new Proxy(
+		{},
+		{
+			set: (target, property, value) => setValueInProxy(this, target, property, value),
+		},
+	);
 
-	stopBatch();
+	setProxyValue.call(this, value);
 }
 
-function peekStoreValue<Value extends PlainObject>(
-	state: ReactiveState<Value, Value>,
-	first?: unknown,
-	second?: boolean,
-): unknown {
-	let value: unknown;
+ReactiveStore.prototype[NAME_MORA] = NAME_STORE;
 
-	if (isKey(first)) {
-		value = state.value[first];
-	} else {
-		value = state.value;
-	}
+ReactiveStore.prototype.asReadonly = getReadonlyInstance;
+ReactiveStore.prototype.get = getValueInProxy;
+ReactiveStore.prototype.notify = emitProxyValues;
+ReactiveStore.prototype.peek = peekValueInProxy;
+ReactiveStore.prototype.set = setProxyValue;
+ReactiveStore.prototype.subscribe = subscribeToProxy;
+ReactiveStore.prototype.toString = getStringValue;
+ReactiveStore.prototype.update = updateProxyValue;
 
-	if (!(first === true || second === true)) {
-		return value;
-	}
+ReactiveStore.prototype.toJSON = function () {
+	return this[SYMBOL_STATE].value;
+};
 
-	if (Array.isArray(value)) {
-		return value.slice();
-	}
+// #endregion
 
-	if (isPlainObject(value)) {
-		return {...value};
-	}
-
-	return value;
-}
-
-function setProperty<Value extends PlainObject>(
-	state: ReactiveState<Value, Value>,
-	key: unknown,
-	value: unknown,
-): void {
-	(state.value as PlainObject)[key as Key] = value;
-}
+// #region Functions
 
 /**
  * Create a reactive store from a function result
@@ -130,92 +87,9 @@ export function store<Value extends PlainObject>(
 	options?: ReactiveOptions<Value>,
 ): ReactiveStore<Value>;
 
-export function store<Value extends PlainObject>(
-	value: Value | (() => Value | Promise<Value>) | Promise<Value>,
-	options?: ReactiveOptions<Value>,
-): ReactiveStore<Value> {
-	const [rx, state] = reactive<Value>(undefined as never, options);
-
-	const keyed = new Map<Key, [Computed<unknown>, ComputedEffect]>();
-	const readonlies: ReadonlyInstances<Value> = {};
-
-	let instance: Record<string, GenericCallback> = {};
-
-	state.value = new Proxy({} as Value, {
-		set: (target: Value, property: PropertyKey, value: unknown) =>
-			setValueInProxy({
-				target,
-				property,
-				state,
-				value,
-				isArray: false,
-			}),
-	});
-
-	const handlers = {
-		...rx,
-		get: (value?: unknown): unknown =>
-			isKey(value)
-				? getReactiveValueInProxy(instance as ReactiveStore<Value>, keyed, value, false).get()
-				: getSimpleValue(state),
-		peek: (first?: unknown, second?: boolean): unknown => peekStoreValue(state, first, second),
-		subscribe: (first: Key | GenericCallback, second?: GenericCallback): Unsubscribe => {
-			if (isKey(first) && typeof second === 'function') {
-				return getReactiveValueInProxy(
-					instance as ReactiveStore<Value>,
-					keyed,
-					first,
-					false,
-				).subscribe(second);
-			}
-
-			return typeof first === 'function' ? subscribe(state, first) : noop;
-		},
-		unsubscribe: (first: Key | GenericCallback, second?: GenericCallback) => {
-			if (isKey(first) && typeof second === 'function') {
-				getReactiveValueInProxy(instance as ReactiveStore<Value>, keyed, first, false)?.unsubscribe(
-					second,
-				);
-			} else if (typeof first === 'function') {
-				unsubscribe(state, first);
-			}
-		},
-	};
-
-	instance = {
-		...handlers,
-		asReadonly: (frozen?: unknown) =>
-			getReadonlyInstance(state, readonlies, handlers, frozen === true),
-		notify(): void {
-			emityProxyValues(state, keyed);
-		},
-		set: (first?: unknown, second?: unknown) => {
-			setProxyValue<Value>(
-				false,
-				state,
-				isStoreObject,
-				isKey,
-				setObject,
-				setProperty,
-				first,
-				second,
-			);
-		},
-		update: (callback: (value: Value) => Value) => {
-			const updated = callback(state.value);
-
-			if (updated == null || isPlainObject(updated)) {
-				setObject(state, updated);
-			}
-		},
-	};
-
-	Object.defineProperty(instance, NAME_MORA, {
-		enumerable: false,
-		value: NAME_STORE,
-	});
-
-	instance.set(value);
-
-	return Object.freeze(instance) as ReactiveStore<Value>;
+export function store(value: unknown, options?: ReactiveOptions<unknown>): ReactiveStore<unknown> {
+	// @ts-expect-error All good, no worries :-)
+	return new ReactiveStore(value, options);
 }
+
+// #endregion

package/types/constants.d.ts

@@ -12,5 +12,5 @@ export declare const NAME_EFFECT = "effect";
 export declare const NAME_MORA = "$mora";
 export declare const NAME_SIGNAL = "signal";
 export declare const NAME_STORE = "store";
-export declare const NAME_ALL: Set<string>;
+export declare const NAMES: Set<string>;
 export declare const PROPERTY_LENGTH = "length";

package/types/index.d.ts

@@ -1,6 +1,6 @@
 export { startBatch, stopBatch } from './batch';
 export { effect, type Effect } from './effect';
-export { isArray, isComputed, isEffect, isReactive, isSignal } from './helpers/is';
+export { isArray, isComputed, isEffect, isReactive, isSignal, } from './helpers/is';
 export type { Unsubscribe } from './models';
 export { array, type ReactiveArray } from './value/array';
 export { computed, type Computed } from './value/computed';

package/types/value/array.d.ts

@@ -131,7 +131,7 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 /**
  * Create a reactive array
  * @param value Initial array of items
- * @param options Reactivity options
+ * @param options Optional reactivity options
  * @returns Reactive array
  */
 export declare function array<Item>(value: Item[], options?: ReactiveOptions<Item>): ReactiveArray<Item>;

package/types/value/computed.d.ts

@@ -10,8 +10,5 @@ export declare class Computed<Value> extends Reactive<Value> {
 }
 /**
  * Create a computed value
- * @param callback Callback to compute the value
- * @param options Reactivity options
- * @returns Computed value
  */
 export declare function computed<Value>(callback: () => Value, options?: ReactiveOptions<Value>): Computed<Value>;

package/types/value/signal.d.ts

@@ -20,7 +20,7 @@ export declare class Signal<Value> extends Reactive<Value> {
 /**
  * Create a reactive value
  * @param value Initial value
- * @param options Reactivity options
+ * @param options Optional reactivity options
  * @returns Reactive value
  */
 export declare function signal<Value>(value: Value, options?: ReactiveOptions<Value>): Signal<Value>;

package/types/value/store.d.ts

@@ -88,7 +88,7 @@ export declare class Store<Value extends PlainObject> extends Reactive<Value, Va
 /**
  * Create a reactive store
  * @param value Initial object value
- * @param options Reactivity options
+ * @param options Optional reactivity options
  * @returns Reactive store
  */
 export declare function store<Value extends PlainObject>(value: Value, options?: ReactiveOptions<Value>): Store<Value>;

package/dist/subscription.d.mts

@@ -1,7 +0,0 @@
-import { ReactiveState, Unsubscribe } from "./models.mjs";
-//#region src/subscription.d.ts
-declare function noop(): void;
-declare function subscribe<Value>(state: ReactiveState<Value, never>, callback: (value: Value) => void): Unsubscribe;
-declare function unsubscribe<Value>(state: ReactiveState<Value, never>, callback: (value: Value) => void): void;
-//#endregion
-export { noop, subscribe, unsubscribe };

package/dist/subscription.mjs

@@ -1,27 +0,0 @@
-//#region src/subscription.ts
-function noop() {}
-function subscribe(state, callback) {
-	if (typeof callback !== "function" || state.subscriptions.has(callback)) return noop;
-	state.subscriptions.set(callback, subscription(state, callback));
-	return () => {
-		unsubscribe(state, callback);
-	};
-}
-function subscription(state, callback) {
-	const instance = {
-		callback,
-		state,
-		destroy: () => {
-			instance.callback = noop;
-			instance.state = void 0;
-		}
-	};
-	callback(state.value);
-	return instance;
-}
-function unsubscribe(state, callback) {
-	state.subscriptions.get(callback)?.destroy();
-	state.subscriptions.delete(callback);
-}
-//#endregion
-export { noop, subscribe, unsubscribe };

package/dist/value/reactive.d.mts

@@ -1,5 +0,0 @@
-import { Reactive, ReactiveOptions, ReactiveState } from "../models.mjs";
-//#region src/value/reactive.d.ts
-declare function reactive<Value, Equal = Value>(value: Value, options?: ReactiveOptions<Equal>): [Reactive<Value>, ReactiveState<Value, Equal>];
-//#endregion
-export { reactive };

package/dist/value/reactive.mjs

@@ -1,16 +0,0 @@
-//#region src/value/reactive.ts
-function reactive(value, options) {
-	const state = {
-		computeds: /* @__PURE__ */ new Set(),
-		effects: /* @__PURE__ */ new Set(),
-		equal: typeof options === "object" && typeof options?.equal === "function" ? options.equal : Object.is,
-		subscriptions: /* @__PURE__ */ new Map(),
-		value
-	};
-	return [{
-		toJSON: () => state.value,
-		toString: () => String(state.value)
-	}, state];
-}
-//#endregion
-export { reactive };

package/src/subscription.ts

@@ -1,45 +0,0 @@
-import type {ReactiveState, Subscription, Unsubscribe} from './models';
-
-export function noop(): void {}
-
-export function subscribe<Value>(
-	state: ReactiveState<Value, never>,
-	callback: (value: Value) => void,
-): Unsubscribe {
-	if (typeof callback !== 'function' || state.subscriptions.has(callback)) {
-		return noop;
-	}
-
-	state.subscriptions.set(callback, subscription(state, callback));
-
-	return () => {
-		unsubscribe(state, callback);
-	};
-}
-
-function subscription<Value>(
-	state: ReactiveState<Value, never>,
-	callback: (value: Value) => void,
-): Subscription {
-	const instance: Subscription = {
-		callback,
-		state,
-		destroy: () => {
-			instance.callback = noop;
-			instance.state = undefined as never;
-		},
-	};
-
-	callback(state.value);
-
-	return instance;
-}
-
-export function unsubscribe<Value>(
-	state: ReactiveState<Value, never>,
-	callback: (value: Value) => void,
-): void {
-	state.subscriptions.get(callback)?.destroy();
-
-	state.subscriptions.delete(callback);
-}

package/src/value/reactive.ts

@@ -1,24 +0,0 @@
-import type {Reactive, ReactiveOptions, ReactiveState} from '../models';
-
-export function reactive<Value, Equal = Value>(
-	value: Value,
-	options?: ReactiveOptions<Equal>,
-): [Reactive<Value>, ReactiveState<Value, Equal>] {
-	const state: ReactiveState<Value, Equal> = {
-		computeds: new Set(),
-		effects: new Set(),
-		equal:
-			typeof options === 'object' && typeof options?.equal === 'function'
-				? options.equal
-				: Object.is,
-		subscriptions: new Map(),
-		value: value as Value,
-	};
-
-	const instance = {
-		toJSON: () => state.value,
-		toString: () => String(state.value),
-	};
-
-	return [instance, state];
-}