marko 6.3.32 → 6.3.33

package/cheatsheet.md

@@ -7,7 +7,7 @@ Marko 6 = HTML superset. NOT JSX, NOT old Marko 4/5. `.marko` files are componen
 1. Text interpolation: `${expr}` inside tag bodies. A bare line at the template root parses as a TAG (concise mode): `Welcome aboard` fails to compile, but `p is a tag` compiles SILENTLY to `<p is a tag></p>` — any line starting with a real tag name loses its words to attributes. Wrap text in an element (`<p>Welcome aboard</p>`) or prefix the line with `--` and a space (`-- Welcome ${name}`). Attributes take raw JS after `=` with NO braces/quotes: `<div title=user.name data-n=1 + 1>`.
 2. A top-level `>` in an attribute value **ENDS THE TAG**: the value truncates there, the rest of the line becomes body text, and it usually still compiles clean. `<button disabled=count>=8 onClick() {…}>More</button>` is `disabled=count` plus the TEXT `=8 onClick() {…}>`, so the handler never binds; spaces don't help (`disabled=a > b` closes too). Parenthesize the value — `disabled=(count >= 8)`, `hidden=(a > b)`, and for a TS type argument `<let/s=(new Set<string>())>`. Do NOT move the type onto the tag variable instead: `<let/s:Set<string>=new Set()>` compiles but fails type-check with TS2322 (the annotation does not flow into the initializer). A `>` nested inside `(…)`/`{…}`/`[…]` is safe (`class={ big: n > 1 }`, `of=list.filter(x => x > 1)`), but an arrow BODY is not nested: `<const/f=(a, b) => a > b>` truncates to `(a, b) => a`. `<` never closes a tag (`disabled=count<=1` is fine).
 3. State: `<let/name=initial>` (slash then var name!). Update by plain assignment in an event handler: `count++`, `text = "hi"`. No setState, no hooks.
-4. Derived values: `<const/total=items.length * price>` — auto-recomputes. Never use an effect to derive state. Updates batch: mid-handler a reassigned `<let>` reads current but its derived `<const>` reads stale — recompute from the `<let>`.
+4. Derived values: `<const/total=items.length * price>` — auto-recomputes. Never use an effect to derive state. `<let>` is deliberately different: its value is an INITIAL value, so `<let/draft=input.text>` seeds from a reactive value and then de-syncs — that de-sync is the point of an editable copy. So pick by intent: recomputes → `<const>`, seeds then diverges → `<let>`. A `<let>` you never assign is just a frozen `<const>`. Updates batch: mid-handler a reassigned `<let>` reads current but its derived `<const>` reads stale — recompute from the `<let>`.
 5. NEVER mutate state in place. `items.push(x)` will NOT update the UI. Always reassign:
    - add: `items = items.concat(x)`
    - remove: `items = items.toSpliced(i, 1)`
@@ -17,6 +17,7 @@ Marko 6 = HTML superset. NOT JSX, NOT old Marko 4/5. `.marko` files are componen
 7. Native inputs are UNCONTROLLED by default: `value=` only sets the initial value. Adding the matching `*Change` handler is what makes them controlled — `valueChange` on `<input>`/`<textarea>`/`<select>`, `checkedChange` on checkboxes/radios, `openChange` on `<details>`/`<dialog>`. `value:=text` is the shorthand for `value=text valueChange(v) { text = v }`. (`<textarea value:=text/>` — value attribute, not body.)
 8. Transform in the handler when needed — number inputs give STRINGS: `<input type="number" value=n valueChange(v) { n = +v }>`, or `value:parseFloat:=n`.
 9. Radio/checkbox groups: `checkedValue:=picked` on each input (shared var, distinct `value=`) — the match is checked; array var for multi-checkbox. Dropdown: `<select value:=picked>`.
+10. Module-level values and helpers need `static`: `static const LIMIT = 10`, `static function fmt(n) {…}`. Without it `function fmt(n) {` parses as a TAG — ``Unable to find entry point for custom tag `<function>` ``, an error that never says `static`. Prefer it to `<const>` for anything that never changes: `<const/LIMIT=10>` emits a per-instance signal plus a `$setup` call.
 
 ## Canonical component (copy this shape)
 
@@ -195,6 +196,8 @@ export interface Input<T> {
 | `onClick={() => ...}` / `@click` / `on-click("name")`       | `onClick() { ... }`                                                                  |
 | `const [x, setX] = useState()` / `state` / `class {}` block | `<let/x=0>` then `x = 1`                                                             |
 | `$ const y = x * 2;` (scriptlets are removed)               | `<const/y=x * 2>`                                                                    |
+| `<let/n=a + b>` when you want it to recompute               | `<const/n=a + b>` — `<let>` seeds an initial value, then de-syncs by design          |
+| `function fmt(n) {…}` / `const LIMIT = 10` at module level  | `static function fmt(n) {…}` / `static const LIMIT = 10`                             |
 | `<let x=0>`                                                 | `<let/x=0>`                                                                          |
 | `<if(cond)>`                                                | `<if=cond>`                                                                          |
 | `items.push(x)`                                             | `items = items.concat(x)`                                                            |

package/dist/debug/html.js

@@ -1844,6 +1844,15 @@ let $chunk;
 function getChunk() {
 	return $chunk;
 }
+function withChunk(chunk, cb) {
+	const prev = $chunk;
+	$chunk = chunk;
+	try {
+		return cb();
+	} finally {
+		$chunk = prev;
+	}
+}
 function getContext(key) {
 	return $chunk.context?.[key];
 }
@@ -2041,19 +2050,28 @@ function forBranches(by, iterate, scopeId, accessor, serializeBranch, serializeM
 	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
 }
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-	const { state } = $chunk.boundary;
 	const resumeBranch = serializeBranch !== 0;
 	const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
 	const branchId = _peek_scope_id();
-	if (resumeMarker && resumeBranch && !singleNode) $chunk.writeHTML(state.mark("[", ""));
+	const chunk = $chunk;
+	const beforeBranch = resumeMarker && resumeBranch && !singleNode ? deferBranchStart(chunk) : void 0;
 	const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
 	const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
+	if (beforeBranch !== void 0) applyBranchStart(chunk, beforeBranch, shouldWriteBranch);
 	if (shouldWriteBranch && (branchIndex || !resumeMarker)) writeScope(scopeId, {
 		[ConditionalRenderer + accessor]: branchIndex || void 0,
 		[BranchScopes + accessor]: resumeMarker ? void 0 : writeScope(branchId, {})
 	});
 	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, shouldWriteBranch ? " " + branchId : "");
 }
