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.

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

[flow] Allow type casts in array patterns inside arrow parameters #9069

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 10 additions & 3 deletions packages/babel-parser/src/parser/expression.js
Expand Up @@ -566,7 +566,7 @@ export default class ExpressionParser extends LValParser {
);
this.state.yieldOrAwaitInPossibleArrowParameters = oldYOAIPAP;
} else {
this.toReferencedList(node.arguments);
this.toReferencedListDeep(node.arguments);

// We keep the old value if it isn't null, for cases like
// (x = async(yield)) => {}
Expand Down Expand Up @@ -891,7 +891,14 @@ export default class ExpressionParser extends LValParser {
true,
refShorthandDefaultPos,
);
this.toReferencedList(node.elements);
if (!this.state.maybeInArrowParameters) {
// This could be an array pattern:
// ([a: string, b: string]) => {}
// In this case, we don't have to call toReferencedList. We will
// call it, if needed, when we are sure that it is a parenthesized
// expression by calling toReferencedListDeep.
this.toReferencedList(node.elements);
}
return this.finishNode(node, "ArrayExpression");

case tt.braceL:
Expand Down Expand Up @@ -1173,10 +1180,10 @@ export default class ExpressionParser extends LValParser {
}
if (refNeedsArrowPos.start) this.unexpected(refNeedsArrowPos.start);

this.toReferencedListDeep(exprList, /* isParenthesizedExpr */ true);
if (exprList.length > 1) {
val = this.startNodeAt(innerStartPos, innerStartLoc);
val.expressions = exprList;
this.toReferencedList(val.expressions);
this.finishNodeAt(val, "SequenceExpression", innerEndPos, innerEndLoc);
} else {
val = exprList[0];
Expand Down
17 changes: 16 additions & 1 deletion packages/babel-parser/src/parser/lval.js
Expand Up @@ -177,11 +177,26 @@ export default class LValParser extends NodeUtils {

toReferencedList(
exprList: $ReadOnlyArray<?Expression>,
isInParens?: boolean, // eslint-disable-line no-unused-vars
isParenthesizedExpr?: boolean, // eslint-disable-line no-unused-vars
): $ReadOnlyArray<?Expression> {
return exprList;
}

toReferencedListDeep(
exprList: $ReadOnlyArray<?Expression>,
isParenthesizedExpr?: boolean,
): $ReadOnlyArray<?Expression> {
this.toReferencedList(exprList, isParenthesizedExpr);

for (const expr of exprList) {
if (expr && expr.type === "ArrayExpression") {
this.toReferencedListDeep(expr.elements);
}
}

return exprList;
}

// Parses spread element.

parseSpread<T: RestElement | SpreadElement>(
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-parser/src/plugins/flow.js
Expand Up @@ -1977,15 +1977,15 @@ export default (superClass: Class<Parser>): Class<Parser> =>
// type casts that we've found that are illegal in this context
toReferencedList(
exprList: $ReadOnlyArray<?N.Expression>,
isInParens?: boolean,
isParenthesizedExpr?: boolean,
): $ReadOnlyArray<?N.Expression> {
for (let i = 0; i < exprList.length; i++) {
const expr = exprList[i];
if (
expr &&
expr.type === "TypeCastExpression" &&
(!expr.extra || !expr.extra.parenthesized) &&
(exprList.length > 1 || !isInParens)
(exprList.length > 1 || !isParenthesizedExpr)
) {
this.raise(
expr.typeAnnotation.start,
Expand Down
@@ -0,0 +1 @@
[a: string];
@@ -0,0 +1,3 @@
{
"throws": "The type cast expression is expected to be wrapped with parenthesis (1:2)"
}
@@ -0,0 +1 @@
([a: string]);
@@ -0,0 +1,3 @@
{
"throws": "The type cast expression is expected to be wrapped with parenthesis (1:3)"
}
@@ -0,0 +1 @@
([a, [b: string]]);
@@ -0,0 +1,3 @@
{
"throws": "The type cast expression is expected to be wrapped with parenthesis (1:7)"
}
@@ -0,0 +1 @@
async ([a: string]);
@@ -0,0 +1,3 @@
{
"throws": "The type cast expression is expected to be wrapped with parenthesis (1:9)"
}
@@ -0,0 +1 @@
async ([a, [b: string]]);
@@ -0,0 +1,3 @@
{
"throws": "The type cast expression is expected to be wrapped with parenthesis (1:13)"
}
@@ -0,0 +1,14 @@
([a: string]) => {};
([a, [b: string]]) => {};
([a: string] = []) => {};
({ x: [a: string] }) => {};

async ([a: string]) => {};
async ([a, [b: string]]) => {};
async ([a: string] = []) => {};
async ({ x: [a: string] }) => {};

let [a: string] = c;
let [a, [b: string]] = c;
let [a: string] = c;
let { x: [a: string] } = c;