@askrjs/askr 0.0.51 → 0.0.52

package/dist/renderer/component-host.js

@@ -2,173 +2,83 @@ import { _isDOMElement } from "../common/vnode.js";
 import "./types.js";
 import { getCurrentContextFrame, getVNodeContextFrame, markVNodeTreeWithContextFrame, withContext } from "../runtime/context.js";
 import { getCurrentInstance } from "../runtime/component-scope.js";
-import { cleanupComponent } from "../runtime/component-cleanup.js";
 import { isPromiseLike } from "../common/promise.js";
 import { captureInlineRenderSnapshot, createComponentInstance, mountInstanceInline, renderComponentInline, warnUnusedStateReads } from "../runtime/component-internal.js";
 import "../runtime/index.js";
 import { tagNamesEqualIgnoreCase } from "./utils.js";
-import { materializeKey } from "./attributes.js";
-import { normalizeComponentChildren } from "./child-shape.js";
-import { cleanupDetachedComponentHost, pruneComponentHostInstances } from "./component-host-cleanup.js";
+import { materializeFreshKey, materializeKey } from "./attributes.js";
 import { getRendererDOMHost } from "./dom-host.js";
-import { findHostInstanceByType, getVNodeComponentInstance, inheritComponentCleanupStrict, inheritComponentKey, isRouteRootComponentVNode, nextComponentInstanceId, setVNodeComponentInstance } from "./component-host-instances.js";
+import { normalizeComponentChildren } from "./child-shape.js";
+import { pruneComponentHostInstances } from "./component-host-cleanup.js";
+import { findHostInstanceByType, getVNodeComponentInstance, inheritComponentCleanupStrict, inheritComponentKey, isRouteRootComponentVNode, nextComponentInstanceId, restoreVNodeComponentInstance, setComponentOwnershipIdentity, setVNodeComponentInstance } from "./component-host-instances.js";
+import { beginComponentHostReplacement, cleanupProvisionalComponentInstance, createRetainedHostInstanceSet, registerVNodeComponentInstanceRollback } from "./component-host-replacement.js";
+import { materializeComponentResultNode, resolveHostNestedComponentResult, resolveNestedComponentResult, resolveWrapperHostResult } from "./component-host-results.js";
 //#region src/renderer/component-host.ts
