@zeix/cause-effect 0.17.0 → 0.17.2

package/archive/collection.ts

@@ -5,16 +5,17 @@ import type { Signal } from '../src/signal'
 import {
 	type Cleanup,
 	createWatcher,
-	emitNotification,
-	type Listener,
-	type Listeners,
-	type Notifications,
+	triggerHook,
+	type HookCallback,
+	type HookCallbacks,
+	type Hook,
 	notifyWatchers,
 	subscribeActiveWatcher,
 	trackSignalReads,
 	type Watcher,
+	UNSET,
 } from '../src/system'
-import { isAsyncFunction, isObjectOfType, isSymbol, UNSET } from '../src/util'
+import { isAsyncFunction, isObjectOfType, isSymbol } from '../src/util'
 import { type Computed, createComputed } from './computed'
 import type { List } from './list'
 
@@ -39,7 +40,7 @@ type Collection<T extends {}> = {
 	get(): T[]
 	keyAt(index: number): string | undefined
 	indexOfKey(key: string): number
-	on<K extends keyof Notifications>(type: K, listener: Listener<K>): Cleanup
+	on(type: Hook, callback: HookCallback): Cleanup
 	sort(compareFn?: (a: T, b: T) => number): void
 }
 
@@ -66,12 +67,7 @@ const createCollection = <T extends {}, O extends {}>(
 	callback: CollectionCallback<T, O>,
 ): Collection<T> => {
 	const watchers = new Set<Watcher>()
-	const listeners: Listeners = {
-		add: new Set<Listener<'add'>>(),
-		change: new Set<Listener<'change'>>(),
-		remove: new Set<Listener<'remove'>>(),
-		sort: new Set<Listener<'sort'>>(),
-	}
+	const hookCallbacks: HookCallbacks = {}
 	const signals = new Map<string, Signal<T>>()
 	const signalWatchers = new Map<string, Watcher>()
 
@@ -121,7 +117,7 @@ const createCollection = <T extends {}, O extends {}>(
 		const watcher = createWatcher(() =>
 			trackSignalReads(watcher, () => {
 				signal.get() // Subscribe to the signal
-				emitNotification(listeners.change, [key])
+				triggerHook(hookCallbacks.change, [key])
 			}),
 		)
 		watcher()
@@ -152,25 +148,29 @@ const createCollection = <T extends {}, O extends {}>(
 		addProperty(key)
 	}
 	origin.on('add', additions => {
+		if (!additions?.length) return
 		for (const key of additions) {
 			if (!signals.has(key)) addProperty(key)
 		}
 		notifyWatchers(watchers)
-		emitNotification(listeners.add, additions)
+		triggerHook(hookCallbacks.add, additions)
 	})
 	origin.on('remove', removals => {
+		if (!removals?.length) return
 		for (const key of Object.keys(removals)) {
 			if (!signals.has(key)) continue
 			removeProperty(key)
 		}
 		order = order.filter(() => true) // Compact array
 		notifyWatchers(watchers)
-		emitNotification(listeners.remove, removals)
+		triggerHook(hookCallbacks.remove, removals)
 	})
 	origin.on('sort', newOrder => {
-		order = [...newOrder]
-		notifyWatchers(watchers)
-		emitNotification(listeners.sort, newOrder)
+		if (newOrder) {
+			order = [...newOrder]
+			notifyWatchers(watchers)
+			triggerHook(hookCallbacks.sort, newOrder)
+		}
 	})
 
 	// Get signal by key or index
@@ -247,16 +247,14 @@ const createCollection = <T extends {}, O extends {}>(
 				order = entries.map(([_, key]) => key)
 
 				notifyWatchers(watchers)
-				emitNotification(listeners.sort, order)
+				triggerHook(hookCallbacks.sort, order)
 			},
 		},
 		on: {
-			value: <K extends keyof Listeners>(
-				type: K,
-				listener: Listener<K>,
-			): Cleanup => {
-				listeners[type].add(listener)
-				return () => listeners[type].delete(listener)
+			value: (type: Hook, callback: HookCallback): Cleanup => {
+				hookCallbacks[type] ||= new Set()
+				hookCallbacks[type].add(callback)
+				return () => hookCallbacks[type]?.delete(callback)
 			},
 		},
 		length: {

package/archive/computed.ts

@@ -1,15 +1,18 @@
 import { isEqual } from '../src/diff'
 import {
 	CircularDependencyError,
+	createError,
 	InvalidCallbackError,
 	NullishSignalValueError,
 } from '../src/errors'
 import {
 	createWatcher,
 	flushPendingReactions,
+	HOOK_CLEANUP,
 	notifyWatchers,
 	subscribeActiveWatcher,
 	trackSignalReads,
+	UNSET,
 	type Watcher,
 } from '../src/system'
 import {
@@ -17,8 +20,6 @@ import {
 	isAsyncFunction,
 	isFunction,
 	isObjectOfType,
-	toError,
-	UNSET,
 } from '../src/util'
 
 /* === Types === */
@@ -78,7 +79,7 @@ const createComputed = <T extends {}>(
 		error = undefined
 	}
 	const err = (e: unknown): undefined => {
-		const newError = toError(e)
+		const newError = createError(e)
 		changed =
 			!error ||
 			newError.name !== error.name ||
@@ -102,7 +103,7 @@ const createComputed = <T extends {}>(
 		if (watchers.size) notifyWatchers(watchers)
 		else watcher.stop()
 	})
-	watcher.onCleanup(() => {
+	watcher.on(HOOK_CLEANUP, () => {
 		controller?.abort()
 	})
 

package/archive/list.ts

@@ -10,13 +10,14 @@ import {
 	batchSignalWrites,
 	type Cleanup,
 	createWatcher,
-	emitNotification,
-	type Listener,
-	type Listeners,
-	type Notifications,
+	type Hook,
+	type HookCallback,
+	type HookCallbacks,
 	notifyWatchers,
 	subscribeActiveWatcher,
 	trackSignalReads,
+	triggerHook,
+	UNSET,
 	type Watcher,
 } from '../src/system'
 import {
@@ -26,7 +27,6 @@ import {
 	isRecord,
 	isString,
 	isSymbol,
-	UNSET,
 } from '../src/util'
 import {
 	type Collection,
@@ -63,7 +63,7 @@ type List<T extends {}> = {
 	update(fn: (value: T) => T): void
 	sort<U = T>(compareFn?: (a: U, b: U) => number): void
 	splice(start: number, deleteCount?: number, ...items: T[]): T[]
-	on<K extends keyof Notifications>(type: K, listener: Listener<K>): Cleanup
+	on(type: Hook, callback: HookCallback): Cleanup
 	remove(index: number): void
 }
 
@@ -90,12 +90,7 @@ const createList = <T extends {}>(
 	if (initialValue == null) throw new NullishSignalValueError('store')
 
 	const watchers = new Set<Watcher>()
-	const listeners: Listeners = {
-		add: new Set<Listener<'add'>>(),
-		change: new Set<Listener<'change'>>(),
-		remove: new Set<Listener<'remove'>>(),
-		sort: new Set<Listener<'sort'>>(),
-	}
+	const hookCallbacks: HookCallbacks = {}
 	const signals = new Map<string, MutableSignal<T>>()
 	const ownWatchers = new Map<string, Watcher>()
 
@@ -163,7 +158,7 @@ const createList = <T extends {}>(
 		const watcher = createWatcher(() => {
 			trackSignalReads(watcher, () => {
 				signal.get() // Subscribe to the signal
-				emitNotification(listeners.change, [key])
+				triggerHook(hookCallbacks.change, [key])
 			})
 		})
 		ownWatchers.set(key, watcher)
@@ -191,11 +186,11 @@ const createList = <T extends {}>(
 		signals.set(key, signal)
 		if (!order.includes(key)) order.push(key)
 		// @ts-expect-error ignore
-		if (listeners.change.size) addOwnWatcher(key, signal)
+		if (hookCallbacks.change?.size) addOwnWatcher(key, signal)
 
 		if (single) {
 			notifyWatchers(watchers)
-			emitNotification(listeners.add, [key])
+			triggerHook(hookCallbacks.add, [key])
 		}
 		return true
 	}
@@ -218,7 +213,7 @@ const createList = <T extends {}>(
 		if (single) {
 			order = order.filter(() => true) // Compact array
 			notifyWatchers(watchers)
-			emitNotification(listeners.remove, [key])
+			triggerHook(hookCallbacks.remove, [key])
 		}
 	}
 
@@ -233,9 +228,9 @@ const createList = <T extends {}>(
 			// Queue initial additions event to allow listeners to be added first
 			if (initialRun)
 				setTimeout(() => {
-					emitNotification(listeners.add, Object.keys(changes.add))
+					triggerHook(hookCallbacks.add, Object.keys(changes.add))
 				}, 0)
-			else emitNotification(listeners.add, Object.keys(changes.add))
+			else triggerHook(hookCallbacks.add, Object.keys(changes.add))
 		}
 
 		// Changes
@@ -249,7 +244,7 @@ const createList = <T extends {}>(
 					if (isMutableSignal(signal)) signal.set(value)
 					else throw new ReadonlySignalError(key, value)
 				}
-				emitNotification(listeners.change, Object.keys(changes.change))
+				triggerHook(hookCallbacks.change, Object.keys(changes.change))
 			})
 		}
 
@@ -257,7 +252,7 @@ const createList = <T extends {}>(
 		if (Object.keys(changes.remove).length) {
 			for (const key in changes.remove) removeProperty(key)
 			order = order.filter(() => true)
-			emitNotification(listeners.remove, Object.keys(changes.remove))
+			triggerHook(hookCallbacks.remove, Object.keys(changes.remove))
 		}
 
 		return changes.changed
@@ -401,7 +396,7 @@ const createList = <T extends {}>(
 				if (!isEqual(newOrder, order)) {
 					order = newOrder
 					notifyWatchers(watchers)
-					emitNotification(listeners.sort, order)
+					triggerHook(hookCallbacks.sort, order)
 				}
 			},
 		},
@@ -473,18 +468,16 @@ const createList = <T extends {}>(
 			},
 		},
 		on: {
-			value: <K extends keyof Notifications>(
-				type: K,
-				listener: Listener<K>,
-			): Cleanup => {
-				listeners[type].add(listener)
+			value: (type: Hook, callback: HookCallback): Cleanup => {
+				hookCallbacks[type] ||= new Set()
+				hookCallbacks[type].add(callback)
 				if (type === 'change' && !ownWatchers.size) {
 					for (const [key, signal] of signals)
 						addOwnWatcher(key, signal)
 				}
 				return () => {
-					listeners[type].delete(listener)
-					if (type === 'change' && !listeners.change.size) {
+					hookCallbacks[type]?.delete(callback)
+					if (type === 'change' && !hookCallbacks.change?.size) {
 						if (ownWatchers.size) {
 							for (const watcher of ownWatchers.values())
 								watcher.stop()

package/archive/memo.ts

@@ -1,5 +1,6 @@
 import {
 	CircularDependencyError,
+	createError,
 	InvalidCallbackError,
 	NullishSignalValueError,
 } from '../src/errors'
@@ -9,9 +10,10 @@ import {
 	notifyWatchers,
 	subscribeActiveWatcher,
 	trackSignalReads,
+	UNSET,
 	type Watcher,
 } from '../src/system'
-import { isObjectOfType, isSyncFunction, toError, UNSET } from '../src/util'
+import { isObjectOfType, isSyncFunction } from '../src/util'
 
 /* === Types === */
 
@@ -69,7 +71,7 @@ const createMemo = <T extends {}>(
 			} catch (e) {
 				// Err track
 				value = UNSET
-				error = toError(e)
+				error = createError(e)
 				computing = false
 				return
 			}

package/archive/state.ts

@@ -3,9 +3,10 @@ import { InvalidCallbackError, NullishSignalValueError } from '../src/errors'
 import {
 	notifyWatchers,
 	subscribeActiveWatcher,
+	UNSET,
 	type Watcher,
 } from '../src/system'
-import { isFunction, isObjectOfType, UNSET } from '../src/util'
+import { isFunction, isObjectOfType } from '../src/util'
 
 /* === Types === */
 

package/archive/store.ts

@@ -10,22 +10,17 @@ import {
 	batchSignalWrites,
 	type Cleanup,
 	createWatcher,
-	emitNotification,
-	type Listener,
-	type Listeners,
-	type Notifications,
+	type HookCallback,
+	type HookCallbacks,
+	type Hook,
 	notifyWatchers,
 	subscribeActiveWatcher,
 	trackSignalReads,
 	type Watcher,
-} from '../src/system'
-import {
-	isFunction,
-	isObjectOfType,
-	isRecord,
-	isSymbol,
 	UNSET,
-} from '../src/util'
+	triggerHook,
+} from '../src/system'
+import { isFunction, isObjectOfType, isRecord, isSymbol } from '../src/util'
 import { isComputed } from './computed'
 import { createList, isList, type List } from './list'
 import { createState, isState, type State } from './state'
@@ -62,7 +57,7 @@ type Store<T extends UnknownRecord> = {
 	sort<U = T[Extract<keyof T, string>]>(
 		compareFn?: (a: U, b: U) => number,
 	): void
-	on<K extends keyof Notifications>(type: K, listener: Listener<K>): Cleanup
+	on(type: Hook, callback: HookCallback): Cleanup
 	remove<K extends Extract<keyof T, string>>(key: K): void
 }
 
@@ -92,11 +87,7 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 	if (initialValue == null) throw new NullishSignalValueError('store')
 
 	const watchers = new Set<Watcher>()
-	const listeners: Omit<Listeners, 'sort'> = {
-		add: new Set<Listener<'add'>>(),
-		change: new Set<Listener<'change'>>(),
-		remove: new Set<Listener<'remove'>>(),
-	}
+	const hookCallbacks: HookCallbacks = {}
 	const signals = new Map<
 		string,
 		MutableSignal<T[Extract<keyof T, string>] & {}>
@@ -131,7 +122,7 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 		const watcher = createWatcher(() => {
 			trackSignalReads(watcher, () => {
 				signal.get() // Subscribe to the signal
-				emitNotification(listeners.change, [key])
+				triggerHook(hookCallbacks.change, [key])
 			})
 		})
 		ownWatchers.set(key, watcher)
@@ -159,11 +150,11 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 		// Set internal states
 		// @ts-expect-error non-matching signal types
 		signals.set(key, signal)
-		if (listeners.change.size) addOwnWatcher(key, signal)
+		if (hookCallbacks.change?.size) addOwnWatcher(key, signal)
 
 		if (single) {
 			notifyWatchers(watchers)
-			emitNotification(listeners.add, [key])
+			triggerHook(hookCallbacks.add, [key])
 		}
 		return true
 	}
@@ -183,7 +174,7 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 
 		if (single) {
 			notifyWatchers(watchers)
-			emitNotification(listeners.remove, [key])
+			triggerHook(hookCallbacks.remove, [key])
 		}
 	}
 
@@ -201,9 +192,9 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 			// Queue initial additions event to allow listeners to be added first
 			if (initialRun)
 				setTimeout(() => {
-					emitNotification(listeners.add, Object.keys(changes.add))
+					triggerHook(hookCallbacks.add, Object.keys(changes.add))
 				}, 0)
-			else emitNotification(listeners.add, Object.keys(changes.add))
+			else triggerHook(hookCallbacks.add, Object.keys(changes.add))
 		}
 
 		// Changes
@@ -220,14 +211,14 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 					if (isMutableSignal(signal)) signal.set(value)
 					else throw new ReadonlySignalError(key, value)
 				}
-				emitNotification(listeners.change, Object.keys(changes.change))
+				triggerHook(hookCallbacks.change, Object.keys(changes.change))
 			})
 		}
 
 		// Removals
 		if (Object.keys(changes.remove).length) {
 			for (const key in changes.remove) removeProperty(key)
-			emitNotification(listeners.remove, Object.keys(changes.remove))
+			triggerHook(hookCallbacks.remove, Object.keys(changes.remove))
 		}
 
 		return changes.changed
@@ -296,19 +287,17 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 			},
 		},
 		on: {
-			value: <K extends keyof Omit<Listeners, 'sort'>>(
-				type: K,
-				listener: Listener<K>,
-			): Cleanup => {
-				listeners[type].add(listener)
+			value: (type: Hook, callback: HookCallback): Cleanup => {
+				hookCallbacks[type] ||= new Set()
+				hookCallbacks[type].add(callback)
 				if (type === 'change' && !ownWatchers.size) {
 					for (const [key, signal] of signals)
 						// @ts-expect-error ignore
 						addOwnWatcher(key, signal)
 				}
 				return () => {
-					listeners[type].delete(listener)
-					if (type === 'change' && !listeners.change.size) {
+					hookCallbacks[type]?.delete(callback)
+					if (type === 'change' && !hookCallbacks.change?.size) {
 						if (ownWatchers.size) {
 							for (const watcher of ownWatchers.values())
 								watcher.stop()

package/archive/task.ts

@@ -1,24 +1,21 @@
 import { isEqual } from '../src/diff'
 import {
 	CircularDependencyError,
+	createError,
 	InvalidCallbackError,
 	NullishSignalValueError,
 } from '../src/errors'
 import {
 	createWatcher,
 	flushPendingReactions,
+	HOOK_CLEANUP,
 	notifyWatchers,
 	subscribeActiveWatcher,
 	trackSignalReads,
+	UNSET,
 	type Watcher,
 } from '../src/system'
-import {
-	isAbortError,
-	isAsyncFunction,
-	isObjectOfType,
-	toError,
-	UNSET,
-} from '../src/util'
+import { isAbortError, isAsyncFunction, isObjectOfType } from '../src/util'
 
 /* === Types === */
 
@@ -78,7 +75,7 @@ const createTask = <T extends {}>(
 		error = undefined
 	}
 	const err = (e: unknown): undefined => {
-		const newError = toError(e)
+		const newError = createError(e)
 		changed =
 			!error ||
 			newError.name !== error.name ||
@@ -102,7 +99,7 @@ const createTask = <T extends {}>(
 		if (watchers.size) notifyWatchers(watchers)
 		else watcher.stop()
 	})
-	watcher.onCleanup(() => {
+	watcher.on(HOOK_CLEANUP, () => {
 		controller?.abort()
 	})