marko 6.4.0 → 6.4.2

package/dist/html.js

@@ -248,8 +248,8 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 }, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /['\r]|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /["\r]|&(?=[#a-zA-Z])/g, needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g, $chunk, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
 	let { state } = $chunk.boundary, target = $chunk.serializeState, scope = scopeWithId(state, scopeId), pending = target.writeScopes[scopeId];
 	return state.needsMainRuntime = !0, countResumeWrite($chunk), Object.assign(scope, partialScope), pending && pending !== partialScope ? Object.assign(pending, partialScope) : target.writeScopes[scopeId] = partialScope, target.flushScopes = !0, scope;
-}, CLIENT_ALL = 715827883, NOOP$2 = () => {}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, unsafeXMLReg = /[<&\r]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&#13;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
-	let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered, result;
+}, CLIENT_ALL = 715827883, NOOP$2 = () => {}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, unsafeXMLReg = /[<&\r]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&#13;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, markerGuard) => {
+	let shouldResume = markerGuard !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered, result;
 	if (typeof renderer == "string") {
 		let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
 		rendered = !0, (() => {
@@ -258,7 +258,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 				if (renderer === "textarea") _html(_attrs_textarea_value(branchId, "a", input));
 				else {
 					if (renderContent && typeof renderContent != "function") throw Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
-					renderer === "select" && ("value" in input || "valueChange" in input) ? _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent ? () => _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason) : void 0, 1) : renderContent && _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
+					renderer === "select" && ("value" in input || "valueChange" in input) ? _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent ? () => _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, markerGuard) : void 0, 1) : renderContent && _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, markerGuard);
 				}
 				_html(`</${renderer}>`);
 			}
@@ -268,12 +268,12 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	} else {
 		let chunk = getChunk(), beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0, render = () => {
 			if (renderer) try {
-				return _set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? CLIENT_ALL : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
+				return _set_scope_reason(shouldResume && inputOrArgs !== void 0 ? CLIENT_ALL : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
 					content
 				} : inputOrArgs);
 			} finally {
-				_set_serialize_reason(void 0);
+				_set_scope_reason(void 0);
 			}
 			else if (content) return content();
 		};
@@ -285,8 +285,9 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 		let patched = patch(tag, scopeId, accessor);
 		return patched !== tag && (patched.a = tag), originalDynamicTag(scopeId, accessor, patched, input, content, inputIsArgs, resume);
 	};
-})(_dynamic_tag), CONSUMED_RESULT_MESSAGE = "Cannot read from a consumed render result", _template = (templateId, renderer, page) => (renderer.render = render, renderer.i = !page, renderer._ = renderer, _content_resume(templateId, renderer)), kAssets = Symbol(), kBlockIndex = Symbol(), kDeferIndex = Symbol(), assetFlush, SET_SCOPE_REGISTER_ID = "$C_s", RENDER_BODY_ID = "$C_b", K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap(), compat = {
+})(_dynamic_tag), CONSUMED_RESULT_MESSAGE = "Cannot read from a consumed render result", _template = (templateId, renderer, page) => (renderer.render = render, renderer.i = !page, renderer._ = renderer, _content_resume(templateId, renderer)), kAssets = Symbol(), kHead = Symbol(), SET_SCOPE_REGISTER_ID = "$C_s", RENDER_BODY_ID = "$C_b", K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap(), compat = {
 	$global,
+	writeLoadAsset,
 	fork: _await,
 	write: _html,
 	writeScript,
@@ -305,7 +306,8 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	onFlush(fn) {
 		let { flushHTML } = Chunk.prototype;
 		Chunk.prototype.flushHTML = function(boundary) {
-			return fn(this), flushHTML.call(this, boundary);
+			let { state } = boundary, reorders = swapReorders(state, null);
+			return fn(this), swapReorders(state, reorders), flushHTML.call(this, boundary);
 		};
 	},
 	patchDynamicTag,
@@ -328,24 +330,45 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			return compatRegistered;
 		};
 	},
+	joinChunks(chunks) {
+		let joined;
+		for (let chunk of chunks) chunk.boundary.aborted || (joined ? joined.append(chunk) : joined = chunk);
+		return joined;
+	},
+	appendChunks(chunks) {
+		let chunk = getChunk();
+		for (let part of chunks) chunk.append(part), part.effects && (chunk.lastEffect = part.lastEffect);
+	},
+	deferReorders(reorders) {
+		let chunk = getChunk();
+		for (let i = reorders.length; i--;) {
+			let carrier = chunk.fork(chunk.boundary, chunk.next);
+			carrier.deferredReorder = reorders[i], chunk.next = carrier;
+		}
+	},
 	createChunk($global) {
 		let state = this.ensureState($global);
 		return new Chunk(new Boundary(state), null, null, state);
 	},