+function deferBranchStart(chunk) {
+	const beforeBranch = chunk.html;
+	chunk.html = "";
+	return beforeBranch;
+}
+function applyBranchStart(chunk, beforeBranch, rendered) {
+	chunk.html = beforeBranch + (rendered ? chunk.boundary.state.mark("[", "") : "") + chunk.html;
+}
 function writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, branchIds) {
 	const endTag = parentEndTag || "";
 	if (serializeMarker !== 0) if (!parentEndTag || serializeStateful !== 0) {
@@ -2981,7 +2999,8 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		};
 		renderNative();
 	} else {
-		if (shouldResume) _html(state.mark("[", ""));
+		const chunk = getChunk();
+		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
 		const render = () => {
 			if (renderer) try {
 				_set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? 1 : 0);
@@ -2996,7 +3015,10 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		};
 		result = shouldResume ? withBranchId(branchId, render) : render();
 		rendered = _peek_scope_id() !== branchId;
-		if (shouldResume) _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
+		if (beforeBranch !== void 0) {
+			applyBranchStart(chunk, beforeBranch, rendered);
+			_html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
+		}
 	}
 	if (rendered) {
 		if (shouldResume) writeScope(scopeId, { [ConditionalRenderer + accessor]: renderer?.["id"] || renderer });
@@ -3147,6 +3169,8 @@ var ServerRendered = class {
 		}, (err) => {
 			const socket = "socket" in stream && stream.socket;
 			if (socket && typeof socket.destroySoon === "function") socket.destroySoon();
+			else if (stream.destroy) stream.destroy();
+			else stream.end();
 			if (!stream.emit?.("error", err)) throw err;
 		}, () => {
 			stream.end();
@@ -3360,6 +3384,7 @@ const compat = {
 	nextScopeId: _scope_id,
 	peekNextScopeId: _peek_scope_id,
 	isInResumedBranch,
+	withChunk,
 	ensureState($global) {
 		let state = $global[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
 		if (!state) {
@@ -3454,6 +3479,12 @@ const compat = {
 	register,
 	registerRenderBody(fn) {
 		register(RENDER_BODY_ID, fn);
+	},
+	registerClassFunctions(input) {
+		for (const key in input) {
+			const value = input[key];
+			if (typeof value === "function" && !getRegistered(value)) register(RENDER_BODY_ID, value);
+		}
 	}
 };
 function NOOP() {}
@@ -3541,10 +3572,7 @@ exports.attrTag = attrTag;
 exports.attrTags = attrTags;
 exports.compat = compat;
 exports.forIn = forIn;
-exports.forInBy = forInBy;
 exports.forOf = forOf;
-exports.forOfBy = forOfBy;
-exports.forStepBy = forStepBy;
 exports.forTo = forTo;
 exports.forUntil = forUntil;
 exports.withLoadAssets = withLoadAssets;

package/dist/debug/html.mjs

@@ -1842,6 +1842,15 @@ let $chunk;
 function getChunk() {
 	return $chunk;
 }
+function withChunk(chunk, cb) {
+	const prev = $chunk;
+	$chunk = chunk;
+	try {
+		return cb();
+	} finally {
+		$chunk = prev;
+	}
+}
 function getContext(key) {
 	return $chunk.context?.[key];
 }
@@ -2039,19 +2048,28 @@ function forBranches(by, iterate, scopeId, accessor, serializeBranch, serializeM
 	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
 }
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-	const { state } = $chunk.boundary;
 	const resumeBranch = serializeBranch !== 0;
 	const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
 	const branchId = _peek_scope_id();
-	if (resumeMarker && resumeBranch && !singleNode) $chunk.writeHTML(state.mark("[", ""));
+	const chunk = $chunk;
+	const beforeBranch = resumeMarker && resumeBranch && !singleNode ? deferBranchStart(chunk) : void 0;
 	const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
 	const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
+	if (beforeBranch !== void 0) applyBranchStart(chunk, beforeBranch, shouldWriteBranch);
 	if (shouldWriteBranch && (branchIndex || !resumeMarker)) writeScope(scopeId, {
 		[ConditionalRenderer + accessor]: branchIndex || void 0,
 		[BranchScopes + accessor]: resumeMarker ? void 0 : writeScope(branchId, {})
 	});
 	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, shouldWriteBranch ? " " + branchId : "");
 }
+function deferBranchStart(chunk) {
+	const beforeBranch = chunk.html;
+	chunk.html = "";
+	return beforeBranch;
+}
+function applyBranchStart(chunk, beforeBranch, rendered) {
+	chunk.html = beforeBranch + (rendered ? chunk.boundary.state.mark("[", "") : "") + chunk.html;
+}
 function writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, branchIds) {
 	const endTag = parentEndTag || "";
 	if (serializeMarker !== 0) if (!parentEndTag || serializeStateful !== 0) {
@@ -2979,7 +2997,8 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		};
 		renderNative();
 	} else {
-		if (shouldResume) _html(state.mark("[", ""));
+		const chunk = getChunk();
+		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
 		const render = () => {
 			if (renderer) try {
 				_set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? 1 : 0);
@@ -2994,7 +3013,10 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		};
 		result = shouldResume ? withBranchId(branchId, render) : render();
 		rendered = _peek_scope_id() !== branchId;
-		if (shouldResume) _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
+		if (beforeBranch !== void 0) {
+			applyBranchStart(chunk, beforeBranch, rendered);
+			_html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
+		}
 	}
 	if (rendered) {
 		if (shouldResume) writeScope(scopeId, { [ConditionalRenderer + accessor]: renderer?.["id"] || renderer });
@@ -3145,6 +3167,8 @@ var ServerRendered = class {
 		}, (err) => {
 			const socket = "socket" in stream && stream.socket;
 			if (socket && typeof socket.destroySoon === "function") socket.destroySoon();
+			else if (stream.destroy) stream.destroy();
+			else stream.end();
 			if (!stream.emit?.("error", err)) throw err;
 		}, () => {
 			stream.end();
@@ -3358,6 +3382,7 @@ const compat = {
 	nextScopeId: _scope_id,
 	peekNextScopeId: _peek_scope_id,
 	isInResumedBranch,
+	withChunk,
 	ensureState($global) {
 		let state = $global[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
 		if (!state) {
@@ -3452,8 +3477,14 @@ const compat = {
 	register,
 	registerRenderBody(fn) {
 		register(RENDER_BODY_ID, fn);
+	},
+	registerClassFunctions(input) {
+		for (const key in input) {
+			const value = input[key];
+			if (typeof value === "function" && !getRegistered(value)) register(RENDER_BODY_ID, value);
+		}
 	}
 };
 function NOOP() {}
 //#endregion
-export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };
+export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forOf, forTo, forUntil, withLoadAssets, withPageAssets };

package/dist/html/compat.d.ts

@@ -1,6 +1,6 @@
 import { register } from "./serializer";
 import type { ServerRenderer } from "./template";
-import { _await, _html, _peek_scope_id, _scope_id, $global, Chunk, isInResumedBranch, State, writeScript } from "./writer";
+import { _await, _html, _peek_scope_id, _scope_id, $global, Chunk, isInResumedBranch, State, withChunk, writeScript } from "./writer";
 export declare const compat: {
     $global: typeof $global;
     fork: typeof _await;
@@ -9,6 +9,7 @@ export declare const compat: {
     nextScopeId: typeof _scope_id;
     peekNextScopeId: typeof _peek_scope_id;
     isInResumedBranch: typeof isInResumedBranch;
+    withChunk: typeof withChunk;
     ensureState($global: any): State;
     isTagsAPI(fn: any): boolean;
     onFlush(fn: (chunk: Chunk) => void): void;
@@ -19,4 +20,5 @@ export declare const compat: {
     render(renderer: ServerRenderer, willRerender: boolean, classAPIOut: any, component: any, input: any, completeChunks: Chunk[], registerChildScope?: boolean): void;
     register: typeof register;
     registerRenderBody(fn: any): void;
+    registerClassFunctions(input: any): void;
 };

package/dist/html/writer.d.ts

@@ -18,6 +18,7 @@ type ScopeInternals = PartialScope & {
     [K_SCOPE_ID]?: number;
 };
 export declare function getChunk(): Chunk | undefined;
+export declare function withChunk<T>(chunk: Chunk, cb: () => T): T;
 export declare function getContext(key: keyof NonNullable<Chunk["context"]>): unknown;
 export declare function getState(): State;
 export declare function getScopeId(scope: unknown): number | undefined;
@@ -56,6 +57,8 @@ export declare function _for_in(obj: Falsy | {}, cb: (key: string, value: unknow
 export declare function _for_to(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, by: Falsy | ((v: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: number, serializeMarker?: number, serializeStateful?: number, parentEndTag?: string | 0, singleNode?: 1): void;
 export declare function _for_until(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, by: Falsy | ((v: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: number, serializeMarker?: number, serializeStateful?: number, parentEndTag?: string | 0, singleNode?: 1): void;
 export declare function _if(cb: () => void | number, scopeId: number, accessor: Accessor, serializeBranch?: number, serializeMarker?: number, serializeStateful?: number, parentEndTag?: string | 0, singleNode?: 1): void;
+export declare function deferBranchStart(chunk: Chunk): string;
+export declare function applyBranchStart(chunk: Chunk, beforeBranch: string, rendered: boolean): void;
 declare let writeScope: (scopeId: number, partialScope: PartialScope) => ScopeInternals;
 export { writeScope as _scope };
 export declare function _existing_scope(scopeId: number): ScopeInternals;

package/dist/html.d.ts

@@ -5,6 +5,6 @@ export { _attr, _attr_and, _attr_class, _attr_details_or_dialog_open as _attr_de
 export { compat } from "./html/compat";
 export { _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _to_text, _unescaped, } from "./html/content";
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";
-export { forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, } from "./html/for";
+export { forIn, forOf, forTo, forUntil } from "./html/for";
 export { _template } from "./html/template";
 export { _attr_content, _await, _el, _el_resume, _existing_scope, _for_in, _for_of, _for_to, _for_until, _hoist, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";

package/dist/html.js

@@ -265,8 +265,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			needsScript && _script(branchId, "d"), (shouldResume || needsScript) && _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
 		})();
 	} else {
-		shouldResume && _html(state.mark("[", ""));
-		let render = () => {
+		let chunk = getChunk(), beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0, render = () => {
 			if (renderer) try {
 				return _set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? 1 : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
@@ -277,7 +276,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			}
 			else if (content) return content();
 		};
-		result = shouldResume ? withBranchId(branchId, render) : render(), rendered = _peek_scope_id() !== branchId, shouldResume && _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 : ""))));
 	}
 	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: renderer?.a || renderer }) : _scope_id(), result;
 }, patchDynamicTag = ((originalDynamicTag) => (patch) => {
@@ -285,7 +284,7 @@ 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", 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(), 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 = {
 	$global,
 	fork: _await,
 	write: _html,
@@ -293,6 +292,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	nextScopeId: _scope_id,
 	peekNextScopeId: _peek_scope_id,
 	isInResumedBranch,
+	withChunk,
 	ensureState($global) {
 		let state = $global[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
 		return state || ($global.runtimeId ||= "M", $global.renderId ||= $global.componentIdPrefix || $global.widgetIdPrefix || "_", $global[K_TAGS_API_STATE] = state = new State($global)), state;
@@ -361,7 +361,13 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	},
 	register,
 	registerRenderBody(fn) {
-		register("$C_b", fn);
+		register(RENDER_BODY_ID, fn);
+	},
+	registerClassFunctions(input) {
+		for (let key in input) {
+			let value = input[key];
+			typeof value == "function" && !getRegistered(value) && register(RENDER_BODY_ID, value);
+		}
 	}
 };
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
@@ -1230,6 +1236,15 @@ function forStepBy(by, index) {
 function getChunk() {
 	return $chunk;
 }
+function withChunk(chunk, cb) {
+	let prev = $chunk;
+	$chunk = chunk;
+	try {
+		return cb();
+	} finally {
+		$chunk = prev;
+	}
+}
 function getContext(key) {
 	return $chunk.context?.[key];
 }
@@ -1382,14 +1397,19 @@ function forBranches(by, iterate, scopeId, accessor, serializeBranch, serializeM
 	}), loopScopes && writeScope(scopeId, { ["A" + accessor]: loopScopes }), writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
 }
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-	let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), branchId = _peek_scope_id();
-	resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[", ""));
-	let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
-	shouldWriteBranch && (branchIndex || !resumeMarker) && writeScope(scopeId, {
+	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;
+	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 : "");
 }
+function deferBranchStart(chunk) {
+	let beforeBranch = chunk.html;
+	return chunk.html = "", beforeBranch;
+}
+function applyBranchStart(chunk, beforeBranch, rendered) {
+	chunk.html = beforeBranch + (rendered ? chunk.boundary.state.mark("[", "") : "") + chunk.html;
+}
 function writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, branchIds) {
 	let endTag = parentEndTag || "";
 	if (serializeMarker !== 0) if (!parentEndTag || serializeStateful !== 0) {
@@ -2050,7 +2070,7 @@ var ServerRendered = class {
 			stream.write(html), stream.flush?.();
 		}, (err) => {
 			let socket = "socket" in stream && stream.socket;
-			if (socket && typeof socket.destroySoon == "function" && socket.destroySoon(), !stream.emit?.("error", err)) throw err;
+			if (socket && typeof socket.destroySoon == "function" ? socket.destroySoon() : stream.destroy ? stream.destroy() : stream.end(), !stream.emit?.("error", err)) throw err;
 		}, () => {
 			stream.end();
 		});
@@ -2193,4 +2213,4 @@ exports.$global = $global, exports._assert_hoist = _assert_hoist, exports._attr
 	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._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._sep = _sep, 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._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.forInBy = forInBy, exports.forOf = forOf, exports.forOfBy = forOfBy, exports.forStepBy = forStepBy, 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._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._sep = _sep, 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._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;

package/dist/html.mjs

@@ -265,8 +265,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			needsScript && _script(branchId, "d"), (shouldResume || needsScript) && _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
 		})();
 	} else {
-		shouldResume && _html(state.mark("[", ""));
-		let render = () => {
+		let chunk = getChunk(), beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0, render = () => {
 			if (renderer) try {
 				return _set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? 1 : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
@@ -277,7 +276,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			}
 			else if (content) return content();
 		};
-		result = shouldResume ? withBranchId(branchId, render) : render(), rendered = _peek_scope_id() !== branchId, shouldResume && _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 : ""))));
 	}
 	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: renderer?.a || renderer }) : _scope_id(), result;
 }, patchDynamicTag = ((originalDynamicTag) => (patch) => {
@@ -285,7 +284,7 @@ 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", 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(), 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 = {
 	$global,
 	fork: _await,
 	write: _html,
@@ -293,6 +292,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	nextScopeId: _scope_id,
 	peekNextScopeId: _peek_scope_id,
 	isInResumedBranch,
+	withChunk,
 	ensureState($global) {
 		let state = $global[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
 		return state || ($global.runtimeId ||= "M", $global.renderId ||= $global.componentIdPrefix || $global.widgetIdPrefix || "_", $global[K_TAGS_API_STATE] = state = new State($global)), state;
@@ -361,7 +361,13 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	},
 	register,
 	registerRenderBody(fn) {
-		register("$C_b", fn);
+		register(RENDER_BODY_ID, fn);
+	},
+	registerClassFunctions(input) {
+		for (let key in input) {
+			let value = input[key];
+			typeof value == "function" && !getRegistered(value) && register(RENDER_BODY_ID, value);
+		}
 	}
 };
 //#region src/common/attr-tag.ts
@@ -1229,6 +1235,15 @@ function forStepBy(by, index) {
 function getChunk() {
 	return $chunk;
 }
+function withChunk(chunk, cb) {
+	let prev = $chunk;
+	$chunk = chunk;
+	try {
+		return cb();
+	} finally {
+		$chunk = prev;
+	}
+}
 function getContext(key) {
 	return $chunk.context?.[key];
 }
@@ -1381,14 +1396,19 @@ function forBranches(by, iterate, scopeId, accessor, serializeBranch, serializeM
 	}), loopScopes && writeScope(scopeId, { ["A" + accessor]: loopScopes }), writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
 }
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-	let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), branchId = _peek_scope_id();
-	resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[", ""));
-	let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
-	shouldWriteBranch && (branchIndex || !resumeMarker) && writeScope(scopeId, {
+	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;
+	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 : "");
 }
+function deferBranchStart(chunk) {
+	let beforeBranch = chunk.html;
+	return chunk.html = "", beforeBranch;
+}
+function applyBranchStart(chunk, beforeBranch, rendered) {
+	chunk.html = beforeBranch + (rendered ? chunk.boundary.state.mark("[", "") : "") + chunk.html;
+}
 function writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, branchIds) {
 	let endTag = parentEndTag || "";
 	if (serializeMarker !== 0) if (!parentEndTag || serializeStateful !== 0) {
@@ -2049,7 +2069,7 @@ var ServerRendered = class {
 			stream.write(html), stream.flush?.();
 		}, (err) => {
 			let socket = "socket" in stream && stream.socket;
-			if (socket && typeof socket.destroySoon == "function" && socket.destroySoon(), !stream.emit?.("error", err)) throw err;
+			if (socket && typeof socket.destroySoon == "function" ? socket.destroySoon() : stream.destroy ? stream.destroy() : stream.end(), !stream.emit?.("error", err)) throw err;
 		}, () => {
 			stream.end();
 		});
@@ -2188,4 +2208,4 @@ function toObjectExpression(options) {
 //#region src/html/compat.ts
 function NOOP() {}
 //#endregion
-export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };
+export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forOf, forTo, forUntil, withLoadAssets, withPageAssets };

