Skip to content

fix: improve code generation #10156

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
Jan 11, 2024
Merged

fix: improve code generation #10156

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
ec57acd
fix: improve code generation
trueadm Jan 11, 2024
ab4d0ab
format
trueadm Jan 11, 2024
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
5 changes: 5 additions & 0 deletions .changeset/odd-buckets-lie.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: improve code generation
25 changes: 18 additions & 7 deletions packages/svelte/src/compiler/phases/3-transform/client/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,10 @@ function is_expression_async(expression) {
* @param {import('estree').AssignmentExpression} node
* @param {import('zimmerframe').Context<import('#compiler').SvelteNode, State>} context
* @param {() => any} fallback
* @param {{skip_proxy_and_freeze?: boolean}} [options]
* @returns {import('estree').Expression}
*/
export function serialize_set_binding(node, context, fallback) {
export function serialize_set_binding(node, context, fallback, options) {
const { state, visit } = context;

if (
Expand All @@ -242,7 +243,7 @@ export function serialize_set_binding(node, context, fallback) {
const value = path.expression?.(b.id(tmp_id));
const assignment = b.assignment('=', path.node, value);
original_assignments.push(assignment);
assignments.push(serialize_set_binding(assignment, context, () => assignment));
assignments.push(serialize_set_binding(assignment, context, () => assignment, options));
}

if (assignments.every((assignment, i) => assignment === original_assignments[i])) {
Expand Down Expand Up @@ -288,7 +289,11 @@ export function serialize_set_binding(node, context, fallback) {
if (private_state !== undefined) {
if (state.in_constructor) {
// See if we should wrap value in $.proxy
if (context.state.analysis.runes && should_proxy_or_freeze(value)) {
if (
context.state.analysis.runes &&
!options?.skip_proxy_and_freeze &&
should_proxy_or_freeze(value)
) {
const assignment = fallback();
if (assignment.type === 'AssignmentExpression') {
assignment.right =
Expand All @@ -302,7 +307,9 @@ export function serialize_set_binding(node, context, fallback) {
return b.call(
'$.set',
left,
context.state.analysis.runes && should_proxy_or_freeze(value)
context.state.analysis.runes &&
!options?.skip_proxy_and_freeze &&
should_proxy_or_freeze(value)
? private_state.kind === 'frozen_state'
? b.call('$.freeze', value)
: b.call('$.proxy', value)
Expand All @@ -321,6 +328,7 @@ export function serialize_set_binding(node, context, fallback) {
if (
context.state.analysis.runes &&
public_state !== undefined &&
!options?.skip_proxy_and_freeze &&
should_proxy_or_freeze(value)
) {
const assignment = fallback();
Expand Down Expand Up @@ -387,15 +395,19 @@ export function serialize_set_binding(node, context, fallback) {
return b.call(
'$.set',
b.id(left_name),
context.state.analysis.runes && should_proxy_or_freeze(value)
context.state.analysis.runes &&
!options?.skip_proxy_and_freeze &&
should_proxy_or_freeze(value)
? b.call('$.proxy', value)
: value
);
} else if (binding.kind === 'frozen_state') {
return b.call(
'$.set',
b.id(left_name),
context.state.analysis.runes && should_proxy_or_freeze(value)
context.state.analysis.runes &&
!options?.skip_proxy_and_freeze &&
should_proxy_or_freeze(value)
? b.call('$.freeze', value)
: value
);
Expand Down Expand Up @@ -624,6 +636,5 @@ export function should_proxy_or_freeze(node) {
) {
return false;
}

return true;
}
5 changes: 4 additions & 1 deletion packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2604,7 +2604,10 @@ export const template_visitors = {
serialize_set_binding(
assignment,
context,
() => /** @type {import('estree').Expression} */ (context.visit(assignment))
() => /** @type {import('estree').Expression} */ (context.visit(assignment)),
{
skip_proxy_and_freeze: true
}
)
);

Expand Down
4 changes: 2 additions & 2 deletions packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export default function State_proxy_literal($$anchor, $$props) {

var button = $.sibling($.sibling(input));

$.bind_value(node, () => $.get(str), ($$value) => $.set(str, $.proxy($$value)));
$.bind_value(input, () => $.get(tpl), ($$value) => $.set(tpl, $.proxy($$value)));
$.bind_value(node, () => $.get(str), ($$value) => $.set(str, $$value));
$.bind_value(input, () => $.get(tpl), ($$value) => $.set(tpl, $$value));
button.__click = [reset, str, tpl];
$.close_frag($$anchor, fragment);
$.pop();
Expand Down