Skip to content

Commit 5511172

Browse files
nicolo-ribaudonicolo-ribaudo
authored
[babel 8] Rename superTypeParameters -> superTypeArguments (#16997)
1 parent c407283 commit 5511172

File tree

49 files changed

+637
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+637
-30
lines changed

‎eslint/babel-eslint-parser/src/analyze-scope.cts

+8-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,14 @@ class Referencer extends OriginalReferencer {
117117

118118
// Flow super types.
119119
this._visitTypeAnnotation(node.implements);
120-
this._visitTypeAnnotation(node.superTypeParameters?.params);
120+
this._visitTypeAnnotation(
121+
(process.env.BABEL_8_BREAKING
122+
? // @ts-ignore(Babel 7 vs Babel 8) Renamed
123+
node.superTypeArguments
124+
: // @ts-ignore(Babel 7 vs Babel 8) Renamed
125+
node.superTypeParameters
126+
)?.params,
127+
);
121128

122129
// Basic.
123130
super.visitClass(node);

‎packages/babel-generator/src/generators/classes.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,13 @@ export function ClassDeclaration(
5252
this.word("extends");
5353
this.space();
5454
this.print(node.superClass);
55-
this.print(node.superTypeParameters);
55+
this.print(
56+
process.env.BABEL_8_BREAKING
57+
? // @ts-ignore(Babel 7 vs Babel 8) Renamed
58+
node.superTypeArguments
59+
: // @ts-ignore(Babel 7 vs Babel 8) Renamed
60+
node.superTypeParameters,
61+
);
5662
}
5763

5864
if (node.implements) {

‎packages/babel-parser/src/plugins/flow/index.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -2585,7 +2585,11 @@ export default (superClass: typeof Parser) =>
25852585
parseClassSuper(node: N.Class): void {
25862586
super.parseClassSuper(node);
25872587
if (node.superClass && this.match(tt.lt)) {
2588-
node.superTypeParameters = this.flowParseTypeParameterInstantiation();
2588+
if (process.env.BABEL_8_BREAKING) {
2589+
node.superTypeArguments = this.flowParseTypeParameterInstantiation();
2590+
} else {
2591+
node.superTypeParameters = this.flowParseTypeParameterInstantiation();
2592+
}
25892593
}
25902594
if (this.isContextual(tt._implements)) {
25912595
this.next();

‎packages/babel-parser/src/plugins/typescript/index.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3352,7 +3352,11 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
33523352
super.parseClassSuper(node);
33533353
// handle `extends f<<T>
33543354
if (node.superClass && (this.match(tt.lt) || this.match(tt.bitShiftL))) {
3355-
node.superTypeParameters = this.tsParseTypeArgumentsInExpression();
3355+
if (process.env.BABEL_8_BREAKING) {
3356+
node.superTypeArguments = this.tsParseTypeArgumentsInExpression();
3357+
} else {
3358+
node.superTypeParameters = this.tsParseTypeArgumentsInExpression();
3359+
}
33563360
}
33573361
if (this.eatContextual(tt._implements)) {
33583362
node.implements = this.tsParseHeritageClause("implements");

‎packages/babel-parser/src/types.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,8 @@ export interface ClassBase extends HasDecorators {
865865
decorators?: Decorator[];
866866
// TODO: All not in spec
867867
typeParameters?: TypeParameterDeclarationBase | null;
868-
superTypeParameters?: TypeParameterInstantiationBase | null;
868+
superTypeParameters?: TypeParameterInstantiationBase | null; // babel 7
869+
superTypeArguments?: TypeParameterInstantiationBase | null; // babel 8
869870
abstract?: boolean;
870871
implements?: TSClassImplements[] | undefined | null | FlowClassImplements[];
871872
}

‎packages/babel-parser/test/fixtures/flow/type-annotations/46-babel-7/input.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a = class Foo<T> extends Bar<T> { }

‎packages/babel-parser/test/fixtures/flow/type-annotations/46-babel-7/options.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"BABEL_8_BREAKING": false
3+
}

‎packages/babel-parser/test/fixtures/flow/type-annotations/46-babel-7/output.json

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"type": "File",
3+
"start":0,"end":35,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":35,"index":35}},
4+
"program": {
5+
"type": "Program",
6+
"start":0,"end":35,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":35,"index":35}},
7+
"sourceType": "module",
8+
"interpreter": null,
9+
"body": [
10+
{
11+
"type": "ExpressionStatement",
12+
"start":0,"end":35,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":35,"index":35}},
13+
"expression": {
14+
"type": "AssignmentExpression",
15+
"start":0,"end":35,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":35,"index":35}},
16+
"operator": "=",
17+
"left": {
18+
"type": "Identifier",
19+
"start":0,"end":1,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":1,"index":1},"identifierName":"a"},
20+
"name": "a"
21+
},
22+
"right": {
23+
"type": "ClassExpression",
24+
"start":4,"end":35,"loc":{"start":{"line":1,"column":4,"index":4},"end":{"line":1,"column":35,"index":35}},
25+
"id": {
26+
"type": "Identifier",
27+
"start":10,"end":13,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":13,"index":13},"identifierName":"Foo"},
28+
"name": "Foo"
29+
},
30+
"typeParameters": {
31+
"type": "TypeParameterDeclaration",
32+
"start":13,"end":16,"loc":{"start":{"line":1,"column":13,"index":13},"end":{"line":1,"column":16,"index":16}},
33+
"params": [
34+
{
35+
"type": "TypeParameter",
36+
"start":14,"end":15,"loc":{"start":{"line":1,"column":14,"index":14},"end":{"line":1,"column":15,"index":15}},
37+
"name": "T",
38+
"variance": null
39+
}
40+
]
41+
},
42+
"superClass": {
43+
"type": "Identifier",
44+
"start":25,"end":28,"loc":{"start":{"line":1,"column":25,"index":25},"end":{"line":1,"column":28,"index":28},"identifierName":"Bar"},
45+
"name": "Bar"
46+
},
47+
"superTypeParameters": {
48+
"type": "TypeParameterInstantiation",
49+
"start":28,"end":31,"loc":{"start":{"line":1,"column":28,"index":28},"end":{"line":1,"column":31,"index":31}},
50+
"params": [
51+
{
52+
"type": "GenericTypeAnnotation",
53+
"start":29,"end":30,"loc":{"start":{"line":1,"column":29,"index":29},"end":{"line":1,"column":30,"index":30}},
54+
"typeParameters": null,
55+
"id": {
56+
"type": "Identifier",
57+
"start":29,"end":30,"loc":{"start":{"line":1,"column":29,"index":29},"end":{"line":1,"column":30,"index":30},"identifierName":"T"},
58+
"name": "T"
59+
}
60+
}
61+
]
62+
},
63+
"body": {
64+
"type": "ClassBody",
65+
"start":32,"end":35,"loc":{"start":{"line":1,"column":32,"index":32},"end":{"line":1,"column":35,"index":35}},
66+
"body": []
67+
}
68+
}
69+
}
70+
}
71+
],
72+
"directives": [],
73+
"extra": {
74+
"topLevelAwait": false
75+
}
76+
}
77+
}

‎packages/babel-parser/test/fixtures/flow/type-annotations/46/options.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"BABEL_8_BREAKING": true
3+
}

‎packages/babel-parser/test/fixtures/flow/type-annotations/46/output.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"start":25,"end":28,"loc":{"start":{"line":1,"column":25,"index":25},"end":{"line":1,"column":28,"index":28},"identifierName":"Bar"},
4545
"name": "Bar"
4646
},
47-
"superTypeParameters": {
47+
"superTypeArguments": {
4848
"type": "TypeParameterInstantiation",
4949
"start":28,"end":31,"loc":{"start":{"line":1,"column":28,"index":28},"end":{"line":1,"column":31,"index":31}},
5050
"params": [

‎packages/babel-parser/test/fixtures/flow/type-annotations/48-babel-7/input.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
class Foo<T> extends Bar<T> { }

‎packages/babel-parser/test/fixtures/flow/type-annotations/48-babel-7/options.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"BABEL_8_BREAKING": false
3+
}

‎packages/babel-parser/test/fixtures/flow/type-annotations/48-babel-7/output.json

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"type": "File",
3+
"start":0,"end":31,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":31,"index":31}},
4+
"program": {
5+
"type": "Program",
6+
"start":0,"end":31,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":31,"index":31}},
7+
"sourceType": "module",
8+
"interpreter": null,
9+
"body": [
10+
{
11+
"type": "ClassDeclaration",
12+
"start":0,"end":31,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":31,"index":31}},
13+
"id": {
14+
"type": "Identifier",
15+
"start":6,"end":9,"loc":{"start":{"line":1,"column":6,"index":6},"end":{"line":1,"column":9,"index":9},"identifierName":"Foo"},
16+
"name": "Foo"
17+
},
18+
"typeParameters": {
19+
"type": "TypeParameterDeclaration",
20+
"start":9,"end":12,"loc":{"start":{"line":1,"column":9,"index":9},"end":{"line":1,"column":12,"index":12}},
21+
"params": [
22+
{
23+
"type": "TypeParameter",
24+
"start":10,"end":11,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":11,"index":11}},
25+
"name": "T",
26+
"variance": null
27+
}
28+
]
29+
},
30+
"superClass": {
31+
"type": "Identifier",
32+
"start":21,"end":24,"loc":{"start":{"line":1,"column":21,"index":21},"end":{"line":1,"column":24,"index":24},"identifierName":"Bar"},
33+
"name": "Bar"
34+
},
35+
"superTypeParameters": {
36+
"type": "TypeParameterInstantiation",
37+
"start":24,"end":27,"loc":{"start":{"line":1,"column":24,"index":24},"end":{"line":1,"column":27,"index":27}},
38+
"params": [
39+
{
40+
"type": "GenericTypeAnnotation",
41+
"start":25,"end":26,"loc":{"start":{"line":1,"column":25,"index":25},"end":{"line":1,"column":26,"index":26}},
42+
"typeParameters": null,
43+
"id": {
44+
"type": "Identifier",
45+
"start":25,"end":26,"loc":{"start":{"line":1,"column":25,"index":25},"end":{"line":1,"column":26,"index":26},"identifierName":"T"},
46+
"name": "T"
47+
}
48+
}
49+
]
50+
},
51+
"body": {
52+
"type": "ClassBody",
53+
"start":28,"end":31,"loc":{"start":{"line":1,"column":28,"index":28},"end":{"line":1,"column":31,"index":31}},
54+
"body": []
55+
}
56+
}
57+
],
58+
"directives": [],
59+
"extra": {
60+
"topLevelAwait": false
61+
}
62+
}
63+
}

‎packages/babel-parser/test/fixtures/flow/type-annotations/48/options.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"BABEL_8_BREAKING": true
3+
}

‎packages/babel-parser/test/fixtures/flow/type-annotations/48/output.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"start":21,"end":24,"loc":{"start":{"line":1,"column":21,"index":21},"end":{"line":1,"column":24,"index":24},"identifierName":"Bar"},
3333
"name": "Bar"
3434
},
35-
"superTypeParameters": {
35+
"superTypeArguments": {
3636
"type": "TypeParameterInstantiation",
3737
"start":24,"end":27,"loc":{"start":{"line":1,"column":24,"index":24},"end":{"line":1,"column":27,"index":27}},
3838
"params": [

‎packages/babel-parser/test/fixtures/typescript/class/expression-extends-babel-7/input.ts

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
(class extends f()<T> {});
2+
(class C extends f()<T> {});

‎packages/babel-parser/test/fixtures/typescript/class/expression-extends-babel-7/options.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"BABEL_8_BREAKING": false
3+
}

‎packages/babel-parser/test/fixtures/typescript/class/expression-extends-babel-7/output.json

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{
2+
"type": "File",
3+
"start":0,"end":55,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":28,"index":55}},
4+
"program": {
5+
"type": "Program",
6+
"start":0,"end":55,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":28,"index":55}},
7+
"sourceType": "module",
8+
"interpreter": null,
9+
"body": [
10+
{
11+
"type": "ExpressionStatement",
12+
"start":0,"end":26,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":26,"index":26}},
13+
"expression": {
14+
"type": "ClassExpression",
15+
"start":1,"end":24,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":24,"index":24}},
16+
"id": null,
17+
"superClass": {
18+
"type": "CallExpression",
19+
"start":15,"end":18,"loc":{"start":{"line":1,"column":15,"index":15},"end":{"line":1,"column":18,"index":18}},
20+
"callee": {
21+
"type": "Identifier",
22+
"start":15,"end":16,"loc":{"start":{"line":1,"column":15,"index":15},"end":{"line":1,"column":16,"index":16},"identifierName":"f"},
23+
"name": "f"
24+
},
25+
"arguments": []
26+
},
27+
"superTypeParameters": {
28+
"type": "TSTypeParameterInstantiation",
29+
"start":18,"end":21,"loc":{"start":{"line":1,"column":18,"index":18},"end":{"line":1,"column":21,"index":21}},
30+
"params": [
31+
{
32+
"type": "TSTypeReference",
33+
"start":19,"end":20,"loc":{"start":{"line":1,"column":19,"index":19},"end":{"line":1,"column":20,"index":20}},
34+
"typeName": {
35+
"type": "Identifier",
36+
"start":19,"end":20,"loc":{"start":{"line":1,"column":19,"index":19},"end":{"line":1,"column":20,"index":20},"identifierName":"T"},
37+
"name": "T"
38+
}
39+
}
40+
]
41+
},
42+
"body": {
43+
"type": "ClassBody",
44+
"start":22,"end":24,"loc":{"start":{"line":1,"column":22,"index":22},"end":{"line":1,"column":24,"index":24}},
45+
"body": []
46+
},
47+
"extra": {
48+
"parenthesized": true,
49+
"parenStart": 0
50+
}
51+
}
52+
},
53+
{
54+
"type": "ExpressionStatement",
55+
"start":27,"end":55,"loc":{"start":{"line":2,"column":0,"index":27},"end":{"line":2,"column":28,"index":55}},
56+
"expression": {
57+
"type": "ClassExpression",
58+
"start":28,"end":53,"loc":{"start":{"line":2,"column":1,"index":28},"end":{"line":2,"column":26,"index":53}},
59+
"id": {
60+
"type": "Identifier",
61+
"start":34,"end":35,"loc":{"start":{"line":2,"column":7,"index":34},"end":{"line":2,"column":8,"index":35},"identifierName":"C"},
62+
"name": "C"
63+
},
64+
"superClass": {
65+
"type": "CallExpression",
66+
"start":44,"end":47,"loc":{"start":{"line":2,"column":17,"index":44},"end":{"line":2,"column":20,"index":47}},
67+
"callee": {
68+
"type": "Identifier",
69+
"start":44,"end":45,"loc":{"start":{"line":2,"column":17,"index":44},"end":{"line":2,"column":18,"index":45},"identifierName":"f"},
70+
"name": "f"
71+
},
72+
"arguments": []
73+
},
74+
"superTypeParameters": {
75+
"type": "TSTypeParameterInstantiation",
76+
"start":47,"end":50,"loc":{"start":{"line":2,"column":20,"index":47},"end":{"line":2,"column":23,"index":50}},
77+
"params": [
78+
{
79+
"type": "TSTypeReference",
80+
"start":48,"end":49,"loc":{"start":{"line":2,"column":21,"index":48},"end":{"line":2,"column":22,"index":49}},
81+
"typeName": {
82+
"type": "Identifier",
83+
"start":48,"end":49,"loc":{"start":{"line":2,"column":21,"index":48},"end":{"line":2,"column":22,"index":49},"identifierName":"T"},
84+
"name": "T"
85+
}
86+
}
87+
]
88+
},
89+
"body": {
90+
"type": "ClassBody",
91+
"start":51,"end":53,"loc":{"start":{"line":2,"column":24,"index":51},"end":{"line":2,"column":26,"index":53}},
92+
"body": []
93+
},
94+
"extra": {
95+
"parenthesized": true,
96+
"parenStart": 27
97+
}
98+
}
99+
}
100+
],
101+
"directives": [],
102+
"extra": {
103+
"topLevelAwait": false
104+
}
105+
}
106+
}

‎packages/babel-parser/test/fixtures/typescript/class/expression-extends-implements-babel-7/options.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
22
"BABEL_8_BREAKING": false
3-
}
3+
}

‎packages/babel-parser/test/fixtures/typescript/class/expression-extends-implements/options.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
22
"BABEL_8_BREAKING": true
3-
}
3+
}

‎packages/babel-parser/test/fixtures/typescript/class/expression-extends-implements/output.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"arguments": []
2626
},
27-
"superTypeParameters": {
27+
"superTypeArguments": {
2828
"type": "TSTypeParameterInstantiation",
2929
"start":18,"end":21,"loc":{"start":{"line":1,"column":18,"index":18},"end":{"line":1,"column":21,"index":21}},
3030
"params": [
@@ -106,7 +106,7 @@
106106
},
107107
"arguments": []
108108
},
109-
"superTypeParameters": {
109+
"superTypeArguments": {
110110
"type": "TSTypeParameterInstantiation",
111111
"start":65,"end":68,"loc":{"start":{"line":2,"column":20,"index":65},"end":{"line":2,"column":23,"index":68}},
112112
"params": [

0 commit comments

Comments
 (0)