marko 6.3.51 → 6.3.53

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, 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";
+import { $ as _attrs_script, $t as $signal, A as _attr_input_value_script, An as Load, At as _for_closure, B as _attr, Bt as _return, C as _attr_input_checkedValue_script, Ct as readyFailed, D as _attr_input_value_attribute_default, Dn as EndNode, Dt as _closure_get, E as _attr_input_value, Et as _closure, F as _controllable_open, Fn as StartNode, Ft as _id, G as _attr_nonce, Gt as _assert_init, H as _attr_class_item, Ht as _script, I as _controllable_select, In as TagVariable, 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, Ot as _const, P as _controllable_input, Pt as _hoist_resume, Q as _attrs_partial_content, Qt as _on, Rt as _let_change, S as _attr_input_checkedValue_default, Sn as Setup, St as ready, 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, Y as _attrs, Yt as syncGen, Z as _attrs_partial, _ as _attr_details_or_dialog_open, _n as _call, _t as _resumed, a as _for_in, an as queueAsyncRender, at as _text_content, b as _attr_input_checked, bn as Owner, bt as init, c as _for_until, cn as run, ct as toInsertNode, d as _try, dn as forIn, dt as _content_resume, en as $signalReset, et as _html, f as addAwaitCounter, fn as forOf, ft as createAndSetupBranch, g as renderCatch, gn as _hoist_read_error, gt as _resume_dynamic_tag_var, 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 Global, 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, 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 _show, un as runId, ut as _content_closures, v as _attr_details_or_dialog_open_default, vt as _var_resume, w as _attr_input_checked_default, wt as withLazy, x as _attr_input_checkedValue, xn as Params, xt as initEmbedded, y as _attr_details_or_dialog_open_script, yn as Clone, yt as getRegisteredWithScope, zt as _or } from "./dom-DQCODUa1.mjs";
 //#region src/common/attr-tag.ts
 const empty = [];
 const rest = Symbol("Attribute Tag");
