@askrjs/askr 0.0.50 → 0.0.52

package/dist/renderer/keyed.js

@@ -1,4 +1,4 @@
-import { buildKeyMapFromChildren, hasPropChanged, isIgnoredForPropChanges } from "./utils.js";
+import { buildKeyMapFromChildren, getMaterializedKey, hasPropChanged, isIgnoredForPropChanges } from "./utils.js";
 import { extractKeyedVnodes } from "./keyed-children.js";
 //#region src/renderer/keyed.ts
 const keyedElements = /* @__PURE__ */ new WeakMap();
@@ -52,6 +52,9 @@ function computeLISLength(positions) {
 	}
 	return tails.length;
 }
+function keyToken(key) {
+	return `${typeof key}:${String(key)}`;
+}
 function collectCurrentKeyOrder(parent, oldKeyMap) {
 	const currentKeys = [];
 	if (oldKeyMap && oldKeyMap.size > 0) {
@@ -60,8 +63,7 @@ function collectCurrentKeyOrder(parent, oldKeyMap) {
 		for (const [key, el] of oldKeyMap) {
 			if (el === lastElement) continue;
 			lastElement = el;
-			const normalizedKey = String(key);
-			currentKeys.push(normalizedKey);
+			currentKeys.push(keyToken(key));
 			keyCount++;
 		}
 		if (keyCount > 0) return {
@@ -72,9 +74,9 @@ function collectCurrentKeyOrder(parent, oldKeyMap) {
 	let keyCount = 0;
 	try {
 		for (let el = parent.firstElementChild; el; el = el.nextElementSibling) {
-			const keyAttr = el.getAttribute("data-key");
-			if (keyAttr === null) continue;
-			currentKeys.push(keyAttr);
+			const key = getMaterializedKey(el);
+			if (key === void 0) continue;
+			currentKeys.push(keyToken(key));
 			keyCount++;
 		}
 	} catch {}
@@ -125,7 +127,7 @@ function planKeyedReorderFastPath(parent, keyedVnodes, totalChildren, oldKeyMap)
 	};
 	const { keyCount: currentKeyCount, currentKeys } = collectCurrentKeyOrder(parent, oldKeyMap);
 	let moveCount = 0;
-	for (let i = 0; i < totalKeyed; i++) if (currentKeys[i] !== String(keyedVnodes[i].key)) moveCount++;
+	for (let i = 0; i < totalKeyed; i++) if (currentKeys[i] !== keyToken(keyedVnodes[i].key)) moveCount++;
 	const cheapMoveTrigger = shouldEvaluateShape && currentKeyCount > 0 && moveCount > Math.max(64, Math.floor(totalKeyed * .1));
 	let lisTrigger = false;
 	let lisLen = 0;
@@ -133,7 +135,7 @@ function planKeyedReorderFastPath(parent, keyedVnodes, totalChildren, oldKeyMap)
 		const indexByKey = /* @__PURE__ */ new Map();
 		for (let i = 0; i < currentKeys.length; i++) indexByKey.set(currentKeys[i], i);
 		const positions = Array(totalKeyed).fill(-1);
-		for (let i = 0; i < totalKeyed; i++) positions[i] = indexByKey.get(String(keyedVnodes[i].key)) ?? -1;
+		for (let i = 0; i < totalKeyed; i++) positions[i] = indexByKey.get(keyToken(keyedVnodes[i].key)) ?? -1;
 		lisLen = computeLISLength(positions);
 		lisTrigger = lisLen < Math.floor(totalKeyed * .5);
 	}
@@ -163,5 +165,3 @@ function isKeyedReorderFastPathEligible(parent, newChildren, oldKeyMap) {
 }
 //#endregion
 export { _reconcilerRecordedParents, getKeyMapForElement, isKeyedReorderFastPathEligible, keyedElements, planKeyedReorderFastPath, populateKeyMapForElement };
-
-//# sourceMappingURL=keyed.js.map

package/dist/renderer/namespaces.js

@@ -19,5 +19,3 @@ function canReuseIntrinsicElementInNamespace(existing, type, parentNamespace) {
 }
 //#endregion
 export { SVG_NAMESPACE, canReuseIntrinsicElementInNamespace, createElementForNamespace, getParentNamespace, resolveChildNamespace };
-
-//# sourceMappingURL=namespaces.js.map

package/dist/renderer/prop-bindings.js

@@ -1,23 +1,29 @@
 import { getRuntimeEnv } from "../common/env.js";
-import { logger } from "../dev/logger.js";
+import { logger } from "../common/logger.js";
 import { incrementPerfMetric } from "../runtime/perf-metrics.js";
 import { incDevCounter } from "../runtime/dev-namespace.js";
-import { addDelegatedListener, getDelegatedHandlerForElement, getDelegatedHandlersForElement, isDelegatedEvent, isEventDelegationEnabled, removeDelegatedListener, updateDelegatedListener } from "../runtime/events.js";
-import { REACTIVE_CHILDREN_KEY, elementListeners, elementReactivePropsCleanup, updateElementRef } from "./cleanup.js";
+import { createFineGrainedEffect, markFineGrainedEffectsDirtySource } from "../runtime/effect.js";
+import { addDelegatedListener, addFreshDelegatedListener, getDelegatedHandlerForElement, getDelegatedHandlersForElement, isDelegatedEvent, isEventDelegationEnabled, removeDelegatedListener, updateDelegatedListener } from "../runtime/events.js";
+import "../runtime/for-bench.js";
+import "../runtime/index.js";
+import { REACTIVE_CHILDREN_KEY, elementListeners, elementReactivePropsCleanup, elementRefs, getElementReactivePropCleanupSize, getElementReactivePropsCleanupMap, updateElementRef } from "./cleanup.js";
 import "./env.js";
 import { createMutableWrappedHandler, getEventListenerKey, getEventListenerOptions, isSkippedProp, parseEventProp } from "./utils.js";
-import { isBenchMetricScopeActive, recordBenchCounter } from "../runtime/for-bench.js";
-import "../runtime/for.js";
 import { applyScalarPropValue, removeStaleAttributes } from "./attributes.js";
-import { createFineGrainedEffect, markFineGrainedEffectsDirtySource } from "../runtime/effect.js";
-//#region src/renderer/prop-bindings.ts
+import { stageHydrationListener } from "./hydration-listener-transaction.js";
 const reactivePropRegistry = /* @__PURE__ */ new Set();
-function addTrackedListener(el, eventName, handler, capture = false) {
+function addTrackedListener(el, eventName, handler, capture = false, fresh = false) {
 	const useDelegation = !capture && isEventDelegationEnabled() && isDelegatedEvent(eventName);
 	const listenerKey = getEventListenerKey(eventName, capture);
+	if (stageHydrationListener({
+		kind: useDelegation ? "delegated" : "direct",
+		eventName,
+		publish: () => addTrackedListener(el, eventName, handler, capture, fresh),
+		rollback: () => removeTrackedListener(el, eventName, capture)
+	})) return;
 	if (useDelegation) {
-		addDelegatedListener(el, eventName, handler, handler, void 0);
-		if (isBenchMetricScopeActive("coldCreate")) recordBenchCounter("listenerBindings");
+		if (fresh) addFreshDelegatedListener(el, eventName, handler, handler, void 0);
+		else addDelegatedListener(el, eventName, handler, handler, void 0);
 		return;
 	}
 	const options = getEventListenerOptions(eventName, capture);
@@ -35,7 +41,21 @@ function addTrackedListener(el, eventName, handler, capture = false) {
 		isDelegated: false,
 		updateHandler: mutableHandler?.updateHandler
 	});
-	if (isBenchMetricScopeActive("coldCreate")) recordBenchCounter("listenerBindings");
+}
+function removeTrackedListener(el, eventName, capture) {
+	if (!capture && getDelegatedHandlerForElement(el, eventName)) {
+		removeDelegatedListener(el, eventName);
+		return;
+	}
+	const listenerKey = getEventListenerKey(eventName, capture);
+	const entry = elementListeners.get(el)?.get(listenerKey);
+	if (!entry) return;
+	if (entry.options !== void 0) el.removeEventListener(entry.eventName, entry.handler, entry.options);
+	else el.removeEventListener(entry.eventName, entry.handler);
+	incDevCounter("listenerRemoves");
+	const listeners = elementListeners.get(el);
+	listeners?.delete(listenerKey);
+	if (listeners?.size === 0) elementListeners.delete(el);
 }
 function markReactivePropsDirtySource(source) {
 	markFineGrainedEffectsDirtySource(source);
@@ -68,7 +88,6 @@ function setupReactiveProp(el, propName, propFn, tagName) {
 			if (getRuntimeEnv().NODE_ENV !== "production") logger.warn("[Askr] Reactive prop update failed:", err);
 		}
 	});
-	if (isBenchMetricScopeActive("coldCreate")) recordBenchCounter("reactivePropsMounted");
 	const cleanup = () => {
 		reactivePropRegistry.delete(descriptor);
 		effectHandle?.cleanup();
@@ -89,13 +108,9 @@ function setupReactiveProp(el, propName, propFn, tagName) {
 	};
 }
 function getOrCreateReactivePropsCleanupMap(el) {
-	let cleanupMap = elementReactivePropsCleanup.get(el);
-	if (!cleanupMap) {
-		cleanupMap = /* @__PURE__ */ new Map();
-		elementReactivePropsCleanup.set(el, cleanupMap);
-	}
-	return cleanupMap;
+	return getElementReactivePropsCleanupMap(el, true);
 }
+/** @internal Create a standalone reactive prop entry for rollback restoration. */
 function createReactivePropCleanupEntry(el, propName, propFn, tagName) {
 	const reactive = setupReactiveProp(el, propName, propFn, tagName);
 	return {
@@ -109,8 +124,30 @@ function createReactivePropCleanupEntry(el, propName, propFn, tagName) {
 }
 function hasTrackedElementPropBindings(el) {
 	const existingListeners = elementListeners.get(el);
-	const existingReactiveProps = elementReactivePropsCleanup.get(el);
-	return existingListeners !== void 0 && existingListeners.size > 0 || existingReactiveProps !== void 0 && existingReactiveProps.size > 0;
+	return existingListeners !== void 0 && existingListeners.size > 0 || getElementReactivePropCleanupSize(el) > 0;
+}
+function hasAnyElementBindingState(el) {
+	return hasTrackedElementPropBindings(el) || getDelegatedHandlersForElement(el) !== void 0 || elementRefs.has(el);
+}
+function applyMatchingElementBindings(el, props) {
+	if (Object.prototype.hasOwnProperty.call(props, "ref")) updateElementRef(el, props.ref);
+	for (const key in props) {
+		const eventProp = parseEventProp(key);
+		if (!eventProp) continue;
+		const value = props[key];
+		if (typeof value === "function") addTrackedListener(el, eventProp.eventName, value, eventProp.capture);
+	}
+}
+/** @internal Attach stateful bindings to a newly cloned blueprint element. */
+function applyFreshElementBindings(el, props) {
+	if (Object.prototype.hasOwnProperty.call(props, "ref")) updateElementRef(el, props.ref);
+	for (const key in props) {
+		const eventProp = parseEventProp(key);
+		if (eventProp) {
+			const value = props[key];
+			if (typeof value === "function") addTrackedListener(el, eventProp.eventName, value, eventProp.capture, true);
+		}
+	}
 }
 function applyPropsToElement(el, props, tagName, isHydrationSkipped) {
 	if (isHydrationSkipped(el)) return;
@@ -136,7 +173,7 @@ function applyPropsToElement(el, props, tagName, isHydrationSkipped) {
 }
 function syncElementPropBindings(el, domVNode, props, usesReactiveChildren) {
 	const existingListeners = elementListeners.get(el);
-	const existingReactiveProps = elementReactivePropsCleanup.get(el);
+	const existingReactiveProps = getElementReactivePropsCleanupMap(el);
 	let desiredListenerKeys = null;
 	let desiredDelegatedEventNames = null;
 	let desiredReactivePropNames = null;
@@ -275,6 +312,4 @@ function syncElementPropBindings(el, domVNode, props, usesReactiveChildren) {
 	}
 }
 //#endregion
-export { applyPropsToElement, hasTrackedElementPropBindings, markReactivePropsDirtySource, syncElementPropBindings };
-
-//# sourceMappingURL=prop-bindings.js.map
+export { applyFreshElementBindings, applyMatchingElementBindings, applyPropsToElement, createReactivePropCleanupEntry, hasAnyElementBindingState, hasTrackedElementPropBindings, markReactivePropsDirtySource, syncElementPropBindings };

package/dist/renderer/reactive-child-dom.js

@@ -1,7 +1,9 @@
 import { teardownNodeSubtree } from "./cleanup.js";
+import { getRangeNodes } from "./dom-range.js";
 import { createElementForNamespace, getParentNamespace } from "./namespaces.js";
-import { syncControlBoundaryScopeDom } from "./boundaries.js";
 import { collectReactiveChildBoundaryVNodes, isSingleRootReactiveChildBoundaryValue } from "./reactive-child-sources.js";
+import { syncControlBoundaryScopeDom } from "./boundary-range-sync.js";
+import "./boundaries.js";
 //#region src/renderer/reactive-child-dom.ts
 function materializeReactiveChildBoundaryNodes(value, parentNamespace, host) {
 	const nodes = [];
@@ -72,6 +74,7 @@ function commitReactiveChildBoundaryEntryNodes(el, entry, host) {
 		host.updateElementChildren(boundaryHost, nextChildren);
 		const nextNodes = Array.from(boundaryHost.childNodes);
 		entry.scope.dom = void 0;
+		entry.scope.range = void 0;
 		entry.scope.needsDomUpdate = false;
 		entry.nodes = nextNodes;
 		return nextNodes;
@@ -80,6 +83,7 @@ function commitReactiveChildBoundaryEntryNodes(el, entry, host) {
 		disposeReactiveChildBoundaryNodes(entry.nodes);
 		entry.nodes = [];
 		entry.scope.dom = void 0;
+		entry.scope.range = void 0;
 	}
 	const nextDom = syncControlBoundaryScopeDom(el, entry.scope, entry.scope.vnode ?? null);
 	if (!nextDom) {
@@ -87,7 +91,11 @@ function commitReactiveChildBoundaryEntryNodes(el, entry, host) {
 		entry.scope.needsDomUpdate = false;
 		return entry.nodes;
 	}
-	entry.nodes = [nextDom];
+	entry.nodes = nextDom.single ? [nextDom.start] : [
+		nextDom.start,
+		...getRangeNodes(nextDom),
+		nextDom.end
+	];
 	entry.scope.needsDomUpdate = false;
 	return entry.nodes;
 }
@@ -129,5 +137,3 @@ function syncReactiveScalarTextNodes(el, slotValues, values, host) {
 }
 //#endregion
 export { commitReactiveChildBoundaryEntryNodes, createReactiveChildBoundaryHost, disposeReactiveChildBoundaryNodes, materializeReactiveChildBoundaryNodes, syncReactiveChildExpectedNodes, syncReactiveChildSequenceNodes, syncReactiveScalarTextNodes };
-
-//# sourceMappingURL=reactive-child-dom.js.map

package/dist/renderer/reactive-child-sources.js

@@ -180,5 +180,3 @@ function collectReactiveChildBoundaryVNodes(value, children) {
 }
 //#endregion
 export { areReactiveChildBoundarySequenceSourcesEqual, areReactiveScalarChildSourcesEqual, canUpdateReactiveChildBoundarySequenceSource, collectReactiveChildBoundaryVNodes, collectReactiveChildValuesAsVNodes, getReactiveChildBoundarySequenceSource, getReactiveScalarChildSource, getSingleReactiveChildBoundarySource, isSingleRootReactiveChildBoundaryValue, normalizeOwnedReactiveTextValue, normalizeReactiveChildBoundaryVNode, normalizeReactiveScalarSequenceValues };
-
-//# sourceMappingURL=reactive-child-sources.js.map

package/dist/renderer/reactive-children.js

@@ -1,24 +1,19 @@
 import { getRuntimeEnv } from "../common/env.js";
-import { logger } from "../dev/logger.js";
+import { logger } from "../common/logger.js";
 import { incDevCounter } from "../runtime/dev-namespace.js";
 import { getCurrentInstance } from "../runtime/component-scope.js";
-import "../runtime/component-contracts.js";
-import { REACTIVE_CHILDREN_KEY, elementReactivePropsCleanup, teardownNodeSubtree } from "./cleanup.js";
-import "./env.js";
 import { createChildScope, disposeChildScope, rerenderChildScope } from "../runtime/child-scope.js";
-import { getParentNamespace } from "./namespaces.js";
 import { createFineGrainedEffect } from "../runtime/effect.js";
+import "../runtime/index.js";
+import { REACTIVE_CHILDREN_KEY, elementReactivePropsCleanup, getElementReactivePropsCleanupMap, teardownNodeSubtree } from "./cleanup.js";
+import "./env.js";
+import { getParentNamespace } from "./namespaces.js";
 import { areReactiveChildBoundarySequenceSourcesEqual, areReactiveScalarChildSourcesEqual, canUpdateReactiveChildBoundarySequenceSource, collectReactiveChildValuesAsVNodes, getReactiveChildBoundarySequenceSource, getReactiveScalarChildSource, getSingleReactiveChildBoundarySource, normalizeOwnedReactiveTextValue, normalizeReactiveChildBoundaryVNode, normalizeReactiveScalarSequenceValues } from "./reactive-child-sources.js";
 import { commitReactiveChildBoundaryEntryNodes, createReactiveChildBoundaryHost, disposeReactiveChildBoundaryNodes, materializeReactiveChildBoundaryNodes, syncReactiveChildExpectedNodes, syncReactiveChildSequenceNodes, syncReactiveScalarTextNodes } from "./reactive-child-dom.js";
 //#region src/renderer/reactive-children.ts
 let reactiveChildScopeId = 0;
 function getOrCreateElementReactiveCleanupMap(el) {
-	let cleanupMap = elementReactivePropsCleanup.get(el);
-	if (!cleanupMap) {
-		cleanupMap = /* @__PURE__ */ new Map();
-		elementReactivePropsCleanup.set(el, cleanupMap);
-	}
-	return cleanupMap;
+	return getElementReactivePropsCleanupMap(el, true);
 }
 function trySyncScalarChildSequenceInPlace(el, children, host) {
 	const normalized = normalizeReactiveScalarSequenceValues(children);
@@ -47,6 +42,11 @@ function setupReactiveScalarChild(el, source, host) {
 					host.updateElementChildren(el, value);
 					return;
 				}
+				if (!ownedTextNode && el.childNodes.length === 0) {
+					ownedTextNode = el.ownerDocument.createTextNode(normalized);
+					el.appendChild(ownedTextNode);
+					return;
+				}
 				if (!ownedTextNode || el.childNodes.length !== 1 || el.firstChild !== ownedTextNode) {
 					host.updateElementChildren(el, normalized);
 					ownedTextNode = el.childNodes.length === 1 && el.firstChild?.nodeType === Node.TEXT_NODE ? el.firstChild : null;
@@ -124,6 +124,18 @@ function setupReactiveScalarChild(el, source, host) {
 		}
 	};
 }
+/** @internal Create a standalone scalar-child binding for rollback restoration. */
+function createReactiveScalarChildCleanupEntry(el, source, host) {
+	const reactive = setupReactiveScalarChild(el, source, host);
+	return {
+		cleanup: reactive.cleanup,
+		updateFn: (nextValue) => {
+			reactive.updateFn(nextValue);
+		},
+		restoreFn: (nextValue) => createReactiveScalarChildCleanupEntry(el, nextValue, host),
+		fnRef: source
+	};
+}
 function setupReactiveChildBoundary(el, childFn, host) {
 	let currentChildFn = childFn;
 	const entry = {
@@ -224,17 +236,23 @@ function syncReactiveScalarChild(el, children, host) {
 	const reactiveChildSource = getReactiveScalarChildSource(children);
 	const reactiveChildBoundary = getSingleReactiveChildBoundarySource(children);
 	const reactiveChildBoundarySequence = getReactiveChildBoundarySequenceSource(children);
-	const existingReactiveEntry = elementReactivePropsCleanup.get(el)?.get(REACTIVE_CHILDREN_KEY);
+	const cleanupMap = getElementReactivePropsCleanupMap(el);
+	const existingReactiveEntry = cleanupMap?.get(REACTIVE_CHILDREN_KEY);
 	if (!reactiveChildSource && !reactiveChildBoundary && !reactiveChildBoundarySequence) {
 		if (existingReactiveEntry) {
 			existingReactiveEntry.cleanup();
-			const cleanupMap = elementReactivePropsCleanup.get(el);
 			cleanupMap?.delete(REACTIVE_CHILDREN_KEY);
 			if (cleanupMap && cleanupMap.size === 0) elementReactivePropsCleanup.delete(el);
 		}
 		return false;
 	}
 	if (reactiveChildSource && !reactiveChildBoundarySequence) {
+		if (existingReactiveEntry?.groupedScalar && existingReactiveEntry.updateFn && reactiveChildSource.length === 1 && reactiveChildSource[0]?.kind === "dynamic") {
+			const nextCompute = reactiveChildSource[0].compute;
+			existingReactiveEntry.updateFn(nextCompute);
+			existingReactiveEntry.fnRef = nextCompute;
+			return true;
+		}
 		if (existingReactiveEntry && Array.isArray(existingReactiveEntry.fnRef) && areReactiveScalarChildSourcesEqual(existingReactiveEntry.fnRef, reactiveChildSource)) return true;
 		if (existingReactiveEntry?.updateFn && Array.isArray(existingReactiveEntry.fnRef)) {
 			existingReactiveEntry.updateFn(reactiveChildSource);
@@ -243,14 +261,7 @@ function syncReactiveScalarChild(el, children, host) {
 		}
 		existingReactiveEntry?.cleanup();
 		try {
-			const reactive = setupReactiveScalarChild(el, reactiveChildSource, host);
-			getOrCreateElementReactiveCleanupMap(el).set(REACTIVE_CHILDREN_KEY, {
-				cleanup: reactive.cleanup,
-				updateFn: (nextValue) => {
-					reactive.updateFn(nextValue);
-				},
-				fnRef: reactiveChildSource
-			});
+			getOrCreateElementReactiveCleanupMap(el).set(REACTIVE_CHILDREN_KEY, createReactiveScalarChildCleanupEntry(el, reactiveChildSource, host));
 			return true;
 		} catch (error) {
 			if (!reactiveChildBoundary && !reactiveChildBoundarySequence) throw error;
@@ -289,6 +300,4 @@ function syncReactiveScalarChild(el, children, host) {
 	return true;
 }
 //#endregion
-export { syncReactiveScalarChild, trySyncScalarChildSequenceInPlace };
-
-//# sourceMappingURL=reactive-children.js.map
+export { createReactiveScalarChildCleanupEntry, syncReactiveScalarChild, trySyncScalarChildSequenceInPlace };

package/dist/renderer/reconcile-commit.js

@@ -34,5 +34,3 @@ function commitReconciliation(parent, finalNodes) {
 }
 //#endregion
 export { commitReconciliation };
-
-//# sourceMappingURL=reconcile-commit.js.map

package/dist/renderer/reconcile-fastpaths.js

@@ -1,9 +1,10 @@
 import { getRuntimeEnv } from "../common/env.js";
 import "./env.js";
-import { checkPropChanges, recordFastPathStats } from "./utils.js";
+import { checkPropChanges, getMaterializedKey, recordFastPathStats } from "./utils.js";
 import { keyedElements, planKeyedReorderFastPath } from "./keyed.js";
 import { canReuseIntrinsicElementInNamespace, getParentNamespace } from "./namespaces.js";
-import { performBulkPositionalKeyedTextUpdate } from "./children.js";
+import { performBulkPositionalKeyedTextUpdate } from "./children-fastpath.js";
+import "./children.js";
 import { applyRendererFastPath } from "./fastpath.js";
 //#region src/renderer/reconcile-fastpaths.ts
 function tryFastPaths(parent, newChildren, keyedVnodes, oldKeyMap) {
@@ -66,8 +67,7 @@ function countPositionalMatches(parent, keyedVnodes, parentNamespace) {
 			const el = parent.children[i];
 			if (!el) continue;
 			if (canReuseIntrinsicElementInNamespace(el, vnode.type, parentNamespace)) {
-				const actualKey = el.getAttribute("data-key");
-				if (actualKey === String(expectedKey) || actualKey !== null && !Number.isNaN(Number(actualKey)) && Number(actualKey) === expectedKey) matchCount++;
+				if (getMaterializedKey(el) === expectedKey) matchCount++;
 			}
 		}
 	} catch {}
@@ -90,17 +90,11 @@ function rebuildKeyedMap(parent) {
 	try {
 		const map = /* @__PURE__ */ new Map();
 		for (let el = parent.firstElementChild; el; el = el.nextElementSibling) {
-			const k = el.getAttribute("data-key");
-			if (k !== null) {
-				map.set(k, el);
-				const n = Number(k);
-				if (!Number.isNaN(n)) map.set(n, el);
-			}
+			const key = getMaterializedKey(el);
+			if (key !== void 0) map.set(key, el);
 		}
 		keyedElements.set(parent, map);
 	} catch {}
 }
 //#endregion
 export { tryFastPaths };
-
-//# sourceMappingURL=reconcile-fastpaths.js.map

package/dist/renderer/reconcile-resolution.js

@@ -1,8 +1,8 @@
 import { __FOR_BOUNDARY__ } from "../common/vnode.js";
-import { extractKey } from "./utils.js";
-import { evaluateForState } from "../runtime/for-internal.js";
-import "../runtime/for.js";
 import { evaluateCaseState, evaluateShowState } from "../runtime/control.js";
+import { clearForDomUpdateState, evaluateForState } from "../runtime/for-internal.js";
+import "../runtime/index.js";
+import { extractKey, getMaterializedKey } from "./utils.js";
 import { canReuseIntrinsicElementInNamespace, getParentNamespace } from "./namespaces.js";
 import { getRendererDOMHost } from "./dom-host.js";
 //#region src/renderer/reconcile-resolution.ts
@@ -14,39 +14,17 @@ function createOldElResolver(parent, oldKeyMap, usedOldEls) {
 			usedOldEls.add(direct);
 			return direct;
 		}
-		const s = String(k);
-		const byString = oldKeyMap.get(s);
-		if (byString && !usedOldEls.has(byString)) {
-			usedOldEls.add(byString);
-			return byString;
-		}
-		const n = Number(s);
-		if (!Number.isNaN(n)) {
-			const byNum = oldKeyMap.get(n);
-			if (byNum && !usedOldEls.has(byNum)) {
-				usedOldEls.add(byNum);
-				return byNum;
-			}
-		}
-		return scanForElementByKey(parent, k, s, usedOldEls);
+		return scanForElementByKey(parent, k, usedOldEls);
 	};
 }
-function scanForElementByKey(parent, k, keyStr, usedOldEls) {
+function scanForElementByKey(parent, k, usedOldEls) {
 	try {
 		for (let ch = parent.firstElementChild; ch; ch = ch.nextElementSibling) {
 			if (usedOldEls.has(ch)) continue;
-			const attr = ch.getAttribute("data-key");
-			if (attr === keyStr) {
+			if (getMaterializedKey(ch) === k) {
 				usedOldEls.add(ch);
 				return ch;
 			}
-			if (attr !== null) {
-				const numAttr = Number(attr);
-				if (!Number.isNaN(numAttr) && numAttr === k) {
-					usedOldEls.add(ch);
-					return ch;
-				}
-			}
 		}
 	} catch {}
 }
@@ -64,7 +42,7 @@ function reconcileKeyedChild(child, key, parent, resolveOldElOnce, newKeyMap) {
 	const el = resolveOldElOnce(key);
 	const parentNamespace = getParentNamespace(parent);
 	const domHost = getRendererDOMHost();
-	if (el && el.parentElement === parent) try {
+	if (el && el.parentElement === parent) {
 		const childObj = child;
 		if (childObj && typeof childObj === "object" && typeof childObj.type === "string") {
 			if (canReuseIntrinsicElementInNamespace(el, childObj.type, parentNamespace)) {
@@ -80,7 +58,7 @@ function reconcileKeyedChild(child, key, parent, resolveOldElOnce, newKeyMap) {
 				return synced;
 			}
 		}
-	} catch {}
+	}
 	const dom = domHost.createDOMNode(child, parentNamespace);
 	if (dom) {
 		if (dom instanceof Element) newKeyMap.set(key, dom);
@@ -91,31 +69,29 @@ function reconcileKeyedChild(child, key, parent, resolveOldElOnce, newKeyMap) {
 function reconcileUnkeyedChild(child, index, parent, resolveUnkeyedOnce, usedOldEls) {
 	const parentNamespace = getParentNamespace(parent);
 	const domHost = getRendererDOMHost();
-	try {
-		const existing = parent.childNodes[index];
-		if (typeof child === "string" || typeof child === "number") {
-			if (existing && existing.nodeType === 3) {
-				existing.data = String(child);
-				usedOldEls.add(existing);
-				return existing;
-			}
-			return domHost.createDOMNode(child, parentNamespace);
-		}
-		if (existing instanceof Element) {
-			const synced = trySyncComponentChild(existing, child, usedOldEls, parentNamespace);
-			if (synced) return synced;
-		}
-		if (existing instanceof Element && canReuseElement(existing, child, parentNamespace)) {
-			domHost.updateElementFromVnode(existing, child);
+	const existing = parent.childNodes[index];
+	if (typeof child === "string" || typeof child === "number") {
+		if (existing && existing.nodeType === 3) {
+			existing.data = String(child);
 			usedOldEls.add(existing);
 			return existing;
 		}
-		const avail = resolveUnkeyedOnce();
-		if (avail) {
-			const reuseResult = tryReuseElement(avail, child, usedOldEls, parentNamespace);
-			if (reuseResult) return reuseResult;
-		}
-	} catch {}
+		return domHost.createDOMNode(child, parentNamespace);
+	}
+	if (existing instanceof Element) {
+		const synced = trySyncComponentChild(existing, child, usedOldEls, parentNamespace);
+		if (synced) return synced;
+	}
+	if (existing instanceof Element && canReuseElement(existing, child, parentNamespace)) {
+		domHost.updateElementFromVnode(existing, child);
+		usedOldEls.add(existing);
+		return existing;
+	}
+	const avail = resolveUnkeyedOnce();
+	if (avail) {
+		const reuseResult = tryReuseElement(avail, child, usedOldEls, parentNamespace);
+		if (reuseResult) return reuseResult;
+	}
 	return domHost.createDOMNode(child, parentNamespace);
 }
 function isComponentVNode(child) {
@@ -130,10 +106,12 @@ function prepareControlBoundaryResolution(child) {
 	if (!controlState) return null;
 	if (controlState.kind === "for") {
 		const childrenVNodes = evaluateControlBoundaryChildren(controlState);
-		return childrenVNodes.length === 1 ? {
+		if (childrenVNodes.length !== 1) return null;
+		clearForDomUpdateState(controlState);
+		return {
 			remount: false,
 			vnode: childrenVNodes[0] ?? null
-		} : null;
+		};
 	}
 	const previousActiveKey = controlState.activeKey;
 	const childrenVNodes = evaluateControlBoundaryChildren(controlState);
@@ -183,5 +161,3 @@ function tryReuseElement(avail, child, usedOldEls, parentNamespace) {
 }
 //#endregion
 export { collectUnkeyedElements, createOldElResolver, reconcileSingleChild };
-
-//# sourceMappingURL=reconcile-resolution.js.map

package/dist/renderer/reconcile.js

@@ -35,5 +35,3 @@ function performFullReconciliation(parent, newChildren, oldKeyMap) {
 }
 //#endregion
 export { reconcileKeyedChildren };
-
-//# sourceMappingURL=reconcile.js.map