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 parsing typescript function types with destructuring #9035

Merged
merged 2 commits into from Nov 19, 2018
Merged

Fix parsing typescript function types with destructuring #9035

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ee970e
Fix parsing typescript function types with destructuring
danez Nov 17, 2018
be59169
Use integer instead of actual stack
danez Nov 18, 2018
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
28 changes: 25 additions & 3 deletions packages/babel-parser/src/plugins/typescript.js
View file
Open in desktop
Expand Up @@ -314,13 +314,19 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}

tsParseBindingListForSignature(): $ReadOnlyArray<
N.Identifier | N.RestElement,
N.Identifier | N.RestElement | N.ObjectPattern,
> {
return this.parseBindingList(tt.parenR).map(pattern => {
if (pattern.type !== "Identifier" && pattern.type !== "RestElement") {
if (
pattern.type !== "Identifier" &&
pattern.type !== "RestElement" &&
pattern.type !== "ObjectPattern"
) {
throw this.unexpected(
pattern.start,
"Name in a signature must be an Identifier.",
`Name in a signature must be an Identifier or ObjectPattern, instead got ${
pattern.type
}`,
);
}
return pattern;
Expand Down Expand Up @@ -747,6 +753,22 @@ export default (superClass: Class<Parser>): Class<Parser> =>
this.next();
return true;
}

if (this.match(tt.braceL)) {
const braceStack = [tt.braceL];
Copy link
Member

Choose a reason for hiding this comment

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

This can be an integer instead of an array, since the check only uses its length.

Copy link
Member Author

Choose a reason for hiding this comment

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

changed

this.next();

while (braceStack.length > 0) {
Copy link
Member

Choose a reason for hiding this comment

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

Is it safe to skip the code between braces without parsing it?

e.g., wouldn't this loop accept something like {bar: {}{foo = 2=>{} }}?

Copy link
Member Author

Choose a reason for hiding this comment

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

It does ignore everything, even if its invalid, but this function is only used in a lookahead() and it's job is to try to skip the first param after (.

it is used here:

babel/packages/babel-parser/src/plugins/typescript.js

Line 775 in be59169

tsIsUnambiguouslyStartOfFunctionType(): boolean {

and this in turn is used here:

babel/packages/babel-parser/src/plugins/typescript.js

Line 741 in be59169

tsIsStartOfFunctionType() {

Copy link
Member

Choose a reason for hiding this comment

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

Oh ok 👍

if (this.match(tt.braceL)) {
braceStack.push(tt.braceL);
} else if (this.match(tt.braceR)) {
braceStack.pop();
}
this.next();
}
return true;
}

return false;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/babel-parser/src/types.js
View file
Open in desktop
Expand Up @@ -1037,7 +1037,7 @@ export type TsSignatureDeclaration =

export type TsSignatureDeclarationOrIndexSignatureBase = NodeBase & {
// Not using TypeScript's "ParameterDeclaration" here, since it's inconsistent with regular functions.
parameters: $ReadOnlyArray<Identifier | RestElement>,
parameters: $ReadOnlyArray<Identifier | RestElement | ObjectPattern>,
typeAnnotation: ?TsTypeAnnotation,
};

Expand Down
1 change: 1 addition & 0 deletions .../babel-parser/test/fixtures/typescript/regression/destructuring-in-function-type/input.js
View file
Open in desktop
@@ -0,0 +1 @@
type MyType = ({ theme }: any) => any
216 changes: 216 additions & 0 deletions ...bel-parser/test/fixtures/typescript/regression/destructuring-in-function-type/output.json
View file
Open in desktop
@@ -0,0 +1,216 @@
{
"type": "File",
"start": 0,
"end": 37,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 37
}
},
"program": {
"type": "Program",
"start": 0,
"end": 37,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 37
}
},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "TSTypeAliasDeclaration",
"start": 0,
"end": 37,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 37
}
},
"id": {
"type": "Identifier",
"start": 5,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 11
},
"identifierName": "MyType"
},
"name": "MyType"
},
"typeAnnotation": {
"type": "TSFunctionType",
"start": 14,
"end": 37,
"loc": {
"start": {
"line": 1,
"column": 14
},
"end": {
"line": 1,
"column": 37
}
},
"parameters": [
{
"type": "ObjectPattern",
"start": 15,
"end": 29,
"loc": {
"start": {
"line": 1,
"column": 15
},
"end": {
"line": 1,
"column": 29
}
},
"properties": [
{
"type": "ObjectProperty",
"start": 17,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 17
},
"end": {
"line": 1,
"column": 22
}
},
"method": false,
"key": {
"type": "Identifier",
"start": 17,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 17
},
"end": {
"line": 1,
"column": 22
},
"identifierName": "theme"
},
"name": "theme"
},
"computed": false,
"shorthand": true,
"value": {
"type": "Identifier",
"start": 17,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 17
},
"end": {
"line": 1,
"column": 22
},
"identifierName": "theme"
},
"name": "theme"
},
"extra": {
"shorthand": true
}
}
],
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start": 24,
"end": 29,
"loc": {
"start": {
"line": 1,
"column": 24
},
"end": {
"line": 1,
"column": 29
}
},
"typeAnnotation": {
"type": "TSAnyKeyword",
"start": 26,
"end": 29,
"loc": {
"start": {
"line": 1,
"column": 26
},
"end": {
"line": 1,
"column": 29
}
}
}
}
}
],
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start": 31,
"end": 37,
"loc": {
"start": {
"line": 1,
"column": 31
},
"end": {
"line": 1,
"column": 37
}
},
"typeAnnotation": {
"type": "TSAnyKeyword",
"start": 34,
"end": 37,
"loc": {
"start": {
"line": 1,
"column": 34
},
"end": {
"line": 1,
"column": 37
}
}
}
}
}
}
],
"directives": []
}
}