Skip to content

chore: DRY out boundary compiler code #17673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dummdidumm merged 1 commit into from
Feb 11, 2026
Merged

chore: DRY out boundary compiler code #17673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 20 additions & 37 deletions packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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)))
);
Expand Down
10 changes: 7 additions & 3 deletions ...s/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,18 @@ export default function Select_with_rich_content($$renderer) {
$$renderer.push('<!--[!-->');
}

$$renderer.push(`<!--]--></select> <select><!--[-->`);
$$renderer.push(`<!--]--></select> <select>`);
$$renderer.push(`<!--[-->`);

{
$$renderer.option({}, ($$renderer) => {
$$renderer.push(`Boundary`);
});
}

$$renderer.push(`<!--]--></select> <select><!--[-->`);
$$renderer.push(`<!--]-->`);
$$renderer.push(`</select> <select>`);
$$renderer.push(`<!--[-->`);

{
$$renderer.option(
Expand All @@ -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);
Expand Down
Loading