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

Flow enums: fix enum body location (#10737)

Browse Source
This commit is contained in:
George Zahariev 2019-11-19 20:46:09 -08:00 committed by Brian Ng
parent 6ba113197f
commit 01d6d6dd3b
32 changed files with 235 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3250,34 +3250,32 @@ export default (superClass: Class<Parser>): Class<Parser> =>
return members;
}
flowEnumStringBody(
bodyNode: N.Node,
flowEnumStringMembers(
initializedMembers: Array<N.Node>,
defaultedMembers: Array<N.Node>,
{ enumName }: { enumName: string },
): N.Node {
): Array<N.Node> {
if (initializedMembers.length === 0) {
bodyNode.members = defaultedMembers;
return defaultedMembers;
} else if (defaultedMembers.length === 0) {
bodyNode.members = initializedMembers;
return initializedMembers;
} else if (defaultedMembers.length > initializedMembers.length) {
bodyNode.members = defaultedMembers;
for (const member of initializedMembers) {
this.flowEnumErrorStringMemberInconsistentlyInitailized(
member.start,
{ enumName },
);
}
return defaultedMembers;
} else {
bodyNode.members = initializedMembers;
for (const member of defaultedMembers) {
this.flowEnumErrorStringMemberInconsistentlyInitailized(
member.start,
{ enumName },
);
}
return initializedMembers;
}
return this.finishNode(bodyNode, "EnumStringBody");
}
flowEnumParseExplicitType({
@ -3313,85 +3311,94 @@ export default (superClass: Class<Parser>): Class<Parser> =>
return null;
}
flowParseEnumDeclaration(node: N.Node): N.Node {
const id = this.parseIdentifier();
node.id = id;
const enumName = id.name;
flowEnumBody(node: N.Node, { enumName, nameLoc }): N.Node {
const explicitType = this.flowEnumParseExplicitType({ enumName });
this.expect(tt.braceL);
const bodyNode = this.startNode();
const members = this.flowEnumMembers({ enumName, explicitType });
switch (explicitType) {
case "boolean":
bodyNode.explicitType = true;
bodyNode.members = members.booleanMembers;
node.body = this.finishNode(bodyNode, "EnumBooleanBody");
break;
node.explicitType = true;
node.members = members.booleanMembers;
this.expect(tt.braceR);
return this.finishNode(node, "EnumBooleanBody");
case "number":
bodyNode.explicitType = true;
bodyNode.members = members.numberMembers;
node.body = this.finishNode(bodyNode, "EnumNumberBody");
break;
node.explicitType = true;
node.members = members.numberMembers;
this.expect(tt.braceR);
return this.finishNode(node, "EnumNumberBody");
case "string":
bodyNode.explicitType = true;
node.body = this.flowEnumStringBody(
bodyNode,
node.explicitType = true;
node.members = this.flowEnumStringMembers(
members.stringMembers,
members.defaultedMembers,
{ enumName },
);
break;
this.expect(tt.braceR);
return this.finishNode(node, "EnumStringBody");
case "symbol":
bodyNode.members = members.defaultedMembers;
node.body = this.finishNode(bodyNode, "EnumSymbolBody");
break;
node.members = members.defaultedMembers;
this.expect(tt.braceR);
return this.finishNode(node, "EnumSymbolBody");
default: {
// null
// `explicitType` is `null`
const empty = () => {
bodyNode.members = [];
return this.finishNode(bodyNode, "EnumStringBody");
node.members = [];
this.expect(tt.braceR);
return this.finishNode(node, "EnumStringBody");
};
bodyNode.explicitType = false;
node.explicitType = false;
const boolsLen = members.booleanMembers.length;
const numsLen = members.numberMembers.length;
const strsLen = members.stringMembers.length;
const defaultedLen = members.defaultedMembers.length;
if (!boolsLen && !numsLen && !strsLen && !defaultedLen) {
node.body = empty();
return empty();
} else if (!boolsLen && !numsLen) {
node.body = this.flowEnumStringBody(
bodyNode,
node.members = this.flowEnumStringMembers(
members.stringMembers,
members.defaultedMembers,
{ enumName },
);
this.expect(tt.braceR);
return this.finishNode(node, "EnumStringBody");
} else if (!numsLen && !strsLen && boolsLen >= defaultedLen) {
bodyNode.members = members.booleanMembers;
node.body = this.finishNode(bodyNode, "EnumBooleanBody");
for (const member of members.defaultedMembers) {
this.flowEnumErrorBooleanMemberNotInitialized(member.start, {
enumName,
memberName: member.id.name,
});
}
node.members = members.booleanMembers;
this.expect(tt.braceR);
return this.finishNode(node, "EnumBooleanBody");
} else if (!boolsLen && !strsLen && numsLen >= defaultedLen) {
bodyNode.members = members.numberMembers;
node.body = this.finishNode(bodyNode, "EnumNumberBody");
for (const member of members.defaultedMembers) {
this.flowEnumErrorNumberMemberNotInitialized(member.start, {
enumName,
memberName: member.id.name,
});
}
} else {
node.body = empty();
this.flowEnumErrorInconsistentMemberValues(id.start, { enumName });
}
}
}
node.members = members.numberMembers;
this.expect(tt.braceR);
return this.finishNode(node, "EnumNumberBody");
} else {
this.flowEnumErrorInconsistentMemberValues(nameLoc, { enumName });
return empty();
}
}
}
}
flowParseEnumDeclaration(node: N.Node): N.Node {
const id = this.parseIdentifier();
node.id = id;
node.body = this.flowEnumBody(this.startNode(), {
enumName: id.name,
nameLoc: id.start,
});
return this.finishNode(node, "EnumDeclaration");
}
};

12
packages/babel-parser/test/fixtures/flow/enum-declaration/boolean-explicit/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumBooleanBody",
"start": 22,
"end": 44,
"start": 7,
"end": 46,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 12
"line": 4,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/boolean-implicit/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumBooleanBody",
"start": 11,
"end": 33,
"start": 7,
"end": 35,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 12
"line": 4,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/boolean-member-not-initialized-explicit/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumBooleanBody",
"start": 22,
"end": 24,
"start": 7,
"end": 26,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 2,
"column": 4
"line": 3,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/boolean-member-not-initialized-implicit/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumBooleanBody",
"start": 11,
"end": 25,
"start": 7,
"end": 27,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 11
"line": 4,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/duplicate-member-name/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 11,
"end": 18,
"start": 7,
"end": 20,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 4
"line": 4,
"column": 1
}
},
"explicitType": false,

