@zeix/cause-effect 0.17.2 → 0.17.3

package/archive/list.ts

@@ -7,16 +7,9 @@ import {
 } from '../src/errors'
 import { isMutableSignal, type MutableSignal } from '../src/signal'
 import {
-	batchSignalWrites,
-	type Cleanup,
-	createWatcher,
-	type Hook,
-	type HookCallback,
-	type HookCallbacks,
+	batch,
 	notifyWatchers,
 	subscribeActiveWatcher,
-	trackSignalReads,
-	triggerHook,
 	UNSET,
 	type Watcher,
 } from '../src/system'
@@ -63,7 +56,6 @@ 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(type: Hook, callback: HookCallback): Cleanup
 	remove(index: number): void
 }
 
@@ -90,7 +82,6 @@ const createList = <T extends {}>(
 	if (initialValue == null) throw new NullishSignalValueError('store')
 
 	const watchers = new Set<Watcher>()
-	const hookCallbacks: HookCallbacks = {}
 	const signals = new Map<string, MutableSignal<T>>()
 	const ownWatchers = new Map<string, Watcher>()
 
@@ -153,17 +144,6 @@ const createList = <T extends {}>(
 		return true
 	}
 
-	// Add own watcher for nested signal
-	const addOwnWatcher = (key: string, signal: MutableSignal<T>) => {
-		const watcher = createWatcher(() => {
-			trackSignalReads(watcher, () => {
-				signal.get() // Subscribe to the signal
-				triggerHook(hookCallbacks.change, [key])
-			})
-		})
-		ownWatchers.set(key, watcher)
-	}
-
 	// Add nested signal and own watcher
 	const addProperty = <K extends keyof T & string>(
 		key: K,
@@ -185,12 +165,9 @@ const createList = <T extends {}>(
 		// @ts-expect-error ignore
 		signals.set(key, signal)
 		if (!order.includes(key)) order.push(key)
-		// @ts-expect-error ignore
-		if (hookCallbacks.change?.size) addOwnWatcher(key, signal)
 
 		if (single) {
 			notifyWatchers(watchers)
-			triggerHook(hookCallbacks.add, [key])
 		}
 		return true
 	}
@@ -213,29 +190,21 @@ const createList = <T extends {}>(
 		if (single) {
 			order = order.filter(() => true) // Compact array
 			notifyWatchers(watchers)
-			triggerHook(hookCallbacks.remove, [key])
 		}
 	}
 
 	// Commit batched changes and emit notifications
-	const batchChanges = (changes: DiffResult, initialRun?: boolean) => {
+	const batchChanges = (changes: DiffResult) => {
 		// Additions
 		if (Object.keys(changes.add).length) {
 			for (const key in changes.add)
 				// @ts-expect-error ignore
 				addProperty(key, changes.add[key] as T, false)
-
-			// Queue initial additions event to allow listeners to be added first
-			if (initialRun)
-				setTimeout(() => {
-					triggerHook(hookCallbacks.add, Object.keys(changes.add))
-				}, 0)
-			else triggerHook(hookCallbacks.add, Object.keys(changes.add))
 		}
 
 		// Changes
 		if (Object.keys(changes.change).length) {
-			batchSignalWrites(() => {
+			batch(() => {
 				for (const key in changes.change) {
 					const value = changes.change[key] as T
 					if (!isValidValue(key, value)) continue
@@ -244,7 +213,6 @@ const createList = <T extends {}>(
 					if (isMutableSignal(signal)) signal.set(value)
 					else throw new ReadonlySignalError(key, value)
 				}
-				triggerHook(hookCallbacks.change, Object.keys(changes.change))
 			})
 		}
 
@@ -252,25 +220,17 @@ const createList = <T extends {}>(
 		if (Object.keys(changes.remove).length) {
 			for (const key in changes.remove) removeProperty(key)
 			order = order.filter(() => true)
-			triggerHook(hookCallbacks.remove, Object.keys(changes.remove))
 		}
 
 		return changes.changed
 	}
 
 	// Reconcile data and dispatch events
-	const reconcile = (
-		oldValue: T[],
-		newValue: T[],
-		initialRun?: boolean,
-	): boolean =>
-		batchChanges(
-			diff(arrayToRecord(oldValue), arrayToRecord(newValue)),
-			initialRun,
-		)
+	const reconcile = (oldValue: T[], newValue: T[]): boolean =>
+		batchChanges(diff(arrayToRecord(oldValue), arrayToRecord(newValue)))
 
 	// Initialize data
-	reconcile([] as T[], initialValue, true)
+	reconcile([] as T[], initialValue)
 
 	// Methods and Properties
 	const prototype: Record<PropertyKey, unknown> = {}
@@ -396,7 +356,6 @@ const createList = <T extends {}>(
 				if (!isEqual(newOrder, order)) {
 					order = newOrder
 					notifyWatchers(watchers)
-					triggerHook(hookCallbacks.sort, order)
 				}
 			},
 		},
@@ -467,26 +426,6 @@ const createList = <T extends {}>(
 				return Object.values(remove) as T[]
 			},
 		},
-		on: {
-			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 () => {
-					hookCallbacks[type]?.delete(callback)
-					if (type === 'change' && !hookCallbacks.change?.size) {
-						if (ownWatchers.size) {
-							for (const watcher of ownWatchers.values())
-								watcher.stop()
-							ownWatchers.clear()
-						}
-					}
-				}
-			},
-		},
 	})
 
 	// Return proxy directly with integrated signal methods

package/archive/memo.ts

@@ -6,10 +6,9 @@ import {
 } from '../src/errors'
 import {
 	createWatcher,
-	flushPendingReactions,
+	flush,
 	notifyWatchers,
 	subscribeActiveWatcher,
-	trackSignalReads,
 	UNSET,
 	type Watcher,
 } from '../src/system'
@@ -54,15 +53,13 @@ const createMemo = <T extends {}>(
 	let computing = false
 
 	// Own watcher: called when notified from sources (push)
-	const watcher = createWatcher(() => {
-		dirty = true
-		if (watchers.size) notifyWatchers(watchers)
-		else watcher.stop()
-	})
-
-	// Called when requested by dependencies (pull)
-	const compute = () =>
-		trackSignalReads(watcher, () => {
+	const watcher = createWatcher(
+		() => {
+			dirty = true
+			if (watchers.size) notifyWatchers(watchers)
+			else watcher.stop()
+		},
+		() => {
 			if (computing) throw new CircularDependencyError('memo')
 			let result: T
 			computing = true
@@ -87,7 +84,8 @@ const createMemo = <T extends {}>(
 				dirty = false
 			}
 			computing = false
-		})
+		},
+	)
 
 	const memo: Record<PropertyKey, unknown> = {}
 	Object.defineProperties(memo, {
@@ -97,8 +95,9 @@ const createMemo = <T extends {}>(
 		get: {
 			value: (): T => {
 				subscribeActiveWatcher(watchers)
-				flushPendingReactions()
-				if (dirty) compute()
+				flush()
+
+				if (dirty) watcher.run()
 				if (error) throw error
 				return value
 			},

package/archive/store.ts

@@ -7,18 +7,11 @@ import {
 } from '../src/errors'
 import { isMutableSignal, type MutableSignal } from '../src/signal'
 import {
-	batchSignalWrites,
-	type Cleanup,
-	createWatcher,
-	type HookCallback,
-	type HookCallbacks,
-	type Hook,
+	batch,
 	notifyWatchers,
 	subscribeActiveWatcher,
-	trackSignalReads,
-	type Watcher,
 	UNSET,
-	triggerHook,
+	type Watcher,
 } from '../src/system'
 import { isFunction, isObjectOfType, isRecord, isSymbol } from '../src/util'
 import { isComputed } from './computed'
@@ -57,7 +50,6 @@ type Store<T extends UnknownRecord> = {
 	sort<U = T[Extract<keyof T, string>]>(
 		compareFn?: (a: U, b: U) => number,
 	): void
-	on(type: Hook, callback: HookCallback): Cleanup
 	remove<K extends Extract<keyof T, string>>(key: K): void
 }
 
@@ -87,7 +79,6 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 	if (initialValue == null) throw new NullishSignalValueError('store')
 
 	const watchers = new Set<Watcher>()
-	const hookCallbacks: HookCallbacks = {}
 	const signals = new Map<
 		string,
 		MutableSignal<T[Extract<keyof T, string>] & {}>
@@ -114,20 +105,6 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 		return true
 	}
 
-	// Add own watcher for nested signal
-	const addOwnWatcher = <K extends keyof T & string>(
-		key: K,
-		signal: MutableSignal<T[K] & {}>,
-	) => {
-		const watcher = createWatcher(() => {
-			trackSignalReads(watcher, () => {
-				signal.get() // Subscribe to the signal
-				triggerHook(hookCallbacks.change, [key])
-			})
-		})
-		ownWatchers.set(key, watcher)
-	}
-
 	// Add nested signal and effect
 	const addProperty = <K extends keyof T & string>(
 		key: K,
@@ -150,11 +127,9 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 		// Set internal states
 		// @ts-expect-error non-matching signal types
 		signals.set(key, signal)
-		if (hookCallbacks.change?.size) addOwnWatcher(key, signal)
 
 		if (single) {
 			notifyWatchers(watchers)
-			triggerHook(hookCallbacks.add, [key])
 		}
 		return true
 	}
@@ -174,12 +149,11 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 
 		if (single) {
 			notifyWatchers(watchers)
-			triggerHook(hookCallbacks.remove, [key])
 		}
 	}
 
 	// Commit batched changes and emit notifications
-	const batchChanges = (changes: DiffResult, initialRun?: boolean) => {
+	const batchChanges = (changes: DiffResult) => {
 		// Additions
 		if (Object.keys(changes.add).length) {
 			for (const key in changes.add)
@@ -188,18 +162,11 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 					changes.add[key] as T[Extract<keyof T, string>] & {},
 					false,
 				)
-
-			// Queue initial additions event to allow listeners to be added first
-			if (initialRun)
-				setTimeout(() => {
-					triggerHook(hookCallbacks.add, Object.keys(changes.add))
-				}, 0)
-			else triggerHook(hookCallbacks.add, Object.keys(changes.add))
 		}
 
 		// Changes
 		if (Object.keys(changes.change).length) {
-			batchSignalWrites(() => {
+			batch(() => {
 				for (const key in changes.change) {
 					const value = changes.change[key] as T[Extract<
 						keyof T,
@@ -211,28 +178,23 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 					if (isMutableSignal(signal)) signal.set(value)
 					else throw new ReadonlySignalError(key, value)
 				}
-				triggerHook(hookCallbacks.change, Object.keys(changes.change))
 			})
 		}
 
 		// Removals
 		if (Object.keys(changes.remove).length) {
 			for (const key in changes.remove) removeProperty(key)
-			triggerHook(hookCallbacks.remove, Object.keys(changes.remove))
 		}
 
 		return changes.changed
 	}
 
 	// Reconcile data and dispatch events
-	const reconcile = (
-		oldValue: T,
-		newValue: T,
-		initialRun?: boolean,
-	): boolean => batchChanges(diff(oldValue, newValue), initialRun)
+	const reconcile = (oldValue: T, newValue: T): boolean =>
+		batchChanges(diff(oldValue, newValue))
 
 	// Initialize data
-	reconcile({} as T, initialValue, true)
+	reconcile({} as T, initialValue)
 
 	// Methods and Properties
 	const prototype: Record<PropertyKey, unknown> = {}
@@ -286,27 +248,6 @@ const createStore = <T extends UnknownRecord>(initialValue: T): Store<T> => {
 				store.set(fn(current()))
 			},
 		},
-		on: {
-			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 () => {
-					hookCallbacks[type]?.delete(callback)
-					if (type === 'change' && !hookCallbacks.change?.size) {
-						if (ownWatchers.size) {
-							for (const watcher of ownWatchers.values())
-								watcher.stop()
-							ownWatchers.clear()
-						}
-					}
-				}
-			},
-		},
 	})
 
 	// Return proxy directly with integrated signal methods

package/archive/task.ts

@@ -7,11 +7,9 @@ import {
 } from '../src/errors'
 import {
 	createWatcher,
-	flushPendingReactions,
-	HOOK_CLEANUP,
+	flush,
 	notifyWatchers,
 	subscribeActiveWatcher,
-	trackSignalReads,
 	UNSET,
 	type Watcher,
 } from '../src/system'
@@ -93,19 +91,14 @@ const createTask = <T extends {}>(
 		}
 
 	// Own watcher: called when notified from sources (push)
-	const watcher = createWatcher(() => {
-		dirty = true
-		controller?.abort()
-		if (watchers.size) notifyWatchers(watchers)
-		else watcher.stop()
-	})
-	watcher.on(HOOK_CLEANUP, () => {
-		controller?.abort()
-	})
-
-	// Called when requested by dependencies (pull)
-	const compute = () =>
-		trackSignalReads(watcher, () => {
+	const watcher = createWatcher(
+		() => {
+			dirty = true
+			controller?.abort()
+			if (watchers.size) notifyWatchers(watchers)
+			else watcher.stop()
+		},
+		() => {
 			if (computing) throw new CircularDependencyError('computed')
 			changed = false
 			// Return current value until promise resolves
@@ -117,7 +110,7 @@ const createTask = <T extends {}>(
 				() => {
 					computing = false
 					controller = undefined
-					compute() // Retry computation with updated state
+					watcher.run() // Retry computation with updated state
 				},
 				{
 					once: true,
@@ -138,7 +131,11 @@ const createTask = <T extends {}>(
 			else if (null == result || UNSET === result) nil()
 			else ok(result)
 			computing = false
-		})
+		},
+	)
+	watcher.onCleanup(() => {
+		controller?.abort()
+	})
 
 	const task: Record<PropertyKey, unknown> = {}
 	Object.defineProperties(task, {
@@ -148,8 +145,9 @@ const createTask = <T extends {}>(
 		get: {
 			value: (): T => {
 				subscribeActiveWatcher(watchers)
-				flushPendingReactions()
-				if (dirty) compute()
+				flush()
+
+				if (dirty) watcher.run()
 				if (error) throw error
 				return value
 			},