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

error on invalid flow type annotation with default assignment (#122)

Browse Source
This commit is contained in:
Dan Harper 2016-09-15 18:35:03 +01:00 committed by Daniel Tschinder
parent dc3036627b
commit 64145b07e3
7 changed files with 232 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/flow.js
View File

@ -1049,6 +1049,18 @@ export default function (instance) {
};
});
instance.extend("parseMaybeDefault", function (inner) {
return function (...args) {
const node = inner.apply(this, args);
if (node.type === "AssignmentPattern" && node.typeAnnotation && node.right.start < node.typeAnnotation.start) {
this.raise(node.typeAnnotation.start, "Type annotations must come before default assignments, e.g. instead of `age = 25: number` use `age: number = 25`");
}
return node;
};
});
// parse typeof and type imports
instance.extend("parseImportSpecifiers", function (inner) {

2
test/fixtures/flow/type-annotations/105/actual.js vendored
View File

@ -1 +1 @@
function g(a:number=1, e=1:number) {}
function g(a:number=1, e:number=1) {}

85
test/fixtures/flow/type-annotations/105/expected.json vendored
View File

@ -54,7 +54,8 @@
"end": {
"line": 1,
"column": 10
}
},
"identifierName": "g"
},
"name": "g"
},
@ -88,7 +89,8 @@
"end": {
"line": 1,
"column": 19
}
},
"identifierName": "a"
},
"name": "a",
"typeAnnotation": {
@ -160,7 +162,7 @@
"left": {
"type": "Identifier",
"start": 23,
"end": 24,
"end": 31,
"loc": {
"start": {
"line": 1,
@ -168,23 +170,54 @@
},
"end": {
"line": 1,
"column": 24
}
"column": 31
},
"identifierName": "e"
},
"name": "e"
"name": "e",
"typeAnnotation": {
"type": "TypeAnnotation",
"start": 24,
"end": 31,
"loc": {
"start": {
"line": 1,
"column": 24
},
"end": {
"line": 1,
"column": 31
}
},
"typeAnnotation": {
"type": "NumberTypeAnnotation",
"start": 25,
"end": 31,
"loc": {
"start": {
"line": 1,
"column": 25
},
"end": {
"line": 1,
"column": 31
}
}
}
}
},
"right": {
"type": "NumericLiteral",
"start": 25,
"end": 26,
"start": 32,
"end": 33,
"loc": {
"start": {
"line": 1,
"column": 25
"column": 32
},
"end": {
"line": 1,
"column": 26
"column": 33
}
},
"extra": {
@ -192,36 +225,6 @@
"raw": "1"
},
"value": 1
},
"typeAnnotation": {
"type": "TypeAnnotation",
"start": 26,
"end": 33,
"loc": {
"start": {
"line": 1,
"column": 26
},
"end": {
"line": 1,
"column": 33
}
},
"typeAnnotation": {
"type": "NumberTypeAnnotation",
"start": 27,
"end": 33,
"loc": {
"start": {
"line": 1,
"column": 27
},
"end": {
"line": 1,
"column": 33
}
}
}
}
}
],
@ -246,4 +249,4 @@
],
"directives": []
}
}
}

1
test/fixtures/flow/type-annotations/with-default-invalid/actual.js vendored Normal file
View File

@ -0,0 +1 @@
function x(foo = "1": string) {}

3
test/fixtures/flow/type-annotations/with-default-invalid/options.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"throws": "Type annotations must come before default assignments, e.g. instead of `age = 25: number` use `age: number = 25` (1:20)"
}

1
test/fixtures/flow/type-annotations/with-default-valid/actual.js vendored Normal file
View File

@ -0,0 +1 @@
function x(foo: string = "1") {}

170
test/fixtures/flow/type-annotations/with-default-valid/expected.json vendored Normal file
View File

@ -0,0 +1,170 @@
{
"type": "File",
"start": 0,
"end": 32,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 32
}
},
"program": {
"type": "Program",
"start": 0,
"end": 32,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 32
}
},
"sourceType": "module",
"body": [
{
"type": "FunctionDeclaration",
"start": 0,
"end": 32,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 32
}
},
"id": {
"type": "Identifier",
"start": 9,
"end": 10,
"loc": {
"start": {
"line": 1,
"column": 9
},
"end": {
"line": 1,
"column": 10
},
"identifierName": "x"
},
"name": "x"
},
"generator": false,
"expression": false,
"async": false,
"params": [
{
"type": "AssignmentPattern",
"start": 11,
"end": 28,
"loc": {
"start": {
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 28
}
},
"left": {
"type": "Identifier",
"start": 11,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 22
},
"identifierName": "foo"
},
"name": "foo",
"typeAnnotation": {
"type": "TypeAnnotation",
"start": 14,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 14
},
"end": {
"line": 1,
"column": 22
}
},
"typeAnnotation": {
"type": "StringTypeAnnotation",
"start": 16,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 16
},
"end": {
"line": 1,
"column": 22
}
}
}
}
},
"right": {
"type": "StringLiteral",
"start": 25,
"end": 28,
"loc": {
"start": {
"line": 1,
"column": 25
},
"end": {
"line": 1,
"column": 28
}
},
"extra": {
"rawValue": "1",
"raw": "\"1\""
},
"value": "1"
}
}
],
"body": {
"type": "BlockStatement",
"start": 30,
"end": 32,
"loc": {
"start": {
"line": 1,
"column": 30
},
"end": {
"line": 1,
"column": 32
}
},
"body": [],
"directives": []
}
}
],
"directives": []
}
}