@askrjs/askr 0.0.91 → 0.0.92

package/dist/{renderer-y2DL627q.js → renderer-C6jz9nIN.js}

@@ -1,17 +1,17 @@
 import { n as hasTransparentComponentResult, t as __CONTROL_BOUNDARY__ } from "./control-C-ApnFs1.js";
 import { n as _isDOMElement, t as __ERROR_BOUNDARY__ } from "./vnode-D24p6IW2.js";
-import { b as isDevelopmentEnvironment, c as runRuntimeHandlerScope, f as configureRuntimeRenderer, i as getDefaultRuntimeInstance, n as enqueueRuntimeTask, v as logger, y as getRuntimeEnv } from "./access-Dpfoi4cA.js";
-import { n as markFastPathApplied, t as isBulkCommitActive } from "./fastlane-CrfB3QG0.js";
-import { b as restoreDomCommitScope, c as enterDomCommitScope, p as getCurrentInstance } from "./component-scope-DzJEbYGE.js";
+import { b as getRuntimeEnv, i as getDefaultRuntimeInstance, l as runRuntimeHandlerScope, n as enqueueRuntimeTask, p as configureRuntimeRenderer, x as isDevelopmentEnvironment, y as logger } from "./access-DSkccuEI.js";
+import { n as isBulkCommitActive, r as markFastPathApplied } from "./fastlane-B2s24fWt.js";
+import { T as withAppRenderRuntime, b as restoreDomCommitScope, c as enterDomCommitScope, d as getCurrentAppRenderRuntime, p as getCurrentInstance } from "./component-scope-4I3yEMkb.js";
 import { i as isFragmentType, r as STATIC_CHILDREN } from "./jsx-C3IECePB.js";
-import { b as withContext, f as getCurrentContextFrame, g as markVNodeTreeWithContextFrame, i as mountInstanceInline, m as getVNodeContextFrame, n as createComponentInstance, o as renderComponentInline, t as captureInlineRenderSnapshot } from "./component-internal-C4uwwUaK.js";
-import { t as cleanupComponent } from "./component-cleanup-BUfUleGZ.js";
-import { c as getCurrentLifecycleCommitBatch, l as registerLifecycleRollback, p as isPromiseLike, r as discardLifecycleCommitBatch, s as flushLifecycleCommitBatch, t as beginLifecycleCommitBatch, u as registerLifecycleTransaction } from "./lifecycle-batch-Dfpid9-A.js";
-import { _ as setControlBoundaryContextFrame, a as registerForStateTransaction, b as rerenderChildScope, c as captureForFallbackTransactionSnapshot, d as clearCaseDomUpdateState, f as clearShowDomUpdateState, g as evaluateShowState, h as evaluateCaseState, i as evaluateForState, l as captureForItemTransactionSnapshot, n as clearForDomUpdateState, o as rollbackForStateTransaction, t as beginForStateTransaction, v as createChildScope, y as disposeChildScope } from "./for-internal-Bsm0B8GZ.js";
-import { n as createOwnedFineGrainedEffect, r as markFineGrainedEffectsDirtySource, t as createFineGrainedEffect } from "./effect-lnxQIpJG.js";
-import { C as getDelegatedHandlersForElement, D as updateDelegatedListener, E as removeDelegatedListener, S as getDelegatedHandlerForElement, T as isEventDelegationEnabled, _ as teardownNodeSubtree, a as elementReactivePropsCleanup, b as addFreshDelegatedListener, c as forEachElementReactivePropCleanup, d as removeAllListeners, f as removeElementReactiveProps, g as setFreshElementReactivePropCleanup, h as setDirectElementReactivePropCleanup, i as elementListeners, l as getElementReactivePropCleanupSize, m as replaceElementRefBookkeeping, n as cleanupInstanceIfPresent, o as elementRefs, p as removeElementRef, r as cleanupInstancesUnder, s as forEachDescendantNode, t as REACTIVE_CHILDREN_KEY, u as getElementReactivePropsCleanupMap, v as updateElementRef, w as isDelegatedEvent, x as clearDelegatedHandlersForElement, y as addDelegatedListener } from "./cleanup-c837KVij.js";
+import { b as withContext, f as getCurrentContextFrame, g as markVNodeTreeWithContextFrame, i as mountInstanceInline, m as getVNodeContextFrame, n as createComponentInstance, o as renderComponentInline, t as captureInlineRenderSnapshot } from "./component-internal-DlAkCgBE.js";
+import { t as cleanupComponent } from "./component-cleanup-CJCfu5ed.js";
+import { c as getCurrentLifecycleCommitBatch, l as registerLifecycleRollback, p as isPromiseLike, r as discardLifecycleCommitBatch, s as flushLifecycleCommitBatch, t as beginLifecycleCommitBatch, u as registerLifecycleTransaction } from "./lifecycle-batch-Cyfd07rf.js";
+import { _ as setControlBoundaryContextFrame, a as registerForStateTransaction, b as rerenderChildScope, c as captureForFallbackTransactionSnapshot, d as clearCaseDomUpdateState, f as clearShowDomUpdateState, g as evaluateShowState, h as evaluateCaseState, i as evaluateForState, l as captureForItemTransactionSnapshot, n as clearForDomUpdateState, o as rollbackForStateTransaction, t as beginForStateTransaction, v as createChildScope, y as disposeChildScope } from "./for-internal-T1C7jd7x.js";
+import { n as createOwnedFineGrainedEffect, r as markFineGrainedEffectsDirtySource, t as createFineGrainedEffect } from "./effect-BdZcHblj.js";
+import { C as getDelegatedHandlersForElement, D as updateDelegatedListener, E as removeDelegatedListener, S as getDelegatedHandlerForElement, T as isEventDelegationEnabled, _ as teardownNodeSubtree, a as elementReactivePropsCleanup, b as addFreshDelegatedListener, c as forEachElementReactivePropCleanup, d as removeAllListeners, f as removeElementReactiveProps, g as setFreshElementReactivePropCleanup, h as setDirectElementReactivePropCleanup, i as elementListeners, l as getElementReactivePropCleanupSize, m as replaceElementRefBookkeeping, n as cleanupInstanceIfPresent, o as elementRefs, p as removeElementRef, r as cleanupInstancesUnder, s as forEachDescendantNode, t as REACTIVE_CHILDREN_KEY, u as getElementReactivePropsCleanupMap, v as updateElementRef, w as isDelegatedEvent, x as clearDelegatedHandlersForElement, y as addDelegatedListener } from "./cleanup-DAAhJjx5.js";
 import { n as getPublicAttributeName, t as sanitizeCssValue } from "./css-BuPaTOfe.js";
