marko 6.4.2 → 6.4.4

package/cheatsheet.md

@@ -16,7 +16,7 @@ Marko 6 = HTML superset, not JSX and not Marko 4/5 syntax. `.marko` files are co
 6. Events: method shorthand `onClick() { ... }` or `onClick=fn`. Handlers receive `(event, element)`; delegation means the element is the second parameter, not `event.currentTarget`: `onSubmit(e) { e.preventDefault(); save() }`, `onClick(e, el) { el.focus() }`. Don't sync input values through `onInput`/`onChange`; that's what the change handlers below are for. Prefix with `async` to `await` in the body: `async onClick() { await save() }`.
 7. Native inputs are uncontrolled by default: `value=` sets the default value. Later writes update what `form.reset()` restores, never a dirty field's display. Adding the matching `*Change` handler is what makes them controlled: `valueChange` on `<input>`/`<textarea>`/`<select>`, `checkedChange` on checkboxes/radios, `openChange` on `<details>`/`<dialog>`. `value:=text` is the shorthand for `value=text valueChange(v) { text = v }`. (`<textarea value:=text/>`: value attribute, not body.) `:=` differs by operand: on an identifier (`value:=text`) it assigns that variable; on a member expression (`<let/count:=input.count>` in a child) it wires `input.countChange`, so the child is controlled when the parent passes that handler and keeps its own state when it doesn't.
 8. Transform in the handler when needed; number inputs give strings: `<input type="number" value=n valueChange(v) { n = +v }>`, or `value:parseFloat:=n`. Uncommitted edits (debounce, commit on blur) never sync through a `<script>`; that is rule 4's derive-by-effect trap. Pair a controllable `<let/value:=input.value>` with `<let/pending=null>`, show `<const/draft=pending ?? value>`, collect with `valueChange(v) { pending = v }`, and commit by assigning `value = pending; pending = null`. Prefer that to calling `input.valueChange(...)`, which throws unless every caller controls the tag.
-9. Radio/checkbox groups: `checkedValue:=picked` on each input (shared var, distinct `value=`); the match is checked; array var for multi-checkbox. Dropdown: `<select value:=picked>`.
+9. Radio/checkbox groups: `checkedValue:=picked` on each input (shared var, distinct `value=`); the match is checked; array var for multi-checkbox. Dropdown: `<select value:=picked>`. Every bound value needs a rendered input/`<option>`.
 10. Module-level values, helpers and type aliases need `static`: `static const LIMIT = 10`, `static function fmt(n) {…}`, `static type Row = {…}`. Prefer it to `<const>` for anything that never changes: `<const/LIMIT=10>` runs per instance, `static` hoists it to a module constant. `server`/`client` narrow `static` to one platform (`client import { Chart } from "chart"`); the binding is `undefined` on the other, so read a `client` one only from `<script>`/handlers/`<lifecycle>`. Reading it while rendering throws `is not a function` during SSR.
 11. `$!{html}` and the contents of `<html-script>`/`<html-style>` are written as-is: the latter are escaped only so they can't close the element, and run as code. Never put user-provided content in them.
 
@@ -171,7 +171,7 @@ Imperative libs (charts, maps) needing mount/update/destroy: use `<lifecycle>`,
 
 ## Lazy loading
 
