@marko/runtime-tags 6.3.0 → 6.3.2

package/dist/debug/html.js

@@ -220,8 +220,8 @@ function _escape(val) {
 	assertValidTextValue(val);
 	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeScriptReg = /<\/script/gi;
-const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
+const unsafeScriptReg = /<(\/?script|!--)/gi;
+const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str;
 function _escape_script(val) {
 	assertValidTextValue(val);
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
@@ -648,7 +648,7 @@ function writeAssigned(state) {
 			} else state.buf.push("void 0");
 			const valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
 			if (mutation.value === void 0) {} else if (writeProp(state, mutation.value, null, "")) {
-				const valueRef = state.refs.get(mutation.value);
+				const valueRef = typeof mutation.value === "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
 				if (valueRef && !valueRef.id && valueRef.scopeId === void 0) {
 					valueRef.id = mutation.valueId || nextRefAccess(state);
 					state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex];
@@ -1161,7 +1161,7 @@ function writeReadableStream(state, val, ref) {
 }
 function writeGenerator(state, iter, ref) {
 	if (iter[kTouchedIterator]) {
-		state.buf.push("(async function*(){}())");
+		state.buf.push("(function*(){}())");
 		return true;
 	}
 	let sep = "";
@@ -1323,34 +1323,49 @@ function toAccess(accessor) {
 	const start = accessor[0];
 	return start === "[" ? accessor : start === "\"" || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
 }
+const unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u;
 function quote(str, startPos) {
+	if (!unsafeQuoteReg.test(str)) return "\"" + str + "\"";
 	let result = "";
 	let lastPos = 0;
 	for (let i = startPos; i < str.length; i++) {
 		let replacement;
-		switch (str[i]) {
-			case "\"":
+		const code = str.charCodeAt(i);
+		switch (code) {
+			case 34:
 				replacement = "\\\"";
 				break;
-			case "\\":
+			case 92:
 				replacement = "\\\\";
 				break;
-			case "<":
+			case 60:
 				replacement = "\\x3C";
 				break;
-			case "\n":
+			case 10:
 				replacement = "\\n";
 				break;
-			case "\r":
+			case 13:
 				replacement = "\\r";
 				break;
-			case "\u2028":
+			case 8232:
 				replacement = "\\u2028";
 				break;
-			case "\u2029":
+			case 8233:
 				replacement = "\\u2029";
 				break;
-			default: continue;
+			case 0:
+				replacement = "\\x00";
+				break;
+			default:
+				if (code < 55296 || code > 57343) continue;
+				if (code < 56320) {
+					const next = str.charCodeAt(i + 1);
+					if (next >= 56320 && next <= 57343) {
+						i++;
+						continue;
+					}
+				}
+				replacement = "\\u" + code.toString(16);
 		}
 		result += str.slice(lastPos, i) + replacement;
 		lastPos = i + 1;
@@ -1917,7 +1932,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 						$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 					} else withIsAsync(content, value);
 				});
-				boundary.endAsync(chunk);
+				boundary.endAsync();
 			}
 		}
 	}, (err) => {
@@ -1959,7 +1974,7 @@ function tryCatch(content, catchContent) {
 	const chunk = $chunk;
 	const { boundary } = chunk;
 	const { state } = boundary;
-	const catchBoundary = new Boundary(state);
+	const catchBoundary = new Boundary(state, void 0, boundary);
 	const body = chunk.fork(catchBoundary, null);
 	const bodyEnd = body.render(content);
 	if (catchBoundary.signal.aborted) {
@@ -2073,19 +2088,21 @@ var State = class {
 };
 var Boundary = class extends AbortController {
 	state;
+	parent;
 	onNext = NOOP$2;
 	count = 0;
-	constructor(state, parent) {
+	constructor(state, signal, parent) {
 		super();
 		this.state = state;
+		this.parent = parent;
 		this.signal.addEventListener("abort", () => {
 			this.count = 0;
 			this.state = new State(this.state.$global);
 			this.onNext();
 		});
-		if (parent) if (parent.aborted) this.abort(parent.reason);
-		else parent.addEventListener("abort", () => {
-			this.abort(parent.reason);
+		if (signal) if (signal.aborted) this.abort(signal.reason);
+		else signal.addEventListener("abort", () => {
+			this.abort(signal.reason);
 		});
 	}
 	flush() {
@@ -2095,10 +2112,9 @@ var Boundary = class extends AbortController {
 	startAsync() {
 		if (!this.signal.aborted) this.count++;
 	}
-	endAsync(chunk) {
+	endAsync() {
 		if (!this.signal.aborted && this.count) {
 			this.count--;
-			if (chunk?.reorderId) this.state.reorder(chunk);
 			this.onNext();
 		}
 	}
@@ -2285,12 +2301,22 @@ var Chunk = class Chunk {
 			scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]");
 		}
 		if (state.writeReorders) {
-			needsWalk = true;
-			if (!state.hasReorderRuntime) {
-				state.hasReorderRuntime = true;
-				scripts = concatScripts(scripts, REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")");
-			}
+			let carried = null;
 			for (const reorderedChunk of state.writeReorders) {
+				if (reorderedChunk.async && reorderedChunk.consumed) {
+					let aborted = reorderedChunk.boundary;
+					while (aborted && !aborted.signal.aborted) aborted = aborted.parent;
+					if (!aborted) {
+						(carried ||= []).push(reorderedChunk);
+						continue;
+					}
+					reorderedChunk.async = false;
+				}
+				needsWalk = true;
+				if (!state.hasReorderRuntime) {
+					state.hasReorderRuntime = true;
+					scripts = concatScripts(scripts, REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")");
+				}
 				const { reorderId } = reorderedChunk;
 				const readyReservations = [];
 				let reorderHTML = "";
@@ -2309,6 +2335,7 @@ var Chunk = class Chunk {
 					reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts));
 					if (cur.async) {
 						reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId());
+						state.reorder(cur);
 						cur.html = cur.effects = cur.scripts = cur.lastEffect = "";
 						cur.next = null;
 					}
@@ -2326,7 +2353,7 @@ var Chunk = class Chunk {
 				scripts = concatScripts(scripts, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
 				html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
-			state.writeReorders = null;
+			state.writeReorders = carried;
 		}
 		if (needsWalk) scripts = concatScripts(scripts, runtimePrefix + ".w()");
 		this.html = html;
@@ -2656,9 +2683,9 @@ function nonVoidAttr(name, value) {
 	}
 	return " " + name + attrAssignment(value + "");
 }
-const singleQuoteAttrReplacements = /'|&(?=#?\w+;)/g;
-const doubleQuoteAttrReplacements = /"|&(?=#?\w+;)/g;
-const needsQuotedAttr = /["'>\s]|&#?\w+;|\/$/g;
+const singleQuoteAttrReplacements = /'|&(?=[#a-zA-Z])/g;
+const doubleQuoteAttrReplacements = /"|&(?=[#a-zA-Z])/g;
+const needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g;
 function attrAssignment(value) {
 	return value ? needsQuotedAttr.test(value) ? value[needsQuotedAttr.lastIndex - 1] === (needsQuotedAttr.lastIndex = 0, "\"") ? "='" + escapeSingleQuotedAttrValue(value) + "'" : "=\"" + escapeDoubleQuotedAttrValue(value) + "\"" : "=" + value : "";
 }

package/dist/debug/html.mjs

@@ -218,8 +218,8 @@ function _escape(val) {
 	assertValidTextValue(val);
 	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeScriptReg = /<\/script/gi;
-const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
+const unsafeScriptReg = /<(\/?script|!--)/gi;
+const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str;
 function _escape_script(val) {
 	assertValidTextValue(val);
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
@@ -646,7 +646,7 @@ function writeAssigned(state) {
 			} else state.buf.push("void 0");
 			const valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
 			if (mutation.value === void 0) {} else if (writeProp(state, mutation.value, null, "")) {
-				const valueRef = state.refs.get(mutation.value);
+				const valueRef = typeof mutation.value === "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
 				if (valueRef && !valueRef.id && valueRef.scopeId === void 0) {
 					valueRef.id = mutation.valueId || nextRefAccess(state);
 					state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex];
@@ -1159,7 +1159,7 @@ function writeReadableStream(state, val, ref) {
 }
 function writeGenerator(state, iter, ref) {
 	if (iter[kTouchedIterator]) {
-		state.buf.push("(async function*(){}())");
+		state.buf.push("(function*(){}())");
 		return true;
 	}
 	let sep = "";
@@ -1321,34 +1321,49 @@ function toAccess(accessor) {
 	const start = accessor[0];
 	return start === "[" ? accessor : start === "\"" || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
 }
+const unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u;
 function quote(str, startPos) {
+	if (!unsafeQuoteReg.test(str)) return "\"" + str + "\"";
 	let result = "";
 	let lastPos = 0;
 	for (let i = startPos; i < str.length; i++) {
 		let replacement;
-		switch (str[i]) {
-			case "\"":
+		const code = str.charCodeAt(i);
+		switch (code) {
+			case 34:
 				replacement = "\\\"";
 				break;
-			case "\\":
+			case 92:
 				replacement = "\\\\";
 				break;
-			case "<":
+			case 60:
 				replacement = "\\x3C";
 				break;
-			case "\n":
+			case 10:
 				replacement = "\\n";
 				break;
-			case "\r":
+			case 13:
 				replacement = "\\r";
 				break;
-			case "\u2028":
+			case 8232:
 				replacement = "\\u2028";
 				break;
-			case "\u2029":
+			case 8233:
 				replacement = "\\u2029";
 				break;
-			default: continue;
+			case 0:
+				replacement = "\\x00";
+				break;
+			default:
+				if (code < 55296 || code > 57343) continue;
+				if (code < 56320) {
+					const next = str.charCodeAt(i + 1);
+					if (next >= 56320 && next <= 57343) {
+						i++;
+						continue;
+					}
+				}
+				replacement = "\\u" + code.toString(16);
 		}
 		result += str.slice(lastPos, i) + replacement;
 		lastPos = i + 1;
@@ -1915,7 +1930,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 						$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 					} else withIsAsync(content, value);
 				});
-				boundary.endAsync(chunk);
+				boundary.endAsync();
 			}
 		}
 	}, (err) => {
@@ -1957,7 +1972,7 @@ function tryCatch(content, catchContent) {
 	const chunk = $chunk;
 	const { boundary } = chunk;
 	const { state } = boundary;
-	const catchBoundary = new Boundary(state);
+	const catchBoundary = new Boundary(state, void 0, boundary);
 	const body = chunk.fork(catchBoundary, null);
 	const bodyEnd = body.render(content);
 	if (catchBoundary.signal.aborted) {
@@ -2071,19 +2086,21 @@ var State = class {
 };
 var Boundary = class extends AbortController {
 	state;
+	parent;
 	onNext = NOOP$2;
 	count = 0;
-	constructor(state, parent) {
+	constructor(state, signal, parent) {
 		super();
 		this.state = state;
+		this.parent = parent;
 		this.signal.addEventListener("abort", () => {
 			this.count = 0;
 			this.state = new State(this.state.$global);
 			this.onNext();
 		});
-		if (parent) if (parent.aborted) this.abort(parent.reason);
-		else parent.addEventListener("abort", () => {
-			this.abort(parent.reason);
+		if (signal) if (signal.aborted) this.abort(signal.reason);
+		else signal.addEventListener("abort", () => {
+			this.abort(signal.reason);
 		});
 	}
 	flush() {
@@ -2093,10 +2110,9 @@ var Boundary = class extends AbortController {
 	startAsync() {
 		if (!this.signal.aborted) this.count++;
 	}
-	endAsync(chunk) {
+	endAsync() {
 		if (!this.signal.aborted && this.count) {
 			this.count--;
-			if (chunk?.reorderId) this.state.reorder(chunk);
 			this.onNext();
 		}
 	}
@@ -2283,12 +2299,22 @@ var Chunk = class Chunk {
 			scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]");
 		}
 		if (state.writeReorders) {
-			needsWalk = true;
-			if (!state.hasReorderRuntime) {
-				state.hasReorderRuntime = true;
-				scripts = concatScripts(scripts, REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")");
-			}
+			let carried = null;
 			for (const reorderedChunk of state.writeReorders) {
+				if (reorderedChunk.async && reorderedChunk.consumed) {
+					let aborted = reorderedChunk.boundary;
+					while (aborted && !aborted.signal.aborted) aborted = aborted.parent;
+					if (!aborted) {
+						(carried ||= []).push(reorderedChunk);
+						continue;
+					}
+					reorderedChunk.async = false;
+				}
+				needsWalk = true;
+				if (!state.hasReorderRuntime) {
+					state.hasReorderRuntime = true;
+					scripts = concatScripts(scripts, REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")");
+				}
 				const { reorderId } = reorderedChunk;
 				const readyReservations = [];
 				let reorderHTML = "";
@@ -2307,6 +2333,7 @@ var Chunk = class Chunk {
 					reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts));
 					if (cur.async) {
 						reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId());
+						state.reorder(cur);
 						cur.html = cur.effects = cur.scripts = cur.lastEffect = "";
 						cur.next = null;
 					}
@@ -2324,7 +2351,7 @@ var Chunk = class Chunk {
 				scripts = concatScripts(scripts, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
 				html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
-			state.writeReorders = null;
+			state.writeReorders = carried;
 		}
 		if (needsWalk) scripts = concatScripts(scripts, runtimePrefix + ".w()");
 		this.html = html;
@@ -2654,9 +2681,9 @@ function nonVoidAttr(name, value) {
 	}
 	return " " + name + attrAssignment(value + "");
 }
-const singleQuoteAttrReplacements = /'|&(?=#?\w+;)/g;
-const doubleQuoteAttrReplacements = /"|&(?=#?\w+;)/g;
-const needsQuotedAttr = /["'>\s]|&#?\w+;|\/$/g;
+const singleQuoteAttrReplacements = /'|&(?=[#a-zA-Z])/g;
+const doubleQuoteAttrReplacements = /"|&(?=[#a-zA-Z])/g;
+const needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g;
 function attrAssignment(value) {
 	return value ? needsQuotedAttr.test(value) ? value[needsQuotedAttr.lastIndex - 1] === (needsQuotedAttr.lastIndex = 0, "\"") ? "='" + escapeSingleQuotedAttrValue(value) + "'" : "=\"" + escapeDoubleQuotedAttrValue(value) + "\"" : "=" + value : "";
 }

package/dist/html/writer.d.ts

@@ -121,12 +121,13 @@ export declare enum FlushStatus {
 }
 export declare class Boundary extends AbortController {
     state: State;
+    parent?: Boundary | undefined;
     onNext: () => void;
     count: number;
-    constructor(state: State, parent?: AbortSignal);
+    constructor(state: State, signal?: AbortSignal, parent?: Boundary | undefined);
     flush(): FlushStatus;
     startAsync(): void;
-    endAsync(chunk?: Chunk): void;
+    endAsync(): void;
 }
 export declare class Chunk {
     boundary: Boundary;

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/script") : 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: hasOwnProperty$1 } = {}, 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/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: hasOwnProperty$1 } = {}, 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,10 +238,10 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	[JSON, "JSON"],
 	[Math, "Math"],
 	[Reflect, "Reflect"]
-]), unsafeRegExpSourceReg = /\\[\s\S]|</g, replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match, $chunk, NOOP$2 = () => {}, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
+]), unsafeRegExpSourceReg = /\\[\s\S]|</g, replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, $chunk, NOOP$2 = () => {}, 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;
-}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /'|&(?=#?\w+;)/g, doubleQuoteAttrReplacements = /"|&(?=#?\w+;)/g, needsQuotedAttr = /["'>\s]|&#?\w+;|\/$/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) => {
+}, 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) => {
 	let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered, result;
 	if (typeof renderer == "string") {
 		let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
@@ -534,7 +534,7 @@ function writeAssigned(state) {
 			} else state.buf.push("void 0");
 			let valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
 			if (mutation.value !== void 0) if (writeProp(state, mutation.value, null, "")) {
-				let valueRef = state.refs.get(mutation.value);
+				let valueRef = typeof mutation.value == "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
 				valueRef && !valueRef.id && valueRef.scopeId === void 0 && (valueRef.id = mutation.valueId || nextRefAccess(state), state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex]);
 			} else state.buf.push("void 0");
 			state.buf.push(")");
@@ -819,7 +819,7 @@ function writeReadableStream(state, val, ref) {
 	return state.buf.push("new ReadableStream({start(c){(async(_,f,v,l,i,p=a=>l=new Promise((r,j)=>{f=_.r=r;_.j=j}),a=((_.f=v=>{f(v);a.push(p())}),[p()]))=>{for(i of a)v=await i,i==l?c.close():c.enqueue(v)})(" + iterId + "={}).catch(e=>c.error(e))}})"), reader.read().then(onFulfilled, onRejected), boundary.startAsync(), !0;
 }
 function writeGenerator(state, iter, ref) {
-	if (iter[kTouchedIterator]) return state.buf.push("(async function*(){}())"), !0;
+	if (iter[kTouchedIterator]) return state.buf.push("(function*(){}())"), !0;
 	let sep = "";
 	for (state.buf.push("(function*(){");;) {
 		let { value, done } = iter.next();
@@ -907,32 +907,45 @@ function toAccess(accessor) {
 	return start === "[" ? accessor : start === "\"" || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
 }
 function quote(str, startPos) {
+	if (!unsafeQuoteReg.test(str)) return "\"" + str + "\"";
 	let result = "", lastPos = 0;
 	for (let i = startPos; i < str.length; i++) {
-		let replacement;
-		switch (str[i]) {
-			case "\"":
+		let replacement, code = str.charCodeAt(i);
+		switch (code) {
+			case 34:
 				replacement = "\\\"";
 				break;
-			case "\\":
+			case 92:
 				replacement = "\\\\";
 				break;
-			case "<":
+			case 60:
 				replacement = "\\x3C";
 				break;
-			case "\n":
+			case 10:
 				replacement = "\\n";
 				break;
-			case "\r":
+			case 13:
 				replacement = "\\r";
 				break;
-			case "\u2028":
+			case 8232:
 				replacement = "\\u2028";
 				break;
-			case "\u2029":
+			case 8233:
 				replacement = "\\u2029";
 				break;
-			default: continue;
+			case 0:
+				replacement = "\\x00";
+				break;
+			default:
+				if (code < 55296 || code > 57343) continue;
+				if (code < 56320) {
+					let next = str.charCodeAt(i + 1);
+					if (next >= 56320 && next <= 57343) {
+						i++;
+						continue;
+					}
+				}
+				replacement = "\\u" + code.toString(16);
 		}
 		result += str.slice(lastPos, i) + replacement, lastPos = i + 1;
 	}
@@ -1282,7 +1295,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 				let branchId = _peek_scope_id();
 				$chunk.writeHTML($chunk.boundary.state.mark("[", "")), withIsAsync(content, value), $chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 			} else withIsAsync(content, value);
-		}), boundary.endAsync(chunk)));
+		}), boundary.endAsync()));
 	}, (err) => {
 		chunk.async = !1, boundary.abort(err);
 	});
@@ -1310,7 +1323,7 @@ function tryPlaceholder(content, placeholder, branchId) {
 	};
 }
 function tryCatch(content, catchContent) {
-	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state), body = chunk.fork(catchBoundary, null), bodyEnd = body.render(content);
+	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state, void 0, boundary), body = chunk.fork(catchBoundary, null), bodyEnd = body.render(content);
 	if (catchBoundary.signal.aborted) {
 		catchContent(catchBoundary.signal.reason);
 		return;
@@ -1388,13 +1401,14 @@ var State = class {
 	}
 }, Boundary = class extends AbortController {
 	state;
+	parent;
 	onNext = NOOP$2;
 	count = 0;
-	constructor(state, parent) {
-		super(), this.state = state, this.signal.addEventListener("abort", () => {
+	constructor(state, signal, parent) {
+		super(), this.state = state, this.parent = parent, this.signal.addEventListener("abort", () => {
 			this.count = 0, this.state = new State(this.state.$global), this.onNext();
-		}), parent && (parent.aborted ? this.abort(parent.reason) : parent.addEventListener("abort", () => {
-			this.abort(parent.reason);
+		}), signal && (signal.aborted ? this.abort(signal.reason) : signal.addEventListener("abort", () => {
+			this.abort(signal.reason);
 		}));
 	}
 	flush() {
@@ -1403,8 +1417,8 @@ var State = class {
 	startAsync() {
 		this.signal.aborted || this.count++;
 	}
-	endAsync(chunk) {
-		!this.signal.aborted && this.count && (this.count--, chunk?.reorderId && this.state.reorder(chunk), this.onNext());
+	endAsync() {
+		!this.signal.aborted && this.count && (this.count--, this.onNext());
 	}
 }, Chunk = class Chunk {
 	boundary;
@@ -1509,20 +1523,30 @@ var State = class {
 		readyResumeScripts && (needsWalk = !0);
 		let effects = this.async ? "" : this.effects, { html, scripts } = this;
 		if (state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(scripts, "(e=>(self[e]||=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>\"#\"&&d.push(e)}},self[e]))(\"" + $global.runtimeId + "\")(\"" + $global.renderId + "\")")), scripts = concatScripts(scripts, readyResumeScripts), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + ",\"" + effects + "\"" : "\"" + effects + "\""), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(scripts, runtimePrefix + ".r.push(" + state.resumes + ")") : (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]"))), state.writeReorders) {
-			needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),\"#\"==n?(t[a]=l).i++:\"!\"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):\"T\"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l[\"^\"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})(" + runtimePrefix + ")"));
+			let carried = null;
 			for (let reorderedChunk of state.writeReorders) {
+				if (reorderedChunk.async && reorderedChunk.consumed) {
+					let aborted = reorderedChunk.boundary;
+					for (; aborted && !aborted.signal.aborted;) aborted = aborted.parent;
+					if (!aborted) {
+						(carried ||= []).push(reorderedChunk);
+						continue;
+					}
+					reorderedChunk.async = !1;
+				}
+				needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),\"#\"==n?(t[a]=l).i++:\"!\"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):\"T\"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l[\"^\"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})(" + runtimePrefix + ")"));
 				let { reorderId } = reorderedChunk, readyReservations = [], reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
 				for (reorderedChunk.reorderId = null;;) {
 					cur.flushPlaceholder(), cur.deferOwnReady();
 					let { next } = cur, readyResumeScripts = cur.flushReadyScripts(readyReservations);
-					if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next) cur = next;
+					if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), state.reorder(cur), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next) cur = next;
 					else break;
 				}
 				reorderEffects && (state.hasWrittenResume || (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[]")), reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")"));
 				for (let reservation of readyReservations) scripts = concatScripts(scripts, reservation);
 				scripts = concatScripts(scripts, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"), html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
-			state.writeReorders = null;
+			state.writeReorders = carried;
 		}
 		return needsWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), this.html = html, this.scripts = scripts, this.async || (this.effects = this.lastEffect = ""), state.resumes = "", this;
 	}

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/script") : 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: hasOwnProperty$1 } = {}, 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/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: hasOwnProperty$1 } = {}, 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,10 +238,10 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	[JSON, "JSON"],
 	[Math, "Math"],
 	[Reflect, "Reflect"]
-]), unsafeRegExpSourceReg = /\\[\s\S]|</g, replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match, $chunk, NOOP$2 = () => {}, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
+]), unsafeRegExpSourceReg = /\\[\s\S]|</g, replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, $chunk, NOOP$2 = () => {}, 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;
-}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /'|&(?=#?\w+;)/g, doubleQuoteAttrReplacements = /"|&(?=#?\w+;)/g, needsQuotedAttr = /["'>\s]|&#?\w+;|\/$/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) => {
+}, 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) => {
 	let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered, result;
 	if (typeof renderer == "string") {
 		let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
@@ -533,7 +533,7 @@ function writeAssigned(state) {
 			} else state.buf.push("void 0");
 			let valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
 			if (mutation.value !== void 0) if (writeProp(state, mutation.value, null, "")) {
-				let valueRef = state.refs.get(mutation.value);
+				let valueRef = typeof mutation.value == "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
 				valueRef && !valueRef.id && valueRef.scopeId === void 0 && (valueRef.id = mutation.valueId || nextRefAccess(state), state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex]);
 			} else state.buf.push("void 0");
 			state.buf.push(")");
@@ -818,7 +818,7 @@ function writeReadableStream(state, val, ref) {
 	return state.buf.push("new ReadableStream({start(c){(async(_,f,v,l,i,p=a=>l=new Promise((r,j)=>{f=_.r=r;_.j=j}),a=((_.f=v=>{f(v);a.push(p())}),[p()]))=>{for(i of a)v=await i,i==l?c.close():c.enqueue(v)})(" + iterId + "={}).catch(e=>c.error(e))}})"), reader.read().then(onFulfilled, onRejected), boundary.startAsync(), !0;
 }
 function writeGenerator(state, iter, ref) {
-	if (iter[kTouchedIterator]) return state.buf.push("(async function*(){}())"), !0;
+	if (iter[kTouchedIterator]) return state.buf.push("(function*(){}())"), !0;
 	let sep = "";
 	for (state.buf.push("(function*(){");;) {
 		let { value, done } = iter.next();
@@ -906,32 +906,45 @@ function toAccess(accessor) {
 	return start === "[" ? accessor : start === "\"" || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
 }
 function quote(str, startPos) {
+	if (!unsafeQuoteReg.test(str)) return "\"" + str + "\"";
 	let result = "", lastPos = 0;
 	for (let i = startPos; i < str.length; i++) {
-		let replacement;
-		switch (str[i]) {
-			case "\"":
+		let replacement, code = str.charCodeAt(i);
+		switch (code) {
+			case 34:
 				replacement = "\\\"";
 				break;
-			case "\\":
+			case 92:
 				replacement = "\\\\";
 				break;
-			case "<":
+			case 60:
 				replacement = "\\x3C";
 				break;
-			case "\n":
+			case 10:
 				replacement = "\\n";
 				break;
-			case "\r":
+			case 13:
 				replacement = "\\r";
 				break;
-			case "\u2028":
+			case 8232:
 				replacement = "\\u2028";
 				break;
-			case "\u2029":
+			case 8233:
 				replacement = "\\u2029";
 				break;
-			default: continue;
+			case 0:
+				replacement = "\\x00";
+				break;
+			default:
+				if (code < 55296 || code > 57343) continue;
+				if (code < 56320) {
+					let next = str.charCodeAt(i + 1);
+					if (next >= 56320 && next <= 57343) {
+						i++;
+						continue;
+					}
+				}
+				replacement = "\\u" + code.toString(16);
 		}
 		result += str.slice(lastPos, i) + replacement, lastPos = i + 1;
 	}
@@ -1281,7 +1294,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 				let branchId = _peek_scope_id();
 				$chunk.writeHTML($chunk.boundary.state.mark("[", "")), withIsAsync(content, value), $chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 			} else withIsAsync(content, value);
-		}), boundary.endAsync(chunk)));
+		}), boundary.endAsync()));
 	}, (err) => {
 		chunk.async = !1, boundary.abort(err);
 	});
