Skip to content
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

Jump to bottom

[ts] Support override modifiers for parameter properties #13428

Merged
merged 6 commits into from Jun 10, 2021
Merged

[ts] Support override modifiers for parameter properties #13428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e795eab
Parse override modifier for parameter properties
sosukesuzuki Jun 6, 2021
a1e8b02
Add tests
sosukesuzuki Jun 6, 2021
65d198a
Make tests simple
sosukesuzuki Jun 6, 2021
e5bb74a
Address review1
sosukesuzuki Jun 9, 2021
093a501
Enforce modifiers order
sosukesuzuki Jun 9, 2021
8f7c78c
Add more tests
sosukesuzuki Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 19 additions & 4 deletions packages/babel-parser/src/plugins/typescript/index.js
View file
Open in desktop
Expand Up @@ -283,6 +283,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
} else {
enforceOrder(startPos, modifier, modifier, "override");
enforceOrder(startPos, modifier, modifier, "static");
enforceOrder(startPos, modifier, modifier, "readonly");

modified.accessibility = modifier;
}
Expand Down Expand Up @@ -1927,24 +1928,38 @@ export default (superClass: Class<Parser>): Class<Parser> =>

let accessibility: ?N.Accessibility;
let readonly = false;
let override = false;
if (allowModifiers !== undefined) {
accessibility = this.parseAccessModifier();
readonly = !!this.tsParseModifier(["readonly"]);
if (allowModifiers === false && (accessibility || readonly)) {
const modified = {};
this.tsParseModifiers(modified, [
"public",
"private",
"protected",
"override",
"readonly",
]);
accessibility = modified.accessibility;
override = modified.override;
readonly = modified.readonly;
Comment on lines +1933 to +1943
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used tsParseModifiers on an empty object to reuse the logic to enforce the order. What do you think?

if (
allowModifiers === false &&
(accessibility || readonly || override)
) {
this.raise(startPos, TSErrors.UnexpectedParameterModifier);
}
}

const left = this.parseMaybeDefault();
this.parseAssignableListItemTypes(left);
const elt = this.parseMaybeDefault(left.start, left.loc.start, left);
if (accessibility || readonly) {
if (accessibility || readonly || override) {
const pp: N.TSParameterProperty = this.startNodeAt(startPos, startLoc);
if (decorators.length) {
pp.decorators = decorators;
}
if (accessibility) pp.accessibility = accessibility;
if (readonly) pp.readonly = readonly;
if (override) pp.override = override;
if (elt.type !== "Identifier" && elt.type !== "AssignmentPattern") {
this.raise(pp.start, TSErrors.UnsupportedParameterPropertyKind);
}
Expand Down
1 change: 1 addition & 0 deletions packages/babel-parser/src/types.js
View file
Open in desktop
Expand Up @@ -1178,6 +1178,7 @@ export type TSParameterProperty = HasDecorators & {
// At least one of `accessibility` or `readonly` must be set.
accessibility?: ?Accessibility,
readonly?: ?true,
override?: ?true,
parameter: Identifier | AssignmentPattern,
};

Expand Down
3 changes: 3 additions & 0 deletions ...parser/test/fixtures/typescript/class/constructor-with-invalid-order-modifiers-1/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class D extends B {
constructor(readonly override foo: string) {}
}
78 changes: 78 additions & 0 deletions ...ser/test/fixtures/typescript/class/constructor-with-invalid-order-modifiers-1/output.json
View file
Open in desktop
@@ -0,0 +1,78 @@
{
"type": "File",
"start":0,"end":69,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: 'override' modifier must precede 'readonly' modifier. (2:23)"
],
"program": {
"type": "Program",
"start":0,"end":69,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start":0,"end":69,"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":"D"},
"name": "D"
},
"superClass": {
"type": "Identifier",
"start":16,"end":17,"loc":{"start":{"line":1,"column":16},"end":{"line":1,"column":17},"identifierName":"B"},
"name": "B"
},
"body": {
"type": "ClassBody",
"start":18,"end":69,"loc":{"start":{"line":1,"column":18},"end":{"line":3,"column":1}},
"body": [
{
"type": "ClassMethod",
"start":22,"end":67,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":47}},
"static": false,
"key": {
"type": "Identifier",
"start":22,"end":33,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":13},"identifierName":"constructor"},
"name": "constructor"
},
"computed": false,
"kind": "constructor",
"id": null,
"generator": false,
"async": false,
"params": [
{
"type": "TSParameterProperty",
"start":34,"end":63,"loc":{"start":{"line":2,"column":14},"end":{"line":2,"column":43}},
"readonly": true,
"override": true,
"parameter": {
"type": "Identifier",
"start":52,"end":63,"loc":{"start":{"line":2,"column":32},"end":{"line":2,"column":43},"identifierName":"foo"},
"name": "foo",
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start":55,"end":63,"loc":{"start":{"line":2,"column":35},"end":{"line":2,"column":43}},
"typeAnnotation": {
"type": "TSStringKeyword",
"start":57,"end":63,"loc":{"start":{"line":2,"column":37},"end":{"line":2,"column":43}}
}
}
}
}
],
"body": {
"type": "BlockStatement",
"start":65,"end":67,"loc":{"start":{"line":2,"column":45},"end":{"line":2,"column":47}},
"body": [],
"directives": []
}
}
]
}
}
],
"directives": []
}
}
3 changes: 3 additions & 0 deletions ...parser/test/fixtures/typescript/class/constructor-with-invalid-order-modifiers-2/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class D extends B {
constructor(readonly public foo: string) {}
}
78 changes: 78 additions & 0 deletions ...ser/test/fixtures/typescript/class/constructor-with-invalid-order-modifiers-2/output.json
View file
Open in desktop
@@ -0,0 +1,78 @@
{
"type": "File",
"start":0,"end":67,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: 'public' modifier must precede 'readonly' modifier. (2:23)"
],
"program": {
"type": "Program",
"start":0,"end":67,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start":0,"end":67,"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":"D"},
"name": "D"
},
"superClass": {
"type": "Identifier",
"start":16,"end":17,"loc":{"start":{"line":1,"column":16},"end":{"line":1,"column":17},"identifierName":"B"},
"name": "B"
},
"body": {
"type": "ClassBody",
"start":18,"end":67,"loc":{"start":{"line":1,"column":18},"end":{"line":3,"column":1}},
"body": [
{
"type": "ClassMethod",
"start":22,"end":65,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":45}},
"static": false,
"key": {
"type": "Identifier",
"start":22,"end":33,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":13},"identifierName":"constructor"},
"name": "constructor"
},
"computed": false,
"kind": "constructor",
"id": null,
"generator": false,
"async": false,
"params": [
{
"type": "TSParameterProperty",
"start":34,"end":61,"loc":{"start":{"line":2,"column":14},"end":{"line":2,"column":41}},
"accessibility": "public",
"readonly": true,
"parameter": {
"type": "Identifier",
"start":50,"end":61,"loc":{"start":{"line":2,"column":30},"end":{"line":2,"column":41},"identifierName":"foo"},
"name": "foo",
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start":53,"end":61,"loc":{"start":{"line":2,"column":33},"end":{"line":2,"column":41}},
"typeAnnotation": {
"type": "TSStringKeyword",
"start":55,"end":61,"loc":{"start":{"line":2,"column":35},"end":{"line":2,"column":41}}
}
}
}
}
],
"body": {
"type": "BlockStatement",
"start":63,"end":65,"loc":{"start":{"line":2,"column":43},"end":{"line":2,"column":45}},
"body": [],
"directives": []
}
}
]
}
}
],
"directives": []
}
}
3 changes: 3 additions & 0 deletions ...parser/test/fixtures/typescript/class/constructor-with-invalid-order-modifiers-3/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class D extends B {
constructor(override readonly public foo: string) {}
}
80 changes: 80 additions & 0 deletions ...ser/test/fixtures/typescript/class/constructor-with-invalid-order-modifiers-3/output.json
View file
Open in desktop
@@ -0,0 +1,80 @@
{
"type": "File",
"start":0,"end":76,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: 'public' modifier must precede 'override' modifier. (2:32)",
"SyntaxError: 'public' modifier must precede 'readonly' modifier. (2:32)"
],
"program": {
"type": "Program",
"start":0,"end":76,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start":0,"end":76,"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":"D"},
"name": "D"
},
"superClass": {
"type": "Identifier",
"start":16,"end":17,"loc":{"start":{"line":1,"column":16},"end":{"line":1,"column":17},"identifierName":"B"},
"name": "B"
},
"body": {
"type": "ClassBody",
"start":18,"end":76,"loc":{"start":{"line":1,"column":18},"end":{"line":3,"column":1}},
"body": [
{
"type": "ClassMethod",
"start":22,"end":74,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":54}},
"static": false,
"key": {
"type": "Identifier",
"start":22,"end":33,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":13},"identifierName":"constructor"},
"name": "constructor"
},
"computed": false,
"kind": "constructor",
"id": null,
"generator": false,
"async": false,
"params": [
{
"type": "TSParameterProperty",
"start":34,"end":70,"loc":{"start":{"line":2,"column":14},"end":{"line":2,"column":50}},
"accessibility": "public",
"readonly": true,
"override": true,
"parameter": {
"type": "Identifier",
"start":59,"end":70,"loc":{"start":{"line":2,"column":39},"end":{"line":2,"column":50},"identifierName":"foo"},
"name": "foo",
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start":62,"end":70,"loc":{"start":{"line":2,"column":42},"end":{"line":2,"column":50}},
"typeAnnotation": {
"type": "TSStringKeyword",
"start":64,"end":70,"loc":{"start":{"line":2,"column":44},"end":{"line":2,"column":50}}
}
}
}
}
],
"body": {
"type": "BlockStatement",
"start":72,"end":74,"loc":{"start":{"line":2,"column":52},"end":{"line":2,"column":54}},
"body": [],
"directives": []
}
}
]
}
}
],
"directives": []
}
}
5 changes: 5 additions & 0 deletions ...el-parser/test/fixtures/typescript/class/constructor-with-override-modifer-names/input.ts
View file
Open in desktop
@@ -0,0 +1,5 @@
class D extends B {
constructor(override foo: string) {
super(foo);
}
}