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.
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
fix: do not transform ClassPrivateMethods in estree #11973
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,22 @@ | ||
import { types as t } from "@babel/core"; | ||
import { KEYS as ESLINT_VISITOR_KEYS } from "eslint-visitor-keys"; | ||
|
||
/*eslint no-unused-vars: ["error", { "ignoreRestSiblings": true }]*/ | ||
const { ExportAllDeclaration, ...BABEL_VISITOR_KEYS } = t.VISITOR_KEYS; | ||
// AST Types that are not presented in Babel AST | ||
export const newTypes = { | ||
ChainExpression: ESLINT_VISITOR_KEYS.ChainExpression, | ||
ImportExpression: ESLINT_VISITOR_KEYS.ImportExpression, | ||
Literal: ESLINT_VISITOR_KEYS.Literal, | ||
MethodDefinition: ["decorators"].concat(ESLINT_VISITOR_KEYS.MethodDefinition), | ||
Property: ["decorators"].concat(ESLINT_VISITOR_KEYS.Property), | ||
}; | ||
|
||
export default Object.assign( | ||
{ | ||
ChainExpression: ESLINT_VISITOR_KEYS.ChainExpression, | ||
ExportAllDeclaration: ESLINT_VISITOR_KEYS.ExportAllDeclaration, | ||
ImportExpression: ESLINT_VISITOR_KEYS.ImportExpression, | ||
Literal: ESLINT_VISITOR_KEYS.Literal, | ||
MethodDefinition: ["decorators"].concat( | ||
ESLINT_VISITOR_KEYS.MethodDefinition, | ||
), | ||
Property: ["decorators"].concat(ESLINT_VISITOR_KEYS.Property), | ||
}, | ||
BABEL_VISITOR_KEYS, | ||
); | ||
// AST Types that shares `"type"` property with Babel but have different shape | ||
export const conflictTypes = { | ||
// todo: remove this when class features are supported | ||
ClassPrivateMethod: ["decorators"].concat( | ||
ESLINT_VISITOR_KEYS.MethodDefinition, | ||
), | ||
ExportAllDeclaration: ESLINT_VISITOR_KEYS.ExportAllDeclaration, | ||
}; | ||
|
||
export default Object.assign(newTypes, t.VISITOR_KEYS, conflictTypes); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
packages/babel-parser/test/fixtures/estree/class-private-method/basic/input.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
class A { | ||
#foo(arg, ...others) {} | ||
} |
3 changes: 3 additions & 0 deletions
3
packages/babel-parser/test/fixtures/estree/class-private-method/basic/options.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"plugins": ["flow", "jsx", "estree", "classPrivateMethods"] | ||
} |
72 changes: 72 additions & 0 deletions
72
packages/babel-parser/test/fixtures/estree/class-private-method/basic/output.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
{ | ||
"type": "File", | ||
"start":0,"end":37,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}}, | ||
"program": { | ||
"type": "Program", | ||
"start":0,"end":37,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}}, | ||
"sourceType": "script", | ||
"interpreter": null, | ||
"body": [ | ||
{ | ||
"type": "ClassDeclaration", | ||
"start":0,"end":37,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}}, | ||
"id": { | ||
"type": "Identifier", | ||
"start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7},"identifierName":"A"}, | ||
"name": "A" | ||
}, | ||
"superClass": null, | ||
"body": { | ||
"type": "ClassBody", | ||
"start":8,"end":37,"loc":{"start":{"line":1,"column":8},"end":{"line":3,"column":1}}, | ||
"body": [ | ||
{ | ||
"type": "ClassPrivateMethod", | ||
"start":12,"end":35,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":25}}, | ||
"static": false, | ||
"key": { | ||
"type": "PrivateName", | ||
"start":12,"end":16,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":6}}, | ||
"id": { | ||
"type": "Identifier", | ||
"start":13,"end":16,"loc":{"start":{"line":2,"column":3},"end":{"line":2,"column":6},"identifierName":"foo"}, | ||
"name": "foo" | ||
} | ||
}, | ||
"kind": "method", | ||
"value": { | ||
"type": "FunctionExpression", | ||
"start":16,"end":35,"loc":{"start":{"line":2,"column":6},"end":{"line":2,"column":25}}, | ||
"id": null, | ||
"generator": false, | ||
"async": false, | ||
"expression": false, | ||
"params": [ | ||
{ | ||
"type": "Identifier", | ||
"start":17,"end":20,"loc":{"start":{"line":2,"column":7},"end":{"line":2,"column":10},"identifierName":"arg"}, | ||
"name": "arg" | ||
}, | ||
{ | ||
"type": "RestElement", | ||
"start":22,"end":31,"loc":{"start":{"line":2,"column":12},"end":{"line":2,"column":21}}, | ||
"argument": { | ||
"type": "Identifier", | ||
"start":25,"end":31,"loc":{"start":{"line":2,"column":15},"end":{"line":2,"column":21},"identifierName":"others"}, | ||
"name": "others" | ||
} | ||
} | ||
], | ||
"body": { | ||
"type": "BlockStatement", | ||
"start":33,"end":35,"loc":{"start":{"line":2,"column":23},"end":{"line":2,"column":25}}, | ||
"body": [] | ||
} | ||
} | ||
} | ||
] | ||
} | ||
} | ||
] | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also refactored a bit to remove boilerplates.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice refactor!