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

fix(babel-parser): delete static property from class static block for TS #13680

Merged
merged 6 commits into from Aug 25, 2021
Merged

fix(babel-parser): delete static property from class static block for TS #13680

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
a18637b
Delete static modifier from static blocks node
sosukesuzuki Aug 15, 2021
cb5bff3
Update tests
sosukesuzuki Aug 15, 2021
801aa8e
Address review
sosukesuzuki Aug 18, 2021
7fc070d
Address review
sosukesuzuki Aug 21, 2021
5ea75b9
Add tests from review
sosukesuzuki Aug 25, 2021
828b241
Add tests
sosukesuzuki Aug 25, 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
48 changes: 36 additions & 12 deletions packages/babel-parser/src/plugins/typescript/index.js
View file
Open in desktop
Expand Up @@ -230,17 +230,22 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}

/** Parses a modifier matching one the given modifier names. */
tsParseModifier<T: TsModifier>(allowedModifiers: T[]): ?T {
tsParseModifier<T: TsModifier>(
allowedModifiers: T[],
stopOnStartOfClassStaticBlock?: boolean,
): ?T {
if (!this.match(tt.name)) {
return undefined;
}

const modifier = this.state.value;
if (
allowedModifiers.indexOf(modifier) !== -1 &&
this.tsTryParse(this.tsNextTokenCanFollowModifier.bind(this))
) {
return modifier;
if (allowedModifiers.indexOf(modifier) !== -1) {
if (stopOnStartOfClassStaticBlock && this.tsIsStartOfStaticBlocks()) {
return undefined;
}
if (this.tsTryParse(this.tsNextTokenCanFollowModifier.bind(this))) {
return modifier;
}
}
return undefined;
}
Expand All @@ -258,6 +263,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
allowedModifiers: TsModifier[],
disallowedModifiers?: TsModifier[],
errorTemplate?: ErrorTemplate,
stopOnStartOfClassStaticBlock?: boolean,
): void {
const enforceOrder = (pos, modifier, before, after) => {
if (modifier === before && modified[after]) {
Expand All @@ -277,6 +283,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
const startPos = this.state.start;
const modifier: ?TsModifier = this.tsParseModifier(
allowedModifiers.concat(disallowedModifiers ?? []),
stopOnStartOfClassStaticBlock,
);

if (!modifier) break;
Expand Down Expand Up @@ -2374,34 +2381,51 @@ export default (superClass: Class<Parser>): Class<Parser> =>
});
}

tsIsStartOfStaticBlocks() {
return (
this.isContextual("static") &&
this.lookaheadCharCode() === charCodes.leftCurlyBrace
);
}

parseClassMember(
classBody: N.ClassBody,
member: any,
state: N.ParseClassMemberState,
): void {
const invalidModifersForStaticBlocks = [
const modifiers = [
"declare",
"private",
"public",
"protected",
"override",
"abstract",
"readonly",
"static",
];
this.tsParseModifiers(
member,
invalidModifersForStaticBlocks.concat(["static"]),
modifiers,
/* disallowedModifiers */ undefined,
/* errorTemplate */ undefined,
/* stopOnStartOfClassStaticBlock */ true,
);

const callParseClassMemberWithIsStatic = () => {
const isStatic = !!member.static;
if (isStatic && this.eat(tt.braceL)) {
if (this.tsHasSomeModifiers(member, invalidModifersForStaticBlocks)) {
if (this.tsIsStartOfStaticBlocks()) {
this.next(); // eat "static"
this.next(); // eat "{"
if (this.tsHasSomeModifiers(member, modifiers)) {
this.raise(this.state.pos, TSErrors.StaticBlockCannotHaveModifier);
}
this.parseClassStaticBlock(classBody, ((member: any): N.StaticBlock));
} else {
this.parseClassMemberWithIsStatic(classBody, member, state, isStatic);
this.parseClassMemberWithIsStatic(
classBody,
member,
state,
!!member.static,
);
}
};
if (member.declare) {
Expand Down
3 changes: 3 additions & 0 deletions ...ures/typescript/static-blocks/invalid-static-block-with-accessibility-private-01/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class Foo {
private static {}
}
2 changes: 0 additions & 2 deletions ...ck-with-accessibility-private/output.json → ...with-accessibility-private-01/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@
"type": "File",
"start":0,"end":33,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: 'private' modifier must precede 'static' modifier. (2:9)",
"SyntaxError: Static class blocks cannot have any modifier. (2:19)"
],
"program": {
Expand All @@ -27,7 +26,6 @@
{
"type": "StaticBlock",
"start":14,"end":31,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":19}},
"static": true,
"accessibility": "private",
"body": []
}
Expand Down
0 ...block-with-accessibility-private/input.ts → ...ck-with-accessibility-private-02/input.ts
View file
Open in desktop
File renamed without changes.
12 changes: 12 additions & 0 deletions .../typescript/static-blocks/invalid-static-block-with-accessibility-private-02/options.json
View file
Open in desktop
@@ -0,0 +1,12 @@
{
"plugins": [
[
"classStaticBlock"
],
[
"typescript"
]
],
"sourceType": "module",
"throws": "Unexpected token (2:17)"
}
3 changes: 3 additions & 0 deletions ...es/typescript/static-blocks/invalid-static-block-with-accessibility-protected-01/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class Foo {
protected static {}
}
2 changes: 0 additions & 2 deletions ...-with-accessibility-protected/output.json → ...th-accessibility-protected-01/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@
"type": "File",
"start":0,"end":35,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: 'protected' modifier must precede 'static' modifier. (2:9)",
"SyntaxError: Static class blocks cannot have any modifier. (2:21)"
],
"program": {
Expand All @@ -27,7 +26,6 @@
{
"type": "StaticBlock",
"start":14,"end":33,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":21}},
"static": true,
"accessibility": "protected",
"body": []
}
Expand Down
0 ...ock-with-accessibility-protected/input.ts → ...-with-accessibility-protected-02/input.ts
View file
Open in desktop
File renamed without changes.
12 changes: 12 additions & 0 deletions ...ypescript/static-blocks/invalid-static-block-with-accessibility-protected-02/options.json
View file
Open in desktop
@@ -0,0 +1,12 @@
{
"plugins": [
[
"classStaticBlock"
],
[
"typescript"
]
],
"sourceType": "module",
"throws": "Unexpected token (2:19)"
}
3 changes: 3 additions & 0 deletions ...tures/typescript/static-blocks/invalid-static-block-with-accessibility-public-01/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class Foo {
public static {}
}
2 changes: 0 additions & 2 deletions ...ock-with-accessibility-public/output.json → ...-with-accessibility-public-01/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@
"type": "File",
"start":0,"end":32,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: 'public' modifier must precede 'static' modifier. (2:9)",
"SyntaxError: Static class blocks cannot have any modifier. (2:18)"
],
"program": {
Expand All @@ -27,7 +26,6 @@
{
"type": "StaticBlock",
"start":14,"end":30,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":18}},
"static": true,
"accessibility": "public",
"body": []
}
Expand Down
0 ...-block-with-accessibility-public/input.ts → ...ock-with-accessibility-public-02/input.ts
View file
Open in desktop
File renamed without changes.
12 changes: 12 additions & 0 deletions ...s/typescript/static-blocks/invalid-static-block-with-accessibility-public-02/options.json
View file
Open in desktop
@@ -0,0 +1,12 @@
{
"plugins": [
[
"classStaticBlock"
],
[
"typescript"
]
],
"sourceType": "module",
"throws": "Unexpected token (2:16)"
}
0 ...tic-block-with-modifier-abstract/input.ts → ...-block-with-modifier-abstract-01/input.ts
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions ...-block-with-modifier-abstract/output.json → ...ock-with-modifier-abstract-01/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@
"type": "File",
"start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: 'static' modifier cannot be used with 'abstract' modifier. (2:11)",
"SyntaxError: Static class blocks cannot have any modifier. (2:20)"
],
"program": {
Expand All @@ -28,7 +27,6 @@
"type": "StaticBlock",
"start":14,"end":32,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":20}},
"abstract": true,
"static": true,
"body": []
}
]
Expand Down
3 changes: 3 additions & 0 deletions ...fixtures/typescript/static-blocks/invalid-static-block-with-modifier-abstract-02/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class Foo {
static abstract {}
}
12 changes: 12 additions & 0 deletions ...ures/typescript/static-blocks/invalid-static-block-with-modifier-abstract-02/options.json
View file
Open in desktop
@@ -0,0 +1,12 @@
{
"plugins": [
[
"classStaticBlock"
],
[
"typescript"
]
],
"sourceType": "module",
"throws": "Unexpected token (2:18)"
}
0 ...tic-block-with-modifier-override/input.ts → ...-block-with-modifier-override-01/input.ts
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions ...atic-block-with-modifier-override-01/invalid-static-block-with-modifier-abstract/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class Foo {
abstract static {}
}
38 changes: 38 additions & 0 deletions ...c-block-with-modifier-override-01/invalid-static-block-with-modifier-abstract/output.json
View file
Open in desktop
@@ -0,0 +1,38 @@
{
"type": "File",
"start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: Static class blocks cannot have any modifier. (2:20)"
],
"program": {
"type": "Program",
"start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"id": {
"type": "Identifier",
"start":6,"end":9,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":9},"identifierName":"Foo"},
"name": "Foo"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start":10,"end":34,"loc":{"start":{"line":1,"column":10},"end":{"line":3,"column":1}},
"body": [
{
"type": "StaticBlock",
"start":14,"end":32,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":20}},
"abstract": true,
"body": []
}
]
}
}
],
"directives": []
}
}
2 changes: 0 additions & 2 deletions ...-block-with-modifier-override/output.json → ...ock-with-modifier-override-01/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@
"type": "File",
"start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: 'static' modifier must precede 'override' modifier. (2:11)",
"SyntaxError: Static class blocks cannot have any modifier. (2:20)"
],
"program": {
Expand All @@ -28,7 +27,6 @@
"type": "StaticBlock",
"start":14,"end":32,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":20}},
"override": true,
"static": true,
"body": []
}
]
Expand Down
3 changes: 3 additions & 0 deletions ...fixtures/typescript/static-blocks/invalid-static-block-with-modifier-override-02/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class Foo {
static override {}
}
12 changes: 12 additions & 0 deletions ...ures/typescript/static-blocks/invalid-static-block-with-modifier-override-02/options.json
View file
Open in desktop
@@ -0,0 +1,12 @@
{
"plugins": [
[
"classStaticBlock"
],
[
"typescript"
]
],
"sourceType": "module",
"throws": "Unexpected token (2:18)"
}
2 changes: 1 addition & 1 deletion ...t/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-static/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
"type": "File",
"start":0,"end":32,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: Duplicate modifier: 'static'. (2:9)"
"SyntaxError: Static class blocks cannot have any modifier. (2:18)"
],
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a regression, the input is

