marko 6.4.2 → 6.4.4

package/dist/debug/{dom-BLbR0hEx.js → dom-CUxvM4i9.js}

@@ -23,6 +23,7 @@ const AbortControllers = "#AbortControllers";
 const AbortScopes = "#AbortScopes";
 const AwaitCounter = "#AwaitCounter";
 const BranchAccessor = "#BranchAccessor";
+const BranchRenders = "#BranchRenders";
 const BranchScopes = "#BranchScopes";
 const CatchContent = "#CatchContent";
 const ClosestBranch = "#ClosestBranch";
@@ -67,6 +68,8 @@ const Params = "params";
 const Owner = "owner";
 const Accessor = "accessor";
 const LocalClosures = "localClosures";
+const Returns = "returns";
+const Lazy = "lazy";
 //#endregion
 //#region src/common/helpers.ts
 const htmlAttrNameReg = /^[^a-z_]|[^a-z0-9._:-]/i;
@@ -342,16 +345,19 @@ let rendering;
 let runId = 2;
 let pendingEffects = [];
 let pendingRenders = [];
-const scopeKeyOffset = 1e6;
+const ranRenders = /*@__PURE__*/ new WeakMap();
 function queueRender(scope, signal, signalKey, value, scopeKey = scope["#Id"]) {
 	let render;
 	if (signalKey >= 0 && (render = scope[signalKey])) {
 		render[Value] = value;
-		if (render["gen"] === runId || catchEnabled && render["pending"]) return;
+		if (render["gen"] === runId || catchEnabled && render["pending"]) {
+			if (!render["pending"] && ranRenders.get(render) === runId) console.error("A render was queued again after it ran in this update, so its latest value is dropped. This is a bug in Marko.");
+			return;
+		}
 		render["gen"] = runId;
 	} else {
 		render = {
-			["key"]: scopeKey * scopeKeyOffset + signalKey,
+			["key"]: scopeKey * 1e6 + signalKey,
 			[Scope]: scope,
 			[Signal]: signal,
 			[Value]: value,
@@ -361,7 +367,7 @@ function queueRender(scope, signal, signalKey, value, scopeKey = scope["#Id"]) {
 	}
 	queuePendingRender(render);
 }
-function queuePendingRender(render) {
+let queuePendingRender = (render) => {
 	let i = pendingRenders.push(render) - 1;
 	while (i) {
 		const parentIndex = i - 1 >> 1;
@@ -371,6 +377,34 @@ function queuePendingRender(render) {
 		i = parentIndex;
 	}
 	pendingRenders[i] = render;
+};
+function createBranchRenders(scope, scopeKey) {
+	return {
+		["key"]: scopeKey * 1e6 - 1,
+		[Scope]: scope,
+		[Signal]: runBranchRenders,
+		[Value]: [],
+		["gen"]: 0
+	};
+}
+function installBranchRenders() {
+	const queue = queuePendingRender;
+	queuePendingRender = (render) => {
+		const branchRenders = render[Scope][ClosestBranch]?.[BranchRenders];
+		if (branchRenders) {
+			if (branchRenders["gen"] !== runId && !branchRenders["pending"]) branchRenders[Value] = [];
+			branchRenders["gen"] = runId;
+			const renders = branchRenders[Value];
+			if (!renders.length) queuePendingRender(branchRenders);
+			const prev = pendingRenders;
+			pendingRenders = renders;
+			queue(render);
+			pendingRenders = prev;
+		} else queue(render);
+	};
+}
+function runBranchRenders(_scope, renders) {
+	runRenders(renders);
 }
 function queueEffect(scope, fn) {
 	pendingEffects.push(fn, scope);
@@ -422,26 +456,27 @@ function installCatch(catchEffects, wrapRender) {
 	runEffects = catchEffects;
 	runRender = wrapRender(runRender);
 }
-function runRenders() {
-	while (pendingRenders.length) {
-		const render = pendingRenders[0];
-		const item = pendingRenders.pop();
+function runRenders(renders = pendingRenders) {
+	while (renders.length) {
+		const render = renders[0];
+		const item = renders.pop();
 		if (render !== item) {
 			let i = 0;
-			const mid = pendingRenders.length >> 1;
-			const key = (pendingRenders[0] = item)["key"];
+			const mid = renders.length >> 1;
+			const key = (renders[0] = item)["key"];
 			while (i < mid) {
 				let bestChild = (i << 1) + 1;
 				const right = bestChild + 1;
-				if (right < pendingRenders.length && pendingRenders[right]["key"] - pendingRenders[bestChild]["key"] < 0) bestChild = right;
-				if (pendingRenders[bestChild]["key"] - key >= 0) break;
+				if (right < renders.length && renders[right]["key"] - renders[bestChild]["key"] < 0) bestChild = right;
+				if (renders[bestChild]["key"] - key >= 0) break;
 				else {
-					pendingRenders[i] = pendingRenders[bestChild];
+					renders[i] = renders[bestChild];
 					i = bestChild;
 				}
 			}
-			pendingRenders[i] = item;
+			renders[i] = item;
 		}
+		ranRenders.set(render, runId);
 		runRender(render);
 	}
 }
@@ -685,9 +720,9 @@ function _for_closure(ownerLoopNodeAccessor, fn) {
 	const scopeAccessor = BranchScopes$1 + ownerLoopNodeAccessor;
 	const ownerSignal = (ownerScope) => {
 		const scopes = toArray(ownerScope[scopeAccessor]);
-		if (scopes.length) queueRender(ownerScope, () => {
+		queueRender(ownerScope, () => {
 			for (const scope of scopes) if (scope["#Gen"] > 0 && scope["#Gen"] < runId) fn(scope);
-		}, -1, 0, scopes[0]["#Id"]);
+		}, -1);
 	};
 	ownerSignal._ = fn;
 	return ownerSignal;
@@ -697,8 +732,7 @@ function _for_selector(ownerLoopNodeAccessor, ownerValueAccessor, keyValueAccess
 	const mapAccessor = KeyedScopes + ownerLoopNodeAccessor;
 	const prevKeyProp = `${PreviousKey}${ownerValueAccessor}`;
 	const ownerSignal = (ownerScope) => {
-		const scopes = toArray(ownerScope[scopeAccessor]);
-		if (ownerScope["#Gen"] < runId && scopes.length) {
+		if (ownerScope["#Gen"] < runId) {
 			const nextKey = ownerScope[ownerValueAccessor];
 			queueRender(ownerScope, () => {
 				const map = keyedScopes(ownerScope, scopeAccessor, mapAccessor, keyValueAccessor);
@@ -711,7 +745,7 @@ function _for_selector(ownerLoopNodeAccessor, ownerValueAccessor, keyValueAccess
 					}
 				} else for (const scope of toArray(ownerScope[scopeAccessor])) runLiveBranch(scope, fn);
 				if (map) map[prevKeyProp] = nextKey;
-			}, -1, 0, scopes[0]["#Id"]);
+			}, -1);
 		}
 	};
 	ownerSignal._ = fn;
@@ -1082,13 +1116,13 @@ function init(runtimeId = "M") {
 						visitScope[nextToken()] = visitType === "%" ? visit.parentNode.insertBefore(new Text(), visit) : visit.previousSibling;
 						if ((branchesEnabled || lazyEnabled) && pending[pending.length - 1] !== visitScope) pending.push(visitScope);
 					}
+					if (embedRenders && !embedAnchor && visit.parentNode) embedRenders.set(embedAnchor = visit.parentNode.insertBefore(new Text(), visit), [renderId, scopeLookup]);
 				}
 				if (branchesEnabled && visitBranches) {
 					visitType = "*";
 					lastToken = "";
 					visitBranches();
 				}
-				if (embedRenders && !embedAnchor && visit?.parentNode) embedRenders.set(embedAnchor = visit.parentNode.insertBefore(new Text(), visit.nextSibling), [renderId, scopeLookup]);
 				visits.length = retained;
 				return effects;
 			};
@@ -1156,6 +1190,10 @@ function setupBranch(renderer, branch) {
 	if (renderer["setup"]) queueRender(branch, renderer[Setup], -1);
 	return branch;
 }
+function _return_setup(setup) {
+	(setup._ || setup)[Returns] = 1;
+	return setup;
+}
 function _content(id, template, walks, setup, params, dynamicScopesAccessor) {
 	walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
 	setup = setup ? setup._ || setup : void 0;
@@ -1649,11 +1687,8 @@ function getSelectValue(el, multiple) {
 	return multiple ? Array.from(el.selectedOptions, (opt) => opt.value) : el.value;
 }
 function assertSelectValueMatchesOption(el, normalizedValue, value) {
-	const multiple = Array.isArray(normalizedValue);
-	if (multiple ? normalizedValue.some(Boolean) : normalizedValue) {
-		for (const opt of el.options) if (multiple ? normalizedValue.includes(opt.value) : opt.value === normalizedValue) return;
-		console.error("A controlled `<select>`'s `value` has no matching `<option>`:", value);
-	}
+	const options = Array.from(el.options, (opt) => opt.value);
+	if ((Array.isArray(normalizedValue) ? normalizedValue : [normalizedValue]).some((v) => v && !options.includes(v))) console.error("A controlled `<select>`'s `value` has no matching `<option>`:", value);
 }
 function _attr_details_or_dialog_open_default(scope, nodeAccessor, open) {
 	if (scope["#Gen"] === runId) scope[nodeAccessor].open = isNotVoid(open);
@@ -1688,7 +1723,7 @@ function syncControllableFormInput(el, hasChanged, onChange) {
 	el._ = onChange;
 	el.c = hasChanged;
 	delegate("input", handleChange);
-	if (el.form) delegate("reset", handleFormReset);
+	delegate("reset", handleFormReset);
 	if (isResuming && hasChanged(el)) queueMicrotask(onChange);
 }
 function handleChange(ev) {
@@ -1696,7 +1731,7 @@ function handleChange(ev) {
 }
 function handleFormReset(ev) {
 	const handlers = [];
-	for (const el of ev.target.elements) if (el._ && el.c(el)) handlers.push(el._);
+	for (const el of ev.target.elements || []) if (el._ && el.c(el)) handlers.push(el._);
 	requestAnimationFrame(() => {
 		if (!ev.defaultPrevented) for (const change of handlers) change();
 	});
@@ -1993,18 +2028,19 @@ function patchDynamicTag(fn) {
 	_dynamic_tag = fn(_dynamic_tag);
 }
 let _dynamic_tag = /*@__PURE__*/ withBranches((nodeAccessor, getContent, getTagVar, inputIsArgs) => {
+	const scopeOffsetAccessor = getTagVar && getDebugKey(+nodeAccessor.slice(nodeAccessor.lastIndexOf("/") + 1) + 1, "#scopeOffset");
 	const childScopeAccessor = BranchScopes$1 + nodeAccessor;
 	const rendererAccessor = ConditionalRenderer + nodeAccessor;
 	return (scope, newRenderer, getInput) => {
 		const normalizedRenderer = normalizeDynamicRenderer(newRenderer);
-		if (scope[rendererAccessor] !== (scope[rendererAccessor] = rendererKey(normalizedRenderer)) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) {
+		if (scope[rendererAccessor] !== (scope[rendererAccessor] = rendererKey(normalizedRenderer) || (getContent ? void 0 : 0)) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) {
 			const renderer = normalizedRenderer || (getContent ? getContent(scope) : void 0);
 			setConditionalRenderer(scope, nodeAccessor, renderer, createBranchWithTagNameOrRenderer);
 			if (getTagVar) {
-				if (scope[childScopeAccessor]) {
+				if (normalizedRenderer) {
 					scope[childScopeAccessor][TagVariable] = (value) => getTagVar()(scope, value);
-					if (typeof normalizedRenderer === "string") bindNativeTagVar?.(scope[childScopeAccessor]);
-				} else getTagVar()(scope, void 0);
+					bindTagVar(scope, scope[childScopeAccessor], scope[scopeOffsetAccessor], normalizedRenderer);
+				} else getTagVar()(scope);
 			}
 			if (typeof renderer === "string") {
 				if (getContent) {
@@ -2012,7 +2048,10 @@ let _dynamic_tag = /*@__PURE__*/ withBranches((nodeAccessor, getContent, getTagV
 					setConditionalRenderer(scope[childScopeAccessor], `#${renderer.toLowerCase()}/0`, content, createAndSetupBranch);
 					if (content["accessor"]) subscribeToScopeSet(content[Owner], content[Accessor], scope[childScopeAccessor][`BranchScopes:#${renderer.toLowerCase()}/0`]);
 				}
-			} else if (renderer?.["accessor"]) subscribeToScopeSet(renderer[Owner], renderer[Accessor], scope[childScopeAccessor]);
+			} else if (renderer) {
+				setupBranch(renderer, scope[childScopeAccessor]);
+				if (renderer["accessor"]) subscribeToScopeSet(renderer[Owner], renderer[Accessor], scope[childScopeAccessor]);
+			}
 		}
 		if (normalizedRenderer) {
 			const childScope = scope[childScopeAccessor];
@@ -2048,9 +2087,9 @@ const _dynamic_tag_content = /*@__PURE__*/ withBranches((nodeAccessor) => {
 		renderer?.[LocalClosures]?.(scope[childScopeAccessor]);
 	};
 });
-let bindNativeTagVar;
+let bindTagVar;
 function installDynamicTagVar(bind) {
-	bindNativeTagVar = bind;
+	bindTagVar = bind;
 }
 function dynamicTagScript(branch) {
 	_attrs_script(branch, `#${branch[Renderer].toLowerCase()}/0`);
@@ -2203,7 +2242,6 @@ function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentSco
 	if (typeof tagNameOrRenderer === "string") assertValidTagName(tagNameOrRenderer);
 	const branch = createBranch($global, tagNameOrRenderer, parentScope, parentNode);
 	if (typeof tagNameOrRenderer === "string") branch[`#${tagNameOrRenderer.toLowerCase()}/0`] = branch[StartNode] = branch[EndNode] = document.createElementNS(tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI, tagNameOrRenderer);
-	else setupBranch(tagNameOrRenderer, branch);
 	return branch;
 }
 function bySecondArg(_item, index) {
@@ -2231,6 +2269,12 @@ Object.defineProperty(exports, "AwaitCounter", {
 		return AwaitCounter;
 	}
 });
+Object.defineProperty(exports, "BranchRenders", {
+	enumerable: true,
+	get: function() {
+		return BranchRenders;
+	}
+});
 Object.defineProperty(exports, "Clone", {
 	enumerable: true,
 	get: function() {
@@ -2267,6 +2311,12 @@ Object.defineProperty(exports, "Global", {
 		return Global;
 	}
 });
+Object.defineProperty(exports, "Lazy", {
+	enumerable: true,
+	get: function() {
+		return Lazy;
+	}
+});
 Object.defineProperty(exports, "Load", {
 	enumerable: true,
 	get: function() {
@@ -2327,6 +2377,12 @@ Object.defineProperty(exports, "PlaceholderBranch", {
 		return PlaceholderBranch;
 	}
 });
+Object.defineProperty(exports, "Returns", {
+	enumerable: true,
+	get: function() {
+		return Returns;
+	}
+});
 Object.defineProperty(exports, "Scope", {
 	enumerable: true,
 	get: function() {
@@ -2825,6 +2881,12 @@ Object.defineProperty(exports, "_return_change", {
 		return _return_change;
 	}
 });
+Object.defineProperty(exports, "_return_setup", {
+	enumerable: true,
+	get: function() {
+		return _return_setup;
+	}
+});
 Object.defineProperty(exports, "_script", {
 	enumerable: true,
 	get: function() {
@@ -2921,6 +2983,12 @@ Object.defineProperty(exports, "createBranch", {
 		return createBranch;
 	}
 });
+Object.defineProperty(exports, "createBranchRenders", {
+	enumerable: true,
+	get: function() {
+		return createBranchRenders;
+	}
+});
 Object.defineProperty(exports, "destroyBranch", {
 	enumerable: true,
 	get: function() {
@@ -2987,6 +3055,12 @@ Object.defineProperty(exports, "insertChildNodes", {
 		return insertChildNodes;
 	}
 });
+Object.defineProperty(exports, "installBranchRenders", {
+	enumerable: true,
+	get: function() {
+		return installBranchRenders;
+	}
+});
 Object.defineProperty(exports, "installCatch", {
 	enumerable: true,
 	get: function() {

package/dist/debug/dom.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_control_flow = require("./dom-BLbR0hEx.js");
+const require_control_flow = require("./dom-CUxvM4i9.js");
 //#region src/common/attr-tag.ts
 const empty = [];
 const rest = Symbol("Attribute Tag");
@@ -205,6 +205,7 @@ function _load_template(id, load) {
 			require_control_flow.queueAsyncRender(branch, (branch) => insertLoaded(renderer, branch, branch[require_control_flow.StartNode], awaitCounter));
 		}, loadFailed(branch, awaitCounter));
 	}, _load_signal(() => (pending ||= load()).then((r) => ({ _: r["params"] || noop }))));
+	lazyTemplate[require_control_flow.Lazy] = 1;
 	return lazyTemplate;
 }
 function _load_setup(load) {
@@ -394,6 +395,7 @@ exports._or = require_control_flow._or;
 exports._resumed = require_control_flow._resumed;
 exports._return = require_control_flow._return;
 exports._return_change = require_control_flow._return_change;
+exports._return_setup = require_control_flow._return_setup;
 exports._script = require_control_flow._script;
 exports._show = require_control_flow._show;
 exports._style_rule_item = require_control_flow._style_rule_item;

package/dist/debug/dom.mjs

@@ -1,4 +1,4 @@
-import { $ as _attr_style_items, $t as removeAndDestroyBranch, A as _attr_input_value, At as _child_setup, B as _controllable_select, Bt as _id, C as _attr_details_or_dialog_open_script, Ct as _var_resume, D as _attr_input_checkedValue_script, Dn as Setup, Dt as ready, E as _attr_input_checkedValue_default, En as Params, Et as initEmbedded, F as _attr_select_value, Fn as Load, Ft as _for_closure, G as _attr_class, Gt as _return, Hn as TagVariable, Ht as _let, I as _attr_select_value_default, It as _for_selector, J as _attr_class_names, Jt as _var, K as _attr_class_item, Kt as _return_change, L as _attr_select_value_script, Lt as _global_read, M as _attr_input_value_default, Mn as EndNode, Mt as _closure_get, N as _attr_input_value_dynamic_default, Nt as _const, O as _attr_input_checked_default, Ot as readyFailed, P as _attr_input_value_script, Pn as Global, Pt as _el_read, Q as _attr_style_item, Qt as insertBranchBefore, R as _controllable_input, Rt as _hoist, S as _attr_details_or_dialog_open_default, Sn as _call, St as _resumed, T as _attr_input_checkedValue, Tn as Owner, Tt as init, Ut as _let_change, V as _controllable_textarea, Vn as StartNode, Vt as _if_closure, W as _attr, Wt as _or, X as _attr_nonce, Xt as _assert_init, Y as _attr_content, Yt as _var_change, Z as _attr_style, Zt as destroyBranch, _n as forTo, _t as createAndSetupBranch, a as _for_in, an as $signalReset, at as _html, bn as _assert_hoist, bt as _dynamic_tag_var_resume, c as _for_to, cn as queueAsyncRender, ct as _style_shell, d as _for_until_unkeyed, dn as rendering, dt as _to_text, en as syncGen, et as _attrs, f as _if, fn as run, ft as insertChildNodes, gn as forOf, gt as _content_resume, h as addAwaitCounter, hn as forIn, ht as _content_closures, i as _dynamic_tag_content, in as $signal, it as _attrs_script, j as _attr_input_value_attribute_default, jt as _closure, k as _attr_input_checked_script, l as _for_to_unkeyed, ln as queueEffect, lt as _text, m as _try, mn as runId, mt as _content, n as _await_promise, nt as _attrs_partial, o as _for_of, ot as _lifecycle, p as _show, pn as runEffects, pt as toInsertNode, q as _attr_class_items, qt as _script, r as _dynamic_tag, rn as _on, rt as _attrs_partial_content, s as _for_of_unkeyed, sn as prepareEffects, st as _style_rule_item, t as _await_content, tt as _attrs_content, u as _for_until, un as queueRender, ut as _text_content, v as patchDynamicTag, vn as forUntil, vt as createBranch, w as _attr_input_checked, wn as Clone, wt as getRegisteredWithScope, x as _attr_details_or_dialog_open, xn as _hoist_read_error, xt as _el, y as renderCatch, yn as _assert_class_toggles, yt as setupBranch, z as _controllable_open, zt as _hoist_resume } from "./dom-Cii0IA92.mjs";
+import { $ as _attr_style_items, $t as insertBranchBefore, A as _attr_input_value, An as Params, B as _controllable_select, Bn as Global, Bt as _hoist_resume, C as _attr_details_or_dialog_open_script, Cn as _assert_hoist, Ct as _resumed, D as _attr_input_checkedValue_script, Dn as Clone, Dt as initEmbedded, E as _attr_input_checkedValue_default, Et as init, F as _attr_select_value, Ft as _el_read, G as _attr_class, Gt as _or, Ht as _if_closure, I as _attr_select_value_default, It as _for_closure, J as _attr_class_names, Jn as TagVariable, Jt as _script, K as _attr_class_item, Kt as _return, L as _attr_select_value_script, Lt as _for_selector, M as _attr_input_value_default, Mn as Setup, Mt as _closure, N as _attr_input_value_dynamic_default, Nt as _closure_get, O as _attr_input_checked_default, On as Lazy, Ot as ready, P as _attr_input_value_script, Pt as _const, Q as _attr_style_item, Qt as destroyBranch, R as _controllable_input, Rn as EndNode, Rt as _global_read, S as _attr_details_or_dialog_open_default, Sn as _assert_class_toggles, St as _el, T as _attr_input_checkedValue, Tn as _call, Tt as getRegisteredWithScope, Ut as _let, V as _controllable_textarea, Vn as Load, Vt as _id, W as _attr, Wt as _let_change, X as _attr_nonce, Xt as _var_change, Y as _attr_content, Yt as _var, Z as _attr_style, Zt as _assert_init, _n as runId, _t as _return_setup, a as _for_in, an as $signal, at as _html, bn as forTo, bt as setupBranch, c as _for_to, ct as _style_shell, d as _for_until_unkeyed, dn as queueAsyncRender, dt as _to_text, en as removeAndDestroyBranch, et as _attrs, f as _if, fn as queueEffect, ft as insertChildNodes, gn as runEffects, gt as _content_resume, h as addAwaitCounter, hn as run, ht as _content_closures, i as _dynamic_tag_content, in as _on, it as _attrs_script, j as _attr_input_value_attribute_default, jt as _child_setup, k as _attr_input_checked_script, kn as Owner, kt as readyFailed, l as _for_to_unkeyed, lt as _text, m as _try, mn as rendering, mt as _content, n as _await_promise, nt as _attrs_partial, o as _for_of, on as $signalReset, ot as _lifecycle, p as _show, pn as queueRender, pt as toInsertNode, q as _attr_class_items, qn as StartNode, qt as _return_change, r as _dynamic_tag, rt as _attrs_partial_content, s as _for_of_unkeyed, st as _style_rule_item, t as _await_content, tn as syncGen, tt as _attrs_content, u as _for_until, un as prepareEffects, ut as _text_content, v as patchDynamicTag, vn as forIn, vt as createAndSetupBranch, w as _attr_input_checked, wn as _hoist_read_error, wt as _var_resume, x as _attr_details_or_dialog_open, xn as forUntil, xt as _dynamic_tag_var_resume, y as renderCatch, yn as forOf, yt as createBranch, z as _controllable_open, zt as _hoist } from "./dom-BeY1nGUb.mjs";
 //#region src/common/attr-tag.ts
 const empty = [];
 const rest = Symbol("Attribute Tag");
@@ -203,6 +203,7 @@ function _load_template(id, load) {
 			queueAsyncRender(branch, (branch) => insertLoaded(renderer, branch, branch[StartNode], awaitCounter));
 		}, loadFailed(branch, awaitCounter));
 	}, _load_signal(() => (pending ||= load()).then((r) => ({ _: r["params"] || noop }))));
+	lazyTemplate[Lazy] = 1;
 	return lazyTemplate;
 }
 function _load_setup(load) {
@@ -292,4 +293,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_class_toggles, _assert_hoist, _assert_init, _attr, _attr_class, _attr_class_item, _attr_class_items, _attr_class_names, _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, _dynamic_tag_var_resume, _el, _el_read, _for_closure, _for_in, _for_of, _for_of_unkeyed, _for_selector, _for_to, _for_to_unkeyed, _for_until, _for_until_unkeyed, _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, _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 };
+export { $signal, $signalReset, _assert_class_toggles, _assert_hoist, _assert_init, _attr, _attr_class, _attr_class_item, _attr_class_items, _attr_class_names, _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, _dynamic_tag_var_resume, _el, _el_read, _for_closure, _for_in, _for_of, _for_of_unkeyed, _for_selector, _for_to, _for_to_unkeyed, _for_until, _for_until_unkeyed, _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, _resumed, _return, _return_change, _return_setup, _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

@@ -37,6 +37,7 @@ const Renderer = "#Renderer";
 const TagVariable = "#TagVariable";
 const Owner = "owner";
 const Embed = "embed";
+const Lazy = "lazy";
 //#endregion
 //#region src/common/helpers.ts
 const htmlAttrNameReg = /^[^a-z_]|[^a-z0-9._:-]/i;
@@ -1853,10 +1854,7 @@ function _attr_option_value(value) {
 	const valueAttr = _attr("value", value);
 	const selectedValue = getContext(kSelectedValue);
 	if (selectedValue !== void 0 && normalizedValueMatches(selectedValue, value)) {
-		{
-			const matched = getContext(kSelectedValueMatched);
-			if (matched) matched.value = true;
-		}
+		getContext(kSelectedValueMatched)?.add(normalizeStrAttrValue(value));
 		return valueAttr + " selected";
 	}
 	return valueAttr;
@@ -1868,9 +1866,12 @@ function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content,
 	if (content) {
 		const selectedValue = value ?? "";
 		if (valueChange) {
-			const matched = { value: false };
+			const matched = /* @__PURE__ */ new Set();
 			withContext(kSelectedValue, selectedValue, () => withContext(kSelectedValueMatched, matched, content));
-			if (!matched.value && (Array.isArray(value) ? value.some((v) => normalizeStrAttrValue(v) !== "") : normalizeStrAttrValue(value) !== "")) console.error("A controlled `<select>`'s `value` has no matching `<option>`:", value);
+			if ((Array.isArray(value) ? value : [value]).some((v) => {
+				const str = normalizeStrAttrValue(v);
+				return str !== "" && !matched.has(str);
+			})) console.error("A controlled `<select>`'s `value` has no matching `<option>`:", value);
 		} else withContext(kSelectedValue, selectedValue, content);
 	}
 }
@@ -2325,9 +2326,12 @@ function _attr_content(nodeAccessor, scopeId, content, markerGuard) {
 	const shouldResume = markerGuard !== 0;
 	const render = normalizeServerRender(content);
 	const branchId = _peek_scope_id();
-	if (render) {
+	if (render) try {
+		_set_scope_reason(shouldResume ? CLIENT_ALL : 0);
 		if (shouldResume) withBranchId(branchId, render);
 		else render();
+	} finally {
+		_set_scope_reason(void 0);
 	}
 	if (_peek_scope_id() !== branchId) {
 		if (shouldResume) writeScope(scopeId, {
@@ -2672,7 +2676,7 @@ function tryBoundary(content, catchContent, branchId, renderers) {
 			if (!renderersAtSettle) catchChunk.render(clearTryRenderers, branchId);
 			const inOrder = catchChunk === catchChunk.render(catchContent, catchBoundary.reason);
 			if (boundary.aborted) return;
-			if (bodyEnd.consumed || !inOrder) catchChunk.reorderStart = state.mark("*", branchId + "");
+			if (bodyEnd.consumed || !inOrder) catchChunk.reorderBranch = branchId;
 			if (bodyEnd.consumed) {
 				catchChunk.reorderId = reorderId;
 				state.reorder(catchChunk);
@@ -2880,7 +2884,7 @@ var Chunk = class Chunk {
 	async = false;
 	consumed = false;
 	reorderId = null;
-	reorderStart = "";
+	reorderBranch = 0;
 	deferredReady = null;
 	heldEffects = null;
 	deferredReorder = null;
@@ -3138,7 +3142,8 @@ var Chunk = class Chunk {
 					state.hasReorderRuntime = true;
 					scripts = concatScripts(scripts, REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")");
 				}
-				const { reorderId, reorderStart } = reorderedChunk;
+				const { reorderId, reorderBranch } = reorderedChunk;
+				const rootBranch = reorderBranch || +reorderId;
 				const readyReservations = [];
 				let reorderHTML = "";
 				let reorderEffects = "";
@@ -3166,7 +3171,8 @@ var Chunk = class Chunk {
 					reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts));
 					if (cur.async) {
 						reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId());
-						cur.reorderStart = reorderStart;
+						const holeBranch = cur.context?.[kBranchId];
+						cur.reorderBranch = holeBranch > rootBranch ? holeBranch : reorderBranch;
 						(cur.boundary.pendingReorders ||= /* @__PURE__ */ new Set()).add(cur);
 						cur.html = cur.effects = cur.scripts = cur.lastEffect = "";
 						cur.next = null;
@@ -3182,7 +3188,7 @@ var Chunk = class Chunk {
 				}
 				for (const reservation of readyReservations) reordered = concatScripts(reordered, reservation);
 				reordered = concatScripts(reordered, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
-				html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderStart + reorderHTML + "</t>";
+				html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + (reorderBranch ? state.mark("*", reorderBranch + "") : "") + reorderHTML + "</t>";
 			}
 			state.writeReorders = null;
 		}
@@ -3379,11 +3385,14 @@ function _escape(val) {
 	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 const unsafeScriptReg = /<(\/?script|!--)/gi;
-const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str;
+const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\u003C$1") : str;
 function _escape_script(val) {
 	assertValidTextValue(val);
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
+const unsafeScriptTemplateLiteralReg = /[`\\\r]|\$\{|<(?=\/?script|!--)/gi;
+const replaceUnsafeScriptTemplateLiteral = (c) => c === "<" ? "\\x3C" : c === "\r" ? "\\r" : "\\" + c;
+const quoteScriptTemplateLiteral = (str) => "`" + (unsafeScriptTemplateLiteralReg.test(str) ? str.replace(unsafeScriptTemplateLiteralReg, replaceUnsafeScriptTemplateLiteral) : str) + "`";
 const unsafeStyleReg = /<(\/style)/gi;
 const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str;
 function _escape_style(val) {
@@ -3406,7 +3415,7 @@ function _escape_comment(val) {
 //#endregion
 //#region src/html/dynamic-tag.ts
 const voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, markerGuard) => {
+let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, markerGuard, tagVar) => {
 	const shouldResume = markerGuard !== 0;
 	const renderer = normalizeDynamicRenderer(tag);
 	const state = getState();
@@ -3443,11 +3452,12 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, m
 		renderNative();
 		result = _el(scopeId, DYNAMIC_TAG_VAR_REGISTER_ID + accessor);
 	} else {
+		if (tagVar && renderer?.["lazy"]) throw new Error(`A dynamic tag with a [tag variable](https://markojs.com/docs/reference/language#tag-variables) rendered \`${renderer["id"]}\`, which is lazily loaded, so it does not support one. Import it without \`load\`, or remove the variable.`);
 		const chunk = getChunk();
 		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
 		const render = () => {
 			if (renderer) try {
-				_set_scope_reason(shouldResume && inputOrArgs !== void 0 ? CLIENT_ALL : 0);
+				_set_scope_reason(shouldResume ? CLIENT_ALL : 0);
 				return inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
 					content
@@ -3455,13 +3465,14 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, m
 			} finally {
 				_set_scope_reason(void 0);
 			}
-			else if (content) return content();
+			else if (content) content();
 		};
 		result = shouldResume ? withBranchId(branchId, render) : render();
 		rendered = _peek_scope_id() !== branchId;
 		if (beforeBranch !== void 0) {
 			applyBranchStart(chunk, beforeBranch, rendered);
 			_html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
+			if (renderer) _existing_scope(branchId);
 		}
 	}
 	if (rendered) {
@@ -3478,10 +3489,10 @@ function _content_resume(id, fn, scopeId, locals) {
 	return _resume(_content(id, fn, scopeId), id, scopeId, locals);
 }
 const patchDynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (patch) => {
-	_dynamic_tag = (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
+	_dynamic_tag = (scopeId, accessor, tag, input, content, inputIsArgs, resume, tagVar) => {
 		const patched = patch(tag, scopeId, accessor);
 		if (patched !== tag) patched["id"] = tag;
-		return originalDynamicTag(scopeId, accessor, patched, input, content, inputIsArgs, resume);
+		return originalDynamicTag(scopeId, accessor, patched, input, content, inputIsArgs, resume, tagVar);
 	};
 })(_dynamic_tag);
 //#endregion
@@ -3754,10 +3765,13 @@ function NOOP$1() {}
 const kAssets = Symbol();
 const kHead = Symbol();
 function withLoadAssets(renderer, flush, assetId, triggers) {
-	return Object.assign((input) => {
+	return register(renderer["id"], Object.assign((input) => {
 		writeLoadAsset(assetId, flush, triggers);
 		return writeWaitReady(assetId, renderer, input);
-	}, renderer);
+	}, {
+		...renderer,
+		[Lazy]: 1
+	}));
 }
 function writeLoadAsset(assetId, flush, triggers) {
 	const g = $global();
@@ -3806,7 +3820,7 @@ function writeAsset(g, asset) {
 		if (g[kHead] || g.__flush__ !== flushPage) {
 			const block = blockHTML(g, asset);
 			_html(block + (asset.triggers ? "" : deferHTML(g, asset)));
-			if (block && isInResumedBranch()) writeScript(`document.head.insertAdjacentHTML("beforeend",${_escape_script(JSON.stringify(block))})`);
+			if (block && isInResumedBranch()) writeScript(`document.head.insertAdjacentHTML("beforeend",${quoteScriptTemplateLiteral(block)})`);
 			asset.htmlAt = catchableBoundary();
 		}
 	}
@@ -3842,8 +3856,8 @@ function addAsset(g, id, flush, triggers) {
 	return asset;
 }
 function triggerScript(id, html, triggers) {
-	const htmlStr = _escape_script(JSON.stringify(html));
-	const insert = `(d=new Range().createContextualFragment(h),d.querySelectorAll("script").forEach(s=>s.onerror=()=>console.error(${_escape_script(JSON.stringify(`The lazy module for "${id}" failed to load; its server-rendered content cannot become interactive.`))})),document.head.append(d))`;
+	const htmlStr = quoteScriptTemplateLiteral(html);
+	const insert = `(d=new Range().createContextualFragment(h),d.querySelectorAll("script").forEach(s=>s.onerror=()=>console.error(${quoteScriptTemplateLiteral(`The lazy module for "${id}" failed to load; its server-rendered content cannot become interactive.`)})),document.head.append(d))`;
 	const exprs = triggers.map((trigger) => {
 		const options = trigger.options && toObjectExpression(trigger.options);
 		switch (trigger.type) {