marko 6.3.47 → 6.3.49

package/dist/debug/dom.mjs

@@ -1,4 +1,4 @@
-import { $ as _attrs_script, $t as $signal, A as _attr_input_value_script, At as _for_closure, B as _attr, Bt as _return, C as _attr_input_checkedValue_script, D as _attr_input_value_attribute_default, Dn as Global, Dt as _closure_get, E as _attr_input_value, Et as _closure, F as _controllable_open, Ft as _id, G as _attr_nonce, Gt as _assert_init, H as _attr_class_item, Ht as _script, I as _controllable_select, It as _if_closure, J as _attr_style_items, Jt as removeAndDestroyBranch, K as _attr_style, Kt as destroyBranch, L as _controllable_textarea, Lt as _let, M as _attr_select_value_default, Mt as _global_read, N as _attr_select_value_script, Nn as StartNode, Nt as _hoist, O as _attr_input_value_default, On as Load, Ot as _const, P as _controllable_input, Pn as TagVariable, Pt as _hoist_resume, Q as _attrs_partial_content, Rt as _let_change, S as _attr_input_checkedValue_default, St as readyFailed, T as _attr_input_checked_script, Tn as EndNode, Tt as _child_setup, U as _attr_class_items, Ut as _var, V as _attr_class, Vt as _return_change, W as _attr_content, Wt as _var_change, X as _attrs_content, Xt as _on, Y as _attrs, Yt as syncGen, Z as _attrs_partial, _ as _attr_details_or_dialog_open, _n as Clone, _t as _var_resume, a as _for_in, an as queueAsyncRender, at as _text_content, b as _attr_input_checked, bn as Setup, bt as initEmbedded, c as _for_until, cn as runEffects, ct as toInsertNode, d as _show, dn as forOf, dt as _content_resume, en as $signalReset, et as _html, f as _try, fn as forTo, ft as createAndSetupBranch, g as renderCatch, gn as _call, gt as _resume, h as patchDynamicTag, hn as _hoist_read_error, ht as _el, i as _dynamic_tag_content, in as prepareEffects, it as _text, j as _attr_select_value, jt as _for_selector, k as _attr_input_value_dynamic_default, kt as _el_read, l as _if, ln as runId, lt as _content, mn as _assert_hoist, mt as setupBranch, n as _await_promise, nt as _style_rule_item, o as _for_of, on as queueEffect, ot as _to_text, p as addAwaitCounter, pn as forUntil, pt as createBranch, q as _attr_style_item, qt as insertBranchBefore, r as _dynamic_tag, rt as _style_shell, s as _for_to, sn as run, st as insertChildNodes, t as _await_content, tt as _lifecycle, u as _resume_dynamic_tag, un as forIn, ut as _content_closures, v as _attr_details_or_dialog_open_default, vn as Owner, vt as getRegisteredWithScope, w as _attr_input_checked_default, wt as withLazy, x as _attr_input_checkedValue, xt as ready, y as _attr_details_or_dialog_open_script, yn as Params, yt as init, zt as _or } from "./dom-DyBeisho.mjs";
+import { $ as _attrs_script, $t as $signal, A as _attr_input_value_script, At as _for_closure, B as _attr, Bt as _return, C as _attr_input_checkedValue_script, D as _attr_input_value_attribute_default, Dt as _closure_get, E as _attr_input_value, En as EndNode, Et as _closure, F as _controllable_open, Fn as TagVariable, Ft as _id, G as _attr_nonce, Gt as _assert_init, H as _attr_class_item, Ht as _script, I as _controllable_select, It as _if_closure, J as _attr_style_items, Jt as removeAndDestroyBranch, K as _attr_style, Kt as destroyBranch, L as _controllable_textarea, Lt as _let, M as _attr_select_value_default, Mt as _global_read, N as _attr_select_value_script, Nt as _hoist, O as _attr_input_value_default, On as Global, Ot as _const, P as _controllable_input, Pn as StartNode, Pt as _hoist_resume, Q as _attrs_partial_content, Rt as _let_change, S as _attr_input_checkedValue_default, St as readyFailed, T as _attr_input_checked_script, Tt as _child_setup, U as _attr_class_items, Ut as _var, V as _attr_class, Vt as _return_change, W as _attr_content, Wt as _var_change, X as _attrs_content, Xt as _on, Y as _attrs, Yt as syncGen, Z as _attrs_partial, _ as _attr_details_or_dialog_open, _n as _call, _t as _var_resume, a as _for_in, an as queueAsyncRender, at as _text_content, b as _attr_input_checked, bn as Params, bt as initEmbedded, c as _for_until, cn as run, ct as toInsertNode, d as _show, dn as forIn, dt as _content_resume, en as $signalReset, et as _html, f as _try, fn as forOf, ft as createAndSetupBranch, g as renderCatch, gn as _hoist_read_error, gt as _resume, h as patchDynamicTag, hn as _assert_hoist, ht as _el, i as _dynamic_tag_content, in as prepareEffects, it as _text, j as _attr_select_value, jt as _for_selector, k as _attr_input_value_dynamic_default, kn as Load, kt as _el_read, l as _if, ln as runEffects, lt as _content, mn as forUntil, mt as setupBranch, n as _await_promise, nt as _style_rule_item, o as _for_of, on as queueEffect, ot as _to_text, p as addAwaitCounter, pn as forTo, pt as createBranch, q as _attr_style_item, qt as insertBranchBefore, r as _dynamic_tag, rt as _style_shell, s as _for_to, sn as queueRender, st as insertChildNodes, t as _await_content, tt as _lifecycle, u as _resume_dynamic_tag, un as runId, ut as _content_closures, v as _attr_details_or_dialog_open_default, vn as Clone, vt as getRegisteredWithScope, w as _attr_input_checked_default, wt as withLazy, x as _attr_input_checkedValue, xn as Setup, xt as ready, y as _attr_details_or_dialog_open_script, yn as Owner, yt as init, zt as _or } from "./dom-C55iHvof.mjs";
 //#region src/common/attr-tag.ts
 const empty = [];
 const rest = Symbol("Attribute Tag");
