marko 6.3.52 → 6.3.54

package/cheatsheet.md

@@ -18,6 +18,7 @@ Marko 6 = HTML superset, not JSX and not Marko 4/5 syntax. `.marko` files are co
 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>`.
 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.
 
 ## Canonical component
 

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

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

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

@@ -5,7 +5,6 @@ export declare const Params = "params";
 export declare const Owner = "owner";
 export declare const Accessor = "accessor";
 export declare const LocalClosures = "localClosures";
-export declare const LocalClosureValues = "localClosureValues";
 export declare const Embed = "embed";
 type Self = typeof import("./renderer-prop.debug");
 export type Value = Self[keyof Self];

package/dist/common/helpers.d.ts

@@ -8,6 +8,7 @@ export declare function escapeStyleValue(str: string): string;
 export declare const toDelimitedString: (val: unknown, delimiter: string, stringify: (n: string, v: unknown) => string | undefined) => string;
 export declare function isEventHandler(name: string): name is `on${string}`;
 export declare function getEventHandlerName(name: `on${string}`): string;
+export declare function hasKeys(obj: object): boolean;
 export declare function isVoid(value: unknown): value is false | null | undefined;
 export declare function isNotVoid(value: unknown): boolean;
 export declare function isPromise(value: unknown): value is Promise<unknown>;

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

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BJKb8-wr.js");
+const require_control_flow = require("../dom-CI0Vojyk.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 { An as PendingEffects, Sn as Scope, en as caughtError, g as renderCatch, jn as PendingRenders, kn as ParentBranch, nn as placeholderShown, tn as installCatch, wn as ClosestBranch, xn as Pending } from "../dom-Dq_Yu7MS.mjs";
+import { Dn as Scope, En as Pending, Fn as PendingEffects, In as PendingRenders, Pn as ParentBranch, an as installCatch, in as caughtError, kn as ClosestBranch, on as placeholderShown, y as renderCatch } from "../dom-tl43c2wO.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-BJKb8-wr.js");
+const require_control_flow = require("../dom-CI0Vojyk.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 { A as _attr_input_value_script, C as _attr_input_checkedValue_script, T as _attr_input_checked_script, z as controllableScripts } from "../dom-Dq_Yu7MS.mjs";
+import { E as _attr_input_checkedValue_script, H as controllableScripts, N as _attr_input_value_script, O as _attr_input_checked_script } from "../dom-tl43c2wO.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-BJKb8-wr.js");
+const require_control_flow = require("../dom-CI0Vojyk.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 { y as _attr_details_or_dialog_open_script, z as controllableScripts } from "../dom-Dq_Yu7MS.mjs";
+import { H as controllableScripts, S as _attr_details_or_dialog_open_script } from "../dom-tl43c2wO.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-BJKb8-wr.js");
+const require_control_flow = require("../dom-CI0Vojyk.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 { N as _attr_select_value_script, z as controllableScripts } from "../dom-Dq_Yu7MS.mjs";
+import { H as controllableScripts, I as _attr_select_value_script } from "../dom-tl43c2wO.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-BJKb8-wr.js");
+const require_control_flow = require("../dom-CI0Vojyk.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 { A as _attr_input_value_script, z as controllableScripts } from "../dom-Dq_Yu7MS.mjs";
+import { H as controllableScripts, N as _attr_input_value_script } from "../dom-tl43c2wO.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-BJKb8-wr.js");
+const require_control_flow = require("../dom-CI0Vojyk.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 { F as _controllable_open, I as _controllable_select, L as _controllable_textarea, P as _controllable_input, R as controllableRenders } from "../dom-Dq_Yu7MS.mjs";
+import { B as _controllable_textarea, L as _controllable_input, R as _controllable_open, V as controllableRenders, z as _controllable_select } from "../dom-tl43c2wO.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

@@ -0,0 +1,5 @@
+"use strict";
+const require_control_flow = require("../dom-CI0Vojyk.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

@@ -0,0 +1,4 @@
+import { $t as DYNAMIC_TAG_SCRIPT_REGISTER_ID, bt as _resumed, g as dynamicTagScript, xn as withBranches } from "../dom-tl43c2wO.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,6 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BJKb8-wr.js");
+const require_control_flow = require("../dom-CI0Vojyk.js");
 //#region src/dom/dynamic-tag-var.feat.ts
-const elementGetter = require_control_flow._resumed[require_control_flow.DYNAMIC_TAG_VAR_REGISTER_ID] = (branch) => () => require_control_flow._el_read(branch[require_control_flow.StartNode]);
-require_control_flow.installDynamicTagVar((branch) => branch[require_control_flow.TagVariable](elementGetter(branch)));
+require_control_flow.installDynamicTagVar((branch) => branch[require_control_flow.TagVariable](() => require_control_flow._el_read(branch[require_control_flow.StartNode])));
 //#endregion

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

@@ -1,5 +1,4 @@
-import { Nn as StartNode, Ot as _el_read, Pn as TagVariable, Xt as DYNAMIC_TAG_VAR_REGISTER_ID, gt as _resumed, m as installDynamicTagVar } from "../dom-Dq_Yu7MS.mjs";
+import { Mt as _el_read, Rn as StartNode, _ as installDynamicTagVar, zn as TagVariable } from "../dom-tl43c2wO.mjs";
 //#region src/dom/dynamic-tag-var.feat.ts
-const elementGetter = _resumed[DYNAMIC_TAG_VAR_REGISTER_ID] = (branch) => () => _el_read(branch[StartNode]);
-installDynamicTagVar((branch) => branch[TagVariable](elementGetter(branch)));
+installDynamicTagVar((branch) => branch[TagVariable](() => _el_read(branch[StartNode])));
 //#endregion

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

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BJKb8-wr.js");
+const require_control_flow = require("../dom-CI0Vojyk.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 { Gt as destroyBranch, Mn as PlaceholderBranch, Zt as PLACEHOLDER_DISMISS_REGISTER_ID, gt as _resumed } from "../dom-Dq_Yu7MS.mjs";
+import { Ln as PlaceholderBranch, Yt as destroyBranch, bt as _resumed, en as PLACEHOLDER_DISMISS_REGISTER_ID } from "../dom-tl43c2wO.mjs";
 //#region src/dom/placeholder.feat.ts
 _resumed[PLACEHOLDER_DISMISS_REGISTER_ID] = (tryBranch) => {
 	if (tryBranch["#PlaceholderBranch"]) {

package/dist/debug/{dom-BJKb8-wr.js → dom-CI0Vojyk.js}

@@ -59,7 +59,6 @@ const Params = "params";
 const Owner = "owner";
 const Accessor = "accessor";
 const LocalClosures = "localClosures";
-const LocalClosureValues = "localClosureValues";
 //#endregion
 //#region src/common/helpers.ts
 const htmlAttrNameReg = /^[^a-z_]|[^a-z0-9._:-]/i;
@@ -455,11 +454,6 @@ function abort(ctrl) {
 	ctrl.abort();
 }
 //#endregion
-//#region src/common/meta.ts
-const DYNAMIC_TAG_SCRIPT_REGISTER_ID = "_dynamicTagScript";
-const DYNAMIC_TAG_VAR_REGISTER_ID = "_dynamicTagVar";
-const PLACEHOLDER_DISMISS_REGISTER_ID = "_placeholderDismiss";
-//#endregion
 //#region src/common/opt.ts
 function toArray(opt) {
 	return opt ? Array.isArray(opt) ? opt : [opt] : [];
@@ -503,6 +497,11 @@ function parseHTML(html, ns) {
 	return parser.content || parser;
 }
 //#endregion
+//#region src/common/meta.ts
+const DYNAMIC_TAG_SCRIPT_REGISTER_ID = "_dynamicTagScript";
+const DYNAMIC_TAG_VAR_REGISTER_ID = "_dynamicTagVar";
+const PLACEHOLDER_DISMISS_REGISTER_ID = "_placeholderDismiss";
+//#endregion
 //#region src/dom/scope.ts
 let nextScopeId = 1e6;
 let collectingScopes;
@@ -731,20 +730,24 @@ function _closure(...closureSignals) {
 		}
 	};
 }
-function _closure_get(valueAccessor, fn, getOwnerScope, resumeId) {
-	const closureSignal = ((scope) => {
+function _closure_get(valueAccessor, fn, getOwnerScope, resumeId, ownerValueAccessor) {
+	const closureSignal = ((scope, resumed) => {
+		const ownerScope = getOwnerScope ? getOwnerScope(scope) : scope["_"];
 		scope[closureSignal[SignalIndexAccessor]] = closureSignal[Index];
-		fn(scope);
-		subscribeToScopeSet(getOwnerScope ? getOwnerScope(scope) : scope["_"], closureSignal[ScopeInstancesAccessor], scope);
+		if (!resumed || ownerValueAccessor in ownerScope) fn(scope);
+		subscribeToScopeSet(ownerScope, closureSignal[ScopeInstancesAccessor], scope);
 	});
 	closureSignal[ScopeInstancesAccessor] = ClosureScopes + valueAccessor;
 	closureSignal[SignalIndexAccessor] = ClosureSignalIndex + valueAccessor;
-	if (resumeId) _resumed[resumeId] = closureSignal;
+	if (resumeId) {
+		ownerValueAccessor = valueAccessor;
+		_resumed[resumeId] = (scope) => closureSignal(scope, 1);
+	}
 	return closureSignal;
 }
 function _child_setup(setup) {
 	setup._ = (scope, owner) => {
-		scope["_"] = owner;
+		scope["_"] ||= owner;
 		queueRender(scope, setup, -1);
 	};
 	return setup;
@@ -788,8 +791,9 @@ function _el_read(value) {
 }
 function* traverse(scope, path, args, i = path.length - 1) {
 	if (rendering) _hoist_read_error();
-	if (scope) if (Symbol.iterator in scope) for (const childScope of scope.values()) yield* traverse(childScope, path, args, i);
-	else {
+	if (scope) if (Symbol.iterator in scope) {
+		for (const childScope of scope.values()) if (childScope["#Gen"] !== 0) yield* traverse(childScope, path, args, i);
+	} else {
 		const item = scope[path[i]];
 		if (i) yield* traverse(item, path, args, i - 1);
 		else yield typeof item === "function" ? item(...args) : item;
@@ -1090,6 +1094,12 @@ function _var_resume(id, signal) {
 function _el(id, accessor) {
 	return _resumed[id] = (scope) => () => _el_read(scope[accessor]);
 }
+function _resume_dynamic_tag_var(accessor) {
+	_resumed[DYNAMIC_TAG_VAR_REGISTER_ID + accessor] = (scope) => () => {
+		const node = scope[accessor];
+		return _el_read(node.nodeType === 8 ? node.previousSibling : node);
+	};
+}
 //#endregion
 //#region src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
@@ -1123,7 +1133,7 @@ function _content(id, template, walks, setup, params, dynamicScopesAccessor) {
 	} : (branch) => {
 		walk(branch[StartNode] = branch[EndNode] = new Text(), walks, branch);
 	};
-	return (owner) => {
+	return _resumed[id] = (owner) => {
 		return {
 			["id"]: id,
 			[Clone]: clone,
@@ -1134,16 +1144,29 @@ function _content(id, template, walks, setup, params, dynamicScopesAccessor) {
 		};
 	};
 }
-function _content_resume(id, template, walks, setup, params, dynamicScopesAccessor) {
-	return _resumed[id] = _content(id, template, walks, setup, params, dynamicScopesAccessor);
+function _content_resume(renderer, hasLocalValues = 0) {
+	return _resumed[renderer()["id"]] = (owner, ...values) => {
+		for (let i = values.length, scope = owner; i > hasLocalValues;) {
+			const closures = values[--i];
+			for (const key in closures) if (!(key in scope)) scope[key] = closures[key];
+			scope = scope["_"];
+		}
+		return renderer(owner, values[hasLocalValues - 1]);
+	};
 }
 function _content_closures(renderer, closureFns) {
 	const closureSignals = {};
 	for (const key in closureFns) closureSignals[key] = _const(key, closureFns[key]);
 	return (owner, closureValues) => {
 		const instance = renderer(owner);
-		instance[LocalClosures] = closureSignals;
-		instance[LocalClosureValues] = closureValues;
+		const clone = instance[Clone];
+		const setClosures = instance[LocalClosures] = (branch) => {
+			for (const key in closureSignals) closureSignals[key](branch, closureValues[key]);
+		};
+		instance[Clone] = (branch, ns) => {
+			clone(branch, ns);
+			setClosures(branch);
+		};
 		return instance;
 	};
 }
@@ -1288,7 +1311,7 @@ function _attr_content(scope, nodeAccessor, value) {
 		setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch);
 		if (content?.["accessor"]) subscribeToScopeSet(content[Owner], content[Accessor], scope[BranchScopes$1 + nodeAccessor]);
 	}
-	for (const accessor in content?.[LocalClosures]) content[LocalClosures][accessor](scope[BranchScopes$1 + nodeAccessor], content[LocalClosureValues][accessor]);
+	content?.[LocalClosures]?.(scope[BranchScopes$1 + nodeAccessor]);
 }
 function _attrs_script(scope, nodeAccessor) {
 	const el = scope[nodeAccessor];
@@ -1684,18 +1707,20 @@ function _await_promise(nodeAccessor, params) {
 		return awaitBranch;
 	};
 	const awaitPromise = (scope, promise) => {
-		if (!isPromise(promise) && scope[promiseAccessor]) promise = Promise.resolve(promise);
+		if (!isPromise(scope[promiseAccessor])) scope[promiseAccessor] = 0;
 		let awaitBranch = scope[branchAccessor];
-		const tryPlaceholder = findBranchWithKey(scope, PlaceholderContent);
+		const tryPlaceholder = (isPromise(promise) || scope[promiseAccessor]) && findBranchWithKey(scope, "#PlaceholderContent");
 		const tryBranch = tryPlaceholder || awaitBranch;
-		if (!(isPromise(promise) ? tryBranch : awaitBranch)) {
-			scope[promiseAccessor] = () => awaitPromise(scope, promise);
-			return;
-		}
-		if (!isPromise(promise)) {
-			resolveAwait(scope, scope[nodeAccessor], promise);
+		if (!tryBranch) {
+			const replay = scope[promiseAccessor] = () => replay === scope[promiseAccessor] && awaitPromise(scope, promise);
+			const awaitCounter = findBranchWithKey(scope, PlaceholderContent)?.[AwaitCounter];
+			if (awaitCounter?.i) {
+				const complete = awaitCounter.c;
+				awaitCounter.c = () => complete() || queueAsyncRender(scope, replay);
+			}
 			return;
 		}
+		if (!isPromise(promise)) return scope[promiseAccessor] ? awaitPromise(scope, Promise.resolve(promise)) : resolveAwait(scope, scope[nodeAccessor], promise);
 		let awaitCounter = tryBranch[AwaitCounter];
 		placeholderShown.add(pendingEffects);
 		if (!tryPlaceholder && !awaitCounter?.i) awaitCounter = createAwaitCounter(tryBranch, () => {
@@ -1706,7 +1731,7 @@ function _await_promise(nodeAccessor, params) {
 					if (detachedParent === anchor.parentNode) anchor.remove();
 					else anchor.replaceWith(detachedParent);
 				}
-			} else dismissPlaceholder(tryBranch);
+			}
 		});
 		if (!scope[promiseAccessor]) {
 			if (awaitBranch) awaitBranch[PendingRenders] ||= [];
@@ -1722,7 +1747,8 @@ function _await_promise(nodeAccessor, params) {
 			if (thisPromise === scope[promiseAccessor]) {
 				const referenceNode = scope[nodeAccessor];
 				scope[promiseAccessor] = 0;
-				if (scope["#ClosestBranch"]?.["#Gen"] === 0) {
+				if (!scope[branchAccessor] || scope["#ClosestBranch"]?.["#Gen"] === 0) {
+					if (!scope[branchAccessor]) awaitPromise(scope, data);
 					awaitCounter.c();
 					run();
 					return;
@@ -1769,11 +1795,7 @@ function _await_content(nodeAccessor, template, walks, setup) {
 	return (scope) => {
 		const pendingScopes = collectScopes(() => (scope[branchAccessor] = createBranch(scope[Global], renderer, scope, scope[nodeAccessor].parentNode))[DetachedAwait] = renderer);
 		scope[branchAccessor][PendingScopes] = pendingScopes;
-		const resolveSync = scope[promiseAccessor];
-		if (typeof resolveSync === "function") {
-			scope[promiseAccessor] = 0;
-			resolveSync();
-		}
+		if (typeof scope[promiseAccessor] === "function") scope[promiseAccessor]();
 	};
 }
 function addAwaitCounter(scope, tryBranch = findBranchWithKey(scope, PlaceholderContent)) {
@@ -1899,18 +1921,19 @@ let _dynamic_tag = /*@__PURE__*/ withBranches((nodeAccessor, getContent, getTagV
 	return (scope, newRenderer, getInput) => {
 		const normalizedRenderer = normalizeDynamicRenderer(newRenderer);
 		if (scope[rendererAccessor] !== (scope[rendererAccessor] = rendererKey(normalizedRenderer)) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) {
-			setConditionalRenderer(scope, nodeAccessor, normalizedRenderer || (getContent ? getContent(scope) : void 0), createBranchWithTagNameOrRenderer);
+			const renderer = normalizedRenderer || (getContent ? getContent(scope) : void 0);
+			setConditionalRenderer(scope, nodeAccessor, renderer, createBranchWithTagNameOrRenderer);
 			if (getTagVar) if (scope[childScopeAccessor]) {
 				scope[childScopeAccessor][TagVariable] = (value) => getTagVar()(scope, value);
 				if (typeof normalizedRenderer === "string") bindNativeTagVar?.(scope[childScopeAccessor]);
 			} else getTagVar()(scope, void 0);
-			if (typeof normalizedRenderer === "string") {
+			if (typeof renderer === "string") {
 				if (getContent) {
 					const content = getContent(scope);
-					setConditionalRenderer(scope[childScopeAccessor], `#${normalizedRenderer.toLowerCase()}/0`, content, createAndSetupBranch);
-					if (content["accessor"]) subscribeToScopeSet(content[Owner], content[Accessor], scope[childScopeAccessor][`BranchScopes:#${normalizedRenderer.toLowerCase()}/0`]);
+					setConditionalRenderer(scope[childScopeAccessor], `#${renderer.toLowerCase()}/0`, content, createAndSetupBranch);
+					if (content["accessor"]) subscribeToScopeSet(content[Owner], content[Accessor], scope[childScopeAccessor][`BranchScopes:#${renderer.toLowerCase()}/0`]);
 				}
