fix: parse type parameters with inType context (#14384)

babel · Mar 23, 2022 · 326c420 · 326c420
1 parent e54bc6b
commit 326c420
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -1614,9 +1614,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     ): N.TsTypeAliasDeclaration {
       node.id = this.parseIdentifier();
       this.checkIdentifier(node.id, BIND_TS_TYPE);
-
-      node.typeParameters = this.tsTryParseTypeParameters();
       node.typeAnnotation = this.tsInType(() => {
+        node.typeParameters = this.tsTryParseTypeParameters();
         this.expect(tt.eq);
 
         if (

diff --git a/packages/babel-parser/test/fixtures/typescript/type-alias/generic-babel-7/input.ts b/packages/babel-parser/test/fixtures/typescript/type-alias/generic-babel-7/input.ts
@@ -1 +1 @@
-type T<U> = U;
+type T<U>=U;
diff --git a/packages/babel-parser/test/fixtures/typescript/type-alias/generic-babel-7/output.json b/packages/babel-parser/test/fixtures/typescript/type-alias/generic-babel-7/output.json
@@ -1,15 +1,15 @@
 {
   "type": "File",
-  "start":0,"end":14,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":14,"index":14}},
+  "start":0,"end":12,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":12,"index":12}},
   "program": {
     "type": "Program",
-    "start":0,"end":14,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":14,"index":14}},
+    "start":0,"end":12,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":12,"index":12}},
     "sourceType": "module",
     "interpreter": null,
     "body": [
       {
         "type": "TSTypeAliasDeclaration",
-        "start":0,"end":14,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":14,"index":14}},
+        "start":0,"end":12,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":12,"index":12}},
         "id": {
           "type": "Identifier",
           "start":5,"end":6,"loc":{"start":{"line":1,"column":5,"index":5},"end":{"line":1,"column":6,"index":6},"identifierName":"T"},
@@ -28,10 +28,10 @@
         },
         "typeAnnotation": {
           "type": "TSTypeReference",
-          "start":12,"end":13,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":13,"index":13}},
+          "start":10,"end":11,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":11,"index":11}},
           "typeName": {
             "type": "Identifier",
-            "start":12,"end":13,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":13,"index":13},"identifierName":"U"},
+            "start":10,"end":11,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":11,"index":11},"identifierName":"U"},
             "name": "U"
           }
         }

diff --git a/packages/babel-parser/test/fixtures/typescript/type-alias/generic/input.ts b/packages/babel-parser/test/fixtures/typescript/type-alias/generic/input.ts
@@ -1 +1 @@
-type T<U> = U;
+type T<U>=U;
diff --git a/packages/babel-parser/test/fixtures/typescript/type-alias/generic/output.json b/packages/babel-parser/test/fixtures/typescript/type-alias/generic/output.json
@@ -1,15 +1,15 @@
 {
   "type": "File",
-  "start":0,"end":14,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":14,"index":14}},
+  "start":0,"end":12,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":12,"index":12}},
   "program": {
     "type": "Program",
-    "start":0,"end":14,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":14,"index":14}},
+    "start":0,"end":12,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":12,"index":12}},
     "sourceType": "module",
     "interpreter": null,
     "body": [
       {
         "type": "TSTypeAliasDeclaration",
-        "start":0,"end":14,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":14,"index":14}},
+        "start":0,"end":12,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":12,"index":12}},
         "id": {
           "type": "Identifier",
           "start":5,"end":6,"loc":{"start":{"line":1,"column":5,"index":5},"end":{"line":1,"column":6,"index":6},"identifierName":"T"},
@@ -32,10 +32,10 @@
         },
         "typeAnnotation": {
           "type": "TSTypeReference",
-          "start":12,"end":13,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":13,"index":13}},
+          "start":10,"end":11,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":11,"index":11}},
           "typeName": {
             "type": "Identifier",
-            "start":12,"end":13,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":13,"index":13},"identifierName":"U"},
+            "start":10,"end":11,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":11,"index":11},"identifierName":"U"},
             "name": "U"
           }
         }