doxum 0.1.41 → 0.1.42

package/README.md

@@ -276,8 +276,8 @@ runtime.dispose();
 
 The stable vocabulary is `read` for a synchronous current value, `select` for a
 `Readable`, and `observe` for declaring a lazy source boundary. `ProjectionRuntime`
-exposes `read`, `select`, `items`, `update`, `batch`, `scope` and `dispose`.
-`ProjectionScope` mirrors `read`, `select`, `items`, `update`, `batch` and `dispose`, plus
+exposes `read`, `select`, `items`, `update`, `batch`, `scope`, `onDispose` and `dispose`.
+`ProjectionScope` mirrors `read`, `select`, `items`, `update`, `batch`, `onDispose` and `dispose`, plus
 `own(definitionOrTree)` for lifecycle ownership of lazy projection definitions.
 
 ### Commands inside a batch
@@ -638,8 +638,40 @@ values. Ordinary source resets preserve retained state when one exists. If a pro
 faults, the Runtime owns recovery, recreates declared state, and performs a reset
 evaluation. Stateless processors use the same recovery path without a state object.
 
+### Projection disposal
+
+`runtime.dispose()`, `scope.dispose()` and Doxum unsubscribe functions are idempotent.
+A parent Runtime ends its scopes, so later component cleanup can safely dispose them
+again. Every subscription registration is independent, including registrations with
+the same callback; an old unsubscribe cannot cancel a later subscription.
+
+`runtime.onDispose(cleanup)` / `scope.onDispose(cleanup)` register synchronous,
+cancellable callbacks. The returned function unregisters that callback without
+executing it. Owner callbacks run in LIFO order; Runtime shutdown runs child scope
+callbacks before its own while all projections remain readable. Cleanup may read
+current values and unsubscribe, but cannot update, batch, subscribe or register new
+resources. Perform domain writes before disposal. After callbacks, consumers and
+producers are released, then source connections; failures do not prevent remaining
+cleanup, and are thrown after disposal completes. Repeated disposal does not retry
+failed callbacks. Reads, commands and new subscriptions still throw after disposal.
+
 ### React
 