package/dist/translator/index.js

@@ -1976,6 +1976,14 @@ function _resume_branch(scopeId) {
 	const branchId = $chunk.context?.[kBranchId];
 	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { [ClosestBranchId$1]: branchId });
 }
+function deferBranchStart(chunk) {
+	const beforeBranch = chunk.html;
+	chunk.html = "";
+	return beforeBranch;
+}
+function applyBranchStart(chunk, beforeBranch, rendered) {
+	chunk.html = beforeBranch + (rendered ? chunk.boundary.state.mark("[", "") : "") + chunk.html;
+}
 let writeScope = (scopeId, partialScope) => {
 	const { state } = $chunk.boundary;
 	const target = $chunk.serializeState;
@@ -2196,7 +2204,8 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		};
 		renderNative();
 	} else {
-		if (shouldResume) _html(state.mark("[", ""));
+		const chunk = void 0;
+		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
 		const render = () => {
 			if (renderer) try {
 				_set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? 1 : 0);
@@ -2211,7 +2220,10 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		};
 		result = shouldResume ? withBranchId(branchId, render) : render();
 		rendered = _peek_scope_id() !== branchId;
-		if (shouldResume) _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
+		if (beforeBranch !== void 0) {
+			applyBranchStart(chunk, beforeBranch, rendered);
+			_html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
+		}
 	}
 	if (rendered) {
 		if (shouldResume) writeScope(scopeId, { [ConditionalRenderer$1 + accessor]: renderer?.["id"] || renderer });
@@ -2987,9 +2999,7 @@ function getSignal(section, referencedBindings, name) {
 			values: [],
 			intersection: void 0,
 			render: [],
-			renderReferencedBindings: void 0,
 			effect: [],
-			effectReferencedBindings: void 0,
 			hasHTMLEffect: false,
 			build: void 0,
 			export: !!exportName,
@@ -3228,25 +3238,15 @@ function replaceNullishAndEmptyFunctionsWith0(args) {
 	args.length = finalLen || 0;
 	return args;
 }
-function addStatement(type, targetSection, referencedBindings, statement, usedReferences, isPure) {
+function addStatement(type, targetSection, referencedBindings, statement, isPure) {
 	const signal = getSignal(targetSection, referencedBindings);
 	const statements = signal[type] ??= [];
-	const add = type === "effect" ? addEffectReferences : addRenderReferences;
 	if (Array.isArray(statement)) statements.push(...statement);
 	else statements.push(statement);
-	if (usedReferences !== false) if (usedReferences) for (const ref of usedReferences) add(signal, ref);
-	else add(signal, referencedBindings);
 	if (!isPure || type === "effect") signal.hasSideEffect = true;
 }
-function addEffectReferences(signal, referencedBindings) {
-	signal.effectReferencedBindings = bindingUtil.union(signal.effectReferencedBindings, referencedBindings);
-}
-function addRenderReferences(signal, referencedBindings) {
-	signal.renderReferencedBindings = bindingUtil.union(signal.renderReferencedBindings, referencedBindings);
-}
 function addValue(targetSection, referencedBindings, signal, value) {
 	const parentSignal = getSignal(targetSection, referencedBindings);
-	addRenderReferences(parentSignal, referencedBindings);
 	parentSignal.values.push({
 		signal,
 		value
@@ -4093,6 +4093,22 @@ function templateElement(value, tail) {
 	}, tail);
 }
 //#endregion
+//#region src/translator/util/branch-tag.ts
+function getBranchSectionAccessor(nodeBinding) {
+	return {
+		binding: nodeBinding,
+		prefix: getAccessorPrefix().BranchScopes
+	};
+}
+function initBranchSection(bodySection, upstreamExpression, sectionAccessor) {
+	bodySection.isBranch = true;
+	bodySection.upstreamExpression = upstreamExpression;
+	bodySection.sectionAccessor = sectionAccessor;
+}
+function resumeOwnerByMarkerWhenStatic(tagSection, bodySection, nodeBinding, statefulReasonKey) {
+	if (isStateSerializeReason(getSerializeReason(tagSection, statefulReasonKey)) && isStaticSerializeReason(getSerializeReason(bodySection, kBranchSerializeReason)) && isStaticSerializeReason(getSerializeReason(tagSection, nodeBinding))) setSectionOwnerResumedByMarker(bodySection);
+}
+//#endregion
 //#region src/translator/util/is-event-or-change-handler.ts
 function isEventOrChangeHandler(prop) {
 	return /^on[-A-Z][a-zA-Z0-9_$]|[a-zA-Z_$][a-zA-Z0-9_$]*Change$/.test(prop);
@@ -4180,12 +4196,7 @@ var for_default = {
 				onFinalizeReferences(() => detectForSelector(bodySection, keyBinding));
 			}
 		}
-		bodySection.sectionAccessor = {
-			binding: nodeBinding,
-			prefix: getAccessorPrefix().BranchScopes
-		};
-		bodySection.upstreamExpression = tagExtra;
-		bodySection.isBranch = true;
+		initBranchSection(bodySection, tagExtra, getBranchSectionAccessor(nodeBinding));
 		if (!isAttrTag && !getOnlyChildParentTagName(tag)) {
 			visit(tag, 37);
 			enterShallow(tag);
@@ -4219,7 +4230,7 @@ var for_default = {
 				const singleChild = bodySection.content?.singleChild && bodySection.content.startType !== 4;
 				const branchSerializeReason = getSerializeReason(bodySection, kBranchSerializeReason);
 				const markerSerializeReason = getSerializeReason(tagSection, nodeBinding);
-				if (isStateSerializeReason(getSerializeReason(tagSection, kStatefulReason$2)) && isStaticSerializeReason(branchSerializeReason) && isStaticSerializeReason(markerSerializeReason)) setSectionOwnerResumedByMarker(bodySection);
+				resumeOwnerByMarkerWhenStatic(tagSection, bodySection, nodeBinding, kStatefulReason$2);
 				flushInto(tag);
 				writeHTMLResumeStatements(tagBody);
 				const forTagArgs = getBaseArgsInForTag(forType, forAttrs);
@@ -4987,7 +4998,7 @@ var native_tag_default = {
 				const isOpenOnly = !!(tagDef && tagDef.parseOptions?.openTagOnly);
 				const isTextOnly = isTextOnlyNativeTag(tag);
 				const hasChildren = !!tag.node.body.body.length;
-				if (injectNonce) addStatement("render", tagSection, void 0, _marko_compiler.types.expressionStatement(callRuntime("_attr_nonce", scopeIdentifier, getScopeAccessorLiteral(nodeBinding))), void 0, true);
+				if (injectNonce) addStatement("render", tagSection, void 0, _marko_compiler.types.expressionStatement(callRuntime("_attr_nonce", scopeIdentifier, getScopeAccessorLiteral(nodeBinding))), true);
 				if (staticControllable) {
 					const hasChangeHandler = !!staticControllable.attrs[1];
 					const defaultHelper = getDOMControllableDefaultHelper(staticControllable);
@@ -5030,14 +5041,14 @@ var native_tag_default = {
 										stmt = _marko_compiler.types.expressionStatement(callRuntime(`_attr_${name}_items`, nodeExpr, _marko_compiler.types.objectExpression(props)));
 									}
 								}
-								if (stmt) addStatement("render", tagSection, valueReferences, stmt, void 0, !!meta.dynamicItems);
+								if (stmt) addStatement("render", tagSection, valueReferences, stmt, !!meta.dynamicItems);
 							}
 							break;
 						}
 						default:
 							if (confident) break;
 							else if (isEventHandler(name)) addStatement("effect", tagSection, valueReferences, _marko_compiler.types.expressionStatement(callRuntime("_on", createScopeReadExpression(nodeBinding), _marko_compiler.types.stringLiteral(getEventHandlerName(name)), value)));
-							else addStatement("render", tagSection, valueReferences, _marko_compiler.types.expressionStatement(callRuntime("_attr", createScopeReadExpression(nodeBinding), _marko_compiler.types.stringLiteral(name), value)), void 0, true);
+							else addStatement("render", tagSection, valueReferences, _marko_compiler.types.expressionStatement(callRuntime("_attr", createScopeReadExpression(nodeBinding), _marko_compiler.types.stringLiteral(name), value)), true);
 							break;
 					}
 				}
@@ -5049,9 +5060,9 @@ var native_tag_default = {
 					if (skipExpression) addStatement("render", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime(canHaveAttrContent ? "_attrs_partial_content" : "_attrs_partial", scopeIdentifier, visitAccessor, spreadExpression, skipExpression, controllable && importRuntime(controllable))));
 					else addStatement("render", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime(canHaveAttrContent ? "_attrs_content" : "_attrs", scopeIdentifier, visitAccessor, spreadExpression, controllable && importRuntime(controllable))));
 					enableControllable(controllableFeatureFor(staticName));
-					addStatement("effect", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_attrs_script", scopeIdentifier, visitAccessor)), false);
+					addStatement("effect", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_attrs_script", scopeIdentifier, visitAccessor)));
 				}
-				if (staticContentAttr) addStatement("render", tagSection, staticContentAttr.value.extra?.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_attr_content", scopeIdentifier, visitAccessor, staticContentAttr.value)), void 0, true);
+				if (staticContentAttr) addStatement("render", tagSection, staticContentAttr.value.extra?.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_attr_content", scopeIdentifier, visitAccessor, staticContentAttr.value)), true);
 			},
 			exit(tag) {
 				const nodeBinding = tag.node.extra[kNativeTagBinding];
@@ -5059,7 +5070,7 @@ var native_tag_default = {
 				const tagName = getCanonicalTagName(tag);
 				if (!openTagOnly) if (tagName !== "textarea" && isTextOnlyNativeTag(tag)) {
 					const textLiteral = bodyToTextLiteral(tag.node.body);
-					if (!_marko_compiler.types.isStringLiteral(textLiteral)) addStatement("render", getSection(tag), textLiteral.extra?.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_text_content", createScopeReadExpression(nodeBinding), textLiteral)), void 0, true);
+					if (!_marko_compiler.types.isStringLiteral(textLiteral)) addStatement("render", getSection(tag), textLiteral.extra?.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_text_content", createScopeReadExpression(nodeBinding), textLiteral)), true);
 				} else tag.insertBefore(tag.node.body.body).forEach((child) => child.skip());
 				tag.remove();
 			}
@@ -5529,16 +5540,9 @@ const IfTag = {
 				visit(ifTag, 37);
 				enterShallow(ifTag);
 			}
-			const sectionAccessor = {
-				binding: getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection, branches.length),
-				prefix: getAccessorPrefix().BranchScopes
-			};
+			const sectionAccessor = getBranchSectionAccessor(getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection, branches.length));
 			for (const [branchTag, branchBodySection] of branches) {
-				if (branchBodySection) {
-					branchBodySection.isBranch = true;
-					branchBodySection.upstreamExpression = ifTagExtra;
-					branchBodySection.sectionAccessor = sectionAccessor;
-				}
+				if (branchBodySection) initBranchSection(branchBodySection, ifTagExtra, sectionAccessor);
 				if (branchTag.node.attributes.length) mergeReferenceNodes.push(branchTag.node.attributes[0].value);
 			}
 			mergeReferences(ifTagSection, ifTag.node, mergeReferenceNodes);
@@ -5560,7 +5564,7 @@ const IfTag = {
 				if (bodySection) {
 					const [[ifTag]] = getBranches(tag);
 					const ifTagSection = getSection(ifTag);
-					if (isStateSerializeReason(getSerializeReason(ifTagSection, kStatefulReason$1)) && isStaticSerializeReason(getSerializeReason(bodySection, kBranchSerializeReason)) && isStaticSerializeReason(getSerializeReason(ifTagSection, getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection)))) setSectionOwnerResumedByMarker(bodySection);
+					resumeOwnerByMarkerWhenStatic(ifTagSection, bodySection, getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection), kStatefulReason$1);
 					flushInto(tag);
 					writeHTMLResumeStatements(tagBody);
 				}
@@ -6555,7 +6559,7 @@ function writeParamsToSignals(tag, propTree, importAlias, info) {
 		const argExport = propTree.props[i];
 		if (argExport) {
 			const argExportIdentifier = info.getBindingIdentifier(argExport.binding, `${importAlias}_param_${i}`);
-			addStatement("render", info.tagSection, arg.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(argExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), arg])), void 0, true);
+			addStatement("render", info.tagSection, arg.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(argExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), arg])), true);
 		}
 		i++;
 	}
