@zeix/cause-effect 0.15.1 → 0.15.2

package/src/store.ts

@@ -1,5 +1,19 @@
-import { diff, type UnknownRecord, type UnknownRecordOrArray } from './diff'
+import { isComputed } from './computed'
+import {
+	type ArrayToRecord,
+	diff,
+	type UnknownArray,
+	type UnknownRecord,
+	type UnknownRecordOrArray,
+} from './diff'
 import { effect } from './effect'
+import {
+	InvalidSignalValueError,
+	NullishSignalValueError,
+	StoreKeyExistsError,
+	StoreKeyRangeError,
+	StoreKeyReadonlyError,
+} from './errors'
 import {
 	batch,
 	type Cleanup,
@@ -7,76 +21,133 @@ import {
 	subscribe,
 	type Watcher,
 } from './scheduler'
-import { type Signal, toMutableSignal, UNSET } from './signal'
-import { type State, state } from './state'
-import { hasMethod, isObjectOfType, validArrayIndexes } from './util'
-
-/* === Constants === */
-
-const TYPE_STORE = 'Store'
+import { isMutableSignal, type Signal } from './signal'
+import { isState, type State, state } from './state'
+import {
+	isFunction,
+	isObjectOfType,
+	isRecord,
+	isSymbol,
+	recordToArray,
+	UNSET,
+	valueString,
+} from './util'
 
 /* === Types === */
 
-interface StoreAddEvent<T extends UnknownRecordOrArray> extends CustomEvent {
-	type: 'store-add'
-	detail: Partial<T>
-}
-
-interface StoreChangeEvent<T extends UnknownRecordOrArray> extends CustomEvent {
-	type: 'store-change'
-	detail: Partial<T>
-}
-
-interface StoreRemoveEvent<T extends UnknownRecordOrArray> extends CustomEvent {
-	type: 'store-remove'
-	detail: Partial<T>
-}
+type ArrayItem<T> = T extends readonly (infer U extends {})[] ? U : never
 
-type StoreEventMap<T extends UnknownRecordOrArray> = {
+type StoreEventMap<T extends UnknownRecord | UnknownArray> = {
 	'store-add': StoreAddEvent<T>
 	'store-change': StoreChangeEvent<T>
 	'store-remove': StoreRemoveEvent<T>
+	'store-sort': StoreSortEvent
 }
 
-interface StoreEventTarget<T extends UnknownRecordOrArray> extends EventTarget {
+interface StoreEventTarget<T extends UnknownRecord | UnknownArray>
+	extends EventTarget {
 	addEventListener<K extends keyof StoreEventMap<T>>(
 		type: K,
 		listener: (event: StoreEventMap<T>[K]) => void,
 		options?: boolean | AddEventListenerOptions,
 	): void
-	addEventListener(
-		type: string,
-		listener: EventListenerOrEventListenerObject,
-		options?: boolean | AddEventListenerOptions,
-	): void
 
 	removeEventListener<K extends keyof StoreEventMap<T>>(
 		type: K,
 		listener: (event: StoreEventMap<T>[K]) => void,
 		options?: boolean | EventListenerOptions,
 	): void
-	removeEventListener(
-		type: string,
-		listener: EventListenerOrEventListenerObject,
-		options?: boolean | EventListenerOptions,
-	): void
 
 	dispatchEvent(event: Event): boolean
 }
 
-type Store<T extends UnknownRecordOrArray = UnknownRecord> = {
-	[K in keyof T]: T[K] extends UnknownRecord ? Store<T[K]> : State<T[K]>
-} & StoreEventTarget<T> & {
-		[Symbol.toStringTag]: 'Store'
-		[Symbol.iterator](): IterableIterator<[keyof T, Signal<T[keyof T]>]>
-
-		add<K extends keyof T>(key: K, value: T[K]): void
-		get(): T
-		remove<K extends keyof T>(key: K): void
-		set(value: T): void
-		update(updater: (value: T) => T): void
-		size: State<number>
-	}
+interface BaseStore<T extends UnknownRecord | UnknownArray>
+	extends StoreEventTarget<T> {
+	readonly [Symbol.toStringTag]: 'Store'
+	get(): T
+	set(value: T): void
+	update(fn: (value: T) => T): void
+	sort<
+		U = T extends UnknownArray ? ArrayItem<T> : T[Extract<keyof T, string>],
+	>(
+		compareFn?: (a: U, b: U) => number,
+	): void
+	readonly size: State<number>
+}
+
+type RecordStore<T extends UnknownRecord> = BaseStore<T> & {
+	[K in keyof T]: T[K] extends readonly unknown[] | Record<string, unknown>
+		? Store<T[K]>
+		: State<T[K]>
+} & {
+	add<K extends Extract<keyof T, string>>(key: K, value: T[K]): void
+	remove<K extends Extract<keyof T, string>>(key: K): void
+	[Symbol.iterator](): IterableIterator<
+		[
+			Extract<keyof T, string>,
+			T[Extract<keyof T, string>] extends
+				| readonly unknown[]
+				| Record<string, unknown>
+				? Store<T[Extract<keyof T, string>]>
+				: State<T[Extract<keyof T, string>]>,
+		]
+	>
+}
+
+type ArrayStore<T extends UnknownArray> = BaseStore<T> & {
+	readonly length: number
+	[n: number]: ArrayItem<T> extends
+		| readonly unknown[]
+		| Record<string, unknown>
+		? Store<ArrayItem<T>>
+		: State<ArrayItem<T>>
+	add(value: ArrayItem<T>): void
+	remove(index: number): void
+	[Symbol.iterator](): IterableIterator<
+		ArrayItem<T> extends readonly unknown[] | Record<string, unknown>
+			? Store<ArrayItem<T>>
+			: State<ArrayItem<T>>
+	>
+	readonly [Symbol.isConcatSpreadable]: boolean
+}
+
+interface StoreAddEvent<T extends UnknownRecord | UnknownArray>
+	extends CustomEvent {
+	type: 'store-add'
+	detail: Partial<T>
+}
+
+interface StoreChangeEvent<T extends UnknownRecord | UnknownArray>
+	extends CustomEvent {
+	type: 'store-change'
+	detail: Partial<T>
+}
+
+interface StoreRemoveEvent<T extends UnknownRecord | UnknownArray>
+	extends CustomEvent {
+	type: 'store-remove'
+	detail: Partial<T>
+}
+
+interface StoreSortEvent extends CustomEvent {
+	type: 'store-sort'
+	detail: string[]
+}
+
+type Store<T> = T extends UnknownRecord
+	? RecordStore<T>
+	: T extends UnknownArray
+		? ArrayStore<T>
+		: never
+
+/* === Constants === */
+
+const TYPE_STORE = 'Store'
+
+const STORE_EVENT_ADD = 'store-add'
+const STORE_EVENT_CHANGE = 'store-change'
+const STORE_EVENT_REMOVE = 'store-remove'
+const STORE_EVENT_SORT = 'store-sort'
 
 /* === Functions === */
 
@@ -92,87 +163,165 @@ type Store<T extends UnknownRecordOrArray = UnknownRecord> = {
  * @param {T} initialValue - initial object or array value of the store
  * @returns {Store<T>} - new store with reactive properties that preserves the original type T
  */
-const store = <T extends UnknownRecordOrArray>(initialValue: T): Store<T> => {
-	const watchers: Set<Watcher> = new Set()
+const store = <T extends UnknownRecord | UnknownArray>(
+	initialValue: T,
+): Store<T> => {
+	const watchers = new Set<Watcher>()
 	const eventTarget = new EventTarget()
-	const signals: Map<keyof T, Store<T[keyof T]> | State<T[keyof T]>> =
-		new Map()
-	const cleanups = new Map<keyof T, Cleanup>()
+	const signals = new Map<string, Signal<T[Extract<keyof T, string>] & {}>>()
+	const cleanups = new Map<string, Cleanup>()
+
+	// Determine if this is an array-like store at creation time
+	const isArrayLike = Array.isArray(initialValue)
 
 	// Internal state
 	const size = state(0)
 
-	// Get current record or array
-	const current = (): T => {
-		const keys = Array.from(signals.keys())
-		const arrayIndexes = validArrayIndexes(keys)
-		if (arrayIndexes)
-			return arrayIndexes.map(index =>
-				signals.get(String(index))?.get(),
-			) as unknown as T
-		const record: Partial<T> = {}
+	// Get current record
+	const current = () => {
+		const record: Record<string, unknown> = {}
 		for (const [key, signal] of signals) {
 			record[key] = signal.get()
 		}
-		return record as T
+		return record
 	}
 
 	// Emit event
-	const emit = (type: keyof StoreEventMap<T>, detail: Partial<T>) =>
+	const emit = <R>(type: keyof StoreEventMap<T>, detail: R) =>
 		eventTarget.dispatchEvent(new CustomEvent(type, { detail }))
 
+	// Get sorted indexes
+	const getSortedIndexes = () =>
+		Array.from(signals.keys())
+			.map(k => Number(k))
+			.filter(n => Number.isInteger(n))
+			.sort((a, b) => a - b)
+
+	// Validate input
+	const isValidValue = <T>(
+		key: string,
+		value: T,
+	): value is NonNullable<T> => {
+		if (value == null)
+			throw new NullishSignalValueError(`store for key "${key}"`)
+		if (value === UNSET) return true
+		if (isSymbol(value) || isFunction(value) || isComputed(value))
+			throw new InvalidSignalValueError(
+				`store for key "${key}"`,
+				valueString(value),
+			)
+		return true
+	}
+
 	// Add nested signal and effect
-	const addProperty = <K extends keyof T>(key: K, value: T[K]) => {
-		const stringKey = String(key)
-		const signal = toMutableSignal(value)
-		signals.set(stringKey, signal as Store<T[keyof T]> | State<T[keyof T]>)
+	const addProperty = <K extends Extract<keyof T, string>>(
+		key: K,
+		value: T[K] | ArrayItem<T>,
+		single = false,
+	): boolean => {
+		if (!isValidValue(key, value)) return false
+		const signal =
+			isState(value) || isStore(value)
+				? value
+				: isRecord(value)
+					? store(value)
+					: Array.isArray(value)
+						? store(value)
+						: state(value)
+		// @ts-expect-error non-matching signal types
+		signals.set(key, signal)
 		const cleanup = effect(() => {
 			const currentValue = signal.get()
 			if (currentValue != null)
-				emit('store-change', { [key]: currentValue } as Partial<T>)
+				emit(STORE_EVENT_CHANGE, {
+					[key]: currentValue,
+				} as unknown as Partial<T>)
 		})
-		cleanups.set(stringKey, cleanup)
+		cleanups.set(key, cleanup)
+
+		if (single) {
+			size.set(signals.size)
+			notify(watchers)
+			emit(STORE_EVENT_ADD, {
+				[key]: value,
+			} as unknown as Partial<T>)
+		}
+		return true
 	}
 
 	// Remove nested signal and effect
-	const removeProperty = <K extends keyof T>(key: K) => {
-		const stringKey = String(key)
-		signals.delete(stringKey)
-		const cleanup = cleanups.get(stringKey)
-		if (cleanup) cleanup()
-		cleanups.delete(stringKey)
+	const removeProperty = <K extends Extract<keyof T, string>>(
+		key: K,
+		single = false,
+	) => {
+		const ok = signals.delete(key)
+		if (ok) {
+			const cleanup = cleanups.get(key)
+			if (cleanup) cleanup()
+			cleanups.delete(key)
+		}
+
+		if (single) {
+			size.set(signals.size)
+			notify(watchers)
+			emit(STORE_EVENT_REMOVE, {
+				[key]: UNSET,
+			} as unknown as Partial<T>)
+		}
+		return ok
 	}
 
 	// Reconcile data and dispatch events
-	const reconcile = (oldValue: T, newValue: T): boolean => {
-		const changes = diff(oldValue, newValue)
+	const reconcile = (
+		oldValue: T,
+		newValue: T,
+		initialRun?: boolean,
+	): boolean => {
+		const changes = diff(
+			oldValue as T extends UnknownArray ? ArrayToRecord<T> : T,
+			newValue as T extends UnknownArray ? ArrayToRecord<T> : T,
+		)
 
 		batch(() => {
+			// Additions
 			if (Object.keys(changes.add).length) {
 				for (const key in changes.add) {
-					const value = changes.add[key]
-					if (value != null) addProperty(key, value as T[keyof T])
+					const value = changes.add[key] ?? UNSET
+					addProperty(
+						key as Extract<keyof T, string>,
+						value as T[Extract<keyof T, string>] & {},
+					)
+				}
+
+				// Queue initial additions event to allow listeners to be added first
+				if (initialRun) {
+					setTimeout(() => {
+						emit(STORE_EVENT_ADD, changes.add as Partial<T>)
+					}, 0)
+				} else {
+					emit<Partial<T>>(STORE_EVENT_ADD, changes.add as Partial<T>)
 				}
-				emit('store-add', changes.add)
 			}
+
+			// Changes
 			if (Object.keys(changes.change).length) {
 				for (const key in changes.change) {
-					const signal = signals.get(key)
 					const value = changes.change[key]
-					if (
-						signal &&
-						value != null &&
-						hasMethod<Signal<T[keyof T]>>(signal, 'set')
-					)
-						signal.set(value)
+					if (!isValidValue(key, value)) continue
+					const signal = signals.get(key as Extract<keyof T, string>)
+					if (isMutableSignal(signal))
+						signal.set(value as T[Extract<keyof T, string>] & {})
+					else
+						throw new StoreKeyReadonlyError(key, valueString(value))
 				}
-				emit('store-change', changes.change)
+				emit(STORE_EVENT_CHANGE, changes.change as Partial<T>)
 			}
+
+			// Removals
 			if (Object.keys(changes.remove).length) {
-				for (const key in changes.remove) {
-					removeProperty(key)
-				}
-				emit('store-remove', changes.remove)
+				for (const key in changes.remove)
+					removeProperty(key as Extract<keyof T, string>)
+				emit(STORE_EVENT_REMOVE, changes.remove as Partial<T>)
 			}
 
 			size.set(signals.size)
@@ -181,112 +330,185 @@ const store = <T extends UnknownRecordOrArray>(initialValue: T): Store<T> => {
 		return changes.changed
 	}
 
-	// Initialize data
-	reconcile({} as T, initialValue)
+	// Initialize data - convert arrays to records for internal storage
+	reconcile({} as T, initialValue, true)
 
-	// Queue initial additions event to allow listeners to be added first
-	setTimeout(() => {
-		const initialAdditionsEvent = new CustomEvent('store-add', {
-			detail: initialValue,
-		})
-		eventTarget.dispatchEvent(initialAdditionsEvent)
-	}, 0)
-
-	const storeProps = [
-		'add',
-		'get',
-		'remove',
-		'set',
-		'update',
-		'addEventListener',
-		'removeEventListener',
-		'dispatchEvent',
-		'size',
-	]
+	// Methods and Properties
+	const s: Record<string, unknown> = {
+		add: isArrayLike
+			? (v: ArrayItem<T>): void => {
+					const nextIndex = signals.size
+					const key = String(nextIndex) as Extract<keyof T, string>
+					addProperty(key, v, true)
+				}
+			: <K extends Extract<keyof T, string>>(k: K, v: T[K]): void => {
+					if (!signals.has(k)) addProperty(k, v, true)
+					else throw new StoreKeyExistsError(k, valueString(v))
+				},
+		get: (): T => {
+			subscribe(watchers)
+			return recordToArray(current()) as T
+		},
+		remove: isArrayLike
+			? (index: number): void => {
+					const currentArray = recordToArray(current()) as T
+					const currentLength = signals.size
+					if (
+						!Array.isArray(currentArray) ||
+						index <= -currentLength ||
+						index >= currentLength
+					)
+						throw new StoreKeyRangeError(index)
+					const newArray = [...currentArray]
+					newArray.splice(index, 1)
+
+					if (reconcile(currentArray, newArray as unknown as T))
+						notify(watchers)
+				}
+			: <K extends Extract<keyof T, string>>(k: K): void => {
+					if (signals.has(k)) removeProperty(k, true)
+				},
+		set: (v: T): void => {
+			if (reconcile(current() as T, v)) {
+				notify(watchers)
+				if (UNSET === v) watchers.clear()
+			}
+		},
+		update: (fn: (v: T) => T): void => {
+			const oldValue = current()
+			const newValue = fn(recordToArray(oldValue) as T)
+			if (reconcile(oldValue as T, newValue)) {
+				notify(watchers)
+				if (UNSET === newValue) watchers.clear()
+			}
+		},
+		sort: (
+			compareFn?: <
+				U = T extends UnknownArray
+					? ArrayItem<T>
+					: T[Extract<keyof T, string>],
+			>(
+				a: U,
+				b: U,
+			) => number,
+		): void => {
+			// Get all entries as [key, value] pairs
+			const entries = Array.from(signals.entries())
+				.map(
+					([key, signal]) =>
+						[key, signal.get()] as [
+							string,
+							T[Extract<keyof T, string>],
+						],
+				)
+				.sort(
+					compareFn
+						? (a, b) => compareFn(a[1], b[1])
+						: (a, b) => String(a[1]).localeCompare(String(b[1])),
+				)
+
+			// Create array of original keys in their new sorted order
+			const newOrder: string[] = entries.map(([key]) => String(key))
+			const newSignals = new Map<
+				string,
+				Signal<T[Extract<keyof T, string>] & {}>
+			>()
+
+			entries.forEach(([key], newIndex) => {
+				const oldKey = String(key)
+				const newKey = isArrayLike ? String(newIndex) : String(key)
+
+				const signal = signals.get(oldKey)
+				if (signal) newSignals.set(newKey, signal)
+			})
+
+			// Replace signals map
+			signals.clear()
+			newSignals.forEach((signal, key) => signals.set(key, signal))
+			notify(watchers)
+			emit(STORE_EVENT_SORT, newOrder)
+		},
+		addEventListener: eventTarget.addEventListener.bind(eventTarget),
+		removeEventListener: eventTarget.removeEventListener.bind(eventTarget),
+		dispatchEvent: eventTarget.dispatchEvent.bind(eventTarget),
+		size,
+	}
 
 	// Return proxy directly with integrated signal methods
 	return new Proxy({} as Store<T>, {
 		get(_target, prop) {
-			// Handle signal methods and size property
-			switch (prop) {
-				case 'add':
-					return <K extends keyof T>(k: K, v: T[K]): void => {
-						if (!signals.has(k)) {
-							addProperty(k, v)
-							notify(watchers)
-							emit('store-add', {
-								[k]: v,
-							} as unknown as Partial<T>)
-							size.set(signals.size)
-						}
-					}
-				case 'get':
-					return (): T => {
-						subscribe(watchers)
-						return current()
-					}
-				case 'remove':
-					return <K extends keyof T>(k: K): void => {
-						if (signals.has(k)) {
-							removeProperty(k)
-							notify(watchers)
-							emit('store-remove', { [k]: UNSET } as Partial<T>)
-							size.set(signals.size)
-						}
-					}
-				case 'set':
-					return (v: T): void => {
-						if (reconcile(current(), v)) {
-							notify(watchers)
-							if (UNSET === v) watchers.clear()
+			// Symbols
+			if (prop === Symbol.toStringTag) return TYPE_STORE
+			if (prop === Symbol.isConcatSpreadable) return isArrayLike
+			if (prop === Symbol.iterator)
+				return isArrayLike
+					? function* () {
+							const indexes = getSortedIndexes()
+							for (const index of indexes) {
+								const signal = signals.get(
+									String(index) as Extract<keyof T, string>,
+								)
+								if (signal) yield signal
+							}
 						}
-					}
-				case 'update':
-					return (fn: (v: T) => T): void => {
-						const oldValue = current()
-						const newValue = fn(oldValue)
-						if (reconcile(oldValue, newValue)) {
-							notify(watchers)
-							if (UNSET === newValue) watchers.clear()
+					: function* () {
+							for (const [key, signal] of signals)
+								yield [key, signal]
 						}
-					}
-				case 'addEventListener':
-					return eventTarget.addEventListener.bind(eventTarget)
-				case 'removeEventListener':
-					return eventTarget.removeEventListener.bind(eventTarget)
-				case 'dispatchEvent':
-					return eventTarget.dispatchEvent.bind(eventTarget)
-				case 'size':
-					return size
-			}
+			if (isSymbol(prop)) return undefined
 
-			// Handle symbol properties
-			if (prop === Symbol.toStringTag) return TYPE_STORE
-			if (prop === Symbol.iterator) {
-				return function* () {
-					for (const [key, signal] of signals) {
-						yield [key, signal]
-					}
-				}
+			// Methods and Properties
+			if (prop in s) return s[prop]
+			if (prop === 'length' && isArrayLike) {
+				subscribe(watchers)
+				return size.get()
 			}
 
-			// Handle data properties - return signals
-			return signals.get(String(prop))
+			// Signals
+			return signals.get(prop as Extract<keyof T, string>)
 		},
 		has(_target, prop) {
-			const key = String(prop)
+			const stringProp = String(prop)
 			return (
-				signals.has(key) ||
-				storeProps.includes(key) ||
+				(stringProp &&
+					signals.has(stringProp as Extract<keyof T, string>)) ||
+				Object.keys(s).includes(stringProp) ||
 				prop === Symbol.toStringTag ||
-				prop === Symbol.iterator
+				prop === Symbol.iterator ||
+				prop === Symbol.isConcatSpreadable ||
+				(prop === 'length' && isArrayLike)
 			)
 		},
 		ownKeys() {
-			return Array.from(signals.keys()).map(key => String(key))
+			return isArrayLike
+				? getSortedIndexes()
+						.map(key => String(key))
+						.concat(['length'])
+				: Array.from(signals.keys()).map(key => String(key))
 		},
 		getOwnPropertyDescriptor(_target, prop) {
-			const signal = signals.get(String(prop))
+			const nonEnumerable = <T>(value: T) => ({
+				enumerable: false,
+				configurable: true,
+				writable: false,
+				value,
+			})
+
+			if (prop === 'length' && isArrayLike)
+				return {
+					enumerable: true,
+					configurable: true,
+					writable: false,
+					value: size.get(),
+				}
+			if (prop === Symbol.isConcatSpreadable)
+				return nonEnumerable(isArrayLike)
+			if (prop === Symbol.toStringTag) return nonEnumerable(TYPE_STORE)
+			if (isSymbol(prop)) return undefined
+
+			if (Object.keys(s).includes(prop)) return nonEnumerable(s[prop])
+
+			const signal = signals.get(prop as Extract<keyof T, string>)
 			return signal
 				? {
 						enumerable: true,
@@ -320,5 +542,6 @@ export {
 	type StoreAddEvent,
 	type StoreChangeEvent,
 	type StoreRemoveEvent,
+	type StoreSortEvent,
 	type StoreEventMap,
 }