Skip to content

chore: fix more wacky compiler output #16794

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
merged 2 commits into from
Sep 18, 2025
Merged

chore: fix more wacky compiler output #16794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7453945
chore: fix more wacky compiler output
Rich-Harris Sep 18, 2025
034174c
update tests
Rich-Harris Sep 18, 2025
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
6 changes: 3 additions & 3 deletions packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ export function server_component(analysis, options) {
b.unary('!', b.id('$$settled')),
b.block([
b.stmt(b.assignment('=', b.id('$$settled'), b.true)),
b.stmt(b.assignment('=', b.id('$$inner_renderer'), b.call(' $$renderer.copy'))),
b.stmt(b.assignment('=', b.id('$$inner_renderer'), b.call('$$renderer.copy'))),
b.stmt(b.call('$$render_inner', b.id('$$inner_renderer')))
])
),
b.stmt(b.call(' $$renderer.subsume', b.id('$$inner_renderer')))
b.stmt(b.call('$$renderer.subsume', b.id('$$inner_renderer')))
];
}

Expand Down Expand Up @@ -301,7 +301,7 @@ export function server_component(analysis, options) {
const code = b.literal(render_stylesheet(analysis.source, analysis, options).code);

body.push(b.const('$$css', b.object([b.init('hash', hash), b.init('code', code)])));
component_block.body.unshift(b.stmt(b.call(' $$renderer.global.css.add', b.id('$$css'))));
component_block.body.unshift(b.stmt(b.call('$$renderer.global.css.add', b.id('$$css'))));
}

let should_inject_props =
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ export function EachBlock(node, context) {
);

