fix: improve code generation

.changeset/odd-buckets-lie.md

@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: improve code generation

packages/svelte/src/compiler/phases/3-transform/client/utils.js

@@ -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 (
@@ -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])) {
@@ -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 =
@@ -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)
@@ -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();
@@ -387,7 +395,9 @@ 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
 				);
@@ -395,7 +405,9 @@ 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('$.freeze', value)
 						: value
 				);
@@ -624,6 +636,5 @@ export function should_proxy_or_freeze(node) {
 	) {
 		return false;
 	}
-
 	return true;
 }

packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js

@@ -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,
+				}
 			)
 		);
 

packages/svelte/tests/parser-legacy/samples/action-duplicate/output.json

@@ -31,4 +31,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/action-with-call/output.json

@@ -73,4 +73,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/action-with-identifier/output.json

@@ -38,4 +38,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/action-with-literal/output.json

@@ -39,4 +39,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/action/output.json

@@ -23,4 +23,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/animation/output.json

@@ -76,4 +76,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-class-directive/output.json

@@ -38,4 +38,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-containing-solidus/output.json

@@ -38,4 +38,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-curly-bracket/output.json

@@ -52,4 +52,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-dynamic-boolean/output.json

@@ -44,4 +44,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-dynamic/output.json

@@ -80,4 +80,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-empty/output.json

@@ -105,4 +105,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-escaped/output.json

@@ -30,4 +30,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-multiple/output.json

@@ -45,4 +45,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-shorthand/output.json

@@ -34,4 +34,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-static-boolean/output.json

@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-static/output.json

@@ -30,4 +30,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-style-directive-modifiers/output.json

@@ -15,7 +15,9 @@
 						"end": 36,
 						"type": "StyleDirective",
 						"name": "color",
-						"modifiers": ["important"],
+						"modifiers": [
+							"important"
+						],
 						"value": [
 							{
 								"type": "MustacheTag",
@@ -45,4 +47,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-style-directive-shorthand/output.json

@@ -23,4 +23,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-style-directive-string/output.json

@@ -359,4 +359,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-style-directive/output.json

@@ -45,4 +45,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-style/output.json

@@ -38,4 +38,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-unquoted/output.json

@@ -30,4 +30,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/attribute-with-whitespace/output.json

@@ -46,4 +46,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/await-catch/output.json

@@ -171,4 +171,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/await-then-catch/output.json

@@ -228,4 +228,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json

@@ -109,4 +109,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/binding/output.json

@@ -119,4 +119,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/comment-with-ignores/output.json

@@ -9,8 +9,11 @@
 				"start": 0,
 				"end": 30,
 				"data": " svelte-ignore foo bar ",
-				"ignores": ["foo", "bar"]
+				"ignores": [
+					"foo",
+					"bar"
+				]
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/comment/output.json

@@ -13,4 +13,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/component-dynamic/output.json

@@ -77,4 +77,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/convert-entities-in-element/output.json

@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/convert-entities/output.json

@@ -13,4 +13,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/css/output.json

@@ -81,4 +81,4 @@
 			"styles": "\n\tdiv {\n\t\tcolor: red;\n\t}\n"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/dynamic-element-string/output.json

@@ -47,4 +47,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/dynamic-element-variable/output.json

@@ -77,4 +77,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json

@@ -479,4 +479,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/each-block-destructured/output.json

@@ -265,4 +265,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/each-block-else/output.json

@@ -88,4 +88,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/each-block-indexed/output.json

@@ -94,4 +94,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/each-block-keyed/output.json

@@ -114,4 +114,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/each-block/output.json

@@ -65,4 +65,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/element-with-attribute-empty-string/output.json

@@ -61,4 +61,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/element-with-attribute/output.json

@@ -61,4 +61,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/element-with-mustache/output.json

@@ -50,4 +50,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/element-with-text/output.json

@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/elements/output.json

@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/event-handler/output.json

@@ -161,4 +161,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/if-block-else/output.json

@@ -68,4 +68,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/if-block-elseif/output.json

@@ -158,4 +158,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/if-block/output.json

@@ -36,4 +36,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/implicitly-closed-li/output.json

@@ -70,4 +70,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json

@@ -295,4 +295,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/nbsp/output.json

@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/no-error-if-before-closing/output.json

@@ -265,4 +265,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/raw-mustaches/output.json

@@ -78,4 +78,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/refs/output.json

@@ -119,4 +119,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json

@@ -147,4 +147,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json

@@ -52,4 +52,4 @@
 			]
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/output.json

@@ -175,4 +175,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/script/output.json

@@ -147,4 +147,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/self-closing-element/output.json

@@ -14,4 +14,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/self-reference/output.json

@@ -133,4 +133,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/slotted-element/output.json

@@ -39,4 +39,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/space-between-mustaches/output.json

@@ -106,4 +106,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/spread/output.json

@@ -36,4 +36,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/style-inside-head/output.json

@@ -30,4 +30,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/textarea-children/output.json

@@ -50,4 +50,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/textarea-end-tag/output.json

@@ -50,4 +50,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/transition-intro-no-params/output.json

@@ -33,4 +33,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/transition-intro/output.json

@@ -101,4 +101,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/unusual-identifier/output.json

@@ -65,4 +65,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json

@@ -147,4 +147,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/whitespace-after-style-tag/output.json

@@ -81,4 +81,4 @@
 			"styles": "\n\tdiv {\n\t\tcolor: red;\n\t}\n"
 		}
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/whitespace-leading-trailing/output.json

@@ -29,4 +29,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-legacy/samples/whitespace-normal/output.json

@@ -75,4 +75,4 @@
 			}
 		]
 	}
-}
+}

packages/svelte/tests/parser-modern/samples/comment-before-script/output.json

@@ -129,4 +129,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json

@@ -907,4 +907,4 @@
 		"transparent": false
 	},
 	"options": null
-}
+}

packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json

@@ -327,4 +327,4 @@
 		"transparent": false
 	},
 	"options": null
-}
+}

packages/svelte/tests/parser-modern/samples/each-block-object-pattern/output.json

@@ -314,4 +314,4 @@
 		"transparent": false
 	},
 	"options": null
-}
+}

packages/svelte/tests/parser-modern/samples/snippets/output.json

@@ -171,4 +171,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json

@@ -479,4 +479,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}

packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js

@@ -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();