-Defer a tag's JS into its own bundle until a trigger fires: `visible#sel`, `idle`, `media(...)`, `on-click#sel` (combine with `|`), or `render` alone. Server HTML renders immediately; in the browser `<try>` shows a `@placeholder` while loading. Don't hand-roll an `IntersectionObserver`.
+Defer a tag's JS into its own bundle until a trigger fires: `visible#sel`, `idle`, `media(...)`, `on-click#sel` (combine with `|`), or `render` alone. Server HTML renders immediately; in the browser `<try>` shows a `@placeholder` while loading. Don't hand-roll an `IntersectionObserver`. A lazy tag takes no tag variable: bind state down instead (`<Modal open:=open/>`).
 
 ```marko
 import PriceChart from "<price-chart>" with { load: "visible#chart" }

package/dist/common/constants/accessor-prop.d.ts

@@ -4,6 +4,7 @@ export declare const AbortControllers = "A";
 export declare const AbortScopes = "B";
 export declare const AwaitCounter = "O";
 export declare const BranchAccessor = "C";
+export declare const BranchRenders = "BR";
 export declare const BranchScopes = "D";
 export declare const CatchContent = "E";
 export declare const ClosestBranch = "F";

package/dist/common/constants/accessor-prop.debug.d.ts

@@ -4,6 +4,7 @@ export declare const AbortControllers = "#AbortControllers";
 export declare const AbortScopes = "#AbortScopes";
 export declare const AwaitCounter = "#AwaitCounter";
 export declare const BranchAccessor = "#BranchAccessor";
+export declare const BranchRenders = "#BranchRenders";
 export declare const BranchScopes = "#BranchScopes";
 export declare const CatchContent = "#CatchContent";
 export declare const ClosestBranch = "#ClosestBranch";

package/dist/common/constants/renderer-prop.d.ts

@@ -5,7 +5,9 @@ export declare const Params = "d";
 export declare const Owner = "e";
 export declare const Accessor = "f";
 export declare const LocalClosures = "g";
+export declare const Returns = "h";
 export declare const Embed = "i";
+export declare const Lazy = "j";
 type Self = typeof import("./renderer-prop");
 export type Value = Self[keyof Self];
 export {};

package/dist/common/constants/renderer-prop.debug.d.ts

@@ -5,7 +5,9 @@ export declare const Params = "params";
 export declare const Owner = "owner";
 export declare const Accessor = "accessor";
 export declare const LocalClosures = "localClosures";
+export declare const Returns = "returns";
 export declare const Embed = "embed";
+export declare const Lazy = "lazy";
 type Self = typeof import("./renderer-prop.debug");
 export type Value = Self[keyof Self];
 export {};

package/dist/common/types.d.ts

@@ -21,6 +21,7 @@ export interface BranchScope extends Scope {
     [AccessorProp.PlaceholderBranch]: BranchScope | undefined | 0;
     [AccessorProp.TryBranch]: BranchScope | undefined;
     [AccessorProp.PendingRenders]: PendingRender[] | 0 | undefined;
+    [AccessorProp.BranchRenders]: PendingRender | undefined;
     [AccessorProp.DetachedAwait]: Renderer | 0 | undefined;
     [AccessorProp.PendingScopes]: Scope[] | void;
 }

package/dist/debug/dom/catch.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-CUxvM4i9.js");
 //#region src/dom/catch.feat.ts
 const handlePendingTry = (fn, scope, branch) => {
 	while (branch) {

package/dist/debug/dom/catch.feat.mjs

@@ -1,4 +1,4 @@
-import { In as ParentBranch, Ln as PendingEffectScopes, On as Pending, Rn as PendingEffects, b as runPendingEffects, cn as queueAsyncRender, jn as ClosestBranch, kn as Scope, ln as queueEffect, on as installCatch, y as renderCatch, zn as PendingRenders } from "../dom-Cii0IA92.mjs";
+import { Gn as PendingRenders, Hn as ParentBranch, Ln as ClosestBranch, Nn as Pending, Pn as Scope, Un as PendingEffectScopes, Wn as PendingEffects, b as runPendingEffects, dn as queueAsyncRender, fn as queueEffect, ln as installCatch, y as renderCatch } from "../dom-BeY1nGUb.mjs";
 //#region src/dom/catch.feat.ts
 const handlePendingTry = (fn, scope, branch) => {
 	while (branch) {

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

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-CUxvM4i9.js");
 //#region src/dom/controllable-input.feat.ts
 require_control_flow.controllableScripts[0] = require_control_flow._attr_input_checked_script;
 require_control_flow.controllableScripts[1] = require_control_flow._attr_input_checkedValue_script;

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

@@ -1,4 +1,4 @@
-import { D as _attr_input_checkedValue_script, P as _attr_input_value_script, U as controllableScripts, k as _attr_input_checked_script } from "../dom-Cii0IA92.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-BeY1nGUb.mjs";
 //#region src/dom/controllable-input.feat.ts
 controllableScripts[0] = _attr_input_checked_script;
 controllableScripts[1] = _attr_input_checkedValue_script;

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

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-CUxvM4i9.js");
 //#region src/dom/controllable-open.feat.ts
 require_control_flow.controllableScripts[4] = require_control_flow._attr_details_or_dialog_open_script;
 //#endregion

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

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

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

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-CUxvM4i9.js");
 //#region src/dom/controllable-select.feat.ts
 require_control_flow.controllableScripts[3] = require_control_flow._attr_select_value_script;
 //#endregion

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

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

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

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-CUxvM4i9.js");
 //#region src/dom/controllable-textarea.feat.ts
 require_control_flow.controllableScripts[2] = require_control_flow._attr_input_value_script;
 //#endregion

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

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

package/dist/debug/dom/controllable.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-CUxvM4i9.js");
 require("./controllable-input.feat.js");
 require("./controllable-open.feat.js");
 require("./controllable-select.feat.js");

package/dist/debug/dom/controllable.feat.mjs

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

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

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-CUxvM4i9.js");
 //#region src/dom/dynamic-tag-script.feat.ts
 require_control_flow._resumed[require_control_flow.DYNAMIC_TAG_SCRIPT_REGISTER_ID] = require_control_flow.withBranches(require_control_flow.dynamicTagScript);
 //#endregion

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

@@ -1,4 +1,4 @@
-import { Cn as withBranches, St as _resumed, g as dynamicTagScript, tn as DYNAMIC_TAG_SCRIPT_REGISTER_ID } from "../dom-Cii0IA92.mjs";
+import { Ct as _resumed, En as withBranches, g as dynamicTagScript, nn as DYNAMIC_TAG_SCRIPT_REGISTER_ID } from "../dom-BeY1nGUb.mjs";
 //#region src/dom/dynamic-tag-script.feat.ts
 _resumed[DYNAMIC_TAG_SCRIPT_REGISTER_ID] = withBranches(dynamicTagScript);
 //#endregion

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

@@ -1,5 +1,13 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-CUxvM4i9.js");
 //#region src/dom/dynamic-tag-var.feat.ts
-require_control_flow.installDynamicTagVar((branch) => branch[require_control_flow.TagVariable](() => require_control_flow._el_read(branch[require_control_flow.StartNode])));
+require_control_flow.installBranchRenders();
+require_control_flow.installDynamicTagVar((scope, branch, scopeKey, renderer) => {
+	branch[require_control_flow.BranchRenders] = require_control_flow.createBranchRenders(scope, scopeKey);
+	if (typeof renderer === "string") branch[require_control_flow.TagVariable](() => require_control_flow._el_read(branch[require_control_flow.StartNode]));
+	else {
+		if (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.`);
+		if (!(renderer["setup"] || renderer["params"])?.["returns"]) throw new Error(`A dynamic tag with a [tag variable](https://markojs.com/docs/reference/language#tag-variables) rendered \`${renderer["id"]}\`, which does not [\`<return>\`](https://markojs.com/docs/reference/core-tag#return) a value. Add a \`<return>\` to it, or remove the variable.`);
+	}
+});
 //#endregion

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