if (node.fallback) {
const open = b.stmt(b.call(b.id(' $$renderer.push'), block_open));
const open = b.stmt(b.call(b.id('$$renderer.push'), block_open));

const fallback = /** @type {BlockStatement} */ (context.visit(node.fallback));

fallback.body.unshift(b.stmt(b.call(b.id(' $$renderer.push'), block_open_else)));
fallback.body.unshift(b.stmt(b.call(b.id('$$renderer.push'), block_open_else)));

block.body.push(
b.if(
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ export function IfBlock(node, context) {
? /** @type {BlockStatement} */ (context.visit(node.alternate))
: b.block([]);

consequent.body.unshift(b.stmt(b.call(b.id(' $$renderer.push'), block_open)));
consequent.body.unshift(b.stmt(b.call(b.id('$$renderer.push'), block_open)));

alternate.body.unshift(b.stmt(b.call(b.id(' $$renderer.push'), block_open_else)));
alternate.body.unshift(b.stmt(b.call(b.id('$$renderer.push'), block_open_else)));

/** @type {Statement} */
let statement = b.if(test, consequent, alternate);
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export function RegularElement(node, context) {
b.stmt(
b.assignment(
'=',
b.id(' $$renderer.local.select_value'),
b.id('$$renderer.local.select_value'),
b.member(
build_spread_object(
node,
Expand Down Expand Up @@ -125,7 +125,7 @@ export function RegularElement(node, context) {
);
}

const left = b.id(' $$renderer.local.select_value');
const left = b.id('$$renderer.local.select_value');
if (value.type === 'Attribute') {
state.template.push(
b.stmt(b.assignment('=', left, build_attribute_value(value.value, context)))
Expand Down
8 changes: 4 additions & 4 deletions packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export function process_children(nodes, { visit, state }) {
flush();
const visited = /** @type {Expression} */ (visit(node.expression));
state.template.push(
b.stmt(b.call(' $$renderer.push', b.thunk(b.call('$.escape', visited), true)))
b.stmt(b.call('$$renderer.push', b.thunk(b.call('$.escape', visited), true)))
);
} else if (node.type === 'Text' || node.type === 'Comment' || node.type === 'ExpressionTag') {
sequence.push(node);
Expand Down Expand Up @@ -119,7 +119,7 @@ export function build_template(template) {
statements.push(
b.stmt(
b.call(
b.id(' $$renderer.push'),
b.id('$$renderer.push'),
b.template(
strings.map((cooked, i) => b.quasi(cooked, i === strings.length - 1)),
expressions
Expand Down Expand Up @@ -267,7 +267,7 @@ export function build_getter(node, state) {
* @returns {Statement}
*/
export function call_child_renderer(body, async) {
return b.stmt(b.call(' $$renderer.child', b.arrow([b.id('$$renderer')], body, async)));
return b.stmt(b.call('$$renderer.child', b.arrow([b.id('$$renderer')], body, async)));
}

/**
Expand All @@ -277,7 +277,7 @@ export function call_child_renderer(body, async) {
*/
export function call_component_renderer(body, component_fn_id) {
return b.stmt(
b.call(' $$renderer.component', b.arrow([b.id('$$renderer')], body, false), component_fn_id)
b.call('$$renderer.component', b.arrow([b.id('$$renderer')], body, false), component_fn_id)
);
}

Expand Down
16 changes: 8 additions & 8 deletions ...elte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ import 'svelte/internal/flags/async';
import * as $ from 'svelte/internal/server';

export default function Async_each_fallback_hoisting($$renderer) {
$$renderer.child(async ($$renderer) => {
$$renderer.child(async ($$renderer) => {
const each_array = $.ensure_array_like((await $.save(Promise.resolve([])))());

if (each_array.length !== 0) {
$$renderer.push('<!--[-->');
$$renderer.push('<!--[-->');

for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
let item = each_array[$$index];

$$renderer.push(`<!---->`);
$$renderer.push(async () => $.escape(await Promise.reject('This should never be reached')));
$$renderer.push(`<!---->`);
$$renderer.push(async () => $.escape(await Promise.reject('This should never be reached')));
}
} else {
$$renderer.push('<!--[!-->');
$$renderer.push(`<!---->`);
$$renderer.push(async () => $.escape(await Promise.resolve(4)));
$$renderer.push('<!--[!-->');
$$renderer.push(`<!---->`);
$$renderer.push(async () => $.escape(await Promise.resolve(4)));
}
});

$$renderer.push(`<!--]-->`);
$$renderer.push(`<!--]-->`);
}
10 changes: 5 additions & 5 deletions packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ export default function Async_each_hoisting($$renderer) {
const second = Promise.resolve(2);
const third = Promise.resolve(3);

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

$$renderer.child(async ($$renderer) => {
$$renderer.child(async ($$renderer) => {
const each_array = $.ensure_array_like((await $.save(Promise.resolve([first, second, third])))());

for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
let item = each_array[$$index];

$$renderer.push(`<!---->`);
$$renderer.push(async () => $.escape(await item));
$$renderer.push(`<!---->`);
$$renderer.push(async () => $.escape(await item));
}
});

$$renderer.push(`<!--]-->`);
$$renderer.push(`<!--]-->`);
}
12 changes: 6 additions & 6 deletions ...velte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import 'svelte/internal/flags/async';
import * as $ from 'svelte/internal/server';

export default function Async_if_alternate_hoisting($$renderer) {
$$renderer.child(async ($$renderer) => {
$$renderer.child(async ($$renderer) => {
if ((await $.save(Promise.resolve(false)))()) {
$$renderer.push('<!--[-->');
$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
$$renderer.push('<!--[-->');
$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
} else {
$$renderer.push('<!--[!-->');
$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
$$renderer.push('<!--[!-->');
$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
}
});

$$renderer.push(`<!--]-->`);
$$renderer.push(`<!--]-->`);
}
12 changes: 6 additions & 6 deletions packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import 'svelte/internal/flags/async';
import * as $ from 'svelte/internal/server';

export default function Async_if_hoisting($$renderer) {
$$renderer.child(async ($$renderer) => {
$$renderer.child(async ($$renderer) => {
if ((await $.save(Promise.resolve(true)))()) {
$$renderer.push('<!--[-->');
$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
$$renderer.push('<!--[-->');
$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
} else {
$$renderer.push('<!--[!-->');
$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
$$renderer.push('<!--[!-->');
$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
}
});

$$renderer.push(`<!--]-->`);
$$renderer.push(`<!--]-->`);
}
4 changes: 2 additions & 2 deletions packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function Await_block_scope($$renderer) {
counter.count += 1;
}

$$renderer.push(`<button>clicks: ${$.escape(counter.count)}</button> `);
$$renderer.push(`<button>clicks: ${$.escape(counter.count)}</button> `);
$.await($$renderer, promise, () => {}, (counter) => {});
$$renderer.push(`<!--]--> ${$.escape(counter.count)}`);
$$renderer.push(`<!--]--> ${$.escape(counter.count)}`);
}
8 changes: 4 additions & 4 deletions ...ges/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as $ from 'svelte/internal/server';
import TextInput from './Child.svelte';

function snippet($$renderer) {
$$renderer.push(`<!---->Something`);
$$renderer.push(`<!---->Something`);
}

export default function Bind_component_snippet($$renderer) {
Expand All @@ -23,14 +23,14 @@ export default function Bind_component_snippet($$renderer) {
}
});

$$renderer.push(`<!----> value: ${$.escape(value)}`);
$$renderer.push(`<!----> value: ${$.escape(value)}`);
}

do {
$$settled = true;
$$inner_renderer = $$renderer.copy();
$$inner_renderer = $$renderer.copy();
$$render_inner($$inner_renderer);
} while (!$$settled);

$$renderer.subsume($$inner_renderer);
$$renderer.subsume($$inner_renderer);
}
2 changes: 1 addition & 1 deletion ...napshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as $ from 'svelte/internal/server';

export default function Class_state_field_constructor_assignment($$renderer, $$props) {
$$renderer.component(($$renderer) => {
$$renderer.component(($$renderer) => {
class Foo {
a = 0;
#b;
Expand Down
6 changes: 3 additions & 3 deletions ...sts/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as $ from 'svelte/internal/server';

export default function Delegated_locally_declared_shadowed($$renderer) {
$$renderer.push(`<!--[-->`);
$$renderer.push(`<!--[-->`);

const each_array = $.ensure_array_like({ length: 1 });

for (let index = 0, $$length = each_array.length; index < $$length; index++) {
$$renderer.push(`<button type="button"${$.attr('data-index', index)}>B</button>`);
$$renderer.push(`<button type="button"${$.attr('data-index', index)}>B</button>`);
}

$$renderer.push(`<!--]-->`);
$$renderer.push(`<!--]-->`);
}
2 changes: 1 addition & 1 deletion ...s/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ export default function Main($$renderer) {

let y = () => 'test';

$$renderer.push(`<div${$.attr('foobar', x)}></div> <svg${$.attr('viewBox', x)}></svg> <custom-element${$.attr('foobar', x)}></custom-element> <div${$.attr('foobar', y())}></div> <svg${$.attr('viewBox', y())}></svg> <custom-element${$.attr('foobar', y())}></custom-element>`);
$$renderer.push(`<div${$.attr('foobar', x)}></div> <svg${$.attr('viewBox', x)}></svg> <custom-element${$.attr('foobar', x)}></custom-element> <div${$.attr('foobar', y())}></div> <svg${$.attr('viewBox', y())}></svg> <custom-element${$.attr('foobar', y())}></custom-element>`);
}
6 changes: 3 additions & 3 deletions packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as $ from 'svelte/internal/server';

export default function Each_index_non_null($$renderer) {
$$renderer.push(`<!--[-->`);
$$renderer.push(`<!--[-->`);

const each_array = $.ensure_array_like(Array(10));

for (let i = 0, $$length = each_array.length; i < $$length; i++) {
$$renderer.push(`<p>index: ${$.escape(i)}</p>`);
$$renderer.push(`<p>index: ${$.escape(i)}</p>`);
}

$$renderer.push(`<!--]-->`);
$$renderer.push(`<!--]-->`);
}
6 changes: 3 additions & 3 deletions packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import * as $ from 'svelte/internal/server';

export default function Each_string_template($$renderer) {
$$renderer.push(`<!--[-->`);
$$renderer.push(`<!--[-->`);

const each_array = $.ensure_array_like(['foo', 'bar', 'baz']);

for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
let thing = each_array[$$index];

$$renderer.push(`<!---->${$.escape(thing)}, `);
$$renderer.push(`<!---->${$.escape(thing)}, `);
}

$$renderer.push(`<!--]-->`);
$$renderer.push(`<!--]-->`);
}
2 changes: 1 addition & 1 deletion ...es/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function Function_prop_no_getter($$renderer) {
onmouseenter: () => count = plusOne(count),

children: ($$renderer) => {
$$renderer.push(`<!---->clicks: ${$.escape(count)}`);
$$renderer.push(`<!---->clicks: ${$.escape(count)}`);
},

$$slots: { default: true }
Expand Down
2 changes: 1 addition & 1 deletion ...ages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as $ from 'svelte/internal/server';

export default function Functional_templating($$renderer) {
$$renderer.push(`<h1>hello</h1> <div class="potato"><p>child element</p> <p>another child element</p></div>`);
$$renderer.push(`<h1>hello</h1> <div class="potato"><p>child element</p> <p>another child element</p></div>`);
}
2 changes: 1 addition & 1 deletion packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as $ from 'svelte/internal/server';

export default function Hello_world($$renderer) {
$$renderer.push(`<h1>hello world</h1>`);
$$renderer.push(`<h1>hello world</h1>`);
}
2 changes: 1 addition & 1 deletion packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as $ from 'svelte/internal/server';

export default function Hmr($$renderer) {
$$renderer.push(`<h1>hello world</h1>`);
$$renderer.push(`<h1>hello world</h1>`);
}
2 changes: 1 addition & 1 deletion ...te/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ export default function Nullish_coallescence_omittance($$renderer) {
let name = 'world';
let count = 0;

$$renderer.push(`<h1>Hello, world!</h1> <b>123</b> <button>Count is ${$.escape(count)}</button> <h1>Hello, world</h1>`);
$$renderer.push(`<h1>Hello, world!</h1> <b>123</b> <button>Count is ${$.escape(count)}</button> <h1>Hello, world</h1>`);
}
2 changes: 1 addition & 1 deletion packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as $ from 'svelte/internal/server';

export default function Props_identifier($$renderer, $$props) {
$$renderer.component(($$renderer) => {
$$renderer.component(($$renderer) => {
let { $$slots, $$events, ...props } = $$props;

props.a;
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as $ from 'svelte/internal/server';

export default function Purity($$renderer) {
$$renderer.push(`<p>0</p> <p>${$.escape(location.href)}</p> `);
$$renderer.push(`<p>0</p> <p>${$.escape(location.href)}</p> `);
Child($$renderer, { prop: encodeURIComponent('hello') });
$$renderer.push(`<!---->`);
$$renderer.push(`<!---->`);
}
2 changes: 1 addition & 1 deletion packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ export default function State_proxy_literal($$renderer) {
tpl = ``;
}

$$renderer.push(`<input${$.attr('value', str)}/> <input${$.attr('value', tpl)}/> <button>reset</button>`);
$$renderer.push(`<input${$.attr('value', str)}/> <input${$.attr('value', tpl)}/> <button>reset</button>`);
}
Loading
Loading