-function materializeComponentResultNode(childInstance, result, parentNamespace) {
-	const dom = getRendererDOMHost().createDOMNode(result, parentNamespace);
-	if (dom instanceof Element) {
-		mountInstanceInline(childInstance, dom);
-		return dom;
-	}
-	if (!dom) {
-		const placeholder = document.createComment("");
-		try {
-			placeholder.__ASKR_INSTANCE = childInstance;
-		} catch {}
-		childInstance._placeholder = placeholder;
-		mountInstanceInline(childInstance, null);
-		return placeholder;
-	}
-	const host = document.createElement("div");
-	host.appendChild(dom);
-	host.__ASKR_WRAPPER_HOST = true;
-	mountInstanceInline(childInstance, host);
-	return host;
-}
-function resolveNestedComponentResult(result, snapshot, parentInstance) {
-	let currentResult = result;
-	let activeSnapshot = snapshot;
-	let depth = 0;
-	while (_isDOMElement(currentResult) && typeof currentResult.type === "function" && depth < 16) {
-		const nestedSnapshot = getVNodeContextFrame(currentResult) ?? activeSnapshot;
-		const nestedInstance = createComponentInstance(nextComponentInstanceId(), currentResult.type, currentResult.props ?? {}, null);
-		nestedInstance.isRoot = isRouteRootComponentVNode(currentResult);
-		nestedInstance.parentInstance = parentInstance;
-		nestedInstance.portalScope = parentInstance?.portalScope ?? nestedInstance.portalScope;
-		inheritComponentCleanupStrict(nestedInstance);
-		if (nestedSnapshot) nestedInstance.ownerFrame = nestedSnapshot;
-		const nextResult = withContext(nestedSnapshot ?? null, () => renderComponentInline(nestedInstance));
-		cleanupComponent(nestedInstance);
-		if (isPromiseLike(nextResult)) throw new Error("Async components are not supported. Components must return synchronously.");
-		activeSnapshot = nestedSnapshot ?? null;
-		currentResult = nextResult;
-		depth += 1;
-	}
-	return currentResult;
-}
-function resolveHostNestedComponentResult(host, retainedInstance, result, snapshot, retainedHostInstances) {
-	let currentResult = result;
-	let activeSnapshot = snapshot;
-	let depth = 0;
-	const retainedInstances = /* @__PURE__ */ new Set([retainedInstance]);
-	if (retainedHostInstances) for (const instance of retainedHostInstances) retainedInstances.add(instance);
-	const createdInstances = [];
-	while (_isDOMElement(currentResult) && typeof currentResult.type === "function" && depth < 16) {
-		const nestedSnapshot = getVNodeContextFrame(currentResult) ?? activeSnapshot;
-		let nestedInstance = findHostInstanceByType(host, currentResult.type);
-		const hadNestedInstance = !!nestedInstance;
-		if (!nestedInstance) {
-			nestedInstance = createComponentInstance(nextComponentInstanceId(), currentResult.type, currentResult.props ?? {}, null);
-			createdInstances.push(nestedInstance);
-		}
-		if (hadNestedInstance) captureInlineRenderSnapshot(nestedInstance);
-		setVNodeComponentInstance(currentResult, nestedInstance);
-		nestedInstance.isRoot = isRouteRootComponentVNode(currentResult);
-		nestedInstance.parentInstance = retainedInstance;
-		nestedInstance.portalScope = retainedInstance.portalScope ?? nestedInstance.portalScope;
-		inheritComponentCleanupStrict(nestedInstance);
-		nestedInstance.props = (currentResult.props ?? {}) || {};
-		if (nestedSnapshot) nestedInstance.ownerFrame = nestedSnapshot;
-		const nextResult = withContext(nestedSnapshot ?? null, () => renderComponentInline(nestedInstance));
-		if (isPromiseLike(nextResult)) throw new Error("Async components are not supported. Components must return synchronously.");
-		retainedInstances.add(nestedInstance);
-		warnUnusedStateReads(nestedInstance);
-		activeSnapshot = nestedSnapshot ?? null;
-		currentResult = markVNodeTreeWithContextFrame(nextResult, activeSnapshot);
-		depth += 1;
-	}
-	const previousInstances = host.__ASKR_INSTANCES ?? [];
-	for (const instance of previousInstances) if (!retainedInstances.has(instance)) cleanupComponent(instance);
-	const nextHostInstances = previousInstances.filter((instance) => retainedInstances.has(instance));
-	for (const instance of retainedInstances) if (instance.target === host && !nextHostInstances.includes(instance)) nextHostInstances.push(instance);
-	host.__ASKR_INSTANCES = nextHostInstances;
-	host.__ASKR_INSTANCE = host.__ASKR_INSTANCES[0] ?? retainedInstance;
-	for (const instance of createdInstances) mountInstanceInline(instance, host);
-	return currentResult;
-}
-function resolveWrapperHostResult(host, result, snapshot) {
-	let currentResult = result;
-	let activeSnapshot = snapshot;
-	let depth = 0;
-	while (_isDOMElement(currentResult) && typeof currentResult.type === "function" && depth < 16) {
-		const nestedSnapshot = getVNodeContextFrame(currentResult) ?? activeSnapshot;
-		const nestedInstance = findHostInstanceByType(host, currentResult.type);
-		if (!nestedInstance) break;
-		captureInlineRenderSnapshot(nestedInstance);
-		nestedInstance.props = (currentResult.props ?? {}) || {};
-		nestedInstance.parentInstance = getCurrentInstance();
-		nestedInstance.isRoot = isRouteRootComponentVNode(currentResult);
-		nestedInstance.portalScope = getCurrentInstance()?.portalScope ?? nestedInstance.portalScope;
-		inheritComponentCleanupStrict(nestedInstance);
-		if (nestedSnapshot) nestedInstance.ownerFrame = nestedSnapshot;
-		const nextResult = withContext(nestedSnapshot ?? null, () => renderComponentInline(nestedInstance));
-		if (isPromiseLike(nextResult)) throw new Error("Async components are not supported. Components must return synchronously.");
-		warnUnusedStateReads(nestedInstance);
-		activeSnapshot = nestedSnapshot ?? null;
-		currentResult = nextResult;
-		depth += 1;
-	}
-	return markVNodeTreeWithContextFrame(currentResult, activeSnapshot);
-}
 function syncComponentElement(currentDom, node, type, props, parentNamespace, forceChildrenUpdate = false, retainedHostInstances) {
 	const existingHost = currentDom instanceof Element ? currentDom : null;
-	const existingInstance = existingHost ? findHostInstanceByType(existingHost, type) : null;
+	const existingInstance = existingHost ? findHostInstanceByType(existingHost, type, node, getCurrentInstance(), 0) : null;
 	if (!existingHost) return null;
 	const domHost = getRendererDOMHost();
 	if (!existingInstance || existingInstance.fn !== type) {
 		const snapshot = getVNodeContextFrame(node) || getCurrentContextFrame() || null;
 		const hydrationInstance = createComponentInstance(nextComponentInstanceId(), type, props || {}, existingHost);
+		setComponentOwnershipIdentity(hydrationInstance, node, getCurrentInstance(), 0);
 		hydrationInstance.isRoot = isRouteRootComponentVNode(node);
 		hydrationInstance.portalScope = getCurrentInstance()?.portalScope ?? hydrationInstance.portalScope;
 		inheritComponentCleanupStrict(hydrationInstance);
-		setVNodeComponentInstance(node, hydrationInstance);
-		if (snapshot) hydrationInstance.ownerFrame = snapshot;
-		const result = withContext(snapshot, () => renderComponentInline(hydrationInstance));
-		if (isPromiseLike(result)) throw new Error("Async components are not supported. Components must return synchronously.");
-		const scopedResult = markVNodeTreeWithContextFrame(result, snapshot ?? null);
-		if (scopedResult && typeof scopedResult === "object" && "type" in scopedResult && typeof scopedResult.type === "string" && tagNamesEqualIgnoreCase(existingHost.tagName, scopedResult.type)) {
-			pruneComponentHostInstances(existingHost, retainedHostInstances ? [hydrationInstance, ...retainedHostInstances] : [hydrationInstance]);
-			withContext(snapshot, () => {
-				domHost.updateElementFromVnode(existingHost, inheritComponentKey(scopedResult, node), true, forceChildrenUpdate || hydrationInstance.mounted === false);
-				materializeKey(existingHost, node, props);
-			});
-			mountInstanceInline(hydrationInstance, existingHost);
-			itemInstanceHydrationComplete(existingHost);
-			warnUnusedStateReads(hydrationInstance);
-			return existingHost;
-		}
-		const resolvedResult = resolveHostNestedComponentResult(existingHost, hydrationInstance, scopedResult, snapshot ?? null, retainedHostInstances);
-		if (_isDOMElement(resolvedResult) && typeof resolvedResult.type === "string" && tagNamesEqualIgnoreCase(existingHost.tagName, resolvedResult.type)) {
-			withContext(snapshot, () => {
-				domHost.updateElementFromVnode(existingHost, inheritComponentKey(resolvedResult, node), true, forceChildrenUpdate || hydrationInstance.mounted === false);
-				materializeKey(existingHost, node, props);
+		const previousVNodeInstance = getVNodeComponentInstance(node);
+		const liveRetainedInstances = createRetainedHostInstanceSet(hydrationInstance, retainedHostInstances);
+		pruneComponentHostInstances(existingHost, liveRetainedInstances);
+		const replacement = beginComponentHostReplacement(existingHost, hydrationInstance, hydrationInstance.target, liveRetainedInstances, true);
+		try {
+			registerVNodeComponentInstanceRollback(node, previousVNodeInstance, hydrationInstance);
+			setVNodeComponentInstance(node, hydrationInstance);
+			if (snapshot) hydrationInstance.ownerFrame = snapshot;
+			const result = withContext(snapshot, () => renderComponentInline(hydrationInstance));
+			if (isPromiseLike(result)) throw new Error("Async components are not supported. Components must return synchronously.");
+			const scopedResult = markVNodeTreeWithContextFrame(result, snapshot ?? null);
+			if (scopedResult && typeof scopedResult === "object" && "type" in scopedResult && typeof scopedResult.type === "string" && tagNamesEqualIgnoreCase(existingHost.tagName, scopedResult.type)) {
+				withContext(snapshot, () => {
+					domHost.updateElementFromVnode(existingHost, inheritComponentKey(scopedResult, node), true, forceChildrenUpdate || hydrationInstance.mounted === false);
+					materializeKey(existingHost, node, props);
+				});
+				mountInstanceInline(hydrationInstance, existingHost);
+				itemInstanceHydrationComplete(existingHost);
+				warnUnusedStateReads(hydrationInstance);
+				return existingHost;
+			}
+			const resolvedResult = resolveHostNestedComponentResult(existingHost, hydrationInstance, scopedResult, snapshot ?? null, liveRetainedInstances);
+			if (_isDOMElement(resolvedResult) && typeof resolvedResult.type === "string" && tagNamesEqualIgnoreCase(existingHost.tagName, resolvedResult.type)) {
+				withContext(snapshot, () => {
+					domHost.updateElementFromVnode(existingHost, inheritComponentKey(resolvedResult, node), true, forceChildrenUpdate || hydrationInstance.mounted === false);
+					materializeKey(existingHost, node, props);
+				});
+				mountInstanceInline(hydrationInstance, existingHost);
+				itemInstanceHydrationComplete(existingHost);
+				warnUnusedStateReads(hydrationInstance);
+				return existingHost;
+			}
+			const nextDom = replacement.replace(() => materializeComponentResultNode(hydrationInstance, scopedResult, parentNamespace), (replacement) => {
+				if (replacement instanceof Element) {
+					materializeKey(replacement, node, props);
+					retainReplacementOwnerChain(replacement, hydrationInstance, liveRetainedInstances);
+				}
 			});
-			mountInstanceInline(hydrationInstance, existingHost);
-			itemInstanceHydrationComplete(existingHost);
 			warnUnusedStateReads(hydrationInstance);
-			return existingHost;
+			return nextDom;
+		} catch (error) {
+			restoreVNodeComponentInstance(node, previousVNodeInstance);
+			if (!hydrationInstance.mounted) cleanupProvisionalComponentInstance(hydrationInstance);
+			throw error;
 		}
-		const nextDom = materializeComponentResultNode(hydrationInstance, scopedResult, parentNamespace);
-		if (nextDom instanceof Element) materializeKey(nextDom, node, props);
-		if (nextDom !== existingHost && existingHost.parentNode) {
-			existingHost.parentNode.replaceChild(nextDom, existingHost);
-			cleanupDetachedComponentHost(existingHost, hydrationInstance);
-		}
-		warnUnusedStateReads(hydrationInstance);
-		return nextDom;
 	}
 	const snapshot = getVNodeContextFrame(node) || getCurrentContextFrame() || existingInstance.ownerFrame || null;
+	const liveRetainedInstances = createRetainedHostInstanceSet(existingInstance, retainedHostInstances);
+	pruneComponentHostInstances(existingHost, liveRetainedInstances);
+	const replacement = beginComponentHostReplacement(existingHost, existingInstance, existingInstance.target, liveRetainedInstances);
 	captureInlineRenderSnapshot(existingInstance);
 	existingInstance.props = props || {};
+	setComponentOwnershipIdentity(existingInstance, node, getCurrentInstance(), 0);
 	existingInstance.isRoot = isRouteRootComponentVNode(node);
 	existingInstance.portalScope = getCurrentInstance()?.portalScope ?? existingInstance.portalScope;
 	inheritComponentCleanupStrict(existingInstance);
@@ -177,13 +87,12 @@ function syncComponentElement(currentDom, node, type, props, parentNamespace, fo
 	if (isPromiseLike(result)) throw new Error("Async components are not supported. Components must return synchronously.");
 	const scopedResult = markVNodeTreeWithContextFrame(result, snapshot ?? null);
 	if (existingHost.__ASKR_WRAPPER_HOST) {
-		const wrapperResult = resolveWrapperHostResult(existingHost, scopedResult, snapshot ?? null);
+		const wrapperResult = resolveWrapperHostResult(existingHost, scopedResult, snapshot ?? null, liveRetainedInstances);
 		domHost.updateElementChildren(existingHost, normalizeComponentChildren(wrapperResult));
 		warnUnusedStateReads(existingInstance);
 		return existingHost;
 	}
 	if (scopedResult && typeof scopedResult === "object" && "type" in scopedResult && typeof scopedResult.type === "string" && tagNamesEqualIgnoreCase(existingHost.tagName, scopedResult.type)) {
-		pruneComponentHostInstances(existingHost, retainedHostInstances ? [existingInstance, ...retainedHostInstances] : [existingInstance]);
 		withContext(snapshot, () => {
 			domHost.updateElementFromVnode(existingHost, inheritComponentKey(scopedResult, node), true, forceChildrenUpdate || existingInstance.mounted === false);
 			materializeKey(existingHost, node, props);
@@ -191,7 +100,7 @@ function syncComponentElement(currentDom, node, type, props, parentNamespace, fo
 		warnUnusedStateReads(existingInstance);
 		return existingHost;
 	}
-	const resolvedResult = resolveHostNestedComponentResult(existingHost, existingInstance, scopedResult, snapshot ?? null, retainedHostInstances);
+	const resolvedResult = resolveHostNestedComponentResult(existingHost, existingInstance, scopedResult, snapshot ?? null, liveRetainedInstances);
 	if (_isDOMElement(resolvedResult) && typeof resolvedResult.type === "string" && tagNamesEqualIgnoreCase(existingHost.tagName, resolvedResult.type)) {
 		withContext(snapshot, () => {
 			domHost.updateElementFromVnode(existingHost, inheritComponentKey(resolvedResult, node), true, forceChildrenUpdate || existingInstance.mounted === false);
@@ -200,15 +109,22 @@ function syncComponentElement(currentDom, node, type, props, parentNamespace, fo
 		warnUnusedStateReads(existingInstance);
 		return existingHost;
 	}
-	const nextDom = materializeComponentResultNode(existingInstance, scopedResult, parentNamespace);
-	if (nextDom instanceof Element) materializeKey(nextDom, node, props);
-	if (nextDom !== existingHost && existingHost.parentNode) {
-		existingHost.parentNode.replaceChild(nextDom, existingHost);
-		cleanupDetachedComponentHost(existingHost, existingInstance);
-	}
+	const nextDom = replacement.replace(() => materializeComponentResultNode(existingInstance, scopedResult, parentNamespace), (replacement) => {
+		if (replacement instanceof Element) {
+			materializeKey(replacement, node, props);
+			retainReplacementOwnerChain(replacement, existingInstance, liveRetainedInstances);
+		}
+	});
 	warnUnusedStateReads(existingInstance);
 	return nextDom;
 }
+function retainReplacementOwnerChain(host, owner, retainedInstances) {
+	const componentHost = host;
+	const next = [...componentHost.__ASKR_INSTANCES ?? []];
+	for (const instance of retainedInstances) if (!next.includes(instance)) next.push(instance);
+	componentHost.__ASKR_INSTANCES = next;
+	componentHost.__ASKR_INSTANCE = owner;
+}
 function itemInstanceHydrationComplete(host) {
 	const instance = host.__ASKR_INSTANCE;
 	if (instance) {
@@ -222,26 +138,35 @@ function createComponentElement(node, type, props, parentNamespace) {
 	if (componentFn.constructor.name === "AsyncFunction") throw new Error("Async components are not supported. Use resource() for async work.");
 	let childInstance = getVNodeComponentInstance(node);
 	const hadChildInstance = !!childInstance;
+	const previousVNodeInstance = childInstance;
 	if (!childInstance) {
 		childInstance = createComponentInstance(nextComponentInstanceId(), componentFn, props || {}, null);
+		registerVNodeComponentInstanceRollback(node, previousVNodeInstance, childInstance);
 		setVNodeComponentInstance(node, childInstance);
 	}
-	if (hadChildInstance) captureInlineRenderSnapshot(childInstance);
-	childInstance.portalScope = getCurrentInstance()?.portalScope ?? childInstance.portalScope;
-	childInstance.parentInstance = getCurrentInstance();
-	childInstance.props = props || {};
-	childInstance.isRoot = isRouteRootComponentVNode(node);
-	inheritComponentCleanupStrict(childInstance);
-	if (snapshot) childInstance.ownerFrame = snapshot;
-	const result = withContext(snapshot, () => renderComponentInline(childInstance));
-	if (isPromiseLike(result)) throw new Error("Async components are not supported. Components must return synchronously.");
-	const scopedResult = markVNodeTreeWithContextFrame(result, snapshot ?? null);
-	const dom = withContext(snapshot, () => materializeComponentResultNode(childInstance, scopedResult, parentNamespace));
-	warnUnusedStateReads(childInstance);
-	if (dom instanceof Element) materializeKey(dom, node, props);
-	return dom;
+	try {
+		if (hadChildInstance) captureInlineRenderSnapshot(childInstance);
+		childInstance.portalScope = getCurrentInstance()?.portalScope ?? childInstance.portalScope;
+		setComponentOwnershipIdentity(childInstance, node, getCurrentInstance(), 0);
+		childInstance.parentInstance = getCurrentInstance();
+		childInstance.props = props || {};
+		childInstance.isRoot = isRouteRootComponentVNode(node);
+		inheritComponentCleanupStrict(childInstance);
+		if (snapshot) childInstance.ownerFrame = snapshot;
+		const result = snapshot ? withContext(snapshot, () => renderComponentInline(childInstance)) : renderComponentInline(childInstance);
+		if (isPromiseLike(result)) throw new Error("Async components are not supported. Components must return synchronously.");
+		const scopedResult = markVNodeTreeWithContextFrame(result, snapshot ?? null);
+		const dom = snapshot ? withContext(snapshot, () => materializeComponentResultNode(childInstance, scopedResult, parentNamespace)) : materializeComponentResultNode(childInstance, scopedResult, parentNamespace);
+		warnUnusedStateReads(childInstance);
+		if (dom instanceof Element) materializeFreshKey(dom, node, props);
+		return dom;
+	} catch (error) {
+		if (!hadChildInstance) {
+			restoreVNodeComponentInstance(node, previousVNodeInstance);
+			cleanupProvisionalComponentInstance(childInstance);
+		}
+		throw error;
+	}
 }
 //#endregion
 export { createComponentElement, findHostInstanceByType, inheritComponentCleanupStrict, inheritComponentKey, isRouteRootComponentVNode, resolveNestedComponentResult, syncComponentElement };
-
-//# sourceMappingURL=component-host.js.map

package/dist/renderer/dom-host.js

@@ -9,5 +9,3 @@ function getRendererDOMHost() {
 }
 //#endregion
 export { configureRendererDOMHost, getRendererDOMHost };
-
-//# sourceMappingURL=dom-host.js.map

package/dist/renderer/dom-internal.js

@@ -3,28 +3,42 @@ import "./types.js";
 import { getRuntimeEnv } from "../common/env.js";
 import { logger } from "../common/logger.js";
 import { Fragment } from "../common/jsx.js";
+import { getCurrentInstance } from "../runtime/component-scope.js";
+import { beginLifecycleCommitBatch, discardLifecycleCommitBatch, flushLifecycleCommitBatch } from "../runtime/lifecycle-batch.js";
 import { isBenchMetricScopeActive, recordBenchCounter } from "../runtime/for-bench.js";
 import "../runtime/index.js";
 import { removeAllListeners, removeElementReactiveProps, teardownNodeSubtree, updateElementRef } from "./cleanup.js";
 import "./env.js";
 import "../jsx-runtime.js";
-import { applyStaticScalarPropsToElement, hasMatchingStaticProps, materializeKey } from "./attributes.js";
+import { applyStaticScalarPropsToElement, hasMatchingStaticProps, materializeFreshKey, materializeKey } from "./attributes.js";
 import { createElementForNamespace, resolveChildNamespace } from "./namespaces.js";
-import { configureBoundaryDOMHost, createForBoundary, getControlBoundaryState, getDirectControlBoundaryVNode, registerControlBoundaryCommitOwner } from "./boundaries.js";
 import { performBulkPositionalKeyedTextUpdate } from "./children-fastpath.js";
 import { isBulkTextFastPathEligible, performBulkTextReplace } from "./children.js";
-import { maybeWarnMissingKeys, tryGetStaticCreateFastPathShape } from "./child-shape.js";
 import { configureRendererDOMHost } from "./dom-host.js";
-import { createComponentElement, syncComponentElement } from "./component-host.js";
+import { maybeWarnMissingKeys, tryGetStaticCreateFastPathShape } from "./child-shape.js";
 import { syncReactiveScalarChild } from "./reactive-children.js";
 import { canReuseStaticSubtree, setStaticChildSlotsCacheEnabled } from "./static-reuse.js";
 import { rendererReactiveChildDOMHost, updateElementChildren, updateUnkeyedChildren } from "./element-children.js";
-import { createErrorBoundaryElement } from "./error-boundary-dom.js";
-import { applyPropsToElement, hasTrackedElementPropBindings, markReactivePropsDirtySource, syncElementPropBindings } from "./prop-bindings.js";
 import { runRetainedElementUpdate } from "./retained-element-rollback.js";
+import { beginHydrationListenerTransaction, commitHydrationListenerTransaction, discardHydrationListenerTransaction } from "./hydration-listener-transaction.js";
+import { applyPropsToElement, hasTrackedElementPropBindings, markReactivePropsDirtySource, syncElementPropBindings } from "./prop-bindings.js";
+import { tryAdoptMatchingIntrinsicSubtree, withIntrinsicHydrationAdoption } from "./intrinsic-hydration-adoption.js";
+import { getControlBoundaryState, getDirectControlBoundaryVNode } from "./boundary-state.js";
+import { createForBoundary } from "./boundary-materialization.js";
+import { configureBoundaryDOMHost, registerControlBoundaryCommitOwner } from "./boundaries.js";
+import { createComponentElement, syncComponentElement } from "./component-host.js";
+import { createErrorBoundaryElement } from "./error-boundary-dom.js";
 import { tryPatchStableForDirtyItem } from "./stable-patch.js";
+import { beginDeferredHydrationActivation, commitDeferredHydrationActivation, rememberDeferredHydrationVNode, rollbackDeferredHydrationActivation } from "./hydration-boundaries.js";
+import { createComponentResultNodeWithBlueprint, createResultNodeWithBlueprint } from "./intrinsic-blueprint.js";
 //#region src/renderer/dom-internal.ts
 const IS_DOM_AVAILABLE = typeof document !== "undefined";
+function cleanupFailedDOMConstruction(root) {
+	const nodes = root instanceof DocumentFragment ? Array.from(root.childNodes) : [root];
+	for (const node of nodes) try {
+		teardownNodeSubtree(node);
+	} catch {}
+}
 function getHydrationSkipBoundary(el) {
 	return el.closest("[data-skip-hydrate=\"true\"]");
 }
@@ -58,11 +72,16 @@ function createDOMNode(node, parentNamespace) {
 	if (Array.isArray(node)) {
 		maybeWarnMissingKeys(node);
 		const fragment = document.createDocumentFragment();
-		for (const child of node) {
-			const dom = createDOMNode(child, parentNamespace);
-			if (dom) fragment.appendChild(dom);
+		try {
+			for (const child of node) {
+				const dom = createDOMNode(child, parentNamespace);
+				if (dom) fragment.appendChild(dom);
+			}
+			return fragment;
+		} catch (error) {
+			cleanupFailedDOMConstruction(fragment);
+			throw error;
 		}
-		return fragment;
 	}
 	if (typeof node === "object" && node !== null && "type" in node) {
 		const type = node.type;
@@ -75,66 +94,80 @@ function createDOMNode(node, parentNamespace) {
 	}
 	return null;
 }
+function createComponentResultNode(component, node, parentNamespace) {
+	return createComponentResultNodeWithBlueprint(component, node, parentNamespace, () => createDOMNode(node, parentNamespace), rendererReactiveChildDOMHost);
+}
+function createOwnedResultNodeWithBlueprint(owner, node, parentNamespace) {
+	return createResultNodeWithBlueprint(owner, node, parentNamespace, () => createDOMNode(node, parentNamespace), rendererReactiveChildDOMHost);
+}
 function createIntrinsicElement(node, type, props, parentNamespace) {
 	const children = props.children ?? node.children;
 	const elementNamespace = resolveChildNamespace(type, parentNamespace);
 	const el = createElementForNamespace(type, parentNamespace);
-	if (isBenchMetricScopeActive("coldCreate")) recordBenchCounter("domNodesCreated");
-	materializeKey(el, node, props);
-	const staticCreateFastPath = tryGetStaticCreateFastPathShape(props, children);
-	if (staticCreateFastPath) {
-		applyStaticScalarPropsToElement(el, props, type);
-		if (staticCreateFastPath.textContent !== null) {
-			el.textContent = staticCreateFastPath.textContent;
-			if (isBenchMetricScopeActive("coldCreate")) recordBenchCounter("domNodesCreated");
-		}
-		return el;
-	}
-	applyPropsToElement(el, props, type, isHydrationSkipped);
-	if (children !== null && children !== void 0) {
-		const controlBoundaryVNode = getDirectControlBoundaryVNode(children);
-		if (controlBoundaryVNode) {
-			const controlState = getControlBoundaryState(controlBoundaryVNode);
-			if (!controlState) throw new Error("[createIntrinsicElement] Control boundary missing internal state");
-			registerControlBoundaryCommitOwner(el, controlState);
+	try {
+		if (isBenchMetricScopeActive("coldCreate")) recordBenchCounter("domNodesCreated");
+		materializeFreshKey(el, node, props);
+		const staticCreateFastPath = tryGetStaticCreateFastPathShape(props, children);
+		if (staticCreateFastPath) {
+			applyStaticScalarPropsToElement(el, props, type);
+			if (staticCreateFastPath.textContent !== null) {
+				el.textContent = staticCreateFastPath.textContent;
+				if (isBenchMetricScopeActive("coldCreate")) recordBenchCounter("domNodesCreated");
+			}
+			return el;
 		}
-		if (syncReactiveScalarChild(el, children, rendererReactiveChildDOMHost)) return el;
-		if (Array.isArray(children)) {
-			maybeWarnMissingKeys(children);
-			if (children.length > 1) {
-				const childFrag = document.createDocumentFragment();
-				for (const child of children) {
+		applyPropsToElement(el, props, type, isHydrationSkipped);
+		if (children !== null && children !== void 0) {
+			const controlBoundaryVNode = getDirectControlBoundaryVNode(children);
+			if (controlBoundaryVNode) {
+				const controlState = getControlBoundaryState(controlBoundaryVNode);
+				if (!controlState) throw new Error("[createIntrinsicElement] Control boundary missing internal state");
+				registerControlBoundaryCommitOwner(el, controlState);
+			}
+			if (syncReactiveScalarChild(el, children, rendererReactiveChildDOMHost)) return el;
+			if (Array.isArray(children)) {
+				maybeWarnMissingKeys(children);
+				if (children.length > 1) for (const child of children) {
 					const dom = createDOMNode(child, elementNamespace);
-					if (dom) childFrag.appendChild(dom);
+					if (dom) el.appendChild(dom);
 				}
-				el.appendChild(childFrag);
-			} else if (children.length === 1) {
-				const dom = createDOMNode(children[0], elementNamespace);
+				else if (children.length === 1) {
+					const dom = createDOMNode(children[0], elementNamespace);
+					if (dom) el.appendChild(dom);
+				}
+			} else {
+				const dom = createDOMNode(children, elementNamespace);
 				if (dom) el.appendChild(dom);
 			}
-		} else {
-			const dom = createDOMNode(children, elementNamespace);
-			if (dom) el.appendChild(dom);
 		}
+		return el;
+	} catch (error) {
+		cleanupFailedDOMConstruction(el);
+		throw error;
 	}
-	return el;
 }
 function createFragmentElement(node, props, parentNamespace) {
 	const fragment = document.createDocumentFragment();
 	const children = props.children ?? node.children;
-	if (children) if (Array.isArray(children)) {
-		maybeWarnMissingKeys(children);
-		for (const child of children) {
-			const dom = createDOMNode(child, parentNamespace);
+	try {
+		if (children) if (Array.isArray(children)) {
+			maybeWarnMissingKeys(children);
+			for (const child of children) {
+				const dom = createDOMNode(child, parentNamespace);
+				if (dom) fragment.appendChild(dom);
+			}
+		} else {
+			const dom = createDOMNode(children, parentNamespace);
 			if (dom) fragment.appendChild(dom);
 		}
-	} else {
-		const dom = createDOMNode(children, parentNamespace);
-		if (dom) fragment.appendChild(dom);
+		return fragment;
+	} catch (error) {
+		cleanupFailedDOMConstruction(fragment);
+		throw error;
 	}
-	return fragment;
 }
 function updateElementFromVnode(el, vnode, updateChildren = true, forceChildrenUpdate = false) {
+	if (updateChildren && !forceChildrenUpdate && _isDOMElement(vnode) && tryAdoptMatchingIntrinsicSubtree(el, vnode)) return;
 	runRetainedElementUpdate(el, teardownNodeSubtree, () => {
 		applyElementUpdateFromVnode(el, vnode, updateChildren, forceChildrenUpdate);
 	});
@@ -144,6 +177,7 @@ function applyElementUpdateFromVnode(el, vnode, updateChildren, forceChildrenUpd
 	const props = vnode.props || {};
 	const domVNode = vnode;
 	if (isHydrationSkipped(el)) {
+		rememberDeferredHydrationVNode(el, vnode, getCurrentInstance(), getCurrentInstance()?.ownerFrame ?? null);
 		clearHydrationDeferredSubtree(el);
 		return;
 	}
@@ -167,8 +201,32 @@ function applyElementUpdateFromVnode(el, vnode, updateChildren, forceChildrenUpd
 		updateElementChildren(el, children, forceChildrenUpdate);
 	}
 }
+/** @internal Activate one recorded deferred hydration boundary in place. */
+function activateHydrationBoundary(element) {
+	const record = beginDeferredHydrationActivation(element);
+	if (!record?.vnode) return false;
+	const lifecycleBatch = beginLifecycleCommitBatch();
+	const listenerTransaction = beginHydrationListenerTransaction();
+	try {
+		element.removeAttribute("data-skip-hydrate");
+		withIntrinsicHydrationAdoption(() => {
+			updateElementFromVnode(element, record.vnode, true, true);
+		});
+		commitHydrationListenerTransaction(listenerTransaction);
+		flushLifecycleCommitBatch(lifecycleBatch);
+		commitDeferredHydrationActivation(record);
+		return true;
+	} catch (error) {
+		discardHydrationListenerTransaction(listenerTransaction);
+		discardLifecycleCommitBatch(lifecycleBatch);
+		element.setAttribute("data-skip-hydrate", "true");
+		rollbackDeferredHydrationActivation(record);
+		throw error;
+	}
+}
 configureRendererDOMHost({
 	createDOMNode,
+	createComponentResultNode,
 	syncComponentElement,
 	updateElementFromVnode,
 	updateElementChildren,
@@ -176,11 +234,10 @@ configureRendererDOMHost({
 });
 configureBoundaryDOMHost({
 	createDOMNode,
+	createResultNodeWithBlueprint: createOwnedResultNodeWithBlueprint,
 	syncComponentElement,
 	updateElementFromVnode,
 	tryPatchStableForDirtyItem
 });
 //#endregion
-export { IS_DOM_AVAILABLE, createDOMNode, isBulkTextFastPathEligible, markReactivePropsDirtySource, performBulkPositionalKeyedTextUpdate, performBulkTextReplace, setStaticChildSlotsCacheEnabled, syncComponentElement, tryPatchStableForDirtyItem, updateElementChildren, updateElementFromVnode, updateUnkeyedChildren };
-
-//# sourceMappingURL=dom-internal.js.map
+export { IS_DOM_AVAILABLE, activateHydrationBoundary, createDOMNode, isBulkTextFastPathEligible, markReactivePropsDirtySource, performBulkPositionalKeyedTextUpdate, performBulkTextReplace, setStaticChildSlotsCacheEnabled, syncComponentElement, tryPatchStableForDirtyItem, updateElementChildren, updateElementFromVnode, updateUnkeyedChildren };