@@ -6581,7 +6585,7 @@ function applyAttrObject(tag, propTree, tagInputIdentifier, info) {
 			} else attrTagCallsForTag.set(attrTagName, translatedProps = _marko_compiler.types.parenthesizedExpression(callRuntime("attrTag", translatedProps)));
 		} else translatedProps = callRuntime("attrTag", translatedProps);
 	}
-	addStatement("render", info.tagSection, referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(tagInputIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), translatedProps])), void 0, true);
+	addStatement("render", info.tagSection, referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(tagInputIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), translatedProps])), true);
 }
 function translateAttrTag(tag, attrTagMeta, info, statements) {
 	const translatedAttrs = translateAttrs(tag, true, void 0, statements);
@@ -6691,7 +6695,7 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
 			else {
 				remaining.delete("content");
 				const directContent = !bodySection.params;
-				addStatement("render", info.tagSection, void 0, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(contentExport.binding, `${importAlias}_content`, directContent), [createScopeReadExpression(info.childScopeBinding, info.tagSection), bodyValue])), void 0, true);
+				addStatement("render", info.tagSection, void 0, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(contentExport.binding, `${importAlias}_content`, directContent), [createScopeReadExpression(info.childScopeBinding, info.tagSection), bodyValue])), true);
 			}
 		}
 	}