+```tsx
+// runtime is owned by the application/service; this Provider owns only its scope.
+<ProjectionProvider runtime={runtime} fallback={<span>Loading…</span>}>
+  <TaskList />
+</ProjectionProvider>
+```
+
+Managed Providers acquire a scope after commit and release it on cleanup. StrictMode
+setup replay creates a fresh scope; runtime replacement also remounts the scoped subtree.
+`useProjectionScope()` returns that scope for `scope.own(...)` and `scope.onDispose(...)`.
+The initial render and SSR render `fallback` (default `null`). For synchronous SSR or
+an externally managed lifetime, use `<ProjectionProvider value={runtimeOrScope}>`;
+this mode only injects the owner and never disposes it. The two modes are mutually
+exclusive. Do not create disposable scopes in `useMemo` or revive a disposed scope.
+
 ```ts
 const task = useProjection(tasks, tasks => tasks.get(taskId), equality);
 const [mode, setMode] = useInput(filter);
@@ -648,8 +680,8 @@ const [selectedRows, updateSelectedRows] = useInput(selection);
 
 `useProjection(projection, selector, equality?)` uses the same keyed selector semantics
 as Core. `useInput` handles both scalar `Input<T>` and `CollectionInput<K,V>`; collection
-updates receive a keyed draft callback. `ProjectionProvider` accepts either a
-`ProjectionRuntime` or `ProjectionScope`.
+updates receive a keyed draft callback. Reading a root projection through a managed
+scope does not transfer its ownership; use `scope.own(...)` for local definitions.
 
 See [projection contracts](docs/projections.md).
 

package/dist/advanced.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_transform = require("./transform-D6njdP3k.cjs");
+const require_transform = require("./transform-BPh55GWO.cjs");
 const require_record = require("./record-ChYUi8PP.cjs");
 //#region core/src/projection/advanced.ts
 const resetCollectionChange = Object.freeze({ kind: "reset" });

package/dist/advanced.d.cts

@@ -1,4 +1,4 @@
-import { c as ProjectionChange, d as CollectionRead, l as CollectionChange, n as KeyedDependencyValues, o as KeyedProjection, s as Projection, t as KeyedDependencies, u as CollectionDraft } from "./dependency-Cbf3C8eJ.cjs";
+import { c as ProjectionChange, d as CollectionRead, l as CollectionChange, n as KeyedDependencyValues, o as KeyedProjection, s as Projection, t as KeyedDependencies, u as CollectionDraft } from "./dependency-D0bo_xe_.cjs";
 
 //#region core/src/projection/collection/change.d.ts
 declare const collectionChange: {

package/dist/advanced.d.ts

@@ -1,4 +1,4 @@
-import { c as ProjectionChange, d as CollectionRead, l as CollectionChange, n as KeyedDependencyValues, o as KeyedProjection, s as Projection, t as KeyedDependencies, u as CollectionDraft } from "./dependency-DzxXGYe1.js";
+import { c as ProjectionChange, d as CollectionRead, l as CollectionChange, n as KeyedDependencyValues, o as KeyedProjection, s as Projection, t as KeyedDependencies, u as CollectionDraft } from "./dependency-BYiwTiBj.js";
 
 //#region core/src/projection/collection/change.d.ts
 declare const collectionChange: {

package/dist/advanced.js

@@ -1,4 +1,4 @@
-import { D as defineProcessor, S as compileProjectionDependencies, _ as assertSynchronous, r as collectionChange, t as createKeyedTransform, w as collectionView } from "./transform-CKJ1ivhz.js";
+import { D as defineProcessor, S as compileProjectionDependencies, _ as assertSynchronous, r as collectionChange, t as createKeyedTransform, w as collectionView } from "./transform-BvDYPUMm.js";
 import { n as isPlainObject } from "./record-B2yRhYsc.js";
 //#region core/src/projection/advanced.ts
 const resetCollectionChange = Object.freeze({ kind: "reset" });

package/dist/{contract-CNR6BS75.d.cts → contract-DovG1Yp-.d.cts}

@@ -509,10 +509,11 @@ type MutationIssue = {
 };
 //#endregion
 //#region core/src/readable.d.ts
+/** Ends one registration at most once; safe after owner disposal. */
 type Unsubscribe = () => void;
 type Readable<TValue> = {
   current(): TValue;
-  revision(): number;
+  revision(): number; /** Each call registers independently, even when the listener function is reused. */
   subscribe(listener: () => void): Unsubscribe;
 };
 //#endregion

package/dist/{contract-COgxO5sv.d.ts → contract-PqdXNaP8.d.ts}

@@ -509,10 +509,11 @@ type MutationIssue = {
 };
 //#endregion
 //#region core/src/readable.d.ts
+/** Ends one registration at most once; safe after owner disposal. */
 type Unsubscribe = () => void;
 type Readable<TValue> = {
   current(): TValue;
-  revision(): number;
+  revision(): number; /** Each call registers independently, even when the listener function is reused. */
   subscribe(listener: () => void): Unsubscribe;
 };
 //#endregion

package/dist/{dependency-DzxXGYe1.d.ts → dependency-BYiwTiBj.d.ts}

@@ -1,4 +1,4 @@
-import { _ as Unsubscribe, b as CollectionImpact, p as Synchronous } from "./contract-COgxO5sv.js";
+import { _ as Unsubscribe, b as CollectionImpact, p as Synchronous } from "./contract-PqdXNaP8.js";
 
 //#region core/src/projection/contract.d.ts
 /** The one processor-facing collection transition protocol. */

package/dist/{dependency-Cbf3C8eJ.d.cts → dependency-D0bo_xe_.d.cts}

@@ -1,4 +1,4 @@
-import { _ as Unsubscribe, b as CollectionImpact, p as Synchronous } from "./contract-CNR6BS75.cjs";
+import { _ as Unsubscribe, b as CollectionImpact, p as Synchronous } from "./contract-DovG1Yp-.cjs";
 
 //#region core/src/projection/contract.d.ts
 /** The one processor-facing collection transition protocol. */

package/dist/{driver-B7RR-VfX.js → driver-B7Hu6D0u.js}

@@ -208,6 +208,20 @@ var AddressIndex = class {
 	}
 };
 //#endregion
+//#region core/src/subscription.ts
+/** Each registration owns its identity, independently of callback reuse. */
+const addListener = (listeners, listener, removed) => {
+	const entry = (...args) => listener(...args);
+	listeners.add(entry);
+	let active = true;
+	return () => {
+		if (!active) return;
+		active = false;
+		listeners.delete(entry);
+		removed?.();
+	};
+};
+//#endregion
 //#region core/src/mutation/changes.ts
 const validated = /* @__PURE__ */ new WeakSet();
 const compareChanges = (a, b) => {
@@ -399,4 +413,4 @@ const installRuntimeWriteDriver = (runtime, driver) => {
 	});
 };
 //#endregion
-export { changeCount as a, AddressIndex as c, invalidValue as d, children as f, validate as g, parent as h, contextOf as i, MutationRejected as l, is as m, installRuntimeWriteDriver as n, decodeChanges as o, contains as p, bindContext as r, sealChanges as s, assertRuntimeWritable as t, fail as u };
+export { validate as _, changeCount as a, addListener as c, fail as d, invalidValue as f, parent as g, is as h, contextOf as i, AddressIndex as l, contains as m, installRuntimeWriteDriver as n, decodeChanges as o, children as p, bindContext as r, sealChanges as s, assertRuntimeWritable as t, MutationRejected as u };

package/dist/{driver-CN3dGxQI.cjs → driver-i4G4iVX0.cjs}

@@ -208,6 +208,20 @@ var AddressIndex = class {
 	}
 };
 //#endregion
+//#region core/src/subscription.ts
+/** Each registration owns its identity, independently of callback reuse. */
+const addListener = (listeners, listener, removed) => {
+	const entry = (...args) => listener(...args);
+	listeners.add(entry);
+	let active = true;
+	return () => {
+		if (!active) return;
+		active = false;
+		listeners.delete(entry);
+		removed?.();
+	};
+};
+//#endregion
 //#region core/src/mutation/changes.ts
 const validated = /* @__PURE__ */ new WeakSet();
 const compareChanges = (a, b) => {
@@ -411,6 +425,12 @@ Object.defineProperty(exports, "MutationRejected", {
 		return MutationRejected;
 	}
 });
+Object.defineProperty(exports, "addListener", {
+	enumerable: true,
+	get: function() {
+		return addListener;
+	}
+});
 Object.defineProperty(exports, "assertRuntimeWritable", {
 	enumerable: true,
 	get: function() {

package/dist/index.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_transform = require("./transform-D6njdP3k.cjs");
+const require_transform = require("./transform-BPh55GWO.cjs");
 const require_record = require("./record-ChYUi8PP.cjs");
-const require_driver = require("./driver-CN3dGxQI.cjs");
+const require_driver = require("./driver-i4G4iVX0.cjs");
 //#region core/src/schema/model.ts
 const schemaNodeOf = (schema) => schema;
 const collectionEntryNode = (node) => node.kind === "map" || node.kind === "table" || node.kind === "list" ? node.value : void 0;
@@ -1623,10 +1623,7 @@ const createHistory = (input) => {
 			revision: () => revision,
 			subscribe: (listener) => {
 				if (disposed) throw new DocumentDisposedError();
-				listeners.add(listener);
-				return () => {
-					listeners.delete(listener);
-				};
+				return require_driver.addListener(listeners, listener);
 			},
 			undo: () => {
 				input.assertIdle();
@@ -2297,6 +2294,7 @@ const addRoot = (notification, listener) => {
 	};
 	notification.root.add(entry);
 	return () => {
+		if (!entry.active) return;
 		entry.active = false;
 		if (!notification.notifying) notification.root.delete(entry);
 		else notification.cleanups.add(() => {
@@ -2670,7 +2668,9 @@ const select = (document, selector, equality = Object.is) => {
 		};
 	};
 	const installSubscription = () => {
-		unsubscribeDocument?.();
+		const stop = unsubscribeDocument;
+		unsubscribeDocument = void 0;
+		stop?.();
 		unsubscribeDocument = dependencies.length > 0 ? context.notifications.subscribeTargets(dependencies, () => {
 			const result = evaluate();
 			if (result.rebound) installSubscription();
@@ -2690,15 +2690,22 @@ const select = (document, selector, equality = Object.is) => {
 		},
 		subscribe: (listener) => {
 			ensureCurrent();
-			listeners.add(listener);
-			if (listeners.size === 1) installSubscription();
-			return () => {
-				listeners.delete(listener);
+			const unsubscribe = require_driver.addListener(listeners, listener, () => {
 				if (!listeners.size) {
-					unsubscribeDocument?.();
+					const stop = unsubscribeDocument;
 					unsubscribeDocument = void 0;
+					stop?.();
 				}
-			};
+			});
+			try {
+				if (listeners.size === 1) installSubscription();
+			} catch (error) {
+				try {
+					unsubscribe();
+				} catch {}
+				throw error;
+			}
+			return unsubscribe;
 		}
 	});
 };
@@ -3688,6 +3695,33 @@ function createValueDerive(dependencies, compute, equality = Object.is) {
 }
 const derive = Object.assign(createValueDerive, { keyed: keyedDerive });
 //#endregion
+//#region core/src/projection/cleanup.ts
+/** Owner-local, cancellable LIFO callbacks. Lifecycle admission stays with the owner. */
+const createCleanupStack = () => {
+	const entries = /* @__PURE__ */ new Set();
+	return {
+		add(callback) {
+			const entry = () => {
+				require_transform.assertSynchronous(callback());
+			};
+			entries.add(entry);
+			return () => {
+				entries.delete(entry);
+			};
+		},
+		drain(failures) {
+			for (const entry of [...entries].reverse()) {
+				if (!entries.delete(entry)) continue;
+				try {
+					entry();
+				} catch (error) {
+					failures.push(error);
+				}
+			}
+		}
+	};
+};
+//#endregion
 //#region core/src/projection/collection/changes.ts
 /** Net transitions for one consumer's unconsumed interval; bounded by touched keys. */
 const createCollectionChanges = () => {
@@ -4209,8 +4243,7 @@ const createCollectionOutput = (binding) => {
 		},
 		observe: (listener) => {
 			binding.check();
-			observers.add(listener);
-			return () => observers.delete(listener);
+			return require_driver.addListener(observers, listener);
 		},
 		hasConsumers: () => consumers.size > 0,
 		forEachConsumer: (run) => consumers.forEach((_pending, consumer) => run(consumer)),
@@ -4242,8 +4275,7 @@ const createCollectionOutput = (binding) => {
 		},
 		subscribe: (listener) => {
 			binding.check();
-			listeners.add(listener);
-			return () => listeners.delete(listener);
+			return require_driver.addListener(listeners, listener);
 		}
 	};
 };
@@ -4358,8 +4390,7 @@ const createValueOutput = (binding) => {
 		},
 		observe: (listener) => {
 			binding.check();
-			observers.add(listener);
-			return () => observers.delete(listener);
+			return require_driver.addListener(observers, listener);
 		},
 		hasConsumers: () => consumers.size > 0,
 		forEachConsumer: (run) => consumers.forEach((_revision, consumer) => run(consumer)),
@@ -4388,8 +4419,7 @@ const createValueOutput = (binding) => {
 		},
 		subscribe: (listener) => {
 			binding.check();
-			listeners.add(listener);
-			return () => listeners.delete(listener);
+			return require_driver.addListener(listeners, listener);
 		}
 	};
 };
@@ -4593,7 +4623,7 @@ const selectionAffects = (selection, change) => {
 const createDirectReadable = (source) => Object.freeze({
 	current: source.current,
 	revision: source.revision,
-	subscribe: (listener) => source.subscribe(() => listener())
+	subscribe: source.subscribe
 });
 /** Consumer-side selector tracking; it never mutates processor dependencies. */
 const createSelectorReadable = (source, selector, equality = Object.is) => {
@@ -4697,15 +4727,22 @@ const createSelectorReadable = (source, selector, equality = Object.is) => {
 		},
 		subscribe: (listener) => {
 			ensureCurrent();
-			listeners.add(listener);
-			installSource();
-			return () => {
-				listeners.delete(listener);
-				if (!listeners.size && unsubscribeSource) {
-					unsubscribeSource();
+			const unsubscribe = require_driver.addListener(listeners, listener, () => {
+				if (!listeners.size) {
+					const stop = unsubscribeSource;
 					unsubscribeSource = void 0;
+					stop?.();
 				}
-			};
+			});
+			try {
+				installSource();
+			} catch (error) {
+				try {
+					unsubscribe();
+				} catch {}
+				throw error;
+			}
+			return unsubscribe;
 		}
 	});
 };
@@ -6003,7 +6040,7 @@ const createSourceRegistry = (scheduler) => {
 //#endregion
 //#region core/src/projection/readable/keyed.ts
 /** Runtime-owned keyed consumer family over one materialized collection output. */
-const createProjectionItems = (source, checkOwner) => {
+const createProjectionItems = (source, checkOwner, checkSubscription) => {
 	if (source.kind !== "collection") throw new TypeError("Projection items require a keyed collection projection.");
 	let disposed = false;
 	const active = /* @__PURE__ */ new Map();
@@ -6132,12 +6169,12 @@ const createProjectionItems = (source, checkOwner) => {
 			subscribe: (listener) => {
 				check();
 				ensureObserved();
-				state.listeners.add(listener);
-				if (!state.tracked && !state.ended) registerWaiting(state);
-				return () => {
-					state.listeners.delete(listener);
+				checkSubscription();
+				const unsubscribe = require_driver.addListener(state.listeners, listener, () => {
 					if (!state.listeners.size && !state.tracked) unregisterWaiting(state);
-				};
+				});
+				if (!state.tracked && !state.ended) registerWaiting(state);
+				return unsubscribe;
 			}
 		});
 		return state;
@@ -6194,8 +6231,8 @@ const createProjectionItems = (source, checkOwner) => {
 		},
 		subscribe: (listener) => {
 			check();
-			keyListeners.add(listener);
-			return () => keyListeners.delete(listener);
+			checkSubscription();
+			return require_driver.addListener(keyListeners, listener);
 		}
 	});
 	return {
@@ -6203,6 +6240,7 @@ const createProjectionItems = (source, checkOwner) => {
 			keys,
 			get: (key) => {
 				check();
+				checkSubscription();
 				const current = source.current();
 				if (source.revision() !== settledRevision) pendingKeys.add(key);
 				const canonical = active.get(key);
@@ -6247,6 +6285,7 @@ const createProjectionRuntime = (options) => {
 	const materialized = /* @__PURE__ */ new WeakMap();
 	const publicViews = /* @__PURE__ */ new WeakMap();
 	const scopes = /* @__PURE__ */ new Set();
+	const cleanups = createCleanupStack();
 	const rootItems = /* @__PURE__ */ new Map();
 	const disposeItemControllers = (registry, failures) => {
 		const controllers = [...registry.values()];
@@ -6276,7 +6315,7 @@ const createProjectionRuntime = (options) => {
 		const owner = definition.owner;
 		if (owner === void 0) return;
 		if (owner !== requester) throw new TypeError("Projection belongs to another scope.");
-		if (!requester?.active) throw new require_transform.ProjectionDisposedError();
+		if (requester?.status === "disposed") throw new require_transform.ProjectionDisposedError();
 	};
 	const rememberScoped = (definition, requester) => {
 		if (requester && definition.owner === requester) requester.materialized.push(definition);
@@ -6356,25 +6395,33 @@ const createProjectionRuntime = (options) => {
 				assertOutput(output);
 				return output.revision();
 			},
-			subscribe: output.subscribe,
-			observe: output.observe
+			subscribe: (listener) => {
+				scheduler.assertCommand();
+				return output.subscribe(listener);
+			},
+			observe: (listener) => {
+				scheduler.assertCommand();
+				return output.observe(listener);
+			}
 		});
 	};
 	const projectionItems = (projection, requester) => {
+		scheduler.assertCommand();
 		const output = resolveOutput(projection, requester);
 		if (output.kind !== "collection") throw new TypeError("Projection items require a keyed collection projection.");
 		const registry = requester?.items ?? rootItems;
 		const existing = registry.get(output);
 		if (existing) return existing.items;
 		const controller = createProjectionItems(readableSource(projection, requester), () => {
-			if (requester && !requester.active) throw new require_transform.ProjectionDisposedError();
+			if (requester?.status === "disposed") throw new require_transform.ProjectionDisposedError();
 			scheduler.ensureCurrent(output);
 			assertOutput(output);
-		});
+		}, scheduler.assertCommand);
 		registry.set(output, controller);
 		return controller.items;
 	};
 	const makeReadable = (projection, selector, equality, requester) => {
+		scheduler.assertCommand();
 		const source = readableSource(projection, requester);
 		return selector ? createSelectorReadable(source, selector, equality) : createDirectReadable(source);
 	};
@@ -6382,8 +6429,8 @@ const createProjectionRuntime = (options) => {
 		return makeReadable(projection, selector, equality);
 	}
 	const inputAccess = (target, requester) => {
-		scheduler.assertIdle();
-		if (requester && !requester.active) throw new require_transform.ProjectionDisposedError();
+		scheduler.assertCommand();
+		if (requester?.status === "disposed") throw new require_transform.ProjectionDisposedError();
 		const ref = require_transform.projectionRef(target);
 		if (ref.output !== 0 || ref.producer.kind !== "source") throw new TypeError("Projection is not an input.");
 		if (ref.producer.source.kind !== "value-input" && ref.producer.source.kind !== "collection-input") throw new TypeError("Projection is not an input.");
@@ -6404,11 +6451,9 @@ const createProjectionRuntime = (options) => {
 		updateInput(target, valueOrRun);
 	}
 	const batch = (run, options) => scheduler.batch(run, options);
-	const disposeScope = (state) => {
-		if (!state.active) return;
-		scheduler.assertIdle();
-		state.active = false;
-		const failures = [];
+	const releaseScope = (state, failures) => {
+		state.status = "disposed";
+		scopes.delete(state);
 		disposeScopeConsumers(state, failures);
 		for (let index = state.materialized.length - 1; index >= 0; index--) {
 			const definition = state.materialized[index];
@@ -6423,24 +6468,38 @@ const createProjectionRuntime = (options) => {
 			}
 		}
 		state.materialized.length = 0;
-		scopes.delete(state);
+	};
+	const disposeScope = (state) => {
+		if (state.status !== "active") return;
+		scheduler.assertCommand();
+		state.status = "closing";
+		const failures = [];
+		try {
+			scheduler.cleanup(() => state.cleanups.drain(failures));
+		} catch (error) {
+			failures.push(error);
+		} finally {
+			scheduler.releaseOwned(() => releaseScope(state, failures));
+		}
 		throwCleanupFailures(failures, "Projection scope cleanup failed.");
 	};
 	const createScope = () => {
-		scheduler.assertIdle();
+		scheduler.assertCommand();
 		const state = {
-			active: true,
+			status: "active",
+			cleanups: createCleanupStack(),
 			materialized: [],
 			subscriptions: /* @__PURE__ */ new Set(),
 			items: /* @__PURE__ */ new Map()
 		};
 		scopes.add(state);
 		const assertActive = () => {
-			if (!state.active) throw new require_transform.ProjectionDisposedError();
+			if (state.status === "disposed") throw new require_transform.ProjectionDisposedError();
 			scheduler.assertActive();
 		};
 		function own(target) {
 			assertActive();
+			scheduler.assertCommand();
 			const projections = [];
 			const collect = (value) => {
 				if (require_transform.isProjection(value)) {
@@ -6510,6 +6569,11 @@ const createProjectionRuntime = (options) => {
 			},
 			update: scopeUpdate,
 			batch: scopeBatch,
+			onDispose: (callback) => {
+				assertActive();
+				scheduler.assertCommand();
+				return state.cleanups.add(callback);
+			},
 			dispose: () => disposeScope(state)
 		});
 	};
@@ -6520,24 +6584,33 @@ const createProjectionRuntime = (options) => {
 		update,
 		batch,
 		scope: createScope,
+		onDispose: (callback) => {
+			scheduler.assertCommand();
+			return cleanups.add(callback);
+		},
 		dispose: () => {
-			if (!scheduler.active) return;
-			scheduler.assertIdle();
+			if (!scheduler.beginClose()) return;
 			const failures = [];
-			for (const scope of scopes) {
-				scope.active = false;
-				disposeScopeConsumers(scope, failures);
-				scope.materialized.length = 0;
-			}
-			scopes.clear();
-			disposeItemControllers(rootItems, failures);
+			const owned = [...scopes].reverse();
+			for (const scope of owned) scope.status = "closing";
 			try {
-				sources.dispose();
+				scheduler.cleanup(() => {
+					for (const scope of owned) scope.cleanups.drain(failures);
+					cleanups.drain(failures);
+				});
 			} catch (error) {
 				failures.push(error);
 			}
 			try {
-				scheduler.dispose();
+				scheduler.dispose(() => {
+					for (const scope of owned) {
+						scope.status = "disposed";
+						scope.materialized.length = 0;
+						disposeScopeConsumers(scope, failures);
+					}
+					scopes.clear();
+					disposeItemControllers(rootItems, failures);
+				}, sources.dispose);
 			} catch (error) {
 				failures.push(error);
 			}

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { $ as table, A as ParseError, B as DocumentListConfig, C as Read, D as ChangeSet, E as Change, F as CollectionPath, G as ReadonlyValue, H as DocumentTreeValue, I as PathValueOf, J as field, K as Schema, L as SchemaPath, M as parse, N as CollectionEntry, O as MemberChange, P as CollectionId, Q as optional, R as DocumentAddress, S as Draft, T as snapshot, U as Infer, V as DocumentTreeNode, W as ObjectSchema, X as map, Y as list, Z as object, _ as Unsubscribe, a as DocumentProblem, b as CollectionImpact, c as HistoryState, d as OperationResult, et as tree, f as ReadonlyDocument, g as Readable, h as TransactionResult, i as DocumentDisposedError, j as ParseIssue, k as ValueTransition, l as LocalHistory, m as TransactionRejected, n as DocumentCommit, o as DocumentReentrancyError, p as Synchronous, q as Validator, r as DocumentDiagnostic, s as DocumentRuntime, t as CommitSource, tt as variant, u as ObserverError, v as MutationIssue, w as replace, x as DocumentImpact, y as MutationIssueCode, z as DocumentAnchor } from "./contract-CNR6BS75.cjs";
-import { _ as ProjectionDisposedError, a as Input, f as ExternalCollectionEvent, g as ExternalValueSource, h as ExternalValueEvent, i as CollectionInputDraft, m as ExternalCollectionSource, n as KeyedDependencyValues, o as KeyedProjection, p as ExternalCollectionRead, r as CollectionInput, s as Projection, t as KeyedDependencies, v as ProjectionError } from "./dependency-Cbf3C8eJ.cjs";
+import { $ as table, A as ParseError, B as DocumentListConfig, C as Read, D as ChangeSet, E as Change, F as CollectionPath, G as ReadonlyValue, H as DocumentTreeValue, I as PathValueOf, J as field, K as Schema, L as SchemaPath, M as parse, N as CollectionEntry, O as MemberChange, P as CollectionId, Q as optional, R as DocumentAddress, S as Draft, T as snapshot, U as Infer, V as DocumentTreeNode, W as ObjectSchema, X as map, Y as list, Z as object, _ as Unsubscribe, a as DocumentProblem, b as CollectionImpact, c as HistoryState, d as OperationResult, et as tree, f as ReadonlyDocument, g as Readable, h as TransactionResult, i as DocumentDisposedError, j as ParseIssue, k as ValueTransition, l as LocalHistory, m as TransactionRejected, n as DocumentCommit, o as DocumentReentrancyError, p as Synchronous, q as Validator, r as DocumentDiagnostic, s as DocumentRuntime, t as CommitSource, tt as variant, u as ObserverError, v as MutationIssue, w as replace, x as DocumentImpact, y as MutationIssueCode, z as DocumentAnchor } from "./contract-DovG1Yp-.cjs";
+import { _ as ProjectionDisposedError, a as Input, f as ExternalCollectionEvent, g as ExternalValueSource, h as ExternalValueEvent, i as CollectionInputDraft, m as ExternalCollectionSource, n as KeyedDependencyValues, o as KeyedProjection, p as ExternalCollectionRead, r as CollectionInput, s as Projection, t as KeyedDependencies, v as ProjectionError } from "./dependency-D0bo_xe_.cjs";
 
 //#region core/src/runtime.d.ts
 declare const createDocument: <S extends ObjectSchema<object>>(input: {
@@ -119,6 +119,7 @@ type ProjectionRuntime = {
     readonly cause?: unknown;
   }): T;
   scope(): ProjectionScope;
+  onDispose<R>(cleanup: () => Synchronous<R>): Unsubscribe;
   dispose(): void;
 };
 type ProjectionOwnershipTree = {
@@ -136,6 +137,7 @@ type ProjectionScope = {
   batch<T>(run: () => Synchronous<T>, options?: {
     readonly cause?: unknown;
   }): T;
+  onDispose<R>(cleanup: () => Synchronous<R>): Unsubscribe;
   dispose(): void;
 };
 declare const createProjectionRuntime: (options?: {

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { $ as table, A as ParseError, B as DocumentListConfig, C as Read, D as ChangeSet, E as Change, F as CollectionPath, G as ReadonlyValue, H as DocumentTreeValue, I as PathValueOf, J as field, K as Schema, L as SchemaPath, M as parse, N as CollectionEntry, O as MemberChange, P as CollectionId, Q as optional, R as DocumentAddress, S as Draft, T as snapshot, U as Infer, V as DocumentTreeNode, W as ObjectSchema, X as map, Y as list, Z as object, _ as Unsubscribe, a as DocumentProblem, b as CollectionImpact, c as HistoryState, d as OperationResult, et as tree, f as ReadonlyDocument, g as Readable, h as TransactionResult, i as DocumentDisposedError, j as ParseIssue, k as ValueTransition, l as LocalHistory, m as TransactionRejected, n as DocumentCommit, o as DocumentReentrancyError, p as Synchronous, q as Validator, r as DocumentDiagnostic, s as DocumentRuntime, t as CommitSource, tt as variant, u as ObserverError, v as MutationIssue, w as replace, x as DocumentImpact, y as MutationIssueCode, z as DocumentAnchor } from "./contract-COgxO5sv.js";
-import { _ as ProjectionDisposedError, a as Input, f as ExternalCollectionEvent, g as ExternalValueSource, h as ExternalValueEvent, i as CollectionInputDraft, m as ExternalCollectionSource, n as KeyedDependencyValues, o as KeyedProjection, p as ExternalCollectionRead, r as CollectionInput, s as Projection, t as KeyedDependencies, v as ProjectionError } from "./dependency-DzxXGYe1.js";
+import { $ as table, A as ParseError, B as DocumentListConfig, C as Read, D as ChangeSet, E as Change, F as CollectionPath, G as ReadonlyValue, H as DocumentTreeValue, I as PathValueOf, J as field, K as Schema, L as SchemaPath, M as parse, N as CollectionEntry, O as MemberChange, P as CollectionId, Q as optional, R as DocumentAddress, S as Draft, T as snapshot, U as Infer, V as DocumentTreeNode, W as ObjectSchema, X as map, Y as list, Z as object, _ as Unsubscribe, a as DocumentProblem, b as CollectionImpact, c as HistoryState, d as OperationResult, et as tree, f as ReadonlyDocument, g as Readable, h as TransactionResult, i as DocumentDisposedError, j as ParseIssue, k as ValueTransition, l as LocalHistory, m as TransactionRejected, n as DocumentCommit, o as DocumentReentrancyError, p as Synchronous, q as Validator, r as DocumentDiagnostic, s as DocumentRuntime, t as CommitSource, tt as variant, u as ObserverError, v as MutationIssue, w as replace, x as DocumentImpact, y as MutationIssueCode, z as DocumentAnchor } from "./contract-PqdXNaP8.js";
+import { _ as ProjectionDisposedError, a as Input, f as ExternalCollectionEvent, g as ExternalValueSource, h as ExternalValueEvent, i as CollectionInputDraft, m as ExternalCollectionSource, n as KeyedDependencyValues, o as KeyedProjection, p as ExternalCollectionRead, r as CollectionInput, s as Projection, t as KeyedDependencies, v as ProjectionError } from "./dependency-BYiwTiBj.js";
 
 //#region core/src/runtime.d.ts
 declare const createDocument: <S extends ObjectSchema<object>>(input: {
@@ -119,6 +119,7 @@ type ProjectionRuntime = {
     readonly cause?: unknown;
   }): T;
   scope(): ProjectionScope;
+  onDispose<R>(cleanup: () => Synchronous<R>): Unsubscribe;
   dispose(): void;
 };
 type ProjectionOwnershipTree = {
@@ -136,6 +137,7 @@ type ProjectionScope = {
   batch<T>(run: () => Synchronous<T>, options?: {
     readonly cause?: unknown;
   }): T;
+  onDispose<R>(cleanup: () => Synchronous<R>): Unsubscribe;
   dispose(): void;
 };
 declare const createProjectionRuntime: (options?: {