refactor: remove convertDecorators helper (#75)

Author: armano2

src/convert.ts

@@ -282,28 +282,6 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
     return classImplementsNode;
   }
 
-  /**
-   * Converts a ts.NodeArray of ts.Decorators into an array of ESTreeNode decorators
-   * @param  {ts.NodeArray<ts.Decorator>} decorators A ts.NodeArray of ts.Decorators to be converted
-   * @returns {ESTreeNode[]}       an array of converted ESTreeNode decorators
-   */
-  function convertDecorators(
-    decorators: ts.NodeArray<ts.Decorator>
-  ): ESTreeNode[] {
-    if (!decorators || !decorators.length) {
-      return [];
-    }
-    return decorators.map(decorator => {
-      const expression = convertChild(decorator.expression);
-      return {
-        type: AST_NODE_TYPES.Decorator,
-        range: [decorator.getStart(ast), decorator.end],
-        loc: nodeUtils.getLoc(decorator, ast),
-        expression
-      };
-    });
-  }
-
   /**
    * Converts an array of ts.Node parameters into an array of ESTreeNode params
    * @param  {ts.Node[]} parameters An array of ts.Node params to be converted
@@ -319,7 +297,7 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
         return convertedParam;
       }
       return Object.assign(convertedParam, {
-        decorators: convertDecorators(param.decorators)
+        decorators: param.decorators.map(convertChild)
       });
     });
   }
@@ -366,9 +344,8 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
               )
             : null;
         } else if (key === 'decorators') {
-          const decorators = convertDecorators((node as any).decorators);
-          if (decorators && decorators.length) {
-            result.decorators = decorators;
+          if (node.decorators && node.decorators.length) {
+            result.decorators = node.decorators.map(convertChild);
           }
         } else {
           if (Array.isArray((node as any)[key])) {
@@ -966,7 +943,7 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
       }
 
       if (node.decorators) {
-        result.decorators = convertDecorators(node.decorators);
+        result.decorators = node.decorators.map(convertChild);
       }
 
       const accessibility = nodeUtils.getTSNodeAccessibility(node);
@@ -1071,7 +1048,7 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
         });
 
         if (node.decorators) {
-          result.decorators = convertDecorators(node.decorators);
+          result.decorators = node.decorators.map(convertChild);
         }
 
         const accessibility = nodeUtils.getTSNodeAccessibility(node);
@@ -1631,7 +1608,7 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
       }
 
       if (node.decorators) {
-        result.decorators = convertDecorators(node.decorators);
+        result.decorators = node.decorators.map(convertChild);
       }
 
       const filteredMembers = node.members.filter(
@@ -1979,6 +1956,14 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
       break;
     }
 
+    case SyntaxKind.Decorator: {
+      Object.assign(result, {
+        type: AST_NODE_TYPES.Decorator,
+        expression: convertChild(node.expression)
+      });
+      break;
+    }
+
     // Literals
 
     case SyntaxKind.StringLiteral:
@@ -2550,7 +2535,7 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
        * so we handle them here too.
        */
       if (node.decorators) {
-        result.decorators = convertDecorators(node.decorators);
+        result.decorators = node.decorators.map(convertChild);
       }
       if (nodeUtils.hasModifier(SyntaxKind.AbstractKeyword, node)) {
         result.abstract = true;
@@ -2605,7 +2590,7 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
        * so we handle them here too.
        */
       if (node.decorators) {
-        result.decorators = convertDecorators(node.decorators);
+        result.decorators = node.decorators.map(convertChild);
       }
       break;
     }