@@ -6719,13 +6723,13 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
 		const childAttrExports = getKnownFromPropTree(propTree, attr.name);
 		const attrExportIdentifier = info.getBindingIdentifier(childAttrExports.binding, `${importAlias}_${attr.name}`);
 		remaining.delete(attr.name);
-		addStatement("render", info.tagSection, attr.value.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(attrExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), attr.value])), void 0, true);
+		addStatement("render", info.tagSection, attr.value.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(attrExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), attr.value])), true);
 	}
 	if (knownSpread) for (const prop of remaining) {
 		const childAttrExports = getKnownFromPropTree(propTree, prop);
 		const attrExportIdentifier = info.getBindingIdentifier(childAttrExports.binding, `${importAlias}_${prop}`);
 		const propBinding = knownSpread.binding.propertyAliases.get(prop);
-		addStatement("render", info.tagSection, propBinding, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(attrExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), createScopeReadExpression(propBinding, info.tagSection)])), void 0, true);
+		addStatement("render", info.tagSection, propBinding, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(attrExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), createScopeReadExpression(propBinding, info.tagSection)])), true);
 	}
 	else if (spreadProps && (remaining.size || propTree.rest && !propTree.rest.props)) {
 		const spreadExpr = propsToExpression(spreadProps.reverse());
@@ -6748,7 +6752,7 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
 				props.push(_marko_compiler.types.objectProperty(propId, shorthand ? propId : generateUidIdentifier(name), false, shorthand));
 			});
 			props.push(_marko_compiler.types.restElement(restId));