-	flushScript($global, chunk) {
-		chunk ||= this.createChunk($global);
-		let { boundary } = chunk, scripts = boundary.flush() === 0 ? chunk.flushScript(boundary).scripts : "";
-		if (boundary.signal.aborted) throw boundary.signal.reason;
+	flushScript(chunk, reorders) {
+		let { boundary } = chunk, { state } = boundary, html = "", scripts = "";
+		if (reorders) for (let reorder of reorders) state.reorder(reorder);
+		if (boundary.flush() === 0 && ({html, scripts} = chunk.flushScript(boundary)), boundary.aborted) throw boundary.reason;
 		if (boundary.count) throw Error("Cannot serialize promise across tags/class compat layer.");
-		return scripts;
+		return {
+			html,
+			scripts
+		};
 	},
-	render(renderer, willRerender, classAPIOut, component, input, completeChunks, registerChildScope) {
-		let state = this.ensureState(classAPIOut.global), boundary = new Boundary(state), context = getChunk()?.context ?? null, head = new Chunk(boundary, new Chunk(boundary, null, context, state), context, state), normalizedInput = input;
+	render(renderer, willRerender, classAPIOut, component, input, componentScopes, registerChildScope, parentChunk) {
+		if (parentChunk?.boundary.aborted) return;
+		let state = this.ensureState(classAPIOut.global), boundary = new Boundary(state, void 0, parentChunk?.boundary), context = getChunk()?.context ?? null, head = new Chunk(boundary, new Chunk(boundary, null, context, state), context, state), normalizedInput = input;
 		if ("renderBody" in input) {
 			normalizedInput = {};
 			for (let key in input) normalizedInput[key === "renderBody" ? "content" : key] = input[key];
 		}
-		head.render(() => {
+		let componentScope = new Chunk(boundary, null, context, state);
+		componentScope.render(() => {
 			if (this.hasPendingClassFunctions(classAPIOut.global) && drainClassFunctions(classAPIOut.global, (hostId) => {
 				let fnScopeId = _scope_id(), scope = writeScope(fnScopeId, {
 					m5c: component.id,
@@ -356,11 +379,12 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 				let scopeId = _peek_scope_id();
 				writeScope(scopeId, { m5c: component.id }), _script(scopeId, SET_SCOPE_REGISTER_ID);
 			}
-			_set_serialize_reason(willRerender ? CLIENT_ALL : 0);
+		}), head.render(() => {
+			_set_scope_reason(willRerender ? CLIENT_ALL : 0);
 			try {
 				renderer(normalizedInput);
 			} finally {
-				_set_serialize_reason(void 0);
+				_set_scope_reason(void 0);
 			}
 			let asyncOut = classAPIOut.beginAsync({
 				last: !0,
@@ -368,7 +392,16 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			});
 			classAPIOut.onLast((next) => {
 				(boundary.onNext = () => {
-					boundary.signal.aborted ? (asyncOut.error(boundary.signal.reason), boundary.onNext = NOOP) : boundary.count || (boundary.onNext = NOOP, head = head.consume(), asyncOut.write(head.html), asyncOut.script(head.scripts), asyncOut.end(), head.html = head.scripts = "", completeChunks.push(head), next());
+					if (boundary.aborted) boundary.onNext = NOOP, parentChunk?.boundary.aborted ? (asyncOut.end(), next()) : asyncOut.error(boundary.reason);
+					else if (!boundary.count) {
+						boundary.onNext = NOOP;
+						let queued = swapReorders(state, null);
+						head = head.consume(boundary);
+						let reorders = swapReorders(state, queued);
+						reorders && asyncOut.writer.get("reorders").push(...reorders);
+						let heldEffects = head.takeHeldEffects();
+						heldEffects && (head.effects = joinHeldEffects(heldEffects, head.effects), head.lastEffect = ""), asyncOut.write(head.html), asyncOut.script(head.scripts), head.html = head.scripts = "", asyncOut.writer.get("chunks").push(head), asyncOut.end(), componentScopes.push(componentScope), next();
+					}
 				})();
 			});
 		});
@@ -450,6 +483,7 @@ function normalizeDynamicRenderer(value) {
 }
 //#endregion
 //#region src/common/errors.ts
+function _assert_class_toggles(classes, toggles) {}
 function _el_read_error() {}
 function _hoist_read_error() {}
 function _assert_hoist(value) {}
@@ -474,11 +508,12 @@ function forUntil(until, from, step, cb) {
 }
 //#endregion
 //#region src/common/opt.ts
-function forEach(opt, cb) {
+function reduce(opt, cb, acc) {
 	if (opt) {
-		if (Array.isArray(opt)) for (let item of opt) cb(item);
-		else cb(opt);
+		if (Array.isArray(opt)) for (let item of opt) acc = cb(acc, item);
+		else acc = cb(acc, opt);
 	}
+	return acc;
 }
 function push(opt, item) {
 	return opt ? Array.isArray(opt) ? (opt.push(item), opt) : [opt, item] : item;
@@ -552,6 +587,14 @@ var State$1 = class {
 			channel
 		});
 	}
+	dropCall(value, object, property) {
+		let { mutated } = this.#state;
+		for (let i = 0; i < mutated.length; i++) {
+			let mutation = mutated[i];
+			if (mutation.value === value && mutation.object === object && mutation.property === property) return mutated.splice(i, 1), !0;
+		}
+		return !1;
+	}
 };
 function register(id, val, scope, locals) {
 	return REGISTRY.set(val, {
@@ -609,13 +652,13 @@ function writeAssigned(state) {
 			let hasSeen = state.refs.get(mutation.object)?.id, objectStartIndex = state.buf.push(state.buf.length === 0 ? "" : ",");
 			if (writeProp(state, mutation.object, null, "")) {
 				let objectRef = state.refs.get(mutation.object);
-				objectRef && objectRef.scopeId === void 0 && (objectRef.id ? hasSeen || (state.buf[objectStartIndex] = "(" + state.buf[objectStartIndex], state.buf.push(")")) : (objectRef.id = nextRefAccess(state), state.buf[objectStartIndex] = "(" + objectRef.id + "=" + state.buf[objectStartIndex], state.buf.push(")")));
+				objectRef && objectRef.scopeId === void 0 && (!objectRef.id && !isAncestorChannelRef(state, objectRef) ? (objectRef.id = nextRefAccess(state), state.buf[objectStartIndex] = "(" + objectRef.id + "=" + state.buf[objectStartIndex], state.buf.push(")")) : hasSeen || (state.buf[objectStartIndex] = "(" + state.buf[objectStartIndex], state.buf.push(")")));
 			} else state.buf.push("void 0");
 			let valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
 			if (mutation.value !== void 0) {
 				if (writeProp(state, mutation.value, null, "")) {
 					let valueRef = typeof mutation.value == "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
-					valueRef && !valueRef.id && valueRef.scopeId === void 0 && (valueRef.id = mutation.valueId || nextRefAccess(state), state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex]);
+					valueRef && !valueRef.id && valueRef.scopeId === void 0 && !isAncestorChannelRef(state, valueRef) && (valueRef.id = mutation.valueId || nextRefAccess(state), state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex]);
 				} else state.buf.push("void 0");
 			}
 			state.buf.push(")");
@@ -628,7 +671,7 @@ function writeCallArg(state, val) {
 	if (val === void 0) state.wroteUndefined = !0, state.buf.push("$");
 	else if (writeProp(state, val, null, "")) {
 		let ref = state.refs.get(val) || state.strs.get(val);
-		ref && ref.id === null && assignId(state, ref);
+		ref && ensureId(state, ref);
 	} else state.buf.push("void 0");
 }
 function hasChannelMutations(state) {
@@ -680,7 +723,7 @@ function writeRegistered(state, val, parent, accessor, registered) {
 		let locals = registered.locals?.(state.boundary.state.scope);
 		if (locals) {
 			state.buf.push(registered.access + "(_(" + scopeId + ")");
-			for (let local of locals) state.buf.push(","), local ? writePlainObject(state, local, new Reference(ref, null, state.flushId, state.buf.length)) : state.buf.push("0");
+			for (let local of locals) state.buf.push(","), writePlainObject(state, local, newArgReference(state, ref, local));
 		} else state.buf.push("_(" + scopeId + "," + quoteRegisterId(registered.id));
 		state.buf.push(")");
 	} else state.buf.push(registered.access);
@@ -880,6 +923,16 @@ function writeArrayArg(state, ref, items, assignsPrefix, plainPrefix, needsId) {
 	} else state.buf.push(plainPrefix), writeArray(state, items, new Reference(ref, null, state.flushId, state.buf.length));
 	state.buf.push(")");
 }
+function newArgReference(state, parent, val) {
+	for (let key in val) {
+		let member = val[key];
+		if (isDedupedMember(member) && !(typeof member == "string" ? state.strs.has(member) : state.refs.has(member))) {
+			let ref = new Reference(parent, null, state.flushId, null, nextRefAccess(state));
+			return state.buf.push(ref.id + "="), 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;
@@ -983,14 +1036,10 @@ function writeResponse(state, val, ref) {
 	return !val.body || val.bodyUsed ? state.buf.push("new Response" + (options ? "(null,{" + options + "})" : "")) : (state.buf.push("new Response("), state.buf.push((writeProp(state, val.body, ref, "body") ? "" : "null") + (options ? ",{" + options + "})" : ")"))), !0;
 }
 function writeIntl(state, val, name, ref) {
-	let { locale, ...options } = val.resolvedOptions(), needsId = !1;
-	for (let key in options) if (isDedupedMember(options[key])) {
-		needsId = !0;
-		break;
-	}
+	let { locale, ...options } = val.resolvedOptions();
 	state.buf.push("new Intl." + name + "(" + quote(locale, 0) + ",");
-	let optionsRef;
-	return needsId ? (optionsRef = new Reference(ref, null, state.flushId, null, nextRefAccess(state)), state.buf.push(optionsRef.id + "={")) : (optionsRef = new Reference(ref, null, state.flushId, state.buf.length), state.buf.push("{")), writeObjectProps(state, options, optionsRef), state.buf.push("})"), !0;
+	let optionsRef = newArgReference(state, ref, options);
+	return state.buf.push("{"), writeObjectProps(state, options, optionsRef), state.buf.push("})"), !0;
 }
 function writeIntlLocale(state, val) {
 	return state.buf.push("new Intl.Locale(" + quote(val.toString(), 0) + ")"), !0;
@@ -1001,7 +1050,7 @@ function writeTemporal(state, val, name) {
 function writeReadableStream(state, val, ref) {
 	if (val.locked) return !1;
 	let { boundary, channel } = state, reader = val.getReader(), iterId = nextRefAccess(state), handle = newAsyncHandle(state, ref, iterId), onFulfilled = ({ value, done }) => {
-		done ? writeAsyncCall(state, boundary, handle, "r", value, channel) : boundary.signal.aborted || (reader.read().then(onFulfilled, onRejected), boundary.startAsync(), writeAsyncCall(state, boundary, handle, "f", value, channel));
+		done ? writeAsyncCall(state, boundary, handle, "r", value, channel) : boundary.aborted || (reader.read().then(onFulfilled, onRejected), boundary.startAsync(), writeAsyncCall(state, boundary, handle, "f", value, channel));
 	}, onRejected = (reason) => {
 		writeAsyncCall(state, boundary, handle, "j", reason, channel);
 	};
@@ -1027,19 +1076,16 @@ function writeGenerator(state, iter, ref) {
 	if (heldReturn) {
 		let holder = new Reference(ref, null, state.flushId, null, nextRefAccess(state));
 		state.buf.push("," + holder.id + "={}"), writeProp(state, returnValue, holder, "v");
-	} else if (returnValue !== void 0) {
-		let sepIndex = state.buf.push(",") - 1;
-		if (writeProp(state, returnValue, ref, "") && isDedupedMember(returnValue)) {
-			let retRef = typeof returnValue == "string" ? state.strs.get(returnValue) : state.refs.get(returnValue);
-			retRef && !retRef.id && retRef.scopeId === void 0 && (retRef.id = nextRefAccess(state), state.buf[sepIndex] = "," + retRef.id + "=");
-		}
+	} else if (returnValue !== void 0 && (state.buf.push(","), writeProp(state, returnValue, ref, "") && isDedupedMember(returnValue))) {
+		let retRef = typeof returnValue == "string" ? state.strs.get(returnValue) : state.refs.get(returnValue);
+		retRef && ensureId(state, retRef);
 	}
 	return state.buf.push(")"), !0;
 }
 function writeAsyncGenerator(state, iter, ref) {
 	if (iter[kTouchedIterator]) return state.buf.push("(async function*(){}())"), !0;
 	let { boundary, channel } = state, iterId = nextRefAccess(state), handle = newAsyncHandle(state, ref, iterId), onFulfilled = ({ value, done }) => {
-		done ? writeAsyncCall(state, boundary, handle, "r", value, channel) : boundary.signal.aborted || (iter.next().then(onFulfilled, onRejected), boundary.startAsync(), writeAsyncCall(state, boundary, handle, "f", value, channel));
+		done ? writeAsyncCall(state, boundary, handle, "r", value, channel) : boundary.aborted || (iter.next().then(onFulfilled, onRejected), boundary.startAsync(), writeAsyncCall(state, boundary, handle, "f", value, channel));
 	}, onRejected = (reason) => {
 		writeAsyncCall(state, boundary, handle, "j", reason, channel);
 	};
@@ -1070,7 +1116,7 @@ function writeMaybeIterableProps(state, val, ref) {
 	return sep;
 }
 function writeAsyncCall(state, boundary, handle, method, value, channel, valueId = null) {
-	boundary.signal.aborted || (state.mutated.push({
+	boundary.aborted || (state.mutated.push({
 		value,
 		object: handle,
 		property: method,
@@ -1088,6 +1134,9 @@ function trackChannel(state, ref) {
 	}
 	return !1;
 }
+function isAncestorChannelRef(state, ref) {
+	return ref.channel?.readyId !== state.channel?.readyId;
+}
 function abortRender(boundary, err) {
 	for (; boundary.parent;) boundary = boundary.parent;
 	boundary.abort(err);
@@ -1171,7 +1220,7 @@ function quote(str, startPos) {
 	return "\"" + (lastPos === startPos ? str : result + str.slice(lastPos)) + "\"";
 }
 function writeRef(state, ref) {
-	ref.id === null && ref.scopeId === void 0 && ref.path === null && (ref.pos === null || ref.flushId !== state.flushId) ? (ref.path = accessPath(state, ref), ref.pos = state.buf.length, ref.flushId = state.flushId, ref.channel = state.channel, state.buf.push(ref.path)) : state.buf.push(ensureId(state, ref));
+	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, state.buf.push(ref.path)) : state.buf.push(ensureId(state, ref));
 }
 function ensureId(state, ref) {
 	return ref.scopeId === void 0 ? ref.id ? (trackChannel(state, ref), ref.id) : assignId(state, ref) : (trackChannel(state, ref), "_(" + ref.scopeId + ")");
@@ -1182,14 +1231,14 @@ function accessId(state, ref) {
 }
 function assignId(state, ref) {
 	let { pos } = ref;
-	return ref.id = nextRefAccess(state), pos !== null && ref.flushId === state.flushId ? (pos === 0 ? state.buf[0] = ref.id + "=" + state.buf[0] : state.buf[pos - 1] += ref.id + "=", ref.id) : (ref.channel = state.channel, ref.id + "=" + (ref.path || accessPath(state, ref)));
+	return pos !== null && ref.flushId === state.flushId ? (ref.id = nextRefAccess(state), pos === 0 ? state.buf[0] = ref.id + "=" + state.buf[0] : state.buf[pos - 1] += ref.id + "=", ref.id) : isAncestorChannelRef(state, ref) ? ref.path || accessPath(state, ref) : (ref.id = nextRefAccess(state), ref.id + "=" + (ref.path || accessPath(state, ref)));
 }
 function accessPath(state, ref) {
 	let cur = ref, accessPrevValue = "";
 	do {
 		accessPrevValue = toAccess(cur.accessor) + accessPrevValue;
 		let parent = cur.parent;
-		if (parent.id && (trackChannel(state, parent) || !parent.parent)) return parent.id + accessPrevValue;
+		if (parent.id) return trackChannel(state, parent), parent.id + accessPrevValue;
 		if (parent.flushId === state.flushId || parent.scopeId !== void 0) return accessId(state, parent) + accessPrevValue;
 		cur = parent;
 	} while (cur);
@@ -1341,8 +1390,8 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 	}
 	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_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) {
 	let partial = {};
@@ -1352,8 +1401,8 @@ function _attrs_partial(data, skip, nodeAccessor, scopeId, tagName) {
 	}
 	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 _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) {
 	writeScope(scopeId, serializeType ? {
@@ -1486,8 +1535,17 @@ function _html(html) {
 function writeScript(script) {
 	$chunk.writeScript(script);
 }
-function _script(scopeId, registryId, serializeMarker) {
-	serializeMarker === 0 && ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) && _resume_branch(scopeId), $chunk.boundary.state.needsMainRuntime = !0, $chunk.writeEffect(scopeId, registryId);
+function catchableBoundary() {
+	let { boundary } = $chunk;
+	return boundary.withinCatch ? boundary : null;
+}
+function mayDrop(written) {
+	let { boundary } = $chunk;
+	for (let cur = written; cur && !isWithin(boundary, cur); cur = cur.parent) if (cur.aborted || cur.count) return !0;
+	return !1;
+}
+function _script(scopeId, registryId, markerGuard) {
+	markerGuard === 0 && ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) && _resume_branch(scopeId), $chunk.boundary.state.needsMainRuntime = !0, $chunk.writeEffect(scopeId, registryId);
 }
 function _trailers(html) {
 	$chunk.boundary.state.trailerHTML += html;
@@ -1528,8 +1586,8 @@ function _resume_branch(scopeId) {
 	let branchId = $chunk.context?.[kBranchId];
 	branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { G: branchId });
 }
-function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
-	let shouldResume = serializeReason !== 0, render = normalizeServerRender(content), branchId = _peek_scope_id();
+function _attr_content(nodeAccessor, scopeId, content, markerGuard) {
+	let shouldResume = markerGuard !== 0, render = normalizeServerRender(content), branchId = _peek_scope_id();
 	render && (shouldResume ? withBranchId(branchId, render) : render()), _peek_scope_id() === branchId ? _scope_id() : shouldResume && writeScope(scopeId, {
 		["A" + nodeAccessor]: writeScope(branchId, {}),
 		["D" + nodeAccessor]: rendererKey(render)
@@ -1548,48 +1606,48 @@ function writeScopePassive(scopeId, partialScope) {
 	let target = $chunk.serializeState, scope = _scope_with_id(scopeId), passive = target.passiveScopes ||= {};
 	return Object.assign(scope, partialScope), passive[scopeId] = Object.assign(passive[scopeId] || {}, partialScope), scope;
 }
-function _show_start(display, mark) {
-	display ? mark && $chunk.writeHTML($chunk.boundary.state.mark("[", "")) : $chunk.writeHTML("<t hidden>");
+function _show_start(display, markerGuard, branchExprGuard, parentEndTag) {
+	display ? resumesMarker(markerGuard, branchExprGuard, parentEndTag) && $chunk.writeHTML($chunk.boundary.state.mark("[", "")) : $chunk.writeHTML("<t hidden>");
 }
-function _show_end(scopeId, accessor, display, serializeMarker, serializeStateful, parentEndTag, singleNode) {
+function _show_end(scopeId, accessor, display, markerGuard, branchExprGuard, parentEndTag, singleNode) {
 	let branchId = _scope_id(), wrap = !display;
-	wrap && $chunk.writeHTML("</t>"), writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, wrap || singleNode ? 1 : void 0, " " + branchId);
+	wrap && $chunk.writeHTML("</t>"), 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) => {
 		let 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), !1, () => 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) => {
 			let 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) => {
 			let 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) {
-	if (serializeBranch === 0) {
-		iterate(0), writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, "");
+function forBranches(by, iterate, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
+	if (branchGuard === 0) {
+		iterate(0), writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, "");
 		return;
 	}
-	let { state } = $chunk.boundary, resumeKeys = serializeMarker !== 0, resumeMarker = resumeKeys && (!parentEndTag || serializeStateful !== 0), flushBranchIds = "", loopScopes;
+	let { state } = $chunk.boundary, resumeKeys = markerGuard !== 0, resumeMarker = resumesMarker(markerGuard, branchExprGuard, parentEndTag), flushBranchIds = "", loopScopes;
 	iterate((itemKey, sameAsIndex, render) => {
 		let branchId = _peek_scope_id();
 		resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(state.mark("[", flushBranchIds)), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
@@ -1597,14 +1655,14 @@ function forBranches(by, iterate, scopeId, accessor, serializeBranch, serializeM
 			let branchScope = writeScope(branchId, resumeKeys && !sameAsIndex ? { M: itemKey } : {});
 			resumeMarker || (loopScopes = push(loopScopes, branchScope));
 		});
-	}), loopScopes && writeScope(scopeId, { ["A" + accessor]: loopScopes }), writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
+	}), loopScopes && writeScope(scopeId, { ["A" + accessor]: loopScopes }), writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
 }
-function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-	let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), branchId = _peek_scope_id(), chunk = $chunk, beforeBranch = resumeMarker && resumeBranch && !singleNode ? deferBranchStart(chunk) : void 0, branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
+function _if(cb, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
+	let resumeBranch = branchGuard !== 0, resumeMarker = resumesMarker(markerGuard, branchExprGuard, parentEndTag), branchId = _peek_scope_id(), chunk = $chunk, beforeBranch = resumeMarker && resumeBranch && !singleNode ? deferBranchStart(chunk) : void 0, branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
 	beforeBranch !== void 0 && applyBranchStart(chunk, beforeBranch, shouldWriteBranch), shouldWriteBranch && (branchIndex || !resumeMarker) && writeScope(scopeId, {
 		["D" + accessor]: branchIndex || void 0,
 		["A" + 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) {
 	let beforeBranch = chunk.html;
@@ -1613,14 +1671,15 @@ 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) {
 	let endTag = parentEndTag || "";
-	if (serializeMarker !== 0) {
-		if (!parentEndTag || serializeStateful !== 0) {
-			let { state } = $chunk.boundary, 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 $chunk.writeHTML(endTag);
+	if (resumesMarker(markerGuard, branchExprGuard, parentEndTag)) {
+		let { state } = $chunk.boundary, mark = singleNode ? state.mark(parentEndTag ? "}" : "|", scopeId + " " + accessor + (branchIds || "")) : state.mark(parentEndTag ? ")" : "]", scopeId + " " + accessor + (branchIds || ""));
+		$chunk.writeHTML(mark + endTag);
+	} else markerGuard === 0 ? $chunk.writeHTML(endTag) : $chunk.writeHTML(endTag + _el_resume(scopeId, accessor));
 }
 function _existing_scope(scopeId) {
 	return writeScope(scopeId, {});
@@ -1632,28 +1691,28 @@ function scopeWithId(state, scopeId) {
 	let { scopes } = state, scope = scopes.get(scopeId);
 	return scope || scopes.set(scopeId, scope = { [K_SCOPE_ID]: scopeId }), scope;
 }
-function _subscribe(subscribers, scope, resumeId, serializeMarker) {
+function _subscribe(subscribers, scope, resumeId, markerGuard) {
 	if (subscribers) {
-		let { serializer } = $chunk.boundary.state;
-		!$chunk.serializeState.readyId && !serializer.written(subscribers) ? subscribers.add(scope) : resumeId ? _script(scope[K_SCOPE_ID], resumeId, serializeMarker) : serializer.writeCall(scope, subscribers, "add", $chunk.serializeState);
+		let { boundary, serializeState } = $chunk, { serializer } = boundary.state;
+		!serializeState.readyId && !serializer.written(subscribers) ? subscribers.add(scope) : resumeId ? _script(scope[K_SCOPE_ID], resumeId, markerGuard) : serializer.writeCall(scope, subscribers, "add", serializeState), boundary.withinCatch && (boundary.subscribed ||= []).push(subscribers, scope, serializeState);
 	}
 	return scope;
 }
 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() {
-	let reason = $chunk.boundary.state.serializeReason;
-	return $chunk.boundary.state.serializeReason = void 0, reason;
+	let reason = $chunk.boundary.state.scopeReason;
+	return $chunk.boundary.state.scopeReason = void 0, 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) {
 	let chunk = $chunk, { boundary } = chunk, body = new Chunk(boundary, null, chunk.context, {
@@ -1663,10 +1722,11 @@ function writeWaitReady(readyId, renderer, input) {
 		writeScopes: {},
 		flushScopes: !1
 	}), bodyEnd = body.render(renderer, input);
+	if (boundary.aborted) throw boundary.reason;
 	body === bodyEnd ? (chunk.writeHTML(body.html), body.deferOwnReady(), chunk.deferredReady = push(chunk.deferredReady, body)) : (bodyEnd.next = $chunk = chunk.fork(boundary, chunk.next), chunk.next = body);
 }
-function _await(scopeId, accessor, promise, content, serializeMarker) {
-	let resumeMarker = serializeMarker !== 0;
+function _await(scopeId, accessor, promise, content, markerGuard) {
+	let resumeMarker = markerGuard !== 0;
 	if (!isPromise(promise)) {
 		if (resumeMarker) {
 			let branchId = _peek_scope_id();
@@ -1676,15 +1736,18 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 	}
 	let chunk = $chunk, { boundary } = chunk, startId = _peek_scope_id(), after = chunk.next = $chunk = chunk.fork(boundary, chunk.next);
 	chunk.async = !0, captureContext(chunk), boundary.startAsync(), promise.then((value) => {
-		chunk.async && (chunk.async = !1, boundary.signal.aborted || (chunk.render(() => {
-			if (resumeMarker) {
-				let branchId = _peek_scope_id();
-				$chunk.writeHTML($chunk.boundary.state.mark("[", "")), withBranchId(branchId, () => withIsAsync({ parent: getAsyncContent(chunk) }, content, value)), $chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
-			} else {
-				let renderedSince = _peek_scope_id() !== startId, async = { parent: getAsyncContent(chunk) };
-				withIsAsync(async, content, value), async.visit = renderedSince && (after.html || after.next) ? $chunk.boundary.state.mark("]", scopeId + " " + accessor) : "", async.resumed && $chunk.writeHTML(async.visit), async.end = $chunk;
-			}
-		}), boundary.endAsync()));
+		if (chunk.async && (chunk.async = !1, !boundary.aborted)) {
+			let { state } = boundary;
+			chunk.render(() => {
+				if (resumeMarker) {
+					let branchId = _peek_scope_id();
+					$chunk.writeHTML($chunk.boundary.state.mark("[", "")), withBranchId(branchId, () => withIsAsync({ parent: getAsyncContent(chunk) }, content, value)), $chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
+				} else {
+					let renderedSince = _peek_scope_id() !== startId, async = { parent: getAsyncContent(chunk) };
+					withIsAsync(async, content, value), async.visit = renderedSince && (after.html || after.next) ? $chunk.boundary.state.mark("]", scopeId + " " + accessor) : "", async.resumed && $chunk.writeHTML(async.visit), async.end = $chunk;
+				}
+			}), !chunk.async && boundary.pendingReorders?.delete(chunk) && state.reorder(chunk), boundary.endAsync();
+		}
 	}, (err) => {
 		chunk.async = !1, boundary.abort(err);
 	});
@@ -1708,32 +1771,56 @@ function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBran
 	};
 }
 function tryBoundary(content, catchContent, branchId, renderers) {
-	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state, boundary.signal, boundary), body = chunk.fork(catchBoundary, null), bodyEnd = body.render(() => withBranchId(branchId, content));
-	if (catchBoundary.signal.aborted) return catchContent ? catchContent(catchBoundary.signal.reason) : boundary.abort(catchBoundary.signal.reason), !0;
+	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state, void 0, boundary);
+	catchContent && (catchBoundary.withinCatch = !0);
+	let body = chunk.fork(catchBoundary, null), bodyEnd = body.render(() => withBranchId(branchId, content));
+	if (catchBoundary.aborted) {
+		if (!catchContent) throw catchBoundary.reason;
+		return catchContent(catchBoundary.reason), !0;
+	}
 	if (body === bodyEnd) return chunk.append(body), !1;
 	let renderersAtSettle = !catchBoundary.resumeWrites, bodyNext = bodyEnd.next = $chunk = chunk.fork(boundary, chunk.next);
 	chunk.next = body, boundary.startAsync();
-	let reorderId = catchContent ? state.nextReorderId() : "", endMarker = reorderId && state.mark("!", reorderId);
-	return reorderId && (chunk.writeHTML(state.mark("!^", reorderId)), bodyEnd.writeHTML(endMarker), captureContext(chunk)), catchBoundary.onNext = () => {
-		if (!boundary.signal.aborted) {
-			if (catchBoundary.signal.aborted) {
+	let reorderId = catchContent ? state.nextReorderId() : "";
+	return reorderId && (chunk.catchRange = {
+		id: reorderId,
+		end: bodyEnd
+	}, captureContext(chunk)), catchBoundary.onNext = () => {
+		if (!boundary.aborted) {
+			if (catchBoundary.aborted) {
 				if (!reorderId) {
-					boundary.abort(catchBoundary.signal.reason);
+					boundary.abort(catchBoundary.reason);
 					return;
 				}
-				if (!bodyEnd.consumed) {
-					let cur = body, writeMarker = !0;
-					do {
-						let next = cur.next;
-						cur.boundary !== catchBoundary && cur.boundary.abort(catchBoundary.signal.reason), writeMarker && !cur.consumed && (writeMarker = !1, cur.async = !1, cur.next = bodyNext, cur.needsWalk = !0, cur.html = endMarker, cur.scripts = cur.effects = cur.lastEffect = "", cur.placeholder = cur.reorderId = cur.deferredReady = null), cur = next;
-					} while (cur !== bodyNext);
+				let streamed = !chunk.catchRange, catchChunk = chunk.fork(boundary, null);
+				chunk.catchRange = null, renderersAtSettle || catchChunk.render(clearTryRenderers, branchId);
+				let inOrder = catchChunk === catchChunk.render(catchContent, catchBoundary.reason);
+				if (boundary.aborted) return;
+				if ((bodyEnd.consumed || !inOrder) && (catchChunk.reorderStart = state.mark("*", branchId + "")), bodyEnd.consumed) catchChunk.reorderId = reorderId, state.reorder(catchChunk);
+				else {
+					let reorder = null;
+					inOrder ? streamed && (reorder = chunk.fork(boundary, null)) : reorder = catchChunk, reorder && (reorder.reorderId = reorderId);
+					let endMarker = state.mark("!", reorderId), cut = body;
+					for (; cut.consumed;) cut = cut.next;
+					cut.async = !1, 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, inOrder && (catchChunk.next = bodyNext);
 				}
-				let catchChunk = chunk.fork(boundary, null);
-				catchChunk.reorderId = reorderId, catchChunk.render(catchContent, catchBoundary.signal.reason), state.reorder(catchChunk), boundary.endAsync();
-			} else catchBoundary.count ? boundary.onNext() : (renderersAtSettle && catchBoundary.resumeWrites && bodyEnd.render(renderers), boundary.endAsync());
+				boundary.endAsync();
+			} else catchBoundary.count ? boundary.onNext() : (renderersAtSettle && catchBoundary.resumeWrites && bodyEnd.render(renderers), chunk.catchRange = null, boundary.endAsync());
 		}
 	}, renderersAtSettle;
 }
+function unsubscribe(subscribed, serializer) {
+	for (let i = 0; i < subscribed.length; i += 3) {
+		let subscribers = subscribed[i], scope = subscribed[i + 1];
+		serializer.written(subscribers) ? serializer.dropCall(scope, subscribers, "add") || serializer.writeCall(scope, subscribers, "delete", subscribed[i + 2]) : subscribers.delete(scope);
+	}
+}
+function clearTryRenderers(branchId) {
+	writeScope(branchId, {
+		E: 0,
+		Q: _scope_with_id(branchId).Q && 0
+	});
+}
 function writeTryRenderers(branchId, catchContent, placeholderContent) {
 	writeScope(branchId, {
 		E: catchContent,
@@ -1769,7 +1856,7 @@ var State = class {
 	flushScopes = !1;
 	writeScopes = {};
 	readyIds = null;
-	serializeReason;
+	scopeReason;
 	$global;
 	constructor($global) {
 		this.$global = $global, $global.cspNonce && (this.nonceAttr = " nonce" + attrAssignment($global.cspNonce));
@@ -1810,28 +1897,42 @@ var State = class {
 	mark(code, str) {
 		return "<!--" + this.commentPrefix + code + str + "-->";
 	}
-}, Boundary = class extends AbortController {
+}, Boundary = class {
 	onNext = NOOP$2;
 	count = 0;
 	resumeWrites = 0;
 	state;
 	parent;
+	aborted = !1;
+	reason;
+	subscribed;
+	pendingReorders;
+	children;
+	withinCatch = !1;
 	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();
-		}), signal && (signal.aborted ? this.abort(signal.reason) : signal.addEventListener("abort", this));
+		this.state = state, this.parent = parent, parent ? (this.withinCatch = parent.withinCatch, parent.aborted ? this.abort(parent.reason) : (parent.children ||= []).push(this)) : signal && (signal.aborted ? this.abort(signal.reason) : signal.addEventListener("abort", this));
+	}
+	abort(reason) {
+		if (this.aborted) return;
+		let { state } = this;
+		if (this.aborted = !0, this.reason = reason, this.subscribed && unsubscribe(this.subscribed, state.serializer), this.pendingReorders) {
+			for (let reorder of this.pendingReorders) state.reorder(reorder);
+			this.pendingReorders = void 0;
+		}
+		if (this.count = 0, this.state = new State(state.$global), this.children) for (let child of this.children) child.abort(reason);
+		this.onNext();
 	}
 	handleEvent(event) {
 		this.abort(event.target.reason);
 	}
 	flush() {
-		return this.signal.aborted || flushSerializer(this, this.state), this.count ? 1 : this.signal.aborted ? 2 : 0;
+		return this.aborted || flushSerializer(this, this.state), this.count ? 1 : this.aborted ? 2 : 0;
 	}
 	startAsync() {
-		this.signal.aborted || this.count++;
+		this.aborted || this.count++;
 	}
 	endAsync() {
-		this.signal.aborted || (this.count--, this.onNext());
+		this.aborted || (this.count--, this.onNext());
 	}
 }, Chunk = class Chunk {
 	html = "";
@@ -1840,9 +1941,12 @@ var State = class {
 	lastEffect = "";
 	async = !1;
 	consumed = !1;
-	needsWalk = !1;
 	reorderId = null;
+	reorderStart = "";
 	deferredReady = null;
+	heldEffects = null;
+	deferredReorder = null;
+	catchRange = null;
 	placeholder = null;
 	boundary;
 	next;
@@ -1858,13 +1962,17 @@ var State = class {
 		this.html += html;
 	}
 	writeEffect(scopeId, registryId) {
-		countResumeWrite(this), this.lastEffect === registryId ? this.effects += " " + scopeId : (this.lastEffect = registryId, this.effects = concatEffects(this.effects, registryId + " " + scopeId));
+		countResumeWrite(this), this.lastEffect === registryId ? this.effects = concatEffects(this.effects, scopeId + "") : (this.lastEffect = registryId, this.effects = concatEffects(this.effects, registryId + " " + scopeId));
 	}
 	writeScript(script) {
 		this.scripts = concatScripts(this.scripts, script);
 	}
 	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, this.deferredReady = concat(this.deferredReady, chunk.takeDeferredReady());
+		this.html += chunk.html, this.effects = concatEffects(this.effects, chunk.effects), this.scripts = concatScripts(this.scripts, chunk.scripts), this.lastEffect = chunk.lastEffect || this.lastEffect, this.deferredReady = concat(this.deferredReady, chunk.takeDeferredReady());
+	}
+	takeHeldEffects() {
+		let { heldEffects } = this;
+		return this.heldEffects = null, heldEffects;
 	}
 	takeDeferredReady() {
 		let { deferredReady } = this;
@@ -1876,25 +1984,59 @@ var State = class {
 			deferred.effects = this.effects, deferred.scripts = this.scripts, this.effects = this.scripts = this.lastEffect = "", this.deferredReady = concat(deferred, this.deferredReady);
 		}
 	}
-	flushPlaceholder() {
+	renderPlaceholders(boundary) {
+		let { 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;
+				}
+				cur.deferredReorder && (reorders ||= []).push(cur.deferredReorder);
+			}
+			if (state.writeReorders) {
+				for (let reorder of state.writeReorders) if ((reorders = renderReorderPlaceholders(reorder, reorders)) === !1) {
+					if (boundary.aborted) return;
+					continue restart;
+				}
+			}
+			for (let i = 0; reorders && i < reorders.length; i++) if ((reorders = renderReorderPlaceholders(reorders[i], reorders)) === !1) {
+				if (boundary.aborted) return;
+				continue restart;
+			}
+			return;
+		}
+	}
+	renderPlaceholder(state) {
 		let { placeholder } = this;
-		if (placeholder) {
-			this.placeholder = null;
-			let body = placeholder.body.consume();
-			if (body.async) {
-				let { state } = this.boundary, { branchId, scopeId, placeholderBranchId } = placeholder, reorderId = body.reorderId = branchId ? branchId + "" : state.nextReorderId();
-				this.writeHTML(state.mark("!^", reorderId));
-				let { effects } = this, beforeBranch = deferBranchStart(this);
-				if (this.render(() => withBranchId(placeholderBranchId, placeholder.render)) !== this && this.boundary.abort(/* @__PURE__ */ Error("An @placeholder cannot contain async content.")), this.boundary.signal.aborted) return;
-				let stateful = this.effects !== effects;
-				applyBranchStart(this, beforeBranch, stateful), stateful && (this.render(() => writeScope(branchId, { P: scopeWithId(state, placeholderBranchId) })), this.writeHTML(state.mark("]", scopeId + " " + ("P" + branchId) + " " + placeholderBranchId)), body.writeEffect(branchId, "_f")), this.writeHTML(state.mark("!", reorderId)), state.reorder(body);
-			} else body.next = this.next, this.next = body;
+		if (!placeholder || (this.placeholder = null, this.boundary.aborted)) return !1;
+		let { body } = placeholder, end = body;
+		for (; end.next && !end.async;) end = end.next;
+		if (!end.async) return end.next = this.next, this.next = body, !1;
+		let { branchId, scopeId, placeholderBranchId } = placeholder, reorderId = body.reorderId = branchId + "";
+		this.writeHTML(state.mark("!^", reorderId));
+		let { effects } = this, beforeBranch = deferBranchStart(this);
+		if (this.render(() => withBranchId(placeholderBranchId, placeholder.render)) !== this && this.boundary.abort(/* @__PURE__ */ Error("An @placeholder cannot contain async content.")), this.boundary.aborted) return !0;
+		let stateful = this.effects !== effects;
+		return applyBranchStart(this, beforeBranch, stateful), stateful && (this.render(() => writeScope(branchId, { P: scopeWithId(state, placeholderBranchId) })), this.writeHTML(state.mark("]", scopeId + " " + ("P" + branchId) + " " + placeholderBranchId)), dismissChunk(end, body).writeEffect(branchId, "_f")), this.writeHTML(state.mark("!", reorderId)), this.deferredReorder = body, !1;
+	}
+	markCatchRange() {
+		let { catchRange } = this;
+		if (catchRange) {
+			let { state } = this.boundary;
+			this.catchRange = null, this.writeHTML(state.mark("!^", catchRange.id)), catchRange.end.writeHTML(state.mark("!", catchRange.id));
 		}
 	}
-	consume() {
-		let cur = this, html = "", effects = "", scripts = "", lastEffect = "", needsWalk = !1, deferredReady;
-		for (; cur.next && !cur.async;) cur.flushPlaceholder(), needsWalk ||= cur.needsWalk, html += cur.html, cur.serializeState.readyId ? deferredReady = push(deferredReady, cur) : (effects = concatEffects(effects, cur.effects), scripts = concatScripts(scripts, cur.scripts), lastEffect = cur.lastEffect || lastEffect), deferredReady = concat(deferredReady, cur.takeDeferredReady()), cur.consumed = !0, cur = cur.next;
-		return 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), cur.lastEffect ||= lastEffect, cur;
+	queueDeferredReorder() {
+		let { deferredReorder } = this;
+		deferredReorder && (this.deferredReorder = null, deferredReorder.boundary.state.reorder(deferredReorder));
+	}
+	consume(boundary) {
+		this.renderPlaceholders(boundary);
+		let cur = this, html = "", effects = "", scripts = "", effectsEnd, heldEffects = this.heldEffects, deferredReady;
+		for (this.heldEffects = null, this.serializeState.readyId && this.effects && followHeldEffects(this); cur.next && !cur.async;) cur.markCatchRange(), cur.queueDeferredReorder(), html += cur.html, cur.serializeState.readyId ? deferredReady = push(deferredReady, cur) : (cur.effects && (effectsEnd && effectsEnd.boundary !== cur.boundary && (heldEffects = holdEffectsOn(heldEffects, effectsEnd, effects), effects = ""), effectsEnd = cur, effects = concatEffects(effects, cur.effects)), scripts = concatScripts(scripts, cur.scripts)), deferredReady = concat(deferredReady, cur.takeDeferredReady()), cur.consumed = !0, cur = cur.next;
+		return cur.deferOwnReady(), effects && (cur.serializeState.readyId ? heldEffects = holdEffectsOn(heldEffects, effectsEnd, effects) : effectsEnd.boundary === cur.boundary ? (cur.effects = concatEffects(effects, cur.effects), cur.lastEffect ||= effectsEnd.lastEffect) : (heldEffects = holdEffectsOn(heldEffects, effectsEnd, effects), isWithin(cur.boundary, effectsEnd.boundary) && (cur.lastEffect ||= effectsEnd.lastEffect))), cur.heldEffects = heldEffects, cur.deferredReady = concat(deferredReady, cur.deferredReady), cur.html = html + cur.html, cur.scripts = concatScripts(scripts, cur.scripts), cur;
 	}
 	render(content, val) {
 		let prev = $chunk;
@@ -1908,10 +2050,9 @@ var State = class {
 		}
 	}
 	flushReadyScripts(boundary, reservations, holdEffects) {
-		let { serializeState } = this, { readyId } = serializeState, scripts = "";
-		if (forEach(this.takeDeferredReady(), (chunk) => {
-			scripts = concatScripts(scripts, chunk.flushReadyScripts(boundary, reservations, holdEffects)), (chunk.effects || chunk.deferredReady) && (this.deferredReady = push(this.deferredReady, chunk));
-		}), readyId && !this.async) {
+		let { serializeState } = this, { readyId } = serializeState, scripts = "", held = this.takeDeferredReady();
+		if (held) for (let chunk of Array.isArray(held) ? held : [held]) chunk.boundary.aborted || (scripts = concatScripts(scripts, chunk.flushReadyScripts(boundary, reservations, holdEffects)), (chunk.effects || chunk.deferredReady) && (this.deferredReady = push(this.deferredReady, chunk)));
+		if (readyId && !this.async) {
 			let { state } = boundary;
 			flushSerializer(boundary, serializeState);
 			let deps = state.serializer.takeChannelDeps(), effects = holdEffects ? "" : this.effects, { resumes } = serializeState, chunkScripts = this.scripts;
@@ -1929,51 +2070,74 @@ var State = class {
 	}
 	flushScript(boundary) {
 		let { state } = boundary, { $global, runtimePrefix } = state, needsWalk = state.walkOnNextFlush;
-		needsWalk && (state.walkOnNextFlush = !1);
+		needsWalk && (state.walkOnNextFlush = !1), flushSerializer(boundary, state);
 		let readyResumeScripts = this.flushReadyScripts(boundary, void 0, this.async);
-		for (let channel; !boundary.signal.aborted && (channel = state.serializer.pendingReadyChannel());) {
+		for (let channel; !boundary.aborted && (channel = state.serializer.pendingReadyChannel());) {
 			let resumes = state.serializer.stringifyScopes([], boundary, channel), deps = state.serializer.takeChannelDeps();
 			state.needsMainRuntime = !0, readyResumeScripts = concatScripts(readyResumeScripts, state.writeReady(channel.readyId, concatSequence(depsMarker(deps), resumes)));
 		}
 		readyResumeScripts && (needsWalk = !0);
-		let effects = this.async ? "" : this.effects, { html, scripts } = this;
-		state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(scripts, "(e=>(self[e]||=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(r=l.slice(s+1),(l=l[s])>\"#\"||(a[r]=e),l),r,e),l>\"#\"&&d.push(e)}},self[e]))(\"" + $global.runtimeId + "\")(\"" + $global.renderId + "\")")), scripts = concatScripts(scripts, readyResumeScripts), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + ",\"" + effects + "\"" : "\"" + effects + "\"");
+		let effects = this.async ? "" : joinHeldEffects(this.takeHeldEffects(), this.effects), { html, scripts } = this;
+		html && state.hasReorderRuntime && (html = state.mark("*", "") + html), state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(scripts, "(e=>(self[e]||=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(r=l.slice(s+1),(l=l[s])>\"#\"||(a[r]=e),l),r,e),l>\"#\"&&d.push(e)}},self[e]))(\"" + $global.runtimeId + "\")(\"" + $global.renderId + "\")")), scripts = concatScripts(scripts, readyResumeScripts), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + ",\"" + effects + "\"" : "\"" + effects + "\"");
 		let reordered = "", needsResumeArray = !1;
 		if (state.writeReorders) {
-			let carried = null;
 			for (let reorderedChunk of state.writeReorders) {
-				if (reorderedChunk.async && reorderedChunk.consumed) {
-					let aborted = reorderedChunk.boundary;
-					for (; aborted && !aborted.signal.aborted;) aborted = aborted.parent;
-					if (!aborted) {
-						(carried ||= []).push(reorderedChunk);
-						continue;
-					}
-					reorderedChunk.async = !1;
-				}
-				needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),\"#\"==n?(t[a]=l).i++:\"!\"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):\"T\"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,r:a,c(i=e.l[\"^\"+a],f=d.cloneNode()){if(--o.i)return 1;for(;f.prepend(r=e.l[a].previousSibling||i),i!=r;);c(a,d)}}),e.v.push({data:e.i+\"*\"+l.r}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})(" + runtimePrefix + ")"));
-				let { reorderId } = reorderedChunk, readyReservations = [], reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
-				for (reorderedChunk.reorderId = null;;) {
-					cur.flushPlaceholder(), cur.deferOwnReady();
+				needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),\"#\"==n?(t[a]=l).i++:\"T\"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:1,r:a,c(i=e.l[\"^\"+a],f=d.cloneNode()){if(--o.i)return 1;for(;f.prepend(r=e.l[a].previousSibling||i),i!=r;);c(a,d)}}),e.v.push({data:e.i+\"*\"+l.r}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})(" + runtimePrefix + ")"));
+				let { reorderId, reorderStart } = reorderedChunk, readyReservations = [], reorderHTML = "", reorderEffects = "", effectsBoundary = reorderedChunk.boundary, reorderScripts = "", cur = reorderedChunk.boundary.aborted ? null : reorderedChunk;
+				for (reorderedChunk.reorderId = null; cur;) {
+					cur.markCatchRange(), cur.queueDeferredReorder(), cur.deferOwnReady();
 					let { next } = cur, readyResumeScripts = cur.flushReadyScripts(boundary, readyReservations, this.async);
-					if (this.deferredReady = concat(this.deferredReady, cur.takeDeferredReady()), cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), state.reorder(cur), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next) cur = next;
-					else break;
+					this.deferredReady = concat(this.deferredReady, cur.takeDeferredReady()), cur.consumed = !0, reorderHTML += cur.html, this.async && cur.effects && cur.boundary !== effectsBoundary && (reorderEffects &&= (holdReorderEffects(this, effectsBoundary, reorderEffects), ""), effectsBoundary = cur.boundary), reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), cur.reorderStart = reorderStart, (cur.boundary.pendingReorders ||= /* @__PURE__ */ new Set()).add(cur), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), cur = next;
 				}
-				reorderEffects && (this.async ? (this.effects = concatEffects(this.effects, reorderEffects), this.lastEffect = "") : (needsResumeArray = !0, reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")")));
+				reorderEffects && (this.async ? holdReorderEffects(this, effectsBoundary, reorderEffects) : (needsResumeArray = !0, reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")")));
 				for (let reservation of readyReservations) reordered = concatScripts(reordered, reservation);
-				reordered = concatScripts(reordered, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"), html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
+				reordered = concatScripts(reordered, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"), html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderStart + reorderHTML + "</t>";
 			}
-			state.writeReorders = carried;
+			state.writeReorders = null;
 		}
-		return flushSerializer(boundary, state), (state.resumes || needsResumeArray && !state.hasWrittenResume) && (scripts = concatScripts(scripts, state.resumeScript(state.resumes))), scripts = concatScripts(scripts, reordered), needsWalk && (scripts = concatScripts(scripts, state.walkScript())), this.html = html, this.scripts = scripts, this.async || (this.effects = this.lastEffect = ""), state.resumes = "", this;
+		return (state.resumes || needsResumeArray && !state.hasWrittenResume) && (scripts = concatScripts(scripts, state.resumeScript(state.resumes))), scripts = concatScripts(scripts, reordered), needsWalk && (scripts = concatScripts(scripts, state.walkScript())), this.html = html, this.scripts = scripts, this.async || (this.effects = this.lastEffect = ""), state.resumes = "", this;
 	}
 	flushHTML(boundary) {
 		let { state } = boundary;
-		this.needsWalk && (this.needsWalk = !1, state.walkOnNextFlush = !0), this.flushScript(boundary);
+		this.flushScript(boundary);
 		let { html, scripts } = this;
 		return this.html = this.scripts = "", 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 !1;
+		cur.deferredReorder && (reorders ||= []).push(cur.deferredReorder);
+	}
+	return reorders;
+}
+function dismissChunk(end, body) {
+	if (end.boundary !== body.boundary) for (; end.next;) end = end.next;
+	return end;
+}
+function followHeldEffects(chunk) {
+	let held = reduce(chunk.deferredReady, lastHeldOf, chunk);
+	held !== chunk && (held.effects = concatEffects(held.effects, chunk.effects), chunk.effects = "");
+}
+function lastHeldOf(held, cur) {
+	return cur.serializeState === held.serializeState && cur.boundary === held.boundary ? cur : held;
+}
+function holdEffectsOn(heldEffects, chunk, effects) {
+	return chunk.effects = effects, push(heldEffects, chunk);
+}
+function isWithin(boundary, outer) {
+	for (; boundary && boundary !== outer;) boundary = boundary.parent;
+	return !!boundary;
+}
+function holdReorderEffects(head, boundary, effects) {
+	head.serializeState.readyId || (head.effects && (head.heldEffects = holdEffectsOn(head.heldEffects, head.fork(head.boundary, null), head.effects)), head.effects = head.lastEffect = ""), head.heldEffects = holdEffectsOn(head.heldEffects, head.fork(boundary, null), effects);
+}
+function joinHeldEffects(heldEffects, effects) {
+	return concatEffects(reduce(heldEffects, joinUncaught, ""), effects);
+}
+function joinUncaught(joined, held) {
+	return held.boundary.aborted ? joined : concatEffects(joined, held.effects);
+}
 function flushSerializer(boundary, serializeState) {
 	let { state } = boundary, { serializer } = state, pending = serializer.pending(serializeState);
 	if (serializeState.flushScopes || pending) {
@@ -2224,11 +2388,11 @@ var ServerRendered = class {
 			(boundary.onNext = () => {
 				switch (!boundary.count && boundary.flush()) {
 					case 2:
-						settle(boundary), reject(boundary.signal.reason);
+						settle(boundary), reject(boundary.reason);
 						break;
 					case 0:
-						if (head = head.consume(), boundary.signal.aborted) break;
-						html += head.flushHTML(boundary), boundary.count || boundary.signal.aborted || (settle(boundary), resolve(html));
+						if (head = head.consume(boundary), boundary.aborted) break;
+						html += head.flushHTML(boundary), boundary.count || boundary.aborted || (settle(boundary), resolve(html));
 				}
 			})();
 		});
@@ -2249,13 +2413,13 @@ var ServerRendered = class {
 				again = !1;
 				let status = boundary.flush();
 				if (status === 2) {
-					tick || offTick(onNext), settle(boundary), onAbort(boundary.signal.reason);
+					tick || offTick(onNext), settle(boundary), onAbort(boundary.reason);
 					return;
 				}
 				if (write || status === 0) {
-					if (head = head.consume(), boundary.signal.aborted) continue;
+					if (head = head.consume(boundary), boundary.aborted) continue;
 					let html = head.flushHTML(boundary);
-					if (boundary.signal.aborted) continue;
+					if (boundary.aborted) continue;
 					if (html && onWrite(html), !boundary.count) {
 						tick || offTick(onNext), settle(boundary), onClose();
 						return;
@@ -2270,8 +2434,8 @@ var ServerRendered = class {
 	toString() {
 		let head = this.#head;
 		if (this.#head = null, !head) throw Error(CONSUMED_RESULT_MESSAGE);
-		let { boundary } = head, html = boundary.flush() === 0 ? head.consume().flushHTML(boundary) : "";
-		if (boundary.count && boundary.abort(/* @__PURE__ */ Error("Cannot consume asynchronous render with 'toString'")), settle(boundary), boundary.signal.aborted) throw boundary.signal.reason;
+		let { boundary } = head, html = boundary.flush() === 0 ? head.consume(boundary).flushHTML(boundary) : "";
+		if (boundary.count && boundary.abort(/* @__PURE__ */ Error("Cannot consume asynchronous render with 'toString'")), settle(boundary), boundary.aborted) throw boundary.reason;
 		return html;
 	}
 };
@@ -2281,42 +2445,66 @@ function settle(boundary) {
 function NOOP$1() {}
 //#endregion
 //#region src/html/assets.ts
-function withLoadAssets(renderer, assetId, triggers) {
-	return Object.assign((input) => {
-		let g = $global();
-		return addAsset(g, assetId, triggers), _html(flush(g, "")), writeWaitReady(assetId, renderer, input);
-	}, renderer);
+function withLoadAssets(renderer, flush, assetId, triggers) {
+	return Object.assign((input) => (writeLoadAsset(assetId, flush, triggers), writeWaitReady(assetId, renderer, input)), renderer);
+}
+function writeLoadAsset(assetId, flush, triggers) {
+	let g = $global();
+	writeAsset(g, addAsset(g, assetId, flush, triggers));
 }
 function withPageAssets(template, runtime, assetId, runtimeId) {
-	return assetFlush = runtime, Object.assign((input) => {
+	return Object.assign((input) => {
 		let g = $global();
-		return runtimeId && (g[kAssets] || (g.runtimeId = runtimeId)), addAsset(g, assetId), g.__flush__ ? (_html(flush(g, "")), writeWaitReady(assetId, template, input)) : (g.__flush__ = flush, template(input));
+		runtimeId && (g[kAssets] || (g.runtimeId = runtimeId));
+		let asset = addAsset(g, assetId, runtime);
+		return g.__flush__ ? (writeAsset(g, asset), writeWaitReady(assetId, template, input)) : (g.__flush__ = flushPage, template(input));
 	}, template);
 }
 function _flush_head() {
 	let g = $global();
-	return g[kAssets] ? flush(g, "") : "";
+	return g[kAssets] ? (g[kHead] = !0, takeAssets(g, catchableBoundary())) : "";
+}
+function flushPage(g, html) {
+	return takeAssets(g, null) + html;
 }
-function flush(g, html) {
-	let result = "", assets = g[kAssets], { length } = assets, bi = g[kBlockIndex], di = g[kDeferIndex];
-	for (; bi < length; bi++) result += assetFlush(g, "block", assets[bi].id);
-	for (; di < length; di++) {
-		let { id, triggers } = assets[di], deferHTML = assetFlush(g, "defer", id);
-		triggers ? deferHTML && writeTriggerScript(id, deferHTML, triggers) : result += deferHTML;
+function takeAssets(g, at) {
+	let block = "", defer = "";
+	for (let asset of g[kAssets]) asset.htmlAt === void 0 && (asset.htmlAt = at, block += blockHTML(g, asset), asset.triggers || (defer += deferHTML(g, asset)));
+	return block + defer;
+}
+function writeAsset(g, asset) {
+	if (needsWrite(asset.htmlAt) && (asset.htmlAt = void 0, g[kHead] || g.__flush__ !== flushPage)) {
+		let block = blockHTML(g, asset);
+		_html(block + (asset.triggers ? "" : deferHTML(g, asset))), block && isInResumedBranch() && writeScript(`document.head.insertAdjacentHTML("beforeend",${_escape_script(JSON.stringify(block))})`), asset.htmlAt = catchableBoundary();
+	}
+	if (asset.triggers && needsWrite(asset.scriptAt)) {
+		let defer = deferHTML(g, asset);
+		defer && writeScript(asset.script ||= triggerScript(asset.id, defer, asset.triggers)), asset.scriptAt = catchableBoundary();
 	}
-	return g[kBlockIndex] = bi, g[kDeferIndex] = di, result + html;
 }
-function addAsset(g, id, triggers) {
-	let assets = g[kAssets];
-	assets ? assets.find((a) => a.id === id) || assets.push({
-		id,
-		triggers
-	}) : (g[kAssets] = [{
-		id,
-		triggers
-	}], g[kBlockIndex] = g[kDeferIndex] = 0);
+function needsWrite(at) {
+	return at === void 0 || at !== null && mayDrop(at);
 }
-function writeTriggerScript(id, html, triggers) {
+function blockHTML(g, asset) {
+	return asset.block ??= asset.flush(g, "block", asset.id);
+}
+function deferHTML(g, asset) {
+	return asset.defer ??= asset.flush(g, "defer", asset.id);
+}
+function addAsset(g, id, flush, triggers) {
+	let assets = g[kAssets] ||= [], asset = assets.find((a) => a.id === id);
+	return asset || assets.push(asset = {
+		id,
+		flush,
+		triggers,
+		block: void 0,
+		defer: void 0,
+		script: void 0,
+		htmlAt: void 0,
+		scriptAt: void 0
+	}), asset;
+}
+function triggerScript(id, html, triggers) {
 	let htmlStr = _escape_script(JSON.stringify(html)), exprs = triggers.map((trigger) => {
 		let options = trigger.options && toObjectExpression(trigger.options);
 		switch (trigger.type) {
@@ -2326,7 +2514,7 @@ function writeTriggerScript(id, html, triggers) {
 			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(${querySelectorOrLoad(trigger.selector)})`;
 		}
 	});
-	writeScript(`((p,h,d,l=$=>{d||p.after(new Range().createContextualFragment(d=h))})=>${exprs.length > 1 ? `{${exprs.join(";")}}` : exprs[0]})(document.currentScript,${htmlStr})`);
+	return `((h,d,l=$=>{d||document.head.append(new Range().createContextualFragment(d=h))})=>${exprs.length > 1 ? `{${exprs.join(";")}}` : exprs[0]})(${htmlStr})`;
 }
 function querySelectorOrLoad(selector) {
 	return `document.querySelector(${JSON.stringify(selector)})||l()`;
@@ -2345,10 +2533,14 @@ function drainClassFunctions($global, writeScope) {
 	for (let [id, fn, hostId] of pending) register(id, fn, scopeByHost[hostId] ||= writeScope(hostId));
 	pending.length = 0;
 }
+function swapReorders(state, reorders) {
+	let { writeReorders } = state;
+	return state.writeReorders = reorders, writeReorders;
+}
 function NOOP() {}
-exports.$global = $global, exports._assert_hoist = _assert_hoist, exports._attr = _attr, exports._attr_and = _attr_and, exports._attr_class = _attr_class, exports._attr_content = _attr_content, exports._attr_details_open = _attr_details_or_dialog_open, exports._attr_dialog_open = _attr_details_or_dialog_open, exports._attr_input_checked = _attr_input_checked, exports._attr_input_checkedValue = _attr_input_checkedValue, exports._attr_input_value = _attr_input_value, exports._attr_nonce = _attr_nonce, exports._attr_nullish = _attr_nullish, exports._attr_option_value = _attr_option_value, exports._attr_or = _attr_or, exports._attr_select_value = _attr_select_value, exports._attr_style = _attr_style, exports._attr_textarea_value = _attr_textarea_value, exports._attrs = _attrs, exports._attrs_content = _attrs_content, exports._attrs_partial = _attrs_partial, exports._attrs_partial_content = _attrs_partial_content, exports._attrs_select_value = _attrs_select_value, exports._attrs_textarea_value = _attrs_textarea_value, exports._await = _await, exports._content = _content, exports._content_resume = _content_resume, Object.defineProperty(exports, "_dynamic_tag", {
+exports.$global = $global, exports._assert_class_toggles = _assert_class_toggles, exports._assert_hoist = _assert_hoist, exports._attr = _attr, exports._attr_and = _attr_and, exports._attr_class = _attr_class, exports._attr_content = _attr_content, exports._attr_details_open = _attr_details_or_dialog_open, exports._attr_dialog_open = _attr_details_or_dialog_open, exports._attr_input_checked = _attr_input_checked, exports._attr_input_checkedValue = _attr_input_checkedValue, exports._attr_input_value = _attr_input_value, exports._attr_nonce = _attr_nonce, exports._attr_nullish = _attr_nullish, exports._attr_option_value = _attr_option_value, exports._attr_or = _attr_or, exports._attr_select_value = _attr_select_value, exports._attr_style = _attr_style, exports._attr_textarea_value = _attr_textarea_value, exports._attrs = _attrs, exports._attrs_content = _attrs_content, exports._attrs_partial = _attrs_partial, exports._attrs_partial_content = _attrs_partial_content, exports._attrs_select_value = _attrs_select_value, exports._attrs_textarea_value = _attrs_textarea_value, exports._await = _await, exports._content = _content, exports._content_resume = _content_resume, Object.defineProperty(exports, "_dynamic_tag", {
 	enumerable: !0,
 	get: function() {
 		return _dynamic_tag;
 	}
-}), exports._el = _el, exports._el_read_error = _el_read_error, exports._el_resume = _el_resume, exports._escape = _escape, exports._escape_comment = _escape_comment, exports._escape_script = _escape_script, exports._escape_style = _escape_style, exports._escape_style_value = _escape_style_value, exports._existing_scope = _existing_scope, exports._flush_head = _flush_head, exports._for_in = _for_in, exports._for_of = _for_of, exports._for_to = _for_to, exports._for_until = _for_until, exports._hoist = _hoist, exports._hoist_read_error = _hoist_read_error, exports._html = _html, exports._html_resume = _html_resume, exports._id = _id, exports._if = _if, exports._peek_scope_id = _peek_scope_id, exports._resume = _resume, exports._resume_branch = _resume_branch, exports._resume_locals = _resume_locals, exports._scope = writeScope, exports._scope_id = _scope_id, exports._scope_reason = _scope_reason, exports._scope_with_id = _scope_with_id, exports._script = _script, exports._serialize_guard = _serialize_guard, exports._serialize_if = _serialize_if, exports._set_serialize_reason = _set_serialize_reason, exports._show_end = _show_end, exports._show_start = _show_start, exports._style_html = _style_html, exports._subscribe = _subscribe, exports._template = _template, exports._text_resume = _text_resume, exports._textarea_value = _textarea_value, exports._to_text = _to_text, exports._trailers = _trailers, exports._try = _try, exports._unescaped = _unescaped, exports._var = _var, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = forIn, exports.forOf = forOf, exports.forTo = forTo, exports.forUntil = forUntil, exports.withLoadAssets = withLoadAssets, exports.withPageAssets = withPageAssets;
+}), exports._el = _el, exports._el_read_error = _el_read_error, exports._el_resume = _el_resume, exports._escape = _escape, exports._escape_comment = _escape_comment, exports._escape_script = _escape_script, exports._escape_style = _escape_style, exports._escape_style_value = _escape_style_value, exports._existing_scope = _existing_scope, exports._flush_head = _flush_head, exports._for_in = _for_in, exports._for_of = _for_of, exports._for_to = _for_to, exports._for_until = _for_until, exports._hoist = _hoist, exports._hoist_read_error = _hoist_read_error, exports._html = _html, exports._html_resume = _html_resume, exports._id = _id, exports._if = _if, exports._peek_scope_id = _peek_scope_id, exports._resume = _resume, exports._resume_branch = _resume_branch, exports._resume_locals = _resume_locals, exports._scope = writeScope, exports._scope_id = _scope_id, exports._scope_reason = _scope_reason, exports._scope_with_id = _scope_with_id, exports._script = _script, exports._set_scope_reason = _set_scope_reason, exports._show_end = _show_end, exports._show_start = _show_start, exports._style_html = _style_html, exports._subscribe = _subscribe, exports._template = _template, exports._text_resume = _text_resume, exports._textarea_value = _textarea_value, exports._to_text = _to_text, exports._trailers = _trailers, exports._try = _try, exports._unescaped = _unescaped, exports._var = _var, exports._write_guard = _write_guard, exports._write_if = _write_if, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = forIn, exports.forOf = forOf, exports.forTo = forTo, exports.forUntil = forUntil, exports.withLoadAssets = withLoadAssets, exports.withPageAssets = withPageAssets;