feat: update TSImportType node

armano2 · armano2 · commit 9e7abf9d7731 · 2021-02-24T23:09:30.000+01:00
diff --git a/packages/scope-manager/src/referencer/TypeVisitor.ts b/packages/scope-manager/src/referencer/TypeVisitor.ts
@@ -258,6 +258,8 @@ class TypeVisitor extends Visitor {
   protected TSTypeQuery(node: TSESTree.TSTypeQuery): void {
     if (node.exprName.type === AST_NODE_TYPES.Identifier) {
       this.#referencer.currentScope().referenceValue(node.exprName);
+    } else if (node.exprName.type === AST_NODE_TYPES.TSImportType) {
+      this.visit(node.exprName);
     } else {
       let expr = node.exprName.left;
       while (expr.type !== AST_NODE_TYPES.Identifier) {
diff --git a/packages/shared-fixtures/fixtures/typescript/basics/type-import-type.src.ts b/packages/shared-fixtures/fixtures/typescript/basics/type-import-type.src.ts
@@ -1,2 +1,4 @@
 type A = typeof import('A');
-type B = import("B").X<Y>;
+type B = import('B').X<Y>;
+// prettier-ignore
+type C = typeof /* test */ import('A');
diff --git a/packages/types/src/ts-estree.ts b/packages/types/src/ts-estree.ts
@@ -1416,8 +1416,7 @@ export interface TSImportEqualsDeclaration extends BaseNode {
 
 export interface TSImportType extends BaseNode {
   type: AST_NODE_TYPES.TSImportType;
-  isTypeOf: boolean;
-  parameter: TypeNode;
+  argument: TypeNode;
   qualifier: EntityName | null;
   typeParameters: TSTypeParameterInstantiation | null;
 }
@@ -1686,7 +1685,7 @@ export interface TSTypePredicate extends BaseNode {
 
 export interface TSTypeQuery extends BaseNode {
   type: AST_NODE_TYPES.TSTypeQuery;
-  exprName: EntityName;
+  exprName: EntityName | TSImportType;
 }
 
 export interface TSTypeReference extends BaseNode {
diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -2542,19 +2542,32 @@ export class Converter {
         return result;
       }
 
-      case SyntaxKind.ImportType:
-        return this.createNode<TSESTree.TSImportType>(node, {
+      case SyntaxKind.ImportType: {
+        const range = getRange(node, this.ast);
+        if (node.isTypeOf) {
+          const token = findNextToken(node.getFirstToken()!, node, this.ast)!;
+          range[0] = token.getStart(this.ast);
+        }
+        const result = this.createNode<TSESTree.TSImportType>(node, {
           type: AST_NODE_TYPES.TSImportType,
-          isTypeOf: !!node.isTypeOf,
-          parameter: this.convertChild(node.argument),
+          argument: this.convertChild(node.argument),
           qualifier: this.convertChild(node.qualifier),
           typeParameters: node.typeArguments
             ? this.convertTypeArgumentsToTypeParameters(
                 node.typeArguments,
                 node,
               )
             : null,
+          range: range,
         });
+        if (node.isTypeOf) {
+          return this.createNode<TSESTree.TSTypeQuery>(node, {
+            type: AST_NODE_TYPES.TSTypeQuery,
+            exprName: result,
+          });
+        }
+        return result;
+      }
 
       case SyntaxKind.EnumDeclaration: {
         const result = this.createNode<TSESTree.TSEnumDeclaration>(node, {
diff --git a/packages/typescript-estree/src/ts-estree/estree-to-ts-node-types.ts b/packages/typescript-estree/src/ts-estree/estree-to-ts-node-types.ts
@@ -218,7 +218,7 @@ export interface EstreeToTsNodeTypes {
     | ts.NewExpression
     | ts.CallExpression;
   [AST_NODE_TYPES.TSTypePredicate]: ts.TypePredicateNode;
-  [AST_NODE_TYPES.TSTypeQuery]: ts.TypeQueryNode;
+  [AST_NODE_TYPES.TSTypeQuery]: ts.TypeQueryNode | ts.ImportTypeNode;
   [AST_NODE_TYPES.TSTypeReference]: ts.TypeReferenceNode;
   [AST_NODE_TYPES.TSUnionType]: ts.UnionTypeNode;
   [AST_NODE_TYPES.UpdateExpression]:
diff --git a/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts b/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
@@ -349,11 +349,6 @@ tester.addFixturePatternConfig('typescript/basics', {
      * TODO: report it to babel
      */
     'interface-with-extends-member-expression',
-    /**
-     * @see https://github.com/typescript-eslint/typescript-eslint/issues/2998
-     */
-    'type-import-type',
-    'type-import-type-with-type-parameters-in-type-reference',
     /**
      * Not yet supported in Babel
      * Directive field is not added to module and namespace
diff --git a/packages/typescript-estree/tests/ast-alignment/utils.ts b/packages/typescript-estree/tests/ast-alignment/utils.ts
@@ -151,6 +151,28 @@ export function preprocessBabylonAST(ast: BabelTypes.File): any {
           };
         }
       },
+      TSImportType(node: any) {
+        if (!node.typeParameters) {
+          node.typeParameters = null;
+        }
+        if (!node.qualifier) {
+          node.qualifier = null;
+        }
+        /**
+         * https://github.com/babel/babel/issues/12833
+         */
+        if (node.argument) {
+          node.argument = {
+            type: AST_NODE_TYPES.TSLiteralType,
+            literal: node.argument,
+            loc: {
+              start: { ...node.argument.loc.start },
+              end: { ...node.argument.loc.end },
+            },
+            range: [...node.argument.range],
+          };
+        }
+      },
       TSTypePredicate(node) {
         if (!node.typeAnnotation) {
           node.typeAnnotation = null;
diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/type-import-type-with-type-parameters-in-type-reference.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/type-import-type-with-type-parameters-in-type-reference.src.ts.shot
@@ -84,18 +84,7 @@ Object {
           },
           "params": Array [
             Object {
-              "isTypeOf": false,
-              "loc": Object {
-                "end": Object {
-                  "column": 28,
-                  "line": 1,
-                },
-                "start": Object {
-                  "column": 11,
-                  "line": 1,
-                },
-              },
-              "parameter": Object {
+              "argument": Object {
                 "literal": Object {
                   "loc": Object {
                     "end": Object {
@@ -131,6 +120,16 @@ Object {
                 ],
                 "type": "TSLiteralType",
               },
+              "loc": Object {
+                "end": Object {
+                  "column": 28,
+                  "line": 1,
+                },
+                "start": Object {
+                  "column": 11,
+                  "line": 1,
+                },
+              },
               "qualifier": Object {
                 "loc": Object {
                   "end": Object {
diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/type-import-type.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/type-import-type.src.ts.shot
