marko 6.3.16 → 6.3.17

package/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright 2024 eBay Inc. and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/dist/common/accessor.d.ts

@@ -30,6 +30,7 @@ export declare enum AccessorProp {
     Id = "L",
     Load = "X",
     LoopKey = "M",
+    LoopIndex = "I",
     ParentBranch = "N",
     PendingEffects = "J",
     PendingRenders = "W",

package/dist/common/accessor.debug.d.ts

@@ -30,6 +30,7 @@ export declare enum AccessorProp {
     Id = "#Id",
     Load = "#Load",
     LoopKey = "#LoopKey",
+    LoopIndex = "#LoopIndex",
     ParentBranch = "#ParentBranch",
     PendingEffects = "#PendingEffects",
     PendingRenders = "#PendingRenders",

package/dist/common/types.d.ts

@@ -50,7 +50,6 @@ export declare enum NodeType {
 }
 export declare enum WalkCode {
     Get = 32,
-    Inside = 36,
     Replace = 37,
     EndChild = 38,
     BeginChild = 47,

package/dist/debug/dom.js

@@ -991,9 +991,12 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 		if (checkedValueChange) {
 			const controlledValueKey = "ControlledValue:" + nodeAccessor;
 			const oldValue = scope[controlledValueKey];
-			const newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
+			let 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 document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked;
+				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) {
+					if (newValue === void 0 && radio.defaultChecked) newValue = radio.value;
+					radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked;
+				}
 			} else el.checked = !el.checked;
 			checkedValueChange(newValue);
 			run();
@@ -1500,7 +1503,9 @@ function _await_promise(nodeAccessor, params) {
 			}
 		}, (error) => {
 			if (thisPromise === scope[promiseAccessor]) {
-				awaitCounter.i = scope[promiseAccessor] = 0;
+				scope[promiseAccessor] = 0;
+				if (tryPlaceholder && !awaitCounter.m) awaitCounter.c();
+				else awaitCounter.i = 0;
 				queueAsyncRender(scope, renderCatch, error);
 			}
 		});
