marko 6.3.56 → 6.4.1

package/dist/debug/{dom-DcwejnYg.js → dom-ClV4kVOO.js}

@@ -9,11 +9,13 @@ const ControlledHandler = "ControlledHandler:";
 const ControlledType = "ControlledType:";
 const ControlledValue = "ControlledValue:";
 const DynamicHTMLLastChild = "DynamicHTMLLastChild:";
+const DynamicHTMLValue = "DynamicHTMLValue:";
 const EventAttributes = "EventAttributes:";
 const KeyedScopes = "KeyedScopes:";
 const Lifecycle = "Lifecycle:";
 const Promise$1 = "Promise:";
 const TagVariableChange$1 = "TagVariableChange:";
+const TryBranch$1 = "TryBranch:";
 //#endregion
 //#region src/common/constants/accessor-prop.debug.ts
 const Global = "$global";
@@ -32,15 +34,18 @@ const Load = "#Load";
 const LoopKey = "#LoopKey";
 const ParentBranch = "#ParentBranch";
 const PendingEffects = "#PendingEffects";
+const PendingEffectScopes = "#PendingEffectScopes";
 const PendingRenders = "#PendingRenders";
 const PendingScopes = "#PendingScopes";
 const PlaceholderBranch = "#PlaceholderBranch";
 const PlaceholderContent = "#PlaceholderContent";
 const Renderer = "#Renderer";
+const ReturnValue = "#ReturnValue";
 const StartNode = "#StartNode";
 const Subscriptions = "#Subscriptions";
 const TagVariable = "#TagVariable";
 const TagVariableChange = "#TagVariableChange";
+const TryBranch = "#TryBranch";
 //#endregion
 //#region src/common/constants/closure-scopes-prop.debug.ts
 const Changed = "Changed";
@@ -135,19 +140,21 @@ const toDelimitedString = function toDelimitedString(val, delimiter, stringify)
 	let str = "";
 	let sep = "";
 	let part;
