marko 6.3.48 → 6.3.50

package/dist/common/constants/resume-symbol.d.ts

@@ -8,6 +8,7 @@ export declare const BranchEndNativeTag = "(";
 export declare const BranchEndSingleNode = "|";
 export declare const BranchEndOnlyChildInParent = ")";
 export declare const BranchEndSingleNodeOnlyChildInParent = "}";
+export declare const ReorderStart = "*";
 type Self = typeof import("./resume-symbol");
 export type Value = Self[keyof Self];
 export {};

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

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-CA_HiiES.js");
+const require_control_flow = require("../dom-BAGeiafn.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 ParentBranch, Cn as Scope, Mn as PendingRenders, Sn as Pending, Tn as ClosestBranch, g as renderCatch, jn as PendingEffects, nn as installCatch, rn as placeholderShown, tn as caughtError } from "../dom-DBMLPLeE.mjs";
+import { An as ParentBranch, Cn as Scope, Mn as PendingRenders, Sn as Pending, Tn as ClosestBranch, g as renderCatch, jn as PendingEffects, nn as installCatch, rn as placeholderShown, tn as caughtError } from "../dom-C55iHvof.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-CA_HiiES.js");
+const require_control_flow = require("../dom-BAGeiafn.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-DBMLPLeE.mjs";
+import { A as _attr_input_value_script, C as _attr_input_checkedValue_script, T as _attr_input_checked_script, z as controllableScripts } from "../dom-C55iHvof.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-CA_HiiES.js");
+const require_control_flow = require("../dom-BAGeiafn.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-DBMLPLeE.mjs";
+import { y as _attr_details_or_dialog_open_script, z as controllableScripts } from "../dom-C55iHvof.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-CA_HiiES.js");
+const require_control_flow = require("../dom-BAGeiafn.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-DBMLPLeE.mjs";
+import { N as _attr_select_value_script, z as controllableScripts } from "../dom-C55iHvof.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-CA_HiiES.js");
+const require_control_flow = require("../dom-BAGeiafn.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-DBMLPLeE.mjs";
+import { A as _attr_input_value_script, z as controllableScripts } from "../dom-C55iHvof.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-CA_HiiES.js");
+const require_control_flow = require("../dom-BAGeiafn.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-DBMLPLeE.mjs";
+import { F as _controllable_open, I as _controllable_select, L as _controllable_textarea, P as _controllable_input, R as controllableRenders } from "../dom-C55iHvof.mjs";
 import "./controllable-input.feat.mjs";
 import "./controllable-open.feat.mjs";
 import "./controllable-select.feat.mjs";

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

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-CA_HiiES.js");
+const require_control_flow = require("../dom-BAGeiafn.js");
 //#region src/dom/dynamic-tag-var.feat.ts
 const elementGetter = (branch) => () => require_control_flow._el_read(branch[require_control_flow.StartNode]);
 require_control_flow.installDynamicTagVar((branch) => branch[require_control_flow.TagVariable](elementGetter(branch)));

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

@@ -1,4 +1,4 @@
-import { Fn as TagVariable, Pn as StartNode, Zt as DYNAMIC_TAG_VAR_REGISTER_ID, gt as _resume, kt as _el_read, m as installDynamicTagVar } from "../dom-DBMLPLeE.mjs";
+import { Fn as TagVariable, Pn as StartNode, Zt as DYNAMIC_TAG_VAR_REGISTER_ID, gt as _resume, kt as _el_read, m as installDynamicTagVar } from "../dom-C55iHvof.mjs";
 //#region src/dom/dynamic-tag-var.feat.ts
 const elementGetter = (branch) => () => _el_read(branch[StartNode]);
 installDynamicTagVar((branch) => branch[TagVariable](elementGetter(branch)));

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

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

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

@@ -1,4 +1,4 @@
-import { Ct as registeredValues, Kt as destroyBranch, Nn as PlaceholderBranch, Qt as PLACEHOLDER_DISMISS_REGISTER_ID } from "../dom-DBMLPLeE.mjs";
+import { Ct as registeredValues, Kt as destroyBranch, Nn as PlaceholderBranch, Qt as PLACEHOLDER_DISMISS_REGISTER_ID } from "../dom-C55iHvof.mjs";
 //#region src/dom/placeholder.feat.ts
 registeredValues[PLACEHOLDER_DISMISS_REGISTER_ID] = (tryBranch) => {
 	if (tryBranch["#PlaceholderBranch"]) {

package/dist/debug/{dom-CA_HiiES.js → dom-BAGeiafn.js}

@@ -909,13 +909,14 @@ function init(runtimeId = "M") {
 			const render = curRenders[renderId] = renders[renderId] || renders(renderId);
 			const walk = render.w;
 			const scopeLookup = {};
+			const pending = [];
 			const getScope = (id) => scopeLookup[id] || (+id ? initScope(scopeLookup[id] = { ["#Id"]: +id }) : initGlobal());
 			const initGlobal = () => scopeLookup[0] ||= {
 				runtimeId,
 				renderId
 			};
 			const initScope = (scope) => {
-				scope[Gen$1] = 1;
+				scope[Gen$1] ??= 1;
 				scope[Global] = initGlobal();
 				if (branchesEnabled && scope["#ClosestBranchId"]) scope[ClosestBranch] = getScope(scope[ClosestBranchId]);
 				return scope;
@@ -933,11 +934,16 @@ function init(runtimeId = "M") {
 				}
 			};
 			const serializeContext = ((data, registryId) => typeof data === "number" ? registryId ? registeredValues[registryId](getScope(data)) : getScope(data) : applyScopes(data));
-			const createVisitBranches = (branchScopesStack = [], branchStarts = [], orphanBranches = [], deferredOwners = [], curBranchScopes) => {
-				return (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length, j = deferredOwners.length) => {
+			const createVisitBranches = (branchScopesStack = [], branchStarts = [], curBranchScopes, reorderBranch, reorderDepth = 0, adopt = (scope, branch) => scope["#ClosestBranch"] === scope ? scope !== branch && setParentBranch(scope, branch) : scope[ClosestBranch] = branch) => {
+				return (branchId, branch, endedBranches, accessor, nodeAccessor, singleNode, parent = visit.parentNode, startVisit = visit) => {
+					if (visitType === "*") {
+						while (reorderBranch && pending.length >= reorderDepth) adopt(pending.pop(), reorderBranch);
+						if (reorderBranch = +lastToken && visitScope) reorderDepth = pending.push(reorderBranch);
+						return;
+					}
 					if (visitType !== "[") {
 						visitScope[nextToken()] = visitType === ")" || visitType === "}" ? parent : visit;
-						accessor = BranchScopes$1 + lastToken;
+						accessor = BranchScopes$1 + (nodeAccessor = lastToken);
 						singleNode = visitType !== "]" && visitType !== ")";
 						nextToken();
 					}
@@ -951,6 +957,7 @@ function init(runtimeId = "M") {
 							branch[EndNode] = branch[StartNode] = startVisit;
 							if (visitType === "(") branch[getDebugKey(0, startVisit)] = startVisit;
 						} else {
+							branch[BranchAccessor] = nodeAccessor;
 							curBranchScopes = push(curBranchScopes, branch);
 							if (accessor) {
 								visitScope[accessor] = curBranchScopes;
@@ -962,19 +969,11 @@ function init(runtimeId = "M") {
 							branch[StartNode] = startVisit;
 							branch[EndNode] = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
 						}
-						while (i && orphanBranches[i - 1]["#Id"] > branchId) {
-							i--;
-							setParentBranch(orphanBranches.pop(), branch);
-						}
-						while (j && deferredOwners[j - 1]["#Id"] > branchId) {
-							j--;
-							const owner = deferredOwners.pop();
-							if (owner["#ClosestBranch"] !== owner) owner[ClosestBranch] = branch;
-						}
+						while (pending.at(-1)?.["#Id"] >= branchId) adopt(pending.pop(), branch);
 						nextToken();
 					}
 					if (endedBranches) {
-						for (const ended of endedBranches) orphanBranches.push(ended);
+						for (const ended of endedBranches) pending.push(ended);
 						if (singleNode) visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0];
 					}
 					if (visitType === "[") {
@@ -983,7 +982,7 @@ function init(runtimeId = "M") {
 							curBranchScopes = void 0;
 						}
 						branchStarts.push(visit);
-					} else deferredOwners.push(visitScope);
+					} else pending.push(visitScope);
 				};
 			};
 			const nextToken = () => lastToken = visitText.slice(lastTokenIndex, (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1 || visitText.length + 1) - 1);
@@ -1039,12 +1038,21 @@ function init(runtimeId = "M") {
 					else {
 						visitScope[nextToken()] = htmlStart;
 						visitScope[DynamicHTMLLastChild + lastToken] = visit;
+						if ((branchesEnabled || lazyEnabled) && pending[pending.length - 1] !== visitScope) pending.push(visitScope);
 					}
 					else if (branchesEnabled && visitType > "'") (visitBranches ||= createVisitBranches())();
 					else if (lazyEnabled && render.b && visitType > "%") visits[retained++] = visit;
-					else visitScope[nextToken()] = visitType === "$" ? visit.previousSibling : visit.parentNode.insertBefore(new Text(), visit);
+					else {
+						visitScope[nextToken()] = visitType === "%" ? visit.parentNode.insertBefore(new Text(), visit) : visit.previousSibling;
+						if ((branchesEnabled || lazyEnabled) && pending[pending.length - 1] !== visitScope) pending.push(visitScope);
+					}
+				}
+				if (branchesEnabled && visitBranches) {
+					visitType = "*";
+					lastToken = "";
+					visitBranches();
 				}
-				if (embedRenders && !embedAnchor && visit) embedRenders.set(embedAnchor = visit.parentNode.insertBefore(new Text(), visit.nextSibling), [renderId, scopeLookup]);
+				if (embedRenders && !embedAnchor && visit?.parentNode) embedRenders.set(embedAnchor = visit.parentNode.insertBefore(new Text(), visit.nextSibling), [renderId, scopeLookup]);
 				visits.length = retained;
 				return effects;
 			};

package/dist/debug/{dom-DBMLPLeE.mjs → dom-C55iHvof.mjs}

@@ -908,13 +908,14 @@ function init(runtimeId = "M") {
 			const render = curRenders[renderId] = renders[renderId] || renders(renderId);
 			const walk = render.w;
 			const scopeLookup = {};
+			const pending = [];
 			const getScope = (id) => scopeLookup[id] || (+id ? initScope(scopeLookup[id] = { ["#Id"]: +id }) : initGlobal());
 			const initGlobal = () => scopeLookup[0] ||= {
 				runtimeId,
 				renderId
 			};
 			const initScope = (scope) => {
-				scope[Gen$1] = 1;
+				scope[Gen$1] ??= 1;
 				scope[Global] = initGlobal();
 				if (branchesEnabled && scope["#ClosestBranchId"]) scope[ClosestBranch] = getScope(scope[ClosestBranchId]);
 				return scope;
@@ -932,11 +933,16 @@ function init(runtimeId = "M") {
 				}
 			};
 			const serializeContext = ((data, registryId) => typeof data === "number" ? registryId ? registeredValues[registryId](getScope(data)) : getScope(data) : applyScopes(data));
-			const createVisitBranches = (branchScopesStack = [], branchStarts = [], orphanBranches = [], deferredOwners = [], curBranchScopes) => {
-				return (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length, j = deferredOwners.length) => {
+			const createVisitBranches = (branchScopesStack = [], branchStarts = [], curBranchScopes, reorderBranch, reorderDepth = 0, adopt = (scope, branch) => scope["#ClosestBranch"] === scope ? scope !== branch && setParentBranch(scope, branch) : scope[ClosestBranch] = branch) => {
+				return (branchId, branch, endedBranches, accessor, nodeAccessor, singleNode, parent = visit.parentNode, startVisit = visit) => {
+					if (visitType === "*") {
+						while (reorderBranch && pending.length >= reorderDepth) adopt(pending.pop(), reorderBranch);
+						if (reorderBranch = +lastToken && visitScope) reorderDepth = pending.push(reorderBranch);
+						return;
+					}
 					if (visitType !== "[") {
 						visitScope[nextToken()] = visitType === ")" || visitType === "}" ? parent : visit;
-						accessor = BranchScopes$1 + lastToken;
+						accessor = BranchScopes$1 + (nodeAccessor = lastToken);
 						singleNode = visitType !== "]" && visitType !== ")";
 						nextToken();
 					}
@@ -950,6 +956,7 @@ function init(runtimeId = "M") {
 							branch[EndNode] = branch[StartNode] = startVisit;
 							if (visitType === "(") branch[getDebugKey(0, startVisit)] = startVisit;
 						} else {
+							branch[BranchAccessor] = nodeAccessor;
 							curBranchScopes = push(curBranchScopes, branch);
 							if (accessor) {
 								visitScope[accessor] = curBranchScopes;
@@ -961,19 +968,11 @@ function init(runtimeId = "M") {
 							branch[StartNode] = startVisit;
 							branch[EndNode] = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
 						}
-						while (i && orphanBranches[i - 1]["#Id"] > branchId) {
-							i--;
-							setParentBranch(orphanBranches.pop(), branch);
-						}
-						while (j && deferredOwners[j - 1]["#Id"] > branchId) {
-							j--;
-							const owner = deferredOwners.pop();
-							if (owner["#ClosestBranch"] !== owner) owner[ClosestBranch] = branch;
-						}
+						while (pending.at(-1)?.["#Id"] >= branchId) adopt(pending.pop(), branch);
 						nextToken();
 					}
 					if (endedBranches) {
-						for (const ended of endedBranches) orphanBranches.push(ended);
+						for (const ended of endedBranches) pending.push(ended);
 						if (singleNode) visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0];
 					}
 					if (visitType === "[") {
@@ -982,7 +981,7 @@ function init(runtimeId = "M") {
 							curBranchScopes = void 0;
 						}
 						branchStarts.push(visit);
-					} else deferredOwners.push(visitScope);
+					} else pending.push(visitScope);
 				};
 			};
 			const nextToken = () => lastToken = visitText.slice(lastTokenIndex, (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1 || visitText.length + 1) - 1);
@@ -1038,12 +1037,21 @@ function init(runtimeId = "M") {
 					else {
 						visitScope[nextToken()] = htmlStart;
 						visitScope[DynamicHTMLLastChild + lastToken] = visit;
+						if ((branchesEnabled || lazyEnabled) && pending[pending.length - 1] !== visitScope) pending.push(visitScope);
 					}
 					else if (branchesEnabled && visitType > "'") (visitBranches ||= createVisitBranches())();
 					else if (lazyEnabled && render.b && visitType > "%") visits[retained++] = visit;
-					else visitScope[nextToken()] = visitType === "$" ? visit.previousSibling : visit.parentNode.insertBefore(new Text(), visit);
+					else {
+						visitScope[nextToken()] = visitType === "%" ? visit.parentNode.insertBefore(new Text(), visit) : visit.previousSibling;
+						if ((branchesEnabled || lazyEnabled) && pending[pending.length - 1] !== visitScope) pending.push(visitScope);
+					}
+				}
+				if (branchesEnabled && visitBranches) {
+					visitType = "*";
+					lastToken = "";
+					visitBranches();
 				}
-				if (embedRenders && !embedAnchor && visit) embedRenders.set(embedAnchor = visit.parentNode.insertBefore(new Text(), visit.nextSibling), [renderId, scopeLookup]);
+				if (embedRenders && !embedAnchor && visit?.parentNode) embedRenders.set(embedAnchor = visit.parentNode.insertBefore(new Text(), visit.nextSibling), [renderId, scopeLookup]);
 				visits.length = retained;
 				return effects;
 			};

package/dist/debug/dom.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_control_flow = require("./dom-CA_HiiES.js");
+const require_control_flow = require("./dom-BAGeiafn.js");
 //#region src/common/attr-tag.ts
 const empty = [];
 const rest = Symbol("Attribute Tag");

package/dist/debug/dom.mjs

@@ -1,4 +1,4 @@
-import { $ as _attrs_script, $t as $signal, A as _attr_input_value_script, At as _for_closure, B as _attr, Bt as _return, C as _attr_input_checkedValue_script, D as _attr_input_value_attribute_default, Dt as _closure_get, E as _attr_input_value, En as EndNode, Et as _closure, F as _controllable_open, Fn as TagVariable, Ft as _id, G as _attr_nonce, Gt as _assert_init, H as _attr_class_item, Ht as _script, I as _controllable_select, It as _if_closure, J as _attr_style_items, Jt as removeAndDestroyBranch, K as _attr_style, Kt as destroyBranch, L as _controllable_textarea, Lt as _let, M as _attr_select_value_default, Mt as _global_read, N as _attr_select_value_script, Nt as _hoist, O as _attr_input_value_default, On as Global, Ot as _const, P as _controllable_input, Pn as StartNode, Pt as _hoist_resume, Q as _attrs_partial_content, Rt as _let_change, S as _attr_input_checkedValue_default, St as readyFailed, T as _attr_input_checked_script, Tt as _child_setup, U as _attr_class_items, Ut as _var, V as _attr_class, Vt as _return_change, W as _attr_content, Wt as _var_change, X as _attrs_content, Xt as _on, Y as _attrs, Yt as syncGen, Z as _attrs_partial, _ as _attr_details_or_dialog_open, _n as _call, _t as _var_resume, a as _for_in, an as queueAsyncRender, at as _text_content, b as _attr_input_checked, bn as Params, bt as initEmbedded, c as _for_until, cn as run, ct as toInsertNode, d as _show, dn as forIn, dt as _content_resume, en as $signalReset, et as _html, f as _try, fn as forOf, ft as createAndSetupBranch, g as renderCatch, gn as _hoist_read_error, gt as _resume, h as patchDynamicTag, hn as _assert_hoist, ht as _el, i as _dynamic_tag_content, in as prepareEffects, it as _text, j as _attr_select_value, jt as _for_selector, k as _attr_input_value_dynamic_default, kn as Load, kt as _el_read, l as _if, ln as runEffects, lt as _content, mn as forUntil, mt as setupBranch, n as _await_promise, nt as _style_rule_item, o as _for_of, on as queueEffect, ot as _to_text, p as addAwaitCounter, pn as forTo, pt as createBranch, q as _attr_style_item, qt as insertBranchBefore, r as _dynamic_tag, rt as _style_shell, s as _for_to, sn as queueRender, st as insertChildNodes, t as _await_content, tt as _lifecycle, u as _resume_dynamic_tag, un as runId, ut as _content_closures, v as _attr_details_or_dialog_open_default, vn as Clone, vt as getRegisteredWithScope, w as _attr_input_checked_default, wt as withLazy, x as _attr_input_checkedValue, xn as Setup, xt as ready, y as _attr_details_or_dialog_open_script, yn as Owner, yt as init, zt as _or } from "./dom-DBMLPLeE.mjs";
+import { $ as _attrs_script, $t as $signal, A as _attr_input_value_script, At as _for_closure, B as _attr, Bt as _return, C as _attr_input_checkedValue_script, D as _attr_input_value_attribute_default, Dt as _closure_get, E as _attr_input_value, En as EndNode, Et as _closure, F as _controllable_open, Fn as TagVariable, Ft as _id, G as _attr_nonce, Gt as _assert_init, H as _attr_class_item, Ht as _script, I as _controllable_select, It as _if_closure, J as _attr_style_items, Jt as removeAndDestroyBranch, K as _attr_style, Kt as destroyBranch, L as _controllable_textarea, Lt as _let, M as _attr_select_value_default, Mt as _global_read, N as _attr_select_value_script, Nt as _hoist, O as _attr_input_value_default, On as Global, Ot as _const, P as _controllable_input, Pn as StartNode, Pt as _hoist_resume, Q as _attrs_partial_content, Rt as _let_change, S as _attr_input_checkedValue_default, St as readyFailed, T as _attr_input_checked_script, Tt as _child_setup, U as _attr_class_items, Ut as _var, V as _attr_class, Vt as _return_change, W as _attr_content, Wt as _var_change, X as _attrs_content, Xt as _on, Y as _attrs, Yt as syncGen, Z as _attrs_partial, _ as _attr_details_or_dialog_open, _n as _call, _t as _var_resume, a as _for_in, an as queueAsyncRender, at as _text_content, b as _attr_input_checked, bn as Params, bt as initEmbedded, c as _for_until, cn as run, ct as toInsertNode, d as _show, dn as forIn, dt as _content_resume, en as $signalReset, et as _html, f as _try, fn as forOf, ft as createAndSetupBranch, g as renderCatch, gn as _hoist_read_error, gt as _resume, h as patchDynamicTag, hn as _assert_hoist, ht as _el, i as _dynamic_tag_content, in as prepareEffects, it as _text, j as _attr_select_value, jt as _for_selector, k as _attr_input_value_dynamic_default, kn as Load, kt as _el_read, l as _if, ln as runEffects, lt as _content, mn as forUntil, mt as setupBranch, n as _await_promise, nt as _style_rule_item, o as _for_of, on as queueEffect, ot as _to_text, p as addAwaitCounter, pn as forTo, pt as createBranch, q as _attr_style_item, qt as insertBranchBefore, r as _dynamic_tag, rt as _style_shell, s as _for_to, sn as queueRender, st as insertChildNodes, t as _await_content, tt as _lifecycle, u as _resume_dynamic_tag, un as runId, ut as _content_closures, v as _attr_details_or_dialog_open_default, vn as Clone, vt as getRegisteredWithScope, w as _attr_input_checked_default, wt as withLazy, x as _attr_input_checkedValue, xn as Setup, xt as ready, y as _attr_details_or_dialog_open_script, yn as Owner, yt as init, zt as _or } from "./dom-C55iHvof.mjs";
 //#region src/common/attr-tag.ts
 const empty = [];
 const rest = Symbol("Attribute Tag");

package/dist/debug/html.js

@@ -28,7 +28,6 @@ const ControlledHandler = "ControlledHandler:";
 const ControlledType = "ControlledType:";
 const ControlledValue = "ControlledValue:";
 const EventAttributes = "EventAttributes:";
-const BranchAccessor = "#BranchAccessor";
 const CatchContent = "#CatchContent";
 const ClosestBranchId = "#ClosestBranchId";
 const LoopKey = "#LoopKey";
@@ -1850,11 +1849,16 @@ const WALKER_RUNTIME_CODE = `((runtimeId) => (self[runtimeId] ||= (
     x() {},
     w(node, op, id) {
       while ((node = walker.nextNode())) {
+        // Only reorder markers ("#", "!") are ever looked up, so only they are
+        // kept: the lookup lives as long as the page, and every node marker
+        // would otherwise stay referenced in it after resume consumed it.
         doc.x(
           (op =
             (op = node.data) &&
             !op.indexOf(prefix) &&
-            ((lookup[(id = op.slice(prefixLen + 1))] = node), op[prefixLen])),
+            ((id = op.slice(prefixLen + 1)),
+            (op = op[prefixLen]) > "#" || (lookup[id] = node),
+            op)),
           id,
           node,
         );
@@ -1898,6 +1902,7 @@ const REORDER_RUNTIME_CODE = `((runtime) => {
         (placeholderRoot = placeholders[id] =
           {
             i: runtime.l[id] ? 1 : 2,
+            r: id,
             // Resume may still walk markers inside the dropped placeholder, so
             // park it in any detached parent (a bare <t> clone is the cheapest).
             c(start = runtime.l["^" + id], removed = node.cloneNode()) {
@@ -1913,6 +1918,9 @@ const REORDER_RUNTIME_CODE = `((runtime) => {
               replace(id, node);
             },
           });
+      // Opens the chunk's visits for resume to parent to the root's branch; the
+      // walk that this chunk's own script triggers closes it.
+      runtime.v.push({ data: runtime.i + "*" + placeholder.r });
       // repurpose "op" for callbacks ...carefully
       if ((op = runtime.j[id])) {
         placeholderCb = placeholder.c;
@@ -1983,8 +1991,8 @@ const kIsAsync = Symbol("Is Async");
 function isInResumedBranch() {
 	return $chunk?.context?.[kBranchId] !== void 0;
 }
-function withBranchId(branchId, cb) {
-	return withContext(kBranchId, branchId, cb);
+function withBranchId(branchId, cb, cbValue) {
+	return withContext(kBranchId, branchId, cb, cbValue);
 }
 function withIsAsync(cb, value) {
 	return withContext(kIsAsync, true, cb, value);
@@ -1995,8 +2003,8 @@ function _html(html) {
 function writeScript(script) {
 	$chunk.writeScript(script);
 }
-function _script(scopeId, registryId) {
-	if ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) _resume_branch(scopeId);
+function _script(scopeId, registryId, serializeMarker) {
+	if (serializeMarker === 0 && ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync])) _resume_branch(scopeId);
 	$chunk.boundary.state.needsMainRuntime = true;
 	$chunk.writeEffect(scopeId, registryId);
 }
@@ -2186,6 +2194,7 @@ let writeScope = (scopeId, partialScope) => {
 	const scope = scopeWithId(state, scopeId);
 	const pending = target.writeScopes[scopeId];
 	state.needsMainRuntime = true;
+	countResumeWrite($chunk.boundary);
 	Object.assign(scope, partialScope);
 	if (pending && pending !== partialScope) Object.assign(pending, partialScope);
 	else target.writeScopes[scopeId] = partialScope;
@@ -2257,7 +2266,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 		if (resumeMarker) {
 			const branchId = _peek_scope_id();
 			$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-			content(promise);
+			withBranchId(branchId, content, promise);
 			$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 		} else content(promise);
 		return;
@@ -2279,7 +2288,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 					if (resumeMarker) {
 						const branchId = _peek_scope_id();
 						$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-						withIsAsync(content, value);
+						withBranchId(branchId, () => withIsAsync(content, value));
 						$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 					} else withIsAsync(content, value);
 				});
@@ -2296,16 +2305,19 @@ function _try(scopeId, accessor, content, input) {
 	const placeholderContent = normalizeDynamicRenderer(input.placeholder);
 	const placeholderBranchId = placeholderContent ? _scope_id() : 0;
 	const branchId = _peek_scope_id();
-	$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-	if (catchContent !== void 0) tryCatch(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent || (() => {}));
-	else if (placeholderContent) tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId);
-	else content();
-	writeScope(branchId, {
-		[BranchAccessor]: accessor,
-		[CatchContent]: catchContent,
-		[PlaceholderContent]: placeholderContent
-	});
-	$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
+	const chunk = $chunk;
+	const { boundary } = chunk;
+	const { state } = boundary;
+	const { resumeWrites } = boundary;
+	const beforeBranch = deferBranchStart(chunk);
+	let renderersAtSettle = false;
+	if (catchContent !== void 0 || placeholderContent) renderersAtSettle = tryBoundary(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent, placeholderContent, branchId);
+	else withBranchId(branchId, content);
+	const rendered = chunk !== $chunk || boundary.resumeWrites !== resumeWrites;
+	applyBranchStart(chunk, beforeBranch, rendered);
+	if (!rendered) return;
+	if (!renderersAtSettle) writeTryRenderers(branchId, catchContent, placeholderContent);
+	$chunk.writeHTML(state.mark("]", scopeId + " " + accessor + " " + branchId));
 }
 function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBranchId) {
 	const chunk = $chunk;
@@ -2324,31 +2336,39 @@ function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBran
 		placeholderBranchId
 	};
 }
-function tryCatch(content, catchContent) {
+function tryBoundary(content, catchContent, placeholderContent, branchId) {
 	const chunk = $chunk;
 	const { boundary } = chunk;
 	const { state } = boundary;
 	const catchBoundary = new Boundary(state, boundary.signal, boundary);
 	const body = chunk.fork(catchBoundary, null);
-	const bodyEnd = body.render(content);
+	const bodyEnd = withBranchId(branchId, () => body.render(content));
 	if (catchBoundary.signal.aborted) {
-		catchContent(catchBoundary.signal.reason);
-		return;
+		if (catchContent === void 0) boundary.abort(catchBoundary.signal.reason);
+		else if (catchContent) catchContent(catchBoundary.signal.reason);
+		return false;
 	}
 	if (body === bodyEnd) {
 		chunk.append(body);
-		return;
+		return false;
 	}
-	const reorderId = state.nextReorderId();
-	const endMarker = state.mark("!", reorderId);
-	const bodyNext = bodyEnd.next = $chunk = body.fork(boundary, chunk.next);
+	const renderersAtSettle = !catchBoundary.resumeWrites;
+	const bodyNext = bodyEnd.next = $chunk = chunk.fork(boundary, chunk.next);
 	chunk.next = body;
-	chunk.writeHTML(state.mark("!^", reorderId));
-	bodyEnd.writeHTML(endMarker);
 	boundary.startAsync();
+	const reorderId = catchContent === void 0 ? "" : state.nextReorderId();
+	const endMarker = reorderId && state.mark("!", reorderId);
+	if (reorderId) {
+		chunk.writeHTML(state.mark("!^", reorderId));
+		bodyEnd.writeHTML(endMarker);
+	}
 	catchBoundary.onNext = () => {
 		if (boundary.signal.aborted) return;
 		if (catchBoundary.signal.aborted) {
+			if (!reorderId) {
+				boundary.abort(catchBoundary.signal.reason);
+				return;
+			}
 			if (!bodyEnd.consumed) {
 				let cur = body;
 				let writeMarker = true;
@@ -2368,15 +2388,28 @@ function tryCatch(content, catchContent) {
 				} while (cur !== bodyNext);
 			}
 			const catchChunk = chunk.fork(boundary, null);
+			const { resumeWrites } = boundary;
 			catchChunk.reorderId = reorderId;
-			catchChunk.render(catchContent, catchBoundary.signal.reason);
+			if ((catchChunk.render(catchContent || NOOP$2, catchBoundary.signal.reason) !== catchChunk || boundary.resumeWrites !== resumeWrites) && renderersAtSettle) catchChunk.render(() => writeTryRenderers(branchId, catchContent, placeholderContent));
 			state.reorder(catchChunk);
 			boundary.endAsync();
-		} else if (!catchBoundary.count) boundary.endAsync();
-		else boundary.onNext();
+		} else if (!catchBoundary.count) {
+			if (renderersAtSettle && catchBoundary.resumeWrites) bodyEnd.render(() => writeTryRenderers(branchId, catchContent, placeholderContent));
+			boundary.endAsync();
+		} else boundary.onNext();
 	};
+	return renderersAtSettle;
+}
+function writeTryRenderers(branchId, catchContent, placeholderContent) {
+	writeScope(branchId, {
+		[CatchContent]: catchContent,
+		[PlaceholderContent]: placeholderContent
+	});
 }
 const NOOP$2 = () => {};
+function countResumeWrite(boundary) {
+	for (; boundary; boundary = boundary.parent) boundary.resumeWrites++;
+}
 var State = class {
 	tagId = 1;
 	scopeId = 1;
@@ -2444,6 +2477,7 @@ var State = class {
 var Boundary = class extends AbortController {
 	onNext = NOOP$2;
 	count = 0;
+	resumeWrites = 0;
 	state;
 	parent;
 	constructor(state, signal, parent) {
@@ -2502,6 +2536,7 @@ var Chunk = class Chunk {
 		this.html += html;
 	}
 	writeEffect(scopeId, registryId) {
+		countResumeWrite(this.boundary);
 		if (this.lastEffect === registryId) this.effects += " " + scopeId;
 		else {
 			this.lastEffect = registryId;
@@ -2660,6 +2695,8 @@ var Chunk = class Chunk {
 			needsWalk = true;
 			state.resumes = state.resumes ? state.resumes + ",\"" + effects + "\"" : "\"" + effects + "\"";
 		}
+		let reordered = "";
+		let needsResumeArray = false;
 		if (state.writeReorders) {
 			let carried = null;
 			for (const reorderedChunk of state.writeReorders) {
@@ -2703,14 +2740,11 @@ var Chunk = class Chunk {
 					else break;
 				}
 				if (reorderEffects) {
-					if (!state.hasWrittenResume) {
-						state.hasWrittenResume = true;
-						scripts = concatScripts(scripts, runtimePrefix + ".r=[]");
-					}
+					needsResumeArray = true;
 					reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")");
 				}
-				for (const reservation of readyReservations) scripts = concatScripts(scripts, reservation);
-				scripts = concatScripts(scripts, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
+				for (const reservation of readyReservations) reordered = concatScripts(reordered, reservation);
+				reordered = concatScripts(reordered, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
 				html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
 			state.writeReorders = carried;
@@ -2721,6 +2755,11 @@ var Chunk = class Chunk {
 			state.hasWrittenResume = true;
 			scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]");
 		}
+		else if (needsResumeArray && !state.hasWrittenResume) {
+			state.hasWrittenResume = true;
+			scripts = concatScripts(scripts, runtimePrefix + ".r=[]");
+		}
+		scripts = concatScripts(scripts, reordered);
 		if (needsWalk) scripts = concatScripts(scripts, runtimePrefix + ".w()");
 		this.html = html;
 		this.scripts = scripts;