Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Disallow destructuring assignment in using declarations #16613

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
nicolo-ribaudo merged 4 commits into from
Jul 8, 2024
Merged

Disallow destructuring assignment in using declarations #16613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ae03e1
Fix error handling destructuring assignment of using declarations
H0onnn Jul 5, 2024
981a1a6
Fix Allow ArrayPattern
H0onnn Jul 5, 2024
5a4a912
Fix Throw error for 'using' declarations with ObjectPattern or ArrayP…
H0onnn Jul 6, 2024
ebf9a67
Better error for `{` after `using`
nicolo-ribaudo Jul 6, 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
14 changes: 11 additions & 3 deletions packages/babel-parser/src/parser/statement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,13 @@ export default abstract class StatementParser extends ExpressionParser {
* starts a variable declaration in the same line so that it should be interpreted as
* a keyword.
*/
hasInLineFollowingBindingIdentifier(): boolean {
hasInLineFollowingBindingIdentifierOrBrace(): boolean {
const next = this.nextTokenInLineStart();
const nextCh = this.codePointAtPos(next);
return this.chStartsBindingIdentifier(nextCh, next);
return (
nextCh === charCodes.leftCurlyBrace ||
this.chStartsBindingIdentifier(nextCh, next)
);
}

startsUsingForOf(): boolean {
Expand Down Expand Up @@ -506,7 +509,7 @@ export default abstract class StatementParser extends ExpressionParser {
// using [no LineTerminator here] BindingList[+Using]
if (
this.state.containsEsc ||
!this.hasInLineFollowingBindingIdentifier()
!this.hasInLineFollowingBindingIdentifierOrBrace()
) {
break;
}
Expand Down Expand Up @@ -1566,6 +1569,11 @@ export default abstract class StatementParser extends ExpressionParser {
kind: "var" | "let" | "const" | "using" | "await using",
): void {
const id = this.parseBindingAtom();
if (kind === "using" || kind === "await using") {
if (id.type === "ArrayPattern" || id.type === "ObjectPattern") {
this.raise(Errors.UsingDeclarationHasBindingPattern, id.loc.start);
}
}
this.checkLVal(id, {
in: { type: "VariableDeclarator" },
binding: kind === "var" ? BindingFlag.TYPE_VAR : BindingFlag.TYPE_LEXICAL,
Expand Down
3 changes: 3 additions & 0 deletions ...r/test/fixtures/experimental/explicit-resource-management/disallow-destructuring/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using x = null, {} = null;
using y = null, [] = null;
using {} = null;
3 changes: 3 additions & 0 deletions ...st/fixtures/experimental/explicit-resource-management/disallow-destructuring/options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"sourceType": "module"
}
104 changes: 104 additions & 0 deletions ...est/fixtures/experimental/explicit-resource-management/disallow-destructuring/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"type": "File",
"start":0,"end":70,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":3,"column":16,"index":70}},
"errors": [
"SyntaxError: Using declaration cannot have destructuring patterns. (1:16)",
"SyntaxError: Using declaration cannot have destructuring patterns. (2:16)",
"SyntaxError: Using declaration cannot have destructuring patterns. (3:6)"
],
"program": {
"type": "Program",
"start":0,"end":70,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":3,"column":16,"index":70}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "VariableDeclaration",
"start":0,"end":26,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":26,"index":26}},
"declarations": [
{
"type": "VariableDeclarator",
"start":6,"end":14,"loc":{"start":{"line":1,"column":6,"index":6},"end":{"line":1,"column":14,"index":14}},
"id": {
"type": "Identifier",
"start":6,"end":7,"loc":{"start":{"line":1,"column":6,"index":6},"end":{"line":1,"column":7,"index":7},"identifierName":"x"},
"name": "x"
},
"init": {
"type": "NullLiteral",
"start":10,"end":14,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":14,"index":14}}
}
},
{
"type": "VariableDeclarator",
"start":16,"end":25,"loc":{"start":{"line":1,"column":16,"index":16},"end":{"line":1,"column":25,"index":25}},
"id": {
"type": "ObjectPattern",
"start":16,"end":18,"loc":{"start":{"line":1,"column":16,"index":16},"end":{"line":1,"column":18,"index":18}},
"properties": []
},
"init": {
"type": "NullLiteral",
"start":21,"end":25,"loc":{"start":{"line":1,"column":21,"index":21},"end":{"line":1,"column":25,"index":25}}
}
}
],
"kind": "using"
},
{
"type": "VariableDeclaration",
"start":27,"end":53,"loc":{"start":{"line":2,"column":0,"index":27},"end":{"line":2,"column":26,"index":53}},
"declarations": [
{
"type": "VariableDeclarator",
"start":33,"end":41,"loc":{"start":{"line":2,"column":6,"index":33},"end":{"line":2,"column":14,"index":41}},
"id": {
"type": "Identifier",
"start":33,"end":34,"loc":{"start":{"line":2,"column":6,"index":33},"end":{"line":2,"column":7,"index":34},"identifierName":"y"},
"name": "y"
},
"init": {
"type": "NullLiteral",
"start":37,"end":41,"loc":{"start":{"line":2,"column":10,"index":37},"end":{"line":2,"column":14,"index":41}}
}
},
{
"type": "VariableDeclarator",
"start":43,"end":52,"loc":{"start":{"line":2,"column":16,"index":43},"end":{"line":2,"column":25,"index":52}},
"id": {
"type": "ArrayPattern",
"start":43,"end":45,"loc":{"start":{"line":2,"column":16,"index":43},"end":{"line":2,"column":18,"index":45}},
"elements": []
},
"init": {
"type": "NullLiteral",
"start":48,"end":52,"loc":{"start":{"line":2,"column":21,"index":48},"end":{"line":2,"column":25,"index":52}}
}
}
],
"kind": "using"
},
{
"type": "VariableDeclaration",
"start":54,"end":70,"loc":{"start":{"line":3,"column":0,"index":54},"end":{"line":3,"column":16,"index":70}},
"declarations": [
{
"type": "VariableDeclarator",
"start":60,"end":69,"loc":{"start":{"line":3,"column":6,"index":60},"end":{"line":3,"column":15,"index":69}},
"id": {
"type": "ObjectPattern",
"start":60,"end":62,"loc":{"start":{"line":3,"column":6,"index":60},"end":{"line":3,"column":8,"index":62}},
"properties": []
},
"init": {
"type": "NullLiteral",
"start":65,"end":69,"loc":{"start":{"line":3,"column":11,"index":65},"end":{"line":3,"column":15,"index":69}}
}
}
],
"kind": "using"
}
],
"directives": []
}
}
3 changes: 0 additions & 3 deletions ...erimental/explicit-resource-management/invalid-using-binding-pattern-declaration/input.js
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...ental/explicit-resource-management/invalid-using-binding-pattern-declaration/options.json
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions .../test/fixtures/experimental/explicit-resource-management/using-followed-by-block/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
using
{ foo }
38 changes: 38 additions & 0 deletions ...st/fixtures/experimental/explicit-resource-management/using-followed-by-block/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"type": "File",
"start":0,"end":13,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":7,"index":13}},
"program": {
"type": "Program",
"start":0,"end":13,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":7,"index":13}},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "ExpressionStatement",
"start":0,"end":5,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":5,"index":5}},
"expression": {
"type": "Identifier",
"start":0,"end":5,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":5,"index":5},"identifierName":"using"},
"name": "using"
}
},
{
"type": "BlockStatement",
"start":6,"end":13,"loc":{"start":{"line":2,"column":0,"index":6},"end":{"line":2,"column":7,"index":13}},
"body": [
{
"type": "ExpressionStatement",
"start":8,"end":11,"loc":{"start":{"line":2,"column":2,"index":8},"end":{"line":2,"column":5,"index":11}},
"expression": {
"type": "Identifier",
"start":8,"end":11,"loc":{"start":{"line":2,"column":2,"index":8},"end":{"line":2,"column":5,"index":11},"identifierName":"foo"},
"name": "foo"
}
}
],
"directives": []
}
],
"directives": []
}
}