Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/modern-terms-refuse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: handle default parameters scope leaks
23 changes: 10 additions & 13 deletions packages/svelte/src/compiler/phases/scope.js
Original file line number Diff line number Diff line change
Expand Up @@ -1098,33 +1098,27 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
},

FunctionExpression(node, { state, next }) {
const scope = state.scope.child();
const scope = state.scope.child(true);
scopes.set(node, scope);

if (node.id) {
scopes.set(node.id, state.scope); // so that declarations within with the same name are not confused with the function name
scope.declare(node.id, 'normal', 'function');
}
if (node.id) scope.declare(node.id, 'normal', 'function');

add_params(scope, node.params);
next({ scope });
},

FunctionDeclaration(node, { state, next }) {
if (node.id) {
scopes.set(node.id, state.scope); // so that declarations within with the same name are not confused with the function name
state.scope.declare(node.id, 'normal', 'function', node);
}
if (node.id) state.scope.declare(node.id, 'normal', 'function', node);

const scope = state.scope.child();
const scope = state.scope.child(true);
scopes.set(node, scope);

add_params(scope, node.params);
next({ scope });
},

ArrowFunctionExpression(node, { state, next }) {
const scope = state.scope.child();
const scope = state.scope.child(true);
scopes.set(node, scope);

add_params(scope, node.params);
Expand All @@ -1142,8 +1136,11 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
parent?.type === 'FunctionExpression' ||
parent?.type === 'ArrowFunctionExpression'
) {
// We already created a new scope for the function
context.next();
// The scopes created for the function nodes above handle the function identifier and
// parameters, but the block statement itself holds the non-porous function scope
const scope = context.state.scope.child();
scopes.set(node, scope);
context.next({ scope });
} else {
create_block_scope(node, context);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { test } from '../../test';

export default test({
test({ assert, logs }) {
assert.deepEqual(logs, [42, 43]);
}
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<script>
let value = $state(42);

function shadow(output = value) {
const value = 1337;
return output;
}

console.log(shadow());
value += 1;
console.log(shadow());
</script>