Skip to content

Commit dc7da40

Browse files
authored
chore: fix more wacky compiler output (#16794)
* chore: fix more wacky compiler output * update tests
1 parent 4616422 commit dc7da40

File tree

26 files changed

+66
-66
lines changed

26 files changed

+66
-66
lines changed

packages/svelte/src/compiler/phases/3-transform/server/transform-server.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@ export function server_component(analysis, options) {
198198
b.unary('!', b.id('$$settled')),
199199
b.block([
200200
b.stmt(b.assignment('=', b.id('$$settled'), b.true)),
201-
b.stmt(b.assignment('=', b.id('$$inner_renderer'), b.call(' $$renderer.copy'))),
201+
b.stmt(b.assignment('=', b.id('$$inner_renderer'), b.call('$$renderer.copy'))),
202202
b.stmt(b.call('$$render_inner', b.id('$$inner_renderer')))
203203
])
204204
),
205-
b.stmt(b.call(' $$renderer.subsume', b.id('$$inner_renderer')))
205+
b.stmt(b.call('$$renderer.subsume', b.id('$$inner_renderer')))
206206
];
207207
}
208208

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

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

307307
let should_inject_props =

packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ export function EachBlock(node, context) {
4545
);
4646

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

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

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

5454
block.body.push(
5555
b.if(

packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ export function IfBlock(node, context) {
1616
? /** @type {BlockStatement} */ (context.visit(node.alternate))
1717
: b.block([]);
1818

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

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

2323
/** @type {Statement} */
2424
let statement = b.if(test, consequent, alternate);

packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export function RegularElement(node, context) {
9797
b.stmt(
9898
b.assignment(
9999
'=',
100-
b.id(' $$renderer.local.select_value'),
100+
b.id('$$renderer.local.select_value'),
101101
b.member(
102102
build_spread_object(
103103
node,
@@ -125,7 +125,7 @@ export function RegularElement(node, context) {
125125
);
126126
}
127127

128-
const left = b.id(' $$renderer.local.select_value');
128+
const left = b.id('$$renderer.local.select_value');
129129
if (value.type === 'Attribute') {
130130
state.template.push(
131131
b.stmt(b.assignment('=', left, build_attribute_value(value.value, context)))

packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export function process_children(nodes, { visit, state }) {
8080
flush();
8181
const visited = /** @type {Expression} */ (visit(node.expression));
8282
state.template.push(
83-
b.stmt(b.call(' $$renderer.push', b.thunk(b.call('$.escape', visited), true)))
83+
b.stmt(b.call('$$renderer.push', b.thunk(b.call('$.escape', visited), true)))
8484
);
8585
} else if (node.type === 'Text' || node.type === 'Comment' || node.type === 'ExpressionTag') {
8686
sequence.push(node);
@@ -119,7 +119,7 @@ export function build_template(template) {
119119
statements.push(
120120
b.stmt(
121121
b.call(
122-
b.id(' $$renderer.push'),
122+
b.id('$$renderer.push'),
123123
b.template(
124124
strings.map((cooked, i) => b.quasi(cooked, i === strings.length - 1)),
125125
expressions
@@ -267,7 +267,7 @@ export function build_getter(node, state) {
267267
* @returns {Statement}
268268
*/
269269
export function call_child_renderer(body, async) {
270-
return b.stmt(b.call(' $$renderer.child', b.arrow([b.id('$$renderer')], body, async)));
270+
return b.stmt(b.call('$$renderer.child', b.arrow([b.id('$$renderer')], body, async)));
271271
}
272272

273273
/**
@@ -277,7 +277,7 @@ export function call_child_renderer(body, async) {
277277
*/
278278
export function call_component_renderer(body, component_fn_id) {
279279
return b.stmt(
280-
b.call(' $$renderer.component', b.arrow([b.id('$$renderer')], body, false), component_fn_id)
280+
b.call('$$renderer.component', b.arrow([b.id('$$renderer')], body, false), component_fn_id)
281281
);
282282
}
283283

packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ import 'svelte/internal/flags/async';
22
import * as $ from 'svelte/internal/server';
33

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

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

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

14-
$$renderer.push(`<!---->`);
15-
$$renderer.push(async () => $.escape(await Promise.reject('This should never be reached')));
14+
$$renderer.push(`<!---->`);
15+
$$renderer.push(async () => $.escape(await Promise.reject('This should never be reached')));
1616
}
1717
} else {
18-
$$renderer.push('<!--[!-->');
19-
$$renderer.push(`<!---->`);
20-
$$renderer.push(async () => $.escape(await Promise.resolve(4)));
18+
$$renderer.push('<!--[!-->');
19+
$$renderer.push(`<!---->`);
20+
$$renderer.push(async () => $.escape(await Promise.resolve(4)));
2121
}
2222
});
2323

24-
$$renderer.push(`<!--]-->`);
24+
$$renderer.push(`<!--]-->`);
2525
}

packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ export default function Async_each_hoisting($$renderer) {
66
const second = Promise.resolve(2);
77
const third = Promise.resolve(3);
88

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

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

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

17-
$$renderer.push(`<!---->`);
18-
$$renderer.push(async () => $.escape(await item));
17+
$$renderer.push(`<!---->`);
18+
$$renderer.push(async () => $.escape(await item));
1919
}
2020
});
2121

22-
$$renderer.push(`<!--]-->`);
22+
$$renderer.push(`<!--]-->`);
2323
}

packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import 'svelte/internal/flags/async';
22
import * as $ from 'svelte/internal/server';
33

44
export default function Async_if_alternate_hoisting($$renderer) {
5-
$$renderer.child(async ($$renderer) => {
5+
$$renderer.child(async ($$renderer) => {
66
if ((await $.save(Promise.resolve(false)))()) {
7-
$$renderer.push('<!--[-->');
8-
$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
7+
$$renderer.push('<!--[-->');
8+
$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
99
} else {
10-
$$renderer.push('<!--[!-->');
11-
$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
10+
$$renderer.push('<!--[!-->');
11+
$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
1212
}
1313
});
1414

15-
$$renderer.push(`<!--]-->`);
15+
$$renderer.push(`<!--]-->`);
1616
}

packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import 'svelte/internal/flags/async';
22
import * as $ from 'svelte/internal/server';
33

44
export default function Async_if_hoisting($$renderer) {
5-
$$renderer.child(async ($$renderer) => {
5+
$$renderer.child(async ($$renderer) => {
66
if ((await $.save(Promise.resolve(true)))()) {
7-
$$renderer.push('<!--[-->');
8-
$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
7+
$$renderer.push('<!--[-->');
8+
$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
99
} else {
10-
$$renderer.push('<!--[!-->');
11-
$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
10+
$$renderer.push('<!--[!-->');
11+
$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
1212
}
1313
});
1414

15-
$$renderer.push(`<!--]-->`);
15+
$$renderer.push(`<!--]-->`);
1616
}

packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default function Await_block_scope($$renderer) {
88
counter.count += 1;
99
}
1010

11-
$$renderer.push(`<button>clicks: ${$.escape(counter.count)}</button> `);
11+
$$renderer.push(`<button>clicks: ${$.escape(counter.count)}</button> `);
1212
$.await($$renderer, promise, () => {}, (counter) => {});
13-
$$renderer.push(`<!--]--> ${$.escape(counter.count)}`);
13+
$$renderer.push(`<!--]--> ${$.escape(counter.count)}`);
1414
}

0 commit comments

Comments
 (0)