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

[babel 8] Use an identifier for TSTypeParameter.name (#12829)

Browse Source
This commit is contained in:
Federico Ciardi
2021-07-02 10:44:49 +02:00
committed by GitHub
parent 6df0b7c25f
commit 9bad558d13
177 changed files with 4546 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/babel-parser/src/plugins/typescript/index.js
View File

@@ -485,7 +485,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
tsParseTypeParameter(): N.TsTypeParameter {
const node: N.TsTypeParameter = this.startNode();
node.name = this.parseIdentifierName(node.start);
node.name = this.tsParseTypeParameterName();
node.constraint = this.tsEatThenParseType(tt._extends);
node.default = this.tsEatThenParseType(tt.eq);
return this.finishNode(node, "TSTypeParameter");
@@ -777,7 +777,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
tsParseMappedTypeParameter(): N.TsTypeParameter {
const node: N.TsTypeParameter = this.startNode();
node.name = this.parseIdentifierName(node.start);
node.name = this.tsParseTypeParameterName();
node.constraint = this.tsExpectThenParseType(tt._in);
return this.finishNode(node, "TSTypeParameter");
}
@@ -1091,7 +1091,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
const node = this.startNode();
this.expectContextual("infer");
const typeParameter = this.startNode();
typeParameter.name = this.parseIdentifierName(typeParameter.start);
typeParameter.name = this.tsParseTypeParameterName();
node.typeParameter = this.finishNode(typeParameter, "TSTypeParameter");
return this.finishNode(node, "TSInferType");
}
@@ -3191,6 +3191,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
return method;
}
tsParseTypeParameterName(): N.Identifier | string {
const typeName: N.Identifier = this.parseIdentifier();
return process.env.BABEL_8_BREAKING ? typeName : typeName.name;
}
shouldParseAsAmbientContext(): boolean {
return !!this.getPluginOption("typescript", "dts");
}

13
packages/babel-parser/src/types.js
View File

@@ -960,7 +960,7 @@ export type TsTypeAnnotation = NodeBase & {
};
export type TypeParameterDeclarationBase = NodeBase & {
params: $ReadOnlyArray<TypeParameterBase>,
params: $ReadOnlyArray<TypeParameter | TsTypeParameter>,
};
export type TypeParameterDeclaration = TypeParameterDeclarationBase & {
@@ -973,17 +973,16 @@ export type TsTypeParameterDeclaration = TypeParameterDeclarationBase & {
params: $ReadOnlyArray<TsTypeParameter>,
};
export type TypeParameterBase = NodeBase & {
name: string,
};
export type TypeParameter = TypeParameterBase & {
export type TypeParameter = NodeBase & {
type: "TypeParameter",
name: string,
default?: TypeAnnotation,
};
export type TsTypeParameter = TypeParameterBase & {
export type TsTypeParameter = NodeBase & {
type: "TSTypeParameter",
// TODO(Babel-8): remove string type support
name: string | Identifier,
constraint?: TsType,
default?: TsType,
};