marko 6.4.3 → 6.4.4

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);
 	}
 }
@@ -3384,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) {
@@ -3411,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();
@@ -3448,6 +3452,7 @@ 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 = () => {
@@ -3460,7 +3465,7 @@ 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;
@@ -3484,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
@@ -3760,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();
@@ -3812,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();
 		}
 	}
@@ -3848,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) {

package/dist/debug/html.mjs

@@ -35,6 +35,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;
@@ -1851,10 +1852,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;
@@ -1866,9 +1864,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);
 	}
 }
@@ -3382,11 +3383,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) {
@@ -3409,7 +3413,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();
@@ -3446,6 +3450,7 @@ 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 = () => {
@@ -3458,7 +3463,7 @@ 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;
@@ -3482,10 +3487,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
@@ -3758,10 +3763,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();
@@ -3810,7 +3818,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();
 		}
 	}
@@ -3846,8 +3854,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) {

package/dist/dom/catch.feat.js

@@ -1,12 +1,12 @@
 "use strict";
-let require_control_flow = require("../dom-CtIT8Mpr.js"), handlePendingTry = (fn, scope, branch) => {
+let require_control_flow = require("../dom-Diu8MpmL.js"), handlePendingTry = (fn, scope, branch) => {
 	for (; branch;) {
-		if (branch.O?.i) return (scope.J ||= ((branch.JS ||= (branch.O.m && ((complete) => branch.O.c = () => complete() || require_control_flow.un(branch, require_control_flow.dn, require_control_flow.x))(branch.O.c), [])).push(scope), /* @__PURE__ */ new Set())).add(fn);
+		if (branch.O?.i) return (scope.J ||= ((branch.JS ||= (branch.O.m && ((complete) => branch.O.c = () => complete() || require_control_flow.ln(branch, require_control_flow.un, require_control_flow.b))(branch.O.c), [])).push(scope), /* @__PURE__ */ new Set())).add(fn);
 		branch = branch.N;
 	}
 };
 //#region src/dom/catch.feat.ts
-require_control_flow.cn((effects) => {
+require_control_flow.sn((effects) => {
 	let i = 0, fn, scope, branch;
 	for (; i < effects.length;) fn = effects[i++], scope = effects[i++], (branch = scope.F)?.H !== 0 && !handlePendingTry(fn, scope, branch) && fn(scope);
 }, (runRender) => (render) => {
@@ -18,7 +18,7 @@ require_control_flow.cn((effects) => {
 		}
 		render.f = 0, runRender(render);
 	} catch (error) {
-		require_control_flow.b(render.b, error);
+		require_control_flow.y(render.b, error);
 	}
 });
 //#endregion

package/dist/dom/catch.feat.mjs

@@ -4,7 +4,7 @@ let handlePendingTry = (fn, scope, branch) => {
 		branch = branch.N;
 	}
 };
-import { b as renderCatch, cn as installCatch, dn as queueEffect, un as queueAsyncRender, x as runPendingEffects } from "../dom-DHg9YChM.mjs";
+import { b as runPendingEffects, ln as queueAsyncRender, sn as installCatch, un as queueEffect, y as renderCatch } from "../dom-DefWmvQB.mjs";
 //#region src/dom/catch.feat.ts
 installCatch((effects) => {
 	let i = 0, fn, scope, branch;

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

@@ -11,9 +11,9 @@ export declare const _if: (nodeAccessor: EncodedAccessor, ...branchesArgs: (stri
 export declare const _show: (nodeAccessor: EncodedAccessor, startNodeAccessor?: EncodedAccessor, endNodeAccessor?: EncodedAccessor) => (scope: Scope, display: unknown) => void;
 export declare function rendererKey(renderer: Renderer | string | undefined): string | Renderer | undefined;
 export declare function patchDynamicTag(fn: <T extends typeof _dynamic_tag>(cond: T) => T): void;
-export declare let _dynamic_tag: (nodeAccessor: EncodedAccessor, getContent?: ((scope: Scope) => Renderer) | 0, getTagVar?: (() => Signal<unknown>) | 0, inputIsArgs?: 1) => Signal<Renderer | string | undefined>;
+export declare let _dynamic_tag: (nodeAccessor: EncodedAccessor, getContent?: ((scope: Scope) => Renderer) | 0, getTagVar?: (() => (scope: Scope, value?: unknown) => void) | 0, inputIsArgs?: 1) => Signal<Renderer | string | undefined>;
 export declare const _dynamic_tag_content: (nodeAccessor: EncodedAccessor) => Signal<Renderer | undefined>;
-export declare let bindTagVar: undefined | ((scope: Scope, branch: BranchScope, scopeKey: number, renderer?: Renderer | string) => void);
+export declare let bindTagVar: undefined | ((scope: Scope, branch: BranchScope, scopeKey: number, renderer: Renderer | string) => void);
 export declare function installDynamicTagVar(bind: NonNullable<typeof bindTagVar>): void;
 export declare function dynamicTagScript(branch: Scope): void;
 export declare function setConditionalRenderer<T>(scope: Scope, nodeAccessor: Accessor, newRenderer: T, createBranch: ($global: Scope[typeof AccessorProp.Global], renderer: NonNullable<T>, parentScope: Scope, parentNode: ParentNode) => BranchScope): void;

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

@@ -1,4 +1,4 @@
 "use strict";
-let require_control_flow = require("../dom-CtIT8Mpr.js");
-require_control_flow.W[0] = require_control_flow.A, require_control_flow.W[1] = require_control_flow.O, require_control_flow.W[2] = require_control_flow.F;
+let require_control_flow = require("../dom-Diu8MpmL.js");
+require_control_flow.U[0] = require_control_flow.k, require_control_flow.U[1] = require_control_flow.D, require_control_flow.U[2] = require_control_flow.P;
 //#endregion

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

@@ -1,3 +1,3 @@
-import { A as _attr_input_checked_script, F as _attr_input_value_script, O as _attr_input_checkedValue_script, W as controllableScripts } from "../dom-DHg9YChM.mjs";
+import { D as _attr_input_checkedValue_script, P as _attr_input_value_script, U as controllableScripts, k as _attr_input_checked_script } from "../dom-DefWmvQB.mjs";
 controllableScripts[0] = _attr_input_checked_script, controllableScripts[1] = _attr_input_checkedValue_script, controllableScripts[2] = _attr_input_value_script;
 //#endregion

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

@@ -1,5 +1,5 @@
 "use strict";
-let require_control_flow = require("../dom-CtIT8Mpr.js");
+let require_control_flow = require("../dom-Diu8MpmL.js");
 //#region src/dom/controllable-open.feat.ts
-require_control_flow.W[4] = require_control_flow.w;
+require_control_flow.U[4] = require_control_flow.C;
 //#endregion

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

@@ -1,4 +1,4 @@
-import { W as controllableScripts, w as _attr_details_or_dialog_open_script } from "../dom-DHg9YChM.mjs";
+import { C as _attr_details_or_dialog_open_script, U as controllableScripts } from "../dom-DefWmvQB.mjs";
 //#region src/dom/controllable-open.feat.ts
 controllableScripts[4] = _attr_details_or_dialog_open_script;
 //#endregion

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

@@ -1,5 +1,5 @@
 "use strict";
-let require_control_flow = require("../dom-CtIT8Mpr.js");
+let require_control_flow = require("../dom-Diu8MpmL.js");
 //#region src/dom/controllable-select.feat.ts
-require_control_flow.W[3] = require_control_flow.R;
+require_control_flow.U[3] = require_control_flow.L;
 //#endregion

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

@@ -1,4 +1,4 @@
-import { R as _attr_select_value_script, W as controllableScripts } from "../dom-DHg9YChM.mjs";
+import { L as _attr_select_value_script, U as controllableScripts } from "../dom-DefWmvQB.mjs";
 //#region src/dom/controllable-select.feat.ts
 controllableScripts[3] = _attr_select_value_script;
 //#endregion

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

@@ -1,5 +1,5 @@
 "use strict";
-let require_control_flow = require("../dom-CtIT8Mpr.js");
+let require_control_flow = require("../dom-Diu8MpmL.js");
 //#region src/dom/controllable-textarea.feat.ts
-require_control_flow.W[2] = require_control_flow.F;
+require_control_flow.U[2] = require_control_flow.P;
 //#endregion

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

@@ -1,4 +1,4 @@
-import { F as _attr_input_value_script, W as controllableScripts } from "../dom-DHg9YChM.mjs";
+import { P as _attr_input_value_script, U as controllableScripts } from "../dom-DefWmvQB.mjs";
 //#region src/dom/controllable-textarea.feat.ts
 controllableScripts[2] = _attr_input_value_script;
 //#endregion

package/dist/dom/controllable.feat.js

@@ -1,4 +1,4 @@
 "use strict";
-let require_control_flow = require("../dom-CtIT8Mpr.js");
-require("./controllable-input.feat.js"), require("./controllable-open.feat.js"), require("./controllable-select.feat.js"), require_control_flow.U.INPUT = require_control_flow.z, require_control_flow.U.TEXTAREA = require_control_flow.H, require_control_flow.U.SELECT = require_control_flow.V, require_control_flow.U.DETAILS = require_control_flow.U.DIALOG = require_control_flow.B;
+let require_control_flow = require("../dom-Diu8MpmL.js");
+require("./controllable-input.feat.js"), require("./controllable-open.feat.js"), require("./controllable-select.feat.js"), require_control_flow.H.INPUT = require_control_flow.R, require_control_flow.H.TEXTAREA = require_control_flow.V, require_control_flow.H.SELECT = require_control_flow.B, require_control_flow.H.DETAILS = require_control_flow.H.DIALOG = require_control_flow.z;
 //#endregion

package/dist/dom/controllable.feat.mjs

@@ -1,4 +1,4 @@
-import { B as _controllable_open, H as _controllable_textarea, U as controllableRenders, V as _controllable_select, z as _controllable_input } from "../dom-DHg9YChM.mjs";
+import { B as _controllable_select, H as controllableRenders, R as _controllable_input, V as _controllable_textarea, z as _controllable_open } from "../dom-DefWmvQB.mjs";
 import "./controllable-input.feat.mjs";
 import "./controllable-open.feat.mjs";
 import "./controllable-select.feat.mjs";

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

@@ -1,5 +1,5 @@
 "use strict";
-let require_control_flow = require("../dom-CtIT8Mpr.js");
+let require_control_flow = require("../dom-Diu8MpmL.js");
 //#region src/dom/dynamic-tag-script.feat.ts
-require_control_flow.wt._d = require_control_flow.Tn(require_control_flow._);
+require_control_flow.Ct._d = require_control_flow.wn(require_control_flow.g);
 //#endregion

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

@@ -1,4 +1,4 @@
-import { Tn as withBranches, _ as dynamicTagScript, wt as _resumed } from "../dom-DHg9YChM.mjs";
+import { Ct as _resumed, g as dynamicTagScript, wn as withBranches } from "../dom-DefWmvQB.mjs";
 //#region src/dom/dynamic-tag-script.feat.ts
 _resumed._d = withBranches(dynamicTagScript);
 //#endregion

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

@@ -1,6 +1,6 @@
 "use strict";
-let require_control_flow = require("../dom-CtIT8Mpr.js");
-require_control_flow.sn(), require_control_flow.v((scope, branch, scopeKey, renderer) => {
-	branch.BR = require_control_flow.on(scope, scopeKey), typeof renderer == "string" && branch.T(() => branch.S);
+let require_control_flow = require("../dom-Diu8MpmL.js");
+require_control_flow.on(), require_control_flow._((scope, branch, scopeKey, renderer) => {
+	branch.BR = require_control_flow.an(scope, scopeKey), typeof renderer == "string" && branch.T(() => branch.S);
 });
 //#endregion

package/dist/dom/dynamic-tag-var.feat.mjs

@@ -1,4 +1,4 @@
-import { on as createBranchRenders, sn as installBranchRenders, v as installDynamicTagVar } from "../dom-DHg9YChM.mjs";
+import { _ as installDynamicTagVar, an as createBranchRenders, on as installBranchRenders } from "../dom-DefWmvQB.mjs";
 installBranchRenders(), installDynamicTagVar((scope, branch, scopeKey, renderer) => {
 	branch.BR = createBranchRenders(scope, scopeKey), typeof renderer == "string" && branch.T(() => branch.S);
 });

package/dist/dom/lazy.feat.js

@@ -1,4 +1,4 @@
 "use strict";
 //#region src/dom/lazy.feat.ts
-require("../dom-CtIT8Mpr.js").jt();
+require("../dom-Diu8MpmL.js").At();
 //#endregion

package/dist/dom/lazy.feat.mjs

@@ -1,4 +1,4 @@
-import { jt as withLazy } from "../dom-DHg9YChM.mjs";
+import { At as withLazy } from "../dom-DefWmvQB.mjs";
 //#region src/dom/lazy.feat.ts
 withLazy();
 //#endregion

package/dist/dom/load.d.ts

@@ -12,7 +12,6 @@ export interface LoadTrigger {
 }
 export declare function _load_template(id: string, load: () => Promise<Renderer>): Template & Renderer;
 export declare function _load_setup(load: () => Promise<LoadModule>): (owner: Scope, child: BranchScope, marker: ChildNode) => void;
-export declare function _load_setup_var(load: () => Promise<LoadModule>): (owner: Scope, child: BranchScope, marker: ChildNode) => void;
 export declare function _load_signal(load: () => Promise<LoadSignal>): Signal;
 export declare function _load_visible_trigger(selector: string, options?: IntersectionObserverInit): LoadTrigger;
 export declare function _load_idle_trigger(options?: {

package/dist/dom/placeholder.feat.js

@@ -1,7 +1,7 @@
 "use strict";
-let require_control_flow = require("../dom-CtIT8Mpr.js");
+let require_control_flow = require("../dom-Diu8MpmL.js");
 //#region src/dom/placeholder.feat.ts
-require_control_flow.wt._f = (tryBranch) => {
-	tryBranch.P &&= (require_control_flow.$t(tryBranch.P), 0);
+require_control_flow.Ct._f = (tryBranch) => {
+	tryBranch.P &&= (require_control_flow.Qt(tryBranch.P), 0);
 };
 //#endregion

package/dist/dom/placeholder.feat.mjs

@@ -1,4 +1,4 @@
-import { $t as destroyBranch, wt as _resumed } from "../dom-DHg9YChM.mjs";
+import { Ct as _resumed, Qt as destroyBranch } from "../dom-DefWmvQB.mjs";
 //#region src/dom/placeholder.feat.ts
 _resumed._f = (tryBranch) => {
 	tryBranch.P &&= (destroyBranch(tryBranch.P), 0);

package/dist/dom/renderer.d.ts

@@ -4,16 +4,23 @@ export type Renderer = {
     [RendererProp.Id]: string;
     [RendererProp.Setup]: undefined | SetupFn;
     [RendererProp.Clone]: (branch: BranchScope, ns: string) => void;
-    [RendererProp.Params]: Signal<unknown> | undefined;
+    [RendererProp.Params]: (Signal<unknown> & ReturnMark) | undefined;
     [RendererProp.Owner]: Scope | undefined;
     [RendererProp.Accessor]: Accessor | undefined;
     [RendererProp.LocalClosures]?: SetupFn;
+    [RendererProp.Lazy]?: 1;
+};
+export type SetupFn = ((scope: Scope) => void) & ReturnMark;
+export type ReturnMark = {
+    [RendererProp.Returns]?: 1;
 };
-export type SetupFn = (scope: Scope) => void;
 export declare function createBranch($global: Scope[typeof AccessorProp.Global], renderer: Renderer | string, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
 export declare function setParentBranch(branch: BranchScope, parentBranch: BranchScope | undefined): void;
 export declare function createAndSetupBranch($global: Scope[typeof AccessorProp.Global], renderer: Renderer, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
 export declare function setupBranch(renderer: Renderer, branch: BranchScope): BranchScope;
+export declare function _return_setup<T extends ((...args: any[]) => unknown) | {
+    _: SetupFn;
+}>(setup: T): T;
 export declare function _content(id: string, template?: string | 0, walks?: string | 0, setup?: {
     _: Signal<unknown>;
 } | SetupFn | 0, params?: Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;

package/dist/{dom-DHg9YChM.mjs → dom-DefWmvQB.mjs}

@@ -75,9 +75,9 @@ 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] = rendererKey(normalizedRenderer)) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) {
+		if (scope[rendererAccessor] !== (scope[rendererAccessor] = rendererKey(normalizedRenderer) || (getContent ? void 0 : 0)) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) {
 			let renderer = normalizedRenderer || (getContent ? getContent(scope) : void 0);
-			if (setConditionalRenderer(scope, nodeAccessor, renderer, createBranchWithTagNameOrRenderer), getTagVar && (scope[childScopeAccessor] ? (scope[childScopeAccessor].T = (value) => getTagVar()(scope, value), bindTagVar(scope, scope[childScopeAccessor], scope[scopeOffsetAccessor], normalizedRenderer)) : getTagVar()(scope, void 0)), typeof renderer == "string") {
+			if (setConditionalRenderer(scope, nodeAccessor, renderer, createBranchWithTagNameOrRenderer), getTagVar && (normalizedRenderer ? (scope[childScopeAccessor].T = (value) => getTagVar()(scope, value), bindTagVar(scope, scope[childScopeAccessor], scope[scopeOffsetAccessor], normalizedRenderer)) : getTagVar()(scope)), typeof renderer == "string") {
 				if (getContent) {
 					let content = getContent(scope);
 					setConditionalRenderer(scope[childScopeAccessor], "a", content, createAndSetupBranch), content.f && subscribeToScopeSet(content.e, content.f, scope[childScopeAccessor].Aa);
@@ -626,8 +626,8 @@ function init(runtimeId = "M") {
 					}
 				}
 				let retained = 0;
-				for (visit of visits = render.v) lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = getScope(nextToken()), dynamicHtmlEnabled && visitType > "%" && visitType <= "'" ? visitType === "&" ? htmlStart = visit : (visitScope[nextToken()] = htmlStart, visitScope["H" + lastToken] = visit, (branchesEnabled || lazyEnabled) && pending[pending.length - 1] !== visitScope && pending.push(visitScope)) : branchesEnabled && visitType > "'" ? (visitBranches ||= createVisitBranches())() : lazyEnabled && render.b && visitType > "%" ? visits[retained++] = visit : (visitScope[nextToken()] = visitType === "%" ? visit.parentNode.insertBefore(new Text(), visit) : visit.previousSibling, (branchesEnabled || lazyEnabled) && pending[pending.length - 1] !== visitScope && pending.push(visitScope));
-				return branchesEnabled && visitBranches && (visitType = "*", lastToken = "", visitBranches()), embedRenders && !embedAnchor && visit?.parentNode && embedRenders.set(embedAnchor = visit.parentNode.insertBefore(new Text(), visit.nextSibling), [renderId, scopeLookup]), visits.length = retained, effects;
+				for (visit of visits = render.v) lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = getScope(nextToken()), dynamicHtmlEnabled && visitType > "%" && visitType <= "'" ? visitType === "&" ? htmlStart = visit : (visitScope[nextToken()] = htmlStart, visitScope["H" + lastToken] = visit, (branchesEnabled || lazyEnabled) && pending[pending.length - 1] !== visitScope && pending.push(visitScope)) : branchesEnabled && visitType > "'" ? (visitBranches ||= createVisitBranches())() : lazyEnabled && render.b && visitType > "%" ? visits[retained++] = visit : (visitScope[nextToken()] = visitType === "%" ? visit.parentNode.insertBefore(new Text(), visit) : visit.previousSibling, (branchesEnabled || lazyEnabled) && pending[pending.length - 1] !== visitScope && pending.push(visitScope)), embedRenders && !embedAnchor && visit.parentNode && embedRenders.set(embedAnchor = visit.parentNode.insertBefore(new Text(), visit), [renderId, scopeLookup]);
+				return branchesEnabled && visitBranches && (visitType = "*", lastToken = "", visitBranches()), visits.length = retained, effects;
 			}, render.w = () => {
 				walk(), runResumeEffects(render);
 			}, render;
@@ -678,6 +678,9 @@ function createAndSetupBranch($global, renderer, parentScope, parentNode) {
 function setupBranch(renderer, branch) {
 	return renderer.c && queueRender(branch, renderer.c, -1), branch;
 }
+function _return_setup(setup) {
+	return setup;
+}
 function _content(id, template, walks, setup, params, dynamicScopesAccessor) {
 	walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup = setup ? setup._ || setup : void 0, params ||= void 0;
 	let clone = template ? (branch, ns) => {
@@ -1031,14 +1034,14 @@ function observeOnce(scope, nodeAccessor, init, callback) {
 	(scope["N" + nodeAccessor] ||= new MutationObserver(callback)).observe(scope[nodeAccessor], init);
 }
 function syncControllableFormInput(el, hasChanged, onChange) {
-	el._ = onChange, el.c = hasChanged, delegate("input", handleChange), el.form && delegate("reset", handleFormReset), isResuming && hasChanged(el) && queueMicrotask(onChange);
+	el._ = onChange, el.c = hasChanged, delegate("input", handleChange), delegate("reset", handleFormReset), isResuming && hasChanged(el) && queueMicrotask(onChange);
 }
 function handleChange(ev) {
 	ev.target._?.(ev);
 }
 function handleFormReset(ev) {
 	let handlers = [];
-	for (let el of ev.target.elements) el._ && el.c(el) && handlers.push(el._);
+	for (let el of ev.target.elements || []) el._ && el.c(el) && handlers.push(el._);
 	requestAnimationFrame(() => {
 		if (!ev.defaultPrevented) for (let change of handlers) change();
 	});
@@ -1240,4 +1243,4 @@ function byFirstArg(name) {
 	return name;
 }
 //#endregion
-export { _attr_style_item as $, destroyBranch as $t, _attr_input_checked_script as A, readyFailed as At, _controllable_open as B, _hoist as Bt, _attr_details_or_dialog_open_default as C, _hoist_read_error as Cn, _el as Ct, _attr_input_checkedValue_default as D, init as Dt, _attr_input_checkedValue as E, getRegisteredWithScope as Et, _attr_input_value_script as F, _const as Ft, _attr as G, _let_change as Gt, _controllable_textarea as H, _id as Ht, _attr_select_value as I, _el_read as It, _attr_class_items as J, _return_change as Jt, _attr_class as K, _or as Kt, _attr_select_value_default as L, _for_closure as Lt, _attr_input_value_attribute_default as M, _child_setup as Mt, _attr_input_value_default as N, _closure as Nt, _attr_input_checkedValue_script as O, initEmbedded as Ot, _attr_input_value_dynamic_default as P, _closure_get as Pt, _attr_style as Q, _assert_init as Qt, _attr_select_value_script as R, _for_selector as Rt, _attr_details_or_dialog_open as S, _assert_hoist as Sn, _dynamic_tag_var_resume as St, _attr_input_checked as T, withBranches as Tn, _var_resume as Tt, controllableRenders as U, _if_closure as Ut, _controllable_select as V, _hoist_resume as Vt, controllableScripts as W, _let as Wt, _attr_content as X, _var as Xt, _attr_class_names as Y, _script as Yt, _attr_nonce as Z, _var_change as Zt, dynamicTagScript as _, forIn as _n, _content_resume as _t, _for_in as a, $signalReset as an, _attrs_script as at, renderCatch as b, forUntil as bn, setParentBranch as bt, _for_to as c, installCatch as cn, _style_rule_item as ct, _for_until_unkeyed as d, queueEffect as dn, _text_content as dt, insertBranchBefore as en, _attr_style_items as et, _if as f, queueRender as fn, _to_text as ft, bindTagVar as g, runId as gn, _content_closures as gt, addAwaitCounter as h, runEffects as hn, _content as ht, _dynamic_tag_content as i, $signal as in, _attrs_partial_content as it, _attr_input_value as j, withLazy as jt, _attr_input_checked_default as k, ready as kt, _for_to_unkeyed as l, prepareEffects as ln, _style_shell as lt, _try as m, run as mn, toInsertNode as mt, _await_promise as n, syncGen as nn, _attrs_content as nt, _for_of as o, createBranchRenders as on, _html as ot, _show as p, rendering as pn, insertChildNodes as pt, _attr_class_item as q, _return as qt, _dynamic_tag as r, _on as rn, _attrs_partial as rt, _for_of_unkeyed as s, installBranchRenders as sn, _lifecycle as st, _await_content as t, removeAndDestroyBranch as tn, _attrs as tt, _for_until as u, queueAsyncRender as un, _text as ut, installDynamicTagVar as v, forOf as vn, createAndSetupBranch as vt, _attr_details_or_dialog_open_script as w, _call as wn, _resumed as wt, runPendingEffects as x, _assert_class_toggles as xn, setupBranch as xt, patchDynamicTag as y, forTo as yn, createBranch as yt, _controllable_input as z, _global_read as zt };
+export { _attr_style_items as $, insertBranchBefore as $t, _attr_input_value as A, withLazy as At, _controllable_select as B, _hoist_resume as Bt, _attr_details_or_dialog_open_script as C, _call as Cn, _resumed as Ct, _attr_input_checkedValue_script as D, initEmbedded as Dt, _attr_input_checkedValue_default as E, init as Et, _attr_select_value as F, _el_read as Ft, _attr_class as G, _or as Gt, controllableRenders as H, _if_closure as Ht, _attr_select_value_default as I, _for_closure as It, _attr_class_names as J, _script as Jt, _attr_class_item as K, _return as Kt, _attr_select_value_script as L, _for_selector as Lt, _attr_input_value_default as M, _closure as Mt, _attr_input_value_dynamic_default as N, _closure_get as Nt, _attr_input_checked_default as O, ready as Ot, _attr_input_value_script as P, _const as Pt, _attr_style_item as Q, destroyBranch as Qt, _controllable_input as R, _global_read as Rt, _attr_details_or_dialog_open_default as S, _hoist_read_error as Sn, _el as St, _attr_input_checkedValue as T, getRegisteredWithScope as Tt, controllableScripts as U, _let as Ut, _controllable_textarea as V, _id as Vt, _attr as W, _let_change as Wt, _attr_nonce as X, _var_change as Xt, _attr_content as Y, _var as Yt, _attr_style as Z, _assert_init as Zt, installDynamicTagVar as _, forOf as _n, _return_setup as _t, _for_in as a, createBranchRenders as an, _html as at, runPendingEffects as b, _assert_class_toggles as bn, setupBranch as bt, _for_to as c, prepareEffects as cn, _style_shell as ct, _for_until_unkeyed as d, queueRender as dn, _to_text as dt, removeAndDestroyBranch as en, _attrs as et, _if as f, rendering as fn, insertChildNodes as ft, dynamicTagScript as g, forIn as gn, _content_resume as gt, addAwaitCounter as h, runId as hn, _content_closures as ht, _dynamic_tag_content as i, $signalReset as in, _attrs_script as it, _attr_input_value_attribute_default as j, _child_setup as jt, _attr_input_checked_script as k, readyFailed as kt, _for_to_unkeyed as l, queueAsyncRender as ln, _text as lt, _try as m, runEffects as mn, _content as mt, _await_promise as n, _on as nn, _attrs_partial as nt, _for_of as o, installBranchRenders as on, _lifecycle as ot, _show as p, run as pn, toInsertNode as pt, _attr_class_items as q, _return_change as qt, _dynamic_tag as r, $signal as rn, _attrs_partial_content as rt, _for_of_unkeyed as s, installCatch as sn, _style_rule_item as st, _await_content as t, syncGen as tn, _attrs_content as tt, _for_until as u, queueEffect as un, _text_content as ut, patchDynamicTag as v, forTo as vn, createAndSetupBranch as vt, _attr_input_checked as w, withBranches as wn, _var_resume as wt, _attr_details_or_dialog_open as x, _assert_hoist as xn, _dynamic_tag_var_resume as xt, renderCatch as y, forUntil as yn, createBranch as yt, _controllable_open as z, _hoist as zt };