fix(typescript-estree): remove now defunct Import node type

typescript-eslint · May 21, 2020 · f199cbd · f199cbd
1 parent a35026d
commit f199cbd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/packages/eslint-plugin/src/rules/no-unsafe-call.ts b/packages/eslint-plugin/src/rules/no-unsafe-call.ts
@@ -42,8 +42,8 @@ export default util.createRule<[], MessageIds>({
     }
 
     return {
-      ':matches(CallExpression, OptionalCallExpression) > :not(Import).callee'(
-        node: Exclude<TSESTree.LeftHandSideExpression, TSESTree.Import>,
+      ':matches(CallExpression, OptionalCallExpression) > *.callee'(
+        node: TSESTree.CallExpression['callee'],
       ): void {
         checkCall(node, node, 'unsafeCall');
       },

diff --git a/packages/experimental-utils/src/ts-eslint/Rule.ts b/packages/experimental-utils/src/ts-eslint/Rule.ts
@@ -281,9 +281,9 @@ interface RuleListener {
   FunctionExpression?: RuleFunction<TSESTree.FunctionExpression>;
   Identifier?: RuleFunction<TSESTree.Identifier>;
   IfStatement?: RuleFunction<TSESTree.IfStatement>;
-  Import?: RuleFunction<TSESTree.Import>;
   ImportDeclaration?: RuleFunction<TSESTree.ImportDeclaration>;
   ImportDefaultSpecifier?: RuleFunction<TSESTree.ImportDefaultSpecifier>;
+  ImportExpression?: RuleFunction<TSESTree.ImportExpression>;
   ImportNamespaceSpecifier?: RuleFunction<TSESTree.ImportNamespaceSpecifier>;
   ImportSpecifier?: RuleFunction<TSESTree.ImportSpecifier>;
   JSXAttribute?: RuleFunction<TSESTree.JSXAttribute>;

diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -1992,11 +1992,6 @@ export class Converter {
         }
       }
 
-      case SyntaxKind.ImportKeyword:
-        return this.createNode<TSESTree.Import>(node, {
-          type: AST_NODE_TYPES.Import,
-        });
-
       case SyntaxKind.EmptyStatement:
         return this.createNode<TSESTree.EmptyStatement>(node, {
           type: AST_NODE_TYPES.EmptyStatement,

diff --git a/packages/typescript-estree/src/ts-estree/ts-estree.ts b/packages/typescript-estree/src/ts-estree/ts-estree.ts
@@ -172,7 +172,6 @@ export type Node =
   | FunctionExpression
   | Identifier
   | IfStatement
-  | Import
   | ImportDeclaration
   | ImportDefaultSpecifier
   | ImportExpression
@@ -447,7 +446,6 @@ export type PrimaryExpression =
   | ClassExpression
   | FunctionExpression
   | Identifier
-  | Import
   | JSXElement
   | JSXFragment
   | JSXOpeningElement
@@ -956,10 +954,6 @@ export interface IfStatement extends BaseNode {
   alternate: Statement | null;
 }
 
-export interface Import extends BaseNode {
-  type: AST_NODE_TYPES.Import;
-}
-
 export interface ImportDeclaration extends BaseNode {
   type: AST_NODE_TYPES.ImportDeclaration;
   source: Literal;