@@ -20,10 +20,6 @@ function* attrTagIterator() {
 	yield* this[rest];
 }
 //#endregion
-//#region src/common/constants/load-signal-value.debug.ts
-const Value = "value";
-const Signal = "signal";
-//#endregion
 //#region src/common/compat-meta.ts
 const SET_SCOPE_REGISTER_ID = "$compat_setScope";
 const RENDER_BODY_ID = "$compat_renderBody";
@@ -211,9 +207,10 @@ const _load_template = /*@__PURE__*/ withLazy((id, load) => {
 const _load_setup = /*@__PURE__*/ withLazy((nodeAccessor, childScopeAccessor, load) => {
 	let pending;
 	let renderer;
+	const insertCached = (child, marker) => insertLoaded(renderer, child, marker);
 	return (owner) => {
 		const child = owner[childScopeAccessor];
-		if (renderer) insertLoaded(renderer, child, owner[nodeAccessor]);
+		if (renderer) queueRender(child, insertCached, -1, owner[nodeAccessor]);
 		else {
 			const awaitCounter = addAwaitCounter(owner);
 			child[Load] ||= /* @__PURE__ */ new Map();
@@ -225,27 +222,26 @@ const _load_setup = /*@__PURE__*/ withLazy((nodeAccessor, childScopeAccessor, lo
 	};
 });
 function insertLoaded(renderer, branch, marker, awaitCounter) {
-	const parent = marker.parentNode, values = branch[Load], insert = () => {
+	const parent = marker.parentNode, values = branch[Load], clone = () => {
+		syncGen(branch);
+		renderer[Clone](branch, parent.namespaceURI);
+		branch[Load] = 0;
+	}, insert = () => {
 		insertBranchBefore(branch, parent, marker);
 		marker.remove();
 		awaitCounter?.c();
 	};
 	let remaining;
-	syncGen(branch);
-	renderer[Clone](branch, parent.namespaceURI);
-	branch[Load] = 0;
 	if (remaining = values?.size) {
 		const fail = loadFailed(branch, awaitCounter);
-		for (const [promise, entry] of values) promise.then((signal) => {
-			entry[Signal] = signal;
-			if (!--remaining) queueAsyncRender(branch, (branch) => {
-				syncGen(branch);
-				renderer[Setup]?.(branch);
-				values.forEach((e) => e[Signal]._(branch, e[Value]));
-				insert();
-			});
-		}, (error) => remaining > 0 && (remaining = 0, fail(error)));
+		values.forEach(([, apply], promise) => promise.then((mod) => (apply._ = mod._) && !--remaining && queueAsyncRender(branch, (branch) => {
+			clone();
+			renderer["setup"]?.(branch);
+			values.forEach(([value, apply]) => apply(branch, value));
+			insert();
+		}), (error) => remaining > 0 && (remaining = 0, fail(error))));
 	} else {
+		clone();
 		setupBranch(renderer, branch);
 		insert();
 	}
@@ -259,13 +255,13 @@ function loadFailed(scope, awaitCounter) {
 }
 const _load_signal = /*@__PURE__*/ withLazy((load) => {
 	let pending;
-	let signal;
-	return (scope, value) => {
+	const apply = (scope, value) => {
 		pending ||= load();
-		if (scope["#Load"] || !("#Load" in scope) && scope["#Gen"] === runId) (scope[Load] ||= /* @__PURE__ */ new Map()).set(pending, { [Value]: value });
-		else if (signal) signal(scope, value);
-		else pending.then((mod) => queueAsyncRender(scope, signal = mod._, value), () => 0);
+		if (scope["#Load"] || !("#Load" in scope) && scope["#Gen"] === runId) (scope[Load] ||= /* @__PURE__ */ new Map()).set(pending, [value, apply]);
+		else if (apply._) apply._(scope, value);
+		else pending.then((mod) => queueAsyncRender(scope, apply._ = mod._, value), () => 0);
 	};
+	return apply;
 });
 function _load_visible_trigger(selector, options) {
 	let pending;

package/dist/debug/html.js

@@ -28,7 +28,6 @@ const ControlledHandler = "ControlledHandler:";
 const ControlledType = "ControlledType:";
 const ControlledValue = "ControlledValue:";
 const EventAttributes = "EventAttributes:";
-const BranchAccessor = "#BranchAccessor";
 const CatchContent = "#CatchContent";
 const ClosestBranchId = "#ClosestBranchId";
 const LoopKey = "#LoopKey";
@@ -1850,11 +1849,16 @@ const WALKER_RUNTIME_CODE = `((runtimeId) => (self[runtimeId] ||= (
     x() {},
     w(node, op, id) {
       while ((node = walker.nextNode())) {
+        // Only reorder markers ("#", "!") are ever looked up, so only they are
+        // kept: the lookup lives as long as the page, and every node marker
+        // would otherwise stay referenced in it after resume consumed it.
         doc.x(
           (op =
             (op = node.data) &&
             !op.indexOf(prefix) &&
-            ((lookup[(id = op.slice(prefixLen + 1))] = node), op[prefixLen])),
+            ((id = op.slice(prefixLen + 1)),
+            (op = op[prefixLen]) > "#" || (lookup[id] = node),
+            op)),
           id,
           node,
         );
@@ -1898,6 +1902,7 @@ const REORDER_RUNTIME_CODE = `((runtime) => {
         (placeholderRoot = placeholders[id] =
           {
             i: runtime.l[id] ? 1 : 2,
+            r: id,
             // Resume may still walk markers inside the dropped placeholder, so
             // park it in any detached parent (a bare <t> clone is the cheapest).
             c(start = runtime.l["^" + id], removed = node.cloneNode()) {
@@ -1913,6 +1918,9 @@ const REORDER_RUNTIME_CODE = `((runtime) => {
               replace(id, node);
             },
           });
+      // Opens the chunk's visits for resume to parent to the root's branch; the
+      // walk that this chunk's own script triggers closes it.
+      runtime.v.push({ data: runtime.i + "*" + placeholder.r });
       // repurpose "op" for callbacks ...carefully
       if ((op = runtime.j[id])) {
         placeholderCb = placeholder.c;
@@ -1983,8 +1991,8 @@ const kIsAsync = Symbol("Is Async");
 function isInResumedBranch() {
 	return $chunk?.context?.[kBranchId] !== void 0;
 }
-function withBranchId(branchId, cb) {
-	return withContext(kBranchId, branchId, cb);
+function withBranchId(branchId, cb, cbValue) {
+	return withContext(kBranchId, branchId, cb, cbValue);
 }
 function withIsAsync(cb, value) {
 	return withContext(kIsAsync, true, cb, value);
@@ -1995,8 +2003,8 @@ function _html(html) {
 function writeScript(script) {
 	$chunk.writeScript(script);
 }
-function _script(scopeId, registryId) {
-	if ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) _resume_branch(scopeId);
+function _script(scopeId, registryId, serializeMarker) {
+	if (serializeMarker === 0 && ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync])) _resume_branch(scopeId);
 	$chunk.boundary.state.needsMainRuntime = true;
 	$chunk.writeEffect(scopeId, registryId);
 }
@@ -2186,6 +2194,7 @@ let writeScope = (scopeId, partialScope) => {
 	const scope = scopeWithId(state, scopeId);
 	const pending = target.writeScopes[scopeId];
 	state.needsMainRuntime = true;
+	countResumeWrite($chunk.boundary);
 	Object.assign(scope, partialScope);
 	if (pending && pending !== partialScope) Object.assign(pending, partialScope);
 	else target.writeScopes[scopeId] = partialScope;
@@ -2257,7 +2266,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 		if (resumeMarker) {
 			const branchId = _peek_scope_id();
 			$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-			content(promise);
+			withBranchId(branchId, content, promise);
 			$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 		} else content(promise);
 		return;
@@ -2279,7 +2288,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 					if (resumeMarker) {
 						const branchId = _peek_scope_id();
 						$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-						withIsAsync(content, value);
+						withBranchId(branchId, () => withIsAsync(content, value));
 						$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 					} else withIsAsync(content, value);
 				});
@@ -2296,16 +2305,19 @@ function _try(scopeId, accessor, content, input) {
 	const placeholderContent = normalizeDynamicRenderer(input.placeholder);
 	const placeholderBranchId = placeholderContent ? _scope_id() : 0;
 	const branchId = _peek_scope_id();
-	$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-	if (catchContent !== void 0) tryCatch(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent || (() => {}));
-	else if (placeholderContent) tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId);
-	else content();
-	writeScope(branchId, {
-		[BranchAccessor]: accessor,
-		[CatchContent]: catchContent,
-		[PlaceholderContent]: placeholderContent
-	});
-	$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
+	const chunk = $chunk;
+	const { boundary } = chunk;
+	const { state } = boundary;
+	const { resumeWrites } = boundary;
+	const beforeBranch = deferBranchStart(chunk);
+	let renderersAtSettle = false;
+	if (catchContent !== void 0 || placeholderContent) renderersAtSettle = tryBoundary(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent, placeholderContent, branchId);
+	else withBranchId(branchId, content);
+	const rendered = chunk !== $chunk || boundary.resumeWrites !== resumeWrites;
+	applyBranchStart(chunk, beforeBranch, rendered);
+	if (!rendered) return;
+	if (!renderersAtSettle) writeTryRenderers(branchId, catchContent, placeholderContent);
+	$chunk.writeHTML(state.mark("]", scopeId + " " + accessor + " " + branchId));
 }
 function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBranchId) {
 	const chunk = $chunk;
@@ -2324,31 +2336,39 @@ function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBran
 		placeholderBranchId
 	};
 }
-function tryCatch(content, catchContent) {
+function tryBoundary(content, catchContent, placeholderContent, branchId) {
 	const chunk = $chunk;
 	const { boundary } = chunk;
 	const { state } = boundary;
 	const catchBoundary = new Boundary(state, boundary.signal, boundary);
 	const body = chunk.fork(catchBoundary, null);
-	const bodyEnd = body.render(content);
+	const bodyEnd = withBranchId(branchId, () => body.render(content));
 	if (catchBoundary.signal.aborted) {
-		catchContent(catchBoundary.signal.reason);
-		return;
+		if (catchContent === void 0) boundary.abort(catchBoundary.signal.reason);
+		else if (catchContent) catchContent(catchBoundary.signal.reason);
+		return false;
 	}
 	if (body === bodyEnd) {
 		chunk.append(body);
-		return;
+		return false;
 	}
-	const reorderId = state.nextReorderId();
-	const endMarker = state.mark("!", reorderId);
-	const bodyNext = bodyEnd.next = $chunk = body.fork(boundary, chunk.next);
+	const renderersAtSettle = !catchBoundary.resumeWrites;
+	const bodyNext = bodyEnd.next = $chunk = chunk.fork(boundary, chunk.next);
 	chunk.next = body;
-	chunk.writeHTML(state.mark("!^", reorderId));
-	bodyEnd.writeHTML(endMarker);
 	boundary.startAsync();
+	const reorderId = catchContent === void 0 ? "" : state.nextReorderId();
+	const endMarker = reorderId && state.mark("!", reorderId);
+	if (reorderId) {
+		chunk.writeHTML(state.mark("!^", reorderId));
+		bodyEnd.writeHTML(endMarker);
+	}
 	catchBoundary.onNext = () => {
 		if (boundary.signal.aborted) return;
 		if (catchBoundary.signal.aborted) {
+			if (!reorderId) {
+				boundary.abort(catchBoundary.signal.reason);
+				return;
+			}
 			if (!bodyEnd.consumed) {
 				let cur = body;
 				let writeMarker = true;
@@ -2368,15 +2388,28 @@ function tryCatch(content, catchContent) {
 				} while (cur !== bodyNext);
 			}
 			const catchChunk = chunk.fork(boundary, null);
+			const { resumeWrites } = boundary;
 			catchChunk.reorderId = reorderId;
-			catchChunk.render(catchContent, catchBoundary.signal.reason);
+			if ((catchChunk.render(catchContent || NOOP$2, catchBoundary.signal.reason) !== catchChunk || boundary.resumeWrites !== resumeWrites) && renderersAtSettle) catchChunk.render(() => writeTryRenderers(branchId, catchContent, placeholderContent));
 			state.reorder(catchChunk);
 			boundary.endAsync();
-		} else if (!catchBoundary.count) boundary.endAsync();
-		else boundary.onNext();
+		} else if (!catchBoundary.count) {
+			if (renderersAtSettle && catchBoundary.resumeWrites) bodyEnd.render(() => writeTryRenderers(branchId, catchContent, placeholderContent));
+			boundary.endAsync();
+		} else boundary.onNext();
 	};
+	return renderersAtSettle;
+}
+function writeTryRenderers(branchId, catchContent, placeholderContent) {
+	writeScope(branchId, {
+		[CatchContent]: catchContent,
+		[PlaceholderContent]: placeholderContent
+	});
 }
 const NOOP$2 = () => {};
+function countResumeWrite(boundary) {
+	for (; boundary; boundary = boundary.parent) boundary.resumeWrites++;
+}
 var State = class {
 	tagId = 1;
 	scopeId = 1;
@@ -2444,6 +2477,7 @@ var State = class {
 var Boundary = class extends AbortController {
 	onNext = NOOP$2;
 	count = 0;
+	resumeWrites = 0;
 	state;
 	parent;
 	constructor(state, signal, parent) {
@@ -2502,6 +2536,7 @@ var Chunk = class Chunk {
 		this.html += html;
 	}
 	writeEffect(scopeId, registryId) {
+		countResumeWrite(this.boundary);
 		if (this.lastEffect === registryId) this.effects += " " + scopeId;
 		else {
 			this.lastEffect = registryId;
@@ -2660,6 +2695,8 @@ var Chunk = class Chunk {
 			needsWalk = true;
 			state.resumes = state.resumes ? state.resumes + ",\"" + effects + "\"" : "\"" + effects + "\"";
 		}
+		let reordered = "";
+		let needsResumeArray = false;
 		if (state.writeReorders) {
 			let carried = null;
 			for (const reorderedChunk of state.writeReorders) {
@@ -2703,14 +2740,11 @@ var Chunk = class Chunk {
 					else break;
 				}
 				if (reorderEffects) {
-					if (!state.hasWrittenResume) {
-						state.hasWrittenResume = true;
-						scripts = concatScripts(scripts, runtimePrefix + ".r=[]");
-					}
+					needsResumeArray = true;
 					reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")");
 				}
-				for (const reservation of readyReservations) scripts = concatScripts(scripts, reservation);
-				scripts = concatScripts(scripts, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
+				for (const reservation of readyReservations) reordered = concatScripts(reordered, reservation);
+				reordered = concatScripts(reordered, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
 				html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
 			state.writeReorders = carried;
@@ -2721,6 +2755,11 @@ var Chunk = class Chunk {
 			state.hasWrittenResume = true;
 			scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]");
 		}
+		else if (needsResumeArray && !state.hasWrittenResume) {
+			state.hasWrittenResume = true;
+			scripts = concatScripts(scripts, runtimePrefix + ".r=[]");
+		}
+		scripts = concatScripts(scripts, reordered);
 		if (needsWalk) scripts = concatScripts(scripts, runtimePrefix + ".w()");
 		this.html = html;
 		this.scripts = scripts;

package/dist/debug/html.mjs

@@ -26,7 +26,6 @@ const ControlledHandler = "ControlledHandler:";
 const ControlledType = "ControlledType:";
 const ControlledValue = "ControlledValue:";
 const EventAttributes = "EventAttributes:";
-const BranchAccessor = "#BranchAccessor";
 const CatchContent = "#CatchContent";
 const ClosestBranchId = "#ClosestBranchId";
 const LoopKey = "#LoopKey";
@@ -1848,11 +1847,16 @@ const WALKER_RUNTIME_CODE = `((runtimeId) => (self[runtimeId] ||= (
     x() {},
     w(node, op, id) {
       while ((node = walker.nextNode())) {
+        // Only reorder markers ("#", "!") are ever looked up, so only they are
+        // kept: the lookup lives as long as the page, and every node marker
+        // would otherwise stay referenced in it after resume consumed it.
         doc.x(
           (op =
             (op = node.data) &&
             !op.indexOf(prefix) &&
-            ((lookup[(id = op.slice(prefixLen + 1))] = node), op[prefixLen])),
+            ((id = op.slice(prefixLen + 1)),
+            (op = op[prefixLen]) > "#" || (lookup[id] = node),
+            op)),
           id,
           node,
         );
@@ -1896,6 +1900,7 @@ const REORDER_RUNTIME_CODE = `((runtime) => {
         (placeholderRoot = placeholders[id] =
           {
             i: runtime.l[id] ? 1 : 2,
+            r: id,
             // Resume may still walk markers inside the dropped placeholder, so
             // park it in any detached parent (a bare <t> clone is the cheapest).
             c(start = runtime.l["^" + id], removed = node.cloneNode()) {
@@ -1911,6 +1916,9 @@ const REORDER_RUNTIME_CODE = `((runtime) => {
               replace(id, node);
             },
           });
+      // Opens the chunk's visits for resume to parent to the root's branch; the
+      // walk that this chunk's own script triggers closes it.
+      runtime.v.push({ data: runtime.i + "*" + placeholder.r });
       // repurpose "op" for callbacks ...carefully
       if ((op = runtime.j[id])) {
         placeholderCb = placeholder.c;
@@ -1981,8 +1989,8 @@ const kIsAsync = Symbol("Is Async");
 function isInResumedBranch() {
 	return $chunk?.context?.[kBranchId] !== void 0;
 }
-function withBranchId(branchId, cb) {
-	return withContext(kBranchId, branchId, cb);
+function withBranchId(branchId, cb, cbValue) {
+	return withContext(kBranchId, branchId, cb, cbValue);
 }
 function withIsAsync(cb, value) {
 	return withContext(kIsAsync, true, cb, value);
@@ -1993,8 +2001,8 @@ function _html(html) {
 function writeScript(script) {
 	$chunk.writeScript(script);
 }
-function _script(scopeId, registryId) {
-	if ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) _resume_branch(scopeId);
+function _script(scopeId, registryId, serializeMarker) {
+	if (serializeMarker === 0 && ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync])) _resume_branch(scopeId);
 	$chunk.boundary.state.needsMainRuntime = true;
 	$chunk.writeEffect(scopeId, registryId);
 }
@@ -2184,6 +2192,7 @@ let writeScope = (scopeId, partialScope) => {
 	const scope = scopeWithId(state, scopeId);
 	const pending = target.writeScopes[scopeId];
 	state.needsMainRuntime = true;
+	countResumeWrite($chunk.boundary);
 	Object.assign(scope, partialScope);
 	if (pending && pending !== partialScope) Object.assign(pending, partialScope);
 	else target.writeScopes[scopeId] = partialScope;
@@ -2255,7 +2264,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 		if (resumeMarker) {
 			const branchId = _peek_scope_id();
 			$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-			content(promise);
+			withBranchId(branchId, content, promise);
 			$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 		} else content(promise);
 		return;
@@ -2277,7 +2286,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 					if (resumeMarker) {
 						const branchId = _peek_scope_id();
 						$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-						withIsAsync(content, value);
+						withBranchId(branchId, () => withIsAsync(content, value));
 						$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 					} else withIsAsync(content, value);
 				});
@@ -2294,16 +2303,19 @@ function _try(scopeId, accessor, content, input) {
 	const placeholderContent = normalizeDynamicRenderer(input.placeholder);
 	const placeholderBranchId = placeholderContent ? _scope_id() : 0;
 	const branchId = _peek_scope_id();
-	$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-	if (catchContent !== void 0) tryCatch(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent || (() => {}));
-	else if (placeholderContent) tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId);
-	else content();
-	writeScope(branchId, {
-		[BranchAccessor]: accessor,
-		[CatchContent]: catchContent,
-		[PlaceholderContent]: placeholderContent
-	});
-	$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
+	const chunk = $chunk;
+	const { boundary } = chunk;
+	const { state } = boundary;
+	const { resumeWrites } = boundary;
+	const beforeBranch = deferBranchStart(chunk);
+	let renderersAtSettle = false;
+	if (catchContent !== void 0 || placeholderContent) renderersAtSettle = tryBoundary(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent, placeholderContent, branchId);
+	else withBranchId(branchId, content);
+	const rendered = chunk !== $chunk || boundary.resumeWrites !== resumeWrites;
+	applyBranchStart(chunk, beforeBranch, rendered);
+	if (!rendered) return;
+	if (!renderersAtSettle) writeTryRenderers(branchId, catchContent, placeholderContent);
+	$chunk.writeHTML(state.mark("]", scopeId + " " + accessor + " " + branchId));
 }
 function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBranchId) {
 	const chunk = $chunk;
@@ -2322,31 +2334,39 @@ function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBran
 		placeholderBranchId
 	};
 }
-function tryCatch(content, catchContent) {
+function tryBoundary(content, catchContent, placeholderContent, branchId) {
 	const chunk = $chunk;
 	const { boundary } = chunk;
 	const { state } = boundary;
 	const catchBoundary = new Boundary(state, boundary.signal, boundary);
 	const body = chunk.fork(catchBoundary, null);
-	const bodyEnd = body.render(content);
+	const bodyEnd = withBranchId(branchId, () => body.render(content));
 	if (catchBoundary.signal.aborted) {
-		catchContent(catchBoundary.signal.reason);
-		return;
+		if (catchContent === void 0) boundary.abort(catchBoundary.signal.reason);
+		else if (catchContent) catchContent(catchBoundary.signal.reason);
+		return false;
 	}
 	if (body === bodyEnd) {
 		chunk.append(body);
-		return;
+		return false;
 	}
-	const reorderId = state.nextReorderId();
-	const endMarker = state.mark("!", reorderId);
-	const bodyNext = bodyEnd.next = $chunk = body.fork(boundary, chunk.next);
+	const renderersAtSettle = !catchBoundary.resumeWrites;
+	const bodyNext = bodyEnd.next = $chunk = chunk.fork(boundary, chunk.next);
 	chunk.next = body;
-	chunk.writeHTML(state.mark("!^", reorderId));
-	bodyEnd.writeHTML(endMarker);
 	boundary.startAsync();
+	const reorderId = catchContent === void 0 ? "" : state.nextReorderId();
+	const endMarker = reorderId && state.mark("!", reorderId);
+	if (reorderId) {
+		chunk.writeHTML(state.mark("!^", reorderId));
+		bodyEnd.writeHTML(endMarker);
+	}
 	catchBoundary.onNext = () => {
 		if (boundary.signal.aborted) return;
 		if (catchBoundary.signal.aborted) {
+			if (!reorderId) {
+				boundary.abort(catchBoundary.signal.reason);
+				return;
+			}
 			if (!bodyEnd.consumed) {
 				let cur = body;
 				let writeMarker = true;
@@ -2366,15 +2386,28 @@ function tryCatch(content, catchContent) {
 				} while (cur !== bodyNext);
 			}
 			const catchChunk = chunk.fork(boundary, null);
+			const { resumeWrites } = boundary;
 			catchChunk.reorderId = reorderId;
-			catchChunk.render(catchContent, catchBoundary.signal.reason);
+			if ((catchChunk.render(catchContent || NOOP$2, catchBoundary.signal.reason) !== catchChunk || boundary.resumeWrites !== resumeWrites) && renderersAtSettle) catchChunk.render(() => writeTryRenderers(branchId, catchContent, placeholderContent));
 			state.reorder(catchChunk);
 			boundary.endAsync();
-		} else if (!catchBoundary.count) boundary.endAsync();
-		else boundary.onNext();
+		} else if (!catchBoundary.count) {
+			if (renderersAtSettle && catchBoundary.resumeWrites) bodyEnd.render(() => writeTryRenderers(branchId, catchContent, placeholderContent));
+			boundary.endAsync();
+		} else boundary.onNext();
 	};
+	return renderersAtSettle;
+}
+function writeTryRenderers(branchId, catchContent, placeholderContent) {
+	writeScope(branchId, {
+		[CatchContent]: catchContent,
+		[PlaceholderContent]: placeholderContent
+	});
 }
 const NOOP$2 = () => {};
+function countResumeWrite(boundary) {
+	for (; boundary; boundary = boundary.parent) boundary.resumeWrites++;
+}
 var State = class {
 	tagId = 1;
 	scopeId = 1;
@@ -2442,6 +2475,7 @@ var State = class {
 var Boundary = class extends AbortController {
 	onNext = NOOP$2;
 	count = 0;
+	resumeWrites = 0;
 	state;
 	parent;
 	constructor(state, signal, parent) {
@@ -2500,6 +2534,7 @@ var Chunk = class Chunk {
 		this.html += html;
 	}
 	writeEffect(scopeId, registryId) {
+		countResumeWrite(this.boundary);
 		if (this.lastEffect === registryId) this.effects += " " + scopeId;
 		else {
 			this.lastEffect = registryId;
@@ -2658,6 +2693,8 @@ var Chunk = class Chunk {
 			needsWalk = true;
 			state.resumes = state.resumes ? state.resumes + ",\"" + effects + "\"" : "\"" + effects + "\"";
 		}
+		let reordered = "";
+		let needsResumeArray = false;
 		if (state.writeReorders) {
 			let carried = null;
 			for (const reorderedChunk of state.writeReorders) {
@@ -2701,14 +2738,11 @@ var Chunk = class Chunk {
 					else break;
 				}
 				if (reorderEffects) {
-					if (!state.hasWrittenResume) {
-						state.hasWrittenResume = true;
-						scripts = concatScripts(scripts, runtimePrefix + ".r=[]");
-					}
+					needsResumeArray = true;
 					reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")");
 				}
-				for (const reservation of readyReservations) scripts = concatScripts(scripts, reservation);
-				scripts = concatScripts(scripts, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
+				for (const reservation of readyReservations) reordered = concatScripts(reordered, reservation);
+				reordered = concatScripts(reordered, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
 				html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
 			state.writeReorders = carried;
@@ -2719,6 +2753,11 @@ var Chunk = class Chunk {
 			state.hasWrittenResume = true;
 			scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]");
 		}
+		else if (needsResumeArray && !state.hasWrittenResume) {
+			state.hasWrittenResume = true;
+			scripts = concatScripts(scripts, runtimePrefix + ".r=[]");
+		}
+		scripts = concatScripts(scripts, reordered);
 		if (needsWalk) scripts = concatScripts(scripts, runtimePrefix + ".w()");
 		this.html = html;
 		this.scripts = scripts;

package/dist/dom/catch.feat.js

@@ -1,4 +1,4 @@
-let require_control_flow = require("../dom-DprILxYO.js"), handlePendingTry = (fn, scope, branch) => {
+let require_control_flow = require("../dom-BNmfm4st.js"), handlePendingTry = (fn, scope, branch) => {
 	for (; branch;) {
 		if (branch.O?.i) return (branch.J ||= []).push(fn, scope);
 		branch = branch.N;

package/dist/dom/catch.feat.mjs

@@ -4,7 +4,7 @@ let handlePendingTry = (fn, scope, branch) => {
 		branch = branch.N;
 	}
 };
-import { $t as caughtError, en as installCatch, g as renderCatch, tn as placeholderShown } from "../dom-BbknkVDz.mjs";
+import { $t as caughtError, en as installCatch, g as renderCatch, tn as placeholderShown } from "../dom-BsAS26Ze.mjs";
 //#region src/dom/catch.feat.ts
 installCatch((runEffects) => (effects, checkPending = placeholderShown.has(effects)) => {
 	if (checkPending || caughtError.has(effects)) {

package/dist/dom/controllable-input.feat.js

@@ -1,3 +1,3 @@
-let require_control_flow = require("../dom-DprILxYO.js");
+let require_control_flow = require("../dom-BNmfm4st.js");
 require_control_flow.z[0] = require_control_flow.T, require_control_flow.z[1] = require_control_flow.C, require_control_flow.z[2] = require_control_flow.A;
 //#endregion

package/dist/dom/controllable-input.feat.mjs

@@ -1,3 +1,3 @@
-import { A as _attr_input_value_script, C as _attr_input_checkedValue_script, T as _attr_input_checked_script, z as controllableScripts } from "../dom-BbknkVDz.mjs";
+import { A as _attr_input_value_script, C as _attr_input_checkedValue_script, T as _attr_input_checked_script, z as controllableScripts } from "../dom-BsAS26Ze.mjs";
 controllableScripts[0] = _attr_input_checked_script, controllableScripts[1] = _attr_input_checkedValue_script, controllableScripts[2] = _attr_input_value_script;
 //#endregion

package/dist/dom/controllable-open.feat.js

@@ -1,4 +1,4 @@
-let require_control_flow = require("../dom-DprILxYO.js");
+let require_control_flow = require("../dom-BNmfm4st.js");
 //#region src/dom/controllable-open.feat.ts
 require_control_flow.z[4] = require_control_flow.y;
 //#endregion

package/dist/dom/controllable-open.feat.mjs

@@ -1,4 +1,4 @@
-import { y as _attr_details_or_dialog_open_script, z as controllableScripts } from "../dom-BbknkVDz.mjs";
+import { y as _attr_details_or_dialog_open_script, z as controllableScripts } from "../dom-BsAS26Ze.mjs";
 //#region src/dom/controllable-open.feat.ts
 controllableScripts[4] = _attr_details_or_dialog_open_script;
 //#endregion

package/dist/dom/controllable-select.feat.js

@@ -1,4 +1,4 @@
-let require_control_flow = require("../dom-DprILxYO.js");
+let require_control_flow = require("../dom-BNmfm4st.js");
 //#region src/dom/controllable-select.feat.ts
 require_control_flow.z[3] = require_control_flow.N;
 //#endregion