Fix: remove unnecessary TypeRef wrapper for ImportType (fixes #507) (#508)

ikatyang · JamesHenry · commit 746146274f99 · 2018-08-06T15:19:19.000-04:00
diff --git a/lib/ast-node-types.js b/lib/ast-node-types.js
@@ -113,6 +113,8 @@ module.exports = {
     TSEnumMember: "TSEnumMember",
     TSExportAssignment: "TSExportAssignment",
     TSExportKeyword: "TSExportKeyword",
+    TSImportType: "TSImportType",
+    TSLiteralType: "TSLiteralType",
     TSIndexSignature: "TSIndexSignature",
     TSInterfaceBody: "TSInterfaceBody",
     TSInterfaceDeclaration: "TSInterfaceDeclaration",
diff --git a/lib/convert.js b/lib/convert.js
@@ -154,6 +154,9 @@ module.exports = function convert(config) {
                         loc: nodeUtils.getLoc(typeArgument, ast)
                     };
                 }
+                if (typeArgument.kind === SyntaxKind.ImportType) {
+                    return convert({ node: typeArgument, parent: null, ast, additionalOptions });
+                }
                 return {
                     type: AST_NODE_TYPES.TSTypeReference,
                     range: [
@@ -2141,6 +2144,16 @@ module.exports = function convert(config) {
             result.typeAnnotation.range = result.typeAnnotation.typeAnnotation.range;
             break;
 
+        case SyntaxKind.ImportType:
+            Object.assign(result, {
+                type: AST_NODE_TYPES.TSImportType,
+                isTypeOf: !!node.isTypeOf,
+                parameter: convertChild(node.argument),
+                qualifier: convertChild(node.qualifier),
+                typeParameters: node.typeArguments ? convertTypeArgumentsToTypeParameters(node.typeArguments) : null
+            });
+            break;
+
         case SyntaxKind.EnumDeclaration: {
             Object.assign(result, {
                 type: AST_NODE_TYPES.TSEnumDeclaration,
diff --git a/package.json b/package.json
@@ -62,6 +62,7 @@
     "typescript": "*"
   },
   "jest": {
+    "testEnvironment": "node",
     "testRegex": "tests/lib/.+\\.js$",
     "testPathIgnorePatterns": [],
     "collectCoverage": true,
diff --git a/tests/ast-alignment/fixtures-to-test.js b/tests/ast-alignment/fixtures-to-test.js
@@ -422,7 +422,12 @@ let fixturePatternConfigsToTest = [
             "class-with-private-parameter-properties",
             "class-with-protected-parameter-properties",
             "class-with-public-parameter-properties",
-            "class-with-readonly-parameter-properties"
+            "class-with-readonly-parameter-properties",
+            /**
+             * Not yet supported in Babylon https://github.com/babel/babel/issues/7749
+             */
+            "import-type",
+            "import-type-with-type-parameters-in-type-reference"
         ],
         parseWithSourceTypeModule: [
             "export-named-enum",
diff --git a/tests/ast-alignment/jest.config.js b/tests/ast-alignment/jest.config.js
@@ -1,5 +1,6 @@
 "use strict";
 
 module.exports = {
+    testEnvironment: "node",
     testRegex: "spec\\.js$"
 };
diff --git a/tests/fixtures/typescript/basics/import-type-with-type-parameters-in-type-reference.src.ts b/tests/fixtures/typescript/basics/import-type-with-type-parameters-in-type-reference.src.ts
@@ -0,0 +1 @@
+type X = A<import("").B<any>>;
diff --git a/tests/fixtures/typescript/basics/import-type.src.ts b/tests/fixtures/typescript/basics/import-type.src.ts
@@ -0,0 +1,2 @@
+type A = typeof import('A');
+type B = import("B").X<Y>;
diff --git a/tests/lib/__snapshots__/typescript.js.snap b/tests/lib/__snapshots__/typescript.js.snap

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+type A = typeof import('A');`
	`2`	`+type B = import("B").X<Y>;`