-import { i as ROUTE_ROOT_COMPONENT, o as isUnsafeUrlAttribute } from "./csp-nonce-DH0TrDij.js";
+import { i as ROUTE_ROOT_COMPONENT, o as isUnsafeUrlAttribute } from "./csp-nonce-ByMbWv8s.js";
 import { a as isSSRPortalHydrationAnchor } from "./portal-w3oQ6oQU.js";
 //#region src/runtime/error-boundary.ts
 function createBoundaryReset(instance) {
@@ -100,20 +100,22 @@ function getPassiveOptions(eventName) {
 * Uses caching to avoid recreating wrappers for the same handler
 */
 function createWrappedHandler(handler, flushAfter = false) {
+	const appRuntime = getCurrentAppRenderRuntime();
 	const cachedByFlush = handlerCache.get(handler);
 	if (cachedByFlush) {
-		const cached = cachedByFlush.get(flushAfter);
+		const cachedByRuntime = cachedByFlush.get(flushAfter);
+		const cached = appRuntime ? cachedByRuntime?.scoped.get(appRuntime) : cachedByRuntime?.unscoped;
 		if (cached) return cached;
 	}
 	const wrapped = (event) => {
 		try {
-			runRuntimeHandlerScope(() => {
+			runRuntimeHandlerScope(() => withAppRenderRuntime(appRuntime, () => {
 				try {
 					handler(event);
 				} catch (error) {
 					logger.error("[Askr] Event handler error:", error);
 				}
-			}, flushAfter ? "sync" : "defer");
+			}), flushAfter ? "sync" : "defer");
 		} catch (err) {
 			if (flushAfter) queueMicrotask(() => {
 				throw err;
@@ -126,21 +128,25 @@ function createWrappedHandler(handler, flushAfter = false) {
 			cacheSize++;
 			handlerCache.set(handler, /* @__PURE__ */ new Map());
 		}
-		handlerCache.get(handler)?.set(flushAfter, wrapped);
+		const cachedByRuntime = handlerCache.get(handler)?.get(flushAfter) ?? { scoped: /* @__PURE__ */ new WeakMap() };
+		if (appRuntime) cachedByRuntime.scoped.set(appRuntime, wrapped);
+		else cachedByRuntime.unscoped = wrapped;
+		handlerCache.get(handler)?.set(flushAfter, cachedByRuntime);
 	} catch {}
 	return wrapped;
 }
 function createMutableWrappedHandler(handler, flushAfter = false) {
 	let currentHandler = handler;
+	let appRuntime = getCurrentAppRenderRuntime();
 	const wrapped = (event) => {
 		try {
-			runRuntimeHandlerScope(() => {
+			runRuntimeHandlerScope(() => withAppRenderRuntime(appRuntime, () => {
 				try {
 					currentHandler(event);
 				} catch (error) {
 					logger.error("[Askr] Event handler error:", error);
 				}
-			}, flushAfter ? "sync" : "defer");
+			}), flushAfter ? "sync" : "defer");
 		} catch (err) {
 			if (flushAfter) queueMicrotask(() => {
 				throw err;
@@ -152,6 +158,7 @@ function createMutableWrappedHandler(handler, flushAfter = false) {
 		handler: wrapped,
 		updateHandler(nextHandler) {
 			currentHandler = nextHandler;
+			appRuntime = getCurrentAppRenderRuntime();
 		}
 	};
 }
@@ -2345,6 +2352,170 @@ function commitReconciliation(parent, finalNodes) {
 	}
 }
 //#endregion
+//#region src/renderer/component-host-cleanup.ts
+function retireComponentOwnersForIntrinsicReuse(element, retainedOwner) {
+	const host = element;
+	if (host.__ASKR_INSTANCE || host.__ASKR_INSTANCES?.length) {
+		const instances = host.__ASKR_INSTANCES ?? [];
+		const activeOwner = retainedOwner === void 0 ? getCurrentInstance() : retainedOwner;
+		const activeOwnerIndex = activeOwner ? instances.indexOf(activeOwner) : -1;
+		pruneComponentHostInstances(host, activeOwnerIndex >= 0 ? instances.slice(activeOwnerIndex) : activeOwner && host.__ASKR_INSTANCE === activeOwner ? [activeOwner] : []);
+	}
+}
+function cleanupDetachedComponentHost(host, retainedInstance) {
+	const retainedInstances = retainedInstance instanceof Object && typeof retainedInstance[Symbol.iterator] === "function" ? new Set(retainedInstance) : /* @__PURE__ */ new Set([retainedInstance]);
+	const cleanupErrors = [];
+	const cleanedInstances = /* @__PURE__ */ new Set();
+	const nodes = [host];
+	try {
+		forEachDescendantNode(host, (node) => {
+			nodes.push(node);
+		});
+	} catch (error) {
+		cleanupErrors.push(error);
+	}
+	for (const node of nodes) {
+		if (node instanceof Element) {
+			cleanupElementListeners(node, cleanupErrors);
+			cleanupElementReactiveProps(node, cleanupErrors);
+			cleanupElementRef(node, cleanupErrors);
+		}
+		cleanupNodeInstances(node, retainedInstances, cleanedInstances, cleanupErrors);
+		clearHostMetadata(node, cleanupErrors);
+	}
+	if (cleanupErrors.length > 0) throw new AggregateError(cleanupErrors, "Detached component host cleanup failed");
+}
+function cleanupElementListeners(element, cleanupErrors) {
+	const listenerMap = elementListeners.get(element);
+	if (listenerMap) {
+		elementListeners.delete(element);
+		for (const entry of listenerMap.values()) try {
+			if (entry.isDelegated) removeDelegatedListener(element, entry.eventName);
+			else if (entry.options !== void 0) element.removeEventListener(entry.eventName, entry.handler, entry.options);
+			else element.removeEventListener(entry.eventName, entry.handler);
+		} catch (error) {
+			cleanupErrors.push(error);
+		}
+	}
+	try {
+		clearDelegatedHandlersForElement(element);
+	} catch (error) {
+		cleanupErrors.push(error);
+	}
+}
+function cleanupElementReactiveProps(element, cleanupErrors) {
+	if (!elementReactivePropsCleanup.has(element)) return;
+	const entries = [];
+	forEachElementReactivePropCleanup(element, (entry) => entries.push(entry));
+	elementReactivePropsCleanup.delete(element);
+	for (const entry of entries) try {
+		entry.cleanup();
+	} catch (error) {
+		cleanupErrors.push(error);
+	}
+}
+function cleanupElementRef(element, cleanupErrors) {
+	try {
+		removeElementRef(element);
+	} catch (error) {
+		replaceElementRefBookkeeping(element, void 0);
+		cleanupErrors.push(error);
+	}
+}
+function cleanupNodeInstances(node, retainedInstances, cleanedInstances, cleanupErrors) {
+	const instances = new Set(node.__ASKR_INSTANCES ?? []);
+	if (node.__ASKR_INSTANCE) instances.add(node.__ASKR_INSTANCE);
+	for (const instance of instances) {
+		if (retainedInstances.has(instance) || cleanedInstances.has(instance)) continue;
+		cleanedInstances.add(instance);
+		try {
+			cleanupComponent(instance);
+		} catch (error) {
+			cleanupErrors.push(error);
+		}
+	}
+}
+function clearHostMetadata(node, cleanupErrors) {
+	for (const property of [
+		"__ASKR_INSTANCE",
+		"__ASKR_INSTANCES",
+		"__ASKR_WRAPPER_HOST"
+	]) try {
+		delete node[property];
+	} catch (error) {
+		cleanupErrors.push(error);
+	}
+}
+function pruneComponentHostInstances(host, retainedInstances) {
+	const hadInstanceList = Object.prototype.hasOwnProperty.call(host, "__ASKR_INSTANCES");
+	const hadPrimaryInstance = Object.prototype.hasOwnProperty.call(host, "__ASKR_INSTANCE");
+	const previousInstanceList = host.__ASKR_INSTANCES?.slice();
+	const previousPrimaryInstance = host.__ASKR_INSTANCE;
+	const previousInstances = collectHostInstances(host);
+	const commit = () => {
+		const nextInstances = orderHostInstances(retainedInstances);
+		const retained = new Set(nextInstances);
+		writeHostInstances(host, nextInstances);
+		cleanupHostInstances(Array.from(previousInstances).filter((instance) => !retained.has(instance)), "Component host pruning failed");
+	};
+	const rollback = () => {
+		const currentInstances = collectHostInstances(host);
+		for (const instance of retainedInstances) currentInstances.add(instance);
+		try {
+			if (hadInstanceList) host.__ASKR_INSTANCES = previousInstanceList;
+			else delete host.__ASKR_INSTANCES;
+			if (hadPrimaryInstance) host.__ASKR_INSTANCE = previousPrimaryInstance;
+			else delete host.__ASKR_INSTANCE;
+		} catch {}
+		cleanupHostInstances(Array.from(currentInstances).filter((instance) => !previousInstances.has(instance)), "Provisional component host cleanup failed");
+	};
+	if (!registerLifecycleTransaction({}, commit, rollback)) commit();
+}
+function orderHostInstances(instances) {
+	const ordered = Array.from(new Set(instances));
+	const candidates = new Set(ordered);
+	const originalIndex = new Map(ordered.map((instance, index) => [instance, index]));
+	const depthCache = /* @__PURE__ */ new Map();
+	const getDepth = (instance, visiting = /* @__PURE__ */ new Set()) => {
+		const cached = depthCache.get(instance);
+		if (cached !== void 0) return cached;
+		if (visiting.has(instance)) return 0;
+		visiting.add(instance);
+		const parent = instance._vnodeParent ?? instance.parentInstance;
+		const depth = parent && candidates.has(parent) ? getDepth(parent, visiting) + 1 : 0;
+		visiting.delete(instance);
+		depthCache.set(instance, depth);
+		return depth;
+	};
+	return ordered.sort((left, right) => getDepth(right) - getDepth(left) || originalIndex.get(left) - originalIndex.get(right));
+}
+function collectHostInstances(host) {
+	const instances = /* @__PURE__ */ new Set();
+	for (const instance of host.__ASKR_INSTANCES ?? []) instances.add(instance);
+	if (host.__ASKR_INSTANCE) instances.add(host.__ASKR_INSTANCE);
+	return instances;
+}
+function writeHostInstances(host, instances) {
+	try {
+		if (instances.length > 0) {
+			host.__ASKR_INSTANCES = instances;
+			host.__ASKR_INSTANCE = instances[0];
+		} else {
+			delete host.__ASKR_INSTANCES;
+			delete host.__ASKR_INSTANCE;
+		}
+	} catch {}
+}
+function cleanupHostInstances(instances, message) {
+	const cleanupErrors = [];
+	for (const instance of instances) try {
+		cleanupComponent(instance);
+	} catch (error) {
+		cleanupErrors.push(error);
+	}
+	if (cleanupErrors.length > 0) throw new AggregateError(cleanupErrors, message);
+}
+//#endregion
 //#region src/renderer/children-fastpath.ts
 function upperCommonTagName$1(tag) {
 	switch (tag) {
@@ -2378,6 +2549,7 @@ function performBulkPositionalKeyedTextUpdate(parent, keyedVnodes) {
 			const vnodeType = vnode.type;
 			if (tagsEqualIgnoreCase$1(child.tagName, vnodeType)) {
 				updateTextContent(child, vnode.children || vnode.props?.children, vnode);
+				retireComponentOwnersForIntrinsicReuse(child);
 				setDataKey(child, key, () => updatedKeys += 1);
 				reused += 1;
 				continue;
@@ -2512,6 +2684,7 @@ function processElementVnode(vnode, existingNode, finalNodes) {
 		const tag = vnodeObj.type;
 		if (existingNode && existingNode.nodeType === 1 && tagsEqualIgnoreCase$1(existingNode.tagName, tag)) {
 			updateElementFromVnode(existingNode, vnode);
+			retireComponentOwnersForIntrinsicReuse(existingNode);
 			finalNodes.push(existingNode);
 			return "reused";
 		}
@@ -2623,6 +2796,7 @@ function applyRendererFastPath(parent, keyedVnodes, oldKeyMap) {
 		} else el = localOldKeyMap?.get(key) ?? oldKeyMap?.get(key);
 		if (el) {
 			updateElementFromVnode(el, vnode);
+			retireComponentOwnersForIntrinsicReuse(el);
 			finalNodes.push(el);
 			reusedCount++;
 		} else {
@@ -2865,6 +3039,7 @@ function reconcileKeyedChild(child, key, parent, resolveOldElOnce, usedOldEls, n
 		if (childObj && typeof childObj === "object" && typeof childObj.type === "string") {
 			if (canReuseIntrinsicElementInNamespace(el, childObj.type, parentNamespace)) {
 				domHost.updateElementFromVnode(el, child);
+				retireComponentOwnersForIntrinsicReuse(el);
 				newKeyMap.set(key, el);
 				return el;
 			}
@@ -2924,6 +3099,7 @@ function reconcileUnkeyedChild(child, parent, resolveUnkeyedOnce, usedOldEls, ex
 	}
 	if (existing instanceof Element && canReuseElement(existing, child, parentNamespace)) {
 		domHost.updateElementFromVnode(existing, child);
+		retireComponentOwnersForIntrinsicReuse(existing);
 		usedOldEls.add(existing);
 		return existing;
 	}
@@ -2996,6 +3172,7 @@ function tryReuseElement(avail, child, usedOldEls, parentNamespace) {
 		const childObj = child;
 		if (typeof childObj.type === "string" && canReuseIntrinsicElementInNamespace(avail, childObj.type, parentNamespace)) {
 			getRendererDOMHost().updateElementFromVnode(avail, child);
+			retireComponentOwnersForIntrinsicReuse(avail);
 			usedOldEls.add(avail);
 			return avail;
 		}
@@ -3919,6 +4096,7 @@ function updateMixedControlChildren(parent, children, forceUpdate) {
 		}
 		if (cursor instanceof Element && _isDOMElement(child) && typeof child.type === "string" && tagsEqualIgnoreCase(cursor.tagName, child.type)) {
 			domHost.updateElementFromVnode(cursor, child, true, forceUpdate);
+			retireComponentOwnersForIntrinsicReuse(cursor);
 			cursor = cursor.nextSibling;
 			continue;
 		}
@@ -3985,8 +4163,10 @@ function updateUnkeyedChildren(parent, newChildren, forceUpdate = false) {
 			const next = newChildren[i];
 			const current = c[i];
 			if (!current || next === void 0) continue;
-			if (_isDOMElement(next) && typeof next.type === "string") if (tagsEqualIgnoreCase(current.tagName, next.type)) domHost.updateElementFromVnode(current, next, true, forceUpdate);
-			else {
+			if (_isDOMElement(next) && typeof next.type === "string") if (tagsEqualIgnoreCase(current.tagName, next.type)) {
+				domHost.updateElementFromVnode(current, next, true, forceUpdate);
+				retireComponentOwnersForIntrinsicReuse(current);
+			} else {
 				const dom = domHost.createDOMNode(next, parentNamespace);
 				if (dom) {
 					teardownNodeSubtree(current);
@@ -4039,8 +4219,10 @@ function updateUnkeyedChildren(parent, newChildren, forceUpdate = false) {
 			}
 			else if (_isDOMElement(next)) if (currentNode.nodeType === 1) {
 				const currentEl = currentNode;
-				if (typeof next.type === "string") if (tagsEqualIgnoreCase(currentEl.tagName, next.type)) domHost.updateElementFromVnode(currentEl, next, true, forceUpdate);
-				else {
+				if (typeof next.type === "string") if (tagsEqualIgnoreCase(currentEl.tagName, next.type)) {
+					domHost.updateElementFromVnode(currentEl, next, true, forceUpdate);
+					retireComponentOwnersForIntrinsicReuse(currentEl);
+				} else {
 					const dom = domHost.createDOMNode(next, parentNamespace);
 					if (dom) {
 						teardownNodeSubtree(currentEl);
@@ -4130,8 +4312,10 @@ function updateUnkeyedChildren(parent, newChildren, forceUpdate = false) {
 			teardownNodeSubtree(current);
 			parent.replaceChild(textNode, current);
 		} else if (_isDOMElement(next)) {
-			if (typeof next.type === "string") if (tagsEqualIgnoreCase(current.tagName, next.type)) domHost.updateElementFromVnode(current, next, true, forceUpdate);
-			else {
+			if (typeof next.type === "string") if (tagsEqualIgnoreCase(current.tagName, next.type)) {
+				domHost.updateElementFromVnode(current, next, true, forceUpdate);
+				retireComponentOwnersForIntrinsicReuse(current);
+			} else {
 				const dom = domHost.createDOMNode(next, parentNamespace);
 				if (dom) {
 					teardownNodeSubtree(current);
@@ -5286,6 +5470,7 @@ function syncControlBoundaryScopeDom(parent, scope, vnode, before = null, allowH
 		if (resolvedRange.single && dom?.nodeType === 8 && (vnode === null || vnode === void 0 || vnode === false)) return currentRange;
 		if (resolvedRange.single && dom instanceof Element && _isDOMElement(vnode) && typeof vnode.type === "string" && tagNamesEqualIgnoreCase$1(dom.tagName, vnode.type)) {
 			host.updateElementFromVnode(dom, vnode, true);
+			retireComponentOwnersForIntrinsicReuse(dom);
 			return currentRange;
 		}
 		if (!resolvedRange.single && syncTransparentRange(resolvedRange, vnode, false)) return resolvedRange;
@@ -5574,161 +5759,6 @@ function trySyncControlBoundaryChild(parent, currentNode, next) {
 	return true;
 }
 //#endregion
-//#region src/renderer/component-host-cleanup.ts
-function cleanupDetachedComponentHost(host, retainedInstance) {
-	const retainedInstances = retainedInstance instanceof Object && typeof retainedInstance[Symbol.iterator] === "function" ? new Set(retainedInstance) : /* @__PURE__ */ new Set([retainedInstance]);
-	const cleanupErrors = [];
-	const cleanedInstances = /* @__PURE__ */ new Set();
-	const nodes = [host];
-	try {
-		forEachDescendantNode(host, (node) => {
-			nodes.push(node);
-		});
-	} catch (error) {
-		cleanupErrors.push(error);
-	}
-	for (const node of nodes) {
-		if (node instanceof Element) {
-			cleanupElementListeners(node, cleanupErrors);
-			cleanupElementReactiveProps(node, cleanupErrors);
-			cleanupElementRef(node, cleanupErrors);
-		}
-		cleanupNodeInstances(node, retainedInstances, cleanedInstances, cleanupErrors);
-		clearHostMetadata(node, cleanupErrors);
-	}
-	if (cleanupErrors.length > 0) throw new AggregateError(cleanupErrors, "Detached component host cleanup failed");
-}
-function cleanupElementListeners(element, cleanupErrors) {
-	const listenerMap = elementListeners.get(element);
-	if (listenerMap) {
-		elementListeners.delete(element);
-		for (const entry of listenerMap.values()) try {
-			if (entry.isDelegated) removeDelegatedListener(element, entry.eventName);
-			else if (entry.options !== void 0) element.removeEventListener(entry.eventName, entry.handler, entry.options);
-			else element.removeEventListener(entry.eventName, entry.handler);
-		} catch (error) {
-			cleanupErrors.push(error);
-		}
-	}
-	try {
-		clearDelegatedHandlersForElement(element);
-	} catch (error) {
-		cleanupErrors.push(error);
-	}
-}
-function cleanupElementReactiveProps(element, cleanupErrors) {
-	if (!elementReactivePropsCleanup.has(element)) return;
-	const entries = [];
-	forEachElementReactivePropCleanup(element, (entry) => entries.push(entry));
-	elementReactivePropsCleanup.delete(element);
-	for (const entry of entries) try {
-		entry.cleanup();
-	} catch (error) {
-		cleanupErrors.push(error);
-	}
-}
-function cleanupElementRef(element, cleanupErrors) {
-	try {
-		removeElementRef(element);
-	} catch (error) {
-		replaceElementRefBookkeeping(element, void 0);
-		cleanupErrors.push(error);
-	}
-}
-function cleanupNodeInstances(node, retainedInstances, cleanedInstances, cleanupErrors) {
-	const instances = new Set(node.__ASKR_INSTANCES ?? []);
-	if (node.__ASKR_INSTANCE) instances.add(node.__ASKR_INSTANCE);
-	for (const instance of instances) {
-		if (retainedInstances.has(instance) || cleanedInstances.has(instance)) continue;
-		cleanedInstances.add(instance);
-		try {
-			cleanupComponent(instance);
-		} catch (error) {
-			cleanupErrors.push(error);
-		}
-	}
-}
-function clearHostMetadata(node, cleanupErrors) {
-	for (const property of [
-		"__ASKR_INSTANCE",
-		"__ASKR_INSTANCES",
-		"__ASKR_WRAPPER_HOST"
-	]) try {
-		delete node[property];
-	} catch (error) {
-		cleanupErrors.push(error);
-	}
-}
-function pruneComponentHostInstances(host, retainedInstances) {
-	const hadInstanceList = Object.prototype.hasOwnProperty.call(host, "__ASKR_INSTANCES");
-	const hadPrimaryInstance = Object.prototype.hasOwnProperty.call(host, "__ASKR_INSTANCE");
-	const previousInstanceList = host.__ASKR_INSTANCES?.slice();
-	const previousPrimaryInstance = host.__ASKR_INSTANCE;
-	const previousInstances = collectHostInstances(host);
-	const commit = () => {
-		const nextInstances = orderHostInstances(retainedInstances);
-		const retained = new Set(nextInstances);
-		writeHostInstances(host, nextInstances);
-		cleanupHostInstances(Array.from(previousInstances).filter((instance) => !retained.has(instance)), "Component host pruning failed");
-	};
-	const rollback = () => {
-		const currentInstances = collectHostInstances(host);
-		for (const instance of retainedInstances) currentInstances.add(instance);
-		try {
-			if (hadInstanceList) host.__ASKR_INSTANCES = previousInstanceList;
-			else delete host.__ASKR_INSTANCES;
-			if (hadPrimaryInstance) host.__ASKR_INSTANCE = previousPrimaryInstance;
-			else delete host.__ASKR_INSTANCE;
-		} catch {}
-		cleanupHostInstances(Array.from(currentInstances).filter((instance) => !previousInstances.has(instance)), "Provisional component host cleanup failed");
-	};
-	if (!registerLifecycleTransaction({}, commit, rollback)) commit();
-}
-function orderHostInstances(instances) {
-	const ordered = Array.from(new Set(instances));
-	const candidates = new Set(ordered);
-	const originalIndex = new Map(ordered.map((instance, index) => [instance, index]));
-	const depthCache = /* @__PURE__ */ new Map();
-	const getDepth = (instance, visiting = /* @__PURE__ */ new Set()) => {
-		const cached = depthCache.get(instance);
-		if (cached !== void 0) return cached;
-		if (visiting.has(instance)) return 0;
-		visiting.add(instance);
-		const parent = instance._vnodeParent ?? instance.parentInstance;
-		const depth = parent && candidates.has(parent) ? getDepth(parent, visiting) + 1 : 0;
-		visiting.delete(instance);
-		depthCache.set(instance, depth);
-		return depth;
-	};
-	return ordered.sort((left, right) => getDepth(right) - getDepth(left) || originalIndex.get(left) - originalIndex.get(right));
-}
-function collectHostInstances(host) {
-	const instances = /* @__PURE__ */ new Set();
-	for (const instance of host.__ASKR_INSTANCES ?? []) instances.add(instance);
-	if (host.__ASKR_INSTANCE) instances.add(host.__ASKR_INSTANCE);
-	return instances;
-}
-function writeHostInstances(host, instances) {
-	try {
-		if (instances.length > 0) {
-			host.__ASKR_INSTANCES = instances;
-			host.__ASKR_INSTANCE = instances[0];
-		} else {
-			delete host.__ASKR_INSTANCES;
-			delete host.__ASKR_INSTANCE;
-		}
-	} catch {}
-}
-function cleanupHostInstances(instances, message) {
-	const cleanupErrors = [];
-	for (const instance of instances) try {
-		cleanupComponent(instance);
-	} catch (error) {
-		cleanupErrors.push(error);
-	}
-	if (cleanupErrors.length > 0) throw new AggregateError(cleanupErrors, message);
-}
-//#endregion
 //#region src/renderer/component-host-replacement.ts
 function cleanupProvisionalComponentInstance(instance) {
 	try {
@@ -5872,6 +5902,16 @@ function registerVNodeComponentInstanceRollback(node, previousInstance, provisio
 function retainReplacementOwnerChain(host, owner, retainedInstances) {
 	pruneComponentHostInstances(host, /* @__PURE__ */ new Set([owner, ...retainedInstances]));
 }
+function retainMaterializedReplacementOwnerChain(host, owner, retainedInstances) {
+	const instanceHost = host;
+	const materializedInstances = /* @__PURE__ */ new Set([
+		owner,
+		...retainedInstances,
+		...instanceHost.__ASKR_INSTANCES ?? []
+	]);
+	if (instanceHost.__ASKR_INSTANCE) materializedInstances.add(instanceHost.__ASKR_INSTANCE);
+	pruneComponentHostInstances(instanceHost, materializedInstances);
+}
 function adoptEmptySSRPortalHydrationHost(host, instance, retainedInstances, result) {
 	if (!isSSRPortalHydrationAnchor(host) || result !== null && result !== void 0 && result !== false) return false;
 	const instanceHost = host;
@@ -6174,7 +6214,7 @@ function syncComponentElement(currentDom, node, type, props, parentNamespace, fo
 			}
 			return replacement.replace(() => materializeComponentResultNode(hydrationInstance, scopedResult, parentNamespace), (replacement) => {
 				if (replacement instanceof Element) materializeKey(replacement, node, props);
-				retainReplacementOwnerChain(replacement, hydrationInstance, liveRetainedInstances);
+				retainMaterializedReplacementOwnerChain(replacement, hydrationInstance, liveRetainedInstances);
 			});
 		} catch (error) {
 			restoreVNodeComponentInstance(node, previousVNodeInstance);
@@ -6253,7 +6293,7 @@ function syncComponentElement(currentDom, node, type, props, parentNamespace, fo
 	}
 	return replacement.replace(() => materializeComponentResultNode(existingInstance, scopedResult, parentNamespace), (replacement) => {
 		if (replacement instanceof Element) materializeKey(replacement, node, props);
-		retainReplacementOwnerChain(replacement, existingInstance, liveRetainedInstances);
+		retainMaterializedReplacementOwnerChain(replacement, existingInstance, liveRetainedInstances);
 	});
 }
 //#endregion
@@ -6366,9 +6406,12 @@ function patchStableIntrinsicElement(dom, nextVNode) {
 	}
 	return true;
 }
-function resolveStableIntrinsicPatchVNode(dom, vnode) {
+function resolveStableIntrinsicPatch(dom, vnode) {
 	if (!_isDOMElement(vnode)) return null;
-	if (typeof vnode.type === "string") return tagNamesEqualIgnoreCase$1(dom.tagName, vnode.type) ? vnode : null;
+	if (typeof vnode.type === "string") return tagNamesEqualIgnoreCase$1(dom.tagName, vnode.type) ? {
+		vnode,
+		retainedOwner: null
+	} : null;
 	if (typeof vnode.type !== "function") return null;
 	const host = dom;
 	const existingInstance = findHostInstanceByType(host, vnode.type, vnode, getCurrentInstance());
@@ -6383,15 +6426,18 @@ function resolveStableIntrinsicPatchVNode(dom, vnode) {
 	const result = withContext(snapshot, () => renderComponentInline(existingInstance));
 	if (isPromiseLike(result)) throw new Error("Async components are not supported. Components must return synchronously.");
 	const resolvedResult = resolveNestedComponentResult(result, snapshot ?? null, existingInstance);
-	if (_isDOMElement(resolvedResult) && typeof resolvedResult.type === "string" && tagNamesEqualIgnoreCase$1(dom.tagName, resolvedResult.type)) return inheritComponentKey(resolvedResult, vnode);
+	if (_isDOMElement(resolvedResult) && typeof resolvedResult.type === "string" && tagNamesEqualIgnoreCase$1(dom.tagName, resolvedResult.type)) return {
+		vnode: inheritComponentKey(resolvedResult, vnode),
+		retainedOwner: existingInstance
+	};
 	return null;
 }
 function tryPatchStableForDirtyItem(scope) {
 	if (!(scope.dom instanceof Element) || scope.vnode === void 0) return false;
-	const nextIntrinsic = resolveStableIntrinsicPatchVNode(scope.dom, scope.vnode);
-	if (!nextIntrinsic) return false;
-	const didPatch = patchStableIntrinsicElement(scope.dom, nextIntrinsic);
-	if (didPatch);
+	const patch = resolveStableIntrinsicPatch(scope.dom, scope.vnode);
+	if (!patch) return false;
+	const didPatch = patchStableIntrinsicElement(scope.dom, patch.vnode);
+	if (didPatch) retireComponentOwnersForIntrinsicReuse(scope.dom, patch.retainedOwner);
 	return didPatch;
 }
 //#endregion
@@ -7308,7 +7354,7 @@ function replaceComponentRange(instance, result, host) {
 				return syncedHost;
 			}
 		}
-		return beginComponentHostReplacement(instanceHost, instance, instance.target, retainedInstances).replace(() => materializeComponentResultNode(instance, result, getParentNamespace(parent)), (nextHost) => retainReplacementOwnerChain(nextHost, instance, retainedInstances));
+		return beginComponentHostReplacement(instanceHost, instance, instance.target, retainedInstances).replace(() => materializeComponentResultNode(instance, result, getParentNamespace(parent)), (nextHost) => retainMaterializedReplacementOwnerChain(nextHost, instance, retainedInstances));
 	}
 	const placeholder = host;
 	if (syncComponentFragmentRange(placeholder, instance, result, false)) return placeholder;
@@ -7321,7 +7367,7 @@ function replaceComponentRange(instance, result, host) {
 			restoreDomCommitScope(previousInstance);
 		}
 	}
-	return beginComponentHostReplacement(instanceHost, instance, instance.target, retainedInstances).replace(() => materializeComponentResultNode(instance, result, getParentNamespace(parent)), (nextHost) => retainReplacementOwnerChain(nextHost, instance, retainedInstances));
+	return beginComponentHostReplacement(instanceHost, instance, instance.target, retainedInstances).replace(() => materializeComponentResultNode(instance, result, getParentNamespace(parent)), (nextHost) => retainMaterializedReplacementOwnerChain(nextHost, instance, retainedInstances));
 }
 //#endregion
 //#region src/renderer/index.ts

package/dist/{resolution-C9A31xQi.js → resolution-B21kmOkp.js}

@@ -1,10 +1,10 @@
 import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-C3IECePB.js";
-import { _ as readScope, d as defineScope } from "./component-internal-C4uwwUaK.js";
-import { p as isPromiseLike } from "./lifecycle-batch-Dfpid9-A.js";
+import { _ as readScope, d as defineScope } from "./component-internal-DlAkCgBE.js";
+import { p as isPromiseLike } from "./lifecycle-batch-Cyfd07rf.js";
 import { S as withPageFramework, b as replacePageRoute, n as getActiveRenderContext } from "./render-context-B7ohlh6t.js";
-import { i as ROUTE_ROOT_COMPONENT } from "./csp-nonce-DH0TrDij.js";
-import { c as withTelemetry, t as createQueryPrefetchContext } from "./query-registry-B4LpVtlT.js";
-import { c as removeRouteBasePath, i as getMatchingRouteRecord, l as buildRouteContext, o as addRouteBasePath, s as normalizeRouteBasePath, u as buildRouteContextBase, v as getActiveRouteAuthOptions } from "./route-matching-xlgdQXg_.js";
+import { i as ROUTE_ROOT_COMPONENT } from "./csp-nonce-ByMbWv8s.js";
+import { c as withTelemetry, t as createQueryPrefetchContext } from "./query-registry-qm13pEdK.js";
+import { c as removeRouteBasePath, i as getMatchingRouteRecord, l as buildRouteContext, o as addRouteBasePath, s as normalizeRouteBasePath, u as buildRouteContextBase, v as getActiveRouteAuthOptions } from "./route-matching-Bo6UqG-5.js";
 //#region src/router/route-data-loader.ts
 var RouteDataLoadError = class extends Error {
 	constructor(route, phase, cause) {

package/dist/{resource-operation-whZDJAYv.js → resource-operation-CaAttQqz.js}

@@ -1,10 +1,10 @@
-import { t as enqueueRuntimeLane, v as logger } from "./access-Dpfoi4cA.js";
-import { f as getCurrentComponentInstance } from "./component-scope-DzJEbYGE.js";
-import { c as registerCommitOperationForInstance, f as getCurrentContextFrame, y as withAsyncResourceContext } from "./component-internal-C4uwwUaK.js";
-import { p as isPromiseLike } from "./lifecycle-batch-Dfpid9-A.js";
+import { t as enqueueRuntimeLane, y as logger } from "./access-DSkccuEI.js";
+import { f as getCurrentComponentInstance } from "./component-scope-4I3yEMkb.js";
+import { c as registerCommitOperationForInstance, f as getCurrentContextFrame, y as withAsyncResourceContext } from "./component-internal-DlAkCgBE.js";
+import { p as isPromiseLike } from "./lifecycle-batch-Cyfd07rf.js";
 import { t as brandSnapshotSource } from "./snapshot-source-BB42xgwb.js";
 import { C as SSRDataMissingError, a as getResourceVerificationSnapshot, i as getNextRenderKey, n as getActiveRenderContext, o as isHydrationVerificationRender, p as throwSSRDataMissing, r as getCurrentRenderData, s as recordResourceVerificationSnapshot } from "./render-context-B7ohlh6t.js";
-import { t as state } from "./state-DCjONcHK.js";
+import { t as state } from "./state-XPZYUzHL.js";
 //#region src/runtime/resource-cell.ts
 /**
 * Pure, component-agnostic ResourceCell state machine.

package/dist/resources/index.d.ts

@@ -1,5 +1,5 @@
-import { ft as getSignal } from "../index-Izwp_ESC.js";
-import { i as onRouteChange, n as RouteChangeOptions, t as RouteChangeCleanup } from "../activity-CF2_JvJs.js";
+import { P as getSignal } from "../index-DA3g8lm8.js";
+import { i as onRouteChange, n as RouteChangeOptions, t as RouteChangeCleanup } from "../activity-DxUcygE5.js";
 //#region src/runtime/resource-operation.d.ts
 interface ResourceResult<T> {
   value: T | null;