marko 6.3.22 → 6.3.24

package/dist/debug/dom.js

@@ -1496,58 +1496,59 @@ function _await_promise(nodeAccessor, params) {
 	const promiseAccessor = Promise$1 + nodeAccessor;
 	const branchAccessor = BranchScopes$1 + nodeAccessor;
 	_enable_catch();
-	return (scope, promise) => {
-		if (!isPromise(promise)) {
-			if (!scope[promiseAccessor]) {
-				const resolve = () => resolveAwait(scope, branchAccessor, nodeAccessor, scope[nodeAccessor], params, promise);
-				if (scope[branchAccessor]) resolve();
-				else scope[promiseAccessor] = resolve;
-				return;
-			}
-			promise = Promise.resolve(promise);
+	const resolveAwait = (scope, referenceNode, value) => {
+		const awaitBranch = scope[branchAccessor];
+		if (awaitBranch["#DetachedAwait"]) {
+			awaitBranch[PendingScopes] = awaitBranch[PendingScopes]?.forEach(syncGen);
+			setupBranch(awaitBranch[DetachedAwait], awaitBranch);
+			awaitBranch[DetachedAwait] = 0;
+			insertBranchBefore(awaitBranch, scope[nodeAccessor].parentNode, scope[nodeAccessor]);
+			referenceNode.remove();
 		}
+		params?.(awaitBranch, [value]);
+		return awaitBranch;
+	};
+	const awaitPromise = (scope, promise) => {
+		if (!isPromise(promise) && scope[promiseAccessor]) promise = Promise.resolve(promise);
 		let awaitBranch = scope[branchAccessor];
 		const tryPlaceholder = 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);
+			return;
+		}
 		let awaitCounter = tryBranch[AwaitCounter];
 		placeholderShown.add(pendingEffects);
-		if (tryPlaceholder) {
-			if (!scope[promiseAccessor]) {
-				if (awaitBranch) awaitBranch[PendingRenders] ||= [];
-				awaitCounter = addAwaitCounter(scope, tryPlaceholder);
-			}
-		} else {
-			if (!awaitCounter?.i) awaitCounter = tryBranch[AwaitCounter] = {
-				i: 0,
-				c() {
-					if (--awaitCounter.i) return 1;
-					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);
-						}
-					} else dismissPlaceholder(tryBranch);
-					queueEffect(tryBranch, runPendingEffects);
+		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 (!awaitCounter.i++) requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(scope, () => {
-					if (!awaitBranch["#DetachedAwait"]) {
-						awaitBranch["#StartNode"].parentNode.insertBefore(scope[nodeAccessor], awaitBranch["#StartNode"]);
-						tempDetachBranch(tryBranch);
-					}
-				}, -1))));
-			}
+			} else dismissPlaceholder(tryBranch);
+		});
+		if (!scope[promiseAccessor]) {
+			if (awaitBranch) awaitBranch[PendingRenders] ||= [];
+			if (tryPlaceholder) awaitCounter = addAwaitCounter(scope, tryPlaceholder);
+			else if (!awaitCounter.i++) requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(scope, () => {
+				if (!awaitBranch["#DetachedAwait"]) {
+					awaitBranch["#StartNode"].parentNode.insertBefore(scope[nodeAccessor], awaitBranch["#StartNode"]);
+					tempDetachBranch(tryBranch);
+				}
+			}, -1))));
 		}
 		const thisPromise = scope[promiseAccessor] = promise.then((data) => {
 			if (thisPromise === scope[promiseAccessor]) {
 				const referenceNode = scope[nodeAccessor];
 				scope[promiseAccessor] = 0;
 				queueAsyncRender(scope, () => {
-					awaitBranch = resolveAwait(scope, branchAccessor, nodeAccessor, referenceNode, params, data);
+					awaitBranch = resolveAwait(scope, referenceNode, data);
 					const pendingRenders = awaitBranch[PendingRenders];
 					awaitBranch[PendingRenders] = 0;
 					pendingRenders?.forEach(queuePendingRender);
@@ -1579,18 +1580,7 @@ function _await_promise(nodeAccessor, params) {
 			}
 		});
 	};
-}
-function resolveAwait(scope, branchAccessor, nodeAccessor, referenceNode, params, value) {
-	const awaitBranch = scope[branchAccessor];
-	if (awaitBranch["#DetachedAwait"]) {
-		awaitBranch[PendingScopes] = awaitBranch[PendingScopes]?.forEach(syncGen);
-		setupBranch(awaitBranch[DetachedAwait], awaitBranch);
-		awaitBranch[DetachedAwait] = 0;
-		insertBranchBefore(awaitBranch, scope[nodeAccessor].parentNode, scope[nodeAccessor]);
-		referenceNode.remove();
-	}
-	params?.(awaitBranch, [value]);
-	return awaitBranch;
+	return awaitPromise;
 }
 function _await_content(nodeAccessor, template, walks, setup) {
 	const branchAccessor = BranchScopes$1 + nodeAccessor;
@@ -1609,19 +1599,23 @@ function _await_content(nodeAccessor, template, walks, setup) {
 function addAwaitCounter(scope, tryBranch = findBranchWithKey(scope, PlaceholderContent)) {
 	if (!tryBranch) return;
 	let awaitCounter = tryBranch[AwaitCounter];
-	if (!awaitCounter?.i) awaitCounter = tryBranch[AwaitCounter] = {
+	if (!awaitCounter?.i) awaitCounter = createAwaitCounter(tryBranch, () => dismissPlaceholder(tryBranch));
+	placeholderShown.add(pendingEffects);
+	if (!awaitCounter.i++) requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(tryBranch, () => {
+		insertBranchBefore(tryBranch["#PlaceholderBranch"] = createAndSetupBranch(tryBranch["$global"], tryBranch["#PlaceholderContent"], tryBranch["_"], tryBranch["#StartNode"].parentNode), tryBranch["#StartNode"].parentNode, tryBranch["#StartNode"]);
+		tempDetachBranch(tryBranch);
+	}, -1))));
+	return awaitCounter;
+}
+function createAwaitCounter(tryBranch, done) {
+	const awaitCounter = tryBranch[AwaitCounter] = {
 		i: 0,
 		c() {
 			if (--awaitCounter.i) return 1;
-			dismissPlaceholder(tryBranch);
+			done();
 			queueEffect(tryBranch, runPendingEffects);
 		}
 	};
-	placeholderShown.add(pendingEffects);
-	if (!awaitCounter.i++) requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(tryBranch, () => {
-		insertBranchBefore(tryBranch["#PlaceholderBranch"] = createAndSetupBranch(tryBranch["$global"], tryBranch["#PlaceholderContent"], tryBranch["_"], tryBranch["#StartNode"].parentNode), tryBranch["#StartNode"].parentNode, tryBranch["#StartNode"]);
-		tempDetachBranch(tryBranch);
-	}, -1))));
 	return awaitCounter;
 }
 function runPendingEffects(scope) {

package/dist/debug/dom.mjs

@@ -1494,58 +1494,59 @@ function _await_promise(nodeAccessor, params) {
 	const promiseAccessor = Promise$1 + nodeAccessor;
 	const branchAccessor = BranchScopes$1 + nodeAccessor;
 	_enable_catch();
-	return (scope, promise) => {
-		if (!isPromise(promise)) {
-			if (!scope[promiseAccessor]) {
-				const resolve = () => resolveAwait(scope, branchAccessor, nodeAccessor, scope[nodeAccessor], params, promise);
-				if (scope[branchAccessor]) resolve();
-				else scope[promiseAccessor] = resolve;
-				return;
-			}
-			promise = Promise.resolve(promise);
+	const resolveAwait = (scope, referenceNode, value) => {
+		const awaitBranch = scope[branchAccessor];
+		if (awaitBranch["#DetachedAwait"]) {
+			awaitBranch[PendingScopes] = awaitBranch[PendingScopes]?.forEach(syncGen);
+			setupBranch(awaitBranch[DetachedAwait], awaitBranch);
+			awaitBranch[DetachedAwait] = 0;
+			insertBranchBefore(awaitBranch, scope[nodeAccessor].parentNode, scope[nodeAccessor]);
+			referenceNode.remove();
 		}
+		params?.(awaitBranch, [value]);
+		return awaitBranch;
+	};
+	const awaitPromise = (scope, promise) => {
+		if (!isPromise(promise) && scope[promiseAccessor]) promise = Promise.resolve(promise);
 		let awaitBranch = scope[branchAccessor];
 		const tryPlaceholder = 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);
+			return;
+		}
 		let awaitCounter = tryBranch[AwaitCounter];
 		placeholderShown.add(pendingEffects);
-		if (tryPlaceholder) {
-			if (!scope[promiseAccessor]) {
-				if (awaitBranch) awaitBranch[PendingRenders] ||= [];
-				awaitCounter = addAwaitCounter(scope, tryPlaceholder);
-			}
-		} else {
-			if (!awaitCounter?.i) awaitCounter = tryBranch[AwaitCounter] = {
-				i: 0,
-				c() {
-					if (--awaitCounter.i) return 1;
-					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);
-						}
-					} else dismissPlaceholder(tryBranch);
-					queueEffect(tryBranch, runPendingEffects);
+		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 (!awaitCounter.i++) requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(scope, () => {
-					if (!awaitBranch["#DetachedAwait"]) {
-						awaitBranch["#StartNode"].parentNode.insertBefore(scope[nodeAccessor], awaitBranch["#StartNode"]);
-						tempDetachBranch(tryBranch);
-					}
-				}, -1))));
-			}
+			} else dismissPlaceholder(tryBranch);
+		});
+		if (!scope[promiseAccessor]) {
+			if (awaitBranch) awaitBranch[PendingRenders] ||= [];
+			if (tryPlaceholder) awaitCounter = addAwaitCounter(scope, tryPlaceholder);
+			else if (!awaitCounter.i++) requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(scope, () => {
+				if (!awaitBranch["#DetachedAwait"]) {
+					awaitBranch["#StartNode"].parentNode.insertBefore(scope[nodeAccessor], awaitBranch["#StartNode"]);
+					tempDetachBranch(tryBranch);
+				}
+			}, -1))));
 		}
 		const thisPromise = scope[promiseAccessor] = promise.then((data) => {
 			if (thisPromise === scope[promiseAccessor]) {
 				const referenceNode = scope[nodeAccessor];
 				scope[promiseAccessor] = 0;
 				queueAsyncRender(scope, () => {
-					awaitBranch = resolveAwait(scope, branchAccessor, nodeAccessor, referenceNode, params, data);
+					awaitBranch = resolveAwait(scope, referenceNode, data);
 					const pendingRenders = awaitBranch[PendingRenders];
 					awaitBranch[PendingRenders] = 0;
 					pendingRenders?.forEach(queuePendingRender);
@@ -1577,18 +1578,7 @@ function _await_promise(nodeAccessor, params) {
 			}
 		});
 	};
-}
-function resolveAwait(scope, branchAccessor, nodeAccessor, referenceNode, params, value) {
-	const awaitBranch = scope[branchAccessor];
-	if (awaitBranch["#DetachedAwait"]) {
-		awaitBranch[PendingScopes] = awaitBranch[PendingScopes]?.forEach(syncGen);
-		setupBranch(awaitBranch[DetachedAwait], awaitBranch);
-		awaitBranch[DetachedAwait] = 0;
-		insertBranchBefore(awaitBranch, scope[nodeAccessor].parentNode, scope[nodeAccessor]);
-		referenceNode.remove();
-	}
-	params?.(awaitBranch, [value]);
-	return awaitBranch;
+	return awaitPromise;
 }
 function _await_content(nodeAccessor, template, walks, setup) {
 	const branchAccessor = BranchScopes$1 + nodeAccessor;
@@ -1607,19 +1597,23 @@ function _await_content(nodeAccessor, template, walks, setup) {
 function addAwaitCounter(scope, tryBranch = findBranchWithKey(scope, PlaceholderContent)) {
 	if (!tryBranch) return;
 	let awaitCounter = tryBranch[AwaitCounter];
-	if (!awaitCounter?.i) awaitCounter = tryBranch[AwaitCounter] = {
+	if (!awaitCounter?.i) awaitCounter = createAwaitCounter(tryBranch, () => dismissPlaceholder(tryBranch));
+	placeholderShown.add(pendingEffects);
+	if (!awaitCounter.i++) requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(tryBranch, () => {
+		insertBranchBefore(tryBranch["#PlaceholderBranch"] = createAndSetupBranch(tryBranch["$global"], tryBranch["#PlaceholderContent"], tryBranch["_"], tryBranch["#StartNode"].parentNode), tryBranch["#StartNode"].parentNode, tryBranch["#StartNode"]);
+		tempDetachBranch(tryBranch);
+	}, -1))));
+	return awaitCounter;
+}
+function createAwaitCounter(tryBranch, done) {
+	const awaitCounter = tryBranch[AwaitCounter] = {
 		i: 0,
 		c() {
 			if (--awaitCounter.i) return 1;
-			dismissPlaceholder(tryBranch);
+			done();
 			queueEffect(tryBranch, runPendingEffects);
 		}
 	};
-	placeholderShown.add(pendingEffects);
-	if (!awaitCounter.i++) requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(tryBranch, () => {
-		insertBranchBefore(tryBranch["#PlaceholderBranch"] = createAndSetupBranch(tryBranch["$global"], tryBranch["#PlaceholderContent"], tryBranch["_"], tryBranch["#StartNode"].parentNode), tryBranch["#StartNode"].parentNode, tryBranch["#StartNode"]);
-		tempDetachBranch(tryBranch);
-	}, -1))));
 	return awaitCounter;
 }
 function runPendingEffects(scope) {

package/dist/debug/html.js

@@ -624,7 +624,7 @@ function writeScopesRoot(state, flushes) {
 		const ref = state.refs.get(scope) || newScopeReference(state, scope, scopeId);
 		const openIndex = buf.push("") - 1;
 		if (writeObjectProps(state, flush[2], ref)) {
-			buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId > nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{";
+			buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId !== nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{";
 			if (fillIndex === -1) fillIndex = openIndex;
 			nextSlotId = scopeId + 1;
 			buf.push("}");

package/dist/debug/html.mjs

@@ -622,7 +622,7 @@ function writeScopesRoot(state, flushes) {
 		const ref = state.refs.get(scope) || newScopeReference(state, scope, scopeId);
 		const openIndex = buf.push("") - 1;
 		if (writeObjectProps(state, flush[2], ref)) {
-			buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId > nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{";
+			buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId !== nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{";
 			if (fillIndex === -1) fillIndex = openIndex;
 			nextSlotId = scopeId + 1;
 			buf.push("}");

package/dist/dom.js

@@ -934,37 +934,38 @@ function toInsertNode(startNode, endNode) {
 function _await_promise(nodeAccessor, params) {
 	nodeAccessor = decodeAccessor(nodeAccessor);
 	let promiseAccessor = "L" + nodeAccessor, branchAccessor = "A" + nodeAccessor;
-	return _enable_catch(), (scope, promise) => {
+	_enable_catch();
+	let resolveAwait = (scope, referenceNode, value) => {
+		let awaitBranch = scope[branchAccessor];
+		return awaitBranch.V && (awaitBranch.Y = awaitBranch.Y?.forEach(syncGen), setupBranch(awaitBranch.V, awaitBranch), awaitBranch.V = 0, insertBranchBefore(awaitBranch, scope[nodeAccessor].parentNode, scope[nodeAccessor]), referenceNode.remove()), params?.(awaitBranch, [value]), awaitBranch;
+	}, awaitPromise = (scope, promise) => {
+		!isPromise(promise) && scope[promiseAccessor] && (promise = Promise.resolve(promise));
+		let awaitBranch = scope[branchAccessor], tryPlaceholder = findBranchWithKey(scope, "Q"), tryBranch = tryPlaceholder || awaitBranch;
+		if (!(isPromise(promise) ? tryBranch : awaitBranch)) {
+			scope[promiseAccessor] = () => awaitPromise(scope, promise);
+			return;
+		}
 		if (!isPromise(promise)) {
-			if (!scope[promiseAccessor]) {
-				let resolve = () => resolveAwait(scope, branchAccessor, nodeAccessor, scope[nodeAccessor], params, promise);
-				scope[branchAccessor] ? resolve() : scope[promiseAccessor] = resolve;
-				return;
-			}
-			promise = Promise.resolve(promise);
+			resolveAwait(scope, scope[nodeAccessor], promise);
+			return;
 		}
-		let awaitBranch = scope[branchAccessor], tryPlaceholder = findBranchWithKey(scope, "Q"), tryBranch = tryPlaceholder || awaitBranch, awaitCounter = tryBranch.O;
-		placeholderShown.add(pendingEffects), tryPlaceholder ? scope[promiseAccessor] || (awaitBranch && (awaitBranch.W ||= []), awaitCounter = addAwaitCounter(scope, tryPlaceholder)) : (awaitCounter?.i || (awaitCounter = tryBranch.O = {
-			i: 0,
-			c() {
-				if (--awaitCounter.i) return 1;
-				if (tryBranch === scope[branchAccessor]) {
-					let anchor = scope[nodeAccessor];
-					if (anchor.parentNode) {
-						let detachedParent = scope[branchAccessor].S.parentNode;
-						detachedParent === anchor.parentNode ? anchor.remove() : anchor.replaceWith(detachedParent);
-					}
-				} else dismissPlaceholder(tryBranch);
-				queueEffect(tryBranch, runPendingEffects);
-			}
-		}), scope[promiseAccessor] || (awaitBranch && (awaitBranch.W ||= []), awaitCounter.i++ || requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(scope, () => {
+		let awaitCounter = tryBranch.O;
+		placeholderShown.add(pendingEffects), !tryPlaceholder && !awaitCounter?.i && (awaitCounter = createAwaitCounter(tryBranch, () => {
+			if (tryBranch === scope[branchAccessor]) {
+				let anchor = scope[nodeAccessor];
+				if (anchor.parentNode) {
+					let detachedParent = scope[branchAccessor].S.parentNode;
+					detachedParent === anchor.parentNode ? anchor.remove() : anchor.replaceWith(detachedParent);
+				}
+			} else dismissPlaceholder(tryBranch);
+		})), scope[promiseAccessor] || (awaitBranch && (awaitBranch.W ||= []), tryPlaceholder ? awaitCounter = addAwaitCounter(scope, tryPlaceholder) : awaitCounter.i++ || requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(scope, () => {
 			awaitBranch.V || (awaitBranch.S.parentNode.insertBefore(scope[nodeAccessor], awaitBranch.S), tempDetachBranch(tryBranch));
-		}, -1))))));
+		}, -1)))));
 		let thisPromise = scope[promiseAccessor] = promise.then((data) => {
 			if (thisPromise === scope[promiseAccessor]) {
 				let referenceNode = scope[nodeAccessor];
 				scope[promiseAccessor] = 0, queueAsyncRender(scope, () => {
-					awaitBranch = resolveAwait(scope, branchAccessor, nodeAccessor, referenceNode, params, data);
+					awaitBranch = resolveAwait(scope, referenceNode, data);
 					let pendingRenders = awaitBranch.W;
 					if (awaitBranch.W = 0, pendingRenders?.forEach(queuePendingRender), placeholderShown.add(pendingEffects), awaitCounter.c(), awaitCounter.m) {
 						let fnScopes = /* @__PURE__ */ new Map(), effects = awaitCounter.m([]);
@@ -983,10 +984,7 @@ function _await_promise(nodeAccessor, params) {
 			thisPromise === scope[promiseAccessor] && (scope[promiseAccessor] = 0, tryPlaceholder && !awaitCounter.m ? awaitCounter.c() : awaitCounter.i = 0, queueAsyncRender(scope, renderCatch, error));
 		});
 	};
-}
-function resolveAwait(scope, branchAccessor, nodeAccessor, referenceNode, params, value) {
-	let awaitBranch = scope[branchAccessor];
-	return awaitBranch.V && (awaitBranch.Y = awaitBranch.Y?.forEach(syncGen), setupBranch(awaitBranch.V, awaitBranch), awaitBranch.V = 0, insertBranchBefore(awaitBranch, scope[nodeAccessor].parentNode, scope[nodeAccessor]), referenceNode.remove()), params?.(awaitBranch, [value]), awaitBranch;
+	return awaitPromise;
 }
 function _await_content(nodeAccessor, template, walks, setup) {
 	nodeAccessor = decodeAccessor(nodeAccessor);
@@ -1001,15 +999,19 @@ function _await_content(nodeAccessor, template, walks, setup) {
 function addAwaitCounter(scope, tryBranch = findBranchWithKey(scope, "Q")) {
 	if (!tryBranch) return;
 	let awaitCounter = tryBranch.O;
-	return awaitCounter?.i || (awaitCounter = tryBranch.O = {
+	return awaitCounter?.i || (awaitCounter = createAwaitCounter(tryBranch, () => dismissPlaceholder(tryBranch))), placeholderShown.add(pendingEffects), awaitCounter.i++ || requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(tryBranch, () => {
+		insertBranchBefore(tryBranch.P = createAndSetupBranch(tryBranch.$, tryBranch.Q, tryBranch._, tryBranch.S.parentNode), tryBranch.S.parentNode, tryBranch.S), tempDetachBranch(tryBranch);
+	}, -1)))), awaitCounter;
+}
+function createAwaitCounter(tryBranch, done) {
+	let awaitCounter = tryBranch.O = {
 		i: 0,
 		c() {
 			if (--awaitCounter.i) return 1;
-			dismissPlaceholder(tryBranch), queueEffect(tryBranch, runPendingEffects);
+			done(), queueEffect(tryBranch, runPendingEffects);
 		}
-	}), placeholderShown.add(pendingEffects), awaitCounter.i++ || requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(tryBranch, () => {
-		insertBranchBefore(tryBranch.P = createAndSetupBranch(tryBranch.$, tryBranch.Q, tryBranch._, tryBranch.S.parentNode), tryBranch.S.parentNode, tryBranch.S), tempDetachBranch(tryBranch);
-	}, -1)))), awaitCounter;
+	};
+	return awaitCounter;
 }
 function runPendingEffects(scope) {
 	let effects = scope.J;

package/dist/dom.mjs

@@ -933,37 +933,38 @@ function toInsertNode(startNode, endNode) {
 function _await_promise(nodeAccessor, params) {
 	nodeAccessor = decodeAccessor(nodeAccessor);
 	let promiseAccessor = "L" + nodeAccessor, branchAccessor = "A" + nodeAccessor;
-	return _enable_catch(), (scope, promise) => {
+	_enable_catch();
+	let resolveAwait = (scope, referenceNode, value) => {
+		let awaitBranch = scope[branchAccessor];
+		return awaitBranch.V && (awaitBranch.Y = awaitBranch.Y?.forEach(syncGen), setupBranch(awaitBranch.V, awaitBranch), awaitBranch.V = 0, insertBranchBefore(awaitBranch, scope[nodeAccessor].parentNode, scope[nodeAccessor]), referenceNode.remove()), params?.(awaitBranch, [value]), awaitBranch;
+	}, awaitPromise = (scope, promise) => {
+		!isPromise(promise) && scope[promiseAccessor] && (promise = Promise.resolve(promise));
+		let awaitBranch = scope[branchAccessor], tryPlaceholder = findBranchWithKey(scope, "Q"), tryBranch = tryPlaceholder || awaitBranch;
+		if (!(isPromise(promise) ? tryBranch : awaitBranch)) {
+			scope[promiseAccessor] = () => awaitPromise(scope, promise);
+			return;
+		}
 		if (!isPromise(promise)) {
-			if (!scope[promiseAccessor]) {
-				let resolve = () => resolveAwait(scope, branchAccessor, nodeAccessor, scope[nodeAccessor], params, promise);
-				scope[branchAccessor] ? resolve() : scope[promiseAccessor] = resolve;
-				return;
-			}
-			promise = Promise.resolve(promise);
+			resolveAwait(scope, scope[nodeAccessor], promise);
+			return;
 		}
-		let awaitBranch = scope[branchAccessor], tryPlaceholder = findBranchWithKey(scope, "Q"), tryBranch = tryPlaceholder || awaitBranch, awaitCounter = tryBranch.O;
-		placeholderShown.add(pendingEffects), tryPlaceholder ? scope[promiseAccessor] || (awaitBranch && (awaitBranch.W ||= []), awaitCounter = addAwaitCounter(scope, tryPlaceholder)) : (awaitCounter?.i || (awaitCounter = tryBranch.O = {
-			i: 0,
-			c() {
-				if (--awaitCounter.i) return 1;
-				if (tryBranch === scope[branchAccessor]) {
-					let anchor = scope[nodeAccessor];
-					if (anchor.parentNode) {
-						let detachedParent = scope[branchAccessor].S.parentNode;
-						detachedParent === anchor.parentNode ? anchor.remove() : anchor.replaceWith(detachedParent);
-					}
-				} else dismissPlaceholder(tryBranch);
-				queueEffect(tryBranch, runPendingEffects);
-			}
-		}), scope[promiseAccessor] || (awaitBranch && (awaitBranch.W ||= []), awaitCounter.i++ || requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(scope, () => {
+		let awaitCounter = tryBranch.O;
+		placeholderShown.add(pendingEffects), !tryPlaceholder && !awaitCounter?.i && (awaitCounter = createAwaitCounter(tryBranch, () => {
+			if (tryBranch === scope[branchAccessor]) {
+				let anchor = scope[nodeAccessor];
+				if (anchor.parentNode) {
+					let detachedParent = scope[branchAccessor].S.parentNode;
+					detachedParent === anchor.parentNode ? anchor.remove() : anchor.replaceWith(detachedParent);
+				}
+			} else dismissPlaceholder(tryBranch);
+		})), scope[promiseAccessor] || (awaitBranch && (awaitBranch.W ||= []), tryPlaceholder ? awaitCounter = addAwaitCounter(scope, tryPlaceholder) : awaitCounter.i++ || requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(scope, () => {
 			awaitBranch.V || (awaitBranch.S.parentNode.insertBefore(scope[nodeAccessor], awaitBranch.S), tempDetachBranch(tryBranch));
-		}, -1))))));
+		}, -1)))));
 		let thisPromise = scope[promiseAccessor] = promise.then((data) => {
 			if (thisPromise === scope[promiseAccessor]) {
 				let referenceNode = scope[nodeAccessor];
 				scope[promiseAccessor] = 0, queueAsyncRender(scope, () => {
-					awaitBranch = resolveAwait(scope, branchAccessor, nodeAccessor, referenceNode, params, data);
+					awaitBranch = resolveAwait(scope, referenceNode, data);
 					let pendingRenders = awaitBranch.W;
 					if (awaitBranch.W = 0, pendingRenders?.forEach(queuePendingRender), placeholderShown.add(pendingEffects), awaitCounter.c(), awaitCounter.m) {
 						let fnScopes = /* @__PURE__ */ new Map(), effects = awaitCounter.m([]);
@@ -982,10 +983,7 @@ function _await_promise(nodeAccessor, params) {
 			thisPromise === scope[promiseAccessor] && (scope[promiseAccessor] = 0, tryPlaceholder && !awaitCounter.m ? awaitCounter.c() : awaitCounter.i = 0, queueAsyncRender(scope, renderCatch, error));
 		});
 	};
-}
-function resolveAwait(scope, branchAccessor, nodeAccessor, referenceNode, params, value) {
-	let awaitBranch = scope[branchAccessor];
-	return awaitBranch.V && (awaitBranch.Y = awaitBranch.Y?.forEach(syncGen), setupBranch(awaitBranch.V, awaitBranch), awaitBranch.V = 0, insertBranchBefore(awaitBranch, scope[nodeAccessor].parentNode, scope[nodeAccessor]), referenceNode.remove()), params?.(awaitBranch, [value]), awaitBranch;
+	return awaitPromise;
 }
 function _await_content(nodeAccessor, template, walks, setup) {
 	nodeAccessor = decodeAccessor(nodeAccessor);
@@ -1000,15 +998,19 @@ function _await_content(nodeAccessor, template, walks, setup) {
 function addAwaitCounter(scope, tryBranch = findBranchWithKey(scope, "Q")) {
 	if (!tryBranch) return;
 	let awaitCounter = tryBranch.O;
-	return awaitCounter?.i || (awaitCounter = tryBranch.O = {
+	return awaitCounter?.i || (awaitCounter = createAwaitCounter(tryBranch, () => dismissPlaceholder(tryBranch))), placeholderShown.add(pendingEffects), awaitCounter.i++ || requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(tryBranch, () => {
+		insertBranchBefore(tryBranch.P = createAndSetupBranch(tryBranch.$, tryBranch.Q, tryBranch._, tryBranch.S.parentNode), tryBranch.S.parentNode, tryBranch.S), tempDetachBranch(tryBranch);
+	}, -1)))), awaitCounter;
+}
+function createAwaitCounter(tryBranch, done) {
+	let awaitCounter = tryBranch.O = {
 		i: 0,
 		c() {
 			if (--awaitCounter.i) return 1;
-			dismissPlaceholder(tryBranch), queueEffect(tryBranch, runPendingEffects);
+			done(), queueEffect(tryBranch, runPendingEffects);
 		}
-	}), placeholderShown.add(pendingEffects), awaitCounter.i++ || requestAnimationFrame(() => awaitCounter.i && runEffects(prepareEffects(() => queueRender(tryBranch, () => {
-		insertBranchBefore(tryBranch.P = createAndSetupBranch(tryBranch.$, tryBranch.Q, tryBranch._, tryBranch.S.parentNode), tryBranch.S.parentNode, tryBranch.S), tempDetachBranch(tryBranch);
-	}, -1)))), awaitCounter;
+	};
+	return awaitCounter;
 }
 function runPendingEffects(scope) {
 	let effects = scope.J;

package/dist/html.js

@@ -262,7 +262,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 				_html(`</${renderer}>`);
 			}
 			let childScope = getScopeById(branchId), needsScript = childScope && (childScope.Ia || childScope.Ea);
-			needsScript && (writeScope(branchId, { R: renderer }), _script(branchId, "d")), (shouldResume || needsScript) && _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
+			needsScript && _script(branchId, "d"), (shouldResume || needsScript) && _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
 		})();
 	} else {
 		shouldResume && _html(state.mark("[", ""));
@@ -516,7 +516,7 @@ function writeScopesRoot(state, flushes) {
 	let { buf } = state, nextSlotId = -1, fillIndex = -1;
 	for (let flush of flushes) {
 		let scopeId = flush[0], scope = flush[1], ref = state.refs.get(scope) || newScopeReference(state, scope, scopeId), openIndex = buf.push("") - 1;
-		writeObjectProps(state, flush[2], ref) ? (buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId > nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{", fillIndex === -1 && (fillIndex = openIndex), nextSlotId = scopeId + 1, buf.push("}")) : buf.pop();
+		writeObjectProps(state, flush[2], ref) ? (buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId === nextSlotId ? "" : "," + (scopeId - nextSlotId)) + ",{", fillIndex === -1 && (fillIndex = openIndex), nextSlotId = scopeId + 1, buf.push("}")) : buf.pop();
 	}
 	nextSlotId !== -1 && buf.push("]");
 	let extras = "";

package/dist/html.mjs

@@ -262,7 +262,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 				_html(`</${renderer}>`);
 			}
 			let childScope = getScopeById(branchId), needsScript = childScope && (childScope.Ia || childScope.Ea);
-			needsScript && (writeScope(branchId, { R: renderer }), _script(branchId, "d")), (shouldResume || needsScript) && _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
+			needsScript && _script(branchId, "d"), (shouldResume || needsScript) && _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
 		})();
 	} else {
 		shouldResume && _html(state.mark("[", ""));
@@ -515,7 +515,7 @@ function writeScopesRoot(state, flushes) {
 	let { buf } = state, nextSlotId = -1, fillIndex = -1;
 	for (let flush of flushes) {
 		let scopeId = flush[0], scope = flush[1], ref = state.refs.get(scope) || newScopeReference(state, scope, scopeId), openIndex = buf.push("") - 1;
-		writeObjectProps(state, flush[2], ref) ? (buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId > nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{", fillIndex === -1 && (fillIndex = openIndex), nextSlotId = scopeId + 1, buf.push("}")) : buf.pop();
+		writeObjectProps(state, flush[2], ref) ? (buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId === nextSlotId ? "" : "," + (scopeId - nextSlotId)) + ",{", fillIndex === -1 && (fillIndex = openIndex), nextSlotId = scopeId + 1, buf.push("}")) : buf.pop();
 	}
 	nextSlotId !== -1 && buf.push("]");
 	let extras = "";

package/dist/translator/index.js

@@ -2071,10 +2071,7 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 			}
 			const childScope = getScopeById(branchId);
 			const needsScript = childScope && (childScope["EventAttributes:a"] || childScope["ControlledHandler:a"]);
-			if (needsScript) {
-				writeScope(branchId, { [Renderer$1]: renderer });
-				_script(branchId, "d");
-			}
+			if (needsScript) _script(branchId, "d");
 			if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
 		};
 		renderNative();
@@ -4658,8 +4655,12 @@ var native_tag_default = {
 					flushInto(tag);
 					tag.insertBefore(_marko_compiler.types.expressionStatement(callRuntime("_attr_select_value", getScopeIdIdentifier(tagSection), nodeBinding && getScopeAccessorLiteral(nodeBinding), selectArgs.value, selectArgs.valueChange, _marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement(tag.node.body.body)), selectArgs.serializeType)));
 				} else if (isTextOnly) {
-					for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoText(child)) write`${child.value}`;
-					else if (_marko_compiler.types.isMarkoPlaceholder(child)) write`${callRuntime(getTextOnlyEscapeHelper(tagName), child.value)}`;
+					const rawTextHelper = getRawTextEscapeHelper(tagName);
+					if (rawTextHelper) {
+						const body = bodyToTextLiteral(tag.node.body);
+						write`${_marko_compiler.types.isStringLiteral(body) ? getHTMLRuntime()[rawTextHelper](body.value) : callRuntime(rawTextHelper, body)}`;
+					} else for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoText(child)) write`${child.value}`;
+					else if (_marko_compiler.types.isMarkoPlaceholder(child)) write`${callRuntime("_escape", child.value)}`;
 				} else tag.insertBefore(tag.node.body.body).forEach((child) => child.skip());
 				if (!tagExtra[kSkipEndTag] && !isOpenOnly && !selectArgs) {
 					if (tagName === "head" && getMarkoOpts().linkAssets) write`${callRuntime("_flush_head")}`;
@@ -5005,11 +5006,10 @@ function assertOptionInSelectWithValue(tag) {
 		parent = parent.parentPath;
 	}
 }
