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] Disallow invalid type annotations in ExpressionStatements #12185

Merged
merged 1 commit into from Oct 16, 2020
Merged

[ts] Disallow invalid type annotations in ExpressionStatements #12185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 24 additions & 18 deletions packages/babel-parser/src/plugins/typescript/index.js
View file
Open in desktop
Expand Up @@ -1816,25 +1816,27 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}
}

parseExprListItem(
allowEmpty: ?boolean,
refExpressionErrors?: ?ExpressionErrors,
refNeedsArrowPos: ?Pos,
allowPlaceholder: ?boolean,
): ?N.Expression {
const node = super.parseExprListItem(
allowEmpty,
refExpressionErrors,
refNeedsArrowPos,
allowPlaceholder,
);

// Handle `func(a: T)` or `func<T>(a: T)`
if (!refNeedsArrowPos && node?.type === "TSTypeCastExpression") {
this.raise(node.start, TSErrors.UnexpectedTypeAnnotation);
}
tsCheckForInvalidTypeCasts(items: $ReadOnlyArray<?N.Expression>) {
items.forEach(node => {
if (node?.type === "TSTypeCastExpression") {
this.raise(
node.typeAnnotation.start,
TSErrors.UnexpectedTypeAnnotation,
);
}
});
}

return node;
toReferencedList(
exprList: $ReadOnlyArray<?N.Expression>,
isInParens?: boolean, // eslint-disable-line no-unused-vars
): $ReadOnlyArray<?N.Expression> {
// Handles invalid scenarios like: `f(a:b)`, `(a:b);`, and `(a:b,c:d)`.
//
// Note that `f<T>(a:b)` goes through a different path and is handled
// in `parseSubscript` directly.
this.tsCheckForInvalidTypeCasts(exprList);
return exprList;
}

parseSubscript(
Expand Down Expand Up @@ -1886,6 +1888,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
tt.parenR,
/* possibleAsync */ false,
);

// Handles invalid case: `f<T>(a:b)`
this.tsCheckForInvalidTypeCasts(node.arguments);

node.typeParameters = typeArguments;
return this.finishCallExpression(node, state.optionalChainMember);
} else if (this.match(tt.backQuote)) {
Expand Down
2 changes: 2 additions & 0 deletions packages/babel-parser/test/fixtures/typescript/cast/invalid/input.ts
View file
Open in desktop
@@ -0,0 +1,2 @@
(a:b);
(a:b,c:d);
106 changes: 106 additions & 0 deletions packages/babel-parser/test/fixtures/typescript/cast/invalid/output.json
View file
Open in desktop
@@ -0,0 +1,106 @@
{
"type": "File",
"start":0,"end":17,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":10}},
"errors": [
"SyntaxError: Did not expect a type annotation here. (1:2)",
"SyntaxError: Did not expect a type annotation here. (2:2)",
"SyntaxError: Did not expect a type annotation here. (2:6)"
],
"program": {
"type": "Program",
"start":0,"end":17,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":10}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ExpressionStatement",
"start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
"expression": {
"type": "TSTypeCastExpression",
"start":1,"end":4,"loc":{"start":{"line":1,"column":1},"end":{"line":1,"column":4}},
"extra": {
"parenthesized": true,
"parenStart": 0
},
"expression": {
"type": "Identifier",
"start":1,"end":2,"loc":{"start":{"line":1,"column":1},"end":{"line":1,"column":2},"identifierName":"a"},
"name": "a"
},
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start":2,"end":4,"loc":{"start":{"line":1,"column":2},"end":{"line":1,"column":4}},
"typeAnnotation": {
"type": "TSTypeReference",
"start":3,"end":4,"loc":{"start":{"line":1,"column":3},"end":{"line":1,"column":4}},
"typeName": {
"type": "Identifier",
"start":3,"end":4,"loc":{"start":{"line":1,"column":3},"end":{"line":1,"column":4},"identifierName":"b"},
"name": "b"
}
}
}
}
},
{
"type": "ExpressionStatement",
"start":7,"end":17,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":10}},
"expression": {
"type": "SequenceExpression",
"start":8,"end":15,"loc":{"start":{"line":2,"column":1},"end":{"line":2,"column":8}},
"extra": {
"parenthesized": true,
"parenStart": 7
},
"expressions": [
{
"type": "TSTypeCastExpression",
"start":8,"end":11,"loc":{"start":{"line":2,"column":1},"end":{"line":2,"column":4}},
"expression": {
"type": "Identifier",
"start":8,"end":9,"loc":{"start":{"line":2,"column":1},"end":{"line":2,"column":2},"identifierName":"a"},
"name": "a"
},
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start":9,"end":11,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":4}},
"typeAnnotation": {
"type": "TSTypeReference",
"start":10,"end":11,"loc":{"start":{"line":2,"column":3},"end":{"line":2,"column":4}},
"typeName": {
"type": "Identifier",
"start":10,"end":11,"loc":{"start":{"line":2,"column":3},"end":{"line":2,"column":4},"identifierName":"b"},
"name": "b"
}
}
}
},
{
"type": "TSTypeCastExpression",
"start":12,"end":15,"loc":{"start":{"line":2,"column":5},"end":{"line":2,"column":8}},
"expression": {
"type": "Identifier",
"start":12,"end":13,"loc":{"start":{"line":2,"column":5},"end":{"line":2,"column":6},"identifierName":"c"},
"name": "c"
},
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start":13,"end":15,"loc":{"start":{"line":2,"column":6},"end":{"line":2,"column":8}},
"typeAnnotation": {
"type": "TSTypeReference",
"start":14,"end":15,"loc":{"start":{"line":2,"column":7},"end":{"line":2,"column":8}},
"typeName": {
"type": "Identifier",
"start":14,"end":15,"loc":{"start":{"line":2,"column":7},"end":{"line":2,"column":8},"identifierName":"d"},
"name": "d"
}
}
}
}
]
}
}
],
"directives": []
}
}
4 changes: 2 additions & 2 deletions packages/babel-parser/test/fixtures/typescript/cast/parameter-typecast/output.json
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@
"type": "File",
"start":0,"end":26,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":14}},
"errors": [
"SyntaxError: Did not expect a type annotation here. (1:5)",
"SyntaxError: Did not expect a type annotation here. (2:8)"
"SyntaxError: Did not expect a type annotation here. (1:6)",
"SyntaxError: Did not expect a type annotation here. (2:9)"
],
"program": {
"type": "Program",
Expand Down