marko 6.3.34 → 6.3.36

package/dist/{dom-6hBvZW7X.mjs → dom-BKDjlXIl.mjs}

@@ -52,7 +52,7 @@ let unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeStyleAttr = (c) => c === ";" ? "
 	let childScopeAccessor = "A" + nodeAccessor, rendererAccessor = "D" + nodeAccessor;
 	return (scope, newRenderer, getInput) => {
 		let normalizedRenderer = normalizeDynamicRenderer(newRenderer);
-		if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.a || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) if (setConditionalRenderer(scope, nodeAccessor, normalizedRenderer || (getContent ? getContent(scope) : void 0), createBranchWithTagNameOrRenderer), getTagVar && (scope[childScopeAccessor].T = (value) => getTagVar()(scope, value)), typeof normalizedRenderer == "string") {
+		if (scope[rendererAccessor] !== (scope[rendererAccessor] = rendererKey(normalizedRenderer)) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) if (setConditionalRenderer(scope, nodeAccessor, normalizedRenderer || (getContent ? getContent(scope) : void 0), createBranchWithTagNameOrRenderer), getTagVar && (scope[childScopeAccessor] ? (scope[childScopeAccessor].T = (value) => getTagVar()(scope, value), typeof normalizedRenderer == "string" && bindNativeTagVar?.(scope[childScopeAccessor])) : getTagVar()(scope, void 0)), typeof normalizedRenderer == "string") {
 			if (getContent) {
 				let content = getContent(scope);
 				setConditionalRenderer(scope[childScopeAccessor], "a", content, createAndSetupBranch), content.f && subscribeToScopeSet(content.e, content.f, scope[childScopeAccessor].Aa);
@@ -78,9 +78,9 @@ let unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeStyleAttr = (c) => c === ";" ? "
 	nodeAccessor = decodeAccessor(nodeAccessor);
 	let childScopeAccessor = "A" + nodeAccessor, rendererAccessor = "D" + nodeAccessor;
 	return (scope, renderer) => {
-		if (scope[rendererAccessor] !== (scope[rendererAccessor] = renderer?.a || renderer) && (setConditionalRenderer(scope, nodeAccessor, renderer, createAndSetupBranch), renderer?.f && subscribeToScopeSet(renderer.e, renderer.f, scope[childScopeAccessor])), renderer) for (let accessor in renderer.g) renderer.g[accessor](scope[childScopeAccessor], renderer.h[accessor]);
+		if (scope[rendererAccessor] !== (scope[rendererAccessor] = rendererKey(renderer)) && (setConditionalRenderer(scope, nodeAccessor, renderer, createAndSetupBranch), renderer?.f && subscribeToScopeSet(renderer.e, renderer.f, scope[childScopeAccessor])), renderer) for (let accessor in renderer.g) renderer.g[accessor](scope[childScopeAccessor], renderer.h[accessor]);
 	};
-}), _resume_dynamic_tag = /*@__PURE__*/ withBranches(() => _resume("d", dynamicTagScript)), loop = /*@__PURE__*/ withBranches((forEach) => (nodeAccessor, template, walks, setup, params) => {
+}), bindNativeTagVar, _resume_dynamic_tag = /*@__PURE__*/ withBranches(() => _resume("d", dynamicTagScript)), loop = /*@__PURE__*/ withBranches((forEach) => (nodeAccessor, template, walks, setup, params) => {
 	nodeAccessor = decodeAccessor(nodeAccessor);
 	let scopesAccessor = "A" + nodeAccessor, keyedScopesAccessor = "O" + nodeAccessor, renderer = _content("", template, walks, setup)();
 	return (scope, value) => {
@@ -462,9 +462,13 @@ function _var(scope, childAccessor, signal) {
 function _return_change(scope, changeHandler) {
 	scope.U = changeHandler || void 0;
 }
-function _id({ $: $global }) {
-	let id = tagIdsByGlobal.get($global) || 0;
-	return tagIdsByGlobal.set($global, id + 1), "c" + $global.runtimeId + $global.renderId + id.toString(36);
+function _id(scope, accessor) {
+	let id = accessor !== void 0 && scope[accessor];
+	if (!id) {
+		let $global = scope.$, n = tagIdsByGlobal.get($global) || 0;
+		tagIdsByGlobal.set($global, n + 1), id = "c" + $global.runtimeId + $global.renderId + n.toString(36), accessor !== void 0 && (scope[accessor] = id);
+	}
+	return id;
 }
 function _script(id, fn) {
 	return _resume(id, fn), (scope) => {
@@ -474,17 +478,17 @@ function _script(id, fn) {
 function _el_read(value) {
 	return value;
 }
-function* traverse(scope, path, i = path.length - 1) {
-	if (scope) if (Symbol.iterator in scope) for (let childScope of scope.values()) yield* traverse(childScope, path, i);
+function* traverse(scope, path, args, i = path.length - 1) {
+	if (scope) if (Symbol.iterator in scope) for (let childScope of scope.values()) yield* traverse(childScope, path, args, i);
 	else {
 		let item = scope[path[i]];
-		i ? yield* traverse(item, path, i - 1) : yield typeof item == "function" ? item() : item;
+		i ? yield* traverse(item, path, args, i - 1) : yield typeof item == "function" ? item(...args) : item;
 	}
 }
 function _hoist(...path) {
 	return path = path.map((p) => typeof p == "string" ? p : decodeAccessor(p)), (scope) => {
-		let fn = () => traverse(scope, path).next().value;
-		return fn[Symbol.iterator] = () => traverse(scope, path), fn;
+		let fn = (...args) => traverse(scope, path, args).next().value;
+		return fn[Symbol.iterator] = () => traverse(scope, path, []), fn;
 	};
 }
 function _hoist_resume(id, ...path) {
@@ -689,7 +693,7 @@ function _attr_style_item(element, name, value) {
 }
 function _style_shell(scope, nodeAccessor) {
 	let element = scope[nodeAccessor], id = _id(scope);
-	_attr_nonce(scope, nodeAccessor), element.className = id, _text_content(element, "." + id + "~*{}");
+	_attr_nonce(scope, nodeAccessor), _attr(element, "class", id), _text_content(element, "." + id + "~*{}");
 }
 function _style_rule_item(element, name, value) {
 	let text = element.textContent, decl = name + ":" + escapeStyleValue(_to_text(value)) + ";", start = text.indexOf("{" + name + ":");
@@ -756,7 +760,7 @@ function attrsInternal(scope, nodeAccessor, nextAttrs, controllable) {
 }
 function _attr_content(scope, nodeAccessor, value) {
 	let content = normalizeClientRender(value);
-	scope["D" + nodeAccessor] !== (scope["D" + nodeAccessor] = content?.a) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.f && subscribeToScopeSet(content.e, content.f, scope["A" + nodeAccessor]));
+	scope["D" + nodeAccessor] !== (scope["D" + nodeAccessor] = rendererKey(content)) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.f && subscribeToScopeSet(content.e, content.f, scope["A" + nodeAccessor]));
 	for (let accessor in content?.g) content.g[accessor](scope["A" + nodeAccessor], content.h[accessor]);
 }
 function _attrs_script(scope, nodeAccessor) {
@@ -874,7 +878,7 @@ function _attr_input_value_dynamic_default(scope, nodeAccessor, value) {
 }
 function _attr_input_value(scope, nodeAccessor, value, valueChange, setDefault = _attr_input_value_default) {
 	let el = scope[nodeAccessor], normalizedValue = normalizeAttrValue(value) || "";
-	scope["E" + nodeAccessor] = valueChange, scope["G" + nodeAccessor] = normalizedValue, scope["F" + nodeAccessor] = valueChange ? 2 : 5, valueChange && scope.H < runId ? setInputValue(el, normalizedValue) : setDefault(scope, nodeAccessor, normalizedValue);
+	scope["E" + nodeAccessor] = valueChange, scope["G" + nodeAccessor] = normalizedValue, scope["F" + nodeAccessor] = valueChange ? 2 : 5, valueChange && scope.H < runId ? setInputValue(el, normalizedValue) : setDefault(scope, nodeAccessor, value);
 }
 function _attr_input_value_attribute_default(scope, nodeAccessor, value) {
 	_attr(scope[nodeAccessor], "value", value);
@@ -1119,9 +1123,15 @@ function renderCatch(scope, error) {
 		placeholderBranch && (tryWithCatch.O && (tryWithCatch.O.i = 0), owner["A" + tryWithCatch.C] = placeholderBranch, destroyBranch(tryWithCatch)), caughtError.add(pendingEffects), setConditionalRenderer(owner, tryWithCatch.C, tryWithCatch.E, createAndSetupBranch), tryWithCatch.E?.d?.(owner["A" + tryWithCatch.C], [error]);
 	} else throw error;
 }
+function rendererKey(renderer) {
+	return renderer?.e ? renderer.a + " " + renderer.e.L : renderer?.a || renderer;
+}
 function patchDynamicTag(fn) {
 	_dynamic_tag = fn(_dynamic_tag);
 }
+function installDynamicTagVar(bind) {
+	bindNativeTagVar = bind;
+}
 function dynamicTagScript(branch) {
 	_attrs_script(branch, "a");
 }
@@ -1140,4 +1150,4 @@ function byFirstArg(name) {
 	return name;
 }
 //#endregion
-export { _html as $, queueEffect as $t, _attr_select_value as A, _id as At, _attr_class as B, _assert_init as Bt, _attr_input_checked_default as C, _closure_get as Ct, _attr_input_value_default as D, _for_selector as Dt, _attr_input_value_attribute_default as E, _for_closure as Et, _controllable_select as F, _return as Ft, _attr_style as G, _on as Gt, _attr_class_items as H, insertBranchBefore as Ht, _controllable_textarea as I, _return_change as It, _attrs as J, caughtError as Jt, _attr_style_item as K, $signal as Kt, controllableRenders as L, _script as Lt, _attr_select_value_script as M, _let as Mt, _controllable_input as N, _let_change as Nt, _attr_input_value_dynamic_default as O, _hoist as Ot, _controllable_open as P, _or as Pt, _attrs_script as Q, queueAsyncRender as Qt, controllableScripts as R, _var as Rt, _attr_input_checkedValue_script as S, _closure as St, _attr_input_value as T, _el_read as Tt, _attr_content as U, removeAndDestroyBranch as Ut, _attr_class_item as V, destroyBranch as Vt, _attr_nonce as W, syncGen as Wt, _attrs_partial as X, placeholderShown as Xt, _attrs_content as Y, installCatch as Yt, _attrs_partial_content as Z, prepareEffects as Zt, _attr_details_or_dialog_open_default as _, getRegisteredWithScope as _t, _for_in as a, forTo as an, _to_text as at, _attr_input_checkedValue as b, ready as bt, _for_until as c, _call as cn, _content as ct, _show as d, createAndSetupBranch as dt, run as en, _lifecycle as et, _try as f, createBranch as ft, _attr_details_or_dialog_open as g, _var_resume as gt, renderCatch as h, _resume as ht, _dynamic_tag_content as i, forOf as in, _text_content as it, _attr_select_value_default as j, _if_closure as jt, _attr_input_value_script as k, _hoist_resume as kt, _if as l, decodeAccessor as ln, _content_closures as lt, patchDynamicTag as m, _el as mt, _await_promise as n, runId as nn, _style_shell as nt, _for_of as o, forUntil as on, insertChildNodes as ot, addAwaitCounter as p, setupBranch as pt, _attr_style_items as q, $signalReset as qt, _dynamic_tag as r, forIn as rn, _text as rt, _for_to as s, _assert_hoist as sn, toInsertNode as st, _await_content as t, runEffects as tn, _style_rule_item as tt, _resume_dynamic_tag as u, _content_resume as ut, _attr_details_or_dialog_open_script as v, init as vt, _attr_input_checked_script as w, _const as wt, _attr_input_checkedValue_default as x, _child_setup as xt, _attr_input_checked as y, initEmbedded as yt, _attr as z, _var_change as zt };
+export { _attrs_script as $, queueAsyncRender as $t, _attr_input_value_script as A, _hoist_resume as At, _attr as B, _var_change as Bt, _attr_input_checkedValue_script as C, _closure as Ct, _attr_input_value_attribute_default as D, _for_closure as Dt, _attr_input_value as E, _el_read as Et, _controllable_open as F, _or as Ft, _attr_nonce as G, syncGen as Gt, _attr_class_item as H, destroyBranch as Ht, _controllable_select as I, _return as It, _attr_style_items as J, $signalReset as Jt, _attr_style as K, _on as Kt, _controllable_textarea as L, _return_change as Lt, _attr_select_value_default as M, _if_closure as Mt, _attr_select_value_script as N, _let as Nt, _attr_input_value_default as O, _for_selector as Ot, _controllable_input as P, _let_change as Pt, _attrs_partial_content as Q, prepareEffects as Qt, controllableRenders as R, _script as Rt, _attr_input_checkedValue_default as S, _child_setup as St, _attr_input_checked_script as T, _const as Tt, _attr_class_items as U, insertBranchBefore as Ut, _attr_class as V, _assert_init as Vt, _attr_content as W, removeAndDestroyBranch as Wt, _attrs_content as X, installCatch as Xt, _attrs as Y, caughtError as Yt, _attrs_partial as Z, placeholderShown as Zt, _attr_details_or_dialog_open as _, _var_resume as _t, _for_in as a, forOf as an, _text_content as at, _attr_input_checked as b, initEmbedded as bt, _for_until as c, _assert_hoist as cn, toInsertNode as ct, _show as d, _content_resume as dt, queueEffect as en, _html as et, _try as f, createAndSetupBranch as ft, renderCatch as g, _resume as gt, patchDynamicTag as h, _el as ht, _dynamic_tag_content as i, forIn as in, _text as it, _attr_select_value as j, _id as jt, _attr_input_value_dynamic_default as k, _hoist as kt, _if as l, _call as ln, _content as lt, installDynamicTagVar as m, setupBranch as mt, _await_promise as n, runEffects as nn, _style_rule_item as nt, _for_of as o, forTo as on, _to_text as ot, addAwaitCounter as p, createBranch as pt, _attr_style_item as q, $signal as qt, _dynamic_tag as r, runId as rn, _style_shell as rt, _for_to as s, forUntil as sn, insertChildNodes as st, _await_content as t, run as tn, _lifecycle as tt, _resume_dynamic_tag as u, decodeAccessor as un, _content_closures as ut, _attr_details_or_dialog_open_default as v, getRegisteredWithScope as vt, _attr_input_checked_default as w, _closure_get as wt, _attr_input_checkedValue as x, ready as xt, _attr_details_or_dialog_open_script as y, init as yt, controllableScripts as z, _var as zt };

package/dist/dom.js

@@ -1,17 +1,17 @@
-let require_control_flow = require("./dom-B-XpL2_H.js"), empty = [], rest = Symbol(), classIdToBranch = /* @__PURE__ */ new Map(), classEventResolver, scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
-	require_control_flow.vt($global.runtimeId);
+let require_control_flow = require("./dom-59H9kVUF.js"), empty = [], rest = Symbol(), classIdToBranch = /* @__PURE__ */ new Map(), classEventResolver, scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
+	require_control_flow.yt($global.runtimeId);
 	let render = self[$global.runtimeId]?.[$global.renderId], scopes = render && scopesByRender.get(render);
 	return render && !scopes && scopesByRender.set(render, scopes = {}), scopes;
 }, compat = {
-	patchDynamicTag: require_control_flow.m,
-	queueEffect: require_control_flow.$t,
+	patchDynamicTag: require_control_flow.h,
+	queueEffect: require_control_flow.en,
 	init(warp10Noop) {
-		require_control_flow.ht("$C_s", (scope) => {
+		require_control_flow.gt("$C_s", (scope) => {
 			if (getRenderScopes(scope.$)[scope.L] = scope, scope.m5c && classIdToBranch.set(scope.m5c, scope), classEventResolver) for (let key in scope) {
 				let resolved = classEventResolver(scope[key], scope);
 				resolved !== scope[key] && (scope[key] = resolved);
 			}
-		}), require_control_flow.ht("$C_b", warp10Noop);
+		}), require_control_flow.gt("$C_b", warp10Noop);
 	},
 	setClassEventResolver(fn) {
 		classEventResolver = fn;
@@ -35,35 +35,35 @@ let require_control_flow = require("./dom-B-XpL2_H.js"), empty = [], rest = Symb
 		branch.S = startNode, branch.K = endNode;
 	},
 	runComponentEffects() {
-		this.effects && require_control_flow.tn(this.effects);
+		this.effects && require_control_flow.nn(this.effects);
 	},
 	runComponentDestroy() {
-		this.scope && require_control_flow.Vt(this.scope);
+		this.scope && require_control_flow.Ht(this.scope);
 	},
 	resolveRegistered(value, $global) {
-		return Array.isArray(value) && typeof value[0] == "string" ? require_control_flow._t(value[0], getRenderScopes($global)?.[value[1]]) : value;
+		return Array.isArray(value) && typeof value[0] == "string" ? require_control_flow.vt(value[0], getRenderScopes($global)?.[value[1]]) : value;
 	},
 	createRenderer(params, clone) {
-		let renderer = require_control_flow.ct("", 0, 0, 0, params)();
+		let renderer = require_control_flow.lt("", 0, 0, 0, params)();
 		return renderer.b = (branch) => {
 			let cloned = clone();
 			branch.S = cloned.startNode, branch.K = cloned.endNode;
 		}, renderer;
 	},
 	render(out, component, renderer, args) {
-		require_control_flow.vt(out.global.runtimeId);
+		require_control_flow.yt(out.global.runtimeId);
 		let branch = component.scope, created = 0;
 		if (!branch && (branch = classIdToBranch.get(component.id)) && (component.scope = branch, classIdToBranch.delete(component.id)), args[0] && typeof args[0] == "object" && "renderBody" in args[0]) {
 			let input = args[0], normalizedInput = args[0] = {};
 			for (let key in input) normalizedInput[key === "renderBody" ? "content" : key] = input[key];
 		}
-		if (component.effects = require_control_flow.Zt(() => {
-			branch ||= (created = 1, component.scope = require_control_flow.dt(out.global, renderer, renderer.e, document.body)), renderer.d?.(branch, renderer._ ? args[0] : args);
-		}), created) return require_control_flow.st(branch.S, branch.K);
+		if (component.effects = require_control_flow.Qt(() => {
+			branch ||= (created = 1, component.scope = require_control_flow.ft(out.global, renderer, renderer.e, document.body)), renderer.d?.(branch, renderer._ ? args[0] : args);
+		}), created) return require_control_flow.ct(branch.S, branch.K);
 	}
 }, _template = (id, template, walks, setup, inputSignal) => {
-	let renderer = require_control_flow.ct(id, template, walks, setup, inputSignal)();
-	return renderer.mount = mount, renderer._ = renderer, require_control_flow.ht(id, renderer);
+	let renderer = require_control_flow.lt(id, template, walks, setup, inputSignal)();
+	return renderer.mount = mount, renderer._ = renderer, require_control_flow.gt(id, renderer);
 };
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region src/common/attr-tag.ts
@@ -102,25 +102,25 @@ function mount(input = {}, reference, position) {
 			parentNode = reference.parentNode, nextSibling = reference.nextSibling;
 			break;
 	}
-	let curValue, args = this.d, effects = require_control_flow.Zt(() => {
-		branch = require_control_flow.ft($global, this, void 0, parentNode), branch.T = (newValue) => {
+	let curValue, args = this.d, effects = require_control_flow.Qt(() => {
+		branch = require_control_flow.pt($global, this, void 0, parentNode), branch.T = (newValue) => {
 			curValue = newValue;
 		}, this.c?.(branch), args?.(branch, input);
 	});
-	return require_control_flow.ot(parentNode, nextSibling, branch.S, branch.K), require_control_flow.tn(effects), {
+	return require_control_flow.st(parentNode, nextSibling, branch.S, branch.K), require_control_flow.nn(effects), {
 		get value() {
 			return curValue;
 		},
 		set value(newValue) {
-			require_control_flow.zt(branch, newValue);
+			require_control_flow.Bt(branch, newValue);
 		},
 		update(newInput = {}) {
-			args && (newInput.$global && ({$global, ...newInput} = newInput), require_control_flow.tn(require_control_flow.Zt(() => {
+			args && (newInput.$global && ({$global, ...newInput} = newInput), require_control_flow.nn(require_control_flow.Qt(() => {
 				args(branch, newInput);
 			})));
 		},
 		destroy() {
-			require_control_flow.Ut(branch);
+			require_control_flow.Wt(branch);
 		}
 	};
 }
@@ -130,13 +130,13 @@ function _load_template(id, load) {
 	let pending, lazyTemplate = _template(id, 0, 0, (branch) => {
 		let awaitCounter = require_control_flow.p(branch);
 		branch.X ||= /* @__PURE__ */ new Map(), (pending ||= load()).then((renderer) => {
-			Object.assign(lazyTemplate, renderer), require_control_flow.Qt(branch, (branch) => insertLoaded(renderer, branch, branch.S, awaitCounter));
+			Object.assign(lazyTemplate, renderer), require_control_flow.$t(branch, (branch) => insertLoaded(renderer, branch, branch.S, awaitCounter));
 		}, loadFailed(branch, awaitCounter));
 	}, _load_signal(() => (pending ||= load()).then((r) => ({ _: r.d }))));
 	return lazyTemplate;
 }
 function _load_setup(nodeAccessor, childScopeAccessor, load) {
-	nodeAccessor = require_control_flow.ln(nodeAccessor), childScopeAccessor = require_control_flow.ln(childScopeAccessor);
+	nodeAccessor = require_control_flow.un(nodeAccessor), childScopeAccessor = require_control_flow.un(childScopeAccessor);
 	let pending, renderer;
 	return (owner) => {
 		let child = owner[childScopeAccessor];
@@ -144,33 +144,33 @@ function _load_setup(nodeAccessor, childScopeAccessor, load) {
 		else {
 			let awaitCounter = require_control_flow.p(owner);
 			child.X ||= /* @__PURE__ */ new Map(), (pending ||= load()).then((mod) => {
-				renderer = require_control_flow.ct("", ...mod._)(), require_control_flow.Qt(child, (child) => insertLoaded(renderer, child, owner[nodeAccessor], awaitCounter));
+				renderer = require_control_flow.lt("", ...mod._)(), require_control_flow.$t(child, (child) => insertLoaded(renderer, child, owner[nodeAccessor], awaitCounter));
 			}, loadFailed(child, awaitCounter));
 		}
 	};
 }
 function insertLoaded(renderer, branch, marker, awaitCounter) {
 	let parent = marker.parentNode, values = branch.X, insert = () => {
-		require_control_flow.Ht(branch, parent, marker), marker.remove(), awaitCounter?.c();
+		require_control_flow.Ut(branch, parent, marker), marker.remove(), awaitCounter?.c();
 	}, remaining;
-	if (require_control_flow.Wt(branch), renderer.b(branch, parent.namespaceURI), branch.X = 0, remaining = values?.size) {
+	if (require_control_flow.Gt(branch), renderer.b(branch, parent.namespaceURI), branch.X = 0, remaining = values?.size) {
 		let fail = loadFailed(branch, awaitCounter);
 		for (let [promise, entry] of values) promise.then((signal) => {
-			entry.b = signal, --remaining || require_control_flow.Qt(branch, (branch) => {
-				require_control_flow.Wt(branch), renderer.c?.(branch), values.forEach((e) => e.b._(branch, e.a)), insert();
+			entry.b = signal, --remaining || require_control_flow.$t(branch, (branch) => {
+				require_control_flow.Gt(branch), renderer.c?.(branch), values.forEach((e) => e.b._(branch, e.a)), insert();
 			});
 		}, (error) => remaining > 0 && (remaining = 0, fail(error)));
-	} else require_control_flow.pt(renderer, branch), insert();
+	} else require_control_flow.mt(renderer, branch), insert();
 }
 function loadFailed(scope, awaitCounter) {
 	return (error) => {
-		awaitCounter && (awaitCounter.m ? awaitCounter.i = 0 : awaitCounter.c()), require_control_flow.Qt(scope, require_control_flow.h, error);
+		awaitCounter && (awaitCounter.m ? awaitCounter.i = 0 : awaitCounter.c()), require_control_flow.$t(scope, require_control_flow.g, error);
 	};
 }
 function _load_signal(load) {
 	let pending, signal;
 	return (scope, value) => {
-		pending ||= load(), scope.X || !("X" in scope) && scope.H === require_control_flow.nn ? (scope.X ||= /* @__PURE__ */ new Map()).set(pending, { a: value }) : signal ? signal(scope, value) : pending.then((mod) => require_control_flow.Qt(scope, signal = mod._, value), () => 0);
+		pending ||= load(), scope.X || !("X" in scope) && scope.H === require_control_flow.rn ? (scope.X ||= /* @__PURE__ */ new Map()).set(pending, { a: value }) : signal ? signal(scope, value) : pending.then((mod) => require_control_flow.$t(scope, signal = mod._, value), () => 0);
 	};
 }
 function _load_visible_trigger(selector, options) {
@@ -196,9 +196,9 @@ function _load_race_trigger(...triggers) {
 function getSelectorOrResolve(selector, resolve) {
 	return document.querySelector(selector) || resolve();
 }
-exports.$signal = require_control_flow.Kt, exports.$signalReset = require_control_flow.qt, exports._assert_hoist = require_control_flow.sn, exports._assert_init = require_control_flow.Bt, exports._attr = require_control_flow.z, exports._attr_class = require_control_flow.B, exports._attr_class_item = require_control_flow.V, exports._attr_class_items = require_control_flow.H, exports._attr_content = require_control_flow.U, exports._attr_details_open = require_control_flow.g, exports._attr_dialog_open = require_control_flow.g, exports._attr_details_open_default = require_control_flow._, exports._attr_dialog_open_default = require_control_flow._, exports._attr_details_open_script = require_control_flow.v, exports._attr_dialog_open_script = require_control_flow.v, exports._attr_input_checked = require_control_flow.y, exports._attr_input_checkedValue = require_control_flow.b, exports._attr_input_checkedValue_default = require_control_flow.x, exports._attr_input_checkedValue_script = require_control_flow.S, exports._attr_input_checked_default = require_control_flow.C, exports._attr_input_checked_script = require_control_flow.w, exports._attr_input_value = require_control_flow.T, exports._attr_textarea_value = require_control_flow.T, exports._attr_input_value_attribute_default = require_control_flow.E, exports._attr_input_value_default = require_control_flow.D, exports._attr_textarea_value_default = require_control_flow.D, exports._attr_input_value_dynamic_default = require_control_flow.O, exports._attr_input_value_script = require_control_flow.k, exports._attr_textarea_value_script = require_control_flow.k, exports._attr_nonce = require_control_flow.W, exports._attr_select_value = require_control_flow.A, exports._attr_select_value_default = require_control_flow.j, exports._attr_select_value_script = require_control_flow.M, exports._attr_style = require_control_flow.G, exports._attr_style_item = require_control_flow.K, exports._attr_style_items = require_control_flow.q, exports._attrs = require_control_flow.J, exports._attrs_content = require_control_flow.Y, exports._attrs_partial = require_control_flow.X, exports._attrs_partial_content = require_control_flow.Z, exports._attrs_script = require_control_flow.Q, exports._await_content = require_control_flow.t, exports._await_promise = require_control_flow.n, exports._call = require_control_flow.cn, exports._child_setup = require_control_flow.xt, exports._closure = require_control_flow.St, exports._closure_get = require_control_flow.Ct, exports._const = require_control_flow.wt, exports._content = require_control_flow.ct, exports._content_closures = require_control_flow.lt, exports._content_resume = require_control_flow.ut, exports._controllable_input = require_control_flow.N, exports._controllable_open = require_control_flow.P, exports._controllable_select = require_control_flow.F, exports._controllable_textarea = require_control_flow.I, Object.defineProperty(exports, "_dynamic_tag", {
+exports.$signal = require_control_flow.qt, exports.$signalReset = require_control_flow.Jt, exports._assert_hoist = require_control_flow.cn, exports._assert_init = require_control_flow.Vt, exports._attr = require_control_flow.B, exports._attr_class = require_control_flow.V, exports._attr_class_item = require_control_flow.H, exports._attr_class_items = require_control_flow.U, exports._attr_content = require_control_flow.W, exports._attr_details_open = require_control_flow._, exports._attr_dialog_open = require_control_flow._, exports._attr_details_open_default = require_control_flow.v, exports._attr_dialog_open_default = require_control_flow.v, exports._attr_details_open_script = require_control_flow.y, exports._attr_dialog_open_script = require_control_flow.y, exports._attr_input_checked = require_control_flow.b, exports._attr_input_checkedValue = require_control_flow.x, exports._attr_input_checkedValue_default = require_control_flow.S, exports._attr_input_checkedValue_script = require_control_flow.C, exports._attr_input_checked_default = require_control_flow.w, exports._attr_input_checked_script = require_control_flow.T, exports._attr_input_value = require_control_flow.E, exports._attr_textarea_value = require_control_flow.E, exports._attr_input_value_attribute_default = require_control_flow.D, exports._attr_input_value_default = require_control_flow.O, exports._attr_textarea_value_default = require_control_flow.O, exports._attr_input_value_dynamic_default = require_control_flow.k, exports._attr_input_value_script = require_control_flow.A, exports._attr_textarea_value_script = require_control_flow.A, exports._attr_nonce = require_control_flow.G, exports._attr_select_value = require_control_flow.j, exports._attr_select_value_default = require_control_flow.M, exports._attr_select_value_script = require_control_flow.N, exports._attr_style = require_control_flow.K, exports._attr_style_item = require_control_flow.q, exports._attr_style_items = require_control_flow.J, exports._attrs = require_control_flow.Y, exports._attrs_content = require_control_flow.X, exports._attrs_partial = require_control_flow.Z, exports._attrs_partial_content = require_control_flow.Q, exports._attrs_script = require_control_flow.$, exports._await_content = require_control_flow.t, exports._await_promise = require_control_flow.n, exports._call = require_control_flow.ln, exports._child_setup = require_control_flow.St, exports._closure = require_control_flow.Ct, exports._closure_get = require_control_flow.wt, exports._const = require_control_flow.Tt, exports._content = require_control_flow.lt, exports._content_closures = require_control_flow.ut, exports._content_resume = require_control_flow.dt, exports._controllable_input = require_control_flow.P, exports._controllable_open = require_control_flow.F, exports._controllable_select = require_control_flow.I, exports._controllable_textarea = require_control_flow.L, Object.defineProperty(exports, "_dynamic_tag", {
 	enumerable: !0,
 	get: function() {
 		return require_control_flow.r;
 	}
-}), exports._dynamic_tag_content = require_control_flow.i, exports._el = require_control_flow.mt, exports._el_read = require_control_flow.Tt, exports._for_closure = require_control_flow.Et, exports._for_in = require_control_flow.a, exports._for_of = require_control_flow.o, exports._for_selector = require_control_flow.Dt, exports._for_to = require_control_flow.s, exports._for_until = require_control_flow.c, exports._hoist = require_control_flow.Ot, exports._hoist_resume = require_control_flow.kt, exports._html = require_control_flow.$, exports._id = require_control_flow.At, exports._if = require_control_flow.l, exports._if_closure = require_control_flow.jt, exports._let = require_control_flow.Mt, exports._let_change = require_control_flow.Nt, exports._lifecycle = require_control_flow.et, exports._load_event_trigger = _load_event_trigger, exports._load_idle_trigger = _load_idle_trigger, exports._load_media_trigger = _load_media_trigger, exports._load_race_trigger = _load_race_trigger, exports._load_setup = _load_setup, exports._load_signal = _load_signal, exports._load_template = _load_template, exports._load_visible_trigger = _load_visible_trigger, exports._on = require_control_flow.Gt, exports._or = require_control_flow.Pt, exports._resume = require_control_flow.ht, exports._resume_dynamic_tag = require_control_flow.u, exports._return = require_control_flow.Ft, exports._return_change = require_control_flow.It, exports._script = require_control_flow.Lt, exports._show = require_control_flow.d, exports._style_rule_item = require_control_flow.tt, exports._style_shell = require_control_flow.nt, exports._template = _template, exports._text = require_control_flow.rt, exports._text_content = require_control_flow.it, exports._to_text = require_control_flow.at, exports._try = require_control_flow.f, exports._var = require_control_flow.Rt, exports._var_change = require_control_flow.zt, exports._var_resume = require_control_flow.gt, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = require_control_flow.rn, exports.forOf = require_control_flow.in, exports.forTo = require_control_flow.an, exports.forUntil = require_control_flow.on, exports.init = require_control_flow.vt, exports.initEmbedded = require_control_flow.yt, exports.ready = require_control_flow.bt, exports.run = require_control_flow.en;
+}), exports._dynamic_tag_content = require_control_flow.i, exports._el = require_control_flow.ht, exports._el_read = require_control_flow.Et, exports._for_closure = require_control_flow.Dt, exports._for_in = require_control_flow.a, exports._for_of = require_control_flow.o, exports._for_selector = require_control_flow.Ot, exports._for_to = require_control_flow.s, exports._for_until = require_control_flow.c, exports._hoist = require_control_flow.kt, exports._hoist_resume = require_control_flow.At, exports._html = require_control_flow.et, exports._id = require_control_flow.jt, exports._if = require_control_flow.l, exports._if_closure = require_control_flow.Mt, exports._let = require_control_flow.Nt, exports._let_change = require_control_flow.Pt, exports._lifecycle = require_control_flow.tt, exports._load_event_trigger = _load_event_trigger, exports._load_idle_trigger = _load_idle_trigger, exports._load_media_trigger = _load_media_trigger, exports._load_race_trigger = _load_race_trigger, exports._load_setup = _load_setup, exports._load_signal = _load_signal, exports._load_template = _load_template, exports._load_visible_trigger = _load_visible_trigger, exports._on = require_control_flow.Kt, exports._or = require_control_flow.Ft, exports._resume = require_control_flow.gt, exports._resume_dynamic_tag = require_control_flow.u, exports._return = require_control_flow.It, exports._return_change = require_control_flow.Lt, exports._script = require_control_flow.Rt, exports._show = require_control_flow.d, exports._style_rule_item = require_control_flow.nt, exports._style_shell = require_control_flow.rt, exports._template = _template, exports._text = require_control_flow.it, exports._text_content = require_control_flow.at, exports._to_text = require_control_flow.ot, exports._try = require_control_flow.f, exports._var = require_control_flow.zt, exports._var_change = require_control_flow.Bt, exports._var_resume = require_control_flow._t, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = require_control_flow.in, exports.forOf = require_control_flow.an, exports.forTo = require_control_flow.on, exports.forUntil = require_control_flow.sn, exports.init = require_control_flow.yt, exports.initEmbedded = require_control_flow.bt, exports.ready = require_control_flow.xt, exports.run = require_control_flow.tn;

package/dist/dom.mjs

@@ -65,7 +65,7 @@ let empty = [], rest = Symbol(), classIdToBranch = /* @__PURE__ */ new Map(), cl
 	let renderer = _content(id, template, walks, setup, inputSignal)();
 	return renderer.mount = mount, renderer._ = renderer, _resume(id, renderer);
 };
-import { $ as _html, $t as queueEffect, A as _attr_select_value, At as _id, B as _attr_class, Bt as _assert_init, C as _attr_input_checked_default, Ct as _closure_get, D as _attr_input_value_default, Dt as _for_selector, E as _attr_input_value_attribute_default, Et as _for_closure, F as _controllable_select, Ft as _return, G as _attr_style, Gt as _on, H as _attr_class_items, Ht as insertBranchBefore, I as _controllable_textarea, It as _return_change, J as _attrs, K as _attr_style_item, Kt as $signal, Lt as _script, M as _attr_select_value_script, Mt as _let, N as _controllable_input, Nt as _let_change, O as _attr_input_value_dynamic_default, Ot as _hoist, P as _controllable_open, Pt as _or, Q as _attrs_script, Qt as queueAsyncRender, Rt as _var, S as _attr_input_checkedValue_script, St as _closure, T as _attr_input_value, Tt as _el_read, U as _attr_content, Ut as removeAndDestroyBranch, V as _attr_class_item, Vt as destroyBranch, W as _attr_nonce, Wt as syncGen, X as _attrs_partial, Y as _attrs_content, Z as _attrs_partial_content, Zt as prepareEffects, _ as _attr_details_or_dialog_open_default, _t as getRegisteredWithScope, a as _for_in, an as forTo, at as _to_text, b as _attr_input_checkedValue, bt as ready, c as _for_until, cn as _call, ct as _content, d as _show, dt as createAndSetupBranch, en as run, et as _lifecycle, f as _try, ft as createBranch, g as _attr_details_or_dialog_open, gt as _var_resume, h as renderCatch, ht as _resume, i as _dynamic_tag_content, in as forOf, it as _text_content, j as _attr_select_value_default, jt as _if_closure, k as _attr_input_value_script, kt as _hoist_resume, l as _if, ln as decodeAccessor, lt as _content_closures, m as patchDynamicTag, mt as _el, n as _await_promise, nn as runId, nt as _style_shell, o as _for_of, on as forUntil, ot as insertChildNodes, p as addAwaitCounter, pt as setupBranch, q as _attr_style_items, qt as $signalReset, r as _dynamic_tag, rn as forIn, rt as _text, s as _for_to, sn as _assert_hoist, st as toInsertNode, t as _await_content, tn as runEffects, tt as _style_rule_item, u as _resume_dynamic_tag, ut as _content_resume, v as _attr_details_or_dialog_open_script, vt as init, w as _attr_input_checked_script, wt as _const, x as _attr_input_checkedValue_default, xt as _child_setup, y as _attr_input_checked, yt as initEmbedded, z as _attr, zt as _var_change } from "./dom-6hBvZW7X.mjs";
+import { $ as _attrs_script, $t as queueAsyncRender, A as _attr_input_value_script, At as _hoist_resume, B as _attr, Bt as _var_change, C as _attr_input_checkedValue_script, Ct as _closure, D as _attr_input_value_attribute_default, Dt as _for_closure, E as _attr_input_value, Et as _el_read, F as _controllable_open, Ft as _or, G as _attr_nonce, Gt as syncGen, H as _attr_class_item, Ht as destroyBranch, I as _controllable_select, It as _return, J as _attr_style_items, Jt as $signalReset, K as _attr_style, Kt as _on, L as _controllable_textarea, Lt as _return_change, M as _attr_select_value_default, Mt as _if_closure, N as _attr_select_value_script, Nt as _let, O as _attr_input_value_default, Ot as _for_selector, P as _controllable_input, Pt as _let_change, Q as _attrs_partial_content, Qt as prepareEffects, Rt as _script, S as _attr_input_checkedValue_default, St as _child_setup, T as _attr_input_checked_script, Tt as _const, U as _attr_class_items, Ut as insertBranchBefore, V as _attr_class, Vt as _assert_init, W as _attr_content, Wt as removeAndDestroyBranch, X as _attrs_content, Y as _attrs, Z as _attrs_partial, _ as _attr_details_or_dialog_open, _t as _var_resume, a as _for_in, an as forOf, at as _text_content, b as _attr_input_checked, bt as initEmbedded, c as _for_until, cn as _assert_hoist, ct as toInsertNode, d as _show, dt as _content_resume, en as queueEffect, et as _html, f as _try, ft as createAndSetupBranch, g as renderCatch, gt as _resume, h as patchDynamicTag, ht as _el, i as _dynamic_tag_content, in as forIn, it as _text, j as _attr_select_value, jt as _id, k as _attr_input_value_dynamic_default, kt as _hoist, l as _if, ln as _call, lt as _content, mt as setupBranch, n as _await_promise, nn as runEffects, nt as _style_rule_item, o as _for_of, on as forTo, ot as _to_text, p as addAwaitCounter, pt as createBranch, q as _attr_style_item, qt as $signal, r as _dynamic_tag, rn as runId, rt as _style_shell, s as _for_to, sn as forUntil, st as insertChildNodes, t as _await_content, tn as run, tt as _lifecycle, u as _resume_dynamic_tag, un as decodeAccessor, ut as _content_closures, v as _attr_details_or_dialog_open_default, vt as getRegisteredWithScope, w as _attr_input_checked_default, wt as _closure_get, x as _attr_input_checkedValue, xt as ready, y as _attr_details_or_dialog_open_script, yt as init, zt as _var } from "./dom-BKDjlXIl.mjs";
 //#region src/common/attr-tag.ts
 function attrTag(attrs) {
 	return attrs[Symbol.iterator] = attrTagIterator, attrs[rest] = empty, attrs;

package/dist/html/dynamic-tag.d.ts

@@ -5,7 +5,7 @@ interface BodyContentObject {
     content: ServerRenderer;
 }
 export declare let _dynamic_tag: (scopeId: number, accessor: Accessor, tag: unknown | string | ServerRenderer | BodyContentObject, inputOrArgs: unknown, content?: (() => void) | 0, inputIsArgs?: 1, serializeReason?: 1 | 0) => unknown;
-export declare function _content(id: string, fn: ServerRenderer): ServerRenderer;
+export declare function _content(id: string, fn: ServerRenderer, scopeId?: number): ServerRenderer;
 export declare function _content_resume(id: string, fn: ServerRenderer, scopeId?: number): ServerRenderer;
 export declare const patchDynamicTag: (patch: (tag: unknown, scopeId: number, accessor: Accessor) => unknown) => void;
 export {};

package/dist/html/serializer.d.ts

@@ -5,7 +5,14 @@ export interface SerializeChannel {
     readyId?: string;
     parent?: SerializeChannel;
 }
-export declare function setDebugInfo(obj: WeakKey, file: string, loc: string | 0, vars?: Record<string, string>): void;
+interface Debug {
+    file: string;
+    loc: string | 0;
+    vars: Record<string, string | [name: string, loc?: string]> | undefined;
+    slots?: Record<string, string>;
+}
+export declare function setDebugInfo(obj: WeakKey, file: string, loc: string | 0, vars?: Debug["vars"]): void;
+export declare function setDebugSlotName(obj: WeakKey, accessor: string, name: string): void;
 export declare class Serializer {
     #private;
     pending(channel?: SerializeChannel): boolean;
@@ -23,3 +30,4 @@ export declare function getRegistered(val: WeakKey): {
 export declare function toObjectKey(name: string): string;
 export declare function toAccess(accessor: string): string;
 export declare function quote(str: string, startPos: number): string;
+export {};

package/dist/html/template.d.ts

@@ -1,6 +1,7 @@
 import { RendererProp, type Template } from "../common/types";
 export type ServerRenderer = ((...args: unknown[]) => unknown) & {
     [RendererProp.Id]?: string;
+    [RendererProp.Owner]?: number;
     [RendererProp.Embed]?: boolean;
 };
 export declare const _template: (templateId: string, renderer: ServerRenderer, page?: 1) => Template;

package/dist/html/writer.d.ts

@@ -21,6 +21,7 @@ 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 rendererKey(renderer: unknown): unknown;
 export declare function getScopeId(scope: unknown): number | undefined;
 export declare function getScopeById(scopeId: number | undefined): ScopeInternals | undefined;
 export declare function $global(): $Global & {

package/dist/html.js

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&\r]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&#13;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -255,15 +255,15 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			if (_scope_id(), _html(`<${renderer}${_attrs(input, "a", branchId, renderer)}>`), !voidElementsReg.test(renderer)) {
 				let renderContent = content || normalizeDynamicRenderer(input.content);
 				if (renderer === "textarea") _html(_attr_textarea_value(branchId, "a", input.value, input.valueChange, 1));
-				else if (renderContent) {
-					if (typeof renderContent != "function") throw Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
-					renderer === "select" && ("value" in input || "valueChange" in input) ? _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent, 1) : _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
+				else {
+					if (renderContent && typeof renderContent != "function") throw Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
+					renderer === "select" && ("value" in input || "valueChange" in input) ? _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent ? () => _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason) : void 0, 1) : renderContent && _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
 				}
 				_html(`</${renderer}>`);
 			}
 			let childScope = getScopeById(branchId), needsScript = childScope && (childScope.Ia || childScope.Ea);
 			needsScript && _script(branchId, "d"), (shouldResume || needsScript) && _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
-		})();
+		})(), result = _el(branchId, "e");
 	} else {
 		let chunk = getChunk(), beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0, render = () => {
 			if (renderer) try {
@@ -278,7 +278,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 		};
 		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;
+	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: rendererKey(renderer) }) : _scope_id(), result;
 }, patchDynamicTag = ((originalDynamicTag) => (patch) => {
 	_dynamic_tag = (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
 		let patched = patch(tag, scopeId, accessor);
@@ -1264,6 +1264,9 @@ function getContext(key) {
 function getState() {
 	return $chunk.boundary.state;
 }
+function rendererKey(renderer) {
+	return renderer?.e === void 0 ? renderer?.a || renderer : renderer.a + " " + renderer.e;
+}
 function getScopeId(scope) {
 	return scope[K_SCOPE_ID];
 }
@@ -1342,7 +1345,7 @@ function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
 	let shouldResume = serializeReason !== 0, render = normalizeServerRender(content), branchId = _peek_scope_id();
 	render && (shouldResume ? withBranchId(branchId, render) : render()), _peek_scope_id() === branchId ? _scope_id() : shouldResume && writeScope(scopeId, {
 		["A" + nodeAccessor]: writeScope(branchId, {}),
-		["D" + nodeAccessor]: render?.a
+		["D" + nodeAccessor]: rendererKey(render)
 	});
 }
 function normalizeServerRender(value) {
@@ -1857,7 +1860,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, seriali
 }
 function _textarea_value(value) {
 	let escaped = _escape(normalizeStrAttrValue(value));
-	return escaped[0] === "\n" || escaped[0] === "\r" ? "\n" + escaped : escaped;
+	return escaped[0] === "\n" ? "\n" + escaped : escaped;
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _attr("value", value);
@@ -1994,11 +1997,11 @@ function normalizeStrAttrValue(value) {
 }
 //#endregion
 //#region src/html/dynamic-tag.ts
-function _content(id, fn) {
-	return fn.a = id, fn;
+function _content(id, fn, scopeId) {
+	return fn.a = id, fn.e = scopeId, fn;
 }
 function _content_resume(id, fn, scopeId) {
-	return _resume(_content(id, fn), id, scopeId);
+	return _resume(_content(id, fn, scopeId), id, scopeId);
 }
 //#endregion
 //#region src/html/template.ts
@@ -2209,14 +2212,17 @@ function writeTriggerScript(html, triggers) {
 	let htmlStr = _escape_script(JSON.stringify(html)), exprs = triggers.map((trigger) => {
 		let options = trigger.options && toObjectExpression(trigger.options);
 		switch (trigger.type) {
-			case "visible": return `(e=>e&&new IntersectionObserver((e,i)=>e.some(e=>e.isIntersecting)&&i.disconnect()+l()${options ? `,${options}` : ""}).observe(e))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
+			case "visible": return `(e=>e&&new IntersectionObserver((e,i)=>e.some(e=>e.isIntersecting)&&i.disconnect()+l()${options ? `,${options}` : ""}).observe(e))(${querySelectorOrLoad(trigger.selector)})`;
 			case "idle": return `(self.requestIdleCallback||l)(l${options ? `,${options}` : ""})`;
 			case "media": return `(m=>m.matches?l():m.addEventListener("change",l,{once:1}))(matchMedia(${JSON.stringify(trigger.selector)}))`;
-			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
+			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(${querySelectorOrLoad(trigger.selector)})`;
 		}
 	});
 	writeScript(`((p,h,d,l=$=>{d||p.after(new Range().createContextualFragment(d=h))})=>${exprs.length > 1 ? `{${exprs.join(";")}}` : exprs[0]})(document.currentScript,${htmlStr})`);
 }
+function querySelectorOrLoad(selector) {
+	return `document.querySelector(${JSON.stringify(selector)})||l()`;
+}
 function toObjectExpression(options) {
 	let result = "{", sep = "";
 	for (let key in options) Object.hasOwn(options, key) && (result += sep + toObjectKey(key) + ":" + JSON.stringify(options[key]), sep = ",");

package/dist/html.mjs

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&\r]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&#13;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -255,15 +255,15 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			if (_scope_id(), _html(`<${renderer}${_attrs(input, "a", branchId, renderer)}>`), !voidElementsReg.test(renderer)) {
 				let renderContent = content || normalizeDynamicRenderer(input.content);
 				if (renderer === "textarea") _html(_attr_textarea_value(branchId, "a", input.value, input.valueChange, 1));
-				else if (renderContent) {
-					if (typeof renderContent != "function") throw Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
-					renderer === "select" && ("value" in input || "valueChange" in input) ? _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent, 1) : _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
+				else {
+					if (renderContent && typeof renderContent != "function") throw Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
+					renderer === "select" && ("value" in input || "valueChange" in input) ? _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent ? () => _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason) : void 0, 1) : renderContent && _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
 				}
 				_html(`</${renderer}>`);
 			}
 			let childScope = getScopeById(branchId), needsScript = childScope && (childScope.Ia || childScope.Ea);
 			needsScript && _script(branchId, "d"), (shouldResume || needsScript) && _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
-		})();
+		})(), result = _el(branchId, "e");
 	} else {
 		let chunk = getChunk(), beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0, render = () => {
 			if (renderer) try {
@@ -278,7 +278,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 		};
 		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;
+	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: rendererKey(renderer) }) : _scope_id(), result;
 }, patchDynamicTag = ((originalDynamicTag) => (patch) => {
 	_dynamic_tag = (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
 		let patched = patch(tag, scopeId, accessor);
@@ -1263,6 +1263,9 @@ function getContext(key) {
 function getState() {
 	return $chunk.boundary.state;
 }
+function rendererKey(renderer) {
+	return renderer?.e === void 0 ? renderer?.a || renderer : renderer.a + " " + renderer.e;
+}
 function getScopeId(scope) {
 	return scope[K_SCOPE_ID];
 }
@@ -1341,7 +1344,7 @@ function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
 	let shouldResume = serializeReason !== 0, render = normalizeServerRender(content), branchId = _peek_scope_id();
 	render && (shouldResume ? withBranchId(branchId, render) : render()), _peek_scope_id() === branchId ? _scope_id() : shouldResume && writeScope(scopeId, {
 		["A" + nodeAccessor]: writeScope(branchId, {}),
-		["D" + nodeAccessor]: render?.a
+		["D" + nodeAccessor]: rendererKey(render)
 	});
 }
 function normalizeServerRender(value) {
@@ -1856,7 +1859,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, seriali
 }
 function _textarea_value(value) {
 	let escaped = _escape(normalizeStrAttrValue(value));
-	return escaped[0] === "\n" || escaped[0] === "\r" ? "\n" + escaped : escaped;
+	return escaped[0] === "\n" ? "\n" + escaped : escaped;
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _attr("value", value);
@@ -1993,11 +1996,11 @@ function normalizeStrAttrValue(value) {
 }
 //#endregion
 //#region src/html/dynamic-tag.ts
-function _content(id, fn) {
-	return fn.a = id, fn;
+function _content(id, fn, scopeId) {
+	return fn.a = id, fn.e = scopeId, fn;
 }
 function _content_resume(id, fn, scopeId) {
-	return _resume(_content(id, fn), id, scopeId);
+	return _resume(_content(id, fn, scopeId), id, scopeId);
 }
 //#endregion
 //#region src/html/template.ts
@@ -2208,14 +2211,17 @@ function writeTriggerScript(html, triggers) {
 	let htmlStr = _escape_script(JSON.stringify(html)), exprs = triggers.map((trigger) => {
 		let options = trigger.options && toObjectExpression(trigger.options);
 		switch (trigger.type) {
-			case "visible": return `(e=>e&&new IntersectionObserver((e,i)=>e.some(e=>e.isIntersecting)&&i.disconnect()+l()${options ? `,${options}` : ""}).observe(e))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
+			case "visible": return `(e=>e&&new IntersectionObserver((e,i)=>e.some(e=>e.isIntersecting)&&i.disconnect()+l()${options ? `,${options}` : ""}).observe(e))(${querySelectorOrLoad(trigger.selector)})`;
 			case "idle": return `(self.requestIdleCallback||l)(l${options ? `,${options}` : ""})`;
 			case "media": return `(m=>m.matches?l():m.addEventListener("change",l,{once:1}))(matchMedia(${JSON.stringify(trigger.selector)}))`;
-			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
+			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(${querySelectorOrLoad(trigger.selector)})`;
 		}
 	});
 	writeScript(`((p,h,d,l=$=>{d||p.after(new Range().createContextualFragment(d=h))})=>${exprs.length > 1 ? `{${exprs.join(";")}}` : exprs[0]})(document.currentScript,${htmlStr})`);
 }
+function querySelectorOrLoad(selector) {
+	return `document.querySelector(${JSON.stringify(selector)})||l()`;
+}
 function toObjectExpression(options) {
 	let result = "{", sep = "";
 	for (let key in options) Object.hasOwn(options, key) && (result += sep + toObjectKey(key) + ":" + JSON.stringify(options[key]), sep = ",");