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

Allow statics in flow interfaces (#427)

Browse Source
This commit is contained in:
Brian Ng 2017-03-23 16:10:07 -05:00 committed by Daniel Tschinder
parent e4e1cb0bda
commit a495d7f65d
3 changed files with 248 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/flow.js
View File

@ -69,7 +69,7 @@ pp.flowParseTypeAndPredicateInitialiser = function () {
pp.flowParseDeclareClass = function (node) { pp.flowParseDeclareClass = function (node) {
this.next(); this.next();
this.flowParseInterfaceish(node, true); this.flowParseInterfaceish(node);
return this.finishNode(node, "DeclareClass"); return this.finishNode(node, "DeclareClass");
}; };
@ -194,7 +194,7 @@ pp.flowParseDeclareInterface = function (node) {
// Interfaces // Interfaces
pp.flowParseInterfaceish = function (node, allowStatic) { pp.flowParseInterfaceish = function (node) {
node.id = this.parseIdentifier(); node.id = this.parseIdentifier();
if (this.isRelational("<")) { if (this.isRelational("<")) {
@ -219,7 +219,7 @@ pp.flowParseInterfaceish = function (node, allowStatic) {
} while (this.eat(tt.comma)); } while (this.eat(tt.comma));
} }
node.body = this.flowParseObjectType(allowStatic); node.body = this.flowParseObjectType(true);
}; };
pp.flowParseInterfaceExtends = function () { pp.flowParseInterfaceExtends = function () {
@ -236,7 +236,7 @@ pp.flowParseInterfaceExtends = function () {
}; };
pp.flowParseInterface = function (node) { pp.flowParseInterface = function (node) {
this.flowParseInterfaceish(node, false); this.flowParseInterfaceish(node);
return this.finishNode(node, "InterfaceDeclaration"); return this.finishNode(node, "InterfaceDeclaration");
}; };

5
test/fixtures/flow/interfaces-module-and-script/10/actual.js vendored Normal file
View File

@ -0,0 +1,5 @@
interface IFoo {
x: boolean;
static (): void;
static y: boolean;
}

239
test/fixtures/flow/interfaces-module-and-script/10/expected.json vendored Normal file
View File

@ -0,0 +1,239 @@
{
"type": "File",
"start": 0,
"end": 72,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"program": {
"type": "Program",
"start": 0,
"end": 72,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"sourceType": "module",
"body": [
{
"type": "InterfaceDeclaration",
"start": 0,
"end": 72,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"id": {
"type": "Identifier",
"start": 10,
"end": 14,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 14
},
"identifierName": "IFoo"
},
"name": "IFoo"
},
"typeParameters": null,
"extends": [],
"mixins": [],
"body": {
"type": "ObjectTypeAnnotation",
"start": 15,
"end": 72,
"loc": {
"start": {
"line": 1,
"column": 15
},
"end": {
"line": 5,
"column": 1
}
},
"callProperties": [
{
"type": "ObjectTypeCallProperty",
"start": 33,
"end": 49,
"loc": {
"start": {
"line": 3,
"column": 2
},
"end": {
"line": 3,
"column": 18
}
},
"static": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 40,
"end": 48,
"loc": {
"start": {
"line": 3,
"column": 9
},
"end": {
"line": 3,
"column": 17
}
},
"params": [],
"rest": null,
"typeParameters": null,
"returnType": {
"type": "VoidTypeAnnotation",
"start": 44,
"end": 48,
"loc": {
"start": {
"line": 3,
"column": 13
},
"end": {
"line": 3,
"column": 17
}
}
}
}
}
],
"properties": [
{
"type": "ObjectTypeProperty",
"start": 19,
"end": 30,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 13
}
},
"key": {
"type": "Identifier",
"start": 19,
"end": 20,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 3
},
"identifierName": "x"
},
"name": "x"
},
"value": {
"type": "BooleanTypeAnnotation",
"start": 22,
"end": 29,
"loc": {
"start": {
"line": 2,
"column": 5
},
"end": {
"line": 2,
"column": 12
}
}
},
"optional": false,
"static": false,
"variance": null
},
{
"type": "ObjectTypeProperty",
"start": 52,
"end": 70,
"loc": {
"start": {
"line": 4,
"column": 2
},
"end": {
"line": 4,
"column": 20
}
},
"key": {
"type": "Identifier",
"start": 59,
"end": 60,
"loc": {
"start": {
"line": 4,
"column": 9
},
"end": {
"line": 4,
"column": 10
},
"identifierName": "y"
},
"name": "y"
},
"value": {
"type": "BooleanTypeAnnotation",
"start": 62,
"end": 69,
"loc": {
"start": {
"line": 4,
"column": 12
},
"end": {
"line": 4,
"column": 19
}
}
},
"optional": false,
"static": true,
"variance": null
}
],
"indexers": [],
"exact": false
}
}
],
"directives": []
}
}