-			addStatement("render", info.tagSection, tagReferencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(propTree.rest.binding, importAlias + "_$rest"), [createScopeReadExpression(info.childScopeBinding, info.tagSection), _marko_compiler.types.callExpression(_marko_compiler.types.arrowFunctionExpression([_marko_compiler.types.objectPattern(props)], restId), [spreadId])])), void 0, true);
+			addStatement("render", info.tagSection, tagReferencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(propTree.rest.binding, importAlias + "_$rest"), [createScopeReadExpression(info.childScopeBinding, info.tagSection), _marko_compiler.types.callExpression(_marko_compiler.types.arrowFunctionExpression([_marko_compiler.types.objectPattern(props)], restId), [spreadId])])), true);
 		}
 	} else {
 		for (const name of remaining) {
@@ -6756,7 +6760,7 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
 			const attrExportIdentifier = info.getBindingIdentifier(childAttrExports.binding, `${importAlias}_${name}`);
 			addStatement("render", info.tagSection, void 0, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(attrExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection)])));
 		}
-		if (propTree.rest && !propTree.rest.props) addStatement("render", info.tagSection, tagReferencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(propTree.rest.binding, importAlias + "_$rest"), [createScopeReadExpression(info.childScopeBinding, info.tagSection), _marko_compiler.types.objectExpression(restProps || [])])), void 0, true);
+		if (propTree.rest && !propTree.rest.props) addStatement("render", info.tagSection, tagReferencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(propTree.rest.binding, importAlias + "_$rest"), [createScopeReadExpression(info.childScopeBinding, info.tagSection), _marko_compiler.types.objectExpression(restProps || [])])), true);
 	}
 }
 function mapParamReasonToExpr(exprs, reason) {
@@ -6872,7 +6876,6 @@ function getOrCreatePropertyAlias(binding, property) {
 function trackDomVarReferences(tag, binding) {
 	const tagVar = tag.node.var;
 	if (!tagVar) return;
-	if (!_marko_compiler.types.isIdentifier(tagVar)) throw tag.get("var").buildCodeFrameError("Tag variables on native elements cannot be destructured.");
 	const babelBinding = tag.scope.getBinding(tagVar.name);
 	const section = getOrCreateSection(tag);
 	binding.originalName = tagVar.name;
@@ -9148,7 +9151,7 @@ function checkDynamicStylePlacement(tag) {
 	for (const sibling of tag.getAllPrevSiblings()) {
 		if (isCoreTagName(sibling, "style")) continue;
 		if (sibling.isMarkoText() ? /\S/.test(sibling.node.value) : getNodeContentType(sibling, "startType") !== null) {
-			(0, _marko_compiler_babel_utils.diagnosticWarn)(tag, { label: "The `${...}` values of a [`<style>` tag](https://markojs.com/docs/reference/core-tag#style) only apply to elements rendered after it, so the content before this tag will not receive them. Move the `<style>` tag above the content it styles." });
+			(0, _marko_compiler_babel_utils.diagnosticWarn)(tag, { label: "The `${...}` values of a [`<style>` tag](https://markojs.com/docs/reference/core-tag#style) only apply to the subsequent siblings of the `<style>` tag and their descendants, so the content before this tag will not receive them. Move the `<style>` tag above the content it styles." });
 			return;
 		}
 	}
@@ -9180,10 +9183,10 @@ function translateDOM$1(tag) {
 		const { names, binding } = dynamic;
 		const section = getSection(tag);
 		const readEl = () => createScopeReadExpression(binding);
-		addStatement("render", section, void 0, _marko_compiler.types.expressionStatement(callRuntime("_style_shell", scopeIdentifier, getScopeAccessorLiteral(binding))), void 0, true);
+		addStatement("render", section, void 0, _marko_compiler.types.expressionStatement(callRuntime("_style_shell", scopeIdentifier, getScopeAccessorLiteral(binding))), true);
 		dynamicStyleValues(node).forEach((value, i) => {
 			const valueRef = value.extra?.referencedBindings;
-			addStatement("render", section, valueRef, _marko_compiler.types.expressionStatement(callRuntime("_style_rule_item", readEl(), _marko_compiler.types.stringLiteral(names[i]), value)), void 0, !valueRef);
+			addStatement("render", section, valueRef, _marko_compiler.types.expressionStatement(callRuntime("_style_rule_item", readEl(), _marko_compiler.types.stringLiteral(names[i]), value)), !valueRef);
 		});
 	}
 	emitStyleImport(tag);
@@ -9640,7 +9643,7 @@ function translateExit(placeholder) {
 		if (isHTML) {
 			write`${method === "_escape" ? buildEscapedTextExpression(value) : callRuntime(method, value)}`;
 			if (nodeBinding) markNode(placeholder, nodeBinding, markerSerializeReason);
-		} else addStatement("render", section, valueExtra.referencedBindings, _marko_compiler.types.expressionStatement(method === "_text" ? callRuntime("_text", createScopeReadExpression(nodeBinding), value) : callRuntime("_html", scopeIdentifier, value, getScopeAccessorLiteral(nodeBinding))), void 0, true);
+		} else addStatement("render", section, valueExtra.referencedBindings, _marko_compiler.types.expressionStatement(method === "_text" ? callRuntime("_text", createScopeReadExpression(nodeBinding), value) : callRuntime("_html", scopeIdentifier, value, getScopeAccessorLiteral(nodeBinding))), true);
 	}
 	placeholder.remove();
 }
@@ -9761,7 +9764,7 @@ var referenced_identifier_default = {
 				const resetEmitted = getAbortResetEmitted(section);
 				if (!resetEmitted.has(exprRoot)) {
 					resetEmitted.add(exprRoot);
-					addStatement("render", section, exprRoot.node.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(importRuntime("$signalReset"), [scopeIdentifier, _marko_compiler.types.numericLiteral(exprId)])), false);
+					addStatement("render", section, exprRoot.node.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(importRuntime("$signalReset"), [scopeIdentifier, _marko_compiler.types.numericLiteral(exprId)])));
 				}
 				identifier.replaceWith(_marko_compiler.types.callExpression(importRuntime("$signal"), [scopeIdentifier, _marko_compiler.types.numericLiteral(exprId)]));
 			}