-			} else if (normalizedRenderer?.["accessor"]) subscribeToScopeSet(normalizedRenderer[Owner], normalizedRenderer[Accessor], scope[childScopeAccessor]);
+			} else if (renderer?.["accessor"]) subscribeToScopeSet(renderer[Owner], renderer[Accessor], scope[childScopeAccessor]);
 		}
 		if (normalizedRenderer) {
 			const childScope = scope[childScopeAccessor];
@@ -1920,7 +1943,7 @@ let _dynamic_tag = /*@__PURE__*/ withBranches((nodeAccessor, getContent, getTagV
 				(getContent ? _attrs : _attrs_content)(childScope, nodeAccessor, (inputIsArgs ? args[0] : args) || {}, controllableRenders[childScope[nodeAccessor].tagName]);
 				if (childScope["EventAttributes:" + nodeAccessor] || childScope["ControlledHandler:" + nodeAccessor]) queueEffect(childScope, dynamicTagScript);
 			} else {
-				for (const accessor in normalizedRenderer[LocalClosures]) normalizedRenderer[LocalClosures][accessor](childScope, normalizedRenderer[LocalClosureValues][accessor]);
+				normalizedRenderer[LocalClosures]?.(childScope);
 				if (normalizedRenderer["params"]) if (inputIsArgs) normalizedRenderer[Params](childScope, normalizedRenderer._ ? args[0] : args);
 				else {
 					const inputWithContent = getContent ? {
@@ -1941,14 +1964,13 @@ const _dynamic_tag_content = /*@__PURE__*/ withBranches((nodeAccessor) => {
 			setConditionalRenderer(scope, nodeAccessor, renderer, createAndSetupBranch);
 			if (renderer?.["accessor"]) subscribeToScopeSet(renderer[Owner], renderer[Accessor], scope[childScopeAccessor]);
 		}
-		if (renderer) for (const accessor in renderer[LocalClosures]) renderer[LocalClosures][accessor](scope[childScopeAccessor], renderer[LocalClosureValues][accessor]);
+		renderer?.[LocalClosures]?.(scope[childScopeAccessor]);
 	};
 });
 let bindNativeTagVar;
 function installDynamicTagVar(bind) {
 	bindNativeTagVar = bind;
 }
-const _resume_dynamic_tag = /*@__PURE__*/ withBranches(() => _resumed[DYNAMIC_TAG_SCRIPT_REGISTER_ID] = dynamicTagScript);
 function dynamicTagScript(branch) {
 	_attrs_script(branch, `#${branch[Renderer].toLowerCase()}/0`);
 }
@@ -1972,7 +1994,7 @@ function setConditionalRenderer(scope, nodeAccessor, newRenderer, createBranch)
 		referenceNode.remove();
 	}
 }
-const loop = /*@__PURE__*/ withBranches((forEach) => (nodeAccessor, template, walks, setup, params) => {
+const loop = /*@__PURE__*/ withBranches((forEach, reorder) => (nodeAccessor, template, walks, setup, params) => {
 	const scopesAccessor = BranchScopes$1 + nodeAccessor;
 	const keyedScopesAccessor = KeyedScopes + nodeAccessor;
 	const renderer = _content("", template, walks, setup)();
@@ -2033,61 +2055,67 @@ const loop = /*@__PURE__*/ withBranches((forEach) => (nodeAccessor, template, wa
 			for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
 			return;
 		}
-		const diffLen = newEnd - start + 1;
-		const sources = new Array(diffLen);
-		const pred = new Array(diffLen);
-		const tails = [];
-		let tail = -1;
-		let lo;
-		let hi;
-		let mid;
-		for (let i = diffLen; i--;) sources[i] = newScopes[start + i]["#LoopIndex"] ?? -1;
-		for (let i = 0; i < diffLen; i++) if (~sources[i]) if (tail < 0 || sources[tails[tail]] < sources[i]) {
-			if (~tail) pred[i] = tails[tail];
-			tails[++tail] = i;
-		} else {
-			lo = 0;
-			hi = tail;
-			while (lo < hi) {
-				mid = (lo + hi) / 2 | 0;
-				if (sources[tails[mid]] < sources[i]) lo = mid + 1;
-				else hi = mid;
-			}
-			if (sources[i] < sources[tails[lo]]) {
-				if (lo > 0) pred[i] = tails[lo - 1];
-				tails[lo] = i;
-			}
-		}
-		hi = tails[tail];
-		lo = tail + 1;
-		while (lo-- > 0) {
-			tails[lo] = hi;
-			hi = pred[hi];
-		}
-		for (let i = diffLen; i--;) {
-			if (~tail && i === tails[tail]) tail--;
-			else insertBranchBefore(newScopes[start + i], parentNode, afterReference);
-			afterReference = newScopes[start + i][StartNode];
-		}
+		reorder(newScopes, start, newEnd, parentNode, afterReference);
 	};
 });
 const _for_of = /*@__PURE__*/ loop(([all, by], cb) => {
 	by ||= bySecondArg;
 	if (typeof by === "string") forOf(all, (item, i) => cb(item[by], [item, i]));
 	else forOf(all, (item, i) => cb(by(item, i), [item, i]));
-});
+}, reorderKeyed);
 const _for_in = /*@__PURE__*/ loop(([obj, by], cb) => {
 	by ||= byFirstArg;
 	forIn(obj, (key, value) => cb(by(key, value), [key, value]));
-});
+}, reorderKeyed);
 const _for_to = /*@__PURE__*/ loop(([to, from, step, by], cb) => {
 	by ||= byFirstArg;
 	forTo(to, from, step, (v) => cb(by(v), [v]));
-});
+}, reorderKeyed);
 const _for_until = /*@__PURE__*/ loop(([until, from, step, by], cb) => {
 	by ||= byFirstArg;
 	forUntil(until, from, step, (v) => cb(by(v), [v]));
-});
+}, reorderKeyed);
+const _for_of_unkeyed = /*@__PURE__*/ loop(([all], cb) => forOf(all, (item, i) => cb(i, [item, i])));
+const _for_to_unkeyed = /*@__PURE__*/ loop(([to, from, step], cb) => forTo(to, from, step, (v) => cb(v, [v])));
+const _for_until_unkeyed = /*@__PURE__*/ loop(([until, from, step], cb) => forUntil(until, from, step, (v) => cb(v, [v])));
+function reorderKeyed(newScopes, start, newEnd, parentNode, afterReference) {
+	const diffLen = newEnd - start + 1;
+	const sources = new Array(diffLen);
+	const pred = new Array(diffLen);
+	const tails = [];
+	let tail = -1;
+	let lo;
+	let hi;
+	let mid;
+	for (let i = diffLen; i--;) sources[i] = newScopes[start + i]["#LoopIndex"] ?? -1;
+	for (let i = 0; i < diffLen; i++) if (~sources[i]) if (tail < 0 || sources[tails[tail]] < sources[i]) {
+		if (~tail) pred[i] = tails[tail];
+		tails[++tail] = i;
+	} else {
+		lo = 0;
+		hi = tail;
+		while (lo < hi) {
+			mid = (lo + hi) / 2 | 0;
+			if (sources[tails[mid]] < sources[i]) lo = mid + 1;
+			else hi = mid;
+		}
+		if (sources[i] < sources[tails[lo]]) {
+			if (lo > 0) pred[i] = tails[lo - 1];
+			tails[lo] = i;
+		}
+	}
+	hi = tails[tail];
+	lo = tail + 1;
+	while (lo-- > 0) {
+		tails[lo] = hi;
+		hi = pred[hi];
+	}
+	for (let i = diffLen; i--;) {
+		if (~tail && i === tails[tail]) tail--;
+		else insertBranchBefore(newScopes[start + i], parentNode, afterReference);
+		afterReference = newScopes[start + i][StartNode];
+	}
+}
 function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
 	if (typeof tagNameOrRenderer === "string") assertValidTagName(tagNameOrRenderer);
 	const branch = createBranch($global, tagNameOrRenderer, parentScope, parentNode);
