cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow function types in type params within arrow return types (#8954)

Browse Source
This commit is contained in:
Daniel Tschinder 2018-11-01 07:10:46 -07:00 committed by Brian Ng
parent e85faec47d
commit cd81b079ee
5 changed files with 439 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/babel-parser/src/plugins/flow.js
View File

@ -638,12 +638,15 @@ export default (superClass: Class<Parser>): Class<Parser> =>
this.state.inType = true; this.state.inType = true;
this.expectRelational("<"); this.expectRelational("<");
const oldNoAnonFunctionType = this.state.noAnonFunctionType;
this.state.noAnonFunctionType = false;
while (!this.isRelational(">")) { while (!this.isRelational(">")) {
node.params.push(this.flowParseType()); node.params.push(this.flowParseType());
if (!this.isRelational(">")) { if (!this.isRelational(">")) {
this.expect(tt.comma); this.expect(tt.comma);
} }
} }
this.state.noAnonFunctionType = oldNoAnonFunctionType;
this.expectRelational(">"); this.expectRelational(">");
this.state.inType = oldInType; this.state.inType = oldInType;

1
packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_14/input.js vendored Normal file
View File

@ -0,0 +1 @@
type T = Array<(string) => number>

183
packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_14/output.json vendored Normal file
View File

@ -0,0 +1,183 @@
{
"type": "File",
"start": 0,
"end": 34,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 34
}
},
"program": {
"type": "Program",
"start": 0,
"end": 34,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 34
}
},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "TypeAlias",
"start": 0,
"end": 34,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 34
}
},
"id": {
"type": "Identifier",
"start": 5,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 6
},
"identifierName": "T"
},
"name": "T"
},
"typeParameters": null,
"right": {
"type": "GenericTypeAnnotation",
"start": 9,
"end": 34,
"loc": {
"start": {
"line": 1,
"column": 9
},
"end": {
"line": 1,
"column": 34
}
},
"typeParameters": {
"type": "TypeParameterInstantiation",
"start": 14,
"end": 34,
"loc": {
"start": {
"line": 1,
"column": 14
},
"end": {
"line": 1,
"column": 34
}
},
"params": [
{
"type": "FunctionTypeAnnotation",
"start": 15,
"end": 33,
"loc": {
"start": {
"line": 1,
"column": 15
},
"end": {
"line": 1,
"column": 33
}
},
"params": [
{
"type": "FunctionTypeParam",
"start": 16,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 16
},
"end": {
"line": 1,
"column": 22
}
},
"name": null,
"optional": false,
"typeAnnotation": {
"type": "StringTypeAnnotation",
"start": 16,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 16
},
"end": {
"line": 1,
"column": 22
}
}
}
}
],
"rest": null,
"returnType": {
"type": "NumberTypeAnnotation",
"start": 27,
"end": 33,
"loc": {
"start": {
"line": 1,
"column": 27
},
"end": {
"line": 1,
"column": 33
}
}
},
"typeParameters": null
}
]
},
"id": {
"type": "Identifier",
"start": 9,
"end": 14,
"loc": {
"start": {
"line": 1,
"column": 9
},
"end": {
"line": 1,
"column": 14
},
"identifierName": "Array"
},
"name": "Array"
}
}
}
],
"directives": []
}
}

1
packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_15/input.js vendored Normal file
View File

@ -0,0 +1 @@
let x = (): Array<(string) => number> => []

251
packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_15/output.json vendored Normal file
View File

@ -0,0 +1,251 @@
{
"type": "File",
"start": 0,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 43
}
},
"program": {
"type": "Program",
"start": 0,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 43
}
},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "VariableDeclaration",
"start": 0,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 43
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 4,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 43
}
},
"id": {
"type": "Identifier",
"start": 4,
"end": 5,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 5
},
"identifierName": "x"
},
"name": "x"
},
"init": {
"type": "ArrowFunctionExpression",
"start": 8,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 8
},
"end": {
"line": 1,
"column": 43
}
},
"predicate": null,
"returnType": {
"type": "TypeAnnotation",
"start": 10,
"end": 37,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 37
}
},
"typeAnnotation": {
"type": "GenericTypeAnnotation",
"start": 12,
"end": 37,
"loc": {
"start": {
"line": 1,
"column": 12
},
"end": {
"line": 1,
"column": 37
}
},
"typeParameters": {
"type": "TypeParameterInstantiation",
"start": 17,
"end": 37,
"loc": {
"start": {
"line": 1,
"column": 17
},
"end": {
"line": 1,
"column": 37
}
},
"params": [
{
"type": "FunctionTypeAnnotation",
"start": 18,
"end": 36,
"loc": {
"start": {
"line": 1,
"column": 18
},
"end": {
"line": 1,
"column": 36
}
},
"params": [
{
"type": "FunctionTypeParam",
"start": 19,
"end": 25,
"loc": {
"start": {
"line": 1,
"column": 19
},
"end": {
"line": 1,
"column": 25
}
},
"name": null,
"optional": false,
"typeAnnotation": {
"type": "StringTypeAnnotation",
"start": 19,
"end": 25,
"loc": {
"start": {
"line": 1,
"column": 19
},
"end": {
"line": 1,
"column": 25
}
}
}
}
],
"rest": null,
"returnType": {
"type": "NumberTypeAnnotation",
"start": 30,
"end": 36,
"loc": {
"start": {
"line": 1,
"column": 30
},
"end": {
"line": 1,
"column": 36
}
}
},
"typeParameters": null
}
]
},
"id": {
"type": "Identifier",
"start": 12,
"end": 17,
"loc": {
"start": {
"line": 1,
"column": 12
},
"end": {
"line": 1,
"column": 17
},
"identifierName": "Array"
},
"name": "Array"
}
}
},
"id": null,
"generator": false,
"async": false,
"params": [],
"body": {
"type": "ArrayExpression",
"start": 41,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 41
},
"end": {
"line": 1,
"column": 43
}
},
"elements": []
}
}
}
],
"kind": "let"
}
],
"directives": []
}
}