@@ -1309,7 +1322,7 @@ function tryPlaceholder(content, placeholder, branchId) {
 	};
 }
 function tryCatch(content, catchContent) {
-	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state), body = chunk.fork(catchBoundary, null), bodyEnd = body.render(content);
+	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state, void 0, boundary), body = chunk.fork(catchBoundary, null), bodyEnd = body.render(content);
 	if (catchBoundary.signal.aborted) {
 		catchContent(catchBoundary.signal.reason);
 		return;
@@ -1387,13 +1400,14 @@ var State = class {
 	}
 }, Boundary = class extends AbortController {
 	state;
+	parent;
 	onNext = NOOP$2;
 	count = 0;
-	constructor(state, parent) {
-		super(), this.state = state, this.signal.addEventListener("abort", () => {
+	constructor(state, signal, parent) {
+		super(), this.state = state, this.parent = parent, this.signal.addEventListener("abort", () => {
 			this.count = 0, this.state = new State(this.state.$global), this.onNext();
-		}), parent && (parent.aborted ? this.abort(parent.reason) : parent.addEventListener("abort", () => {
-			this.abort(parent.reason);
+		}), signal && (signal.aborted ? this.abort(signal.reason) : signal.addEventListener("abort", () => {
+			this.abort(signal.reason);
 		}));
 	}
 	flush() {
@@ -1402,8 +1416,8 @@ var State = class {
 	startAsync() {
 		this.signal.aborted || this.count++;
 	}
-	endAsync(chunk) {
-		!this.signal.aborted && this.count && (this.count--, chunk?.reorderId && this.state.reorder(chunk), this.onNext());
+	endAsync() {
+		!this.signal.aborted && this.count && (this.count--, this.onNext());
 	}
 }, Chunk = class Chunk {
 	boundary;
@@ -1508,20 +1522,30 @@ var State = class {
 		readyResumeScripts && (needsWalk = !0);
 		let effects = this.async ? "" : this.effects, { html, scripts } = this;
 		if (state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(scripts, "(e=>(self[e]||=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>\"#\"&&d.push(e)}},self[e]))(\"" + $global.runtimeId + "\")(\"" + $global.renderId + "\")")), scripts = concatScripts(scripts, readyResumeScripts), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + ",\"" + effects + "\"" : "\"" + effects + "\""), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(scripts, runtimePrefix + ".r.push(" + state.resumes + ")") : (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]"))), state.writeReorders) {
-			needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),\"#\"==n?(t[a]=l).i++:\"!\"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):\"T\"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l[\"^\"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})(" + runtimePrefix + ")"));
+			let carried = null;
 			for (let reorderedChunk of state.writeReorders) {
+				if (reorderedChunk.async && reorderedChunk.consumed) {
+					let aborted = reorderedChunk.boundary;
+					for (; aborted && !aborted.signal.aborted;) aborted = aborted.parent;
+					if (!aborted) {
+						(carried ||= []).push(reorderedChunk);
+						continue;
+					}
+					reorderedChunk.async = !1;
+				}
+				needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),\"#\"==n?(t[a]=l).i++:\"!\"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):\"T\"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l[\"^\"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})(" + runtimePrefix + ")"));
 				let { reorderId } = reorderedChunk, readyReservations = [], reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
 				for (reorderedChunk.reorderId = null;;) {
 					cur.flushPlaceholder(), cur.deferOwnReady();
 					let { next } = cur, readyResumeScripts = cur.flushReadyScripts(readyReservations);
-					if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next) cur = next;
+					if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), state.reorder(cur), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next) cur = next;
 					else break;
 				}
 				reorderEffects && (state.hasWrittenResume || (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[]")), reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")"));
 				for (let reservation of readyReservations) scripts = concatScripts(scripts, reservation);
 				scripts = concatScripts(scripts, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"), html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
-			state.writeReorders = null;
+			state.writeReorders = carried;
 		}
 		return needsWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), this.html = html, this.scripts = scripts, this.async || (this.effects = this.lastEffect = ""), state.resumes = "", this;
 	}