@@ -2132,10 +2160,10 @@ Object.defineProperty(exports, "ClosestBranch", {
 		return ClosestBranch;
 	}
 });
-Object.defineProperty(exports, "DYNAMIC_TAG_VAR_REGISTER_ID", {
+Object.defineProperty(exports, "DYNAMIC_TAG_SCRIPT_REGISTER_ID", {
 	enumerable: true,
 	get: function() {
-		return DYNAMIC_TAG_VAR_REGISTER_ID;
+		return DYNAMIC_TAG_SCRIPT_REGISTER_ID;
 	}
 });
 Object.defineProperty(exports, "EndNode", {
@@ -2558,6 +2586,12 @@ Object.defineProperty(exports, "_for_of", {
 		return _for_of;
 	}
 });
+Object.defineProperty(exports, "_for_of_unkeyed", {
+	enumerable: true,
+	get: function() {
+		return _for_of_unkeyed;
+	}
+});
 Object.defineProperty(exports, "_for_selector", {
 	enumerable: true,
 	get: function() {
@@ -2570,12 +2604,24 @@ Object.defineProperty(exports, "_for_to", {
 		return _for_to;
 	}
 });
+Object.defineProperty(exports, "_for_to_unkeyed", {
+	enumerable: true,
+	get: function() {
+		return _for_to_unkeyed;
+	}
+});
 Object.defineProperty(exports, "_for_until", {
 	enumerable: true,
 	get: function() {
 		return _for_until;
 	}
 });
+Object.defineProperty(exports, "_for_until_unkeyed", {
+	enumerable: true,
+	get: function() {
+		return _for_until_unkeyed;
+	}
+});
 Object.defineProperty(exports, "_global_read", {
 	enumerable: true,
 	get: function() {
@@ -2654,10 +2700,10 @@ Object.defineProperty(exports, "_or", {
 		return _or;
 	}
 });
-Object.defineProperty(exports, "_resume_dynamic_tag", {
+Object.defineProperty(exports, "_resume_dynamic_tag_var", {
 	enumerable: true,
 	get: function() {
-		return _resume_dynamic_tag;
+		return _resume_dynamic_tag_var;
 	}
 });
 Object.defineProperty(exports, "_resumed", {
@@ -2786,6 +2832,12 @@ Object.defineProperty(exports, "destroyBranch", {
 		return destroyBranch;
 	}
 });
+Object.defineProperty(exports, "dynamicTagScript", {
+	enumerable: true,
+	get: function() {
+		return dynamicTagScript;
+	}
+});
 Object.defineProperty(exports, "forIn", {
 	enumerable: true,
 	get: function() {
@@ -2948,6 +3000,12 @@ Object.defineProperty(exports, "toInsertNode", {
 		return toInsertNode;
 	}
 });
+Object.defineProperty(exports, "withBranches", {
+	enumerable: true,
+	get: function() {
+		return withBranches;
+	}
+});
 Object.defineProperty(exports, "withLazy", {
 	enumerable: true,
 	get: function() {