Skip to content

chore: improve should_proxy_or_freeze logic internally #10249

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 1 commit into from
Jan 20, 2024
Merged

chore: improve should_proxy_or_freeze logic internally #10249

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
5 changes: 5 additions & 0 deletions .changeset/angry-plums-punch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"svelte": patch
---

chore: improve should_proxy_or_freeze logic internally
32 changes: 25 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 @@ -293,7 +293,7 @@ export function serialize_set_binding(node, context, fallback, options) {
if (
context.state.analysis.runes &&
!options?.skip_proxy_and_freeze &&
should_proxy_or_freeze(value)
should_proxy_or_freeze(value, context.state.scope)
) {
const assignment = fallback();
if (assignment.type === 'AssignmentExpression') {
Expand All @@ -310,7 +310,7 @@ export function serialize_set_binding(node, context, fallback, options) {
left,
context.state.analysis.runes &&
!options?.skip_proxy_and_freeze &&
should_proxy_or_freeze(value)
should_proxy_or_freeze(value, context.state.scope)
? private_state.kind === 'frozen_state'
? b.call('$.freeze', value)
: b.call('$.proxy', value)
Expand All @@ -330,7 +330,7 @@ export function serialize_set_binding(node, context, fallback, options) {
context.state.analysis.runes &&
public_state !== undefined &&
!options?.skip_proxy_and_freeze &&
should_proxy_or_freeze(value)
should_proxy_or_freeze(value, context.state.scope)
) {
const assignment = fallback();
if (assignment.type === 'AssignmentExpression') {
Expand Down Expand Up @@ -398,7 +398,7 @@ export function serialize_set_binding(node, context, fallback, options) {
b.id(left_name),
context.state.analysis.runes &&
!options?.skip_proxy_and_freeze &&
should_proxy_or_freeze(value)
should_proxy_or_freeze(value, context.state.scope)
? b.call('$.proxy', value)
: value
);
Expand All @@ -408,7 +408,7 @@ export function serialize_set_binding(node, context, fallback, options) {
b.id(left_name),
context.state.analysis.runes &&
!options?.skip_proxy_and_freeze &&
should_proxy_or_freeze(value)
should_proxy_or_freeze(value, context.state.scope)
? b.call('$.freeze', value)
: value
);
Expand Down Expand Up @@ -623,8 +623,11 @@ export function get_prop_source(binding, state, name, initial) {
return b.call('$.prop', ...args);
}

/** @param {import('estree').Expression} node */
export function should_proxy_or_freeze(node) {
/**
* @param {import('estree').Expression} node
* @param {import("../../scope.js").Scope | null} scope
*/
export function should_proxy_or_freeze(node, scope) {
if (
!node ||
node.type === 'Literal' ||
Expand All @@ -637,5 +640,20 @@ export function should_proxy_or_freeze(node) {
) {
return false;
}
if (node.type === 'Identifier' && scope !== null) {
const binding = scope.get(node.name);
// Let's see if the reference is something that can be proxied or frozen
if (
binding !== null &&
!binding.reassigned &&
binding.initial !== null &&
binding.initial.type !== 'FunctionDeclaration' &&
binding.initial.type !== 'ClassDeclaration' &&
binding.initial.type !== 'ImportDeclaration' &&
binding.initial.type !== 'EachBlock'
) {
return should_proxy_or_freeze(binding.initial, null);
}
}
return true;
}
9 changes: 6 additions & 3 deletions packages/svelte/src/compiler/phases/3-transform/client/visitors/javascript-runes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,14 @@ export const javascript_visitors_runes = {

value =
field.kind === 'state'
? b.call('$.source', should_proxy_or_freeze(init) ? b.call('$.proxy', init) : init)
? b.call(
'$.source',
should_proxy_or_freeze(init, state.scope) ? b.call('$.proxy', init) : init
)
: field.kind === 'frozen_state'
? b.call(
'$.source',
should_proxy_or_freeze(init) ? b.call('$.freeze', init) : init
should_proxy_or_freeze(init, state.scope) ? b.call('$.freeze', init) : init
)
: b.call('$.derived', b.thunk(init));
} else {
Expand Down Expand Up @@ -238,7 +241,7 @@ export const javascript_visitors_runes = {
*/
const create_state_declarator = (id, value) => {
const binding = /** @type {import('#compiler').Binding} */ (state.scope.get(id.name));
if (should_proxy_or_freeze(value)) {
if (should_proxy_or_freeze(value, state.scope)) {
value = b.call(rune === '$state' ? '$.proxy' : '$.freeze', value);
}
if (is_state_source(binding, state)) {
Expand Down