@@ -1,4 +1,12 @@
-import { Hn as TagVariable, Pt as _el_read, Vn as StartNode, _ as installDynamicTagVar } from "../dom-Cii0IA92.mjs";
+import { Ft as _el_read, In as BranchRenders, Jn as TagVariable, _ as installDynamicTagVar, cn as installBranchRenders, qn as StartNode, sn as createBranchRenders } from "../dom-BeY1nGUb.mjs";
 //#region src/dom/dynamic-tag-var.feat.ts
-installDynamicTagVar((branch) => branch[TagVariable](() => _el_read(branch[StartNode])));
+installBranchRenders();
+installDynamicTagVar((scope, branch, scopeKey, renderer) => {
+	branch[BranchRenders] = createBranchRenders(scope, scopeKey);
+	if (typeof renderer === "string") branch[TagVariable](() => _el_read(branch[StartNode]));
+	else {
+		if (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.`);
+		if (!(renderer["setup"] || renderer["params"])?.["returns"]) throw new Error(`A dynamic tag with a [tag variable](https://markojs.com/docs/reference/language#tag-variables) rendered \`${renderer["id"]}\`, which does not [\`<return>\`](https://markojs.com/docs/reference/core-tag#return) a value. Add a \`<return>\` to it, or remove the variable.`);
+	}
+});
 //#endregion

package/dist/debug/dom/lazy.feat.js

@@ -1,4 +1,4 @@
 "use strict";
 //#region src/dom/lazy.feat.ts
-require("../dom-BLbR0hEx.js").withLazy();
+require("../dom-CUxvM4i9.js").withLazy();
 //#endregion

package/dist/debug/dom/lazy.feat.mjs

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

package/dist/debug/dom/placeholder.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-CUxvM4i9.js");
 //#region src/dom/placeholder.feat.ts
 require_control_flow._resumed[require_control_flow.PLACEHOLDER_DISMISS_REGISTER_ID] = (tryBranch) => {
 	if (tryBranch["#PlaceholderBranch"]) {

package/dist/debug/dom/placeholder.feat.mjs

@@ -1,4 +1,4 @@
-import { Bn as PlaceholderBranch, St as _resumed, Zt as destroyBranch, nn as PLACEHOLDER_DISMISS_REGISTER_ID } from "../dom-Cii0IA92.mjs";
+import { Ct as _resumed, Kn as PlaceholderBranch, Qt as destroyBranch, rn as PLACEHOLDER_DISMISS_REGISTER_ID } from "../dom-BeY1nGUb.mjs";
 //#region src/dom/placeholder.feat.ts
 _resumed[PLACEHOLDER_DISMISS_REGISTER_ID] = (tryBranch) => {
 	if (tryBranch["#PlaceholderBranch"]) {

package/dist/debug/{dom-Cii0IA92.mjs → dom-BeY1nGUb.mjs}

@@ -22,6 +22,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";
@@ -66,6 +67,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;
@@ -341,16 +344,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,
@@ -360,7 +366,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;
@@ -370,6 +376,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);
@@ -421,26 +455,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);
 	}
 }
@@ -684,9 +719,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;
@@ -696,8 +731,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);
@@ -710,7 +744,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;
@@ -1081,13 +1115,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;
 			};
