marko 6.4.1 → 6.4.3

package/dist/html.d.ts

@@ -1,5 +1,5 @@
 export { attrTag, attrTags } from "./common/attr-tag";
-export { _assert_hoist, _el_read_error, _hoist_read_error, } from "./common/errors";
+export { _assert_class_toggles, _assert_hoist, _el_read_error, _hoist_read_error, } from "./common/errors";
 export { _flush_head, withLoadAssets, withPageAssets } from "./html/assets";
 export { _attr, _attr_and, _attr_class, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _attrs_select_value, _attrs_textarea_value, _style_html, _textarea_value, } from "./html/attrs";
 export { compat } from "./html/compat";

package/dist/html.js

@@ -268,7 +268,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	} else {
 		let chunk = getChunk(), beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0, render = () => {
 			if (renderer) try {
-				return _set_scope_reason(shouldResume && inputOrArgs !== void 0 ? CLIENT_ALL : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
+				return _set_scope_reason(shouldResume ? CLIENT_ALL : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
 					content
 				} : inputOrArgs);
@@ -277,7 +277,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			}
 			else if (content) return content();
 		};
-		result = shouldResume ? withBranchId(branchId, render) : render(), rendered = _peek_scope_id() !== branchId, beforeBranch !== void 0 && (applyBranchStart(chunk, beforeBranch, rendered), _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : ""))));
+		result = shouldResume ? withBranchId(branchId, render) : render(), rendered = _peek_scope_id() !== branchId, beforeBranch !== void 0 && (applyBranchStart(chunk, beforeBranch, rendered), _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : ""))), renderer && _existing_scope(branchId));
 	}
 	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: rendererKey(renderer) }) : _scope_id(), result;
 }, patchDynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (patch) => {
@@ -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.aborted) throw boundary.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,6 +379,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 				let scopeId = _peek_scope_id();
 				writeScope(scopeId, { m5c: component.id }), _script(scopeId, SET_SCOPE_REGISTER_ID);
 			}
+		}), head.render(() => {
 			_set_scope_reason(willRerender ? CLIENT_ALL : 0);
 			try {
 				renderer(normalizedInput);
@@ -368,7 +392,16 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			});
 			classAPIOut.onLast((next) => {
 				(boundary.onNext = () => {
-					boundary.aborted ? (asyncOut.error(boundary.reason), boundary.onNext = NOOP) : boundary.count || (boundary.onNext = NOOP, head = head.consume(boundary), 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,6 +508,13 @@ function forUntil(until, from, step, cb) {
 }
 //#endregion
 //#region src/common/opt.ts
+function reduce(opt, cb, acc) {
+	if (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;
 }
@@ -546,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, {
@@ -1486,6 +1535,15 @@ function _html(html) {
 function writeScript(script) {
 	$chunk.writeScript(script);
 }
+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);
 }
@@ -1530,7 +1588,12 @@ function _resume_branch(scopeId) {
 }
 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, {
+	if (render) try {
+		_set_scope_reason(shouldResume ? CLIENT_ALL : 0), shouldResume ? withBranchId(branchId, render) : render();
+	} finally {
+		_set_scope_reason(void 0);
+	}
+	_peek_scope_id() === branchId ? _scope_id() : shouldResume && writeScope(scopeId, {
 		["A" + nodeAccessor]: writeScope(branchId, {}),
 		["D" + nodeAccessor]: rendererKey(render)
 	});
@@ -1635,8 +1698,8 @@ function scopeWithId(state, scopeId) {
 }
 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, markerGuard) : 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;
 }
@@ -1713,7 +1776,9 @@ function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBran
 	};
 }
 function tryBoundary(content, catchContent, branchId, renderers) {
-	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state, void 0, boundary), body = chunk.fork(catchBoundary, null), bodyEnd = body.render(() => withBranchId(branchId, content));
+	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;
@@ -1733,10 +1798,10 @@ function tryBoundary(content, catchContent, branchId, renderers) {
 					return;
 				}
 				let streamed = !chunk.catchRange, catchChunk = chunk.fork(boundary, null);
-				chunk.catchRange = null;
+				chunk.catchRange = null, renderersAtSettle || catchChunk.render(clearTryRenderers, branchId);
 				let inOrder = catchChunk === catchChunk.render(catchContent, catchBoundary.reason);
 				if (boundary.aborted) return;
-				if (bodyEnd.consumed) catchChunk.reorderId = reorderId, state.reorder(catchChunk);
+				if ((bodyEnd.consumed || !inOrder) && (catchChunk.reorderBranch = 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);
@@ -1749,6 +1814,18 @@ function tryBoundary(content, catchContent, branchId, renderers) {
 		}
 	}, 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,
@@ -1833,15 +1910,17 @@ var State = class {
 	parent;
 	aborted = !1;
 	reason;
+	subscribed;
 	pendingReorders;
 	children;
+	withinCatch = !1;
 	constructor(state, signal, parent) {
-		this.state = state, this.parent = parent, parent ? parent.aborted ? this.abort(parent.reason) : (parent.children ||= []).push(this) : 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.pendingReorders) {
+		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;
 		}
@@ -1868,7 +1947,9 @@ var State = class {
 	async = !1;
 	consumed = !1;
 	reorderId = null;
+	reorderBranch = 0;
 	deferredReady = null;
+	heldEffects = null;
 	deferredReorder = null;
 	catchRange = null;
 	placeholder = null;
@@ -1886,7 +1967,7 @@ 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);
@@ -1894,6 +1975,10 @@ var State = class {
 	append(chunk) {
 		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;
 		return this.deferredReady = null, deferredReady;
@@ -1934,12 +2019,12 @@ var State = class {
 		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 ? branchId + "" : state.nextReorderId();
+		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)), end.writeEffect(branchId, "_f")), this.writeHTML(state.mark("!", reorderId)), this.deferredReorder = body, !1;
+		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;
@@ -1954,9 +2039,9 @@ var State = class {
 	}
 	consume(boundary) {
 		this.renderPlaceholders(boundary);
-		let cur = this, html = "", effects = "", scripts = "", lastEffect = "", deferredReady;
-		for (; cur.next && !cur.async;) cur.markCatchRange(), cur.queueDeferredReorder(), 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.html = html + cur.html, cur.effects = concatEffects(effects, cur.effects), cur.scripts = concatScripts(scripts, cur.scripts), cur.lastEffect ||= lastEffect, cur;
+		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;
@@ -1990,32 +2075,37 @@ 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.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) {
 			for (let reorderedChunk of state.writeReorders) {
 				needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),\"#\"==n?(t[a]=l).i++:\"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 } = reorderedChunk, readyReservations = [], reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk.boundary.aborted ? null : reorderedChunk;
+				let { reorderId, reorderBranch } = reorderedChunk, rootBranch = reorderBranch || +reorderId, 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);
-					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()), (cur.boundary.pendingReorders ||= /* @__PURE__ */ new Set()).add(cur), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), cur = next;
+					if (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());
+						let holeBranch = cur.context?.[kBranchId];
+						cur.reorderBranch = holeBranch > rootBranch ? holeBranch : reorderBranch, (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 + ">" + (reorderBranch ? state.mark("*", reorderBranch + "") : "") + reorderHTML + "</t>";
 			}
 			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;
@@ -2031,6 +2121,33 @@ function renderReorderPlaceholders(reorder, reorders) {
 	}
 	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) {
@@ -2338,42 +2455,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 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 writeTriggerScript(id, html, triggers) {
+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) {
@@ -2383,7 +2524,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()`;
@@ -2402,8 +2543,12 @@ 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;