marko 6.3.56 → 6.4.1

package/dist/debug/html.mjs

@@ -104,19 +104,21 @@ const toDelimitedString = function toDelimitedString(val, delimiter, stringify)
 	let str = "";
 	let sep = "";
 	let part;
-	if (val) if (typeof val !== "object") str += val;
-	else if (Array.isArray(val)) for (const v of val) {
-		part = toDelimitedString(v, delimiter, stringify);
-		if (part) {
-			str += sep + part;
-			sep = delimiter;
+	if (val) {
+		if (typeof val !== "object") str += val;
+		else if (Array.isArray(val)) for (const v of val) {
+			part = toDelimitedString(v, delimiter, stringify);
+			if (part) {
+				str += sep + part;
+				sep = delimiter;
+			}
 		}
-	}
-	else for (const name in val) {
-		part = stringify(name, val[name]);
-		if (part) {
-			str += sep + part;
-			sep = delimiter;
+		else for (const name in val) {
+			part = stringify(name, val[name]);
+			if (part) {
+				str += sep + part;
+				sep = delimiter;
+			}
 		}
 	}
 	return str;
@@ -216,18 +218,18 @@ function _hoist_read_error() {
 function _assert_hoist(value) {
 	if (value !== void 0 && typeof value !== "function") throw new Error(`Hoisted values must be functions, received type "${typeof value}".`);
 }
-function assertExclusiveAttrs(attrs, onError = throwErr) {
+function assertExclusiveAttrs(attrs, onError = throwErr, isSet = isTruthy) {
 	if (attrs) {
 		let exclusiveAttrs;
-		if (attrs.checkedChange) (exclusiveAttrs ||= []).push("checkedChange");
+		if (isSet(attrs.checkedChange)) (exclusiveAttrs ||= []).push("checkedChange");
 		if ("checkedValue" in attrs) {
 			(exclusiveAttrs ||= []).push("checkedValue");
 			if ("checked" in attrs) exclusiveAttrs.push("checked");
-		} else if (attrs.checkedValueChange) {
+		} else if (isSet(attrs.checkedValueChange)) {
 			(exclusiveAttrs ||= []).push("checkedValueChange");
 			if ("checked" in attrs) exclusiveAttrs.push("checked");
 		}
-		if (attrs.valueChange) {
+		if (isSet(attrs.valueChange)) {
 			(exclusiveAttrs ||= []).push("valueChange");
 			if ("checked" in attrs && !exclusiveAttrs.includes("checked")) exclusiveAttrs.push("checked");
 		}
@@ -243,6 +245,9 @@ function assertHandlerIsFunction(name, value) {
 function assertValidTagName(tagName) {
 	if (!/^[a-z][a-z0-9._-]*$/i.test(tagName)) throw new Error(`Invalid tag name: "${tagName}". Tag names must start with a letter and contain only letters, numbers, periods, hyphens, and underscores.`);
 }
+function isTruthy(value) {
+	return value;
+}
 function throwErr(msg) {
 	throw new Error(msg);
 }
@@ -260,43 +265,47 @@ const DYNAMIC_TAG_SCRIPT_REGISTER_ID = "_dynamicTagScript";
 const DYNAMIC_TAG_VAR_REGISTER_ID = "_dynamicTagVar";
 const PLACEHOLDER_DISMISS_REGISTER_ID = "_placeholderDismiss";
 //#endregion
-//#region src/html/content.ts
-function _to_text(val) {
-	assertValidTextValue(val);
-	return val || val === 0 ? val + "" : "";
-}
-function _unescaped(val) {
-	assertValidTextValue(val);
-	return val ? val + "" : val === 0 ? "0" : "";
+//#region src/common/for.ts
+function forIn(obj, cb) {
+	for (const key in obj) cb(key, obj[key]);
 }
-const unsafeXMLReg = /[<&\r]/g;
-const replaceUnsafeXML = (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&#13;";
-const escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str;
-function _escape(val) {
-	assertValidTextValue(val);
-	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
+function forOf(list, cb) {
+	assertValidList(list);
+	if (list) {
+		let i = 0;
+		for (const item of list) cb(item, i++);
+	}
 }
-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" : "";
+function forTo(to, from, step, cb) {
+	assertValidRangeBound("to", to);
+	assertValidRangeStart("from", from);
+	assertValidRangeStart("step", step);
+	const start = from || 0;
+	const delta = step || 1;
+	for (let steps = (to - start) / delta, i = 0; i <= steps; i++) cb(start + i * delta);
 }
-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" : "";
+function forUntil(until, from, step, cb) {
+	assertValidRangeBound("until", until);
+	assertValidRangeStart("from", from);
+	assertValidRangeStart("step", step);
+	const start = from || 0;
+	const delta = step || 1;
+	for (let steps = (until - start) / delta, i = 0; i < steps; i++) cb(start + i * delta);
 }
-function _escape_style_value(val) {
-	assertValidTextValue(val);
-	return val || val === 0 ? escapeStyleValue(val + "") : "";
+//#endregion
+//#region src/common/opt.ts
+function push(opt, item) {
+	return opt ? Array.isArray(opt) ? (opt.push(item), opt) : [opt, item] : item;
 }
-const unsafeCommentReg = />/g;
-const escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str;
-function _escape_comment(val) {
-	assertValidTextValue(val);
-	return val ? escapeCommentStr(val + "") : val === 0 ? "0" : "";
+function concat(opt, other) {
+	if (!opt) return other;
+	if (!other) return opt;
+	if (Array.isArray(opt)) {
+		if (Array.isArray(other)) for (const item of other) opt.push(item);
+		else opt.push(other);
+		return opt;
+	}
+	return Array.isArray(other) ? [opt, ...other] : [opt, other];
 }
 //#endregion
 //#region src/html/serializer.ts
@@ -387,7 +396,6 @@ const KNOWN_FUNCTIONS = /* @__PURE__ */ (() => /* @__PURE__ */ new Map([
 	[Function, "Function"],
 	[globalThis.atob, "atob"],
 	[globalThis.btoa, "btoa"],
-	[globalThis.clearImmediate, "clearImmediate"],
 	[globalThis.clearInterval, "clearInterval"],
 	[globalThis.clearTimeout, "clearTimeout"],
 	[globalThis.crypto?.getRandomValues, "crypto.getRandomValues"],
@@ -395,7 +403,6 @@ const KNOWN_FUNCTIONS = /* @__PURE__ */ (() => /* @__PURE__ */ new Map([
 	[globalThis.fetch, "fetch"],
 	[globalThis.performance?.now, "performance.now"],
 	[globalThis.queueMicrotask, "queueMicrotask"],
-	[globalThis.setImmediate, "setImmediate"],
 	[globalThis.setInterval, "setInterval"],
 	[globalThis.setTimeout, "setTimeout"],
 	[globalThis.structuredClone, "structuredClone"],
@@ -611,6 +618,9 @@ var Serializer = class {
 			this.#state.boundary = boundary;
 			this.#state.channel = channel;
 			return writeScopesRoot(this.#state, flushes);
+		} catch (err) {
+			abortRender(boundary, err);
+			return "";
 		} finally {
 			this.#state.flushId++;
 			this.#state.buf = [];
@@ -725,7 +735,7 @@ function writeAssigned(state) {
 			if (writeProp(state, mutation.object, null, "")) {
 				const objectRef = state.refs.get(mutation.object);
 				if (objectRef && objectRef.scopeId === void 0) {
-					if (!objectRef.id) {
+					if (!objectRef.id && !isAncestorChannelRef(state, objectRef)) {
 						objectRef.id = nextRefAccess(state);
 						state.buf[objectStartIndex] = "(" + objectRef.id + "=" + state.buf[objectStartIndex];
 						state.buf.push(")");
@@ -738,7 +748,7 @@ function writeAssigned(state) {
 			const valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
 			if (mutation.value === void 0) {} else if (writeProp(state, mutation.value, null, "")) {
 				const valueRef = typeof mutation.value === "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
-				if (valueRef && !valueRef.id && valueRef.scopeId === void 0) {
+				if (valueRef && !valueRef.id && valueRef.scopeId === void 0 && !isAncestorChannelRef(state, valueRef)) {
 					valueRef.id = mutation.valueId || nextRefAccess(state);
 					state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex];
 				}
@@ -755,7 +765,7 @@ function writeCallArg(state, val) {
 		state.buf.push("$");
 	} else if (writeProp(state, val, null, "")) {
 		const ref = state.refs.get(val) || state.strs.get(val);
-		if (ref && ref.id === null) assignId(state, ref);
+		if (ref) ensureId(state, ref);
 	} else state.buf.push("void 0");
 }
 function hasChannelMutations(state) {
@@ -837,8 +847,7 @@ function writeRegistered(state, val, parent, accessor, registered) {
 			state.buf.push(registered.access + "(_(" + scopeId + ")");
 			for (const local of locals) {
 				state.buf.push(",");
-				if (local) writePlainObject(state, local, new Reference(ref, null, state.flushId, state.buf.length));
-				else state.buf.push("0");
+				writePlainObject(state, local, newArgReference(state, ref, local));
 			}
 		} else state.buf.push("_(" + scopeId + "," + quoteRegisterId(registered.id));
 		state.buf.push(")");
@@ -927,7 +936,8 @@ function writeUnknownObject(state, val, ref) {
 	const proto = Object.getPrototypeOf(val);
 	if (proto === objectProto) return writePlainObject(state, val, ref);
 	if (proto === arrayProto) return writeArray(state, val, ref);
-	switch (proto?.constructor) {
+	const constructor = proto?.constructor;
+	switch (constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -944,7 +954,7 @@ function writeUnknownObject(state, val, ref) {
 		case ReferenceError:
 		case SyntaxError:
 		case TypeError:
-		case URIError: return writeError(state, val, ref);
+		case URIError: return writeError(state, val, constructor.name, ref);
 		case AggregateError: return writeAggregateError(state, val, ref);
 		case ArrayBuffer: return writeArrayBuffer(state, val);
 		case Int8Array:
@@ -957,7 +967,7 @@ function writeUnknownObject(state, val, ref) {
 		case Float32Array:
 		case Float64Array:
 		case BigInt64Array:
-		case BigUint64Array: return writeTypedArray(state, val, ref);
+		case BigUint64Array: return writeTypedArray(state, val, constructor.name, ref);
 		case DataView: return writeDataView(state, val, ref);
 		case WeakSet: return writeWeakSet(state);
 		case WeakMap: return writeWeakMap(state);
@@ -1146,6 +1156,17 @@ function writeArrayArg(state, ref, items, assignsPrefix, plainPrefix, needsId) {
 	}
 	state.buf.push(")");
 }
+function newArgReference(state, parent, val) {
+	for (const key in val) {
+		const member = val[key];
+		if (isDedupedMember(member) && !(typeof member === "string" ? state.strs.has(member) : state.refs.has(member))) {
+			const ref = new Reference(parent, null, state.flushId, null, nextRefAccess(state));
+			state.buf.push(ref.id + "=");
+			return ref;
+		}
+	}
+	return new Reference(parent, null, state.flushId, state.buf.length);
+}
 function isDedupedMember(val) {
 	switch (typeof val) {
 		case "object": return val !== null && val[K_SCOPE_ID] === void 0;
@@ -1178,16 +1199,16 @@ function writeArrayBuffer(state, val) {
 	state.buf.push(result);
 	return true;
 }
-function writeTypedArray(state, val, ref) {
+function writeTypedArray(state, val, name, ref) {
 	if (val.byteOffset || val.byteLength < val.buffer.byteLength || state.refs.has(val.buffer)) {
 		if (!canWriteBuffer(state, val.buffer, ref)) return false;
 		const needsLength = val.byteOffset + val.byteLength < val.buffer.byteLength;
-		state.buf.push("new " + val.constructor.name + "(");
+		state.buf.push("new " + name + "(");
 		writeProp(state, val.buffer, ref, "buffer");
 		state.buf.push((val.byteOffset || needsLength ? "," + val.byteOffset + (needsLength ? "," + val.length : "") : "") + ")");
 	} else {
 		state.refs.set(val.buffer, new Reference(ref, "buffer", state.flushId, null));
-		state.buf.push("new " + val.constructor.name + (val.length === 0 ? "" : "(" + (hasOnlyZeros(val) ? val.length : typedArrayToInitString(val)) + ")"));
+		state.buf.push("new " + name + (val.length === 0 ? "" : "(" + (hasOnlyZeros(val) ? val.length : typedArrayToInitString(val)) + ")"));
 	}
 	return true;
 }
@@ -1199,8 +1220,8 @@ function writeWeakMap(state) {
 	state.buf.push("new WeakMap");
 	return true;
 }
-function writeError(state, val, ref) {
-	const result = "new " + val.constructor.name + "(" + quote(val.message + "", 0);
+function writeError(state, val, name, ref) {
+	const result = "new " + name + "(" + quote(val.message + "", 0);
 	if (val.cause !== void 0) {
 		const pos = state.buf.push(result + ",{cause:") - 1;
 		if (writeProp(state, val.cause, ref, "cause")) state.buf.push("})");
@@ -1342,20 +1363,9 @@ function writeResponse(state, val, ref) {
 }
 function writeIntl(state, val, name, ref) {
 	const { locale, ...options } = val.resolvedOptions();
-	let needsId = false;
-	for (const key in options) if (isDedupedMember(options[key])) {
-		needsId = true;
-		break;
-	}
 	state.buf.push("new Intl." + name + "(" + quote(locale, 0) + ",");
-	let optionsRef;
-	if (needsId) {
-		optionsRef = new Reference(ref, null, state.flushId, null, nextRefAccess(state));
-		state.buf.push(optionsRef.id + "={");
-	} else {
-		optionsRef = new Reference(ref, null, state.flushId, state.buf.length);
-		state.buf.push("{");
-	}
+	const optionsRef = newArgReference(state, ref, options);
+	state.buf.push("{");
 	writeObjectProps(state, options, optionsRef);
 	state.buf.push("})");
 	return true;
@@ -1369,14 +1379,17 @@ function writeTemporal(state, val, name) {
 	return true;
 }
 function writeReadableStream(state, val, ref) {
-	if (val.locked) return false;
+	if (val.locked) {
+		throwUnserializable(state, val, ref, "", "The ReadableStream is locked by a reader on the server; to also send it to the browser, `tee()` it (or `clone()` its `Request`/`Response`) before reading.");
+		return false;
+	}
 	const { boundary, channel } = state;
 	const reader = val.getReader();
 	const iterId = nextRefAccess(state);
 	const handle = newAsyncHandle(state, ref, iterId);
 	const onFulfilled = ({ value, done }) => {
 		if (done) writeAsyncCall(state, boundary, handle, "r", value, channel);
-		else if (!boundary.signal.aborted) {
+		else if (!boundary.aborted) {
 			reader.read().then(onFulfilled, onRejected);
 			boundary.startAsync();
 			writeAsyncCall(state, boundary, handle, "f", value, channel);
@@ -1423,13 +1436,10 @@ function writeGenerator(state, iter, ref) {
 		state.buf.push("," + holder.id + "={}");
 		writeProp(state, returnValue, holder, "v");
 	} else if (returnValue !== void 0) {
-		const sepIndex = state.buf.push(",") - 1;
+		state.buf.push(",");
 		if (writeProp(state, returnValue, ref, "") && isDedupedMember(returnValue)) {
 			const retRef = typeof returnValue === "string" ? state.strs.get(returnValue) : state.refs.get(returnValue);
-			if (retRef && !retRef.id && retRef.scopeId === void 0) {
-				retRef.id = nextRefAccess(state);
-				state.buf[sepIndex] = "," + retRef.id + "=";
-			}
+			if (retRef) ensureId(state, retRef);
 		}
 	}
 	state.buf.push(")");
@@ -1445,7 +1455,7 @@ function writeAsyncGenerator(state, iter, ref) {
 	const handle = newAsyncHandle(state, ref, iterId);
 	const onFulfilled = ({ value, done }) => {
 		if (done) writeAsyncCall(state, boundary, handle, "r", value, channel);
-		else if (!boundary.signal.aborted) {
+		else if (!boundary.aborted) {
 			iter.next().then(onFulfilled, onRejected);
 			boundary.startAsync();
 			writeAsyncCall(state, boundary, handle, "f", value, channel);
@@ -1492,7 +1502,7 @@ function writeMaybeIterableProps(state, val, ref) {
 	return sep;
 }
 function writeAsyncCall(state, boundary, handle, method, value, channel, valueId = null) {
-	if (boundary.signal.aborted) return;
+	if (boundary.aborted) return;
 	state.mutated.push({
 		value,
 		object: handle,
@@ -1502,7 +1512,7 @@ function writeAsyncCall(state, boundary, handle, method, value, channel, valueId
 	});
 	boundary.endAsync();
 }
-function throwUnserializable(state, cause, ref = null, accessor = "") {
+function throwUnserializable(state, cause, ref = null, accessor = "", hint = "Values referenced in the browser must be serializable.") {
 	if (cause !== void 0) {
 		let message = "Unable to serialize";
 		let access = "";
@@ -1515,10 +1525,12 @@ function throwUnserializable(state, cause, ref = null, accessor = "") {
 				const slotName = debug.slots?.[rawAccessor];
 				let debugAccess = varLoc ? rawAccessor : void 0;
 				let debugLoc = debug.loc;
-				if (varLoc) if (Array.isArray(varLoc)) {
-					debugAccess = varLoc[0];
-					if (varLoc[1]) debugLoc = varLoc[1];
-				} else debugLoc = varLoc;
+				if (varLoc) {
+					if (Array.isArray(varLoc)) {
+						debugAccess = varLoc[0];
+						if (varLoc[1]) debugLoc = varLoc[1];
+					} else debugLoc = varLoc;
+				}
 				let display;
 				if (debugAccess !== void 0) display = slotName && debugAccess.startsWith("...") ? `\`${slotName}\` from \`${debugAccess}\`` : JSON.stringify(debugAccess);
 				else display = describeAccessor(rawAccessor, slotName) ?? JSON.stringify(rawAccessor);
@@ -1532,10 +1544,10 @@ function throwUnserializable(state, cause, ref = null, accessor = "") {
 		if (accessor) access = toAccess(accessor) + access;
 		if (access[0] === ".") access = access.slice(1);
 		if (access) message += ` (reading ${access})`;
-		message += ". Values referenced in the browser must be serializable.";
+		message += ". " + hint;
 		const err = new TypeError(message, { cause });
 		err.stack = void 0;
-		state.boundary.abort(err);
+		abortRender(state.boundary, err);
 	}
 }
 const accessorPrefixDescriptions = {
@@ -1548,12 +1560,14 @@ const accessorPrefixDescriptions = {
 	ControlledType: "the controlled type",
 	ControlledValue: "the controlled value",
 	DynamicHTMLLastChild: "the dynamic html",
+	DynamicHTMLValue: "the dynamic html value",
 	EventAttributes: "the event handlers",
 	IdFallback: "the generated id",
 	KeyedScopes: "the keyed scopes",
 	Lifecycle: "the lifecycle handlers",
 	Promise: "the pending promise",
-	TagVariableChange: "the tag variable change handler"
+	TagVariableChange: "the tag variable change handler",
+	TryBranch: "the try branch"
 };
 function describeAccessor(accessor, slotName) {
 	const sep = accessor.indexOf(":");
@@ -1585,10 +1599,17 @@ function trackChannel(state, ref) {
 	}
 	return false;
 }
+function isAncestorChannelRef(state, ref) {
+	return ref.channel?.readyId !== state.channel?.readyId;
+}
 function abortUnreachableChannel(state, val) {
 	const err = new TypeError("Unable to serialize a value shared between independently lazy loaded content. Values shared this way must also be serialized by content that is not lazily loaded, or by a common parent.", { cause: val });
 	err.stack = void 0;
-	state.boundary.abort(err);
+	abortRender(state.boundary, err);
+}
+function abortRender(boundary, err) {
+	while (boundary.parent) boundary = boundary.parent;
+	boundary.abort(err);
 }
 function isCircular(parent, ref) {
 	let cur = parent;
@@ -1603,16 +1624,17 @@ function toObjectKey(name) {
 	if (name === "__proto__") return "[\"__proto__\"]";
 	const len = name.length;
 	const c0 = name.charCodeAt(0);
-	if (c0 >= 48 && c0 <= 57) if (c0 === 48) {
-		if (len !== 1) return quote(name, 1);
-	} else {
-		for (let i = 1; i < len; i++) {
-			const c = name.charCodeAt(i);
-			if (c < 48 || c > 57) return quote(name, i);
+	if (c0 >= 48 && c0 <= 57) {
+		if (c0 === 48) {
+			if (len !== 1) return quote(name, 1);
+		} else {
+			for (let i = 1; i < len; i++) {
+				const c = name.charCodeAt(i);
+				if (c < 48 || c > 57) return quote(name, i);
+			}
+			if (len > 15 && "" + +name !== name) return quote(name, 0);
 		}
-		if (len > 15 && "" + +name !== name) return quote(name, 0);
-	}
-	else if (c0 >= 97 && c0 <= 122 || c0 >= 65 && c0 <= 90 || c0 === 95 || c0 === 36) for (let i = 1; i < len; i++) {
+	} else if (c0 >= 97 && c0 <= 122 || c0 >= 65 && c0 <= 90 || c0 === 95 || c0 === 36) for (let i = 1; i < len; i++) {
 		const c = name.charCodeAt(i);
 		if (!(c >= 97 && c <= 122 || c >= 65 && c <= 90 || c >= 48 && c <= 57 || c === 95 || c === 36)) return quote(name, i);
 	}
@@ -1673,11 +1695,10 @@ function quote(str, startPos) {
 	return "\"" + (lastPos === startPos ? str : result + str.slice(lastPos)) + "\"";
 }
 function writeRef(state, ref) {
-	if (ref.id === null && ref.scopeId === void 0 && ref.path === null && (ref.pos === null || ref.flushId !== state.flushId)) {
+	if (ref.id === null && ref.scopeId === void 0 && ref.path === null && (ref.pos === null || ref.flushId !== state.flushId) && !isAncestorChannelRef(state, ref)) {
 		ref.path = accessPath(state, ref);
 		ref.pos = state.buf.length;
 		ref.flushId = state.flushId;
-		ref.channel = state.channel;
 		state.buf.push(ref.path);
 	} else state.buf.push(ensureId(state, ref));
 }
@@ -1698,23 +1719,26 @@ function accessId(state, ref) {
 }
 function assignId(state, ref) {
 	const { pos } = ref;
-	ref.id = nextRefAccess(state);
 	if (pos !== null && ref.flushId === state.flushId) {
+		ref.id = nextRefAccess(state);
 		if (pos === 0) state.buf[0] = ref.id + "=" + state.buf[0];
 		else state.buf[pos - 1] += ref.id + "=";
 		return ref.id;
 	}
-	ref.channel = state.channel;
+	if (isAncestorChannelRef(state, ref)) return ref.path || accessPath(state, ref);
+	ref.id = nextRefAccess(state);
 	return ref.id + "=" + (ref.path || accessPath(state, ref));
 }
 function accessPath(state, ref) {
 	let cur = ref;
 	let accessPrevValue = "";
 	do {
+		if (cur.accessor === null) throw new Error("Unable to serialize a reused value: no access path reaches where it was first written, and it has no id.");
 		accessPrevValue = toAccess(cur.accessor) + accessPrevValue;
 		const parent = cur.parent;
 		if (parent.id) {
-			if (trackChannel(state, parent) || !parent.parent) return parent.id + accessPrevValue;
+			trackChannel(state, parent);
+			return parent.id + accessPrevValue;
 		}
 		if (parent.flushId === state.flushId || parent.scopeId !== void 0) return accessId(state, parent) + accessPrevValue;
 		cur = parent;
@@ -1737,7 +1761,7 @@ function nextId(state) {
 	let n = state.ids++;
 	let r = c[n % 53];
 	for (n = n / 53 | 0; n; n >>>= 6) r += c[n & 63];
-	return r;
+	return r === "name" ? nextId(state) : r;
 }
 function hasSymbolIterator(value) {
 	return Symbol.iterator in value;
@@ -1788,126 +1812,307 @@ function patchIteratorNext(proto) {
 	proto.next[kTouchedIterator] = true;
 }
 //#endregion
-//#region src/common/for.ts
-function forIn(obj, cb) {
-	for (const key in obj) cb(key, obj[key]);
+//#region src/html/attrs.ts
+function _attr_class(value) {
+	return stringAttr("class", toDelimitedString(value, " ", stringifyClassObject));
 }
-function forOf(list, cb) {
-	assertValidList(list);
-	if (list) {
-		let i = 0;
-		for (const item of list) cb(item, i++);
+function _attr_style(value) {
+	return stringAttr("style", toDelimitedString(value, ";", stringifyStyleObject));
+}
+function _attr_option_value(value) {
+	const valueAttr = _attr("value", value);
+	const selectedValue = getContext(kSelectedValue);
+	if (selectedValue !== void 0 && normalizedValueMatches(selectedValue, value)) {
+		{
+			const matched = getContext(kSelectedValueMatched);
+			if (matched) matched.value = true;
+		}
+		return valueAttr + " selected";
 	}
+	return valueAttr;
 }
-function forTo(to, from, step, cb) {
-	assertValidRangeBound("to", to);
-	assertValidRangeStart("from", from);
-	assertValidRangeStart("step", step);
-	const start = from || 0;
-	const delta = step || 1;
-	for (let steps = (to - start) / delta, i = 0; i <= steps; i++) cb(start + i * delta);
+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) {
+		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 forUntil(until, from, step, cb) {
-	assertValidRangeBound("until", until);
-	assertValidRangeStart("from", from);
-	assertValidRangeStart("step", step);
-	const start = from || 0;
-	const delta = step || 1;
-	for (let steps = (until - start) / delta, i = 0; i < steps; i++) cb(start + i * delta);
+function _attrs_select_value(scopeId, nodeAccessor, data, content) {
+	if (data && ("value" in data || data.valueChange)) _attr_select_value(scopeId, nodeAccessor, data.value, data.valueChange, content, 1);
+	else content();
 }
-//#endregion
-//#region src/common/opt.ts
-function forEach(opt, cb) {
-	if (opt) if (Array.isArray(opt)) for (const item of opt) cb(item);
-	else cb(opt);
+function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
+	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
+	return _textarea_value(value);
 }
-function push(opt, item) {
-	return opt ? Array.isArray(opt) ? (opt.push(item), opt) : [opt, item] : item;
+function _attrs_textarea_value(scopeId, nodeAccessor, data) {
+	return _attr_textarea_value(scopeId, nodeAccessor, data?.value, data?.valueChange, 1);
 }
-function concat(opt, other) {
-	if (!opt) return other;
-	if (!other) return opt;
-	if (Array.isArray(opt)) {
-		if (Array.isArray(other)) for (const item of other) opt.push(item);
-		else opt.push(other);
-		return opt;
+function _textarea_value(value) {
+	const escaped = _escape(normalizeStrAttrValue(value));
+	return escaped[0] === "\n" ? "\n" + escaped : escaped;
+}
+function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
+	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
+	return _attr("value", value);
+}
+function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange, serializeType) {
+	if (checkedChange) writeControlledScope(0, scopeId, nodeAccessor, void 0, checkedChange, serializeType);
+	return isNotVoid(checked) ? " checked" : "";
+}
+function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value, serializeType) {
+	const valueAttr = _attr("value", value);
+	if (checkedValueChange) writeControlledScope(1, scopeId, nodeAccessor, getCheckedValueRef(checkedValue), checkedValueChange, serializeType);
+	return normalizedValueMatches(checkedValue, value) ? valueAttr + " checked" : valueAttr;
+}
+const checkedValuesRefs = /* @__PURE__ */ new WeakMap();
+function getCheckedValueRef(checkedValue) {
+	if (Array.isArray(checkedValue)) {
+		let ref = checkedValuesRefs.get(checkedValue);
+		if (!ref) {
+			ref = [];
+			checkedValuesRefs.set(checkedValue, ref);
+		}
+		return ref;
 	}
-	return Array.isArray(other) ? [opt, ...other] : [opt, other];
 }
-//#endregion
-//#region src/html/for.ts
-function forOfBy(by, item, index) {
-	return by ? typeof by === "string" ? item[by] : by(item, index) : index;
+function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange, serializeType) {
+	const normalizedOpen = isNotVoid(open);
+	if (openChange) writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen || void 0, openChange, serializeType);
+	return normalizedOpen ? " open" : "";
 }
-function forInBy(by, name, value) {
-	return by ? by(name, value) : name;
+function _attr_nonce() {
+	return getChunk().boundary.state.nonceAttr;
 }
-function forStepBy(by, index) {
-	return by ? by(index) : index;
+function _style_html(decls) {
+	const id = _id();
+	return `<style${_attr_nonce()} class=${id}>.${id}~*{${decls}}</style>`;
 }
-//#endregion
-//#region src/html/inlined-runtimes.debug.ts
-const WALKER_RUNTIME_CODE = `((runtimeId) => (self[runtimeId] ||= (
-  renderId,
-  prefix = runtimeId + renderId,
-  prefixLen = prefix.length,
-  lookup = {},
-  visits = [],
-  doc = document,
-  walker = doc.createTreeWalker(
-    doc,
-    129 /* NodeFilter.SHOW_COMMENT | NodeFilter.SHOW_ELEMENT */,
-  ),
-) =>
-  doc = (self[runtimeId][renderId] = {
-    i: prefix,
-    d: doc,
-    l: lookup,
-    v: visits,
-    x() {},
-    w(node, op, id) {
-      while ((node = walker.nextNode())) {
-        // Only reorder markers ("#", "!") are ever looked up, so only they are
-        // kept: the lookup lives as long as the page, and every node marker
-        // would otherwise stay referenced in it after resume consumed it.
-        doc.x(
-          (op =
-            (op = node.data) &&
-            !op.indexOf(prefix) &&
-            ((id = op.slice(prefixLen + 1)),
-            (op = op[prefixLen]) > "#" || (lookup[id] = node),
-            op)),
-          id,
-          node,
-        );
-
-        if (op > "#") {
-          visits.push(node);
-        }
-      }
-    },
-  })
-, self[runtimeId]))`;
-const REORDER_RUNTIME_CODE = `((runtime) => {
-  if (runtime.j) return;
-  let onNextSibling,
-    placeholder,
-    nextSibling,
-    placeholders = runtime.p = {},
-    replace = (id, container) => runtime.l[id].replaceWith(...container.childNodes);
-  runtime.j = {};
-  runtime.x = (op, id, node, placeholderRoot, placeholderCb) => {
-    if (node == nextSibling) {
-      onNextSibling();
+function _attr(name, value) {
+	return isVoid(value) ? "" : nonVoidAttr(name, value);
+}
+function _attr_and(name, value, attr) {
+	return value ? attr : _attr(name, value);
+}
+function _attr_or(name, value, attr) {
+	return value ? _attr(name, value) : attr;
+}
+function _attr_nullish(name, value, attr) {
+	return value == null ? attr : _attr(name, value);
+}
+function _attrs(data, nodeAccessor, scopeId, tagName) {
+	let result = "";
+	let skip = /[\s/>"'=]/;
+	let events;
+	switch (data && tagName) {
+		case "input":
+			assertExclusiveAttrs(data);
+			if (data.checkedChange) {
+				result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange, 1);
+				skip = /^checked(?:Value)?(?:Change)?$|[\s/>"'=]/;
+			} else if ("checkedValue" in data || data.checkedValueChange) {
+				result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value, 1);
+				skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/;
+			} else if (data.valueChange) {
+				assertNoValueBindingOnCheckable(data.type, data.valueChange);
+				result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange, 1);
+				skip = /^value(?:Change)?$|[\s/>"'=]/;
+			}
+			break;
+		case "select":
+		case "textarea":
+			if ("value" in data || data.valueChange) skip = /^value(?:Change)?$|[\s/>"'=]/;
+			break;
+		case "option":
+			if ("value" in data) {
+				result += _attr_option_value(data.value);
+				skip = /^value$|[\s/>"'=]/;
+			}
+			break;
+		case "details":
+		case "dialog": if (data.openChange) {
+			result += _attr_details_or_dialog_open(scopeId, nodeAccessor, data.open, data.openChange, 1);
+			skip = /^open(?:Change)?$|[\s/>"'=]/;
+		}
+	}
+	for (const name in data) {
+		const value = data[name];
+		switch (name) {
+			case "class":
+				result += _attr_class(value);
+				break;
+			case "style":
+				result += _attr_style(value);
+				break;
+			default:
+				if (name) assertValidAttrName(name);
+				if (name && !(isVoid(value) || skip.test(name) || name === "content" && tagName !== "meta")) {
+					if (isEventHandler(name)) {
+						if (!events) {
+							events = {};
+							writeScope(scopeId, { [EventAttributes + nodeAccessor]: events });
+						}
+						events[getEventHandlerName(name)] = value;
+					} else result += nonVoidAttr(name, value);
+				}
+		}
+	}
+	return result;
+}
+function _attrs_content(data, nodeAccessor, scopeId, tagName, markerGuard) {
+	_html(`${_attrs(data, nodeAccessor, scopeId, tagName)}>`);
+	_attr_content(nodeAccessor, scopeId, data?.content, markerGuard);
+}
+function _attrs_partial(data, skip, nodeAccessor, scopeId, tagName) {
+	const partial = {};
+	for (const name in data) {
+		const key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
+		if (!skip[key]) partial[key] = data[name];
+	}
+	assertExclusiveAttrs({
+		...data,
+		...skip
+	});
+	return _attrs(partial, nodeAccessor, scopeId, tagName);
+}
+function _attrs_partial_content(data, skip, nodeAccessor, scopeId, tagName, markerGuard) {
+	_html(`${_attrs_partial(data, skip, nodeAccessor, scopeId, tagName)}>`);
+	_attr_content(nodeAccessor, scopeId, data?.content, markerGuard);
+}
+function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange, serializeType) {
+	var handlerName = [
+		"checkedChange",
+		"checkedValueChange",
+		"valueChange",
+		"valueChange",
+		"openChange"
+	][type];
+	assertHandlerIsFunction(handlerName, valueChange);
+	setDebugSlotName(writeScope(scopeId, serializeType ? {
+		[ControlledType + nodeAccessor]: type,
+		[ControlledValue + nodeAccessor]: value,
+		[ControlledHandler + nodeAccessor]: valueChange
+	} : {
+		[ControlledValue + nodeAccessor]: value,
+		[ControlledHandler + nodeAccessor]: valueChange
+	}), ControlledHandler + nodeAccessor, handlerName);
+}
+function stringAttr(name, value) {
+	return value && " " + name + attrAssignment(value);
+}
+function nonVoidAttr(name, value) {
+	assertValidAttrValue(name, value);
+	switch (typeof value) {
+		case "string": return " " + name + attrAssignment(value);
+		case "boolean": return " " + name;
+		case "number": return " " + name + "=" + value;
+	}
+	return " " + name + attrAssignment(value + "");
+}
+const singleQuoteAttrReplacements = /['\r]|&(?=[#a-zA-Z])/g;
+const doubleQuoteAttrReplacements = /["\r]|&(?=[#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 : "";
+}
+function escapeSingleQuotedAttrValue(value) {
+	return singleQuoteAttrReplacements.test(value) ? value.replace(singleQuoteAttrReplacements, replaceUnsafeSingleQuoteAttrChar) : value;
+}
+function replaceUnsafeSingleQuoteAttrChar(match) {
+	return match === "'" ? "&#39;" : match === "\r" ? "&#13;" : "&amp;";
+}
+function escapeDoubleQuotedAttrValue(value) {
+	return doubleQuoteAttrReplacements.test(value) ? value.replace(doubleQuoteAttrReplacements, replaceUnsafeDoubleQuoteAttrChar) : value;
+}
+function replaceUnsafeDoubleQuoteAttrChar(match) {
+	return match === "\"" ? "&#34;" : match === "\r" ? "&#13;" : "&amp;";
+}
+function normalizedValueMatches(a, b) {
+	const value = normalizeStrAttrValue(b);
+	if (Array.isArray(a)) {
+		for (const item of a) if (normalizeStrAttrValue(item) === value) return true;
+	} else if (normalizeStrAttrValue(a) === value) return true;
+	return false;
+}
+function normalizeStrAttrValue(value) {
+	return isNotVoid(value) && value !== true ? value + "" : "";
+}
+//#endregion
+//#region src/html/for.ts
+function forOfBy(by, item, index) {
+	return by ? typeof by === "string" ? item[by] : by(item, index) : index;
+}
+function forInBy(by, name, value) {
+	return by ? by(name, value) : name;
+}
+function forStepBy(by, index) {
+	return by ? by(index) : index;
+}
+//#endregion
+//#region src/html/inlined-runtimes.debug.ts
+const WALKER_RUNTIME_CODE = `((runtimeId) => (self[runtimeId] ||= (
+  renderId,
+  prefix = runtimeId + renderId,
+  prefixLen = prefix.length,
+  lookup = {},
+  visits = [],
+  doc = document,
+  walker = doc.createTreeWalker(
+    doc,
+    129 /* NodeFilter.SHOW_COMMENT | NodeFilter.SHOW_ELEMENT */,
+  ),
+) =>
+  doc = (self[runtimeId][renderId] = {
+    i: prefix,
+    d: doc,
+    l: lookup,
+    v: visits,
+    x() {},
+    w(node, op, id) {
+      while ((node = walker.nextNode())) {
+        // Only reorder markers ("#", "!") are ever looked up, so only they are
+        // kept: the lookup lives as long as the page, and every node marker
+        // would otherwise stay referenced in it after resume consumed it.
+        doc.x(
+          (op =
+            (op = node.data) &&
+            !op.indexOf(prefix) &&
+            ((id = op.slice(prefixLen + 1)),
+            (op = op[prefixLen]) > "#" || (lookup[id] = node),
+            op)),
+          id,
+          node,
+        );
+
+        if (op > "#") {
+          visits.push(node);
+        }
+      }
+    },
+  })
+, self[runtimeId]))`;
+const REORDER_RUNTIME_CODE = `((runtime) => {
+  if (runtime.j) return;
+  let onNextSibling,
+    placeholder,
+    nextSibling,
+    placeholders = runtime.p = {},
+    replace = (id, container) => runtime.l[id].replaceWith(...container.childNodes);
+  runtime.j = {};
+  runtime.x = (op, id, node, placeholderRoot, placeholderCb) => {
+    if (node == nextSibling) {
+      onNextSibling();
     }
 
     if (op == "#") {
       (placeholders[id] = placeholder).i++;
-    } else if (op == "!") {
-      if (runtime.l[id] && placeholders[id]) {
-        nextSibling = node.nextSibling;
-        onNextSibling = () => placeholders[id].c();
-      }
     } else if (node.tagName == "T" && (id = node.getAttribute(runtime.i))) {
       nextSibling = node.nextSibling;
       onNextSibling = () => {
@@ -1919,7 +2124,8 @@ const REORDER_RUNTIME_CODE = `((runtime) => {
         placeholders[id] ||
         (placeholderRoot = placeholders[id] =
           {
-            i: runtime.l[id] ? 1 : 2,
+            // The writer streams a reorder only after its markers.
+            i: 1,
             r: id,
             // Resume may still walk markers inside the dropped placeholder, so
             // park it in any detached parent (a bare <t> clone is the cheapest).
@@ -2004,6 +2210,12 @@ function withContext(key, value, cb, cbValue) {
 		ctx[key] = prev;
 	}
 }
+function captureContext(chunk) {
+	if (chunk.context?.[kPendingContexts]) chunk.context = {
+		...chunk.context,
+		[kPendingContexts]: 0
+	};
+}
 const kBranchId = Symbol("Branch Id");
 const kIsAsync = Symbol("Is Async");
 function isInResumedBranch() {
@@ -2012,8 +2224,8 @@ function isInResumedBranch() {
 function withBranchId(branchId, cb, cbValue) {
 	return withContext(kBranchId, branchId, cb, cbValue);
 }
-function withIsAsync(cb, value) {
-	return withContext(kIsAsync, true, cb, value);
+function withIsAsync(async, cb, value) {
+	return withContext(kIsAsync, async, cb, value);
 }
 function _html(html) {
 	$chunk.writeHTML(html);
@@ -2021,8 +2233,8 @@ function _html(html) {
 function writeScript(script) {
 	$chunk.writeScript(script);
 }
-function _script(scopeId, registryId, serializeMarker) {
-	if (serializeMarker === 0 && ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync])) _resume_branch(scopeId);
+function _script(scopeId, registryId, markerGuard) {
+	if (markerGuard === 0 && ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync])) _resume_branch(scopeId);
 	$chunk.boundary.state.needsMainRuntime = true;
 	$chunk.writeEffect(scopeId, registryId);
 }
@@ -2070,12 +2282,14 @@ function _resume_branch(scopeId) {
 	const branchId = $chunk.context?.[kBranchId];
 	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { [ClosestBranchId]: branchId });
 }
-function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
-	const shouldResume = serializeReason !== 0;
+function _attr_content(nodeAccessor, scopeId, content, markerGuard) {
+	const shouldResume = markerGuard !== 0;
 	const render = normalizeServerRender(content);
 	const branchId = _peek_scope_id();
-	if (render) if (shouldResume) withBranchId(branchId, render);
-	else render();
+	if (render) {
+		if (shouldResume) withBranchId(branchId, render);
+		else render();
+	}
 	if (_peek_scope_id() !== branchId) {
 		if (shouldResume) writeScope(scopeId, {
 			[BranchScopes + nodeAccessor]: writeScope(branchId, {}),
@@ -2085,8 +2299,10 @@ function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
 }
 function normalizeServerRender(value) {
 	const renderer = normalizeDynamicRenderer(value);
-	if (renderer) if (typeof renderer === "function") return renderer;
-	else throw new Error(`Invalid \`content\` attribute. Received ${typeof value}`);
+	if (renderer) {
+		if (typeof renderer === "function") return renderer;
+		else throw new Error(`Invalid \`content\` attribute. Received ${typeof value}`);
+	}
 }
 function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId, nodeAccessor) {
 	writeScopePassive(parentScopeId, { [scopeOffsetAccessor]: _scope_id() });
@@ -2101,47 +2317,47 @@ function writeScopePassive(scopeId, partialScope) {
 	passive[scopeId] = Object.assign(passive[scopeId] || {}, partialScope);
 	return scope;
 }
-function _show_start(display, mark) {
+function _show_start(display, markerGuard, branchExprGuard, parentEndTag) {
 	if (display) {
-		if (mark) $chunk.writeHTML($chunk.boundary.state.mark("[", ""));
+		if (resumesMarker(markerGuard, branchExprGuard, parentEndTag)) $chunk.writeHTML($chunk.boundary.state.mark("[", ""));
 	} else $chunk.writeHTML("<t hidden>");
 }
-function _show_end(scopeId, accessor, display, serializeMarker, serializeStateful, parentEndTag, singleNode) {
+function _show_end(scopeId, accessor, display, markerGuard, branchExprGuard, parentEndTag, singleNode) {
 	const branchId = _scope_id();
 	const wrap = !display;
 	if (wrap) $chunk.writeHTML("</t>");
-	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, wrap || singleNode ? 1 : void 0, " " + branchId);
+	writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, wrap || singleNode ? 1 : void 0, " " + branchId);
 }
-function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
+function _for_of(list, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
 	forBranches(by, (each) => each ? forOf(list, (item, index) => {
 		const itemKey = forOfBy(by, item, index);
 		each(itemKey, itemKey === index, () => cb(item, index));
-	}) : forOf(list, cb), scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode);
+	}) : forOf(list, cb), scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
 }
-function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
+function _for_in(obj, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
 	forBranches(by, (each) => each ? forIn(obj, (key, value) => {
 		each(forInBy(by, key, value), false, () => cb(key, value));
-	}) : forIn(obj, cb), scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode);
+	}) : forIn(obj, cb), scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
 }
-function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
+function _for_to(to, from, step, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
 	forBranches(by, (each) => {
 		let index = 0;
 		return each ? forTo(to, from, step, (value) => {
 			const itemKey = forStepBy(by, value);
 			each(itemKey, itemKey === index++, () => cb(value));
 		}) : forTo(to, from, step, cb);
-	}, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode);
+	}, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
 }
-function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
+function _for_until(to, from, step, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
 	forBranches(by, (each) => {
 		let index = 0;
 		return each ? forUntil(to, from, step, (value) => {
 			const itemKey = forStepBy(by, value);
 			each(itemKey, itemKey === index++, () => cb(value));
 		}) : forUntil(to, from, step, cb);
-	}, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode);
+	}, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
 }
-function forBranches(by, iterate, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
+function forBranches(by, iterate, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
 	if (by) {
 		const run = iterate;
 		const seenKeys = /* @__PURE__ */ new Set();
@@ -2151,22 +2367,24 @@ function forBranches(by, iterate, scopeId, accessor, serializeBranch, serializeM
 			else render();
 		});
 	}
-	if (serializeBranch === 0) {
+	if (branchGuard === 0) {
 		iterate(0);
-		writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, "");
+		writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, "");
 		return;
 	}
 	const { state } = $chunk.boundary;
-	const resumeKeys = serializeMarker !== 0;
-	const resumeMarker = resumeKeys && (!parentEndTag || serializeStateful !== 0);
+	const resumeKeys = markerGuard !== 0;
+	const resumeMarker = resumesMarker(markerGuard, branchExprGuard, parentEndTag);
 	let flushBranchIds = "";
 	let loopScopes;
 	iterate((itemKey, sameAsIndex, render) => {
 		const branchId = _peek_scope_id();
-		if (resumeMarker) if (singleNode) flushBranchIds = " " + branchId + flushBranchIds;
-		else {
-			$chunk.writeHTML(state.mark("[", flushBranchIds));
-			flushBranchIds = branchId + "";
+		if (resumeMarker) {
+			if (singleNode) flushBranchIds = " " + branchId + flushBranchIds;
+			else {
+				$chunk.writeHTML(state.mark("[", flushBranchIds));
+				flushBranchIds = branchId + "";
+			}
 		}
 		withBranchId(branchId, () => {
 			render();
@@ -2175,11 +2393,11 @@ function forBranches(by, iterate, scopeId, accessor, serializeBranch, serializeM
 		});
 	});
 	if (loopScopes) writeScope(scopeId, { [BranchScopes + accessor]: loopScopes });
-	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
+	writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
 }
-function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-	const resumeBranch = serializeBranch !== 0;
-	const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
+function _if(cb, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
+	const resumeBranch = branchGuard !== 0;
+	const resumeMarker = resumesMarker(markerGuard, branchExprGuard, parentEndTag);
 	const branchId = _peek_scope_id();
 	const chunk = $chunk;
 	const beforeBranch = resumeMarker && resumeBranch && !singleNode ? deferBranchStart(chunk) : void 0;
@@ -2190,7 +2408,7 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
 		[ConditionalRenderer + accessor]: branchIndex || void 0,
 		[BranchScopes + accessor]: resumeMarker ? void 0 : writeScope(branchId, {})
 	});
-	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, shouldWriteBranch ? " " + branchId : "");
+	writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, shouldWriteBranch ? " " + branchId : "");
 }
 function deferBranchStart(chunk) {
 	const beforeBranch = chunk.html;
@@ -2200,13 +2418,16 @@ function deferBranchStart(chunk) {
 function applyBranchStart(chunk, beforeBranch, rendered) {
 	chunk.html = beforeBranch + (rendered ? chunk.boundary.state.mark("[", "") : "") + chunk.html;
 }
-function writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, branchIds) {
+function resumesMarker(markerGuard, branchExprGuard, parentEndTag) {
+	return markerGuard !== 0 && (!parentEndTag || branchExprGuard !== 0);
+}
+function writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, branchIds) {
 	const endTag = parentEndTag || "";
-	if (serializeMarker !== 0) if (!parentEndTag || serializeStateful !== 0) {
+	if (resumesMarker(markerGuard, branchExprGuard, parentEndTag)) {
 		const { state } = $chunk.boundary;
 		const mark = singleNode ? state.mark(parentEndTag ? "}" : "|", scopeId + " " + accessor + (branchIds || "")) : state.mark(parentEndTag ? ")" : "]", scopeId + " " + accessor + (branchIds || ""));
 		$chunk.writeHTML(mark + endTag);
-	} else $chunk.writeHTML(endTag + _el_resume(scopeId, accessor));
+	} else if (markerGuard !== 0) $chunk.writeHTML(endTag + _el_resume(scopeId, accessor));
 	else $chunk.writeHTML(endTag);
 }
 let writeScope = (scopeId, partialScope) => {
@@ -2215,7 +2436,7 @@ let writeScope = (scopeId, partialScope) => {
 	const scope = scopeWithId(state, scopeId);
 	const pending = target.writeScopes[scopeId];
 	state.needsMainRuntime = true;
-	countResumeWrite($chunk.boundary);
+	countResumeWrite($chunk);
 	Object.assign(scope, partialScope);
 	if (pending && pending !== partialScope) Object.assign(pending, partialScope);
 	else target.writeScopes[scopeId] = partialScope;
@@ -2239,11 +2460,11 @@ function scopeWithId(state, scopeId) {
 	if (!scope) scopes.set(scopeId, scope = { [K_SCOPE_ID]: scopeId });
 	return scope;
 }
-function _subscribe(subscribers, scope, resumeId, serializeMarker) {
+function _subscribe(subscribers, scope, resumeId, markerGuard) {
 	if (subscribers) {
 		const { serializer } = $chunk.boundary.state;
 		if (!$chunk.serializeState.readyId && !serializer.written(subscribers)) subscribers.add(scope);
-		else if (resumeId) _script(scope[K_SCOPE_ID], resumeId, serializeMarker);
+		else if (resumeId) _script(scope[K_SCOPE_ID], resumeId, markerGuard);
 		else serializer.writeCall(scope, subscribers, "add", $chunk.serializeState);
 	}
 	return scope;
@@ -2252,19 +2473,19 @@ const CLIENT_ALL = 715827883;
 function maskGroup(mask, group) {
 	return mask === 715827883 ? 1 : typeof mask === "number" ? group < 15 ? mask >>> 1 + 2 * group & 3 : 0 : mask[group] ?? 0;
 }
-function _set_serialize_reason(reason) {
-	$chunk.boundary.state.serializeReason = reason;
+function _set_scope_reason(reason) {
+	$chunk.boundary.state.scopeReason = reason;
 }
 function _scope_reason() {
-	const reason = $chunk.boundary.state.serializeReason;
-	$chunk.boundary.state.serializeReason = void 0;
+	const reason = $chunk.boundary.state.scopeReason;
+	$chunk.boundary.state.scopeReason = void 0;
 	return reason;
 }
-function _serialize_if(condition, key) {
+function _write_if(condition, key) {
 	return condition && maskGroup(condition, key) ? 1 : void 0;
 }
-function _serialize_guard(condition, key) {
-	return _serialize_if(condition, key) || 0;
+function _write_guard(condition, key) {
+	return _write_if(condition, key) || 0;
 }
 function writeWaitReady(readyId, renderer, input) {
 	const chunk = $chunk;
@@ -2277,6 +2498,7 @@ function writeWaitReady(readyId, renderer, input) {
 		flushScopes: false
 	});
 	const bodyEnd = body.render(renderer, input);
+	if (boundary.aborted) throw boundary.reason;
 	if (body === bodyEnd) {
 		chunk.writeHTML(body.html);
 		body.deferOwnReady();
@@ -2286,8 +2508,8 @@ function writeWaitReady(readyId, renderer, input) {
 		chunk.next = body;
 	}
 }
-function _await(scopeId, accessor, promise, content, serializeMarker) {
-	const resumeMarker = serializeMarker !== 0;
+function _await(scopeId, accessor, promise, content, markerGuard) {
+	const resumeMarker = markerGuard !== 0;
 	if (!isPromise(promise)) {
 		if (resumeMarker) {
 			const branchId = _peek_scope_id();
@@ -2299,25 +2521,32 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 	}
 	const chunk = $chunk;
 	const { boundary } = chunk;
-	chunk.next = $chunk = chunk.fork(boundary, chunk.next);
+	const startId = _peek_scope_id();
+	const after = chunk.next = $chunk = chunk.fork(boundary, chunk.next);
 	chunk.async = true;
-	if (chunk.context?.[kPendingContexts]) chunk.context = {
-		...chunk.context,
-		[kPendingContexts]: 0
-	};
+	captureContext(chunk);
 	boundary.startAsync();
 	promise.then((value) => {
 		if (chunk.async) {
 			chunk.async = false;
-			if (!boundary.signal.aborted) {
+			if (!boundary.aborted) {
+				const { state } = boundary;
 				chunk.render(() => {
 					if (resumeMarker) {
 						const branchId = _peek_scope_id();
 						$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-						withBranchId(branchId, () => withIsAsync(content, value));
+						withBranchId(branchId, () => withIsAsync({ parent: getAsyncContent(chunk) }, content, value));
 						$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
-					} else withIsAsync(content, value);
+					} else {
+						const renderedSince = _peek_scope_id() !== startId;
+						const async = { parent: getAsyncContent(chunk) };
+						withIsAsync(async, content, value);
+						async.visit = renderedSince && (after.html || after.next) ? $chunk.boundary.state.mark("]", scopeId + " " + accessor) : "";
+						if (async.resumed) $chunk.writeHTML(async.visit);
+						async.end = $chunk;
+					}
 				});
+				if (!chunk.async && boundary.pendingReorders?.delete(chunk)) state.reorder(chunk);
 				boundary.endAsync();
 			}
 		}
@@ -2326,9 +2555,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 		boundary.abort(err);
 	});
 }
-function _try(scopeId, accessor, content, input) {
-	const catchContent = input.catch ? normalizeDynamicRenderer(input.catch) || 0 : void 0;
-	const placeholderContent = normalizeDynamicRenderer(input.placeholder);
+function _try(scopeId, accessor, content, placeholderContent, catchContent, placeholderId, catchId) {
 	const placeholderBranchId = placeholderContent ? _scope_id() : 0;
 	const branchId = _peek_scope_id();
 	const chunk = $chunk;
@@ -2336,13 +2563,12 @@ function _try(scopeId, accessor, content, input) {
 	const { state } = boundary;
 	const { resumeWrites } = boundary;
 	const beforeBranch = deferBranchStart(chunk);
-	let renderersAtSettle = false;
-	if (catchContent !== void 0 || placeholderContent) renderersAtSettle = tryBoundary(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent, placeholderContent, branchId);
-	else withBranchId(branchId, content);
+	const renderers = () => writeTryRenderers(branchId, catchContent && _resume(catchContent, catchId), placeholderContent && _resume(placeholderContent, placeholderId));
+	const renderersWritten = tryBoundary(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent, branchId, renderers);
 	const rendered = chunk !== $chunk || boundary.resumeWrites !== resumeWrites;
 	applyBranchStart(chunk, beforeBranch, rendered);
 	if (!rendered) return;
-	if (!renderersAtSettle) writeTryRenderers(branchId, catchContent, placeholderContent);
+	if (!renderersWritten) renderers();
 	$chunk.writeHTML(state.mark("]", scopeId + " " + accessor + " " + branchId));
 }
 function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBranchId) {
@@ -2354,6 +2580,7 @@ function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBran
 		return;
 	}
 	chunk.next = $chunk = chunk.fork(boundary, chunk.next);
+	captureContext(chunk);
 	chunk.placeholder = {
 		body,
 		render: placeholder,
@@ -2362,17 +2589,17 @@ function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBran
 		placeholderBranchId
 	};
 }
-function tryBoundary(content, catchContent, placeholderContent, branchId) {
+function tryBoundary(content, catchContent, branchId, renderers) {
 	const chunk = $chunk;
 	const { boundary } = chunk;
 	const { state } = boundary;
-	const catchBoundary = new Boundary(state, boundary.signal, boundary);
+	const catchBoundary = new Boundary(state, void 0, boundary);
 	const body = chunk.fork(catchBoundary, null);
-	const bodyEnd = withBranchId(branchId, () => body.render(content));
-	if (catchBoundary.signal.aborted) {
-		if (catchContent === void 0) boundary.abort(catchBoundary.signal.reason);
-		else if (catchContent) catchContent(catchBoundary.signal.reason);
-		return false;
+	const bodyEnd = body.render(() => withBranchId(branchId, content));
+	if (catchBoundary.aborted) {
+		if (!catchContent) throw catchBoundary.reason;
+		catchContent(catchBoundary.reason);
+		return true;
 	}
 	if (body === bodyEnd) {
 		chunk.append(body);
@@ -2382,45 +2609,49 @@ function tryBoundary(content, catchContent, placeholderContent, branchId) {
 	const bodyNext = bodyEnd.next = $chunk = chunk.fork(boundary, chunk.next);
 	chunk.next = body;
 	boundary.startAsync();
-	const reorderId = catchContent === void 0 ? "" : state.nextReorderId();
-	const endMarker = reorderId && state.mark("!", reorderId);
+	const reorderId = catchContent ? state.nextReorderId() : "";
 	if (reorderId) {
-		chunk.writeHTML(state.mark("!^", reorderId));
-		bodyEnd.writeHTML(endMarker);
+		chunk.catchRange = {
+			id: reorderId,
+			end: bodyEnd
+		};
+		captureContext(chunk);
 	}
 	catchBoundary.onNext = () => {
-		if (boundary.signal.aborted) return;
-		if (catchBoundary.signal.aborted) {
+		if (boundary.aborted) return;
+		if (catchBoundary.aborted) {
 			if (!reorderId) {
-				boundary.abort(catchBoundary.signal.reason);
+				boundary.abort(catchBoundary.reason);
 				return;
 			}
-			if (!bodyEnd.consumed) {
-				let cur = body;
-				let writeMarker = true;
-				do {
-					const next = cur.next;
-					if (cur.boundary !== catchBoundary) cur.boundary.abort(catchBoundary.signal.reason);
-					if (writeMarker && !cur.consumed) {
-						writeMarker = false;
-						cur.async = false;
-						cur.next = bodyNext;
-						cur.needsWalk = true;
-						cur.html = endMarker;
-						cur.scripts = cur.effects = cur.lastEffect = "";
-						cur.placeholder = cur.reorderId = cur.deferredReady = null;
-					}
-					cur = next;
-				} while (cur !== bodyNext);
-			}
+			const streamed = !chunk.catchRange;
 			const catchChunk = chunk.fork(boundary, null);
-			const { resumeWrites } = boundary;
-			catchChunk.reorderId = reorderId;
-			if ((catchChunk.render(catchContent || NOOP$2, catchBoundary.signal.reason) !== catchChunk || boundary.resumeWrites !== resumeWrites) && renderersAtSettle) catchChunk.render(() => writeTryRenderers(branchId, catchContent, placeholderContent));
-			state.reorder(catchChunk);
+			chunk.catchRange = null;
+			const inOrder = catchChunk === catchChunk.render(catchContent, catchBoundary.reason);
+			if (boundary.aborted) return;
+			if (bodyEnd.consumed) {
+				catchChunk.reorderId = reorderId;
+				state.reorder(catchChunk);
+			} else {
+				let reorder = null;
+				if (!inOrder) reorder = catchChunk;
+				else if (streamed) reorder = chunk.fork(boundary, null);
+				if (reorder) reorder.reorderId = reorderId;
+				const endMarker = state.mark("!", reorderId);
+				let cut = body;
+				while (cut.consumed) cut = cut.next;
+				cut.async = false;
+				cut.next = inOrder ? catchChunk : bodyNext;
+				cut.html = streamed ? endMarker : inOrder ? "" : state.mark("!^", reorderId) + endMarker;
+				cut.scripts = cut.effects = cut.lastEffect = "";
+				cut.placeholder = cut.reorderId = cut.catchRange = null;
+				cut.deferredReorder = reorder;
+				if (inOrder) catchChunk.next = bodyNext;
+			}
 			boundary.endAsync();
 		} else if (!catchBoundary.count) {
-			if (renderersAtSettle && catchBoundary.resumeWrites) bodyEnd.render(() => writeTryRenderers(branchId, catchContent, placeholderContent));
+			if (renderersAtSettle && catchBoundary.resumeWrites) bodyEnd.render(renderers);
+			chunk.catchRange = null;
 			boundary.endAsync();
 		} else boundary.onNext();
 	};
@@ -2433,8 +2664,15 @@ function writeTryRenderers(branchId, catchContent, placeholderContent) {
 	});
 }
 const NOOP$2 = () => {};
-function countResumeWrite(boundary) {
-	for (; boundary; boundary = boundary.parent) boundary.resumeWrites++;
+function countResumeWrite(chunk) {
+	for (let boundary = chunk.boundary; boundary; boundary = boundary.parent) boundary.resumeWrites++;
+	for (let async = getAsyncContent(chunk); async && !async.resumed; async = async.parent) {
+		async.resumed = true;
+		async.end?.writeHTML(async.visit);
+	}
+}
+function getAsyncContent(chunk) {
+	return chunk.context?.[kIsAsync];
 }
 var State = class {
 	tagId = 1;
@@ -2458,7 +2696,7 @@ var State = class {
 	flushScopes = false;
 	writeScopes = {};
 	readyIds = null;
-	serializeReason;
+	scopeReason;
 	$global;
 	constructor($global) {
 		this.$global = $global;
@@ -2519,35 +2757,54 @@ var State = class {
 		return "<!--" + this.commentPrefix + code + str + "-->";
 	}
 };
-var Boundary = class extends AbortController {
+var Boundary = class {
 	onNext = NOOP$2;
 	count = 0;
 	resumeWrites = 0;
 	state;
 	parent;
+	aborted = false;
+	reason;
+	pendingReorders;
+	children;
 	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 (signal) if (signal.aborted) this.abort(signal.reason);
-		else signal.addEventListener("abort", () => {
-			this.abort(signal.reason);
-		});
+		if (parent) {
+			if (parent.aborted) this.abort(parent.reason);
+			else (parent.children ||= []).push(this);
+		} else if (signal) {
+			if (signal.aborted) this.abort(signal.reason);
+			else signal.addEventListener("abort", this);
+		}
+	}
+	abort(reason) {
+		if (this.aborted) return;
+		const { state } = this;
+		this.aborted = true;
+		this.reason = reason;
+		if (this.pendingReorders) {
+			for (const reorder of this.pendingReorders) state.reorder(reorder);
+			this.pendingReorders = void 0;
+		}
+		this.count = 0;
+		this.state = new State(state.$global);
+		if (this.children) for (const child of this.children) child.abort(reason);
+		this.onNext();
+	}
+	handleEvent(event) {
+		this.abort(event.target.reason);
 	}
 	flush() {
-		if (!this.signal.aborted) flushSerializer(this, this.state);
-		return this.count ? 1 : this.signal.aborted ? 2 : 0;
+		if (!this.aborted) flushSerializer(this, this.state);
+		return this.count ? 1 : this.aborted ? 2 : 0;
 	}
 	startAsync() {
-		if (!this.signal.aborted) this.count++;
+		if (!this.aborted) this.count++;
 	}
 	endAsync() {
-		if (!this.signal.aborted && this.count) {
+		if (!this.aborted) {
+			if (!this.count) throw new Error("A boundary ended more async work than it started.");
 			this.count--;
 			this.onNext();
 		}
@@ -2560,9 +2817,10 @@ var Chunk = class Chunk {
 	lastEffect = "";
 	async = false;
 	consumed = false;
-	needsWalk = false;
 	reorderId = null;
 	deferredReady = null;
+	deferredReorder = null;
+	catchRange = null;
 	placeholder = null;
 	boundary;
 	next;
@@ -2581,7 +2839,7 @@ var Chunk = class Chunk {
 		this.html += html;
 	}
 	writeEffect(scopeId, registryId) {
-		countResumeWrite(this.boundary);
+		countResumeWrite(this);
 		if (this.lastEffect === registryId) this.effects += " " + scopeId;
 		else {
 			this.lastEffect = registryId;
@@ -2593,7 +2851,6 @@ var Chunk = class Chunk {
 	}
 	append(chunk) {
 		this.html += chunk.html;
-		this.needsWalk ||= chunk.needsWalk;
 		this.effects = concatEffects(this.effects, chunk.effects);
 		this.scripts = concatScripts(this.scripts, chunk.scripts);
 		this.lastEffect = chunk.lastEffect || this.lastEffect;
@@ -2613,46 +2870,88 @@ var Chunk = class Chunk {
 			this.deferredReady = concat(deferred, this.deferredReady);
 		}
 	}
-	flushPlaceholder() {
-		const { placeholder } = this;
-		if (placeholder) {
-			const body = placeholder.body.consume();
-			if (body.async) {
-				const { state } = this.boundary;
-				const { branchId, scopeId, placeholderBranchId } = placeholder;
-				const reorderId = body.reorderId = branchId ? branchId + "" : state.nextReorderId();
-				this.writeHTML(state.mark("!^", reorderId));
-				const { effects } = this;
-				const beforeBranch = deferBranchStart(this);
-				const after = this.render(() => withBranchId(placeholderBranchId, placeholder.render));
-				const stateful = after === this && this.effects !== effects;
-				applyBranchStart(this, beforeBranch, stateful);
-				if (after !== this) this.boundary.abort(/* @__PURE__ */ new Error("An @placeholder cannot contain async content."));
-				else if (stateful) {
-					this.render(() => writeScope(branchId, { [PlaceholderBranch]: scopeWithId(state, placeholderBranchId) }));
-					this.writeHTML(state.mark("]", scopeId + " " + (PlaceholderBranch + branchId) + " " + placeholderBranchId));
-					body.writeEffect(branchId, PLACEHOLDER_DISMISS_REGISTER_ID);
+	renderPlaceholders(boundary) {
+		const { state } = boundary;
+		restart: for (;;) {
+			let reorders = null;
+			for (let cur = this; cur.next && !cur.async; cur = cur.next) {
+				if (cur.renderPlaceholder(state)) {
+					if (boundary.aborted) return;
+					continue restart;
 				}
-				this.writeHTML(state.mark("!", reorderId));
-				state.reorder(body);
-			} else {
-				body.next = this.next;
-				this.next = body;
+				if (cur.deferredReorder) (reorders ||= []).push(cur.deferredReorder);
 			}
-			this.placeholder = null;
+			if (state.writeReorders) {
+				for (const reorder of state.writeReorders) if ((reorders = renderReorderPlaceholders(reorder, reorders)) === false) {
+					if (boundary.aborted) return;
+					continue restart;
+				}
+			}
+			for (let i = 0; reorders && i < reorders.length; i++) if ((reorders = renderReorderPlaceholders(reorders[i], reorders)) === false) {
+				if (boundary.aborted) return;
+				continue restart;
+			}
+			return;
 		}
 	}
-	consume() {
+	renderPlaceholder(state) {
+		const { placeholder } = this;
+		if (!placeholder) return false;
+		this.placeholder = null;
+		if (this.boundary.aborted) return false;
+		const { body } = placeholder;
+		let end = body;
+		while (end.next && !end.async) end = end.next;
+		if (!end.async) {
+			end.next = this.next;
+			this.next = body;
+			return false;
+		}
+		const { branchId, scopeId, placeholderBranchId } = placeholder;
+		const reorderId = body.reorderId = branchId ? branchId + "" : state.nextReorderId();
+		this.writeHTML(state.mark("!^", reorderId));
+		const { effects } = this;
+		const beforeBranch = deferBranchStart(this);
+		if (this.render(() => withBranchId(placeholderBranchId, placeholder.render)) !== this) this.boundary.abort(/* @__PURE__ */ new Error("An @placeholder cannot contain async content."));
+		if (this.boundary.aborted) return true;
+		const stateful = this.effects !== effects;
+		applyBranchStart(this, beforeBranch, stateful);
+		if (stateful) {
+			this.render(() => writeScope(branchId, { [PlaceholderBranch]: scopeWithId(state, placeholderBranchId) }));
+			this.writeHTML(state.mark("]", scopeId + " " + (PlaceholderBranch + branchId) + " " + placeholderBranchId));
+			end.writeEffect(branchId, PLACEHOLDER_DISMISS_REGISTER_ID);
+		}
+		this.writeHTML(state.mark("!", reorderId));
+		this.deferredReorder = body;
+		return false;
+	}
+	markCatchRange() {
+		const { catchRange } = this;
+		if (catchRange) {
+			const { state } = this.boundary;
+			this.catchRange = null;
+			this.writeHTML(state.mark("!^", catchRange.id));
+			catchRange.end.writeHTML(state.mark("!", catchRange.id));
+		}
+	}
+	queueDeferredReorder() {
+		const { deferredReorder } = this;
+		if (deferredReorder) {
+			this.deferredReorder = null;
+			deferredReorder.boundary.state.reorder(deferredReorder);
+		}
+	}
+	consume(boundary) {
+		this.renderPlaceholders(boundary);
 		let cur = this;
 		let html = "";
 		let effects = "";
 		let scripts = "";
 		let lastEffect = "";
-		let needsWalk = false;
 		let deferredReady;
 		while (cur.next && !cur.async) {
-			cur.flushPlaceholder();
-			needsWalk ||= cur.needsWalk;
+			cur.markCatchRange();
+			cur.queueDeferredReorder();
 			html += cur.html;
 			if (cur.serializeState.readyId) deferredReady = push(deferredReady, cur);
 			else {
@@ -2666,7 +2965,6 @@ var Chunk = class Chunk {
 		}
 		cur.deferOwnReady();
 		cur.deferredReady = concat(deferredReady, cur.deferredReady);
-		cur.needsWalk ||= needsWalk;
 		cur.html = html + cur.html;
 		cur.effects = concatEffects(effects, cur.effects);
 		cur.scripts = concatScripts(scripts, cur.scripts);
@@ -2686,14 +2984,16 @@ var Chunk = class Chunk {
 			$chunk = prev;
 		}
 	}
-	flushReadyScripts(reservations, holdEffects) {
-		const { boundary, serializeState } = this;
+	flushReadyScripts(boundary, reservations, holdEffects) {
+		const { serializeState } = this;
 		const { readyId } = serializeState;
 		let scripts = "";
-		forEach(this.takeDeferredReady(), (chunk) => {
-			scripts = concatScripts(scripts, chunk.flushReadyScripts(reservations, holdEffects));
+		const held = this.takeDeferredReady();
+		if (held) for (const chunk of Array.isArray(held) ? held : [held]) {
+			if (chunk.boundary.aborted) continue;
+			scripts = concatScripts(scripts, chunk.flushReadyScripts(boundary, reservations, holdEffects));
 			if (chunk.effects || chunk.deferredReady) this.deferredReady = push(this.deferredReady, chunk);
-		});
+		}
 		if (readyId && !this.async) {
 			const { state } = boundary;
 			flushSerializer(boundary, serializeState);
@@ -2716,14 +3016,13 @@ var Chunk = class Chunk {
 		}
 		return scripts;
 	}
-	flushScript() {
-		const { boundary } = this;
+	flushScript(boundary) {
 		const { state } = boundary;
 		const { $global, runtimePrefix } = state;
 		let needsWalk = state.walkOnNextFlush;
 		if (needsWalk) state.walkOnNextFlush = false;
-		let readyResumeScripts = this.flushReadyScripts(void 0, this.async);
-		for (let channel; channel = state.serializer.pendingReadyChannel();) {
+		let readyResumeScripts = this.flushReadyScripts(boundary, void 0, this.async);
+		for (let channel; !boundary.aborted && (channel = state.serializer.pendingReadyChannel());) {
 			const resumes = state.serializer.stringifyScopes([], boundary, channel);
 			const deps = state.serializer.takeChannelDeps();
 			state.needsMainRuntime = true;
@@ -2744,17 +3043,7 @@ var Chunk = class Chunk {
 		let reordered = "";
 		let needsResumeArray = false;
 		if (state.writeReorders) {
-			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;
@@ -2765,13 +3054,14 @@ var Chunk = class Chunk {
 				let reorderHTML = "";
 				let reorderEffects = "";
 				let reorderScripts = "";
-				let cur = reorderedChunk;
+				let cur = reorderedChunk.boundary.aborted ? null : reorderedChunk;
 				reorderedChunk.reorderId = null;
-				for (;;) {
-					cur.flushPlaceholder();
+				while (cur) {
+					cur.markCatchRange();
+					cur.queueDeferredReorder();
 					cur.deferOwnReady();
 					const { next } = cur;
-					const readyResumeScripts = cur.flushReadyScripts(readyReservations, this.async);
+					const readyResumeScripts = cur.flushReadyScripts(boundary, readyReservations, this.async);
 					this.deferredReady = concat(this.deferredReady, cur.takeDeferredReady());
 					cur.consumed = true;
 					reorderHTML += cur.html;
@@ -2779,25 +3069,26 @@ 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.boundary.pendingReorders ||= /* @__PURE__ */ new Set()).add(cur);
 						cur.html = cur.effects = cur.scripts = cur.lastEffect = "";
 						cur.next = null;
 					}
-					if (next) cur = next;
-					else break;
+					cur = next;
 				}
-				if (reorderEffects) if (this.async) {
-					this.effects = concatEffects(this.effects, reorderEffects);
-					this.lastEffect = "";
-				} else {
-					needsResumeArray = true;
-					reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")");
+				if (reorderEffects) {
+					if (this.async) {
+						this.effects = concatEffects(this.effects, reorderEffects);
+						this.lastEffect = "";
+					} else {
+						needsResumeArray = true;
+						reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")");
+					}
 				}
 				for (const reservation of readyReservations) reordered = concatScripts(reordered, reservation);
 				reordered = concatScripts(reordered, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
 				html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
-			state.writeReorders = carried;
+			state.writeReorders = null;
 		}
 		flushSerializer(boundary, state);
 		if (state.resumes || needsResumeArray && !state.hasWrittenResume) scripts = concatScripts(scripts, state.resumeScript(state.resumes));
@@ -2809,19 +3100,21 @@ var Chunk = class Chunk {
 		state.resumes = "";
 		return this;
 	}
-	flushHTML() {
-		const { boundary } = this;
+	flushHTML(boundary) {
 		const { state } = boundary;
-		if (this.needsWalk) {
-			this.needsWalk = false;
-			state.walkOnNextFlush = true;
-		}
-		this.flushScript();
+		this.flushScript(boundary);
 		const { html, scripts } = this;
 		this.html = this.scripts = "";
 		return state.flushChunk(html, scripts, boundary.count);
 	}
 };
+function renderReorderPlaceholders(reorder, reorders) {
+	if (!reorder.boundary.aborted) for (let cur = reorder; cur; cur = cur.next) {
+		if (cur.renderPlaceholder(reorder.boundary.state)) return false;
+		if (cur.deferredReorder) (reorders ||= []).push(cur.deferredReorder);
+	}
+	return reorders;
+}
 function flushSerializer(boundary, serializeState) {
 	const { state } = boundary;
 	const { serializer } = state;
@@ -2892,13 +3185,17 @@ function getFilteredGlobals($global) {
 	let filtered = 0;
 	if (Array.isArray(serializedGlobals)) for (const key of serializedGlobals) {
 		const value = $global[key];
-		if (value !== void 0) if (filtered) filtered[key] = value;
-		else filtered = { [key]: value };
+		if (value !== void 0) {
+			if (filtered) filtered[key] = value;
+			else filtered = { [key]: value };
+		}
 	}
 	else for (const key in serializedGlobals) if (serializedGlobals[key]) {
 		const value = $global[key];
-		if (value !== void 0) if (filtered) filtered[key] = value;
-		else filtered = { [key]: value };
+		if (value !== void 0) {
+			if (filtered) filtered[key] = value;
+			else filtered = { [key]: value };
+		}
 	}
 	return filtered;
 }
@@ -2935,237 +3232,52 @@ function flushTickQueue() {
 	}
 }
 //#endregion
-//#region src/html/attrs.ts
-function _attr_class(value) {
-	return stringAttr("class", toDelimitedString(value, " ", stringifyClassObject));
-}
-function _attr_style(value) {
-	return stringAttr("style", toDelimitedString(value, ";", stringifyStyleObject));
-}
-function _attr_option_value(value) {
-	const valueAttr = _attr("value", value);
-	const selectedValue = getContext(kSelectedValue);
-	if (selectedValue !== void 0 && normalizedValueMatches(selectedValue, value)) {
-		{
-			const matched = getContext(kSelectedValueMatched);
-			if (matched) matched.value = true;
-		}
-		return valueAttr + " selected";
-	}
-	return valueAttr;
-}
-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) {
-		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 _textarea_value(value);
-}
-function _textarea_value(value) {
-	const escaped = _escape(normalizeStrAttrValue(value));
-	return escaped[0] === "\n" ? "\n" + escaped : escaped;
-}
-function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
-	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	return _attr("value", value);
-}
-function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange, serializeType) {
-	if (checkedChange) writeControlledScope(0, scopeId, nodeAccessor, void 0, checkedChange, serializeType);
-	return isNotVoid(checked) ? " checked" : "";
-}
-function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value, serializeType) {
-	const valueAttr = _attr("value", value);
-	if (checkedValueChange) writeControlledScope(1, scopeId, nodeAccessor, getCheckedValueRef(checkedValue), checkedValueChange, serializeType);
-	return normalizedValueMatches(checkedValue, value) ? valueAttr + " checked" : valueAttr;
-}
-const checkedValuesRefs = /* @__PURE__ */ new WeakMap();
-function getCheckedValueRef(checkedValue) {
-	if (Array.isArray(checkedValue)) {
-		let ref = checkedValuesRefs.get(checkedValue);
-		if (!ref) {
-			ref = [];
-			checkedValuesRefs.set(checkedValue, ref);
-		}
-		return ref;
-	}
-}
-function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange, serializeType) {
-	const normalizedOpen = isNotVoid(open);
-	if (openChange) writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen || void 0, openChange, serializeType);
-	return normalizedOpen ? " open" : "";
-}
-function _attr_nonce() {
-	return getChunk().boundary.state.nonceAttr;
-}
-function _style_html(decls) {
-	const id = _id();
-	return `<style${_attr_nonce()} class=${id}>.${id}~*{${decls}}</style>`;
-}
-function _attr(name, value) {
-	return isVoid(value) ? "" : nonVoidAttr(name, value);
-}
-function _attr_and(name, value, attr) {
-	return value ? attr : _attr(name, value);
-}
-function _attr_or(name, value, attr) {
-	return value ? _attr(name, value) : attr;
-}
-function _attr_nullish(name, value, attr) {
-	return value == null ? attr : _attr(name, value);
-}
-function _attrs(data, nodeAccessor, scopeId, tagName) {
-	let result = "";
-	let skip = /[\s/>"'=]/;
-	let events;
-	switch (data && tagName) {
-		case "input":
-			assertExclusiveAttrs(data);
-			if (data.checkedChange) {
-				result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange, 1);
-				skip = /^checked(?:Value)?(?:Change)?$|[\s/>"'=]/;
-			} else if ("checkedValue" in data || data.checkedValueChange) {
-				result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value, 1);
-				skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/;
-			} else if (data.valueChange) {
-				assertNoValueBindingOnCheckable(data.type, data.valueChange);
-				result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange, 1);
-				skip = /^value(?:Change)?$|[\s/>"'=]/;
-			}
-			break;
-		case "select":
-		case "textarea":
-			if ("value" in data || data.valueChange) skip = /^value(?:Change)?$|[\s/>"'=]/;
-			break;
-		case "option":
-			if ("value" in data) {
-				result += _attr_option_value(data.value);
-				skip = /^value$|[\s/>"'=]/;
-			}
-			break;
-		case "details":
-		case "dialog":
-			if (data.openChange) {
-				result += _attr_details_or_dialog_open(scopeId, nodeAccessor, data.open, data.openChange, 1);
-				skip = /^open(?:Change)?$|[\s/>"'=]/;
-			}
-			break;
-	}
-	for (const name in data) {
-		const value = data[name];
-		switch (name) {
-			case "class":
-				result += _attr_class(value);
-				break;
-			case "style":
-				result += _attr_style(value);
-				break;
-			default:
-				if (name) assertValidAttrName(name);
-				if (name && !(isVoid(value) || skip.test(name) || name === "content" && tagName !== "meta")) if (isEventHandler(name)) {
-					if (!events) {
-						events = {};
-						writeScope(scopeId, { [EventAttributes + nodeAccessor]: events });
-					}
-					events[getEventHandlerName(name)] = value;
-				} else result += nonVoidAttr(name, value);
-				break;
-		}
-	}
-	return result;
-}
-function _attrs_content(data, nodeAccessor, scopeId, tagName, serializeReason) {
-	_html(`${_attrs(data, nodeAccessor, scopeId, tagName)}>`);
-	_attr_content(nodeAccessor, scopeId, data?.content, serializeReason);
-}
-function _attrs_partial(data, skip, nodeAccessor, scopeId, tagName) {
-	const partial = {};
-	for (const name in data) {
-		const key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
-		if (!skip[key]) partial[key] = data[name];
-	}
-	assertExclusiveAttrs({
-		...data,
-		...skip
-	});
-	return _attrs(partial, nodeAccessor, scopeId, tagName);
-}
-function _attrs_partial_content(data, skip, nodeAccessor, scopeId, tagName, serializeReason) {
-	_html(`${_attrs_partial(data, skip, nodeAccessor, scopeId, tagName)}>`);
-	_attr_content(nodeAccessor, scopeId, data?.content, serializeReason);
-}
-function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange, serializeType) {
-	var handlerName = [
-		"checkedChange",
-		"checkedValueChange",
-		"valueChange",
-		"valueChange",
-		"openChange"
-	][type];
-	assertHandlerIsFunction(handlerName, valueChange);
-	setDebugSlotName(writeScope(scopeId, serializeType ? {
-		[ControlledType + nodeAccessor]: type,
-		[ControlledValue + nodeAccessor]: value,
-		[ControlledHandler + nodeAccessor]: valueChange
-	} : {
-		[ControlledValue + nodeAccessor]: value,
-		[ControlledHandler + nodeAccessor]: valueChange
-	}), ControlledHandler + nodeAccessor, handlerName);
-}
-function stringAttr(name, value) {
-	return value && " " + name + attrAssignment(value);
-}
-function nonVoidAttr(name, value) {
-	assertValidAttrValue(name, value);
-	switch (typeof value) {
-		case "string": return " " + name + attrAssignment(value);
-		case "boolean": return " " + name;
-		case "number": return " " + name + "=" + value;
-	}
-	return " " + name + attrAssignment(value + "");
+//#region src/html/content.ts
+function _to_text(val) {
+	assertValidTextValue(val);
+	return val || val === 0 ? val + "" : "";
 }
-const singleQuoteAttrReplacements = /['\r]|&(?=[#a-zA-Z])/g;
-const doubleQuoteAttrReplacements = /["\r]|&(?=[#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 : "";
+function _unescaped(val) {
+	assertValidTextValue(val);
+	return val ? val + "" : val === 0 ? "0" : "";
 }
-function escapeSingleQuotedAttrValue(value) {
-	return singleQuoteAttrReplacements.test(value) ? value.replace(singleQuoteAttrReplacements, replaceUnsafeSingleQuoteAttrChar) : value;
+const unsafeXMLReg = /[<&\r]/g;
+const replaceUnsafeXML = (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&#13;";
+const escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str;
+function _escape(val) {
+	assertValidTextValue(val);
+	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-function replaceUnsafeSingleQuoteAttrChar(match) {
-	return match === "'" ? "&#39;" : match === "\r" ? "&#13;" : "&amp;";
+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" : "";
 }
-function escapeDoubleQuotedAttrValue(value) {
-	return doubleQuoteAttrReplacements.test(value) ? value.replace(doubleQuoteAttrReplacements, replaceUnsafeDoubleQuoteAttrChar) : value;
+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" : "";
 }
-function replaceUnsafeDoubleQuoteAttrChar(match) {
-	return match === "\"" ? "&#34;" : match === "\r" ? "&#13;" : "&amp;";
+function _escape_style_value(val) {
+	assertValidTextValue(val);
+	return val || val === 0 ? escapeStyleValue(val + "") : "";
 }
-function normalizedValueMatches(a, b) {
-	const value = normalizeStrAttrValue(b);
-	if (Array.isArray(a)) {
-		for (const item of a) if (normalizeStrAttrValue(item) === value) return true;
-	} else if (normalizeStrAttrValue(a) === value) return true;
-	return false;
+const unsafeCommentReg = />/g;
+function escapeCommentStr(str) {
+	if (unsafeCommentReg.test(str)) str = str.replace(unsafeCommentReg, "&gt;");
+	return str.startsWith(getState().commentPrefix) ? "&#" + str.charCodeAt(0) + ";" + str.slice(1) : str;
 }
-function normalizeStrAttrValue(value) {
-	return isNotVoid(value) && value !== true ? value + "" : "";
+function _escape_comment(val) {
+	assertValidTextValue(val);
+	return val ? escapeCommentStr(val + "") : val === 0 ? "0" : "";
 }
 //#endregion
 //#region src/html/dynamic-tag.ts
 const voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
-	const shouldResume = serializeReason !== 0;
+let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, markerGuard) => {
+	const shouldResume = markerGuard !== 0;
 	const renderer = normalizeDynamicRenderer(tag);
 	const state = getState();
 	const branchId = _peek_scope_id();
@@ -3182,11 +3294,11 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 				const renderContent = content || normalizeDynamicRenderer(input.content);
 				if (renderer === "textarea") {
 					if (renderContent) throw new Error("A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead.");
-					_html(_attr_textarea_value(branchId, `#${renderer.toLowerCase()}/0`, input.value, input.valueChange, 1));
+					_html(_attrs_textarea_value(branchId, `#${renderer.toLowerCase()}/0`, input));
 				} else {
 					if (renderContent && typeof renderContent !== "function") throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
-					if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, `#${renderer.toLowerCase()}/0`, input.value, input.valueChange, renderContent ? () => _dynamic_tag(branchId, `#${renderer.toLowerCase()}/0`, renderContent, void 0, 0, void 0, serializeReason) : void 0, 1);
-					else if (renderContent) _dynamic_tag(branchId, `#${renderer.toLowerCase()}/0`, renderContent, void 0, 0, void 0, serializeReason);
+					if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, `#${renderer.toLowerCase()}/0`, input.value, input.valueChange, renderContent ? () => _dynamic_tag(branchId, `#${renderer.toLowerCase()}/0`, renderContent, void 0, 0, void 0, markerGuard) : void 0, 1);
+					else if (renderContent) _dynamic_tag(branchId, `#${renderer.toLowerCase()}/0`, renderContent, void 0, 0, void 0, markerGuard);
 				}
 				_html(`</${renderer}>`);
 			} else if (content) throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
@@ -3205,13 +3317,13 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
 		const render = () => {
 			if (renderer) try {
-				_set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? CLIENT_ALL : 0);
+				_set_scope_reason(shouldResume && inputOrArgs !== void 0 ? CLIENT_ALL : 0);
 				return inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
 					content
 				} : inputOrArgs);
 			} finally {
-				_set_serialize_reason(void 0);
+				_set_scope_reason(void 0);
 			}
 			else if (content) return content();
 		};
@@ -3418,27 +3530,33 @@ var ServerRendered = class {
 	}
 	#promise() {
 		return this.#cachedPromise ||= new Promise((resolve, reject) => {
-			const head = this.#head;
+			let head = this.#head;
 			this.#head = null;
 			if (!head) return reject(/* @__PURE__ */ new Error(CONSUMED_RESULT_MESSAGE));
 			const { boundary } = head;
+			let html = "";
 			(boundary.onNext = () => {
 				switch (!boundary.count && boundary.flush()) {
 					case 2:
-						boundary.onNext = NOOP$1;
-						reject(boundary.signal.reason);
-						break;
-					case 0: {
-						const consumed = head.consume();
-						if (!boundary.signal.aborted) resolve(consumed.flushHTML());
+						settle(boundary);
+						reject(boundary.reason);
 						break;
-					}
+					case 0:
+						head = head.consume(boundary);
+						if (boundary.aborted) break;
+						html += head.flushHTML(boundary);
+						if (!(boundary.count || boundary.aborted)) {
+							settle(boundary);
+							resolve(html);
+						}
 				}
 			})();
 		});
 	}
 	#read(onWrite, onAbort, onClose) {
 		let tick = true;
+		let flushing = false;
+		let again = false;
 		let head = this.#head;
 		this.#head = null;
 		if (!head) {
@@ -3447,24 +3565,39 @@ var ServerRendered = class {
 		}
 		const { boundary } = head;
 		const onNext = boundary.onNext = (write) => {
-			const status = boundary.flush();
-			if (status === 2) {
-				if (!tick) offTick(onNext);
-				boundary.onNext = NOOP$1;
-				onAbort(boundary.signal.reason);
-			} else if (write || status === 0) {
-				head = head.consume();
-				if (boundary.signal.aborted) return;
-				const html = head.flushHTML();
-				if (html) onWrite(html);
-				if (status === 0) {
-					if (!tick) offTick(onNext);
-					onClose();
-				} else tick = true;
-			} else if (tick) {
-				tick = false;
-				queueTick(onNext);
+			if (flushing) {
+				again = true;
+				return;
 			}
+			flushing = true;
+			do {
+				again = false;
+				const status = boundary.flush();
+				if (status === 2) {
+					if (!tick) offTick(onNext);
+					settle(boundary);
+					onAbort(boundary.reason);
+					return;
+				}
+				if (write || status === 0) {
+					head = head.consume(boundary);
+					if (boundary.aborted) continue;
+					const html = head.flushHTML(boundary);
+					if (boundary.aborted) continue;
+					if (html) onWrite(html);
+					if (!boundary.count) {
+						if (!tick) offTick(onNext);
+						settle(boundary);
+						onClose();
+						return;
+					}
+					if (write) tick = true;
+				} else if (tick) {
+					tick = false;
+					queueTick(onNext);
+				}
+			} while (again);
+			flushing = false;
 		};
 		onNext();
 		return boundary;
@@ -3474,13 +3607,17 @@ var ServerRendered = class {
 		this.#head = null;
 		if (!head) throw new Error(CONSUMED_RESULT_MESSAGE);
 		const { boundary } = head;
-		switch (boundary.flush()) {
-			case 2: throw boundary.signal.reason;
-			case 1: throw new Error("Cannot consume asynchronous render with 'toString'");
-		}
-		return head.consume().flushHTML();
+		const html = boundary.flush() === 0 ? head.consume(boundary).flushHTML(boundary) : "";
+		if (boundary.count) boundary.abort(/* @__PURE__ */ new Error("Cannot consume asynchronous render with 'toString'"));
+		settle(boundary);
+		if (boundary.aborted) throw boundary.reason;
+		return html;
 	}
 };
+function settle(boundary) {
+	boundary.onNext = NOOP$1;
+	boundary.state.$global.signal?.removeEventListener("abort", boundary);
+}
 function NOOP$1() {}
 //#endregion
 //#region src/html/assets.ts
@@ -3501,8 +3638,10 @@ function withPageAssets(template, runtime, assetId, runtimeId) {
 	return Object.assign((input) => {
 		const g = $global();
 		if (runtimeId) {
-			if (g.runtimeId !== "M" && g.runtimeId !== runtimeId) throw new Error(`$global.runtimeId ("${g.runtimeId}") conflicts with the runtimeId this entry was compiled with ("${runtimeId}").`);
-			g.runtimeId = runtimeId;
+			if (!g[kAssets]) {
+				if (g.runtimeId !== "M" && g.runtimeId !== runtimeId) throw new Error(`$global.runtimeId ("${g.runtimeId}") conflicts with the runtimeId this entry was compiled with ("${runtimeId}").`);
+				g.runtimeId = runtimeId;
+			} else if (g.runtimeId !== runtimeId) console.error(`A page entry compiled with runtimeId "${runtimeId}" is nested in a render using runtimeId "${g.runtimeId}", so its content cannot resume.`);
 		}
 		addAsset(g, assetId);
 		if (g.__flush__) {
@@ -3610,9 +3749,9 @@ const compat = {
 	},
 	onFlush(fn) {
 		const { flushHTML } = Chunk.prototype;
-		Chunk.prototype.flushHTML = function() {
+		Chunk.prototype.flushHTML = function(boundary) {
 			fn(this);
-			return flushHTML.call(this);
+			return flushHTML.call(this, boundary);
 		};
 	},
 	patchDynamicTag,
@@ -3644,16 +3783,16 @@ const compat = {
 	flushScript($global, chunk) {
 		chunk ||= this.createChunk($global);
 		const { boundary } = chunk;
-		switch (boundary.flush()) {
-			case 2: throw boundary.signal.reason;
-			case 1: throw new Error("Cannot serialize promise across tags/class compat layer.");
-		}
-		return chunk.flushScript().scripts;
+		const scripts = boundary.flush() === 0 ? chunk.flushScript(boundary).scripts : "";
+		if (boundary.aborted) throw boundary.reason;
+		if (boundary.count) throw new Error("Cannot serialize promise across tags/class compat layer.");
+		return scripts;
 	},
 	render(renderer, willRerender, classAPIOut, component, input, completeChunks, registerChildScope) {
 		const state = this.ensureState(classAPIOut.global);
 		const boundary = new Boundary(state);
-		let head = new Chunk(boundary, null, getChunk()?.context ?? null, state);
+		const context = getChunk()?.context ?? null;
+		let head = new Chunk(boundary, new Chunk(boundary, null, context, state), context, state);
 		let normalizedInput = input;
 		if ("renderBody" in input) {
 			normalizedInput = {};
@@ -3674,11 +3813,11 @@ const compat = {
 				writeScope(scopeId, { m5c: component.id });
 				_script(scopeId, SET_SCOPE_REGISTER_ID);
 			}
-			_set_serialize_reason(willRerender ? CLIENT_ALL : 0);
+			_set_scope_reason(willRerender ? CLIENT_ALL : 0);
 			try {
 				renderer(normalizedInput);
 			} finally {
-				_set_serialize_reason(void 0);
+				_set_scope_reason(void 0);
 			}
 			const asyncOut = classAPIOut.beginAsync({
 				last: true,
@@ -3686,12 +3825,12 @@ const compat = {
 			});
 			classAPIOut.onLast((next) => {
 				(boundary.onNext = () => {
-					if (boundary.signal.aborted) {
-						asyncOut.error(boundary.signal.reason);
+					if (boundary.aborted) {
+						asyncOut.error(boundary.reason);
 						boundary.onNext = NOOP;
 					} else if (!boundary.count) {
 						boundary.onNext = NOOP;
-						head = head.consume();
+						head = head.consume(boundary);
 						asyncOut.write(head.html);
 						asyncOut.script(head.scripts);
 						asyncOut.end();
@@ -3736,4 +3875,4 @@ function drainClassFunctions($global, writeScope) {
 }
 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, _html_resume, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _text_resume, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forOf, 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, _attrs_select_value, _attrs_textarea_value, _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, _html_resume, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _set_scope_reason, _show_end, _show_start, _style_html, _subscribe, _template, _text_resume, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, _write_guard, _write_if, attrTag, attrTags, compat, forIn, forOf, forTo, forUntil, withLoadAssets, withPageAssets };