class Foo {
  static static {}
}

Copy link
Member Author

Choose a reason for hiding this comment

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

@JLHwung Can you review again?

"program": {
"type": "Program",
Expand Down
0 ...atic-blocks-with-modifer-declare/input.ts → ...c-blocks-with-modifer-declare-01/input.ts
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion ...c-blocks-with-modifer-declare/output.json → ...locks-with-modifer-declare-01/output.json
View file
Open in desktop
Expand Up @@ -27,7 +27,6 @@
"type": "StaticBlock",
"start":14,"end":31,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":19}},
"declare": true,
"static": true,
"body": []
}
]
Expand Down
3 changes: 3 additions & 0 deletions .../fixtures/typescript/static-blocks/invalid-static-blocks-with-modifer-declare-02/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class Foo {
static declare {}
}
12 changes: 12 additions & 0 deletions ...tures/typescript/static-blocks/invalid-static-blocks-with-modifer-declare-02/options.json
View file
Open in desktop
@@ -0,0 +1,12 @@
{
"plugins": [
[
"classStaticBlock"
],
[
"typescript"
]
],
"sourceType": "module",
"throws": "Unexpected token (2:17)"
}
0 ...ic-blocks-with-modifier-readonly/input.ts → ...blocks-with-modifier-readonly-01/input.ts
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions ...blocks-with-modifier-readonly/output.json → ...cks-with-modifier-readonly-01/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@
"type": "File",
"start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: 'static' modifier must precede 'readonly' modifier. (2:11)",
"SyntaxError: Static class blocks cannot have any modifier. (2:20)"
],
"program": {
Expand All @@ -28,7 +27,6 @@
"type": "StaticBlock",
"start":14,"end":32,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":20}},
"readonly": true,
"static": true,
"body": []
}
]
Expand Down
3 changes: 3 additions & 0 deletions ...ixtures/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly-02/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class Foo {
static readonly {}
}
12 changes: 12 additions & 0 deletions ...res/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly-02/options.json
View file
Open in desktop
@@ -0,0 +1,12 @@
{
"plugins": [
[
"classStaticBlock"
],
[
"typescript"
]
],
"sourceType": "module",
"throws": "Unexpected token (2:18)"
}
1 change: 0 additions & 1 deletion ...est/fixtures/typescript/static-blocks/static-blocks-and-proptery-named-static/output.json
View file
Open in desktop
Expand Up @@ -35,7 +35,6 @@
{
"type": "StaticBlock",
"start":24,"end":33,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":11}},
"static": true,
"body": []
}
]
Expand Down