package/dist/translator/util/branch-tag.d.ts

@@ -0,0 +1,5 @@
+import { type Binding } from "./references";
+import type { Section } from "./sections";
+export declare function getBranchSectionAccessor(nodeBinding: Binding): NonNullable<Section["sectionAccessor"]>;
+export declare function initBranchSection(bodySection: Section, upstreamExpression: Section["upstreamExpression"], sectionAccessor: Section["sectionAccessor"]): void;
+export declare function resumeOwnerByMarkerWhenStatic(tagSection: Section, bodySection: Section, nodeBinding: Binding, statefulReasonKey: symbol): void;

package/dist/translator/util/signals.d.ts

@@ -15,9 +15,7 @@ export interface Signal {
     }>;
     intersection: Opt<Signal>;
     render: t.Statement[];
-    renderReferencedBindings: ReferencedBindings;
     effect: t.Statement[];
-    effectReferencedBindings: ReferencedBindings;
     hasHTMLEffect: boolean;
     hasSideEffect: boolean;
     forcePersist: boolean;
@@ -46,7 +44,7 @@ export declare function signalHasStatements(signal: Signal): boolean;
 export declare function getSignalFn(signal: Signal): t.Expression;
 export declare function getSignalValueIdentifier(signal: Signal): t.Identifier;
 export declare function replaceNullishAndEmptyFunctionsWith0(args: (t.Expression | undefined | false)[]): t.Expression[];