-	if (val) if (typeof val !== "object") str += val;
-	else if (Array.isArray(val)) for (const v of val) {
-		part = toDelimitedString(v, delimiter, stringify);
-		if (part) {
-			str += sep + part;
-			sep = delimiter;
+	if (val) {
+		if (typeof val !== "object") str += val;
+		else if (Array.isArray(val)) for (const v of val) {
+			part = toDelimitedString(v, delimiter, stringify);
+			if (part) {
+				str += sep + part;
+				sep = delimiter;
+			}
 		}
-	}
-	else for (const name in val) {
-		part = stringify(name, val[name]);
-		if (part) {
-			str += sep + part;
-			sep = delimiter;
+		else for (const name in val) {
+			part = stringify(name, val[name]);
+			if (part) {
+				str += sep + part;
+				sep = delimiter;
+			}
 		}
 	}
 	return str;
@@ -250,18 +257,18 @@ function _hoist_read_error() {
 function _assert_hoist(value) {
 	if (value !== void 0 && typeof value !== "function") throw new Error(`Hoisted values must be functions, received type "${typeof value}".`);
 }
-function assertExclusiveAttrs(attrs, onError = throwErr) {
+function assertExclusiveAttrs(attrs, onError = throwErr, isSet = isTruthy) {
 	if (attrs) {
 		let exclusiveAttrs;
-		if (attrs.checkedChange) (exclusiveAttrs ||= []).push("checkedChange");
+		if (isSet(attrs.checkedChange)) (exclusiveAttrs ||= []).push("checkedChange");
 		if ("checkedValue" in attrs) {
 			(exclusiveAttrs ||= []).push("checkedValue");
 			if ("checked" in attrs) exclusiveAttrs.push("checked");
-		} else if (attrs.checkedValueChange) {
+		} else if (isSet(attrs.checkedValueChange)) {
 			(exclusiveAttrs ||= []).push("checkedValueChange");
 			if ("checked" in attrs) exclusiveAttrs.push("checked");
 		}
-		if (attrs.valueChange) {
+		if (isSet(attrs.valueChange)) {
 			(exclusiveAttrs ||= []).push("valueChange");
 			if ("checked" in attrs && !exclusiveAttrs.includes("checked")) exclusiveAttrs.push("checked");
 		}
@@ -277,6 +284,9 @@ function assertHandlerIsFunction(name, value) {
 function assertValidTagName(tagName) {
 	if (!/^[a-z][a-z0-9._-]*$/i.test(tagName)) throw new Error(`Invalid tag name: "${tagName}". Tag names must start with a letter and contain only letters, numbers, periods, hyphens, and underscores.`);
 }
+function isTruthy(value) {
+	return value;
+}
 function throwErr(msg) {
 	throw new Error(msg);
 }
@@ -320,8 +330,6 @@ function forUntil(until, from, step, cb) {
 //#region src/dom/queue.ts
 let rendering;
 let runId = 2;
-const caughtError = /* @__PURE__ */ new WeakSet();
-const placeholderShown = /* @__PURE__ */ new WeakSet();
 let pendingEffects = [];
 let pendingRenders = [];
 const scopeKeyOffset = 1e6;
@@ -398,10 +406,10 @@ let runRender = (render) => {
 	if (!branchesEnabled || render["scope"]["#ClosestBranch"]?.["#Gen"] !== 0) render[Signal](render[Scope], render[Value]);
 };
 let catchEnabled;
-function installCatch(wrapEffects, wrapRender) {
+function installCatch(catchEffects, wrapRender) {
 	catchEnabled = 1;
 	withBranches();
-	runEffects = wrapEffects(runEffects);
+	runEffects = catchEffects;
 	runRender = wrapRender(runRender);
 }
 function runRenders() {
@@ -442,6 +450,12 @@ function $signal(scope, id) {
 	trackCleanup(scope);
 	return ((scope[AbortControllers] ||= {})[id] ||= new AbortController()).signal;
 }
+/** Runs `abort` as a destroyed scope's `$signal` would fire, without creating one. */
+function trackAbort(scope, id, abort) {
+	abortsEnabled = 1;
+	trackCleanup(scope);
+	(scope[AbortControllers] ||= {})[id] = { abort };
+}
 /** Enrols `scope` with its branch so destroying the branch cleans it up. */
 function trackCleanup(scope, subscribers) {
 	const branch = scope[ClosestBranch];
@@ -462,8 +476,10 @@ function toArray(opt) {
 	return opt ? Array.isArray(opt) ? opt : [opt] : [];
 }
 function forEach(opt, cb) {
-	if (opt) if (Array.isArray(opt)) for (const item of opt) cb(item);
-	else cb(opt);
+	if (opt) {
+		if (Array.isArray(opt)) for (const item of opt) cb(item);
+		else cb(opt);
+	}
 }
 function push(opt, item) {
 	return opt ? Array.isArray(opt) ? (opt.push(item), opt) : [opt, item] : item;
@@ -538,11 +554,6 @@ function collectScopes(fn) {
 function skipScope() {
 	return nextScopeId++;
 }
-function findBranchWithKey(scope, key) {
-	let branch = scope[ClosestBranch];
-	while (branch && branch[key] == null) branch = branch[ParentBranch];
-	return branch;
-}
 function destroyBranch(branch) {
 	branch[ParentBranch]?.[BranchScopes]?.delete(branch);
 	destroyNestedScopes(branch);
@@ -633,11 +644,12 @@ function _let_change(id, fn) {
 	const valueChangeAccessor = TagVariableChange$1 + valueAccessor;
 	const base = _let(id, fn);
 	return (scope, value, valueChange) => {
-		if (rendering) if ((scope[valueChangeAccessor] = valueChange) && (scope[valueAccessor] !== value || !(valueAccessor in scope))) {
-			scope[valueAccessor] = value;
-			fn?.(scope);
-		} else base(scope, value);
-		else if (scope[valueChangeAccessor]) scope[valueChangeAccessor](value);
+		if (rendering) {
+			if ((scope[valueChangeAccessor] = valueChange) && (scope[valueAccessor] !== value || !(valueAccessor in scope))) {
+				scope[valueAccessor] = value;
+				fn?.(scope);
+			} else base(scope, value);
+		} else if (scope[valueChangeAccessor]) scope[valueChangeAccessor](value);
 		else base(scope, value);
 		return value;
 	};
@@ -652,10 +664,11 @@ function _const(valueAccessor, fn) {
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "#Id") {
 	return (scope) => {
-		if (scope["#Gen"] === runId) if (~id in scope) {
-			if (!--scope[~id]) fn(scope);
-		} else scope[~id] = defaultPending;
-		else queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+		if (scope["#Gen"] === runId) {
+			if (~id in scope) {
+				if (!--scope[~id]) fn(scope);
+			} else scope[~id] = defaultPending;
+		} else queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
 	};
 }
 function _for_closure(ownerLoopNodeAccessor, fn) {
@@ -738,7 +751,8 @@ function _closure_get(valueAccessor, fn, getOwnerScope, resumeId) {
 	const closureSignal = ((scope, resumed) => {
 		const ownerScope = getOwnerScope ? getOwnerScope(scope) : scope["_"];
 		scope[closureSignal[SignalIndexAccessor]] = closureSignal[Index];
-		if (!resumed || ownerScope[closureSignal["scopeInstancesAccessor"]]["Changed"]) fn(scope);
+		if (!resumed) fn(scope);
+		else if (ownerScope[closureSignal["scopeInstancesAccessor"]]["Changed"]) queueAsyncRender(scope, closureSignal);
 		subscribeToScopeSet(ownerScope, closureSignal[ScopeInstancesAccessor], scope);
 	});
 	closureSignal[ScopeInstancesAccessor] = ClosureScopes + valueAccessor;
@@ -754,9 +768,11 @@ function _child_setup(setup) {
 	return setup;
 }
 function _var(scope, childAccessor, signal) {
-	scope[childAccessor][TagVariable] = (value) => signal(scope, value);
+	const childScope = scope[childAccessor];
+	childScope[TagVariable] = (value) => signal(scope, value);
+	if ("#ReturnValue" in childScope) signal(scope, childScope[ReturnValue]);
 }
-const _return = (scope, value) => scope[TagVariable]?.(value);
+const _return = (scope, value) => scope["#TagVariable"] ? scope[TagVariable](value) : scope[ReturnValue] = value;
 function _return_change(scope, changeHandler) {
 	scope[TagVariableChange] = changeHandler || void 0;
 }
@@ -783,7 +799,7 @@ function _script(id, fn) {
 	};
 }
 function _global_read($global, key) {
-	if (!(key in $global)) console.error(`\`$global.${key}\` is not serialized to the client, so this read is \`undefined\`. Add \`${key}\` to \`serializedGlobals\` at the render call.`);
+	if (!(key in $global)) console.error(`\`$global.${key}\` is not serialized to the client, so this read is \`undefined\`. Serialized globals are embedded in the page: add \`${key}\` to \`serializedGlobals\` at the render call only if it holds no secrets; otherwise copy the field the client needs into its own \`$global\` key and serialize that.`);
 	return $global[key];
 }
 function _el_read(value) {
@@ -792,12 +808,15 @@ 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()) 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;
+	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 step = path[i];
+			const item = Array.isArray(step) ? (scope[step[1]] || 0) === step[2] && scope[step[0]] : scope[step];
+			if (i) yield* traverse(item, path, args, i - 1);
+			else yield typeof item === "function" ? item(...args) : item;
+		}
 	}
 }
 function _hoist(...path) {
@@ -881,9 +900,8 @@ function readyFailed(readyId) {
 	(failedIds ||= /* @__PURE__ */ new Set()).add(readyId);
 	console.error(`The lazy module for "${readyId}" failed to load; its server-rendered content cannot become interactive.`);
 }
-function withLazy(runtime) {
+function withLazy() {
 	lazyEnabled = 1;
-	return runtime;
 }
 function initEmbedded(readyId, runtimeId) {
 	if (!embedRenders) {
@@ -957,7 +975,7 @@ function init(runtimeId = "M") {
 						setParentBranch(branch, branch[ClosestBranch]);
 						if (branch["#AwaitCounter"] = render.p?.[branchId]) branch[AwaitCounter].m = render.m;
 						if (singleNode) {
-							while (startVisit.previousSibling && ~visits.indexOf(startVisit = startVisit.previousSibling));
+							while (startVisit.previousSibling && (startVisit = startVisit.previousSibling).nodeType > 1);
 							branch["_"] ??= visitScope;
 							branch[EndNode] = branch[StartNode] = startVisit;
 							if (visitType === "(") branch[getDebugKey(0, startVisit)] = startVisit;
@@ -1024,6 +1042,7 @@ function init(runtimeId = "M") {
 			let embedAnchor;
 			serializeContext._ = _resumed;
 			if (render.m) throw new Error(`Marko rendered multiple times with $global.runtimeId as ${JSON.stringify(runtimeId)} and $global.renderId as ${JSON.stringify(renderId)}. Ensure each render into a page has a unique $global.renderId.`);
+			for (const otherId in curRenders) if (otherId !== renderId && (otherId.startsWith(renderId) || renderId.startsWith(otherId))) console.error(`Marko rendered with $global.runtimeId as ${JSON.stringify(runtimeId)} and $global.renderId as both ${JSON.stringify(otherId)} and ${JSON.stringify(renderId)}, so one render claims the other's resume comments. Ensure no $global.renderId in a page starts another.`);
 			render.m = (effects) => {
 				processResumes(render.r, effects);
 				if (readyIds && render.b) for (let progress = 1; progress;) {
@@ -1039,13 +1058,15 @@ function init(runtimeId = "M") {
 					visitText = visit.data;
 					visitType = visitText[lastTokenIndex++];
 					visitScope = getScope(nextToken());
-					if (dynamicHtmlEnabled && visitType > "%" && visitType <= "'") if (visitType === "&") htmlStart = visit;
-					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())();
+					if (dynamicHtmlEnabled && visitType > "%" && visitType <= "'") {
+						if (visitType === "&") htmlStart = visit;
+						else {
+							if (visit.parentNode !== htmlStart.parentNode) console.error("An unescaped placeholder (`$!{}`) rendered HTML that does not parse as a balanced fragment where it is placed (an unclosed, stray or misnested tag), so updating it removes the wrong nodes.");
+							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.parentNode.insertBefore(new Text(), visit) : visit.previousSibling;
@@ -1080,7 +1101,7 @@ let isResuming;
 function runResumeEffects(render) {
 	try {
 		isResuming = 1;
-		runEffects(render.m([]), 1);
+		runEffects(render.m([]));
 	} finally {
 		isResuming = 0;
 	}
@@ -1148,6 +1169,7 @@ function _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;) {
+			if (!scope) throw new Error("Unable to resume registered content: its payload does not link the owner of every closure level.");
 			const closures = values[--i];
 			for (const key in closures) if (!(key in scope)) scope[key] = closures[key];
 			scope = scope["_"];
@@ -1196,8 +1218,10 @@ function _attr(element, name, value) {
 	setAttribute(element, name, normalizeAttrValue(value));
 }
 function setAttribute(element, name, value) {
-	if (element.getAttribute(name) != value) if (value === void 0) element.removeAttribute(name);
-	else element.setAttribute(name, value);
+	if (element.getAttribute(name) != value) {
+		if (value === void 0) element.removeAttribute(name);
+		else element.setAttribute(name, value);
+	}
 }
 function _attr_class(element, value) {
 	setAttribute(element, "class", toDelimitedString(value, " ", stringifyClassObject) || void 0);
@@ -1302,7 +1326,6 @@ function attrsInternal(scope, nodeAccessor, nextAttrs, controllable) {
 				assertValidAttrName(name);
 				if (isEventHandler(name)) (events ||= scope[EventAttributes + nodeAccessor] = {})[getEventHandlerName(name)] = value;
 				else if (!(skip?.test(name) || name === "content" && el.tagName !== "META")) _attr(el, name, value);
-				break;
 		}
 	}
 }
@@ -1321,22 +1344,33 @@ function _attrs_script(scope, nodeAccessor) {
 	for (const name in events) _on(el, name, events[name]);
 }
 const _html = /*@__PURE__*/ withDynamicHtml(function _html(scope, value, accessor) {
-	const firstChild = scope[accessor];
-	const parentNode = firstChild.parentNode;
-	const lastChild = scope["DynamicHTMLLastChild:" + accessor] || firstChild;
-	const newContent = parseHTML(_to_text(value), parentNode.namespaceURI);
-	const newFirstChild = scope[accessor] = newContent.firstChild || newContent.appendChild(new Text());
-	const newLastChild = scope[DynamicHTMLLastChild + accessor] = newContent.lastChild;
-	const branch = scope[ClosestBranch];
-	if (branch?.["#StartNode"] === firstChild) branch[StartNode] = newFirstChild;
-	if (branch?.["#EndNode"] === lastChild) branch[EndNode] = newLastChild;
-	insertChildNodes(parentNode, firstChild, newFirstChild, newLastChild);
-	removeChildNodes(firstChild, lastChild);
+	const prevValue = scope[DynamicHTMLValue + accessor];
+	if (prevValue !== (scope["DynamicHTMLValue:" + accessor] = _to_text(value))) {
+		const firstChild = scope[accessor];
+		const parentNode = firstChild.parentNode;
+		const lastChild = scope["DynamicHTMLLastChild:" + accessor] || firstChild;
+		const newContent = parseHTML(scope[DynamicHTMLValue + accessor], parentNode.namespaceURI);
+		if (prevValue === void 0 && lastChild !== firstChild) {
+			let node = firstChild;
+			let newNode = newContent.firstChild;
+			while ((node = node.nextSibling) !== lastChild && node.isEqualNode(newNode)) newNode = newNode.nextSibling;
+			if (node === lastChild && !newNode) return;
+		}
+		const newFirstChild = scope[accessor] = newContent.firstChild || newContent.appendChild(new Text());
+		const newLastChild = scope[DynamicHTMLLastChild + accessor] = newContent.lastChild;
+		const branch = scope[ClosestBranch];
+		if (branch?.["#StartNode"] === firstChild) branch[StartNode] = newFirstChild;
+		if (branch?.["#EndNode"] === lastChild) branch[EndNode] = newLastChild;
+		insertChildNodes(parentNode, firstChild, newFirstChild, newLastChild);
+		removeChildNodes(firstChild, lastChild);
+	}
 });
 function normalizeClientRender(value) {
 	const renderer = normalizeDynamicRenderer(value);
-	if (renderer) if (renderer["id"]) return renderer;
-	else throw new Error(`Invalid \`content\` attribute. Received ${typeof value}`);
+	if (renderer) {
+		if (renderer["id"]) return renderer;
+		else throw new Error(`Invalid \`content\` attribute. Received ${typeof value}`);
+	}
 }
 function normalizeAttrValue(value) {
 	if (isNotVoid(value)) return value === true ? "" : value + "";
@@ -1354,7 +1388,7 @@ function _lifecycle(scope, thisObj, index = 0) {
 			Object.assign(thisObj, thisObj.onMount?.());
 			for (const prop in snapshot) if (!Object.is(snapshot[prop], thisObj[prop])) throw new Error(`Tried to overwrite existing property "${prop}" in <lifecycle> onMount.`);
 		}
-		$signal(scope, accessor).onabort = () => thisObj.onDestroy?.();
+		trackAbort(scope, accessor, () => thisObj.onDestroy?.());
 	}
 }
 function removeChildNodes(startNode, endNode) {
@@ -1456,8 +1490,10 @@ function _attr_input_checkedValue(scope, nodeAccessor, checkedValue, checkedValu
 }
 function _attr_input_checkedValue_script(scope, nodeAccessor) {
 	const el = scope[nodeAccessor];
-	if (isResuming && el.defaultChecked) if (scope["ControlledValue:" + nodeAccessor]) scope[ControlledValue + nodeAccessor].push(el.value);
-	else scope[ControlledValue + nodeAccessor] = el.value;
+	if (isResuming && el.defaultChecked) {
+		if (scope["ControlledValue:" + nodeAccessor]) scope[ControlledValue + nodeAccessor].push(el.value);
+		else scope[ControlledValue + nodeAccessor] = el.value;
+	}
 	syncControllableFormInput(el, hasCheckboxChanged, () => {
 		const checkedValueChange = scope[ControlledHandler + nodeAccessor];
 		if (checkedValueChange) {
@@ -1566,14 +1602,16 @@ function _attr_select_value_script(scope, nodeAccessor) {
 			run();
 		}
 	};
-	if (isResuming) if (el.multiple) {
-		scope[ControlledValue + nodeAccessor] = [];
-		for (const opt of el.options) if (opt.defaultSelected) scope[ControlledValue + nodeAccessor].push(opt.value);
-	} else {
-		scope[ControlledValue + nodeAccessor] = "";
-		for (const opt of el.options) if (opt.defaultSelected) {
-			scope[ControlledValue + nodeAccessor] = opt.value;
-			break;
+	if (isResuming) {
+		if (el.multiple) {
+			scope[ControlledValue + nodeAccessor] = [];
+			for (const opt of el.options) if (opt.defaultSelected) scope[ControlledValue + nodeAccessor].push(opt.value);
+		} else {
+			scope[ControlledValue + nodeAccessor] = "";
+			for (const opt of el.options) if (opt.defaultSelected) {
+				scope[ControlledValue + nodeAccessor] = opt.value;
+				break;
+			}
 		}
 	}
 	syncControllableFormInput(el, hasSelectChanged, onChange);
@@ -1695,6 +1733,7 @@ function _controllable_open(scope, nodeAccessor, nextAttrs) {
 function _await_promise(nodeAccessor, params) {
 	const promiseAccessor = Promise$1 + nodeAccessor;
 	const branchAccessor = BranchScopes$1 + nodeAccessor;
+	const tryAccessor = TryBranch$1 + nodeAccessor;
 	const resolveAwait = (scope, referenceNode, value) => {
 		const awaitBranch = scope[branchAccessor];
 		if (awaitBranch["#DetachedAwait"]) {
@@ -1710,80 +1749,73 @@ function _await_promise(nodeAccessor, params) {
 	const awaitPromise = (scope, promise) => {
 		if (!isPromise(scope[promiseAccessor])) scope[promiseAccessor] = 0;
 		let awaitBranch = scope[branchAccessor];
-		const tryPlaceholder = (isPromise(promise) || scope[promiseAccessor]) && findBranchWithKey(scope, "#PlaceholderContent");
-		const tryBranch = tryPlaceholder || awaitBranch;
+		const tryBranch = scope[tryAccessor] || isPromise(promise) && findTryWithPlaceholder(scope) || awaitBranch;
 		if (!tryBranch) {
 			const deferred = scope[promiseAccessor] = () => deferred === scope[promiseAccessor] && awaitPromise(scope, promise);
-			const awaitCounter = findBranchWithKey(scope, PlaceholderContent)?.[AwaitCounter];
+			const awaitCounter = findTryWithPlaceholder(scope)?.[AwaitCounter];
 			if (awaitCounter?.i) {
 				const complete = awaitCounter.c;
 				awaitCounter.c = () => complete() || queueAsyncRender(scope, deferred);
 			}
 			return;
 		}
-		if (!isPromise(promise)) return scope[promiseAccessor] ? awaitPromise(scope, Promise.resolve(promise)) : resolveAwait(scope, scope[nodeAccessor], promise);
+		if (!isPromise(promise)) return scope[tryAccessor] ? awaitPromise(scope, Promise.resolve(promise)) : resolveAwait(scope, scope[nodeAccessor], promise);
 		let awaitCounter = tryBranch[AwaitCounter];
-		placeholderShown.add(pendingEffects);
-		if (!tryPlaceholder && !awaitCounter?.i) awaitCounter = createAwaitCounter(tryBranch, () => {
-			if (tryBranch === scope[branchAccessor]) {
-				const anchor = scope[nodeAccessor];
-				if (anchor.parentNode) {
-					const detachedParent = scope[branchAccessor][StartNode].parentNode;
-					if (detachedParent === anchor.parentNode) anchor.remove();
-					else anchor.replaceWith(detachedParent);
-				}
-			}
-		});
-		if (!scope[promiseAccessor]) {
-			if (awaitBranch) awaitBranch[PendingRenders] ||= [];
-			if (tryPlaceholder) awaitCounter = addAwaitCounter(scope, tryPlaceholder);
-			else scheduleAwaitFrame(awaitCounter, scope, () => {
-				if (!awaitBranch["#DetachedAwait"]) {
-					awaitBranch[StartNode].parentNode.insertBefore(scope[nodeAccessor], awaitBranch[StartNode]);
-					tempDetachBranch(tryBranch);
-				}
+		if (!scope[tryAccessor]) {
+			scope[tryAccessor] = tryBranch;
+			trackAbort(scope, promiseAccessor, () => {
+				scope[promiseAccessor] = 0;
+				if (scope[tryAccessor]) queueAsyncRender(scope[tryAccessor], completeAwaitCounter, awaitCounter);
 			});
+			if (awaitBranch) awaitBranch[PendingRenders] ||= [];
+			if (tryBranch !== awaitBranch) awaitCounter = addAwaitCounter(scope, tryBranch);
+			else {
+				if (!awaitCounter?.i) awaitCounter = createAwaitCounter(tryBranch, () => {
+					if (tryBranch === scope[branchAccessor]) {
+						const anchor = scope[nodeAccessor];
+						if (anchor.parentNode) {
+							const detachedParent = scope[branchAccessor][StartNode].parentNode;
+							if (detachedParent === anchor.parentNode) anchor.remove();
+							else anchor.replaceWith(detachedParent);
+						}
+					}
+				});
+				scheduleAwaitFrame(awaitCounter, scope, () => {
+					if (!awaitBranch["#DetachedAwait"]) {
+						awaitBranch[StartNode].parentNode.insertBefore(scope[nodeAccessor], awaitBranch[StartNode]);
+						tempDetachBranch(tryBranch);
+					}
+				});
+			}
 		}
 		const thisPromise = scope[promiseAccessor] = promise.then((data) => {
 			if (thisPromise === scope[promiseAccessor]) {
 				const referenceNode = scope[nodeAccessor];
 				scope[promiseAccessor] = 0;
-				if (!scope[branchAccessor] || scope["#ClosestBranch"]?.["#Gen"] === 0) {
-					if (!scope[branchAccessor]) awaitPromise(scope, data);
+				if (!scope[branchAccessor]) {
+					scope[tryAccessor] = 0;
+					awaitPromise(scope, data);
 					awaitCounter.c();
 					run();
-					return;
-				}
-				queueAsyncRender(scope, () => {
-					awaitBranch = resolveAwait(scope, referenceNode, data);
-					const pendingRenders = awaitBranch[PendingRenders];
-					awaitBranch[PendingRenders] = 0;
-					pendingRenders?.forEach(queuePendingRender);
-					placeholderShown.add(pendingEffects);
-					awaitCounter.c();
-					if (awaitCounter.m) {
-						const fnScopes = /* @__PURE__ */ new Map();
-						const effects = awaitCounter.m([]);
-						for (let i = 0; i < pendingEffects.length;) {
-							const fn = pendingEffects[i++];
-							let scopes = fnScopes.get(fn);
-							if (!scopes) fnScopes.set(fn, scopes = /* @__PURE__ */ new Set());
-							scopes.add(pendingEffects[i++]);
-						}
-						for (let i = 0; i < effects.length;) {
-							const fn = effects[i++];
-							const scope = effects[i++];
-							if (!fnScopes.get(fn)?.has(scope)) queueEffect(scope, fn);
-						}
+				} else queueAsyncRender(scope, () => {
+					if (!scope[promiseAccessor]) {
+						awaitBranch = resolveAwait(scope, referenceNode, data);
+						const pendingRenders = awaitBranch[PendingRenders];
+						awaitBranch[PendingRenders] = 0;
+						pendingRenders?.forEach(queuePendingRender);
+						scope[tryAccessor] = 0;
+						queueCompleteAwaitCounter(tryBranch, awaitCounter);
 					}
 				});
 			}
 		}, (error) => {
 			if (thisPromise === scope[promiseAccessor]) {
-				scope[promiseAccessor] = 0;
-				if (tryPlaceholder && !awaitCounter.m) awaitCounter.c();
-				else awaitCounter.i = 0;
+				scope[promiseAccessor] = scope[tryAccessor] = 0;
 				queueAsyncRender(scope, renderCatch, error);
+				if (tryBranch !== awaitBranch && !awaitCounter.m) {
+					if (findTryWithCatch(scope)) queueCompleteAwaitCounter(tryBranch, awaitCounter);
+					else awaitCounter.c();
+				} else awaitCounter.i = 0;
 			}
 		});
 	};
@@ -1799,13 +1831,13 @@ function _await_content(nodeAccessor, template, walks, setup) {
 		if (typeof scope[promiseAccessor] === "function") scope[promiseAccessor]();
 	};
 }
-function addAwaitCounter(scope, tryBranch = findBranchWithKey(scope, PlaceholderContent)) {
+function addAwaitCounter(scope, tryBranch = findTryWithPlaceholder(scope)) {
 	if (!tryBranch) return;
 	let awaitCounter = tryBranch[AwaitCounter];
 	if (!awaitCounter?.i) awaitCounter = createAwaitCounter(tryBranch, () => dismissPlaceholder(tryBranch));
-	placeholderShown.add(pendingEffects);
 	scheduleAwaitFrame(awaitCounter, tryBranch, () => {
-		insertBranchBefore(tryBranch[PlaceholderBranch] = createAndSetupBranch(tryBranch[Global], tryBranch[PlaceholderContent], tryBranch["_"], tryBranch[StartNode].parentNode), tryBranch[StartNode].parentNode, tryBranch[StartNode]);
+		(tryBranch[PlaceholderBranch] = createAndSetupBranch(tryBranch[Global], tryBranch[PlaceholderContent](), tryBranch["_"], tryBranch[StartNode].parentNode))[TryBranch] = tryBranch;
+		insertBranchBefore(tryBranch[PlaceholderBranch], tryBranch[StartNode].parentNode, tryBranch[StartNode]);
 		tempDetachBranch(tryBranch);
 	});
 	return awaitCounter;
@@ -1813,10 +1845,32 @@ function addAwaitCounter(scope, tryBranch = findBranchWithKey(scope, Placeholder
 function scheduleAwaitFrame(awaitCounter, scope, render) {
 	if (!awaitCounter.i++) requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(scope, render, -1))));
 }
+function queueCompleteAwaitCounter(tryBranch, awaitCounter) {
+	queueRender(tryBranch, completeAwaitCounter, -1, awaitCounter, tryBranch["#Id"] + 1e9);
+}
+function completeAwaitCounter(_scope, awaitCounter) {
+	awaitCounter.c();
+	if (awaitCounter.m) {
+		const fnScopes = /* @__PURE__ */ new Map();
+		const effects = awaitCounter.m([]);
+		for (let i = 0; i < pendingEffects.length;) {
+			const fn = pendingEffects[i++];
+			let scopes = fnScopes.get(fn);
+			if (!scopes) fnScopes.set(fn, scopes = /* @__PURE__ */ new Set());
+			scopes.add(pendingEffects[i++]);
+		}
+		for (let i = 0; i < effects.length;) {
+			const fn = effects[i++];
+			const scope = effects[i++];
+			if (!fnScopes.get(fn)?.has(scope)) queueEffect(scope, fn);
+		}
+	}
+}
 function createAwaitCounter(tryBranch, done) {
 	const awaitCounter = tryBranch[AwaitCounter] = {
 		i: 0,
 		c() {
+			if (awaitCounter.i < 1) throw new Error("An await counter completed more counts than it took.");
 			if (--awaitCounter.i) return 1;
 			done();
 			queueEffect(tryBranch, runPendingEffects);
@@ -1824,12 +1878,8 @@ function createAwaitCounter(tryBranch, done) {
 	};
 	return awaitCounter;
 }
-function runPendingEffects(scope) {
-	const effects = scope[PendingEffects];
-	if (effects) {
-		scope[PendingEffects] = [];
-		runEffects(effects, 1);
-	}
+function runPendingEffects(tryBranch) {
+	tryBranch[PendingEffectScopes]?.forEach((scope) => scope[PendingEffects].forEach((fn) => runEffects([fn, scope]), scope[PendingEffects] = null), tryBranch[PendingEffectScopes] = null);
 }
 function dismissPlaceholder(tryBranch) {
 	const placeholderBranch = tryBranch[PlaceholderBranch];
@@ -1839,21 +1889,19 @@ function dismissPlaceholder(tryBranch) {
 		removeAndDestroyBranch(placeholderBranch);
 	}
 }
-function _try(nodeAccessor, template, walks, setup) {
+function _try(nodeAccessor, template, walks, setup, placeholderContent, catchContent) {
 	const branchAccessor = BranchScopes$1 + nodeAccessor;
 	const renderer = _content("", template, walks, setup)();
-	return (scope, input) => {
-		if (!scope[branchAccessor]) setConditionalRenderer(scope, nodeAccessor, renderer, createAndSetupBranch);
+	return (scope) => {
+		setConditionalRenderer(scope, nodeAccessor, renderer, createAndSetupBranch);
 		const branch = scope[branchAccessor];
-		if (branch) {
-			branch[BranchAccessor] = nodeAccessor;
-			branch[CatchContent] = input.catch && (normalizeDynamicRenderer(input.catch) || 0);
-			branch[PlaceholderContent] = normalizeDynamicRenderer(input.placeholder);
-		}
+		branch[BranchAccessor] = nodeAccessor;
+		branch[CatchContent] = catchContent;
+		branch[PlaceholderContent] = placeholderContent || void 0;
 	};
 }
 function renderCatch(scope, error) {
-	const tryWithCatch = findBranchWithKey(scope, CatchContent);
+	const tryWithCatch = findTryWithCatch(scope);
 	if (!tryWithCatch) throw error;
 	else {
 		const owner = tryWithCatch["_"];
@@ -1863,11 +1911,21 @@ function renderCatch(scope, error) {
 			owner[BranchScopes$1 + tryWithCatch[BranchAccessor]] = placeholderBranch;
 			destroyBranch(tryWithCatch);
 		}
-		caughtError.add(pendingEffects);
-		setConditionalRenderer(owner, tryWithCatch[BranchAccessor], tryWithCatch[CatchContent], createAndSetupBranch);
-		tryWithCatch[CatchContent]?.[Params]?.(owner[BranchScopes$1 + tryWithCatch[BranchAccessor]], [error]);
+		const catchContent = tryWithCatch[CatchContent]();
+		setConditionalRenderer(owner, tryWithCatch[BranchAccessor], catchContent, createAndSetupBranch);
+		catchContent[Params]?.(owner[BranchScopes$1 + tryWithCatch[BranchAccessor]], [error]);
 	}
 }
+function findTryWithPlaceholder(scope) {
+	let branch = scope[ClosestBranch];
+	while (branch && !branch["#PlaceholderContent"]) branch = branch[ParentBranch];
+	return branch;
+}
+function findTryWithCatch(scope) {
+	let branch = scope[ClosestBranch];
+	while (branch && !branch["#CatchContent"]) branch = branch["#TryBranch"] || branch["#ParentBranch"];
+	return branch;
+}
 const _if = /*@__PURE__*/ withBranches((nodeAccessor, ...branchesArgs) => {
 	const branchAccessor = ConditionalRenderer + nodeAccessor;
 	const branches = [];
@@ -1924,10 +1982,12 @@ let _dynamic_tag = /*@__PURE__*/ withBranches((nodeAccessor, getContent, getTagV
 		if (scope[rendererAccessor] !== (scope[rendererAccessor] = rendererKey(normalizedRenderer)) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) {
 			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 (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 renderer === "string") {
 				if (getContent) {
 					const content = getContent(scope);
@@ -1945,13 +2005,15 @@ let _dynamic_tag = /*@__PURE__*/ withBranches((nodeAccessor, getContent, getTagV
 				if (childScope["EventAttributes:" + nodeAccessor] || childScope["ControlledHandler:" + nodeAccessor]) queueEffect(childScope, dynamicTagScript);
 			} else {
 				normalizedRenderer[LocalClosures]?.(childScope);
-				if (normalizedRenderer["params"]) if (inputIsArgs) normalizedRenderer[Params](childScope, normalizedRenderer._ ? args[0] : args);
-				else {
-					const inputWithContent = getContent ? {
-						...args,
-						content: getContent(scope)
-					} : args || {};
-					normalizedRenderer[Params](childScope, normalizedRenderer._ ? inputWithContent : [inputWithContent]);
+				if (normalizedRenderer["params"]) {
+					if (inputIsArgs) normalizedRenderer[Params](childScope, normalizedRenderer._ ? args[0] : args);
+					else {
+						const inputWithContent = getContent ? {
+							...args,
+							content: getContent(scope)
+						} : args || {};
+						normalizedRenderer[Params](childScope, normalizedRenderer._ ? inputWithContent : [inputWithContent]);
+					}
 				}
 			}
 		}
@@ -2089,20 +2151,22 @@ function reorderKeyed(newScopes, start, newEnd, parentNode, afterReference) {
 	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;
+	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];
@@ -2221,6 +2285,12 @@ Object.defineProperty(exports, "Pending", {
 		return Pending;
 	}
 });
+Object.defineProperty(exports, "PendingEffectScopes", {
+	enumerable: true,
+	get: function() {
+		return PendingEffectScopes;
+	}
+});
 Object.defineProperty(exports, "PendingEffects", {
 	enumerable: true,
 	get: function() {
@@ -2797,12 +2867,6 @@ Object.defineProperty(exports, "addAwaitCounter", {
 		return addAwaitCounter;
 	}
 });
-Object.defineProperty(exports, "caughtError", {
-	enumerable: true,
-	get: function() {
-		return caughtError;
-	}
-});
 Object.defineProperty(exports, "controllableRenders", {
 	enumerable: true,
 	get: function() {
@@ -2911,12 +2975,6 @@ Object.defineProperty(exports, "patchDynamicTag", {
 		return patchDynamicTag;
 	}
 });
-Object.defineProperty(exports, "placeholderShown", {
-	enumerable: true,
-	get: function() {
-		return placeholderShown;
-	}
-});
 Object.defineProperty(exports, "prepareEffects", {
 	enumerable: true,
 	get: function() {
@@ -2965,6 +3023,12 @@ Object.defineProperty(exports, "renderCatch", {
 		return renderCatch;
 	}
 });
+Object.defineProperty(exports, "rendering", {
+	enumerable: true,
+	get: function() {
+		return rendering;
+	}
+});
 Object.defineProperty(exports, "run", {
 	enumerable: true,
 	get: function() {
@@ -2983,6 +3047,12 @@ Object.defineProperty(exports, "runId", {
 		return runId;
 	}
 });
+Object.defineProperty(exports, "runPendingEffects", {
+	enumerable: true,
+	get: function() {
+		return runPendingEffects;
+	}
+});
 Object.defineProperty(exports, "setupBranch", {
 	enumerable: true,
 	get: function() {