@oscarpalmer/mora 0.31.0 → 0.32.0

package/src/value/store.ts

@@ -1,14 +1,15 @@
-import {isKey, isPlainObject} from '@oscarpalmer/atoms/is';
-import type {GenericCallback, Key, PlainObject} from '@oscarpalmer/atoms/models';
+import type {Key, PlainObject} from '@oscarpalmer/atoms/models';
 import {startBatch, stopBatch} from '../batch';
 import {NAME_MORA, NAME_STORE} from '../constants';
 import {
-	emityProxyValues,
-	getReactiveValueInProxy,
+	emitProxyValues,
+	getValueInProxy,
+	peekValueInProxy,
 	setProxyValue,
 	setValueInProxy,
+	updateProxyValue,
 } from '../helpers/proxy';
-import {getSimpleValue} from '../helpers/value';
+import {subscribeToProxy} from '../helpers/subscription';
 import type {
 	Computed,
 	ComputedEffect,
@@ -16,17 +17,24 @@ import type {
 	ReactiveState,
 	ReactiveStore,
 	ReadonlyInstances,
-	Unsubscribe,
 } from '../models';
-import {noop, subscribe, unsubscribe} from '../subscription';
 import {reactive} from './reactive';
 import {getReadonlyInstance} from './readonly';
 
-function isStoreObject<Value extends PlainObject>(value: unknown): value is Value | undefined {
-	return value == null || isPlainObject(value);
+// #region Functions
+
+function setPropertyValue<Value extends PlainObject, Item = Value>(
+	state: ReactiveState<Value, Item>,
+	key: unknown,
+	value: unknown,
+): void {
+	(state.value as PlainObject)[key as Key] = value;
 }
 
-function setObject(state: ReactiveState<PlainObject, never>, value: PlainObject | undefined): void {
+function setStoreValue<Value extends PlainObject, Item = Value>(
+	state: ReactiveState<Value, Item>,
+	value: PlainObject | undefined,
+): void {
 	startBatch();
 
 	const actual = value ?? {};
@@ -58,42 +66,6 @@ function setObject(state: ReactiveState<PlainObject, never>, value: PlainObject
 	stopBatch();
 }
 
-function peekStoreValue<Value extends PlainObject>(
-	state: ReactiveState<Value, Value>,
-	first?: unknown,
-	second?: boolean,
-): unknown {
-	let value: unknown;
-
-	if (isKey(first)) {
-		value = state.value[first];
-	} else {
-		value = state.value;
-	}
-
-	if (!(first === true || second === true)) {
-		return value;
-	}
-
-	if (Array.isArray(value)) {
-		return value.slice();
-	}
-
-	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;
-}
-
 /**
  * Create a reactive store from a function result
  *
@@ -136,86 +108,35 @@ export function store<Value extends PlainObject>(
 ): ReactiveStore<Value> {
 	const [rx, state] = reactive<Value>(undefined as never, options);
 
+	const isArray = false;
 	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,
-			}),
+		set: (target, property, value) => setValueInProxy(isArray, state, target, property, value),
 	});
 
-	const handlers = {
+	const instance = {
 		...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);
-			}
-		},
+		asReadonly: (frozen?: never) => getReadonlyInstance(state, readonlies, frozen === true),
+		get: (value?: never) => getValueInProxy(isArray, instance as never, state, keyed, value),
+		notify: () => emitProxyValues(state, keyed),
+		peek: (first?: never, second?: never) => peekValueInProxy(isArray, state, first, second),
+		set: (first?: never, second?: never) =>
+			setProxyValue<Value>(isArray, state, setStoreValue, setPropertyValue, first, second),
+		subscribe: (first: never, second?: never, third?: never) =>
+			subscribeToProxy(isArray, instance as never, state, keyed, first, second, third),
+		update: (callback: never) =>
+			updateProxyValue(isArray, state, setStoreValue, setPropertyValue, callback),
 	};
 
 	Object.defineProperty(instance, NAME_MORA, {
-		enumerable: false,
 		value: NAME_STORE,
 	});
 
-	instance.set(value);
+	instance.set(value as never);
 
-	return Object.freeze(instance) as ReactiveStore<Value>;
+	return Object.freeze(instance) as never;
 }
+
+// #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/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);
-}