package/dist/translator/index.js

@@ -1713,8 +1713,8 @@ const escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg,
 function _escape(val) {
 	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeScriptReg = /<\/script/gi;
-const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
+const unsafeScriptReg = /<(\/?script|!--)/gi;
+const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str;
 function _escape_script(val) {
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
@@ -1931,9 +1931,9 @@ function nonVoidAttr(name, value) {
 	}
 	return " " + name + attrAssignment(value + "");
 }
-const singleQuoteAttrReplacements = /'|&(?=#?\w+;)/g;
-const doubleQuoteAttrReplacements = /"|&(?=#?\w+;)/g;
-const needsQuotedAttr = /["'>\s]|&#?\w+;|\/$/g;
+const singleQuoteAttrReplacements = /'|&(?=[#a-zA-Z])/g;
+const doubleQuoteAttrReplacements = /"|&(?=[#a-zA-Z])/g;
+const needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g;
 function attrAssignment(value) {
 	return value ? needsQuotedAttr.test(value) ? value[needsQuotedAttr.lastIndex - 1] === (needsQuotedAttr.lastIndex = 0, "\"") ? "='" + escapeSingleQuotedAttrValue(value) + "'" : "=\"" + escapeDoubleQuotedAttrValue(value) + "\"" : "=" + value : "";
 }
@@ -2134,6 +2134,9 @@ function sectionHasSetupStatements(section) {
 }
 //#endregion
 //#region src/translator/util/binding-has-prop.ts
+function isSectionRendererElided(section) {
+	return !!section.downstreamBinding && !bindingHasProperty(section.downstreamBinding.binding, section.downstreamBinding.properties);
+}
 function bindingHasProperty(binding, properties) {
 	if (binding.pruned) return false;
 	else if (binding.pruned === void 0) throw new Error("Binding must be pruned before checking properties");
@@ -3513,7 +3516,7 @@ var dom_default = { translate: {
 				const setup = getSetup(childSection);
 				const written = writeSignals(childSection);
 				const setupIdentifier = setup && written.has(setup) ? setup.identifier : void 0;
-				if (!childSection.downstreamBinding || bindingHasProperty(childSection.downstreamBinding.binding, childSection.downstreamBinding.properties)) if (getSectionParentIsOwner(childSection)) setBranchRendererArgs(childSection, [
+				if (!isSectionRendererElided(childSection)) if (getSectionParentIsOwner(childSection)) setBranchRendererArgs(childSection, [
 					writes,
 					walks,
 					setupIdentifier,
@@ -4269,9 +4272,12 @@ function buildContent(body) {
 		if (dynamicSerializeReason) body.node.body.unshift(getScopeReasonDeclaration(bodySection));
 		else body.node.body.unshift(_marko_compiler.types.expressionStatement(callRuntime("_scope_reason")));
 		return callRuntime(serialized ? "_content_resume" : "_content", _marko_compiler.types.stringLiteral(getResumeRegisterId(bodySection, "content")), _marko_compiler.types.arrowFunctionExpression(body.node.params, _marko_compiler.types.blockStatement(body.node.body)), serialized ? getScopeIdIdentifier(getSection(getAttributeTagParent(body.parentPath))) : void 0);
-	} else return _marko_compiler.types.callExpression(_marko_compiler.types.identifier(bodySection.name), bodySection.referencedLocalClosures ? [scopeIdentifier, _marko_compiler.types.objectExpression(toArray(bodySection.referencedLocalClosures, (ref) => {
-		return toObjectProperty(getScopeAccessor(ref, true), getDeclaredBindingExpression(ref));
-	}))] : [scopeIdentifier]);
+	} else {
+		if (isSectionRendererElided(bodySection)) return;
+		return _marko_compiler.types.callExpression(_marko_compiler.types.identifier(bodySection.name), bodySection.referencedLocalClosures ? [scopeIdentifier, _marko_compiler.types.objectExpression(toArray(bodySection.referencedLocalClosures, (ref) => {
+			return toObjectProperty(getScopeAccessor(ref, true), getDeclaredBindingExpression(ref));
+		}))] : [scopeIdentifier]);
+	}
 }
 //#endregion
 //#region src/translator/visitors/tag/native-tag.ts
@@ -4294,6 +4300,7 @@ var native_tag_default = {
 				(0, _marko_compiler_babel_utils.getProgram)().node.extra.page ??= true;
 				break;
 		}
+		if (tagName === "option") assertOptionInSelectWithValue(tag);
 		const isTextOnly = isTextOnlyNativeTag(tag);
 		const seen = {};
 		const { attributes } = tag.node;
@@ -4790,6 +4797,31 @@ function getCanonicalTagName(tag) {
 		default: return tagName;
 	}
 }
+function assertOptionInSelectWithValue(tag) {
+	let parent = tag.parentPath;
+	while (parent) {
+		if (parent.isMarkoTag()) {
+			if (analyzeTagNameType(parent) === 0) {
+				const parentName = getCanonicalTagName(parent);
+				if (parentName === "select") {
+					if (parent.node.attributes.some((attr) => _marko_compiler.types.isMarkoAttribute(attr) && (attr.name === "value" || attr.name === "valueChange"))) {
+						let hasValue = false;
+						const attributes = tag.get("attributes");
+						for (let i = 0; i < attributes.length; i++) {
+							const attr = attributes[i].node;
+							if (!_marko_compiler.types.isMarkoAttribute(attr) || attr.name === "value") hasValue = true;
+							else if (attr.name === "selected") throw attributes[i].buildCodeFrameError("The `selected` attribute is not supported on an `<option>` within a `<select>` that has a `value` attribute; include the option's `value` in the select's `value` instead.");
+						}
+						if (!hasValue) throw tag.buildCodeFrameError("An `<option>` within a `<select>` that has a `value` attribute must also have a `value` attribute.");
+					}
+					return;
+				}
+				if (parentName !== "optgroup") return;
+			} else if (!isControlFlowTag(parent)) return;
+		} else if (parent.isProgram()) return;
+		parent = parent.parentPath;
+	}
+}
 function getTextOnlyEscapeHelper(tagName) {
 	switch (tagName) {
 		case "script": return "_escape_script";
@@ -7766,6 +7798,7 @@ var export_default = {
 //#endregion
 //#region src/translator/core/html-comment.ts
 const kNodeBinding$1 = Symbol("comment tag binding");
+const escapeCommentText = (text) => text.replace(/>/g, "&gt;");
 var html_comment_default = {
 	analyze(tag) {
 		(0, _marko_compiler_babel_utils.assertNoArgs)(tag);
@@ -7803,11 +7836,11 @@ var html_comment_default = {
 			const nodeBinding = tagExtra[kNodeBinding$1];
 			const write = writeTo(tag);
 			if (isOutputHTML()) {
-				for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoText(child)) write`${child.value}`;
+				for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoText(child)) write`${escapeCommentText(child.value)}`;
 				else if (_marko_compiler.types.isMarkoPlaceholder(child)) write`${callRuntime(child.escape ? "_escape_comment" : "_unescaped", child.value)}`;
 			} else {
 				const textLiteral = bodyToTextLiteral(tag.node.body);
-				if (_marko_compiler.types.isStringLiteral(textLiteral)) write`${textLiteral}`;
+				if (_marko_compiler.types.isStringLiteral(textLiteral)) write`${escapeCommentText(textLiteral.value)}`;
 				else addStatement("render", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_text", createScopeReadExpression(nodeBinding), textLiteral)));
 			}
 			exit(tag);
@@ -8953,12 +8986,13 @@ var placeholder_default = {
 			const siblingText = extra[kSiblingText];
 			const markerSerializeReason = nodeBinding && getSerializeReason(section, nodeBinding);
 			if (siblingText === 1) {
-				if (isHTML && markerSerializeReason) if (markerSerializeReason === true || markerSerializeReason.state) write`<!>`;
-				else write`${callRuntime("_sep", getSerializeGuard(section, markerSerializeReason, true))}`;
+				if (isHTML && markerSerializeReason) writeSeparator(write, section, markerSerializeReason);
 				visit(placeholder, 37);
 			} else if (siblingText === 2) visit(placeholder, 37);
 			else {
-				if (!isHTML) write` `;
+				if (isHTML) {
+					if (siblingText === 3 && markerSerializeReason) writeSeparator(write, section, markerSerializeReason);
+				} else write` `;
 				visit(placeholder, 32);
 			}
 			if (isHTML) {
@@ -8990,8 +9024,13 @@ function buildEscapedTextExpression(value) {
 		default: return callRuntime("_escape", value);
 	}
 }
+function writeSeparator(write, section, reason) {
+	if (reason === true || reason.state) write`<!>`;
+	else write`${callRuntime("_sep", getSerializeGuard(section, reason, true))}`;
+}
 function analyzeSiblingText(placeholder) {
 	const placeholderExtra = placeholder.node.extra;
+	let hasNodeBefore = false;
 	let prev = placeholder.getPrevSibling();
 	let prevParent = placeholder.parentPath;
 	for (;;) {
@@ -9007,7 +9046,10 @@ function analyzeSiblingText(placeholder) {
 		const contentType = getNodeContentType(prev, "endType");
 		if (contentType === null) prev = prev.getPrevSibling();
 		else if (contentType === 4 || contentType === 1 || contentType === 2) return placeholderExtra[kSiblingText] = 1;
-		else break;
+		else {
+			hasNodeBefore = true;
+			break;
+		}
 	}
 	if (!prev.node && prevParent.isProgram()) return placeholderExtra[kSiblingText] = 1;
 	let next = placeholder.getNextSibling();
@@ -9028,7 +9070,7 @@ function analyzeSiblingText(placeholder) {
 		else break;
 	}
 	if (!next.node && nextParent.isProgram()) return placeholderExtra[kSiblingText] = 2;
-	return placeholderExtra[kSiblingText] = 0;
+	return placeholderExtra[kSiblingText] = hasNodeBefore ? 3 : 0;
 }
 function getInlinedBodyTag(parent) {
 	if (parent.isMarkoTagBody()) {

package/dist/translator/util/binding-has-prop.d.ts

@@ -1,3 +1,5 @@
 import type { Opt } from "./optional";
 import type { Binding } from "./references";
+import type { Section } from "./sections";
+export declare function isSectionRendererElided(section: Section): boolean;
 export declare function bindingHasProperty(binding: Binding, properties: Opt<string>): boolean;

package/dist/translator/visitors/placeholder.d.ts

@@ -6,7 +6,8 @@ declare const kSharedText: unique symbol;
 declare enum SiblingText {
     None = 0,
     Before = 1,
-    After = 2
+    After = 2,
+    NodeBefore = 3
 }
 declare module "@marko/compiler/dist/types" {
     interface MarkoPlaceholderExtra {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "6.3.0",
+  "version": "6.3.2",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",