8
packages/babel-parser/test/fixtures/flow/enum-declaration/empty/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 9,
"end": 8,
"start": 7,
"end": 10,
"loc": {
"start": {
"line": 1,
"column": 9
"column": 7
},
"end": {
"line": 1,
"column": 8
"column": 10
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/enum-name/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 12,
"end": 11,
"start": 10,
"end": 13,
"loc": {
"start": {
"line": 2,
"column": 0
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 11
"line": 2,
"column": 1
}
},
"explicitType": false,

16
packages/babel-parser/test/fixtures/flow/enum-declaration/export/output.json vendored
View File

@ -79,16 +79,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 15,
"end": 15,
"start": 14,
"end": 16,
"loc": {
"start": {
"line": 1,
"column": 15
"column": 14
},
"end": {
"line": 1,
"column": 15
"column": 16
}
},
"explicitType": false,
@ -143,16 +143,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 41,
"end": 41,
"start": 40,
"end": 42,
"loc": {
"start": {
"line": 3,
"column": 23
"column": 22
},
"end": {
"line": 3,
"column": 23
"column": 24
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/inconsistent-member-values-majority-defaulted/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 11,
"end": 27,
"start": 7,
"end": 29,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 4,
"column": 8
"line": 5,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/inconsistent-member-values-mixed-initializers/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 11,
"end": 29,
"start": 7,
"end": 31,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 11
"line": 4,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/invalid-explicit-type-identifier/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 16,
"end": 15,
"start": 7,
"end": 17,
"loc": {
"start": {
"line": 2,
"column": 0
"line": 1,
"column": 7
},
"end": {
"line": 1,
"column": 15
"line": 2,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/invalid-member-initializer-boolean-explicit-string/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 21,
"end": 30,
"start": 7,
"end": 32,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 2,
"column": 11
"line": 3,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/invalid-member-initializer-literal-explicit-symbol/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumSymbolBody",
"start": 21,
"end": 27,
"start": 7,
"end": 29,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 2,
"column": 8
"line": 3,
"column": 1
}
},
"members": []

12
packages/babel-parser/test/fixtures/flow/enum-declaration/invalid-member-initializer-number-explicit-boolean/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumBooleanBody",
"start": 22,
"end": 28,
"start": 7,
"end": 30,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 2,
"column": 8
"line": 3,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/invalid-member-initializer-number-explicit-string/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 21,
"end": 27,
"start": 7,
"end": 29,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 2,
"column": 8
"line": 3,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/invalid-member-initializer-string-explicit-boolean/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumBooleanBody",
"start": 22,
"end": 31,
"start": 7,
"end": 33,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 2,
"column": 11
"line": 3,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/invalid-member-initializer-string-explicit-number/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumNumberBody",
"start": 21,
"end": 30,
"start": 7,
"end": 32,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 2,
"column": 11
"line": 3,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/invalid-member-name/output.json vendored
View File

@ -66,16 +66,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 11,
"end": 22,
"start": 7,
"end": 24,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 6
"line": 4,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/no-trailing-comma/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 11,
"end": 12,
"start": 7,
"end": 14,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 2,
"column": 3
"line": 3,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/number-explicit/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumNumberBody",
"start": 21,
"end": 36,
"start": 7,
"end": 38,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 8
"line": 4,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/number-implicit/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumNumberBody",
"start": 11,
"end": 26,
"start": 7,
"end": 28,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 8
"line": 4,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/number-member-not-initialized-explicit/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumNumberBody",
"start": 21,
"end": 23,
"start": 7,
"end": 25,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 2,
"column": 4
"line": 3,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/number-member-not-initialized-implicit/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumNumberBody",
"start": 11,
"end": 22,
"start": 7,
"end": 24,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 8
"line": 4,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/reserved-word-enum-name/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 13,
"end": 12,
"start": 11,
"end": 14,
"loc": {
"start": {
"line": 2,
"column": 0
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 12
"line": 2,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/string-explicit-defaulted/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 21,
"end": 28,
"start": 7,
"end": 30,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 4
"line": 4,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/string-explicit-initialized/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 21,
"end": 40,
"start": 7,
"end": 42,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 10
"line": 4,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/string-implicit-defaulted/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 11,
"end": 18,
"start": 7,
"end": 20,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 4
"line": 4,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/string-implicit-initialized/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 11,
"end": 30,
"start": 7,
"end": 32,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 10
"line": 4,
"column": 1
}
},
"explicitType": false,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/string-member-inconsistently-initialized-majority-defaulted/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 21,
"end": 39,
"start": 7,
"end": 41,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 4,
"column": 4
"line": 5,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/string-member-inconsistently-initialized-majority-initialized/output.json vendored
View File

@ -65,16 +65,16 @@
},
"body": {
"type": "EnumStringBody",
"start": 21,
"end": 45,
"start": 7,
"end": 47,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 4,
"column": 10
"line": 5,
"column": 1
}
},
"explicitType": true,

12
packages/babel-parser/test/fixtures/flow/enum-declaration/symbol/output.json vendored
View File

@ -62,16 +62,16 @@
},
"body": {
"type": "EnumSymbolBody",
"start": 21,
"end": 28,
"start": 7,
"end": 30,
"loc": {
"start": {
"line": 2,
"column": 2
"line": 1,
"column": 7
},
"end": {
"line": 3,
"column": 4
"line": 4,
"column": 1
}
},
"members": [