chore(types): improve typing for getTokenType and convertBodyEx… (typescript-eslint#1332)

armano2 · bradzacher · commit d0977d07791b · 2019-12-17T11:14:59.000+10:30
* chore(types): improve typing for getTokenType and convertBodyExpressions

* chore(types): remove unnecessary any cast and type

* chore(types): restore original condition
diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -268,7 +268,7 @@ export class Converter {
   private convertBodyExpressions(
     nodes: ts.NodeArray<ts.Statement>,
     parent: ts.SourceFile | ts.Block | ts.ModuleBlock,
-  ): any[] {
+  ): TSESTree.Statement[] {
     let allowDirectives = canContainDirective(parent);
 
     return (
@@ -400,7 +400,7 @@ export class Converter {
             : null;
         } else if (key === 'decorators') {
           if (node.decorators && node.decorators.length) {
-            result.decorators = node.decorators.map((el: any) =>
+            result.decorators = node.decorators.map(el =>
               this.convertChild(el),
             );
           }
@@ -1340,7 +1340,7 @@ export class Converter {
       }
 
       case SyntaxKind.Parameter: {
-        let parameter: any;
+        let parameter: TSESTree.RestElement | TSESTree.BindingName;
         let result: TSESTree.RestElement | TSESTree.AssignmentPattern;
 
         if (node.dotDotDotToken) {
@@ -1349,7 +1349,7 @@ export class Converter {
             argument: this.convertChild(node.name),
           });
         } else if (node.initializer) {
-          parameter = this.convertChild(node.name);
+          parameter = this.convertChild(node.name) as TSESTree.BindingName;
           result = this.createNode<TSESTree.AssignmentPattern>(node, {
             type: AST_NODE_TYPES.AssignmentPattern,
             left: parameter,
@@ -1584,7 +1584,7 @@ export class Converter {
 
       case SyntaxKind.PrefixUnaryExpression:
       case SyntaxKind.PostfixUnaryExpression: {
-        const operator = (getTextForTokenKind(node.operator) ?? '') as any;
+        const operator = getTextForTokenKind(node.operator) ?? '';
         /**
          * ESTree uses UpdateExpression for ++/--
          */
diff --git a/packages/typescript-estree/src/node-utils.ts b/packages/typescript-estree/src/node-utils.ts
@@ -450,11 +450,11 @@ export function isOptional(node: {
  * @param token the ts.Token
  * @returns the token type
  */
-// ts.Node types are ugly
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function getTokenType(token: any): AST_TOKEN_TYPES {
+export function getTokenType(
+  token: ts.Identifier | ts.Token<ts.SyntaxKind>,
+): AST_TOKEN_TYPES {
   // Need two checks for keywords since some are also identifiers
-  if (token.originalKeywordKind) {
+  if ('originalKeywordKind' in token && token.originalKeywordKind) {
     switch (token.originalKeywordKind) {
       case SyntaxKind.NullKeyword:
         return AST_TOKEN_TYPES.Null;
@@ -572,7 +572,7 @@ export function convertToken(
     loc: getLocFor(start, end, ast),
   };
 
-  if (newToken.type === 'RegularExpression') {
+  if (newToken.type === AST_TOKEN_TYPES.RegularExpression) {
     newToken.regex = {
       pattern: value.slice(1, value.lastIndexOf('/')),
       flags: value.slice(value.lastIndexOf('/') + 1),