@@ -1733,12 +1738,17 @@ function loop(forEach) {
 			const parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.["#StartNode"].parentNode : referenceNode;
 			let oldScopesByKey;
 			let hasPotentialMoves;
+			let start = 0;
 			var seenKeys = /* @__PURE__ */ new Set();
 			forEach(value, (key, args) => {
 				assertValidLoopKey(key, seenKeys);
-				let branch = oldLen && (oldScopesByKey ||= oldScopes.reduce((map, scope, i) => map.set(scope["#LoopKey"] ?? i, scope), /* @__PURE__ */ new Map())).get(key);
-				if (branch) hasPotentialMoves = oldScopesByKey.delete(key);
-				else branch = createAndSetupBranch(scope["$global"], renderer, scope, parentNode);
+				const i = newScopes.length;
+				const oldScope = oldScopes[i];
+				let branch = oldLen && (oldScopesByKey || key !== (oldScope?.["#LoopKey"] ?? i) ? (oldScopesByKey ||= oldScopes.reduce((map, scope, j) => j < i ? map : (scope["#LoopIndex"] = j, map.set(scope["#LoopKey"] ?? j, scope)), /* @__PURE__ */ new Map())).get(key) : oldScope && (start++, oldScope));
+				if (branch) {
+					hasPotentialMoves = true;
+					oldScopesByKey?.delete(key);
+				} else branch = createAndSetupBranch(scope["$global"], renderer, scope, parentNode);
 				branch["#LoopKey"] = key;
 				newScopes.push(branch);
 				params?.(branch, args);
@@ -1748,7 +1758,6 @@ function loop(forEach) {
 			let afterReference = null;
 			let oldEnd = oldLen - 1;
 			let newEnd = newLen - 1;
-			let start = 0;
 			if (hasSiblings) {
 				if (oldLen) {
 					afterReference = oldScopes[oldEnd]["#EndNode"].nextSibling;
@@ -1766,19 +1775,18 @@ function loop(forEach) {
 				for (const newScope of newScopes) insertBranchBefore(newScope, parentNode, afterReference);
 				return;
 			}
-			for (const branch of oldScopesByKey.values()) removeAndDestroyBranch(branch);
-			while (start < oldLen && start < newLen && oldScopes[start] === newScopes[start]) start++;
+			if (oldScopesByKey) oldScopesByKey.forEach(removeAndDestroyBranch);
+			else for (let i = newLen; i < oldLen; i++) removeAndDestroyBranch(oldScopes[i]);
 			while (oldEnd >= start && newEnd >= start && oldScopes[oldEnd] === newScopes[newEnd]) {
 				oldEnd--;
 				newEnd--;
 			}
 			if (oldEnd + 1 < oldLen) afterReference = oldScopes[oldEnd + 1]["#StartNode"];
-			if (start > oldEnd) {
-				if (start <= newEnd) for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
+			if (start > oldEnd || start > newEnd) {
+				for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
 				return;
-			} else if (start > newEnd) return;
+			}
 			const diffLen = newEnd - start + 1;
-			const oldPos = /* @__PURE__ */ new Map();
 			const sources = new Array(diffLen);
 			const pred = new Array(diffLen);
 			const tails = [];
@@ -1786,8 +1794,7 @@ function loop(forEach) {
 			let lo;
 			let hi;
 			let mid;
-			for (let i = start; i <= oldEnd; i++) oldPos.set(oldScopes[i], i);
-			for (let i = diffLen; i--;) sources[i] = oldPos.get(newScopes[start + i]) ?? -1;
+			for (let i = diffLen; i--;) sources[i] = newScopes[start + i]["#LoopIndex"] ?? -1;
 			for (let i = 0; i < diffLen; i++) if (~sources[i]) if (tail < 0 || sources[tails[tail]] < sources[i]) {
 				if (~tail) pred[i] = tails[tail];
 				tails[++tail] = i;
@@ -2217,7 +2224,8 @@ function insertLoaded(renderer, branch, marker, awaitCounter) {
 }
 function loadFailed(scope, awaitCounter) {
 	return (error) => {
-		if (awaitCounter) awaitCounter.i = 0;
+		if (awaitCounter) if (awaitCounter.m) awaitCounter.i = 0;
+		else awaitCounter.c();
 		queueAsyncRender(scope, renderCatch, error);
 	};
 }

package/dist/debug/dom.mjs

@@ -989,9 +989,12 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 		if (checkedValueChange) {
 			const controlledValueKey = "ControlledValue:" + nodeAccessor;
 			const oldValue = scope[controlledValueKey];
-			const newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
+			let 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 document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked;
+				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) {
+					if (newValue === void 0 && radio.defaultChecked) newValue = radio.value;
+					radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked;
+				}
 			} else el.checked = !el.checked;
 			checkedValueChange(newValue);
 			run();
@@ -1498,7 +1501,9 @@ function _await_promise(nodeAccessor, params) {
 			}
 		}, (error) => {
 			if (thisPromise === scope[promiseAccessor]) {
-				awaitCounter.i = scope[promiseAccessor] = 0;
+				scope[promiseAccessor] = 0;
+				if (tryPlaceholder && !awaitCounter.m) awaitCounter.c();
+				else awaitCounter.i = 0;
 				queueAsyncRender(scope, renderCatch, error);
 			}
 		});
@@ -1731,12 +1736,17 @@ function loop(forEach) {
 			const parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.["#StartNode"].parentNode : referenceNode;
 			let oldScopesByKey;
 			let hasPotentialMoves;
+			let start = 0;
 			var seenKeys = /* @__PURE__ */ new Set();
 			forEach(value, (key, args) => {
 				assertValidLoopKey(key, seenKeys);
-				let branch = oldLen && (oldScopesByKey ||= oldScopes.reduce((map, scope, i) => map.set(scope["#LoopKey"] ?? i, scope), /* @__PURE__ */ new Map())).get(key);
-				if (branch) hasPotentialMoves = oldScopesByKey.delete(key);
-				else branch = createAndSetupBranch(scope["$global"], renderer, scope, parentNode);
+				const i = newScopes.length;
+				const oldScope = oldScopes[i];
+				let branch = oldLen && (oldScopesByKey || key !== (oldScope?.["#LoopKey"] ?? i) ? (oldScopesByKey ||= oldScopes.reduce((map, scope, j) => j < i ? map : (scope["#LoopIndex"] = j, map.set(scope["#LoopKey"] ?? j, scope)), /* @__PURE__ */ new Map())).get(key) : oldScope && (start++, oldScope));
+				if (branch) {
+					hasPotentialMoves = true;
+					oldScopesByKey?.delete(key);
+				} else branch = createAndSetupBranch(scope["$global"], renderer, scope, parentNode);
 				branch["#LoopKey"] = key;
 				newScopes.push(branch);
 				params?.(branch, args);
@@ -1746,7 +1756,6 @@ function loop(forEach) {
 			let afterReference = null;
 			let oldEnd = oldLen - 1;
 			let newEnd = newLen - 1;
-			let start = 0;
 			if (hasSiblings) {
 				if (oldLen) {
 					afterReference = oldScopes[oldEnd]["#EndNode"].nextSibling;
@@ -1764,19 +1773,18 @@ function loop(forEach) {
 				for (const newScope of newScopes) insertBranchBefore(newScope, parentNode, afterReference);
 				return;
 			}
-			for (const branch of oldScopesByKey.values()) removeAndDestroyBranch(branch);
-			while (start < oldLen && start < newLen && oldScopes[start] === newScopes[start]) start++;
+			if (oldScopesByKey) oldScopesByKey.forEach(removeAndDestroyBranch);
+			else for (let i = newLen; i < oldLen; i++) removeAndDestroyBranch(oldScopes[i]);
 			while (oldEnd >= start && newEnd >= start && oldScopes[oldEnd] === newScopes[newEnd]) {
 				oldEnd--;
 				newEnd--;
 			}
 			if (oldEnd + 1 < oldLen) afterReference = oldScopes[oldEnd + 1]["#StartNode"];
-			if (start > oldEnd) {
-				if (start <= newEnd) for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
+			if (start > oldEnd || start > newEnd) {
+				for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
 				return;
-			} else if (start > newEnd) return;
+			}
 			const diffLen = newEnd - start + 1;
-			const oldPos = /* @__PURE__ */ new Map();
 			const sources = new Array(diffLen);
 			const pred = new Array(diffLen);
 			const tails = [];
@@ -1784,8 +1792,7 @@ function loop(forEach) {
 			let lo;
 			let hi;
 			let mid;
-			for (let i = start; i <= oldEnd; i++) oldPos.set(oldScopes[i], i);
-			for (let i = diffLen; i--;) sources[i] = oldPos.get(newScopes[start + i]) ?? -1;
+			for (let i = diffLen; i--;) sources[i] = newScopes[start + i]["#LoopIndex"] ?? -1;
 			for (let i = 0; i < diffLen; i++) if (~sources[i]) if (tail < 0 || sources[tails[tail]] < sources[i]) {
 				if (~tail) pred[i] = tails[tail];
 				tails[++tail] = i;
@@ -2215,7 +2222,8 @@ function insertLoaded(renderer, branch, marker, awaitCounter) {
 }
 function loadFailed(scope, awaitCounter) {
 	return (error) => {
-		if (awaitCounter) awaitCounter.i = 0;
+		if (awaitCounter) if (awaitCounter.m) awaitCounter.i = 0;
+		else awaitCounter.c();
 		queueAsyncRender(scope, renderCatch, error);
 	};
 }

package/dist/debug/html.js

@@ -239,8 +239,8 @@ function _escape_script(val) {
 	assertValidTextValue(val);
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeStyleReg = /<\/style/gi;
-const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
+const unsafeStyleReg = /<(\/style)/gi;
+const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str;
 function _escape_style(val) {
 	assertValidTextValue(val);
 	return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
@@ -906,11 +906,18 @@ function writeDate(state, val) {
 	state.buf.push("new Date(" + +val + ")");
 	return true;
 }
-const unsafeRegExpSourceReg = /\\[\s\S]|</g;
-const replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match;
+const unsafeRegExpSourceReg = /\\[\s\S]|[<\0\ud800-\udfff]/gu;
+const unsafeRegExpSourceDetect = /[<\0\ud800-\udfff]/u;
+const replaceUnsafeRegExpSourceChar = (match) => {
+	const ch = match.length === 3 ? "" : match[match.length - 1];
+	if (ch === "<") return "\\x3C";
+	if (ch === "\0") return "\\x00";
+	const code = ch.charCodeAt(0);
+	return code >= 55296 && code <= 57343 ? "\\u" + code.toString(16).padStart(4, "0") : match;
+};
 function writeRegExp(state, val) {
 	const { source } = val;
-	state.buf.push("/" + (source.includes("<") ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags);
+	state.buf.push("/" + (unsafeRegExpSourceDetect.test(source) ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags);
 	return true;
 }
 function writePromise(state, val, ref) {
@@ -2582,15 +2589,21 @@ const kSelectedValue = Symbol("selectedValue");
 const kSelectedValueMatched = Symbol("selectedValueMatched");
 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);
+	if (content) {
+		const selectedValue = value ?? "";
+		if (valueChange) {
+			const matched = { value: false };
+			withContext(kSelectedValue, selectedValue, () => 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, selectedValue, content);
+	}
 }
 function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	return _escape(value);
+	return _textarea_value(value);
+}
+function _textarea_value(value) {
+	return _escape(normalizeStrAttrValue(value));
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
@@ -3344,6 +3357,7 @@ exports._show_start = _show_start;
 exports._style_html = _style_html;
 exports._subscribe = _subscribe;
 exports._template = _template;
+exports._textarea_value = _textarea_value;
 exports._to_text = _to_text;
 exports._trailers = _trailers;
 exports._try = _try;

package/dist/debug/html.mjs

@@ -237,8 +237,8 @@ function _escape_script(val) {
 	assertValidTextValue(val);
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeStyleReg = /<\/style/gi;
-const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
+const unsafeStyleReg = /<(\/style)/gi;
+const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str;
 function _escape_style(val) {
 	assertValidTextValue(val);
 	return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
@@ -904,11 +904,18 @@ function writeDate(state, val) {
 	state.buf.push("new Date(" + +val + ")");
 	return true;
 }
-const unsafeRegExpSourceReg = /\\[\s\S]|</g;
-const replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match;
+const unsafeRegExpSourceReg = /\\[\s\S]|[<\0\ud800-\udfff]/gu;
+const unsafeRegExpSourceDetect = /[<\0\ud800-\udfff]/u;
+const replaceUnsafeRegExpSourceChar = (match) => {
+	const ch = match.length === 3 ? "" : match[match.length - 1];
+	if (ch === "<") return "\\x3C";
+	if (ch === "\0") return "\\x00";
+	const code = ch.charCodeAt(0);
+	return code >= 55296 && code <= 57343 ? "\\u" + code.toString(16).padStart(4, "0") : match;
+};
 function writeRegExp(state, val) {
 	const { source } = val;
-	state.buf.push("/" + (source.includes("<") ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags);
+	state.buf.push("/" + (unsafeRegExpSourceDetect.test(source) ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags);
 	return true;
 }
 function writePromise(state, val, ref) {
@@ -2580,15 +2587,21 @@ const kSelectedValue = Symbol("selectedValue");
 const kSelectedValueMatched = Symbol("selectedValueMatched");
 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);
+	if (content) {
+		const selectedValue = value ?? "";
+		if (valueChange) {
+			const matched = { value: false };
+			withContext(kSelectedValue, selectedValue, () => 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, selectedValue, content);
+	}
 }
 function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	return _escape(value);
+	return _textarea_value(value);
+}
+function _textarea_value(value) {
+	return _escape(normalizeStrAttrValue(value));
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
@@ -3270,4 +3283,4 @@ const compat = {
 };
 function NOOP() {}
 //#endregion
-export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };
+export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };

package/dist/dom.js

@@ -620,7 +620,7 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 		let checkedValueChange = scope["E" + nodeAccessor];
 		if (checkedValueChange) {
 			let controlledValueKey = "G" + nodeAccessor, oldValue = scope[controlledValueKey], newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
-			if (el.name && el.type[0] === "r") for (let radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) radio.form === el.form && (radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked);
+			if (el.name && el.type[0] === "r") for (let radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) radio.form === el.form && (newValue === void 0 && radio.defaultChecked && (newValue = radio.value), radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked);
 			else el.checked = !el.checked;
 			checkedValueChange(newValue), run();
 		}
@@ -977,7 +977,7 @@ function _await_promise(nodeAccessor, params) {
 				});
 			}
 		}, (error) => {
-			thisPromise === scope[promiseAccessor] && (awaitCounter.i = scope[promiseAccessor] = 0, queueAsyncRender(scope, renderCatch, error));
+			thisPromise === scope[promiseAccessor] && (scope[promiseAccessor] = 0, tryPlaceholder && !awaitCounter.m ? awaitCounter.c() : awaitCounter.i = 0, queueAsyncRender(scope, renderCatch, error));
 		});
 	};
 }
@@ -1083,27 +1083,26 @@ function loop(forEach) {
 		return enableBranches(), (scope, value) => {
 			let referenceNode = scope[nodeAccessor], oldScopes = toArray(scope[scopesAccessor]), newScopes = scope[scopesAccessor] = [];
 			scope[keyedScopesAccessor] = null;
-			let oldLen = oldScopes.length, parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.S.parentNode : referenceNode, oldScopesByKey, hasPotentialMoves;
+			let oldLen = oldScopes.length, parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.S.parentNode : referenceNode, oldScopesByKey, hasPotentialMoves, start = 0;
 			forEach(value, (key, args) => {
-				let branch = oldLen && (oldScopesByKey ||= oldScopes.reduce((map, scope, i) => map.set(scope.M ?? i, scope), /* @__PURE__ */ new Map())).get(key);
-				branch ? hasPotentialMoves = oldScopesByKey.delete(key) : branch = createAndSetupBranch(scope.$, renderer, scope, parentNode), branch.M = key, newScopes.push(branch), params?.(branch, args);
+				let i = newScopes.length, oldScope = oldScopes[i], branch = oldLen && (oldScopesByKey || key !== (oldScope?.M ?? i) ? (oldScopesByKey ||= oldScopes.reduce((map, scope, j) => j < i ? map : (scope.I = j, map.set(scope.M ?? j, scope)), /* @__PURE__ */ new Map())).get(key) : oldScope && (start++, oldScope));
+				branch ? (hasPotentialMoves = !0, oldScopesByKey?.delete(key)) : branch = createAndSetupBranch(scope.$, renderer, scope, parentNode), branch.M = key, newScopes.push(branch), params?.(branch, args);
 			});
-			let newLen = newScopes.length, hasSiblings = referenceNode !== parentNode, afterReference = null, oldEnd = oldLen - 1, newEnd = newLen - 1, start = 0;
+			let newLen = newScopes.length, hasSiblings = referenceNode !== parentNode, afterReference = null, oldEnd = oldLen - 1, newEnd = newLen - 1;
 			if (hasSiblings && (oldLen ? (afterReference = oldScopes[oldEnd].K.nextSibling, newLen || parentNode.insertBefore(referenceNode, afterReference)) : newLen && (afterReference = referenceNode.nextSibling, referenceNode.remove())), !hasPotentialMoves) {
 				oldLen && (oldScopes.forEach(hasSiblings ? removeAndDestroyBranch : destroyBranch), hasSiblings || (parentNode.textContent = ""));
 				for (let newScope of newScopes) insertBranchBefore(newScope, parentNode, afterReference);
 				return;
 			}
-			for (let branch of oldScopesByKey.values()) removeAndDestroyBranch(branch);
-			for (; start < oldLen && start < newLen && oldScopes[start] === newScopes[start];) start++;
+			if (oldScopesByKey) oldScopesByKey.forEach(removeAndDestroyBranch);
+			else for (let i = newLen; i < oldLen; i++) removeAndDestroyBranch(oldScopes[i]);
 			for (; oldEnd >= start && newEnd >= start && oldScopes[oldEnd] === newScopes[newEnd];) oldEnd--, newEnd--;
-			if (oldEnd + 1 < oldLen && (afterReference = oldScopes[oldEnd + 1].S), start > oldEnd) {
-				if (start <= newEnd) for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
+			if (oldEnd + 1 < oldLen && (afterReference = oldScopes[oldEnd + 1].S), start > oldEnd || start > newEnd) {
+				for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
 				return;
-			} else if (start > newEnd) return;
-			let diffLen = newEnd - start + 1, oldPos = /* @__PURE__ */ new Map(), sources = Array(diffLen), pred = Array(diffLen), tails = [], tail = -1, lo, hi, mid;
-			for (let i = start; i <= oldEnd; i++) oldPos.set(oldScopes[i], i);
-			for (let i = diffLen; i--;) sources[i] = oldPos.get(newScopes[start + i]) ?? -1;
+			}
+			let diffLen = newEnd - start + 1, sources = Array(diffLen), pred = Array(diffLen), tails = [], tail = -1, lo, hi, mid;
+			for (let i = diffLen; i--;) sources[i] = newScopes[start + i].I ?? -1;
 			for (let i = 0; i < diffLen; i++) if (~sources[i]) if (tail < 0 || sources[tails[tail]] < sources[i]) ~tail && (pred[i] = tails[tail]), tails[++tail] = i;
 			else {
 				for (lo = 0, hi = tail; lo < hi;) mid = (lo + hi) / 2 | 0, sources[tails[mid]] < sources[i] ? lo = mid + 1 : hi = mid;
@@ -1321,7 +1320,7 @@ function insertLoaded(renderer, branch, marker, awaitCounter) {
 }
 function loadFailed(scope, awaitCounter) {
 	return (error) => {
-		awaitCounter && (awaitCounter.i = 0), queueAsyncRender(scope, renderCatch, error);
+		awaitCounter && (awaitCounter.m ? awaitCounter.i = 0 : awaitCounter.c()), queueAsyncRender(scope, renderCatch, error);
 	};
 }
 function _load_signal(load) {

package/dist/dom.mjs

@@ -619,7 +619,7 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 		let checkedValueChange = scope["E" + nodeAccessor];
 		if (checkedValueChange) {
 			let controlledValueKey = "G" + nodeAccessor, oldValue = scope[controlledValueKey], newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
-			if (el.name && el.type[0] === "r") for (let radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) radio.form === el.form && (radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked);
+			if (el.name && el.type[0] === "r") for (let radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) radio.form === el.form && (newValue === void 0 && radio.defaultChecked && (newValue = radio.value), radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked);
 			else el.checked = !el.checked;
 			checkedValueChange(newValue), run();
 		}
@@ -976,7 +976,7 @@ function _await_promise(nodeAccessor, params) {
 				});
 			}
 		}, (error) => {
-			thisPromise === scope[promiseAccessor] && (awaitCounter.i = scope[promiseAccessor] = 0, queueAsyncRender(scope, renderCatch, error));
+			thisPromise === scope[promiseAccessor] && (scope[promiseAccessor] = 0, tryPlaceholder && !awaitCounter.m ? awaitCounter.c() : awaitCounter.i = 0, queueAsyncRender(scope, renderCatch, error));
 		});
 	};
 }
@@ -1082,27 +1082,26 @@ function loop(forEach) {
 		return enableBranches(), (scope, value) => {
 			let referenceNode = scope[nodeAccessor], oldScopes = toArray(scope[scopesAccessor]), newScopes = scope[scopesAccessor] = [];
 			scope[keyedScopesAccessor] = null;
-			let oldLen = oldScopes.length, parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.S.parentNode : referenceNode, oldScopesByKey, hasPotentialMoves;
+			let oldLen = oldScopes.length, parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.S.parentNode : referenceNode, oldScopesByKey, hasPotentialMoves, start = 0;
 			forEach(value, (key, args) => {
-				let branch = oldLen && (oldScopesByKey ||= oldScopes.reduce((map, scope, i) => map.set(scope.M ?? i, scope), /* @__PURE__ */ new Map())).get(key);
-				branch ? hasPotentialMoves = oldScopesByKey.delete(key) : branch = createAndSetupBranch(scope.$, renderer, scope, parentNode), branch.M = key, newScopes.push(branch), params?.(branch, args);
+				let i = newScopes.length, oldScope = oldScopes[i], branch = oldLen && (oldScopesByKey || key !== (oldScope?.M ?? i) ? (oldScopesByKey ||= oldScopes.reduce((map, scope, j) => j < i ? map : (scope.I = j, map.set(scope.M ?? j, scope)), /* @__PURE__ */ new Map())).get(key) : oldScope && (start++, oldScope));
+				branch ? (hasPotentialMoves = !0, oldScopesByKey?.delete(key)) : branch = createAndSetupBranch(scope.$, renderer, scope, parentNode), branch.M = key, newScopes.push(branch), params?.(branch, args);
 			});
-			let newLen = newScopes.length, hasSiblings = referenceNode !== parentNode, afterReference = null, oldEnd = oldLen - 1, newEnd = newLen - 1, start = 0;
+			let newLen = newScopes.length, hasSiblings = referenceNode !== parentNode, afterReference = null, oldEnd = oldLen - 1, newEnd = newLen - 1;
 			if (hasSiblings && (oldLen ? (afterReference = oldScopes[oldEnd].K.nextSibling, newLen || parentNode.insertBefore(referenceNode, afterReference)) : newLen && (afterReference = referenceNode.nextSibling, referenceNode.remove())), !hasPotentialMoves) {
 				oldLen && (oldScopes.forEach(hasSiblings ? removeAndDestroyBranch : destroyBranch), hasSiblings || (parentNode.textContent = ""));
 				for (let newScope of newScopes) insertBranchBefore(newScope, parentNode, afterReference);
 				return;
 			}
-			for (let branch of oldScopesByKey.values()) removeAndDestroyBranch(branch);
-			for (; start < oldLen && start < newLen && oldScopes[start] === newScopes[start];) start++;
+			if (oldScopesByKey) oldScopesByKey.forEach(removeAndDestroyBranch);
+			else for (let i = newLen; i < oldLen; i++) removeAndDestroyBranch(oldScopes[i]);
 			for (; oldEnd >= start && newEnd >= start && oldScopes[oldEnd] === newScopes[newEnd];) oldEnd--, newEnd--;
-			if (oldEnd + 1 < oldLen && (afterReference = oldScopes[oldEnd + 1].S), start > oldEnd) {
-				if (start <= newEnd) for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
+			if (oldEnd + 1 < oldLen && (afterReference = oldScopes[oldEnd + 1].S), start > oldEnd || start > newEnd) {
+				for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
 				return;
-			} else if (start > newEnd) return;
-			let diffLen = newEnd - start + 1, oldPos = /* @__PURE__ */ new Map(), sources = Array(diffLen), pred = Array(diffLen), tails = [], tail = -1, lo, hi, mid;
-			for (let i = start; i <= oldEnd; i++) oldPos.set(oldScopes[i], i);
-			for (let i = diffLen; i--;) sources[i] = oldPos.get(newScopes[start + i]) ?? -1;
+			}
+			let diffLen = newEnd - start + 1, sources = Array(diffLen), pred = Array(diffLen), tails = [], tail = -1, lo, hi, mid;
+			for (let i = diffLen; i--;) sources[i] = newScopes[start + i].I ?? -1;
 			for (let i = 0; i < diffLen; i++) if (~sources[i]) if (tail < 0 || sources[tails[tail]] < sources[i]) ~tail && (pred[i] = tails[tail]), tails[++tail] = i;
 			else {
 				for (lo = 0, hi = tail; lo < hi;) mid = (lo + hi) / 2 | 0, sources[tails[mid]] < sources[i] ? lo = mid + 1 : hi = mid;
@@ -1320,7 +1319,7 @@ function insertLoaded(renderer, branch, marker, awaitCounter) {
 }
 function loadFailed(scope, awaitCounter) {
 	return (error) => {
-		awaitCounter && (awaitCounter.i = 0), queueAsyncRender(scope, renderCatch, error);
+		awaitCounter && (awaitCounter.m ? awaitCounter.i = 0 : awaitCounter.c()), queueAsyncRender(scope, renderCatch, error);
 	};
 }
 function _load_signal(load) {

package/dist/html/attrs.d.ts

@@ -4,6 +4,7 @@ export declare function _attr_style(value: unknown): string;
 export declare function _attr_option_value(value: unknown): string;
 export declare function _attr_select_value(scopeId: number, nodeAccessor: Accessor, value: unknown, valueChange: unknown, content?: () => void, serializeType?: 1): void;
 export declare function _attr_textarea_value(scopeId: number, nodeAccessor: Accessor, value: unknown, valueChange: unknown, serializeType?: 1): string;
+export declare function _textarea_value(value: unknown): string;
 export declare function _attr_input_value(scopeId: number, nodeAccessor: Accessor, value: unknown, valueChange: unknown, serializeType?: 1): string;
 export declare function _attr_input_checked(scopeId: number, nodeAccessor: Accessor, checked: unknown, checkedChange: unknown, serializeType?: 1): "" | " checked";
 export declare function _attr_input_checkedValue(scopeId: number, nodeAccessor: Accessor, checkedValue: unknown, checkedValueChange: unknown, value: unknown, serializeType?: 1): string;

package/dist/html.d.ts

@@ -1,7 +1,7 @@
 export { attrTag, attrTags } from "./common/attr-tag";
 export { _assert_hoist, _el_read_error, _hoist_read_error, } from "./common/errors";
 export { _flush_head, withLoadAssets, withPageAssets } from "./html/assets";
-export { _attr, _attr_and, _attr_class, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _style_html, } from "./html/attrs";
+export { _attr, _attr_and, _attr_class, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _style_html, _textarea_value, } from "./html/attrs";
 export { compat } from "./html/compat";
 export { _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _to_text, _unescaped, } from "./html/content";
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";

package/dist/html.js

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -238,7 +238,13 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	[JSON, "JSON"],
 	[Math, "Math"],
 	[Reflect, "Reflect"]
-]), unsafeRegExpSourceReg = /\\[\s\S]|</g, replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, $chunk, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
+]), unsafeRegExpSourceReg = /\\[\s\S]|[<\0\ud800-\udfff]/gu, unsafeRegExpSourceDetect = /[<\0\ud800-\udfff]/u, replaceUnsafeRegExpSourceChar = (match) => {
+	let ch = match.length === 3 ? "" : match[match.length - 1];
+	if (ch === "<") return "\\x3C";
+	if (ch === "\0") return "\\x00";
+	let code = ch.charCodeAt(0);
+	return code >= 55296 && code <= 57343 ? "\\u" + code.toString(16).padStart(4, "0") : match;
+}, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, $chunk, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
 	let { state } = $chunk.boundary, target = $chunk.serializeState, scope = scopeWithId(state, scopeId), pending = target.writeScopes[scopeId];
 	return state.needsMainRuntime = !0, Object.assign(scope, partialScope), pending && pending !== partialScope ? Object.assign(pending, partialScope) : target.writeScopes[scopeId] = partialScope, target.flushScopes = !0, scope;
 }, NOOP$2 = () => {}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /'|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /"|&(?=[#a-zA-Z])/g, needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
@@ -707,7 +713,7 @@ function writeDate(state, val) {
 }
 function writeRegExp(state, val) {
 	let { source } = val;
-	return state.buf.push("/" + (source.includes("<") ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags), !0;
+	return state.buf.push("/" + (unsafeRegExpSourceDetect.test(source) ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags), !0;
 }
 function writePromise(state, val, ref) {
 	let { boundary, channel } = state;
@@ -1694,10 +1700,13 @@ function _attr_option_value(value) {
 	return selectedValue !== void 0 && normalizedValueMatches(selectedValue, value) ? valueAttr + " selected" : valueAttr;
 }
 function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content, serializeType) {
-	valueChange && writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType), content && withContext(kSelectedValue, value, content);
+	valueChange && writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType), content && withContext(kSelectedValue, value ?? "", content);
 }
 function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
-	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _escape(value);
+	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _textarea_value(value);
+}
+function _textarea_value(value) {
+	return _escape(normalizeStrAttrValue(value));
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _attr("value", value);
@@ -2063,4 +2072,4 @@ exports.$global = $global, exports._assert_hoist = _assert_hoist, exports._attr
 	get: function() {
 		return _dynamic_tag;
 	}
-}), exports._el = _el, exports._el_read_error = _el_read_error, exports._el_resume = _el_resume, exports._escape = _escape, exports._escape_comment = _escape_comment, exports._escape_script = _escape_script, exports._escape_style = _escape_style, exports._escape_style_value = _escape_style_value, exports._existing_scope = _existing_scope, exports._flush_head = _flush_head, exports._for_in = _for_in, exports._for_of = _for_of, exports._for_to = _for_to, exports._for_until = _for_until, exports._hoist = _hoist, exports._hoist_read_error = _hoist_read_error, exports._html = _html, exports._id = _id, exports._if = _if, exports._peek_scope_id = _peek_scope_id, exports._resume = _resume, exports._resume_branch = _resume_branch, exports._scope = writeScope, exports._scope_id = _scope_id, exports._scope_reason = _scope_reason, exports._scope_with_id = _scope_with_id, exports._script = _script, exports._sep = _sep, exports._serialize_guard = _serialize_guard, exports._serialize_if = _serialize_if, exports._set_serialize_reason = _set_serialize_reason, exports._show_end = _show_end, exports._show_start = _show_start, exports._style_html = _style_html, exports._subscribe = _subscribe, exports._template = _template, exports._to_text = _to_text, exports._trailers = _trailers, exports._try = _try, exports._unescaped = _unescaped, exports._var = _var, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = forIn, exports.forInBy = forInBy, exports.forOf = forOf, exports.forOfBy = forOfBy, exports.forStepBy = forStepBy, exports.forTo = forTo, exports.forUntil = forUntil, exports.withLoadAssets = withLoadAssets, exports.withPageAssets = withPageAssets;
+}), exports._el = _el, exports._el_read_error = _el_read_error, exports._el_resume = _el_resume, exports._escape = _escape, exports._escape_comment = _escape_comment, exports._escape_script = _escape_script, exports._escape_style = _escape_style, exports._escape_style_value = _escape_style_value, exports._existing_scope = _existing_scope, exports._flush_head = _flush_head, exports._for_in = _for_in, exports._for_of = _for_of, exports._for_to = _for_to, exports._for_until = _for_until, exports._hoist = _hoist, exports._hoist_read_error = _hoist_read_error, exports._html = _html, exports._id = _id, exports._if = _if, exports._peek_scope_id = _peek_scope_id, exports._resume = _resume, exports._resume_branch = _resume_branch, exports._scope = writeScope, exports._scope_id = _scope_id, exports._scope_reason = _scope_reason, exports._scope_with_id = _scope_with_id, exports._script = _script, exports._sep = _sep, exports._serialize_guard = _serialize_guard, exports._serialize_if = _serialize_if, exports._set_serialize_reason = _set_serialize_reason, exports._show_end = _show_end, exports._show_start = _show_start, exports._style_html = _style_html, exports._subscribe = _subscribe, exports._template = _template, exports._textarea_value = _textarea_value, exports._to_text = _to_text, exports._trailers = _trailers, exports._try = _try, exports._unescaped = _unescaped, exports._var = _var, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = forIn, exports.forInBy = forInBy, exports.forOf = forOf, exports.forOfBy = forOfBy, exports.forStepBy = forStepBy, exports.forTo = forTo, exports.forUntil = forUntil, exports.withLoadAssets = withLoadAssets, exports.withPageAssets = withPageAssets;

package/dist/html.mjs

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -238,7 +238,13 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	[JSON, "JSON"],
 	[Math, "Math"],
 	[Reflect, "Reflect"]
-]), unsafeRegExpSourceReg = /\\[\s\S]|</g, replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, $chunk, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
+]), unsafeRegExpSourceReg = /\\[\s\S]|[<\0\ud800-\udfff]/gu, unsafeRegExpSourceDetect = /[<\0\ud800-\udfff]/u, replaceUnsafeRegExpSourceChar = (match) => {
+	let ch = match.length === 3 ? "" : match[match.length - 1];
+	if (ch === "<") return "\\x3C";
+	if (ch === "\0") return "\\x00";
+	let code = ch.charCodeAt(0);
+	return code >= 55296 && code <= 57343 ? "\\u" + code.toString(16).padStart(4, "0") : match;
+}, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, $chunk, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
 	let { state } = $chunk.boundary, target = $chunk.serializeState, scope = scopeWithId(state, scopeId), pending = target.writeScopes[scopeId];
 	return state.needsMainRuntime = !0, Object.assign(scope, partialScope), pending && pending !== partialScope ? Object.assign(pending, partialScope) : target.writeScopes[scopeId] = partialScope, target.flushScopes = !0, scope;
 }, NOOP$2 = () => {}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /'|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /"|&(?=[#a-zA-Z])/g, needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
@@ -706,7 +712,7 @@ function writeDate(state, val) {
 }
 function writeRegExp(state, val) {
 	let { source } = val;
-	return state.buf.push("/" + (source.includes("<") ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags), !0;
+	return state.buf.push("/" + (unsafeRegExpSourceDetect.test(source) ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags), !0;
 }
 function writePromise(state, val, ref) {
 	let { boundary, channel } = state;
@@ -1693,10 +1699,13 @@ function _attr_option_value(value) {
 	return selectedValue !== void 0 && normalizedValueMatches(selectedValue, value) ? valueAttr + " selected" : valueAttr;
 }
 function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content, serializeType) {
-	valueChange && writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType), content && withContext(kSelectedValue, value, content);
+	valueChange && writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType), content && withContext(kSelectedValue, value ?? "", content);
 }
 function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
-	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _escape(value);
+	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _textarea_value(value);
+}
+function _textarea_value(value) {
+	return _escape(normalizeStrAttrValue(value));
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _attr("value", value);
@@ -2058,4 +2067,4 @@ function toObjectExpression(options) {
 //#region src/html/compat.ts
 function NOOP() {}
 //#endregion
-export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };
+export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };

package/dist/translator/index.js

@@ -127,6 +127,7 @@ let AccessorProp$1 = /* @__PURE__ */ function(AccessorProp) {
 	AccessorProp["Id"] = "#Id";
 	AccessorProp["Load"] = "#Load";
 	AccessorProp["LoopKey"] = "#LoopKey";
+	AccessorProp["LoopIndex"] = "#LoopIndex";
 	AccessorProp["ParentBranch"] = "#ParentBranch";
 	AccessorProp["PendingEffects"] = "#PendingEffects";
 	AccessorProp["PendingRenders"] = "#PendingRenders";
@@ -878,6 +879,7 @@ let AccessorProp = /* @__PURE__ */ function(AccessorProp) {
 	AccessorProp["Id"] = "L";
 	AccessorProp["Load"] = "X";
 	AccessorProp["LoopKey"] = "M";
+	AccessorProp["LoopIndex"] = "I";
 	AccessorProp["ParentBranch"] = "N";
 	AccessorProp["PendingEffects"] = "J";
 	AccessorProp["PendingRenders"] = "W";
@@ -1741,8 +1743,8 @@ const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeS
 function _escape_script(val) {
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeStyleReg = /<\/style/gi;
-const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
+const unsafeStyleReg = /<(\/style)/gi;
+const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str;
 function _escape_style(val) {
 	return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
@@ -1838,11 +1840,14 @@ function _attr_option_value(value) {
 const kSelectedValue = Symbol("selectedValue");
 function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content, serializeType) {
 	if (valueChange) writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	if (content) withContext(kSelectedValue, value, content);
+	if (content) withContext(kSelectedValue, value ?? "", content);
 }
 function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	return _escape(value);
+	return _textarea_value(value);
+}
+function _textarea_value(value) {
+	return _escape(normalizeStrAttrValue(value));
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
@@ -2385,7 +2390,6 @@ const [getSteps] = createSectionState("steps", (section) => {
 });
 const walkCodeToName = {
 	[32]: "get",
-	[36]: "inside",
 	[37]: "replace",
 	[38]: "endChild",
 	[47]: "beginChild",
@@ -2563,12 +2567,12 @@ function getSectionMetaIdentifiers(section) {
 	}
 	return meta;
 }
-function markNode(path, nodeBinding, reason) {
+function markNode(path, nodeBinding, reason, deferred) {
 	if (nodeBinding.type !== 0) throw path.buildCodeFrameError("POTENTIAL MARKO BUG: Tried to mark a node that was not determined to need a mark during analyze.");
 	if (isOutputHTML()) {
 		if (reason) {
 			const section = getSection(path);
-			writeTo(path)`${callRuntime("_el_resume", getScopeIdIdentifier(section), getScopeAccessorLiteral(nodeBinding), getSerializeGuard(section, reason, true))}`;
+			writeTo(path, deferred)`${callRuntime("_el_resume", getScopeIdIdentifier(section), getScopeAccessorLiteral(nodeBinding), getSerializeGuard(section, reason, true))}`;
 		}
 	}
 }
@@ -2810,16 +2814,9 @@ function simplifyFunction(fn) {
 //#endregion
 //#region src/translator/util/to-first-expression-or-block.ts
 function toFirstExpressionOrBlock(stmts) {
-	if (stmts.length === 1 && _marko_compiler.types.isExpressionStatement(stmts[0])) return toParenthesizedExpressionIfNeeded(stmts[0].expression);
+	if (stmts.length === 1 && _marko_compiler.types.isExpressionStatement(stmts[0])) return stmts[0].expression;
 	return _marko_compiler.types.blockStatement(stmts);
 }
-function toParenthesizedExpressionIfNeeded(expr) {
-	switch (expr.type) {
-		case "ObjectExpression":
-		case "AssignmentExpression": return _marko_compiler.types.parenthesizedExpression(expr);
-		default: return expr;
-	}
-}
 //#endregion
 //#region src/translator/util/signals.ts
 const [getSignals] = createSectionState("signals", () => /* @__PURE__ */ new Map());
@@ -2925,7 +2922,7 @@ function getSignal(section, referencedBindings, name) {
 			const render = getSignalFn(signal);
 			const closureSignalBuilder = getClosureSignalBuilder(section);
 			if (closureSignalBuilder && !isDynamicClosure(section, closure)) return closureSignalBuilder(closure, render);
-			return callRuntime("_closure_get", isOptimize() ? _marko_compiler.types.numericLiteral(getClosureAccessorId(closure)) : getScopeAccessorLiteral(closure, true), render, isImmediateOwner(section, closure) ? void 0 : _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], getScopeExpression(section, closure.section)), some(closure.closureSections, underTryPlaceholder) ? _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending")) : void 0);
+			return callRuntime("_closure_get", isOptimize() ? _marko_compiler.types.numericLiteral(getClosureAccessorId(closure)) : getScopeAccessorLiteral(closure, true), render, isImmediateOwner(section, closure) ? void 0 : _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], getScopeExpression(section, closure.section)), underTryPlaceholder(section) ? _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending")) : void 0);
 		};
 	}
 	return signal;
@@ -3123,7 +3120,7 @@ function replaceNullishAndEmptyFunctionsWith0(args) {
 				args[i] = _marko_compiler.types.numericLiteral(0);
 				continue;
 			}
-			if (body.length === 1 && _marko_compiler.types.isExpressionStatement(body[0])) arg.body = toParenthesizedExpressionIfNeeded(body[0].expression);
+			if (body.length === 1 && _marko_compiler.types.isExpressionStatement(body[0])) arg.body = body[0].expression;
 		}
 		if (finalLen === void 0) finalLen = i + 1;
 	}
@@ -3695,7 +3692,7 @@ function getRegisteredFnExpression(node) {
 //#region src/translator/util/body-to-text-literal.ts
 const kRawText = Symbol("raw text placeholder");
 function bodyToTextLiteral(body) {
-	return buildTextLiteral(body, toText, false);
+	return buildTextLiteral(body, toText, true);
 }
 function bodyToRawTextLiteral(body) {
 	return buildTextLiteral(body, (value) => value, true);
@@ -3719,15 +3716,17 @@ function buildTextLiteral(body, coerce, bareSingle) {
 	const templateExpressions = [];
 	let currentQuasi = "";
 	let placeholderExtra;
+	let singleValue;
 	for (const child of body.body) if (_marko_compiler.types.isMarkoText(child)) currentQuasi += child.value;
 	else if (_marko_compiler.types.isMarkoPlaceholder(child)) {
 		placeholderExtra ||= child.value.extra;
 		templateQuasis.push(templateElement(currentQuasi, false));
 		templateExpressions.push(coerce(child.value));
+		singleValue = child.value;
 		currentQuasi = "";
 	}
 	if (templateExpressions.length) {
-		if (bareSingle && templateExpressions.length === 1 && !currentQuasi && !templateQuasis[0].value.cooked) return templateExpressions[0];
+		if (bareSingle && templateExpressions.length === 1 && !currentQuasi && !templateQuasis[0].value.cooked && !_marko_compiler.types.isStringLiteral(singleValue)) return singleValue;
 		templateQuasis.push(templateElement(currentQuasi, true));
 		const literal = _marko_compiler.types.templateLiteral(templateQuasis, templateExpressions);
 		literal.extra = placeholderExtra;
@@ -4350,6 +4349,10 @@ var native_tag_default = {
 		let exprExtras;
 		for (let i = attributes.length; i--;) {
 			const attr = attributes[i];
+			if (_marko_compiler.types.isMarkoAttribute(attr) && attr.name === "content" && tag.node.body.body.length) {
+				dropNodes(attr.value);
+				continue;
+			}
 			const valueExtra = attr.value.extra ??= {};
 			if (_marko_compiler.types.isMarkoAttribute(attr)) {
 				if (seen[attr.name]) {
@@ -4489,7 +4492,7 @@ var native_tag_default = {
 						spreadExpression = spreadIdentifier;
 					}
 					if (valueChange) writeAtStartOfBody = callRuntime("_attr_textarea_value", getScopeIdIdentifier(tagSection), visitAccessor, value, valueChange, staticControllable ? void 0 : _marko_compiler.types.numericLiteral(1));
-					else if (value) writeAtStartOfBody = callRuntime("_escape", value);
+					else if (value) writeAtStartOfBody = callRuntime("_textarea_value", value);
 				}
 				for (const attr of staticAttrs) {
 					const { name, value } = attr;
@@ -4549,7 +4552,7 @@ var native_tag_default = {
 				const tagName = getCanonicalTagName(tag);
 				const tagSection = getSection(tag);
 				const markerSerializeReason = !tagExtra[kSkipEndTag] && nodeBinding && getSerializeReason(tagSection, nodeBinding);
-				const write = writeTo(tag, !markerSerializeReason && (tagName === "html" || tagName === "body"));
+				const write = writeTo(tag, tagName === "html" || !markerSerializeReason && tagName === "body");
 				if (tagExtra[kTagContentAttr]) flushBefore(tag);
 				if (selectArgs) {
 					if (!tagExtra[kSkipEndTag]) write`</${tagName}>`;
@@ -4563,7 +4566,7 @@ var native_tag_default = {
 					if (tagName === "head" && getMarkoOpts().linkAssets) write`${callRuntime("_flush_head")}`;
 					write`</${tagName}>`;
 				}
-				if (markerSerializeReason) markNode(tag, nodeBinding, markerSerializeReason);
+				if (markerSerializeReason) markNode(tag, nodeBinding, markerSerializeReason, tagName === "html");
 				tag.remove();
 			}
 		},
@@ -5257,7 +5260,7 @@ function flattenTextOnlyConditional(rootTag) {
 		if (node.body.attributeTags || !body.length) return;
 		const [attr] = node.attributes;
 		if (isCoreTagName(tag, "else")) {
-			if (node.attributes.length) return;
+			if (node.attributes.length > 1 || attr && (!_marko_compiler.types.isMarkoAttribute(attr) || attr.name !== "if")) return;
 		} else if (node.attributes.length !== 1 || !_marko_compiler.types.isMarkoAttribute(attr) || !attr.default) return;
 		for (const child of body) if (_marko_compiler.types.isMarkoText(child)) {
 			if (_escape(child.value) !== child.value) return;
@@ -5274,7 +5277,8 @@ function flattenTextOnlyConditional(rootTag) {
 		const branchTag = branches[i];
 		const text = bodyToRawTextLiteral(branchTag.node.body);
 		rawText ||= _marko_compiler.types.isTemplateLiteral(text);
-		expr = isCoreTagName(branchTag, "else") ? text : _marko_compiler.types.conditionalExpression(branchTag.node.attributes[0].value, text, expr);
+		const [conditionAttr] = branchTag.node.attributes;
+		expr = conditionAttr ? _marko_compiler.types.conditionalExpression(conditionAttr.value, text, expr) : text;
 	}
 	for (let i = branches.length; i-- > 1;) branches[i].remove();
 	const placeholder = _marko_compiler.types.markoPlaceholder(expr, true);
@@ -5499,7 +5503,7 @@ function getChangeHandler(tag, attr) {
 		if (!existingChangedAttr) {
 			const bindingIdentifierPath = binding.path.getOuterBindingIdentifierPaths()[binding.identifier.name];
 			let changeAttrExpr = bindingIdentifierPath ? bindingIdentifierPath.parentPath === binding.path ? buildChangeHandlerFunction(attr.value, modifier) : bindingIdentifierPath.parentPath.isObjectProperty() ? getChangeHandlerFromObjectPattern(bindingIdentifierPath.parentPath) : void 0 : void 0;
-			if (!changeAttrExpr) throw tag.hub.buildError(attr.value, "Unable to bind to value.");
+			if (!changeAttrExpr) throw tag.hub.buildError(attr.value, bindingIdentifierPath?.parentPath?.isArrayPattern() ? `Cannot two-way bind to \`${attr.value.name}\` because it comes from array destructuring, which has no change handler. Use object destructuring or pass an explicit \`${changeAttrName}\` attribute.` : "Unable to bind to value.");
 			if (modifier && _marko_compiler.types.isIdentifier(changeAttrExpr)) changeAttrExpr = _marko_compiler.types.logicalExpression("&&", changeAttrExpr, buildModifierForwarder(_marko_compiler.types.cloneNode(changeAttrExpr), modifier));
 			const changeHandlerAttr = _marko_compiler.types.markoAttribute(changeAttrName, changeAttrExpr);
 			BINDING_CHANGE_HANDLER.set(binding.identifier, changeHandlerAttr);
@@ -9492,6 +9496,14 @@ function optionalValueToNode(value) {
 const kDOMBinding = Symbol("dynamic tag dom binding");
 const kChildOffsetScopeBinding = Symbol("custom tag scope offset");
 const importedDynamicTagResume = /* @__PURE__ */ new WeakSet();
+const [getCompatRegistrations] = createProgramState(() => /* @__PURE__ */ new Set());
+function pushCompatRegistration(key, statement) {
+	const keys = getCompatRegistrations();
+	if (!keys.has(key)) {
+		keys.add(key);
+		(0, _marko_compiler_babel_utils.getProgram)().node.body.push(statement);
+	}
+}
 var dynamic_tag_default = {
 	analyze: { enter(tag) {
 		(0, _marko_compiler_babel_utils.assertAttributesOrArgs)(tag);
@@ -9572,32 +9584,33 @@ var dynamic_tag_default = {
 				if (_marko_compiler.types.isStringLiteral(tagExpression)) tagExpression = (0, _marko_compiler_babel_utils.importDefault)(tag.hub.file, getTagRelativePath(tag), tagExpression.value);
 				if (classTagTemplate) {
 					const preserveBoundary = !tagsSerializeReason && (classHydration === "descendant" || classHydration === "self" && !!classFile?.metadata.marko.hasComponentBrowser);
-					if (isOutputHTML() ? serializeReason || classHydration : serializeReason) (0, _marko_compiler_babel_utils.getProgram)().node.body.push(isOutputHTML() ? _marko_compiler.types.markoScriptlet([_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression((0, _marko_compiler_babel_utils.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"), [
+					if (isOutputHTML() ? serializeReason || classHydration : serializeReason) pushCompatRegistration(classFile.metadata.marko.id, isOutputHTML() ? _marko_compiler.types.markoScriptlet([_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression((0, _marko_compiler_babel_utils.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"), [
 						_marko_compiler.types.stringLiteral(classFile.metadata.marko.id),
 						_marko_compiler.types.identifier(tagExpression.name),
 						...preserveBoundary ? [_marko_compiler.types.stringLiteral("preserve")] : []
 					]))], true) : _marko_compiler.types.expressionStatement(callRuntime("_resume", _marko_compiler.types.stringLiteral(classFile.metadata.marko.id), _marko_compiler.types.identifier(tagExpression.name))));
-				} else (0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.markoScriptlet([_marko_compiler.types.expressionStatement(_marko_compiler.types.assignmentExpression("??=", _marko_compiler.types.memberExpression(_marko_compiler.types.identifier(tagExpression.name), _marko_compiler.types.identifier("_")), _marko_compiler.types.identifier(tagExpression.name)))], true));
+				} else {
+					const rendererName = tagExpression.name;
+					pushCompatRegistration(rendererName, _marko_compiler.types.markoScriptlet([_marko_compiler.types.expressionStatement(_marko_compiler.types.assignmentExpression("??=", _marko_compiler.types.memberExpression(_marko_compiler.types.identifier(rendererName), _marko_compiler.types.identifier("_")), _marko_compiler.types.identifier(rendererName)))], true));
+				}
 			} else if (_marko_compiler.types.isStringLiteral(tagExpression)) tagExpression = (0, _marko_compiler_babel_utils.importDefault)(tag.hub.file, getTagRelativePath(tag), tagExpression.value);
 			const { properties, statements } = translateAttrs(tag, void 0, void 0, void 0, isClassAPI ? "renderBody" : "content");
 			const args = [];
+			const contentProp = getTranslatedBodyContentProperty(properties);
 			let hasTagArgs = false;
 			if (node.arguments) {
 				hasTagArgs = true;
 				args.push(...node.arguments);
 				if (properties.length) args.push(propsToExpression(properties));
-			} else {
-				const contentProp = getTranslatedBodyContentProperty(properties);
-				if (contentProp) {
-					properties.splice(properties.indexOf(contentProp), 1);
-					args.push(propsToExpression(properties), contentProp.value);
-				} else args.push(propsToExpression(properties));
-			}
+			} else if (contentProp) {
+				properties.splice(properties.indexOf(contentProp), 1);
+				args.push(propsToExpression(properties), contentProp.value);
+			} else args.push(propsToExpression(properties));
 			if (isOutputHTML()) {
 				flushInto(tag);
 				writeHTMLResumeStatements(tag.get("body"));
 				const serializeArg = getSerializeGuard(tagSection, serializeReason, true);
-				const dynamicTagExpr = hasTagArgs ? callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, _marko_compiler.types.arrayExpression(args), _marko_compiler.types.numericLiteral(0), _marko_compiler.types.numericLiteral(1), serializeArg) : callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, args[0], args[1] || (serializeArg ? _marko_compiler.types.numericLiteral(0) : void 0), serializeArg ? _marko_compiler.types.numericLiteral(0) : void 0, serializeArg);
+				const dynamicTagExpr = hasTagArgs ? callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, _marko_compiler.types.arrayExpression(args), contentProp ? contentProp.value : _marko_compiler.types.numericLiteral(0), _marko_compiler.types.numericLiteral(1), serializeArg) : callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, args[0], args[1] || (serializeArg ? _marko_compiler.types.numericLiteral(0) : void 0), serializeArg ? _marko_compiler.types.numericLiteral(0) : void 0, serializeArg);
 				if (node.var) {
 					const dynamicScopeIdentifier = generateUidIdentifier(tag.get("name").toString() + "_scope");
 					const mutatesTagVar = !!(tag.node.var.type === "Identifier" && tag.scope.getBinding(tag.node.var.name)?.constantViolations.length);

package/dist/translator/util/body-to-text-literal.d.ts

@@ -5,6 +5,6 @@ declare module "@marko/compiler/dist/types" {
         [kRawText]?: true;
     }
 }
-export declare function bodyToTextLiteral(body: t.MarkoTagBody): t.Expression;
-export declare function bodyToRawTextLiteral(body: t.MarkoTagBody): t.Expression;
+export declare function bodyToTextLiteral(body: t.MarkoTagBody): t.ArrayExpression | t.ArrowFunctionExpression | t.AssignmentExpression | t.AwaitExpression | t.BigIntLiteral | t.BinaryExpression | t.BindExpression | t.BooleanLiteral | t.CallExpression | t.ClassExpression | t.ConditionalExpression | t.DecimalLiteral | t.DoExpression | t.FunctionExpression | t.Identifier | t.Import | t.ImportExpression | t.JSXElement | t.JSXFragment | t.LogicalExpression | t.MemberExpression | t.MetaProperty | t.ModuleExpression | t.NewExpression | t.NullLiteral | t.NumericLiteral | t.ObjectExpression | t.OptionalCallExpression | t.OptionalMemberExpression | t.ParenthesizedExpression | t.PipelineBareFunction | t.PipelinePrimaryTopicReference | t.PipelineTopicExpression | t.RecordExpression | t.RegExpLiteral | t.SequenceExpression | t.StringLiteral | t.Super | t.TSAsExpression | t.TSInstantiationExpression | t.TSNonNullExpression | t.TSSatisfiesExpression | t.TSTypeAssertion | t.TaggedTemplateExpression | t.TemplateLiteral | t.ThisExpression | t.TopicReference | t.TupleExpression | t.TypeCastExpression | t.UnaryExpression | t.UpdateExpression | t.YieldExpression | t.MarkoParseError;
+export declare function bodyToRawTextLiteral(body: t.MarkoTagBody): t.ArrayExpression | t.ArrowFunctionExpression | t.AssignmentExpression | t.AwaitExpression | t.BigIntLiteral | t.BinaryExpression | t.BindExpression | t.BooleanLiteral | t.CallExpression | t.ClassExpression | t.ConditionalExpression | t.DecimalLiteral | t.DoExpression | t.FunctionExpression | t.Identifier | t.Import | t.ImportExpression | t.JSXElement | t.JSXFragment | t.LogicalExpression | t.MemberExpression | t.MetaProperty | t.ModuleExpression | t.NewExpression | t.NullLiteral | t.NumericLiteral | t.ObjectExpression | t.OptionalCallExpression | t.OptionalMemberExpression | t.ParenthesizedExpression | t.PipelineBareFunction | t.PipelinePrimaryTopicReference | t.PipelineTopicExpression | t.RecordExpression | t.RegExpLiteral | t.SequenceExpression | t.StringLiteral | t.Super | t.TSAsExpression | t.TSInstantiationExpression | t.TSNonNullExpression | t.TSSatisfiesExpression | t.TSTypeAssertion | t.TaggedTemplateExpression | t.TemplateLiteral | t.ThisExpression | t.TopicReference | t.TupleExpression | t.TypeCastExpression | t.UnaryExpression | t.UpdateExpression | t.YieldExpression | t.MarkoParseError;
 export declare function injectTextCoercion(expr: t.Expression): void;

package/dist/translator/util/to-first-expression-or-block.d.ts

@@ -1,3 +1,2 @@
 import { types as t } from "@marko/compiler";
-export declare function toFirstExpressionOrBlock(stmts: t.Statement[]): t.ArrayExpression | t.ArrowFunctionExpression | t.AwaitExpression | t.BigIntLiteral | t.BinaryExpression | t.BindExpression | t.BlockStatement | t.BooleanLiteral | t.CallExpression | t.ClassExpression | t.ConditionalExpression | t.DecimalLiteral | t.DoExpression | t.FunctionExpression | t.Identifier | t.Import | t.ImportExpression | t.JSXElement | t.JSXFragment | t.LogicalExpression | t.MemberExpression | t.MetaProperty | t.ModuleExpression | t.NewExpression | t.NullLiteral | t.NumericLiteral | t.OptionalCallExpression | t.OptionalMemberExpression | t.ParenthesizedExpression | t.PipelineBareFunction | t.PipelinePrimaryTopicReference | t.PipelineTopicExpression | t.RecordExpression | t.RegExpLiteral | t.SequenceExpression | t.StringLiteral | t.Super | t.TSAsExpression | t.TSInstantiationExpression | t.TSNonNullExpression | t.TSSatisfiesExpression | t.TSTypeAssertion | t.TaggedTemplateExpression | t.TemplateLiteral | t.ThisExpression | t.TopicReference | t.TupleExpression | t.TypeCastExpression | t.UnaryExpression | t.UpdateExpression | t.YieldExpression | t.MarkoParseError;
-export declare function toParenthesizedExpressionIfNeeded(expr: t.Expression): t.ArrayExpression | t.ArrowFunctionExpression | t.AwaitExpression | t.BigIntLiteral | t.BinaryExpression | t.BindExpression | t.BooleanLiteral | t.CallExpression | t.ClassExpression | t.ConditionalExpression | t.DecimalLiteral | t.DoExpression | t.FunctionExpression | t.Identifier | t.Import | t.ImportExpression | t.JSXElement | t.JSXFragment | t.LogicalExpression | t.MemberExpression | t.MetaProperty | t.ModuleExpression | t.NewExpression | t.NullLiteral | t.NumericLiteral | t.OptionalCallExpression | t.OptionalMemberExpression | t.ParenthesizedExpression | t.PipelineBareFunction | t.PipelinePrimaryTopicReference | t.PipelineTopicExpression | t.RecordExpression | t.RegExpLiteral | t.SequenceExpression | t.StringLiteral | t.Super | t.TSAsExpression | t.TSInstantiationExpression | t.TSNonNullExpression | t.TSSatisfiesExpression | t.TSTypeAssertion | t.TaggedTemplateExpression | t.TemplateLiteral | t.ThisExpression | t.TopicReference | t.TupleExpression | t.TypeCastExpression | t.UnaryExpression | t.UpdateExpression | t.YieldExpression | t.MarkoParseError;
+export declare function toFirstExpressionOrBlock(stmts: t.Statement[]): t.BlockStatement | t.Expression;

package/dist/translator/util/walks.d.ts

@@ -6,7 +6,7 @@ export declare enum Step {
     Enter = 0,
     Exit = 1
 }
-type VisitCodes = WalkCode.Get | WalkCode.Inside | WalkCode.Replace | WalkCode.DynamicTagWithVar;
+type VisitCodes = WalkCode.Get | WalkCode.Replace | WalkCode.DynamicTagWithVar;
 export declare function enter(path: t.NodePath<any>): void;
 export declare function exit(path: t.NodePath<any>): void;
 export declare function enterShallow(path: t.NodePath<any>): void;

package/dist/translator/util/writer.d.ts

@@ -14,5 +14,5 @@ interface SectionMeta {
 }
 export declare const getSectionMeta: (section: Section) => SectionMeta;
 export declare function getSectionMetaIdentifiers(section: Section): SectionMeta;
-export declare function markNode(path: t.NodePath<t.MarkoTag | t.MarkoPlaceholder>, nodeBinding: Binding, reason: undefined | false | SerializeReason): void;
+export declare function markNode(path: t.NodePath<t.MarkoTag | t.MarkoPlaceholder>, nodeBinding: Binding, reason: undefined | false | SerializeReason, deferred?: boolean): void;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.16",
+  "version": "6.3.17",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -47,15 +47,16 @@
     "!**/*.tsbuildinfo",
     "cheatsheet.md"
   ],
-  "scripts": {
-    "build": "node -r ~ts ./scripts/bundle.mts"
-  },
   "dependencies": {
-    "@marko/compiler": "^5.41.2",
+    "@marko/compiler": "^5.41.4",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"
   },
+  "devDependencies": {
+    "@marko/runtime-tags": "npm:marko@6.3.17",
+    "marko": "5.39.26"
+  },
   "engines": {
     "node": ">=22"
   },
@@ -69,5 +70,8 @@
     "./debug/*": "./src/*.ts",
     "./*": "./src/*.ts"
   },
-  "private": false
-}
+  "private": false,
+  "scripts": {
+    "build": "node -r ~ts ./scripts/bundle.mts"
+  }
+}