-export declare function addStatement(type: "render" | "effect", targetSection: Section, referencedBindings: ReferencedBindings, statement: t.Statement | t.Statement[], usedReferences?: ReferencedBindings[] | false, isPure?: boolean): void;
+export declare function addStatement(type: "render" | "effect", targetSection: Section, referencedBindings: ReferencedBindings, statement: t.Statement | t.Statement[], isPure?: boolean): void;
 export declare function addValue(targetSection: Section, referencedBindings: ReferencedBindings, signal: Signal, value: t.Expression): void;
 export declare function getResumeRegisterId(section: Section, referencedBindings: string | ReferencedBindings, type?: string): string;
 export declare function writeSignals(section: Section): Set<Signal>;

package/index.d.ts

@@ -11,7 +11,25 @@ declare global {
   }
 
   namespace Marko {
-    /** A mutable global object for the current render. */
+    /**
+     * A mutable global object for the current render.
+     *
+     * The open index signature means an unaugmented `$global` is unchecked. To
+     * type your own keys, merge into this interface:
+     *
+     * ```ts
+     * declare global {
+     *   namespace Marko {
+     *     interface Global {
+     *       data?: MyRouteContext;
+     *     }
+     *   }
+     * }
+     * ```
+     *
+     * Declare merged members OPTIONAL — a required one makes every
+     * `render({ $global: {} })` call fail with TS2741.
+     */
     export interface Global {
       [x: PropertyKey]: unknown;
       /** An AbortSignal instance that, when aborted, stops further streamed content. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.32",
+  "version": "6.3.33",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -48,14 +48,14 @@
     }
   },
   "dependencies": {
-    "@marko/compiler": "^5.41.16",
+    "@marko/compiler": "^5.41.17",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "@marko/runtime-tags": "npm:marko@6.3.32",
-    "marko": "5.39.30"
+    "@marko/runtime-tags": "npm:marko@6.3.33",
+    "marko": "5.39.31"
   },
   "engines": {
     "node": ">=22"