@@ -39,21 +39,21 @@ const compat = {
 	patchDynamicTag,
 	queueEffect,
 	init(warp10Noop) {
-		_resume(SET_SCOPE_REGISTER_ID, (scope) => {
+		_resumed[SET_SCOPE_REGISTER_ID] = (scope) => {
 			getRenderScopes(scope[Global])[scope["#Id"]] = scope;
 			if (scope.m5c) classIdToBranch.set(scope.m5c, scope);
 			if (classEventResolver) for (const key in scope) {
 				const resolved = classEventResolver(scope[key], scope);
 				if (resolved !== scope[key]) scope[key] = resolved;
 			}
-		});
-		_resume(RENDER_BODY_ID, warp10Noop);
+		};
+		_resumed[RENDER_BODY_ID] = warp10Noop;
 	},
 	setClassEventResolver(fn) {
 		classEventResolver = fn;
 	},
 	resumeClassFunction(id, build) {
-		_resume(id, build);
+		_resumed[id] = build;
 	},
 	getScope($global, scopeId) {
 		return getRenderScopes($global)?.[scopeId];
@@ -125,7 +125,7 @@ const _template = (id, template, walks, setup, inputSignal) => {
 	renderer.render = () => {
 		throw new Error(`render() is not implemented for the DOM compilation of a Marko template`);
 	};
-	return _resume(id, renderer);
+	return _resumed[id] = renderer;
 };
 function mount(input = {}, reference, position) {
 	let branch;
@@ -192,6 +192,7 @@ function mount(input = {}, reference, position) {
 }
 //#endregion
 //#region src/dom/load.ts
+const noop = (_) => 0;
 const _load_template = /*@__PURE__*/ withLazy((id, load) => {
 	let pending;
 	const lazyTemplate = _template(id, 0, 0, (branch) => {
@@ -201,7 +202,7 @@ const _load_template = /*@__PURE__*/ withLazy((id, load) => {
 			Object.assign(lazyTemplate, renderer);
 			queueAsyncRender(branch, (branch) => insertLoaded(renderer, branch, branch[StartNode], awaitCounter));
 		}, loadFailed(branch, awaitCounter));
-	}, _load_signal(() => (pending ||= load()).then((r) => ({ _: r[Params] }))));
+	}, _load_signal(() => (pending ||= load()).then((r) => ({ _: r["params"] || noop }))));
 	return lazyTemplate;
 });
 const _load_setup = /*@__PURE__*/ withLazy((nodeAccessor, childScopeAccessor, load) => {
@@ -259,7 +260,7 @@ const _load_signal = /*@__PURE__*/ withLazy((load) => {
 		pending ||= load();
 		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);
+		else pending.then((mod) => queueAsyncRender(scope, apply._ = mod._, value), noop);
 	};
 	return apply;
 });
@@ -282,7 +283,6 @@ function _load_media_trigger(query) {
 	return (load) => () => (pending ||= new Promise((resolve) => (mql = matchMedia(query)).matches ? resolve() : mql.addEventListener("change", resolve, { once: true }))).then(load);
 }
 function _load_race_trigger(...triggers) {
-	const noop = () => Promise.resolve();
 	let pending;
 	return (load) => () => (pending ||= Promise.race(triggers.map((t) => t(noop)()))).then(load);
 }
@@ -290,4 +290,4 @@ function getSelectorOrResolve(selector, resolve) {
 	return document.querySelector(selector) || (console.warn(`A lazy load trigger could not find an element matching "${selector}". The module was loaded immediately.`), resolve());
 }
 //#endregion
-export { $signal, $signalReset, _assert_hoist, _assert_init, _attr, _attr_class, _attr_class_item, _attr_class_items, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_details_or_dialog_open_default as _attr_details_open_default, _attr_details_or_dialog_open_default as _attr_dialog_open_default, _attr_details_or_dialog_open_script as _attr_details_open_script, _attr_details_or_dialog_open_script as _attr_dialog_open_script, _attr_input_checked, _attr_input_checkedValue, _attr_input_checkedValue_default, _attr_input_checkedValue_script, _attr_input_checked_default, _attr_input_checked_script, _attr_input_value, _attr_input_value as _attr_textarea_value, _attr_input_value_attribute_default, _attr_input_value_default, _attr_input_value_default as _attr_textarea_value_default, _attr_input_value_dynamic_default, _attr_input_value_script, _attr_input_value_script as _attr_textarea_value_script, _attr_nonce, _attr_select_value, _attr_select_value_default, _attr_select_value_script, _attr_style, _attr_style_item, _attr_style_items, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _attrs_script, _await_content, _await_promise, _call, _child_setup, _closure, _closure_get, _const, _content, _content_closures, _content_resume, _controllable_input, _controllable_open, _controllable_select, _controllable_textarea, _dynamic_tag, _dynamic_tag_content, _el, _el_read, _for_closure, _for_in, _for_of, _for_selector, _for_to, _for_until, _global_read, _hoist, _hoist_read_error, _hoist_resume, _html, _id, _if, _if_closure, _let, _let_change, _lifecycle, _load_event_trigger, _load_idle_trigger, _load_media_trigger, _load_race_trigger, _load_setup, _load_signal, _load_template, _load_visible_trigger, _on, _or, _resume, _resume_dynamic_tag, _return, _return_change, _script, _show, _style_rule_item, _style_shell, _template, _text, _text_content, _to_text, _try, _var, _var_change, _var_resume, attrTag, attrTags, compat, forIn, forOf, forTo, forUntil, init, initEmbedded, ready, readyFailed, run };
+export { $signal, $signalReset, _assert_hoist, _assert_init, _attr, _attr_class, _attr_class_item, _attr_class_items, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_details_or_dialog_open_default as _attr_details_open_default, _attr_details_or_dialog_open_default as _attr_dialog_open_default, _attr_details_or_dialog_open_script as _attr_details_open_script, _attr_details_or_dialog_open_script as _attr_dialog_open_script, _attr_input_checked, _attr_input_checkedValue, _attr_input_checkedValue_default, _attr_input_checkedValue_script, _attr_input_checked_default, _attr_input_checked_script, _attr_input_value, _attr_input_value as _attr_textarea_value, _attr_input_value_attribute_default, _attr_input_value_default, _attr_input_value_default as _attr_textarea_value_default, _attr_input_value_dynamic_default, _attr_input_value_script, _attr_input_value_script as _attr_textarea_value_script, _attr_nonce, _attr_select_value, _attr_select_value_default, _attr_select_value_script, _attr_style, _attr_style_item, _attr_style_items, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _attrs_script, _await_content, _await_promise, _call, _child_setup, _closure, _closure_get, _const, _content, _content_closures, _content_resume, _controllable_input, _controllable_open, _controllable_select, _controllable_textarea, _dynamic_tag, _dynamic_tag_content, _el, _el_read, _for_closure, _for_in, _for_of, _for_selector, _for_to, _for_until, _global_read, _hoist, _hoist_read_error, _hoist_resume, _html, _id, _if, _if_closure, _let, _let_change, _lifecycle, _load_event_trigger, _load_idle_trigger, _load_media_trigger, _load_race_trigger, _load_setup, _load_signal, _load_template, _load_visible_trigger, _on, _or, _resume_dynamic_tag_var, _resumed, _return, _return_change, _script, _show, _style_rule_item, _style_shell, _template, _text, _text_content, _to_text, _try, _var, _var_change, _var_resume, attrTag, attrTags, compat, forIn, forOf, forTo, forUntil, init, initEmbedded, ready, readyFailed, run };

package/dist/debug/html.js

@@ -568,6 +568,7 @@ var Reference = class {
 	flushId;
 	pos;
 	id;
+	path = null;
 	constructor(parent, accessor, flushId, pos = null, id = null) {
 		this.parent = parent;
 		this.accessor = accessor;
@@ -791,7 +792,7 @@ function writeReferenceOr(state, write, val, parent, accessor) {
 			addAssignment(ref, accessId(state, parent) + toAccess(accessor));
 			return false;
 		}
-		state.buf.push(ensureId(state, ref));
+		writeRef(state, ref);
 		return true;
 	}
 	const registered = REGISTRY.get(val);
@@ -835,7 +836,7 @@ function writeString(state, val, parent, accessor) {
 		const ref = state.strs.get(val);
 		if (ref) {
 			if (trackChannel(state, ref)) {
-				state.buf.push(ensureId(state, ref));
+				writeRef(state, ref);
 				return true;
 			}
 		} else {
@@ -1660,6 +1661,15 @@ function quote(str, startPos) {
 	}
 	return "\"" + (lastPos === startPos ? str : result + str.slice(lastPos)) + "\"";
 }
+function writeRef(state, ref) {
+	if (ref.id === null && ref.scopeId === void 0 && ref.path === null && (ref.pos === null || ref.flushId !== state.flushId)) {
+		ref.path = accessPath(state, ref);
+		ref.pos = state.buf.length;
+		ref.flushId = state.flushId;
+		ref.channel = state.channel;
+		state.buf.push(ref.path);
+	} else state.buf.push(ensureId(state, ref));
+}
 function ensureId(state, ref) {
 	if (ref.scopeId !== void 0) {
 		trackChannel(state, ref);
@@ -1684,24 +1694,21 @@ function assignId(state, ref) {
 		return ref.id;
 	}
 	ref.channel = state.channel;
+	return ref.id + "=" + (ref.path || accessPath(state, ref));
+}
+function accessPath(state, ref) {
 	let cur = ref;
 	let accessPrevValue = "";
 	do {
 		accessPrevValue = toAccess(cur.accessor) + accessPrevValue;
 		const parent = cur.parent;
 		if (parent.id) {
-			if (trackChannel(state, parent) || !parent.parent) {
-				accessPrevValue = parent.id + accessPrevValue;
-				break;
-			}
-		}
-		if (parent.flushId === state.flushId || parent.scopeId !== void 0) {
-			accessPrevValue = accessId(state, parent) + accessPrevValue;
-			break;
+			if (trackChannel(state, parent) || !parent.parent) return parent.id + accessPrevValue;
 		}
+		if (parent.flushId === state.flushId || parent.scopeId !== void 0) return accessId(state, parent) + accessPrevValue;
 		cur = parent;
 	} while (cur);
-	return ref.id + "=" + accessPrevValue;
+	return accessPrevValue;
 }
 function assignmentsToString(assignments, value) {
 	if (assignments.length > 100) return "($=>(" + assignments.join("=$,") + "=$))(" + value + ")";
@@ -2226,6 +2233,10 @@ function _subscribe(subscribers, scope) {
 	}
 	return scope;
 }
+const CLIENT_ALL = 715827882;
+function maskGroup(mask, group) {
+	return mask === 715827882 ? 1 : typeof mask === "number" ? mask >>> 1 + 2 * group & 3 : mask[group] ?? 0;
+}
 function _set_serialize_reason(reason) {
 	$chunk.boundary.state.serializeReason = reason;
 }
@@ -2235,7 +2246,7 @@ function _scope_reason() {
 	return reason;
 }
 function _serialize_if(condition, key) {
-	return condition && (condition === 1 || (typeof condition === "number" ? condition >>> key + 1 & 1 : condition[key])) ? 1 : void 0;
+	return condition && maskGroup(condition, key) ? 1 : void 0;
 }
 function _serialize_guard(condition, key) {
 	return _serialize_if(condition, key) || 0;
@@ -2437,6 +2448,24 @@ var State = class {
 		this.$global = $global;
 		if ($global.cspNonce) this.nonceAttr = " nonce" + attrAssignment($global.cspNonce);
 	}
+	flushChunk(html, scripts, pending) {
+		const { $global, nonceAttr } = this;
+		const { __flush__ } = $global;
+		if (scripts) html += "<script" + nonceAttr + ">" + scripts + "<\/script>";
+		if (__flush__) {
+			$global.__flush__ = void 0;
+			html = __flush__($global, html);
+		}
+		return pending ? html : html + this.trailerHTML;
+	}
+	walkScript() {
+		return this.runtimePrefix + ".w()";
+	}
+	resumeScript(resumes) {
+		if (this.hasWrittenResume) return this.runtimePrefix + ".r.push(" + resumes + ")";
+		this.hasWrittenResume = true;
+		return this.runtimePrefix + ".r=[" + resumes + "]";
+	}
 	get runtimePrefix() {
 		const { $global } = this;
 		return $global.runtimeId + "." + $global.renderId;
@@ -2548,6 +2577,7 @@ var Chunk = class Chunk {
 	}
 	append(chunk) {
 		this.html += chunk.html;
+		this.needsWalk ||= chunk.needsWalk;
 		this.effects = concatEffects(this.effects, chunk.effects);
 		this.scripts = concatScripts(this.scripts, chunk.scripts);
 		this.lastEffect = chunk.lastEffect || this.lastEffect;
@@ -2750,17 +2780,9 @@ var Chunk = class Chunk {
 			state.writeReorders = carried;
 		}
 		flushSerializer(boundary, state);
-		if (state.resumes) if (state.hasWrittenResume) scripts = concatScripts(scripts, runtimePrefix + ".r.push(" + state.resumes + ")");
-		else {
-			state.hasWrittenResume = true;
-			scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]");
-		}
-		else if (needsResumeArray && !state.hasWrittenResume) {
-			state.hasWrittenResume = true;
-			scripts = concatScripts(scripts, runtimePrefix + ".r=[]");
-		}
+		if (state.resumes || needsResumeArray && !state.hasWrittenResume) scripts = concatScripts(scripts, state.resumeScript(state.resumes));
 		scripts = concatScripts(scripts, reordered);
-		if (needsWalk) scripts = concatScripts(scripts, runtimePrefix + ".w()");
+		if (needsWalk) scripts = concatScripts(scripts, state.walkScript());
 		this.html = html;
 		this.scripts = scripts;
 		if (!this.async) this.effects = this.lastEffect = "";
@@ -2775,18 +2797,9 @@ var Chunk = class Chunk {
 			state.walkOnNextFlush = true;
 		}
 		this.flushScript();
-		const { scripts } = this;
-		const { $global, nonceAttr } = state;
-		const { __flush__ } = $global;
-		let { html } = this;
+		const { html, scripts } = this;
 		this.html = this.scripts = "";
-		if (scripts) html += "<script" + nonceAttr + ">" + scripts + "<\/script>";
-		if (__flush__) {
-			$global.__flush__ = void 0;
-			html = __flush__($global, html);
-		}
-		if (!boundary.count) html += state.trailerHTML;
-		return html;
+		return state.flushChunk(html, scripts, boundary.count);
 	}
 };
 function flushSerializer(boundary, serializeState) {
@@ -3166,13 +3179,13 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 			if (shouldResume || needsScript) _html(state.mark("(", scopeId + " " + accessor + " " + branchId));
 		};
 		renderNative();
-		result = _el(branchId, DYNAMIC_TAG_VAR_REGISTER_ID);
+		result = _el(scopeId, DYNAMIC_TAG_VAR_REGISTER_ID + accessor);
 	} else {
 		const chunk = getChunk();
 		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
 		const render = () => {
 			if (renderer) try {
-				_set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? 1 : 0);
+				_set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? CLIENT_ALL : 0);
 				return inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
 					content
@@ -3222,24 +3235,27 @@ const _template = (templateId, renderer, page) => {
 	return _content_resume(templateId, renderer);
 };
 function render(input = {}) {
+	return startRender(this, input, State);
+}
+function startRender(template, input, StateClass) {
 	let { $global } = input;
 	if ($global) {
 		({$global, ...input} = input);
 		$global = {
 			runtimeId: "M",
-			renderId: getDefaultRenderId(this),
+			renderId: getDefaultRenderId(template),
 			...$global
 		};
 		if (!String($global.runtimeId).match(/^[_a-z][_a-z0-9]*$/i)) throw new Error(`Invalid runtimeId: "${$global.runtimeId}". The runtimeId must start with a letter or underscore and only contain letters, numbers, and underscores.`);
 		if (!String($global.renderId).match(/^[_a-z][_a-z0-9]*$/i)) throw new Error(`Invalid renderId: "${$global.renderId}". The renderId must start with a letter or underscore and only contain letters, numbers, and underscores.`);
 	} else $global = {
 		runtimeId: "M",
-		renderId: getDefaultRenderId(this)
+		renderId: getDefaultRenderId(template)
 	};
-	const state = new State($global);
+	const state = new StateClass($global);
 	const head = new Chunk(new Boundary(state, $global.signal), null, null, state);
-	if (this["embed"]) head.render(() => writeWaitReady(this["id"], this, input));
-	else head.render(this, input);
+	if (template["embed"]) head.render(() => writeWaitReady(template["id"], template, input));
+	else head.render(template, input);
 	return new ServerRendered(head);
 }
 function getDefaultRenderId(template) {
@@ -3638,7 +3654,7 @@ const compat = {
 				writeScope(scopeId, { m5c: component.id });
 				_script(scopeId, SET_SCOPE_REGISTER_ID);
 			}
-			_set_serialize_reason(willRerender ? 1 : 0);
+			_set_serialize_reason(willRerender ? CLIENT_ALL : 0);
 			try {
 				renderer(normalizedInput);
 			} finally {

package/dist/debug/html.mjs

@@ -566,6 +566,7 @@ var Reference = class {
 	flushId;
 	pos;
 	id;
+	path = null;
 	constructor(parent, accessor, flushId, pos = null, id = null) {
 		this.parent = parent;
 		this.accessor = accessor;
@@ -789,7 +790,7 @@ function writeReferenceOr(state, write, val, parent, accessor) {
 			addAssignment(ref, accessId(state, parent) + toAccess(accessor));
 			return false;
 		}
-		state.buf.push(ensureId(state, ref));
+		writeRef(state, ref);
 		return true;
 	}
 	const registered = REGISTRY.get(val);
@@ -833,7 +834,7 @@ function writeString(state, val, parent, accessor) {
 		const ref = state.strs.get(val);
 		if (ref) {
 			if (trackChannel(state, ref)) {
-				state.buf.push(ensureId(state, ref));
+				writeRef(state, ref);
 				return true;
 			}
 		} else {
@@ -1658,6 +1659,15 @@ function quote(str, startPos) {
 	}
 	return "\"" + (lastPos === startPos ? str : result + str.slice(lastPos)) + "\"";
 }
+function writeRef(state, ref) {
+	if (ref.id === null && ref.scopeId === void 0 && ref.path === null && (ref.pos === null || ref.flushId !== state.flushId)) {
+		ref.path = accessPath(state, ref);
+		ref.pos = state.buf.length;
+		ref.flushId = state.flushId;
+		ref.channel = state.channel;
+		state.buf.push(ref.path);
+	} else state.buf.push(ensureId(state, ref));
+}
 function ensureId(state, ref) {
 	if (ref.scopeId !== void 0) {
 		trackChannel(state, ref);
@@ -1682,24 +1692,21 @@ function assignId(state, ref) {
 		return ref.id;
 	}
 	ref.channel = state.channel;
+	return ref.id + "=" + (ref.path || accessPath(state, ref));
+}
+function accessPath(state, ref) {
 	let cur = ref;
 	let accessPrevValue = "";
 	do {
 		accessPrevValue = toAccess(cur.accessor) + accessPrevValue;
 		const parent = cur.parent;
 		if (parent.id) {
-			if (trackChannel(state, parent) || !parent.parent) {
-				accessPrevValue = parent.id + accessPrevValue;
-				break;
-			}
-		}
-		if (parent.flushId === state.flushId || parent.scopeId !== void 0) {
-			accessPrevValue = accessId(state, parent) + accessPrevValue;
-			break;
+			if (trackChannel(state, parent) || !parent.parent) return parent.id + accessPrevValue;
 		}
+		if (parent.flushId === state.flushId || parent.scopeId !== void 0) return accessId(state, parent) + accessPrevValue;
 		cur = parent;
 	} while (cur);
-	return ref.id + "=" + accessPrevValue;
+	return accessPrevValue;
 }
 function assignmentsToString(assignments, value) {
 	if (assignments.length > 100) return "($=>(" + assignments.join("=$,") + "=$))(" + value + ")";
@@ -2224,6 +2231,10 @@ function _subscribe(subscribers, scope) {
 	}
 	return scope;
 }
+const CLIENT_ALL = 715827882;
+function maskGroup(mask, group) {
+	return mask === 715827882 ? 1 : typeof mask === "number" ? mask >>> 1 + 2 * group & 3 : mask[group] ?? 0;
+}
 function _set_serialize_reason(reason) {
 	$chunk.boundary.state.serializeReason = reason;
 }
@@ -2233,7 +2244,7 @@ function _scope_reason() {
 	return reason;
 }
 function _serialize_if(condition, key) {
-	return condition && (condition === 1 || (typeof condition === "number" ? condition >>> key + 1 & 1 : condition[key])) ? 1 : void 0;
+	return condition && maskGroup(condition, key) ? 1 : void 0;
 }
 function _serialize_guard(condition, key) {
 	return _serialize_if(condition, key) || 0;
@@ -2435,6 +2446,24 @@ var State = class {
 		this.$global = $global;
 		if ($global.cspNonce) this.nonceAttr = " nonce" + attrAssignment($global.cspNonce);
 	}
+	flushChunk(html, scripts, pending) {
+		const { $global, nonceAttr } = this;
+		const { __flush__ } = $global;
+		if (scripts) html += "<script" + nonceAttr + ">" + scripts + "<\/script>";
+		if (__flush__) {
+			$global.__flush__ = void 0;
+			html = __flush__($global, html);
+		}
+		return pending ? html : html + this.trailerHTML;
+	}
+	walkScript() {
+		return this.runtimePrefix + ".w()";
+	}
+	resumeScript(resumes) {
+		if (this.hasWrittenResume) return this.runtimePrefix + ".r.push(" + resumes + ")";
+		this.hasWrittenResume = true;
+		return this.runtimePrefix + ".r=[" + resumes + "]";
+	}
 	get runtimePrefix() {
 		const { $global } = this;
 		return $global.runtimeId + "." + $global.renderId;
@@ -2546,6 +2575,7 @@ var Chunk = class Chunk {
 	}
 	append(chunk) {
 		this.html += chunk.html;
+		this.needsWalk ||= chunk.needsWalk;
 		this.effects = concatEffects(this.effects, chunk.effects);
 		this.scripts = concatScripts(this.scripts, chunk.scripts);
 		this.lastEffect = chunk.lastEffect || this.lastEffect;
@@ -2748,17 +2778,9 @@ var Chunk = class Chunk {
 			state.writeReorders = carried;
 		}
 		flushSerializer(boundary, state);
-		if (state.resumes) if (state.hasWrittenResume) scripts = concatScripts(scripts, runtimePrefix + ".r.push(" + state.resumes + ")");
-		else {
-			state.hasWrittenResume = true;
-			scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]");
-		}
-		else if (needsResumeArray && !state.hasWrittenResume) {
-			state.hasWrittenResume = true;
-			scripts = concatScripts(scripts, runtimePrefix + ".r=[]");
-		}
+		if (state.resumes || needsResumeArray && !state.hasWrittenResume) scripts = concatScripts(scripts, state.resumeScript(state.resumes));
 		scripts = concatScripts(scripts, reordered);
-		if (needsWalk) scripts = concatScripts(scripts, runtimePrefix + ".w()");
+		if (needsWalk) scripts = concatScripts(scripts, state.walkScript());
 		this.html = html;
 		this.scripts = scripts;
 		if (!this.async) this.effects = this.lastEffect = "";
@@ -2773,18 +2795,9 @@ var Chunk = class Chunk {
 			state.walkOnNextFlush = true;
 		}
 		this.flushScript();
-		const { scripts } = this;
-		const { $global, nonceAttr } = state;
-		const { __flush__ } = $global;
-		let { html } = this;
+		const { html, scripts } = this;
 		this.html = this.scripts = "";
-		if (scripts) html += "<script" + nonceAttr + ">" + scripts + "<\/script>";
-		if (__flush__) {
-			$global.__flush__ = void 0;
-			html = __flush__($global, html);
-		}
-		if (!boundary.count) html += state.trailerHTML;
-		return html;
+		return state.flushChunk(html, scripts, boundary.count);
 	}
 };
 function flushSerializer(boundary, serializeState) {
@@ -3164,13 +3177,13 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 			if (shouldResume || needsScript) _html(state.mark("(", scopeId + " " + accessor + " " + branchId));
 		};
 		renderNative();
-		result = _el(branchId, DYNAMIC_TAG_VAR_REGISTER_ID);
+		result = _el(scopeId, DYNAMIC_TAG_VAR_REGISTER_ID + accessor);
 	} else {
 		const chunk = getChunk();
 		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
 		const render = () => {
 			if (renderer) try {
-				_set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? 1 : 0);
+				_set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? CLIENT_ALL : 0);
 				return inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
 					content
@@ -3220,24 +3233,27 @@ const _template = (templateId, renderer, page) => {
 	return _content_resume(templateId, renderer);
 };
 function render(input = {}) {
+	return startRender(this, input, State);
+}
+function startRender(template, input, StateClass) {
 	let { $global } = input;
 	if ($global) {
 		({$global, ...input} = input);
 		$global = {
 			runtimeId: "M",
-			renderId: getDefaultRenderId(this),
+			renderId: getDefaultRenderId(template),
 			...$global
 		};
 		if (!String($global.runtimeId).match(/^[_a-z][_a-z0-9]*$/i)) throw new Error(`Invalid runtimeId: "${$global.runtimeId}". The runtimeId must start with a letter or underscore and only contain letters, numbers, and underscores.`);
 		if (!String($global.renderId).match(/^[_a-z][_a-z0-9]*$/i)) throw new Error(`Invalid renderId: "${$global.renderId}". The renderId must start with a letter or underscore and only contain letters, numbers, and underscores.`);
 	} else $global = {
 		runtimeId: "M",
-		renderId: getDefaultRenderId(this)
+		renderId: getDefaultRenderId(template)
 	};
-	const state = new State($global);
+	const state = new StateClass($global);
 	const head = new Chunk(new Boundary(state, $global.signal), null, null, state);
-	if (this["embed"]) head.render(() => writeWaitReady(this["id"], this, input));
-	else head.render(this, input);
+	if (template["embed"]) head.render(() => writeWaitReady(template["id"], template, input));
+	else head.render(template, input);
 	return new ServerRendered(head);
 }
 function getDefaultRenderId(template) {
@@ -3636,7 +3652,7 @@ const compat = {
 				writeScope(scopeId, { m5c: component.id });
 				_script(scopeId, SET_SCOPE_REGISTER_ID);
 			}
-			_set_serialize_reason(willRerender ? 1 : 0);
+			_set_serialize_reason(willRerender ? CLIENT_ALL : 0);
 			try {
 				renderer(normalizedInput);
 			} finally {

package/dist/dom/catch.feat.js

@@ -1,4 +1,4 @@
-let require_control_flow = require("../dom-BNmfm4st.js"), handlePendingTry = (fn, scope, branch) => {
+let require_control_flow = require("../dom-vuB05Hnj.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-BsAS26Ze.mjs";
+import { $t as caughtError, en as installCatch, g as renderCatch, tn as placeholderShown } from "../dom-z4IMlmeO.mjs";
 //#region src/dom/catch.feat.ts
 installCatch((runEffects) => (effects, checkPending = placeholderShown.has(effects)) => {
 	if (checkPending || caughtError.has(effects)) {

package/dist/dom/control-flow.d.ts

@@ -17,11 +17,9 @@ export declare let _dynamic_tag: (nodeAccessor: EncodedAccessor, getContent?: ((
 export declare const _dynamic_tag_content: (nodeAccessor: EncodedAccessor) => Signal<Renderer | undefined>;
 export declare let bindNativeTagVar: undefined | ((branch: Scope) => void);
 export declare function installDynamicTagVar(bind: typeof bindNativeTagVar): void;
-export declare const _resume_dynamic_tag: () => typeof dynamicTagScript;
-declare function dynamicTagScript(branch: Scope): void;
+export declare function dynamicTagScript(branch: Scope): void;
 export declare function setConditionalRenderer<T>(scope: Scope, nodeAccessor: Accessor, newRenderer: T, createBranch: ($global: Scope[typeof AccessorProp.Global], renderer: NonNullable<T>, parentScope: Scope, parentNode: ParentNode) => BranchScope): void;
 export declare const _for_of: (nodeAccessor: EncodedAccessor, template?: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown>) => (scope: Scope, value: [all: unknown[], by?: ((item: unknown, index: number) => unknown) | undefined]) => void;
 export declare const _for_in: (nodeAccessor: EncodedAccessor, template?: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown>) => (scope: Scope, value: [obj: {}, by?: ((key: string, v: unknown) => unknown) | undefined]) => void;
 export declare const _for_to: (nodeAccessor: EncodedAccessor, template?: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown>) => (scope: Scope, value: [to: number, from: number, step: number, by?: ((v: number) => unknown) | undefined]) => void;
 export declare const _for_until: (nodeAccessor: EncodedAccessor, template?: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown>) => (scope: Scope, value: [until: number, from: number, step: number, by?: ((v: number) => unknown) | undefined]) => void;
-export {};

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

@@ -1,3 +1,3 @@
-let require_control_flow = require("../dom-BNmfm4st.js");
+let require_control_flow = require("../dom-vuB05Hnj.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-BsAS26Ze.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-z4IMlmeO.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-BNmfm4st.js");
+let require_control_flow = require("../dom-vuB05Hnj.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-BsAS26Ze.mjs";
+import { y as _attr_details_or_dialog_open_script, z as controllableScripts } from "../dom-z4IMlmeO.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-BNmfm4st.js");
+let require_control_flow = require("../dom-vuB05Hnj.js");
 //#region src/dom/controllable-select.feat.ts
 require_control_flow.z[3] = require_control_flow.N;
 //#endregion

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

@@ -1,4 +1,4 @@
-import { N as _attr_select_value_script, z as controllableScripts } from "../dom-BsAS26Ze.mjs";
+import { N as _attr_select_value_script, z as controllableScripts } from "../dom-z4IMlmeO.mjs";
 //#region src/dom/controllable-select.feat.ts
 controllableScripts[3] = _attr_select_value_script;
 //#endregion

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

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

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

@@ -1,4 +1,4 @@
-import { A as _attr_input_value_script, z as controllableScripts } from "../dom-BsAS26Ze.mjs";
+import { A as _attr_input_value_script, z as controllableScripts } from "../dom-z4IMlmeO.mjs";
 //#region src/dom/controllable-textarea.feat.ts
 controllableScripts[2] = _attr_input_value_script;
 //#endregion

package/dist/dom/controllable.feat.js

@@ -1,3 +1,3 @@
-let require_control_flow = require("../dom-BNmfm4st.js");
+let require_control_flow = require("../dom-vuB05Hnj.js");
 require("./controllable-input.feat.js"), require("./controllable-open.feat.js"), require("./controllable-select.feat.js"), require_control_flow.R.INPUT = require_control_flow.P, require_control_flow.R.TEXTAREA = require_control_flow.L, require_control_flow.R.SELECT = require_control_flow.I, require_control_flow.R.DETAILS = require_control_flow.R.DIALOG = require_control_flow.F;
 //#endregion

package/dist/dom/controllable.feat.mjs

@@ -1,4 +1,4 @@
-import { F as _controllable_open, I as _controllable_select, L as _controllable_textarea, P as _controllable_input, R as controllableRenders } from "../dom-BsAS26Ze.mjs";
+import { F as _controllable_open, I as _controllable_select, L as _controllable_textarea, P as _controllable_input, R as controllableRenders } from "../dom-z4IMlmeO.mjs";
 import "./controllable-input.feat.mjs";
 import "./controllable-open.feat.mjs";
 import "./controllable-select.feat.mjs";

package/dist/dom/dynamic-tag-script.feat.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/dom/dynamic-tag-script.feat.js

@@ -0,0 +1,4 @@
+let require_control_flow = require("../dom-vuB05Hnj.js");
+//#region src/dom/dynamic-tag-script.feat.ts
+require_control_flow._t._d = require_control_flow._n(require_control_flow.p);
+//#endregion