From 3b7f4341c44b99d398bb36f4aa27779fff44f2d3 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 11 Feb 2026 04:41:54 -0500
Subject: [PATCH] chore: DRY out boundary compiler code (#17673)

#17672
---
 .../server/visitors/SvelteBoundary.js         | 57 +++++++------------
 .../_expected/server/index.svelte.js          | 10 +++-
 2 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
index f4ab58646b..acc95272c6 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
@@ -38,43 +38,6 @@ export function SvelteBoundary(node, context) {
 		)
 	);
 
-	// When there's no `failed` snippet, skip the boundary wrapper entirely
-	// (saves bytes / more performant at runtime)
-	if (!failed_snippet) {
-		if (pending_attribute || pending_snippet) {
-			if (pending_attribute && is_pending_attr_nullish && !pending_snippet) {
-				const { callee, pending_block } = build_pending_attribute_block(pending_attribute, context);
-				const block = /** @type {BlockStatement} */ (context.visit(node.fragment));
-				context.state.template.push(
-					b.if(callee, pending_block, b.block(build_template([block_open, block, block_close])))
-				);
-			} else {
-				const pending_block = pending_attribute
-					? build_pending_attribute_block(pending_attribute, context).pending_block
-					: build_pending_snippet_block(/** @type {AST.SnippetBlock} */ (pending_snippet), context);
-				context.state.template.push(pending_block);
-			}
-		} else {
-			const block = /** @type {BlockStatement} */ (context.visit(node.fragment));
-			context.state.template.push(block_open, block, block_close);
-		}
-		return;
-	}
-
-	// Has a `failed` snippet: wrap in $$renderer.boundary()
-
-	const props = b.object([]);
-
-	const failed_fn = b.function_declaration(
-		failed_snippet.expression,
-		[b.id('$$renderer'), ...failed_snippet.parameters],
-		/** @type {BlockStatement} */ (context.visit(failed_snippet.body))
-	);
-	// @ts-expect-error
-	failed_fn.___snippet = true;
-	context.state.template.push(failed_fn);
-	props.properties.push(b.init('failed', failed_snippet.expression));
-
 	const children_nodes = node.fragment.nodes.filter(
 		(child) =>
 			!(child.type === 'SnippetBlock' && ['failed', 'pending'].includes(child.expression.name))
@@ -111,6 +74,26 @@ export function SvelteBoundary(node, context) {
 		children_body = b.block(build_template([block_open, children_block, block_close]));
 	}
 
+	// When there's no `failed` snippet, skip the boundary wrapper entirely
+	// (saves bytes / more performant at runtime)
+	if (!failed_snippet) {
+		context.state.template.push(...children_body.body);
+		return;
+	}
+
+	// Has a `failed` snippet: wrap in $$renderer.boundary()
+	const props = b.object([]);
+
+	const failed_fn = b.function_declaration(
+		failed_snippet.expression,
+		[b.id('$$renderer'), ...failed_snippet.parameters],
+		/** @type {BlockStatement} */ (context.visit(failed_snippet.body))
+	);
+	// @ts-expect-error
+	failed_fn.___snippet = true;
+	context.state.template.push(failed_fn);
+	props.properties.push(b.init('failed', failed_snippet.expression));
+
 	context.state.template.push(
 		b.stmt(b.call('$$renderer.boundary', props, b.arrow([b.id('$$renderer')], children_body)))
 	);
diff --git a/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/index.svelte.js
index acf873ac09..a50200a769 100644
--- a/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/index.svelte.js
@@ -164,7 +164,8 @@ export default function Select_with_rich_content($$renderer) {
 		$$renderer.push('<!--[!-->');
 	}
 
-	$$renderer.push(`<!--]--></select> <select><!--[-->`);
+	$$renderer.push(`<!--]--></select> <select>`);
+	$$renderer.push(`<!--[-->`);
 
 	{
 		$$renderer.option({}, ($$renderer) => {
@@ -172,7 +173,9 @@ export default function Select_with_rich_content($$renderer) {
 		});
 	}
 
-	$$renderer.push(`<!--]--></select> <select><!--[-->`);
+	$$renderer.push(`<!--]-->`);
+	$$renderer.push(`</select> <select>`);
+	$$renderer.push(`<!--[-->`);
 
 	{
 		$$renderer.option(
@@ -188,7 +191,8 @@ export default function Select_with_rich_content($$renderer) {
 		);
 	}
 
-	$$renderer.push(`<!--]--></select> <select>`);
+	$$renderer.push(`<!--]-->`);
+	$$renderer.push(`</select> <select>`);
 	Option($$renderer, {});
 	$$renderer.push(`<!----><!></select>  <select>`);
 	option_snippet($$renderer);