marko 6.1.18 → 6.1.21

package/dist/debug/dom.js

@@ -230,19 +230,12 @@ function push(opt, item) {
 }
 //#endregion
 //#region src/dom/event.ts
-const defaultDelegator = /* @__PURE__ */ createDelegator();
 function _on(element, type, handler) {
 	assertHandlerIsFunction("on" + type[0].toUpperCase() + type.slice(1), handler);
-	if (element["$" + type] === void 0) defaultDelegator(element, type, handleDelegated);
+	if (element["$" + type] === void 0) delegate(type, handleDelegated);
 	element["$" + type] = handler || null;
 }
-/* @__NO_SIDE_EFFECTS__ */
-function createDelegator() {
-	const kEvents = Symbol();
-	return function ensureDelegated(node, type, handler) {
-		((node = node.getRootNode())[kEvents] ||= {})[type] ||= (node.addEventListener(type, handler, true), 1);
-	};
-}
+const delegate = (type, handler) => handler[type] ||= (document.addEventListener(type, handler, true), 1);
 function handleDelegated(ev) {
 	let target = !rendering && ev.target;
 	Object.defineProperty(ev, "currentTarget", {
@@ -725,8 +718,8 @@ function init(runtimeId = "M") {
 				}
 			};
 			const serializeContext = ((data, registryId) => typeof data === "number" ? registryId ? registeredValues[registryId](getScope(data)) : getScope(data) : applyScopes(data));
-			const createVisitBranches = (branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => {
-				return (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
+			const createVisitBranches = (branchScopesStack = [], branchStarts = [], orphanBranches = [], deferredOwners = [], curBranchScopes) => {
+				return (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length, j = deferredOwners.length) => {
 					if (visitType !== "[") {
 						visitScope[nextToken()] = visitType === ")" || visitType === "}" ? parent : visit;
 						accessor = "BranchScopes:" + lastToken;
@@ -753,6 +746,10 @@ function init(runtimeId = "M") {
 							branch["#EndNode"] = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
 						}
 						while (i && orphanBranches[--i]["#Id"] > branchId) setParentBranch(orphanBranches.pop(), branch);
+						while (j && deferredOwners[--j]["#Id"] > branchId) {
+							const owner = deferredOwners.pop();
+							if (owner["#ClosestBranch"] !== owner) owner["#ClosestBranch"] = branch;
+						}
 						nextToken();
 					}
 					if (endedBranches) {
@@ -765,7 +762,7 @@ function init(runtimeId = "M") {
 							curBranchScopes = void 0;
 						}
 						branchStarts.push(visit);
-					}
+					} else deferredOwners.push(visitScope);
 				};
 			};
 			const nextToken = () => lastToken = visitText.slice(lastTokenIndex, (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1 || visitText.length + 1) - 1);
@@ -867,7 +864,6 @@ function _el(id, accessor) {
 //#endregion
 //#region src/dom/controllable.ts
 let inputType = "";
-const controllableDelegate = /* @__PURE__ */ createDelegator();
 function _attr_input_checked_default(scope, nodeAccessor, checked) {
 	const el = scope[nodeAccessor];
 	const normalizedChecked = isNotVoid(checked);
@@ -927,7 +923,7 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 			const oldValue = scope["ControlledValue:" + nodeAccessor];
 			const newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
 			if (el.name && el.type[0] === "r") {
-				for (const radio of el.getRootNode().querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : oldValue === radio.value;
+				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : oldValue === radio.value;
 			} else el.checked = !el.checked;
 			checkedValueChange(newValue);
 			run();
@@ -969,7 +965,7 @@ function _attr_input_value_script(scope, nodeAccessor) {
 }
 function setInputValue(el, value) {
 	if (el.value !== value) {
-		const updatedPosition = resolveCursorPosition(inputType, el.getRootNode().activeElement === el && el.selectionStart, el.value, el.value = value);
+		const updatedPosition = resolveCursorPosition(inputType, document.activeElement === el && el.selectionStart, el.value, el.value = value);
 		if (~updatedPosition) el.setSelectionRange(updatedPosition, updatedPosition);
 	}
 }
@@ -1076,8 +1072,8 @@ function _attr_details_or_dialog_open_script(scope, nodeAccessor) {
 }
 function syncControllableFormInput(el, hasChanged, onChange) {
 	el._ = onChange;
-	controllableDelegate(el, "input", handleChange);
-	if (el.form) controllableDelegate(el.form, "reset", handleFormReset);
+	delegate("input", handleChange);
+	if (el.form) delegate("reset", handleFormReset);
 	if (isResuming && hasChanged(el)) queueMicrotask(onChange);
 }
 function handleChange(ev) {
@@ -1198,11 +1194,16 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
 	scope["ControlledHandler:" + nodeAccessor] = 0;
 	switch (el.tagName) {
 		case "INPUT":
-			if ("checked" in nextAttrs || "checkedChange" in nextAttrs) _attr_input_checked(scope, nodeAccessor, nextAttrs.checked, nextAttrs.checkedChange);
-			else if ("checkedValue" in nextAttrs || "checkedValueChange" in nextAttrs) _attr_input_checkedValue(scope, nodeAccessor, nextAttrs.checkedValue, nextAttrs.checkedValueChange, nextAttrs.value);
-			else if ("value" in nextAttrs || "valueChange" in nextAttrs) _attr_input_value(scope, nodeAccessor, nextAttrs.value, nextAttrs.valueChange);
-			else break;
-			skip = /^(?:value|checked(?:Value)?)(?:Change)?$/;
+			if ("checked" in nextAttrs || "checkedChange" in nextAttrs) {
+				_attr_input_checked(scope, nodeAccessor, nextAttrs.checked, nextAttrs.checkedChange);
+				skip = /^checked(?:Value)?(?:Change)?$/;
+			} else if ("checkedValue" in nextAttrs || "checkedValueChange" in nextAttrs) {
+				_attr_input_checkedValue(scope, nodeAccessor, nextAttrs.checkedValue, nextAttrs.checkedValueChange, nextAttrs.value);
+				skip = /^(?:value|checked(?:Value)?)(?:Change)?$/;
+			} else if ("value" in nextAttrs || "valueChange" in nextAttrs) {
+				_attr_input_value(scope, nodeAccessor, nextAttrs.value, nextAttrs.valueChange);
+				skip = /^value(?:Change)?$/;
+			} else break;
 			break;
 		case "SELECT":
 			if ("value" in nextAttrs || "valueChange" in nextAttrs) {
@@ -1353,7 +1354,12 @@ function _await_promise(nodeAccessor, params) {
 				c() {
 					if (--awaitCounter.i) return 1;
 					if (tryBranch === scope[branchAccessor]) {
-						if (scope[nodeAccessor].parentNode) scope[nodeAccessor].replaceWith(scope[branchAccessor]["#StartNode"].parentNode);
+						const anchor = scope[nodeAccessor];
+						if (anchor.parentNode) {
+							const detachedParent = scope[branchAccessor]["#StartNode"].parentNode;
+							if (detachedParent === anchor.parentNode) anchor.remove();
+							else anchor.replaceWith(detachedParent);
+						}
 					} else dismissPlaceholder(tryBranch);
 					queueEffect(tryBranch, runPendingEffects);
 				}
@@ -1933,7 +1939,7 @@ const compat = {
 			component.scope = branch;
 			classIdToBranch.delete(component.id);
 		}
-		if (typeof args[0] === "object" && "renderBody" in args[0]) {
+		if (args[0] && typeof args[0] === "object" && "renderBody" in args[0]) {
 			const input = args[0];
 			const normalizedInput = args[0] = {};
 			for (const key in input) normalizedInput[key === "renderBody" ? "content" : key] = input[key];
@@ -2052,35 +2058,34 @@ function _load_setup(nodeAccessor, childScopeAccessor, load) {
 	};
 }
 function insertLoaded(renderer, branch, marker, awaitCounter) {
-	const parent = marker.parentNode;
-	syncGen(branch);
-	renderer["clone"](branch, parent.namespaceURI);
-	setupBranch(renderer, branch);
-	applyLoad(branch, () => {
+	const parent = marker.parentNode, values = branch["#Load"], insert = () => {
 		insertBranchBefore(branch, parent, marker);
 		marker.remove();
 		awaitCounter?.c();
-	});
-}
-function loadFailed(scope, awaitCounter) {
-	return (error) => {
-		if (awaitCounter) awaitCounter.i = 0;
-		queueAsyncRender(scope, renderCatch, error);
 	};
-}
-function applyLoad(scope, insert) {
-	const values = scope["#Load"];
 	let remaining;
-	scope["#Load"] = 0;
+	syncGen(branch);
+	renderer["clone"](branch, parent.namespaceURI);
+	branch["#Load"] = 0;
 	if (remaining = values?.size) for (const [promise, entry] of values) promise.then((signal) => {
 		entry["signal"] = signal;
-		if (!--remaining) queueAsyncRender(scope, (scope) => {
-			syncGen(scope);
-			values.forEach((e) => e["signal"]._(scope, e["value"]));
+		if (!--remaining) queueAsyncRender(branch, (branch) => {
+			syncGen(branch);
+			renderer["setup"]?.(branch);
+			values.forEach((e) => e["signal"]._(branch, e["value"]));
 			insert();
 		});
 	}, () => 0);
-	else insert();
+	else {
+		setupBranch(renderer, branch);
+		insert();
+	}
+}
+function loadFailed(scope, awaitCounter) {
+	return (error) => {
+		if (awaitCounter) awaitCounter.i = 0;
+		queueAsyncRender(scope, renderCatch, error);
+	};
 }
 function _load_signal(load) {
 	let pending;

package/dist/debug/dom.mjs

@@ -228,19 +228,12 @@ function push(opt, item) {
 }
 //#endregion
 //#region src/dom/event.ts
-const defaultDelegator = /* @__PURE__ */ createDelegator();
 function _on(element, type, handler) {
 	assertHandlerIsFunction("on" + type[0].toUpperCase() + type.slice(1), handler);
-	if (element["$" + type] === void 0) defaultDelegator(element, type, handleDelegated);
+	if (element["$" + type] === void 0) delegate(type, handleDelegated);
 	element["$" + type] = handler || null;
 }
-/* @__NO_SIDE_EFFECTS__ */
-function createDelegator() {
-	const kEvents = Symbol();
-	return function ensureDelegated(node, type, handler) {
-		((node = node.getRootNode())[kEvents] ||= {})[type] ||= (node.addEventListener(type, handler, true), 1);
-	};
-}
+const delegate = (type, handler) => handler[type] ||= (document.addEventListener(type, handler, true), 1);
 function handleDelegated(ev) {
 	let target = !rendering && ev.target;
 	Object.defineProperty(ev, "currentTarget", {
@@ -723,8 +716,8 @@ function init(runtimeId = "M") {
 				}
 			};
 			const serializeContext = ((data, registryId) => typeof data === "number" ? registryId ? registeredValues[registryId](getScope(data)) : getScope(data) : applyScopes(data));
-			const createVisitBranches = (branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => {
-				return (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
+			const createVisitBranches = (branchScopesStack = [], branchStarts = [], orphanBranches = [], deferredOwners = [], curBranchScopes) => {
+				return (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length, j = deferredOwners.length) => {
 					if (visitType !== "[") {
 						visitScope[nextToken()] = visitType === ")" || visitType === "}" ? parent : visit;
 						accessor = "BranchScopes:" + lastToken;
@@ -751,6 +744,10 @@ function init(runtimeId = "M") {
 							branch["#EndNode"] = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
 						}
 						while (i && orphanBranches[--i]["#Id"] > branchId) setParentBranch(orphanBranches.pop(), branch);
+						while (j && deferredOwners[--j]["#Id"] > branchId) {
+							const owner = deferredOwners.pop();
+							if (owner["#ClosestBranch"] !== owner) owner["#ClosestBranch"] = branch;
+						}
 						nextToken();
 					}
 					if (endedBranches) {
@@ -763,7 +760,7 @@ function init(runtimeId = "M") {
 							curBranchScopes = void 0;
 						}
 						branchStarts.push(visit);
-					}
+					} else deferredOwners.push(visitScope);
 				};
 			};
 			const nextToken = () => lastToken = visitText.slice(lastTokenIndex, (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1 || visitText.length + 1) - 1);
@@ -865,7 +862,6 @@ function _el(id, accessor) {
 //#endregion
 //#region src/dom/controllable.ts
 let inputType = "";
-const controllableDelegate = /* @__PURE__ */ createDelegator();
 function _attr_input_checked_default(scope, nodeAccessor, checked) {
 	const el = scope[nodeAccessor];
 	const normalizedChecked = isNotVoid(checked);
@@ -925,7 +921,7 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 			const oldValue = scope["ControlledValue:" + nodeAccessor];
 			const newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
 			if (el.name && el.type[0] === "r") {
-				for (const radio of el.getRootNode().querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : oldValue === radio.value;
+				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : oldValue === radio.value;
 			} else el.checked = !el.checked;
 			checkedValueChange(newValue);
 			run();
@@ -967,7 +963,7 @@ function _attr_input_value_script(scope, nodeAccessor) {
 }
 function setInputValue(el, value) {
 	if (el.value !== value) {
-		const updatedPosition = resolveCursorPosition(inputType, el.getRootNode().activeElement === el && el.selectionStart, el.value, el.value = value);
+		const updatedPosition = resolveCursorPosition(inputType, document.activeElement === el && el.selectionStart, el.value, el.value = value);
 		if (~updatedPosition) el.setSelectionRange(updatedPosition, updatedPosition);
 	}
 }
@@ -1074,8 +1070,8 @@ function _attr_details_or_dialog_open_script(scope, nodeAccessor) {
 }
 function syncControllableFormInput(el, hasChanged, onChange) {
 	el._ = onChange;
-	controllableDelegate(el, "input", handleChange);
-	if (el.form) controllableDelegate(el.form, "reset", handleFormReset);
+	delegate("input", handleChange);
+	if (el.form) delegate("reset", handleFormReset);
 	if (isResuming && hasChanged(el)) queueMicrotask(onChange);
 }
 function handleChange(ev) {
@@ -1196,11 +1192,16 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
 	scope["ControlledHandler:" + nodeAccessor] = 0;
 	switch (el.tagName) {
 		case "INPUT":
-			if ("checked" in nextAttrs || "checkedChange" in nextAttrs) _attr_input_checked(scope, nodeAccessor, nextAttrs.checked, nextAttrs.checkedChange);
-			else if ("checkedValue" in nextAttrs || "checkedValueChange" in nextAttrs) _attr_input_checkedValue(scope, nodeAccessor, nextAttrs.checkedValue, nextAttrs.checkedValueChange, nextAttrs.value);
-			else if ("value" in nextAttrs || "valueChange" in nextAttrs) _attr_input_value(scope, nodeAccessor, nextAttrs.value, nextAttrs.valueChange);
-			else break;
-			skip = /^(?:value|checked(?:Value)?)(?:Change)?$/;
+			if ("checked" in nextAttrs || "checkedChange" in nextAttrs) {
+				_attr_input_checked(scope, nodeAccessor, nextAttrs.checked, nextAttrs.checkedChange);
+				skip = /^checked(?:Value)?(?:Change)?$/;
+			} else if ("checkedValue" in nextAttrs || "checkedValueChange" in nextAttrs) {
+				_attr_input_checkedValue(scope, nodeAccessor, nextAttrs.checkedValue, nextAttrs.checkedValueChange, nextAttrs.value);
+				skip = /^(?:value|checked(?:Value)?)(?:Change)?$/;
+			} else if ("value" in nextAttrs || "valueChange" in nextAttrs) {
+				_attr_input_value(scope, nodeAccessor, nextAttrs.value, nextAttrs.valueChange);
+				skip = /^value(?:Change)?$/;
+			} else break;
 			break;
 		case "SELECT":
 			if ("value" in nextAttrs || "valueChange" in nextAttrs) {
@@ -1351,7 +1352,12 @@ function _await_promise(nodeAccessor, params) {
 				c() {
 					if (--awaitCounter.i) return 1;
 					if (tryBranch === scope[branchAccessor]) {
-						if (scope[nodeAccessor].parentNode) scope[nodeAccessor].replaceWith(scope[branchAccessor]["#StartNode"].parentNode);
+						const anchor = scope[nodeAccessor];
+						if (anchor.parentNode) {
+							const detachedParent = scope[branchAccessor]["#StartNode"].parentNode;
+							if (detachedParent === anchor.parentNode) anchor.remove();
+							else anchor.replaceWith(detachedParent);
+						}
 					} else dismissPlaceholder(tryBranch);
 					queueEffect(tryBranch, runPendingEffects);
 				}
@@ -1931,7 +1937,7 @@ const compat = {
 			component.scope = branch;
 			classIdToBranch.delete(component.id);
 		}
-		if (typeof args[0] === "object" && "renderBody" in args[0]) {
+		if (args[0] && typeof args[0] === "object" && "renderBody" in args[0]) {
 			const input = args[0];
 			const normalizedInput = args[0] = {};
 			for (const key in input) normalizedInput[key === "renderBody" ? "content" : key] = input[key];
@@ -2050,35 +2056,34 @@ function _load_setup(nodeAccessor, childScopeAccessor, load) {
 	};
 }
 function insertLoaded(renderer, branch, marker, awaitCounter) {
-	const parent = marker.parentNode;
-	syncGen(branch);
-	renderer["clone"](branch, parent.namespaceURI);
-	setupBranch(renderer, branch);
-	applyLoad(branch, () => {
+	const parent = marker.parentNode, values = branch["#Load"], insert = () => {
 		insertBranchBefore(branch, parent, marker);
 		marker.remove();
 		awaitCounter?.c();
-	});
-}
-function loadFailed(scope, awaitCounter) {
-	return (error) => {
-		if (awaitCounter) awaitCounter.i = 0;
-		queueAsyncRender(scope, renderCatch, error);
 	};
-}
-function applyLoad(scope, insert) {
-	const values = scope["#Load"];
 	let remaining;
-	scope["#Load"] = 0;
+	syncGen(branch);
+	renderer["clone"](branch, parent.namespaceURI);
+	branch["#Load"] = 0;
 	if (remaining = values?.size) for (const [promise, entry] of values) promise.then((signal) => {
 		entry["signal"] = signal;
-		if (!--remaining) queueAsyncRender(scope, (scope) => {
-			syncGen(scope);
-			values.forEach((e) => e["signal"]._(scope, e["value"]));
+		if (!--remaining) queueAsyncRender(branch, (branch) => {
+			syncGen(branch);
+			renderer["setup"]?.(branch);
+			values.forEach((e) => e["signal"]._(branch, e["value"]));
 			insert();
 		});
 	}, () => 0);
-	else insert();
+	else {
+		setupBranch(renderer, branch);
+		insert();
+	}
+}
+function loadFailed(scope, awaitCounter) {
+	return (error) => {
+		if (awaitCounter) awaitCounter.i = 0;
+		queueAsyncRender(scope, renderCatch, error);
+	};
 }
 function _load_signal(load) {
 	let pending;

package/dist/debug/html.js

@@ -877,8 +877,11 @@ function writeDate(state, val) {
 	state.buf.push("new Date(" + +val + ")");
 	return true;
 }
+const unsafeRegExpSourceReg = /\\[\s\S]|</g;
+const replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match;
 function writeRegExp(state, val) {
-	state.buf.push(val + "");
+	const { source } = val;
+	state.buf.push("/" + (source.includes("<") ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags);
 	return true;
 }
 function writePromise(state, val, ref) {
@@ -1008,7 +1011,7 @@ function writeWeakMap(state) {
 }
 function writeError(state, val, ref) {
 	const result = "new " + val.constructor.name + "(" + quote(val.message + "", 0);
-	if (val.cause) {
+	if (val.cause !== void 0) {
 		state.buf.push(result + ",{cause:");
 		writeProp(state, val.cause, ref, "cause");
 		state.buf.push("})");
@@ -2464,7 +2467,8 @@ function _attr_style(value) {
 }
 function _attr_option_value(value) {
 	const valueAttr = _attr("value", value);
-	if (normalizedValueMatches(getContext(kSelectedValue), value)) {
+	const selectedValue = getContext(kSelectedValue);
+	if (selectedValue !== void 0 && normalizedValueMatches(selectedValue, value)) {
 		{
 			const matched = getContext(kSelectedValueMatched);
 			if (matched) matched.value = true;
@@ -2475,29 +2479,29 @@ function _attr_option_value(value) {
 }
 const kSelectedValue = Symbol("selectedValue");
 const kSelectedValueMatched = Symbol("selectedValueMatched");
-function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content) {
-	if (valueChange) writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange);
+function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content, serializeType) {
+	if (valueChange) writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType);
 	if (content) if (valueChange) {
 		const matched = { value: false };
 		withContext(kSelectedValue, value, () => withContext(kSelectedValueMatched, matched, content));
 		if (!matched.value && (Array.isArray(value) ? value.some((v) => normalizeStrAttrValue(v) !== "") : normalizeStrAttrValue(value) !== "")) console.error("A controlled `<select>`'s `value` has no matching `<option>`:", value);
 	} else withContext(kSelectedValue, value, content);
 }
-function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
-	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange);
+function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
+	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
 	return _escape(value);
 }
-function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
-	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange);
+function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
+	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
 	return _attr("value", value);
 }
-function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange) {
-	if (checkedChange) writeControlledScope(0, scopeId, nodeAccessor, void 0, checkedChange);
+function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange, serializeType) {
+	if (checkedChange) writeControlledScope(0, scopeId, nodeAccessor, void 0, checkedChange, serializeType);
 	return isNotVoid(checked) ? " checked" : "";
 }
-function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value) {
+function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value, serializeType) {
 	const valueAttr = _attr("value", value);
-	if (checkedValueChange) writeControlledScope(1, scopeId, nodeAccessor, getCheckedValueRef(checkedValue), checkedValueChange);
+	if (checkedValueChange) writeControlledScope(1, scopeId, nodeAccessor, getCheckedValueRef(checkedValue), checkedValueChange, serializeType);
 	return normalizedValueMatches(checkedValue, value) ? valueAttr + " checked" : valueAttr;
 }
 const checkedValuesRefs = /* @__PURE__ */ new WeakMap();
@@ -2511,9 +2515,9 @@ function getCheckedValueRef(checkedValue) {
 		return ref;
 	}
 }
-function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange) {
+function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange, serializeType) {
 	const normalizedOpen = isNotVoid(open);
-	if (openChange) writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen || void 0, openChange);
+	if (openChange) writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen || void 0, openChange, serializeType);
 	return normalizedOpen ? " open" : "";
 }
 function _attr_nonce() {
@@ -2529,11 +2533,16 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 	switch (tagName) {
 		case "input":
 			assertExclusiveAttrs(data);
-			if (data.checkedChange) result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange);
-			else if ("checkedValue" in data || data.checkedValueChange) result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value);
-			else if (data.valueChange) result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange);
-			else break;
-			skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/;
+			if (data.checkedChange) {
+				result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange, 1);
+				skip = /^checked(?:Value)?(?:Change)?$|[\s/>"'=]/;
+			} else if ("checkedValue" in data || data.checkedValueChange) {
+				result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value, 1);
+				skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/;
+			} else if (data.valueChange) {
+				result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange, 1);
+				skip = /^value(?:Change)?$|[\s/>"'=]/;
+			} else break;
 			break;
 		case "select":
 		case "textarea":
@@ -2548,7 +2557,7 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 		case "details":
 		case "dialog":
 			if (data.openChange) {
-				result += _attr_details_or_dialog_open(scopeId, nodeAccessor, data.open, data.openChange);
+				result += _attr_details_or_dialog_open(scopeId, nodeAccessor, data.open, data.openChange, 1);
 				skip = /^open(?:Change)?$|[\s/>"'=]/;
 			}
 			break;
@@ -2594,12 +2603,15 @@ function _attrs_partial_content(data, skip, nodeAccessor, scopeId, tagName, seri
 	_html(`${_attrs_partial(data, skip, nodeAccessor, scopeId, tagName)}>`);
 	_attr_content(nodeAccessor, scopeId, data?.content, serializeReason);
 }
-function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange) {
+function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange, serializeType) {
 	assertHandlerIsFunction("valueChange", valueChange);
-	writeScope(scopeId, {
+	writeScope(scopeId, serializeType ? {
 		["ControlledType:" + nodeAccessor]: type,
 		["ControlledValue:" + nodeAccessor]: value,
 		["ControlledHandler:" + nodeAccessor]: valueChange
+	} : {
+		["ControlledValue:" + nodeAccessor]: value,
+		["ControlledHandler:" + nodeAccessor]: valueChange
 	});
 }
 function stringAttr(name, value) {
@@ -2665,10 +2677,10 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 			const renderContent = content || normalizeDynamicRenderer(input.content);
 			if (renderer === "textarea") {
 				if (renderContent) throw new Error("A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead.");
-				_html(_attr_textarea_value(branchId, `#${renderer}/0`, input.value, input.valueChange));
+				_html(_attr_textarea_value(branchId, `#${renderer}/0`, input.value, input.valueChange, 1));
 			} else if (renderContent) {
 				if (typeof renderContent !== "function") throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
-				if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, `#${renderer}/0`, input.value, input.valueChange, renderContent);
+				if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, `#${renderer}/0`, input.value, input.valueChange, renderContent, 1);
 				else _dynamic_tag(branchId, `#${renderer}/0`, renderContent, void 0, 0, void 0, serializeReason);
 			}
 			_html(`</${renderer}>`);