@@ -1155,6 +1189,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;
@@ -1648,11 +1686,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);
@@ -1687,7 +1722,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) {
@@ -1695,7 +1730,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();
 	});
@@ -1992,18 +2027,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) {
@@ -2011,7 +2047,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];
@@ -2047,9 +2086,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`);
@@ -2202,7 +2241,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) {
@@ -2212,4 +2250,4 @@ function byFirstArg(name) {
 	return name;
 }
 //#endregion
-export { _attr_style_items as $, removeAndDestroyBranch as $t, _attr_input_value as A, AwaitCounter as An, _child_setup as At, _controllable_select as B, PlaceholderBranch as Bn, _id as Bt, _attr_details_or_dialog_open_script as C, withBranches as Cn, _var_resume as Ct, _attr_input_checkedValue_script as D, Setup as Dn, ready as Dt, _attr_input_checkedValue_default as E, Params as En, initEmbedded as Et, _attr_select_value as F, Load as Fn, _for_closure as Ft, _attr_class as G, _return as Gt, controllableRenders as H, TagVariable as Hn, _let as Ht, _attr_select_value_default as I, ParentBranch as In, _for_selector as It, _attr_class_names as J, _var as Jt, _attr_class_item as K, _return_change as Kt, _attr_select_value_script as L, PendingEffectScopes as Ln, _global_read as Lt, _attr_input_value_default as M, EndNode as Mn, _closure_get as Mt, _attr_input_value_dynamic_default as N, Gen$1 as Nn, _const as Nt, _attr_input_checked_default as O, Pending as On, readyFailed as Ot, _attr_input_value_script as P, Global as Pn, _el_read as Pt, _attr_style_item as Q, insertBranchBefore as Qt, _controllable_input as R, PendingEffects as Rn, _hoist as Rt, _attr_details_or_dialog_open_default as S, _call as Sn, _resumed as St, _attr_input_checkedValue as T, Owner as Tn, init as Tt, controllableScripts as U, _let_change as Ut, _controllable_textarea as V, StartNode as Vn, _if_closure as Vt, _attr as W, _or as Wt, _attr_nonce as X, _assert_init as Xt, _attr_content as Y, _var_change as Yt, _attr_style as Z, destroyBranch as Zt, installDynamicTagVar as _, forTo as _n, createAndSetupBranch as _t, _for_in as a, $signalReset as an, _html as at, runPendingEffects as b, _assert_hoist as bn, _dynamic_tag_var_resume as bt, _for_to as c, queueAsyncRender as cn, _style_shell as ct, _for_until_unkeyed as d, rendering as dn, _to_text as dt, syncGen as en, _attrs as et, _if as f, run as fn, insertChildNodes as ft, dynamicTagScript as g, forOf as gn, _content_resume as gt, addAwaitCounter as h, forIn as hn, _content_closures as ht, _dynamic_tag_content as i, $signal as in, _attrs_script as it, _attr_input_value_attribute_default as j, ClosestBranch as jn, _closure as jt, _attr_input_checked_script as k, Scope as kn, withLazy as kt, _for_to_unkeyed as l, queueEffect as ln, _text as lt, _try as m, runId as mn, _content as mt, _await_promise as n, PLACEHOLDER_DISMISS_REGISTER_ID as nn, _attrs_partial as nt, _for_of as o, installCatch as on, _lifecycle as ot, _show as p, runEffects as pn, toInsertNode as pt, _attr_class_items as q, _script as qt, _dynamic_tag as r, _on as rn, _attrs_partial_content as rt, _for_of_unkeyed as s, prepareEffects as sn, _style_rule_item as st, _await_content as t, DYNAMIC_TAG_SCRIPT_REGISTER_ID as tn, _attrs_content as tt, _for_until as u, queueRender as un, _text_content as ut, patchDynamicTag as v, forUntil as vn, createBranch as vt, _attr_input_checked as w, Clone as wn, getRegisteredWithScope as wt, _attr_details_or_dialog_open as x, _hoist_read_error as xn, _el as xt, renderCatch as y, _assert_class_toggles as yn, setupBranch as yt, _controllable_open as z, PendingRenders as zn, _hoist_resume as zt };
+export { _attr_style_items as $, insertBranchBefore as $t, _attr_input_value as A, Params as An, withLazy as At, _controllable_select as B, Global as Bn, _hoist_resume as Bt, _attr_details_or_dialog_open_script as C, _assert_hoist as Cn, _resumed as Ct, _attr_input_checkedValue_script as D, Clone as Dn, initEmbedded as Dt, _attr_input_checkedValue_default as E, withBranches as En, init as Et, _attr_select_value as F, AwaitCounter as Fn, _el_read as Ft, _attr_class as G, PendingRenders as Gn, _or as Gt, controllableRenders as H, ParentBranch as Hn, _if_closure as Ht, _attr_select_value_default as I, BranchRenders as In, _for_closure as It, _attr_class_names as J, TagVariable as Jn, _script as Jt, _attr_class_item as K, PlaceholderBranch as Kn, _return as Kt, _attr_select_value_script as L, ClosestBranch as Ln, _for_selector as Lt, _attr_input_value_default as M, Setup as Mn, _closure as Mt, _attr_input_value_dynamic_default as N, Pending as Nn, _closure_get as Nt, _attr_input_checked_default as O, Lazy as On, ready as Ot, _attr_input_value_script as P, Scope as Pn, _const as Pt, _attr_style_item as Q, destroyBranch as Qt, _controllable_input as R, EndNode as Rn, _global_read as Rt, _attr_details_or_dialog_open_default as S, _assert_class_toggles as Sn, _el as St, _attr_input_checkedValue as T, _call as Tn, getRegisteredWithScope as Tt, controllableScripts as U, PendingEffectScopes as Un, _let as Ut, _controllable_textarea as V, Load as Vn, _id as Vt, _attr as W, PendingEffects as Wn, _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 _, runId as _n, _return_setup as _t, _for_in as a, $signal as an, _html as at, runPendingEffects as b, forTo as bn, setupBranch as bt, _for_to as c, installBranchRenders as cn, _style_shell as ct, _for_until_unkeyed as d, queueAsyncRender as dn, _to_text as dt, removeAndDestroyBranch as en, _attrs as et, _if as f, queueEffect as fn, insertChildNodes as ft, dynamicTagScript as g, runEffects as gn, _content_resume as gt, addAwaitCounter as h, run as hn, _content_closures as ht, _dynamic_tag_content as i, _on as in, _attrs_script as it, _attr_input_value_attribute_default as j, Returns as jn, _child_setup as jt, _attr_input_checked_script as k, Owner as kn, readyFailed as kt, _for_to_unkeyed as l, installCatch as ln, _text as lt, _try as m, rendering as mn, _content as mt, _await_promise as n, DYNAMIC_TAG_SCRIPT_REGISTER_ID as nn, _attrs_partial as nt, _for_of as o, $signalReset as on, _lifecycle as ot, _show as p, queueRender as pn, toInsertNode as pt, _attr_class_items as q, StartNode as qn, _return_change as qt, _dynamic_tag as r, PLACEHOLDER_DISMISS_REGISTER_ID as rn, _attrs_partial_content as rt, _for_of_unkeyed as s, createBranchRenders as sn, _style_rule_item as st, _await_content as t, syncGen as tn, _attrs_content as tt, _for_until as u, prepareEffects as un, _text_content as ut, patchDynamicTag as v, forIn as vn, createAndSetupBranch as vt, _attr_input_checked as w, _hoist_read_error as wn, _var_resume as wt, _attr_details_or_dialog_open as x, forUntil as xn, _dynamic_tag_var_resume as xt, renderCatch as y, forOf as yn, createBranch as yt, _controllable_open as z, Gen$1 as zn, _hoist as zt };