-function getTextOnlyEscapeHelper(tagName) {
+function getRawTextEscapeHelper(tagName) {
 	switch (tagName) {
 		case "script": return "_escape_script";
 		case "style": return "_escape_style";
-		default: return "_escape";
 	}
 }
 function buildAttrExpression(value, serialize, dynamic) {
@@ -9188,7 +9188,7 @@ function isStaticText(node) {
 }
 function getPrevStaticSibling(path) {
 	let prev = path.getPrevSibling();
-	while (prev.node && (prev.isMarkoComment() || prev.isMarkoPlaceholder() && isEmptyPlaceholder(prev.node))) prev = prev.getPrevSibling();
+	while (prev.node && (getNodeContentType(prev, "endType") === null || prev.isMarkoPlaceholder() && isEmptyPlaceholder(prev.node))) prev = prev.getPrevSibling();
 	return prev.node;
 }
 function isEmptyPlaceholder(placeholder) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.22",
+  "version": "6.3.24",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -48,14 +48,14 @@
     }
   },
   "dependencies": {
-    "@marko/compiler": "^5.41.8",
+    "@marko/compiler": "^5.41.9",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "@marko/runtime-tags": "npm:marko@6.3.22",
-    "marko": "5.39.27"
+    "@marko/runtime-tags": "npm:marko@6.3.24",
+    "marko": "5.39.29"
   },
   "engines": {
     "node": ">=22"