Skip to content

Commit 6798efa

Browse files
chore: Rename Payload to Renderer (#16786)
1 parent fc35d9f commit 6798efa

File tree

46 files changed

+438
-436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+438
-436
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { TitleElement } from './visitors/TitleElement.js';
4040
import { UpdateExpression } from './visitors/UpdateExpression.js';
4141
import { VariableDeclaration } from './visitors/VariableDeclaration.js';
4242
import { SvelteBoundary } from './visitors/SvelteBoundary.js';
43-
import { call_child_payload, call_component_payload } from './visitors/shared/utils.js';
43+
import { call_child_renderer, call_component_renderer } from './visitors/shared/utils.js';
4444

4545
/** @type {Visitors} */
4646
const global_visitors = {
@@ -188,21 +188,21 @@ export function server_component(analysis, options) {
188188
template.body = [
189189
...snippets,
190190
b.let('$$settled', b.true),
191-
b.let('$$inner_payload'),
191+
b.let('$$inner_renderer'),
192192
b.function_declaration(
193193
b.id('$$render_inner'),
194-
[b.id('$$payload')],
194+
[b.id(' $$renderer')],
195195
b.block(/** @type {Statement[]} */ (rest))
196196
),
197197
b.do_while(
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_payload'), b.call('$$payload.copy'))),
202-
b.stmt(b.call('$$render_inner', b.id('$$inner_payload')))
201+
b.stmt(b.assignment('=', b.id('$$inner_renderer'), b.call(' $$renderer.copy'))),
202+
b.stmt(b.call('$$render_inner', b.id('$$inner_renderer')))
203203
])
204204
),
205-
b.stmt(b.call('$$payload.subsume', b.id('$$inner_payload')))
205+
b.stmt(b.call(' $$renderer.subsume', b.id('$$inner_renderer')))
206206
];
207207
}
208208

@@ -244,7 +244,7 @@ export function server_component(analysis, options) {
244244
]);
245245

246246
if (analysis.instance.has_await) {
247-
component_block = b.block([call_child_payload(component_block, true)]);
247+
component_block = b.block([call_child_renderer(component_block, true)]);
248248
}
249249

