doxum 0.1.6 → 0.1.7

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_runtime = require("./runtime-CRijXjYp.cjs");
+const require_runtime = require("./runtime-0mOFbe_H.cjs");
 const require_ownership = require("./ownership-CY0nPXGF.cjs");
 const require_driver = require("./driver-CNxqMVFH.cjs");
 //#region core/src/impact.ts
@@ -89,78 +89,170 @@ const createImpact = (input) => {
 //#endregion
 //#region core/src/history.ts
 const createHistory = (input) => {
-	const undos = [];
-	const redos = [];
+	let undos = [];
+	let redos = [];
 	const listeners = /* @__PURE__ */ new Set();
 	let state = Object.freeze({
 		undoDepth: 0,
 		redoDepth: 0
 	});
-	const current = () => {
-		if (state.undoDepth !== undos.length || state.redoDepth !== redos.length) state = Object.freeze({
+	let revision = 0;
+	let pending = false;
+	let disposed = false;
+	let group;
+	const unchanged = () => ({
+		status: "unchanged",
+		revision: input.revision()
+	});
+	const publish = () => {
+		if (state.undoDepth === undos.length && state.redoDepth === redos.length) return;
+		state = Object.freeze({
 			undoDepth: undos.length,
 			redoDepth: redos.length
 		});
-		return state;
+		revision++;
+		pending = true;
 	};
-	const emit = () => {
-		if (listeners.size === 0) return;
-		current();
-		Array.from(listeners).forEach((listener) => listener());
+	const flush = () => {
+		if (!pending) return [];
+		pending = false;
+		const errors = [];
+		for (const listener of [...listeners]) {
+			if (!listeners.has(listener)) continue;
+			try {
+				listener();
+			} catch (error) {
+				errors.push({
+					phase: "listener",
+					error
+				});
+			}
+		}
+		return errors;
 	};
 	const clear = () => {
-		if (undos.length || redos.length) {
-			undos.length = 0;
-			redos.length = 0;
-			emit();
+		group = void 0;
+		undos.length = redos.length = 0;
+		publish();
+	};
+	const travel = (direction) => {
+		input.assertIdle();
+		const from = direction === "redo" ? redos : undos;
+		const to = direction === "redo" ? undos : redos;
+		const previousUndos = undos;
+		const previousRedos = redos;
+		const entry = direction === "cancel" ? from.at(-1) : from.pop();
+		if (!entry) return unchanged();
+		if (direction === "cancel") {
+			if (!group || group.entry !== entry) throw new Error("History group no longer owns its entry.");
+			undos = group.undos;
+			redos = group.redos;
+		} else to.push(entry);
+		let committed = false;
+		try {
+			const operations = direction === "redo" ? entry.batches.flatMap((batch) => batch.operations) : entry.batches.slice().reverse().flatMap((batch) => batch.inverse);
+			const result = input.apply(operations);
+			committed = result.status !== "rejected";
+			if (committed && direction === "cancel") group = void 0;
+			if (result.status === "unchanged") {
+				publish();
+				const errors = input.notify(flush);
+				if (errors.length) throw new AggregateError(errors.map((entry) => entry.error), "History listeners failed.");
+			}
+			return result;
+		} finally {
+			if (!committed) if (direction === "cancel") {
+				undos = previousUndos;
+				redos = previousRedos;
+			} else {
+				to.pop();
+				from.push(entry);
+			}
 		}
 	};
 	return {
 		api: {
-			current,
+			current: () => state,
+			revision: () => revision,
 			subscribe: (listener) => {
+				if (disposed) throw new require_runtime.DocumentDisposedError();
 				listeners.add(listener);
-				return () => listeners.delete(listener);
+				return () => {
+					listeners.delete(listener);
+				};
 			},
 			undo: () => {
-				const entry = undos.pop();
-				if (!entry) return {
-					status: "unchanged",
-					revision: input.revision()
-				};
-				const result = input.apply(entry.inverse);
-				if (result.status === "committed") {
-					redos.push(entry);
-					emit();
-				} else undos.push(entry);
-				return result;
+				input.assertIdle();
+				group = void 0;
+				return travel("undo");
 			},
 			redo: () => {
-				const entry = redos.pop();
-				if (!entry) return {
-					status: "unchanged",
-					revision: input.revision()
-				};
-				const result = input.apply(entry.operations);
-				if (result.status === "committed") {
-					undos.push(entry);
-					emit();
-				} else redos.push(entry);
-				return result;
+				input.assertIdle();
+				group = void 0;
+				return travel("redo");
 			},
-			clear
+			clear: () => {
+				input.assertIdle();
+				clear();
+				const errors = input.notify(flush);
+				if (errors.length) throw new AggregateError(errors.map((entry) => entry.error), "History listeners failed.");
+			},
+			group: () => {
+				input.assertIdle();
+				if (group) throw new Error("A history group is already active.");
+				if (input.capacity <= 0) throw new Error("History is disabled.");
+				const scope = {
+					undos: undos.slice(),
+					redos: redos.slice()
+				};
+				group = scope;
+				return Object.freeze({
+					end: () => {
+						input.assertIdle();
+						if (group === scope) group = void 0;
+					},
+					cancel: () => {
+						input.assertIdle();
+						if (group !== scope) return unchanged();
+						if (!scope.entry) {
+							group = void 0;
+							return unchanged();
+						}
+						const result = travel("cancel");
+						if (result.status !== "rejected") group = void 0;
+						return result;
+					}
+				});
+			}
 		},
 		record: (operations, inverse) => {
 			if (input.capacity <= 0) return;
-			undos.push({
+			const batch = {
 				operations,
 				inverse
-			});
-			if (undos.length > input.capacity) undos.shift();
+			};
+			if (group?.entry) group.entry.batches.push(batch);
+			else {
+				const entry = { batches: [batch] };
+				undos.push(entry);
+				if (group) group.entry = entry;
+				if (undos.length > input.capacity) undos.shift();
+			}
 			redos.length = 0;
-			emit();
+			publish();
+		},
+		publish,
+		flush,
+		endGroup: () => {
+			group = void 0;
 		},
-		invalidate: clear
+		invalidate: clear,
+		dispose: () => {
+			disposed = true;
+			listeners.clear();
+			clear();
+			pending = false;
+		}
 	};
 };
 //#endregion
@@ -180,7 +272,7 @@ const writerFor = (node, inputAddress, sink) => {
 			at: address
 		}) : void 0
 	};
-	if (node.kind === "dict" || node.kind === "record") return {
+	if (node.kind === "dict") return {
 		set: (key, value) => emit(sink, {
 			type: "dict.set",
 			at: address,
@@ -233,20 +325,20 @@ const writerFor = (node, inputAddress, sink) => {
 		}) } : {}
 	};
 	if (node.kind === "tree") return {
-		insert: (treeNodeId, value, parentId, index) => emit(sink, {
+		insert: (treeNodeId, value, position) => emit(sink, {
 			type: "tree.insert",
 			at: address,
 			treeNodeId,
 			value,
-			parentId,
-			index
+			parentId: position?.parentId,
+			index: position?.index
 		}),
-		move: (treeNodeId, parentId, index) => emit(sink, {
+		move: (treeNodeId, position) => emit(sink, {
 			type: "tree.move",
 			at: address,
 			treeNodeId,
-			parentId,
-			index
+			parentId: position?.parentId,
+			index: position?.index
 		}),
 		remove: (treeNodeId) => emit(sink, {
 			type: "tree.remove",
@@ -330,7 +422,6 @@ const writerFor = (node, inputAddress, sink) => {
 			})
 		};
 	}
-	if (node.kind === "single") return writerFor(node.value, address, sink);
 	if (node.kind === "variant") return {
 		replace: (value) => emit(sink, {
 			type: "variant.replace",
@@ -356,69 +447,15 @@ const documentWriter = (schema, sink) => writerFor(schemaRoot(schema), [], sink)
 //#endregion
 //#region core/src/mutation/issue.ts
 const ownAddress$1 = (address) => Object.freeze(address.slice());
-const at$1 = (address, code, message, operation) => Object.freeze({
+const at = (address, code, message, operation) => Object.freeze({
 	source: "mutation",
 	code,
 	address: ownAddress$1(address),
 	message,
 	...operation === void 0 ? {} : { operation }
 });
-const from = (operation, code, message) => at$1(operation.at, code, message, operation.type);
-const input = (code, message) => at$1([], code, message);
-//#endregion
-//#region core/src/mutation/anchor.ts
-const length = (keys) => keys.length;
-const keyAt = (keys, index) => Array.isArray(keys) ? keys[index] : keys.at(index);
-const keyIndex = (keys, key) => Array.isArray(keys) ? keys.indexOf(key) : keys.index(key);
-const keys = (values, keyOf) => ({
-	length: values.length,
-	at: (index) => index >= 0 && index < values.length ? keyOf(values[index]) : void 0,
-	index: (key) => {
-		for (let index = 0; index < values.length; index += 1) if (keyOf(values[index]) === key) return index;
-		return -1;
-	}
-});
-const index = (keys, anchor) => {
-	if (!anchor) return length(keys);
-	if ("at" in anchor) return anchor.at === "start" ? 0 : length(keys);
-	if ("before" in anchor) return keyIndex(keys, anchor.before);
-	return keyIndex(keys, anchor.after) + 1;
-};
-const at = (keys, position) => position <= 0 ? { at: "start" } : { after: keyAt(keys, position - 1) };
-const valid = (keys, anchor) => {
-	if (!anchor) return true;
-	if (typeof anchor !== "object" || anchor === null) return false;
-	if (Number("at" in anchor) + Number("before" in anchor) + Number("after" in anchor) !== 1) return false;
-	if ("at" in anchor) return anchor.at === "start" || anchor.at === "end";
-	return keyIndex(keys, "before" in anchor ? anchor.before : anchor.after) >= 0;
-};
-const afterRemove = (keys, removedIndex, anchor) => {
-	const position = index(keys, anchor);
-	return position > removedIndex ? position - 1 : position;
-};
-const validPositions = (length, positions) => {
-	let previous = -1;
-	for (let index = 0; index < positions.length; index += 1) {
-		const position = positions[index];
-		if (!Number.isInteger(position) || position < 0 || position <= previous || position > length + index) return false;
-		previous = position;
-	}
-	return true;
-};
-const restore = (keys, inserted, positions) => {
-	const currentLength = keys.length;
-	if (inserted.length !== positions.length || !validPositions(currentLength, positions)) throw new Error("Ordered restore positions are invalid.");
-	let readIndex = currentLength - 1;
-	let insertedIndex = inserted.length - 1;
-	keys.length = currentLength + inserted.length;
-	for (let writeIndex = keys.length - 1; writeIndex >= 0; writeIndex -= 1) if (insertedIndex >= 0 && positions[insertedIndex] === writeIndex) {
-		keys[writeIndex] = inserted[insertedIndex];
-		insertedIndex -= 1;
-	} else {
-		keys[writeIndex] = keys[readIndex];
-		readIndex -= 1;
-	}
-};
+const from = (operation, code, message) => at(operation.at, code, message, operation.type);
+const input = (code, message) => at([], code, message);
 //#endregion
 //#region core/src/mutation/execute-entity.ts
 const resolveEntityCollection = (node, value) => {
@@ -463,13 +500,13 @@ const executeEntity = (target, operation, copyPayload) => {
 		}
 		if (collection.kind === "map" && (operation.anchor || operation.positions)) return rejected$4(operation, "invalid-anchor", "Map entries do not support ordering metadata.");
 		if (ids && operation.positions) {
-			if (operation.positions.length !== operation.entries.length || !validPositions(ids.length, operation.positions)) return rejected$4(operation, "invalid-operation", "Entity restore positions are invalid.");
-		} else if (ids && !valid(ids, operation.anchor)) return rejected$4(operation, "invalid-anchor", "Collection anchor is invalid.");
+			if (operation.positions.length !== operation.entries.length || !require_runtime.validPositions(ids.length, operation.positions)) return rejected$4(operation, "invalid-operation", "Entity restore positions are invalid.");
+		} else if (ids && !require_runtime.valid(ids, operation.anchor)) return rejected$4(operation, "invalid-anchor", "Collection anchor is invalid.");
 		for (const entry of operation.entries) byId[entry.id] = copyPayload ? require_ownership.cloneValue(entry.value, "canonical") : require_ownership.transferPayload(entry.value);
-		if (ids) if (operation.positions) restore(ids, operation.entries.map((entry) => entry.id), operation.positions);
+		if (ids) if (operation.positions) require_runtime.restore(ids, operation.entries.map((entry) => entry.id), operation.positions);
 		else if (!operation.anchor || "at" in operation.anchor && operation.anchor.at === "end") for (const entry of operation.entries) ids.push(entry.id);
 		else {
-			const insertion = index(ids, operation.anchor);
+			const insertion = require_runtime.index(ids, operation.anchor);
 			const currentLength = ids.length;
 			ids.length = currentLength + operation.entries.length;
 			for (let index = currentLength - 1; index >= insertion; index -= 1) ids[index + operation.entries.length] = ids[index];
@@ -535,15 +572,15 @@ const executeEntity = (target, operation, copyPayload) => {
 	const position = ids?.indexOf(operation.id) ?? -1;
 	if (!exists) return rejected$4(operation, "missing-entity", `Entity '${operation.id}' does not exist.`);
 	if (!ids || position < 0) return rejected$4(operation, "invalid-collection", `Collection index is missing '${operation.id}'.`);
-	if (!valid(ids, operation.anchor)) return rejected$4(operation, "invalid-anchor", "Collection anchor is invalid.");
+	if (!require_runtime.valid(ids, operation.anchor)) return rejected$4(operation, "invalid-anchor", "Collection anchor is invalid.");
 	if (operation.anchor && ("before" in operation.anchor && operation.anchor.before === operation.id || "after" in operation.anchor && operation.anchor.after === operation.id)) return rejected$4(operation, "invalid-anchor", "An entity cannot be moved relative to itself.");
-	const nextIndex = afterRemove(ids, position, operation.anchor);
+	const nextIndex = require_runtime.afterRemove(ids, position, operation.anchor);
 	if (nextIndex === position) return { status: "unchanged" };
 	const inverse = {
 		type: "entity.move",
 		at: operation.at,
 		id: operation.id,
-		anchor: at(ids, position)
+		anchor: require_runtime.at(ids, position)
 	};
 	ids.splice(position, 1);
 	ids.splice(nextIndex, 0, operation.id);
@@ -564,7 +601,7 @@ const executeList = (target, operation, copyPayload) => {
 	if (!Array.isArray(target.value) && !absent) return rejected$3(operation, "invalid-address", "List target is invalid.");
 	if (absent && operation.type !== "list.replace") return rejected$3(operation, "invalid-address", "Only list replacement can initialize an optional list.");
 	const list = Array.isArray(target.value) ? target.value : [];
-	const orderedKeys = keys(list, target.node.keyOf);
+	const orderedKeys = require_runtime.keys(list, target.node.keyOf);
 	const own = (value) => copyPayload ? require_ownership.ownPayload(value) : value;
 	if (operation.type === "list.replace") {
 		if (operation.keys.length !== operation.value.length) return rejected$3(operation, "invalid-list-keys", "List replacement keys are invalid.");
@@ -599,8 +636,8 @@ const executeList = (target, operation, copyPayload) => {
 	if (operation.type === "list.insert") {
 		if (target.node.keyOf(operation.value) !== operation.key) return rejected$3(operation, "invalid-list-key", "List item key does not match schema.");
 		if (orderedKeys.index(operation.key) >= 0) return rejected$3(operation, "duplicate-list-item", `List item '${operation.key}' already exists.`);
-		if (!valid(orderedKeys, operation.anchor)) return rejected$3(operation, "invalid-anchor", "List anchor is invalid.");
-		list.splice(index(orderedKeys, operation.anchor), 0, own(operation.value));
+		if (!require_runtime.valid(orderedKeys, operation.anchor)) return rejected$3(operation, "invalid-anchor", "List anchor is invalid.");
+		list.splice(require_runtime.index(orderedKeys, operation.anchor), 0, own(operation.value));
 		return {
 			status: "changed",
 			inverse: [{
@@ -618,7 +655,7 @@ const executeList = (target, operation, copyPayload) => {
 			at: operation.at,
 			key: operation.key,
 			value: require_ownership.cloneValue(list[position], "inverse"),
-			anchor: at(orderedKeys, position)
+			anchor: require_runtime.at(orderedKeys, position)
 		};
 		list.splice(position, 1);
 		return {
@@ -626,15 +663,15 @@ const executeList = (target, operation, copyPayload) => {
 			inverse: [inverse]
 		};
 	}
-	if (!valid(orderedKeys, operation.anchor)) return rejected$3(operation, "invalid-anchor", "List anchor is invalid.");
+	if (!require_runtime.valid(orderedKeys, operation.anchor)) return rejected$3(operation, "invalid-anchor", "List anchor is invalid.");
 	if (operation.anchor && ("before" in operation.anchor && operation.anchor.before === operation.key || "after" in operation.anchor && operation.anchor.after === operation.key)) return rejected$3(operation, "invalid-anchor", "A list item cannot be moved relative to itself.");
-	const nextIndex = afterRemove(orderedKeys, position, operation.anchor);
+	const nextIndex = require_runtime.afterRemove(orderedKeys, position, operation.anchor);
 	if (nextIndex === position) return { status: "unchanged" };
 	const inverse = {
 		type: "list.move",
 		at: operation.at,
 		key: operation.key,
-		anchor: at(orderedKeys, position)
+		anchor: require_runtime.at(orderedKeys, position)
 	};
 	const [entry] = list.splice(position, 1);
 	list.splice(nextIndex, 0, entry);
@@ -817,7 +854,7 @@ const changeChanged = (change, value) => {
 	return false;
 };
 const is = (value) => require_ownership.isRecord(value) && require_ownership.isRecord(value.nodes);
-const contains$1 = (tree, id) => has$1(tree.nodes, id);
+const contains = (tree, id) => has$1(tree.nodes, id);
 const validate = (value) => {
 	if (!is(value)) return false;
 	const ids = Object.keys(value.nodes);
@@ -859,7 +896,6 @@ const documentTreeError = (node, value, address) => {
 		}
 		return;
 	}
-	if (node.kind === "single") return documentTreeError(node.value, value, address);
 	if (node.kind === "variant") {
 		if (!require_ownership.isRecord(value) || typeof value[node.tag] !== "string") return void 0;
 		const variant = node.variants[value[node.tag]];
@@ -898,7 +934,7 @@ const replace = (current, operation) => {
 	};
 };
 const insert = (tree, operation, value) => {
-	if (contains$1(tree, operation.treeNodeId)) return rejected$2("duplicate-tree-node", `Tree node '${operation.treeNodeId}' already exists.`);
+	if (contains(tree, operation.treeNodeId)) return rejected$2("duplicate-tree-node", `Tree node '${operation.treeNodeId}' already exists.`);
 	if (!validIndex(operation.index)) return rejected$2("invalid-tree-index", "Tree index is invalid.");
 	if (tree.rootId === void 0) {
 		if (operation.parentId !== void 0) return rejected$2("missing-tree-parent", `Tree parent '${operation.parentId}' does not exist.`);
@@ -1023,9 +1059,8 @@ const move = (tree, operation) => {
 	if (!currentParent || parentId === void 0) return rejected$2("invalid-tree", "Tree parent links are inconsistent.");
 	const originalIndex = childIndex(currentParent, operation.treeNodeId);
 	if (originalIndex < 0) return rejected$2("invalid-tree", "Tree parent links are inconsistent.");
-	let nextIndex = Math.min(operation.index ?? nextParent.children.length, nextParent.children.length);
 	currentParent.children.splice(originalIndex, 1);
-	if (parentId === operation.parentId && nextIndex > originalIndex) nextIndex -= 1;
+	const nextIndex = Math.min(operation.index ?? nextParent.children.length, nextParent.children.length);
 	if (parentId === operation.parentId && nextIndex === originalIndex) {
 		currentParent.children.splice(originalIndex, 0, operation.treeNodeId);
 		return { status: "unchanged" };
@@ -1129,6 +1164,16 @@ const executeValue = (target, operation, copyPayload) => {
 	}
 	if (operation.type === "variant.replace") {
 		if (require_ownership.sameStructuralValue(target.value, operation.value)) return { status: "unchanged" };
+		if (target.value === void 0 && target.node.optional) {
+			target.parent[target.key] = own(operation.value);
+			return {
+				status: "changed",
+				inverse: [{
+					type: "value.clear",
+					at: operation.at
+				}]
+			};
+		}
 		const inverse = {
 			type: "variant.replace",
 			at: operation.at,
@@ -1207,7 +1252,7 @@ const executeClear = (target, operation) => {
 		issue: from(operation, "required-field", "Only optional values can be cleared.")
 	};
 	if (!hasOwn$1(target.parent, target.key)) return { status: "unchanged" };
-	if (target.node.kind !== "field" && target.node.kind !== "variant" && target.node.kind !== "dict" && target.node.kind !== "record" && target.node.kind !== "list" && target.node.kind !== "tree") return {
+	if (target.node.kind !== "field" && target.node.kind !== "variant" && target.node.kind !== "dict" && target.node.kind !== "list" && target.node.kind !== "tree") return {
 		status: "rejected",
 		issue: from(operation, "invalid-operation", "This optional value has no clear operation.")
 	};
@@ -1223,8 +1268,7 @@ const executeClear = (target, operation) => {
 				at: operation.at,
 				value: require_ownership.cloneValue(target.value, "inverse")
 			};
-			case "dict":
-			case "record": return {
+			case "dict": return {
 				type: "dict.replace",
 				at: operation.at,
 				value: require_ownership.cloneValue(target.value, "inverse")
@@ -1263,7 +1307,7 @@ const execute = (root, operation, target, copyPayload) => {
 	if (operation.type === "value.clear") return !target ? invalidTarget(operation) : executeClear(target, operation);
 	if (operation.type === "field.set" || operation.type === "field.clear") return !target || target.node.kind !== "field" ? invalidTarget(operation) : executeValue(target, operation, copyPayload);
 	if (operation.type === "variant.replace") return !target || target.node.kind !== "variant" ? invalidTarget(operation) : executeValue(target, operation, copyPayload);
-	if (operation.type === "dict.set" || operation.type === "dict.delete" || operation.type === "dict.replace") return !target || target.node.kind !== "dict" && target.node.kind !== "record" ? invalidTarget(operation) : executeValue(target, operation, copyPayload);
+	if (operation.type === "dict.set" || operation.type === "dict.delete" || operation.type === "dict.replace") return !target || target.node.kind !== "dict" ? invalidTarget(operation) : executeValue(target, operation, copyPayload);
 	if (operation.type === "entity.create" || operation.type === "entity.remove" || operation.type === "entity.move") return !target || target.node.kind !== "table" && target.node.kind !== "map" ? invalidTarget(operation) : executeEntity(target, operation, copyPayload);
 	if (operation.type === "list.insert" || operation.type === "list.move" || operation.type === "list.remove" || operation.type === "list.replace") return !target || target.node.kind !== "list" ? invalidTarget(operation) : executeList(target, operation, copyPayload);
 	if (operation.type === "tree.insert" || operation.type === "tree.move" || operation.type === "tree.remove" || operation.type === "tree.set" || operation.type === "tree.replace") return !target || target.node.kind !== "tree" ? invalidTarget(operation) : executeTree(root, target, operation, copyPayload);
@@ -1276,7 +1320,7 @@ const execute = (root, operation, target, copyPayload) => {
 //#region core/src/mutation/journal.ts
 const indexNode = () => ({ children: /* @__PURE__ */ new Map() });
 const hasOwn = (value, key) => Object.prototype.hasOwnProperty.call(value, key);
-const sameAddress$1 = (left, right) => {
+const sameAddress = (left, right) => {
 	if (left.length !== right.length) return false;
 	for (let index = 0; index < left.length; index += 1) if (left[index] !== right[index]) return false;
 	return true;
@@ -1375,7 +1419,7 @@ const restoreEntity = (value, subject) => {
 };
 const restoreRootSubject = (value, subject) => {
 	if (subject.kind === "value") return subject.before.status === "present" ? subject.before.value : void 0;
-	if (subject.kind === "variant") return subject.before;
+	if (subject.kind === "variant") return subject.before.status === "present" ? subject.before.value : void 0;
 	if (subject.kind === "dict") {
 		if (require_ownership.isRecord(value)) restoreDict(value, subject.state);
 		return value;
@@ -1391,14 +1435,14 @@ const restoreRootSubject = (value, subject) => {
 	return restoreChange(value, subject.state);
 };
 const restoreSubject = (value, prefix, subject) => {
-	if (sameAddress$1(prefix, subject.address)) return restoreRootSubject(value, subject);
+	if (sameAddress(prefix, subject.address)) return restoreRootSubject(value, subject);
 	const address = subject.address.slice(prefix.length);
 	if (subject.kind === "value") {
 		writePresence(value, address, subject.before);
 		return value;
 	}
 	if (subject.kind === "variant") {
-		writeContainer(value, address, subject.before);
+		writePresence(value, address, subject.before);
 		return value;
 	}
 	const current = require_runtime.read(value, address);
@@ -1499,7 +1543,11 @@ const analyzeEntity = (root, subject) => {
 };
 const subjectChanged = (root, subject) => {
 	if (subject.kind === "value") return valueChanged(root, subject);
-	if (subject.kind === "variant") return !require_ownership.sameStructuralValue(subject.before, require_runtime.read(root, subject.address));
+	if (subject.kind === "variant") {
+		const target = require_runtime.locate(root, subject.address);
+		const exists = !!target && hasOwn(target.parent, target.key);
+		return subject.before.status === "absent" ? exists : !exists || !require_ownership.sameStructuralValue(subject.before.value, target?.value);
+	}
 	if (subject.kind === "dict") return dictChanged(root, subject);
 	if (subject.kind === "list") return listChanged(root, subject);
 	return changeChanged(subject.state, require_runtime.read(root, subject.address));
@@ -1508,13 +1556,13 @@ const listOrderBefore = (value, node, inverse) => {
 	const order = value.map(node.keyOf);
 	if (inverse.type === "list.remove") return order.filter((key) => key !== inverse.key);
 	if (inverse.type === "list.insert") {
-		order.splice(index(order, inverse.anchor), 0, inverse.key);
+		order.splice(require_runtime.index(order, inverse.anchor), 0, inverse.key);
 		return order;
 	}
 	if (inverse.type === "list.move") {
 		const position = order.indexOf(inverse.key);
 		if (position >= 0) order.splice(position, 1);
-		order.splice(index(order, inverse.anchor), 0, inverse.key);
+		order.splice(require_runtime.index(order, inverse.anchor), 0, inverse.key);
 	}
 	return order;
 };
@@ -1556,12 +1604,12 @@ const restoreEntityOrder = (order, inverses) => {
 			continue;
 		}
 		if (inverse.kind === "restore") {
-			restore(order, inverse.ids, inverse.positions);
+			require_runtime.restore(order, inverse.ids, inverse.positions);
 			continue;
 		}
 		const position = order.indexOf(inverse.id);
-		if (position < 0 || !valid(order, inverse.anchor)) throw new Error(`Entity order inverse cannot restore '${inverse.id}'.`);
-		const nextIndex = afterRemove(order, position, inverse.anchor);
+		if (position < 0 || !require_runtime.valid(order, inverse.anchor)) throw new Error(`Entity order inverse cannot restore '${inverse.id}'.`);
+		const nextIndex = require_runtime.afterRemove(order, position, inverse.anchor);
 		order.splice(position, 1);
 		order.splice(nextIndex, 0, inverse.id);
 	}
@@ -1618,7 +1666,7 @@ const createChangeJournal = (root) => {
 		const candidates = buckets.get(addressHash) ?? [];
 		for (const subject of candidates) {
 			require_ownership.profile.journal.comparison();
-			if (subject.kind === kind && sameAddress$1(subject.address, address)) return subject;
+			if (subject.kind === kind && sameAddress(subject.address, address)) return subject;
 		}
 	}
 	const ownerOf = (address) => {
@@ -1661,11 +1709,11 @@ const createChangeJournal = (root) => {
 	const recordVariant = (resolved, operation, inverse) => {
 		if (find("variant", operation.at, resolved.addressHash)) return;
 		const first = inverse[0];
-		if (first?.type !== "variant.replace") return inverseMismatch(operation);
+		if (first?.type !== "variant.replace" && first?.type !== "value.clear") return inverseMismatch(operation);
 		add({
 			...base(resolved, operation),
 			kind: "variant",
-			before: absorb(first.value, operation.at)
+			before: first.type === "value.clear" ? absent : present(absorb(first.value, operation.at))
 		});
 	};
 	const recordDict = (resolved, operation, inverse) => {
@@ -1829,6 +1877,10 @@ const createChangeJournal = (root) => {
 		record: (resolved, operation, inverse) => {
 			require_ownership.profile.batch.journalRecord();
 			if (ownerOf(operation.at)) return;
+			if (operation.type === "value.clear" && resolved.node.kind === "variant") {
+				recordVariant(resolved, operation, inverse);
+				return;
+			}
 			if (operation.type === "field.set" || operation.type === "field.clear" || operation.type === "value.clear") {
 				recordValue(resolved, operation, inverse);
 				return;
@@ -1870,7 +1922,7 @@ const createChangeJournal = (root) => {
 			const changeAt = (address, addressHash) => {
 				const candidates = collectionBuckets.get(addressHash) ?? [];
 				collectionBuckets.set(addressHash, candidates);
-				let change = candidates.find((entry) => sameAddress$1(entry.address, address));
+				let change = candidates.find((entry) => sameAddress(entry.address, address));
 				if (!change) {
 					change = {
 						address,
@@ -1914,7 +1966,7 @@ const createChangeJournal = (root) => {
 const has = (value, key) => Object.prototype.hasOwnProperty.call(value, key);
 const stringArray = (value) => Array.isArray(value) && value.every((entry) => typeof entry === "string");
 const positions = (value) => Array.isArray(value) && value.every((entry) => Number.isInteger(entry) && entry >= 0);
-const address$1 = (value) => stringArray(value);
+const address = (value) => stringArray(value);
 const anchor = (value) => {
 	if (!require_ownership.isRecord(value)) return false;
 	if (Number(has(value, "at")) + Number(has(value, "before")) + Number(has(value, "after")) !== 1) return false;
@@ -1935,7 +1987,7 @@ const rejected = (code, message) => ({
 });
 const decode = (input) => {
 	if (!require_ownership.isRecord(input)) return rejected("invalid-operation", "Operation must be an object.");
-	if (!address$1(input.at)) return rejected("invalid-address", "Operation address is malformed.");
+	if (!address(input.at)) return rejected("invalid-address", "Operation address is malformed.");
 	if (typeof input.type !== "string") return rejected("invalid-operation", "Operation type must be a string.");
 	switch (input.type) {
 		case "field.set":
@@ -2111,192 +2163,6 @@ const mutateOperations = (root, schema, operations, options = {}) => {
 	return session.finish();
 };
 //#endregion
-//#region core/src/mutation/footprint.ts
-const sameAddress = (left, right) => left.length === right.length && left.every((segment, index) => segment === right[index]);
-const containsAddress = (parent, child) => parent.length <= child.length && parent.every((segment, index) => segment === child[index]);
-const address = (value) => Array.isArray(value) && value.every((segment) => typeof segment === "string") ? Object.freeze(value.slice()) : void 0;
-const targetKey = (target) => {
-	const at = target.at.join("\0");
-	if (target.kind === "dictionary-key" || target.kind === "list-item") return `${target.kind}:${at}:${target.key}`;
-	if (target.kind === "entity" || target.kind === "tree-node") return `${target.kind}:${at}:${target.id}`;
-	return `${target.kind}:${at}`;
-};
-const freezeTarget = (target) => Object.freeze({
-	...target,
-	at: Object.freeze(target.at.slice())
-});
-const add = (targets, target) => {
-	const stable = freezeTarget(target);
-	targets.set(targetKey(stable), stable);
-};
-const commandFootprint = (operations) => {
-	const targets = /* @__PURE__ */ new Map();
-	for (const operation of operations) switch (operation.type) {
-		case "field.set":
-		case "field.clear":
-		case "value.clear":
-		case "variant.replace":
-			add(targets, {
-				kind: "value",
-				at: operation.at
-			});
-			break;
-		case "dict.replace":
-			add(targets, {
-				kind: "dictionary",
-				at: operation.at
-			});
-			break;
-		case "dict.set":
-		case "dict.delete":
-			add(targets, {
-				kind: "dictionary-key",
-				at: operation.at,
-				key: operation.key
-			});
-			break;
-		case "entity.create":
-			add(targets, {
-				kind: "collection",
-				at: operation.at
-			});
-			for (const entry of operation.entries) add(targets, {
-				kind: "entity",
-				at: operation.at,
-				id: entry.id
-			});
-			break;
-		case "entity.remove":
-			add(targets, {
-				kind: "collection",
-				at: operation.at
-			});
-			for (const id of operation.ids) add(targets, {
-				kind: "entity",
-				at: operation.at,
-				id
-			});
-			break;
-		case "entity.move":
-			add(targets, {
-				kind: "collection",
-				at: operation.at
-			});
-			add(targets, {
-				kind: "entity",
-				at: operation.at,
-				id: operation.id
-			});
-			break;
-		case "list.insert":
-		case "list.move":
-		case "list.remove":
-			add(targets, {
-				kind: "list",
-				at: operation.at
-			});
-			add(targets, {
-				kind: "list-item",
-				at: operation.at,
-				key: operation.key
-			});
-			break;
-		case "list.replace":
-			add(targets, {
-				kind: "list",
-				at: operation.at
-			});
-			for (const key of operation.keys) add(targets, {
-				kind: "list-item",
-				at: operation.at,
-				key
-			});
-			break;
-		case "tree.insert":
-		case "tree.move":
-		case "tree.remove":
-		case "tree.set":
-			add(targets, {
-				kind: "tree",
-				at: operation.at
-			});
-			add(targets, {
-				kind: "tree-node",
-				at: operation.at,
-				id: operation.treeNodeId
-			});
-			break;
-		case "tree.replace":
-			add(targets, {
-				kind: "tree",
-				at: operation.at
-			});
-			break;
-	}
-	return Object.freeze(Array.from(targets.values()));
-};
-const overlapsValueAndEntity = (value, entity) => containsAddress([...entity.at, entity.id], value.at) || containsAddress(value.at, [...entity.at, entity.id]);
-const targetsOverlap = (left, right) => {
-	if (left.kind === "value" && right.kind === "value") return containsAddress(left.at, right.at) || containsAddress(right.at, left.at);
-	if (left.kind === "value" && right.kind === "entity") return overlapsValueAndEntity(left, right);
-	if (left.kind === "entity" && right.kind === "value") return overlapsValueAndEntity(right, left);
-	if (left.kind === "dictionary" && right.kind === "dictionary") return sameAddress(left.at, right.at);
-	if (left.kind === "dictionary" && right.kind === "dictionary-key") return sameAddress(left.at, right.at);
-	if (left.kind === "dictionary-key" && right.kind === "dictionary") return sameAddress(left.at, right.at);
-	if (left.kind === "dictionary-key" && right.kind === "dictionary-key") return sameAddress(left.at, right.at) && left.key === right.key;
-	if (left.kind === "collection" && right.kind === "collection") return sameAddress(left.at, right.at);
-	if (left.kind === "collection" && right.kind === "entity") return sameAddress(left.at, right.at);
-	if (left.kind === "entity" && right.kind === "collection") return sameAddress(left.at, right.at);
-	if (left.kind === "entity" && right.kind === "entity") return sameAddress(left.at, right.at) && left.id === right.id;
-	if (left.kind === "list" && (right.kind === "list" || right.kind === "list-item")) return sameAddress(left.at, right.at);
-	if (right.kind === "list" && left.kind === "list-item") return sameAddress(left.at, right.at);
-	if (left.kind === "list-item" && right.kind === "list-item") return sameAddress(left.at, right.at) && left.key === right.key;
-	if (left.kind === "tree" && (right.kind === "tree" || right.kind === "tree-node")) return sameAddress(left.at, right.at);
-	if (right.kind === "tree" && left.kind === "tree-node") return sameAddress(left.at, right.at);
-	if (left.kind === "tree-node" && right.kind === "tree-node") return sameAddress(left.at, right.at) && left.id === right.id;
-	return false;
-};
-const footprintsOverlap = (left, right) => left.some((leftTarget) => right.some((rightTarget) => targetsOverlap(leftTarget, rightTarget)));
-const decodedTarget = (value) => {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
-	const record = value;
-	const at = address(record.at);
-	if (!at || typeof record.kind !== "string") return void 0;
-	switch (record.kind) {
-		case "value":
-		case "dictionary":
-		case "collection":
-		case "list":
-		case "tree": return freezeTarget({
-			kind: record.kind,
-			at
-		});
-		case "dictionary-key":
-		case "list-item": return typeof record.key === "string" ? freezeTarget({
-			kind: record.kind,
-			at,
-			key: record.key
-		}) : void 0;
-		case "entity":
-		case "tree-node": return typeof record.id === "string" ? freezeTarget({
-			kind: record.kind,
-			at,
-			id: record.id
-		}) : void 0;
-		default: return;
-	}
-};
-const decodeCommandFootprint = (value) => {
-	if (!Array.isArray(value)) return void 0;
-	const targets = /* @__PURE__ */ new Map();
-	for (const entry of value) {
-		const target = decodedTarget(entry);
-		if (!target) return void 0;
-		targets.set(targetKey(target), target);
-	}
-	return Object.freeze(Array.from(targets.values()));
-};
-//#endregion
 //#region core/src/runtime.ts
 var RejectedUpdate = class extends Error {
 	issues;
@@ -2308,6 +2174,7 @@ var RejectedUpdate = class extends Error {
 const EMPTY = Object.freeze([]);
 const publishDiagnostic = (value) => Object.freeze({
 	...value,
+	source: "application",
 	...value.address === void 0 ? {} : { address: Object.freeze(value.address.slice()) }
 });
 const createDocument = (input) => {
@@ -2368,7 +2235,19 @@ const createDocument = (input) => {
 	const history = createHistory({
 		capacity: input.history === false ? 0 : Math.max(0, input.history?.capacity ?? 100),
 		revision: () => revision,
-		apply: (operations) => applyBatch(operations, "history", false)
+		apply: (operations) => applyBatch(operations, "history", false),
+		assertIdle: () => {
+			if (state.disposed) throw new require_runtime.DocumentDisposedError();
+			if (busy || require_runtime.accessOf(runtime).projectionLocks) throw new require_runtime.DocumentReentrancyError();
+		},
+		notify: (run) => {
+			busy = true;
+			try {
+				return run();
+			} finally {
+				busy = false;
+			}
+		}
 	});
 	const publish = (batch, source, kind, recordHistory) => {
 		revision += 1;
@@ -2382,10 +2261,12 @@ const createDocument = (input) => {
 		});
 		if (kind === "replace" || source === "remote") history.invalidate();
 		else if (recordHistory && (source === "local" || source === "system")) history.record(batch.operations, batch.inverse);
+		else if (source === "history") history.publish();
+		else history.endGroup();
 		busy = true;
 		let observerErrors;
 		try {
-			observerErrors = require_runtime.notify(notification, commit);
+			observerErrors = require_runtime.notify(notification, commit, history.flush);
 		} finally {
 			busy = false;
 		}
@@ -2500,7 +2381,7 @@ const createDocument = (input) => {
 					operations: batch.operations,
 					inverse: batch.inverse,
 					impact,
-					footprint: commandFootprint(batch.operations),
+					footprint: require_runtime.commandFootprint(batch.operations),
 					reports
 				};
 			} catch (error) {
@@ -2528,7 +2409,7 @@ const createDocument = (input) => {
 			const invalidTree = invalidDocument(input.schema, document);
 			if (invalidTree) return {
 				status: "rejected",
-				issues: [at$1(invalidTree, "invalid-tree", "Document replacement contains an invalid tree.")],
+				issues: [at(invalidTree, "invalid-tree", "Document replacement contains an invalid tree.")],
 				revision
 			};
 			if (require_ownership.deepEqual(state.document, document)) return {
@@ -2563,7 +2444,7 @@ const createDocument = (input) => {
 			try {
 				require_runtime.disposeNotification(notification);
 			} finally {
-				history.api.clear();
+				history.dispose();
 				require_driver.disposeRuntimeDriver(runtime);
 			}
 		}
@@ -2571,6 +2452,7 @@ const createDocument = (input) => {
 	require_runtime.bindRuntimeAccess(runtime, state);
 	require_driver.bindRuntimeDriver(runtime);
 	notification = require_runtime.createNotification(runtime);
+	require_runtime.bindDocumentReadable(history.api, runtime);
 	return runtime;
 };
 //#endregion
@@ -2594,26 +2476,16 @@ exports.DocumentReentrancyError = require_runtime.DocumentReentrancyError;
 exports.ProjectionDisposedError = require_runtime.ProjectionDisposedError;
 exports.ProjectionError = require_runtime.ProjectionError;
 exports.asReadable = asReadable;
-exports.commandFootprint = commandFootprint;
-exports.contains = require_runtime.contains;
 exports.createDocument = createDocument;
 exports.createProjectionRuntime = require_runtime.createProjectionRuntime;
-exports.debugKey = require_runtime.debugKey;
-exports.decodeCommandFootprint = decodeCommandFootprint;
 exports.dict = require_runtime.dict;
 exports.field = require_runtime.field;
-exports.footprintsOverlap = footprintsOverlap;
 exports.list = require_runtime.list;
 exports.map = require_runtime.map;
 exports.object = require_runtime.object;
 exports.optional = require_runtime.optional;
-exports.overlaps = require_runtime.overlaps;
-exports.readAddress = require_runtime.read;
-exports.record = require_runtime.record;
-exports.resolveAddress = require_runtime.resolveAddress;
 exports.schema = require_runtime.schema;
 exports.select = select;
-exports.single = require_runtime.single;
 exports.table = require_runtime.table;
 Object.defineProperty(exports, "target", {
 	enumerable: true,