msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

fix: include wrapping parentheses in `{@const}` declarator end (#18436)

Browse Source 
`{@const x = (a)}` (and any `{@const}` whose initializer is wrapped in
parentheses, e.g. `(a = b)`, `({ ... })`) produced a
`VariableDeclarator` whose `end` fell before the closing `)`.
`read_expression` strips the wrapping parens from the returned node but
advances the parser past them, so `init.end` excludes the `)` while the
parser position does not. Use the parser position for the declarator
`end` instead. Fixes source slices / tooling that rely on the node range
(the range previously yielded invalid, unbalanced source).

<img width="2064" height="1746" alt="image"
src="https://github.com/user-attachments/assets/64153ee5-d543-442d-8018-d3668acfd7a7"
/>


### Before submitting the PR, please make sure you do the following

- [x] It's really useful if your PR references an issue where it is
discussed ahead of time. In many cases, features are absent for a
reason. For large changes, please create an RFC:
https://github.com/sveltejs/rfcs
- [x] Prefix your PR title with `feat:`, `fix:`, `chore:`, or `docs:`.
- [x] This message body should clearly illustrate what problems it
solves.
- [x] Ideally, include a test that fails without this PR but passes with
it.
- [x] If this PR changes code within `packages/svelte/src`, add a
changeset (`npx changeset`).

### Tests and linting

- [ ] Run the tests with `pnpm test` and lint the project with `pnpm
lint`
pull/18143/merge
Yuichiro Yamashita 3 weeks ago committed by GitHub
parent 0510174bc0
commit c4daa490bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 543 additions and 1 deletions
Show Stats Download Patch File Download Diff File

5
.changeset/clean-melons-attack.md
Unescape View File

@ -0,0 +1,5 @@
---
'svelte': patch
---
fix: include wrapping parentheses in `{@const}` declarator `end` position

6
packages/svelte/src/compiler/phases/1-parse/state/tag.js
Unescape View File

@ -783,6 +783,8 @@ function special(parser) {
const expression_start = parser.index;
const init = read_expression(parser);
// parser is past wrapping parens, but `init.end` is not — use the parser position
const declarator_end = parser.index;
if (
init.type === 'SequenceExpression' &&
!parser.template.substring(expression_start, init.start).includes('(')
@ -801,7 +803,9 @@ function special(parser) {
declaration: {
type: 'VariableDeclaration',
kind: 'const',
declarations: [{ type: 'VariableDeclarator', id, init, start: id.start, end: init.end }],
declarations: [
{ type: 'VariableDeclarator', id, init, start: id.start, end: declarator_end }
],
start: start + 2, // start at const, not at @const
end: parser.index - 1
},

6
packages/svelte/tests/parser-modern/samples/const-tag-parenthesized-init/input.svelte
Unescape View File

@ -0,0 +1,6 @@
{#each items as item}
{@const x = (item.value)}
{@const y = (a = item.n)}
{@const z = ({ a: item.a })}
{x}{y}{z.a}
{/each}

527
packages/svelte/tests/parser-modern/samples/const-tag-parenthesized-init/output.json
Unescape View File

@ -0,0 +1,527 @@
{
"css": null,
"js": [],
"start": 0,
"end": 126,
"type": "Root",
"fragment": {
"type": "Fragment",
"nodes": [
{
"type": "EachBlock",
"start": 0,
"end": 126,
"expression": {
"type": "Identifier",
"start": 7,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 7
},
"end": {
"line": 1,
"column": 12
}
},
"name": "items"
},
"body": {
"type": "Fragment",
"nodes": [
{
"type": "Text",
"start": 21,
"end": 23,
"raw": "\n\t",
"data": "\n\t"
},
{
"type": "ConstTag",
"start": 23,
"end": 48,
"declaration": {
"type": "VariableDeclaration",
"kind": "const",
"declarations": [
{
"type": "VariableDeclarator",
"id": {
"type": "Identifier",
"name": "x",
"start": 31,
"end": 32,
"loc": {
"start": {
"line": 2,
"column": 9,
"character": 31
},
"end": {
"line": 2,
"column": 10,
"character": 32
}
}
},
"init": {
"type": "MemberExpression",
"start": 36,
"end": 46,
"loc": {
"start": {
"line": 2,
"column": 14
},
"end": {
"line": 2,
"column": 24
}
},
"object": {
"type": "Identifier",
"start": 36,
"end": 40,
"loc": {
"start": {
"line": 2,
"column": 14
},
"end": {
"line": 2,
"column": 18
}
},
"name": "item"
},
"property": {
"type": "Identifier",
"start": 41,
"end": 46,
"loc": {
"start": {
"line": 2,
"column": 19
},
"end": {
"line": 2,
"column": 24
}
},
"name": "value"
},
"computed": false,
"optional": false
},
"start": 31,
"end": 47
}
],
"start": 25,
"end": 47
}
},
{
"type": "Text",
"start": 48,
"end": 50,
"raw": "\n\t",
"data": "\n\t"
},
{
"type": "ConstTag",
"start": 50,
"end": 75,
"declaration": {
"type": "VariableDeclaration",
"kind": "const",
"declarations": [
{
"type": "VariableDeclarator",
"id": {
"type": "Identifier",
"name": "y",
"start": 58,
"end": 59,
"loc": {
"start": {
"line": 3,
"column": 9,
"character": 58
},
"end": {
"line": 3,
"column": 10,
"character": 59
}
}
},
"init": {
"type": "AssignmentExpression",
"start": 63,
"end": 73,
"loc": {
"start": {
"line": 3,
"column": 14
},
"end": {
"line": 3,
"column": 24
}
},
"operator": "=",
"left": {
"type": "Identifier",
"start": 63,
"end": 64,
"loc": {
"start": {
"line": 3,
"column": 14
},
"end": {
"line": 3,
"column": 15
}
},
"name": "a"
},
"right": {
"type": "MemberExpression",
"start": 67,
"end": 73,
"loc": {
"start": {
"line": 3,
"column": 18
},
"end": {
"line": 3,
"column": 24
}
},
"object": {
"type": "Identifier",
"start": 67,
"end": 71,
"loc": {
"start": {
"line": 3,
"column": 18
},
"end": {
"line": 3,
"column": 22
}
},
"name": "item"
},
"property": {
"type": "Identifier",
"start": 72,
"end": 73,
"loc": {
"start": {
"line": 3,
"column": 23
},
"end": {
"line": 3,
"column": 24
}
},
"name": "n"
},
"computed": false,
"optional": false
}
},
"start": 58,
"end": 74
}
],
"start": 52,
"end": 74
}
},
{
"type": "Text",
"start": 75,
"end": 77,
"raw": "\n\t",
"data": "\n\t"
},
{
"type": "ConstTag",
"start": 77,
"end": 105,
"declaration": {
"type": "VariableDeclaration",
"kind": "const",
"declarations": [
{
"type": "VariableDeclarator",
"id": {
"type": "Identifier",
"name": "z",
"start": 85,
"end": 86,
"loc": {
"start": {
"line": 4,
"column": 9,
"character": 85
},
"end": {
"line": 4,
"column": 10,
"character": 86
}
}
},
"init": {
"type": "ObjectExpression",
"start": 90,
"end": 103,
"loc": {
"start": {
"line": 4,
"column": 14
},
"end": {
"line": 4,
"column": 27
}
},
"properties": [
{
"type": "Property",
"start": 92,
"end": 101,
"loc": {
"start": {
"line": 4,
"column": 16
},
"end": {
"line": 4,
"column": 25
}
},
"method": false,
"shorthand": false,
"computed": false,
"key": {
"type": "Identifier",
"start": 92,
"end": 93,
"loc": {
"start": {
"line": 4,
"column": 16
},
"end": {
"line": 4,
"column": 17
}
},
"name": "a"
},
"value": {
"type": "MemberExpression",
"start": 95,
"end": 101,
"loc": {
"start": {
"line": 4,
"column": 19
},
"end": {
"line": 4,
"column": 25
}
},
"object": {
"type": "Identifier",
"start": 95,
"end": 99,
"loc": {
"start": {
"line": 4,
"column": 19
},
"end": {
"line": 4,
"column": 23
}
},
"name": "item"
},
"property": {
"type": "Identifier",
"start": 100,
"end": 101,
"loc": {
"start": {
"line": 4,
"column": 24
},
"end": {
"line": 4,
"column": 25
}
},
"name": "a"
},
"computed": false,
"optional": false
},
"kind": "init"
}
]
},
"start": 85,
"end": 104
}
],
"start": 79,
"end": 104
}
},
{
"type": "Text",
"start": 105,
"end": 107,
"raw": "\n\t",
"data": "\n\t"
},
{
"type": "ExpressionTag",
"start": 107,
"end": 110,
"expression": {
"type": "Identifier",
"start": 108,
"end": 109,
"loc": {
"start": {
"line": 5,
"column": 2
},
"end": {
"line": 5,
"column": 3
}
},
"name": "x"
}
},
{
"type": "ExpressionTag",
"start": 110,
"end": 113,
"expression": {
"type": "Identifier",
"start": 111,
"end": 112,
"loc": {
"start": {
"line": 5,
"column": 5
},
"end": {
"line": 5,
"column": 6
}
},
"name": "y"
}
},
{
"type": "ExpressionTag",
"start": 113,
"end": 118,
"expression": {
"type": "MemberExpression",
"start": 114,
"end": 117,
"loc": {
"start": {
"line": 5,
"column": 8
},
"end": {
"line": 5,
"column": 11
}
},
"object": {
"type": "Identifier",
"start": 114,
"end": 115,
"loc": {
"start": {
"line": 5,
"column": 8
},
"end": {
"line": 5,
"column": 9
}
},
"name": "z"
},
"property": {
"type": "Identifier",
"start": 116,
"end": 117,
"loc": {
"start": {
"line": 5,
"column": 10
},
"end": {
"line": 5,
"column": 11
}
},
"name": "a"
},
"computed": false,
"optional": false
}
},
{
"type": "Text",
"start": 118,
"end": 119,
"raw": "\n",
"data": "\n"
}
]
},
"context": {
"type": "Identifier",
"name": "item",
"start": 16,
"end": 20,
"loc": {
"start": {
"line": 1,
"column": 16,
"character": 16
},
"end": {
"line": 1,
"column": 20,
"character": 20
}
}
}
}
]
},
"options": null
}
Write Preview
Loading…
Cancel
Save