250250
// trick esrap into including comments
@@ -253,15 +253,15 @@ export function server_component(analysis, options) {
253253
if (analysis.props_id) {
254254
// need to be placed on first line of the component for hydration
255255
component_block.body.unshift(
256-
b.const(analysis.props_id, b.call('$.props_id', b.id('$$payload')))
256+
b.const(analysis.props_id, b.call('$.props_id', b.id(' $$renderer')))
257257
);
258258
}
259259

260260
let should_inject_context = dev || analysis.needs_context;
261261

262262
if (should_inject_context) {
263263
component_block = b.block([
264-
call_component_payload(component_block, dev && b.id(component_name))
264+
call_component_renderer(component_block, dev && b.id(component_name))
265265
]);
266266
}
267267

@@ -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('$$payload.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 =
@@ -315,7 +315,7 @@ export function server_component(analysis, options) {
315315

316316
const component_function = b.function_declaration(
317317
b.id(analysis.name),
318-
should_inject_props ? [b.id('$$payload'), b.id('$$props')] : [b.id('$$payload')],
318+
should_inject_props ? [b.id(' $$renderer'), b.id('$$props')] : [b.id(' $$renderer')],
319319
component_block
320320
);
321321

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/** @import { AST } from '#compiler' */
33
/** @import { ComponentContext } from '../types.js' */
44
import * as b from '#compiler/builders';
5-
import { block_close, call_child_payload } from './shared/utils.js';
5+
import { block_close, call_child_renderer } from './shared/utils.js';
66

77
/**
88
* @param {AST.AwaitBlock} node
@@ -13,7 +13,7 @@ export function AwaitBlock(node, context) {
1313
let statement = b.stmt(
1414
b.call(
1515
'$.await',
16-
b.id('$$payload'),
16+
b.id(' $$renderer'),
1717
/** @type {Expression} */ (context.visit(node.expression)),
1818
b.thunk(
1919
node.pending ? /** @type {BlockStatement} */ (context.visit(node.pending)) : b.block([])
@@ -26,7 +26,7 @@ export function AwaitBlock(node, context) {
2626
);
2727

2828
if (node.metadata.expression.has_await) {
29-
statement = call_child_payload(b.block([statement]), true);
29+
statement = call_child_renderer(b.block([statement]), true);
3030
}
3131

3232
context.state.template.push(statement, block_close);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/** @import { AST } from '#compiler' */
33
/** @import { ComponentContext } from '../types.js' */
44
import * as b from '#compiler/builders';
5-
import { block_close, block_open, block_open_else, call_child_payload } from './shared/utils.js';
5+
import { block_close, block_open, block_open_else, call_child_renderer } from './shared/utils.js';
66

77
/**
88
* @param {AST.EachBlock} node
@@ -45,11 +45,11 @@ export function EachBlock(node, context) {
4545
);
4646

4747
if (node.fallback) {
48-
const open = b.stmt(b.call(b.id('$$payload.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('$$payload.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(
@@ -64,7 +64,7 @@ export function EachBlock(node, context) {
6464
}
6565

6666
if (node.metadata.expression.has_await) {
67-
state.template.push(call_child_payload(block, true), block_close);
67+
state.template.push(call_child_renderer(block, true), block_close);
6868
} else {
6969
state.template.push(...block.body, block_close);
7070
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/** @import { AST } from '#compiler' */
33
/** @import { ComponentContext } from '../types.js' */
44
import * as b from '#compiler/builders';
5-
import { block_close, block_open, block_open_else, call_child_payload } from './shared/utils.js';
5+
import { block_close, block_open, block_open_else, call_child_renderer } from './shared/utils.js';
66

77
/**
88
* @param {AST.IfBlock} node
@@ -16,15 +16,15 @@ 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('$$payload.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('$$payload.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);
2525

2626
if (node.metadata.expression.has_await) {
27-
statement = call_child_payload(b.block([statement]), true);
27+
statement = call_child_renderer(b.block([statement]), true);
2828
}
2929

3030
context.state.template.push(statement, block_close);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
process_children,
1313
build_template,
1414
build_attribute_value,
15-
call_child_payload
15+
call_child_renderer
1616
} from './shared/utils.js';
1717

1818
/**
@@ -68,7 +68,7 @@ export function RegularElement(node, context) {
6868
b.stmt(
6969
b.call(
7070
'$.push_element',
71-
b.id('$$payload'),
71+
b.id(' $$renderer'),
7272
b.literal(node.name),
7373
b.literal(location.line),
7474
b.literal(location.column)
@@ -97,7 +97,7 @@ export function RegularElement(node, context) {
9797
b.stmt(
9898
b.assignment(
9999
'=',
100-
b.id('$$payload.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('$$payload.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)))
@@ -160,7 +160,7 @@ export function RegularElement(node, context) {
160160
b.stmt(
161161
b.call(
162162
'$.simple_valueless_option',
163-
b.id('$$payload'),
163+
b.id(' $$renderer'),
164164
b.thunk(
165165
node.metadata.synthetic_value_node.expression,
166166
node.metadata.synthetic_value_node.metadata.expression.has_await
@@ -175,9 +175,9 @@ export function RegularElement(node, context) {
175175
b.stmt(
176176
b.call(
177177
'$.valueless_option',
178-
b.id('$$payload'),
178+
b.id(' $$renderer'),
179179
b.arrow(
180-
[b.id('$$payload')],
180+
[b.id(' $$renderer')],
181181
b.block([...inner_state.init, ...build_template(inner_state.template)])
182182
)
183183
)
@@ -216,7 +216,7 @@ export function RegularElement(node, context) {
216216
// element hadn't resolved prior to hitting the second element.
217217
const elements = state.template.splice(template_start, Infinity);
218218
state.template.push(
219-
call_child_payload(b.block(build_template(elements)), select_with_value_async)
219+
call_child_renderer(b.block(build_template(elements)), select_with_value_async)
220220
);
221221
}
222222

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function RenderTag(node, context) {
2323
b.stmt(
2424
(node.expression.type === 'CallExpression' ? b.call : b.maybe_call)(
2525
snippet_function,
26-
b.id('$$payload'),
26+
b.id(' $$renderer'),
2727
...snippet_args
2828
)
2929
)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
empty_comment,
77
build_attribute_value,
88
PromiseOptimiser,
9-
call_child_payload
9+
call_child_renderer
1010
} from './shared/utils.js';
1111

1212
/**
@@ -57,7 +57,7 @@ export function SlotElement(node, context) {
5757

5858
const slot = b.call(
5959
'$.slot',
60-
b.id('$$payload'),
60+
b.id(' $$renderer'),
6161
b.id('$$props'),
6262
name,
6363
props_expression,
@@ -66,7 +66,7 @@ export function SlotElement(node, context) {
6666

6767
const statement =
6868
optimiser.expressions.length > 0
69-
? call_child_payload(b.block([optimiser.apply(), b.stmt(slot)]), true)
69+
? call_child_renderer(b.block([optimiser.apply(), b.stmt(slot)]), true)
7070
: b.stmt(slot);
7171

7272
context.state.template.push(empty_comment, statement, empty_comment);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import * as b from '#compiler/builders';
1111
export function SnippetBlock(node, context) {
1212
let fn = b.function_declaration(
1313
node.expression,
14-
[b.id('$$payload'), ...node.parameters],
14+
[b.id(' $$renderer'), ...node.parameters],
1515
/** @type {BlockStatement} */ (context.visit(node.body))
1616
);
1717

@@ -21,7 +21,7 @@ export function SnippetBlock(node, context) {
2121
const statements = node.metadata.can_hoist ? context.state.hoisted : context.state.init;
2222

2323
if (dev) {
24-
fn.body.body.unshift(b.stmt(b.call('$.validate_snippet_args', b.id('$$payload'))));
24+
fn.body.body.unshift(b.stmt(b.call('$.validate_snippet_args', b.id(' $$renderer'))));
2525
statements.push(b.stmt(b.call('$.prevent_snippet_stringification', fn.id)));
2626
}
2727

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export function SvelteBoundary(node, context) {
2424
const pending = pending_attribute
2525
? b.call(
2626
build_attribute_value(pending_attribute.value, context, false, true),
27-
b.id('$$payload')
27+
b.id(' $$renderer')
2828
)
2929
: /** @type {BlockStatement} */ (context.visit(pending_snippet.body));
3030

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export function SvelteElement(node, context) {
4545
b.stmt(
4646
b.call(
4747
'$.push_element',
48-
b.id('$$payload'),
48+
b.id(' $$renderer'),
4949
tag,
5050
b.literal(location.line),
5151
b.literal(location.column)
@@ -61,7 +61,7 @@ export function SvelteElement(node, context) {
6161
b.stmt(
6262
b.call(
6363
'$.element',
64-
b.id('$$payload'),
64+
b.id(' $$renderer'),
6565
tag,
6666
attributes.body.length > 0 && b.thunk(attributes),
6767
children.body.length > 0 && b.thunk(children)

0 commit comments

Comments
 (0)