refactor: code clean up

Author: jaredmcateer

src/plugins/index.ts

@@ -22,7 +22,6 @@ import { convertInject } from "./vue-property-decorator/Inject";
 import { convertProvide } from "./vue-property-decorator/Provide";
 import { convertTemplateRef } from "./vue-class-component/TemplateRef";
 import { TsHelper } from "../helpers/TsHelper";
-import { option } from "commander";
 
 export function getDefaultPlugins(tsModule: typeof ts): ASTConvertPlugins {
   return {
@@ -99,7 +98,7 @@ export function getASTResults(
               }
             }
             if (!converted) {
-              astResults.push(convertNodeToASTResult($t.module, property));
+              astResults.push(convertNodeToASTResult($t, property));
             }
           }
         });

src/plugins/vue-class-component/TemplateRef.ts

@@ -1,6 +1,5 @@
 import { ASTConverter, ASTResultKind, ReferenceKind } from "../types";
 import ts from "typescript";
-import { UncouthOptions } from "../../options";
 import { TsHelper } from "../../helpers/TsHelper";
 
 export const convertTemplateRef: ASTConverter<ts.PropertyDeclaration> = (node, options) => {

src/plugins/vue-property-decorator/Inject.ts

@@ -38,7 +38,7 @@ export const convertInject: ASTConverter<ts.PropertyDeclaration> = (node, option
 
     const injectArgs = [injectKeyExpr, ...(defaultValueExpr ? [defaultValueExpr] : [])];
     const injectType = node.type
-      ? [$t.factory.createKeywordTypeNode(node.type.kind as any)]
+      ? [$t.factory.createKeywordTypeNode(node.type.kind as ts.KeywordTypeSyntaxKind)]
       : undefined;
     const injectExpression = $t.createCallExpression("inject", injectType, injectArgs);
     const injectConstStatement = $t.createConstStatement(node.name.getText(), injectExpression);

src/utils.ts

@@ -1,6 +1,8 @@
 import type vueTemplateParser from "vue-template-compiler";
 import type ts from "typescript";
 import { ASTResult, ASTResultKind, ReferenceKind } from "./plugins/types";
+import { TsHelper } from "./helpers/TsHelper";
+
 export function isVueFile(path: string): boolean {
   return path.endsWith(".vue");
 }
@@ -85,80 +87,8 @@ export function isPrimitiveType(tsModule: typeof ts, returnType: ts.Type): boole
   );
 }
 
-export function copySyntheticComments<T extends ts.Node>(
-  tsModule: typeof ts,
-  node: T,
-  copyNode: ts.Node
-): T {
-  const leadingComments =
-    tsModule.getLeadingCommentRanges(copyNode.getSourceFile().getFullText(), copyNode.pos) || [];
-  const trailingComments =
-    tsModule.getTrailingCommentRanges(copyNode.getSourceFile().getFullText(), copyNode.end) || [];
-
-  const getCommentText = (comment: ts.CommentRange) => {
-    return copyNode
-      .getSourceFile()
-      .getFullText()
-      .slice(comment.pos, comment.end)
-      .replace(/\/\//g, "")
-      .replace(/\/\*/g, "")
-      .replace(/\*\//g, "")
-      .replace(/ {2}\* ?/g, "* ")
-      .replace(/ \*\//g, "*/")
-      .replace(/ {2}$/g, "");
-  };
-
-  let result = node;
-  for (const comment of leadingComments) {
-    const text = getCommentText(comment);
-    result = tsModule.addSyntheticLeadingComment(
-      result,
-      comment.kind,
-      text,
-      comment.hasTrailingNewLine
-    );
-  }
-
-  for (const comment of trailingComments) {
-    const text = getCommentText(comment);
-    result = tsModule.addSyntheticTrailingComment(
-      result,
-      comment.kind,
-      text,
-      comment.hasTrailingNewLine
-    );
-  }
-
-  return node;
-}
-
-export function removeComments<T extends ts.Node>(
-  tsModule: typeof ts,
-  node: T
-): T | ts.StringLiteral {
-  if (tsModule.isStringLiteral(node)) {
-    return tsModule.createStringLiteral(node.text);
-  }
-  return node;
-}
-
-export function addTodoComment<T extends ts.Node>(
-  tsModule: typeof ts,
-  node: T,
-  text: string,
-  multiline: boolean
-): T {
-  return tsModule.addSyntheticLeadingComment(
-    node,
-    multiline
-      ? tsModule.SyntaxKind.MultiLineCommentTrivia
-      : tsModule.SyntaxKind.SingleLineCommentTrivia,
-    ` TODO: ${text}`
-  );
-}
-
 export function convertNodeToASTResult<T extends ts.Node>(
-  tsModule: typeof ts,
+  tsHelper: TsHelper,
   node: T
 ): ASTResult<T> {
   return {
@@ -167,18 +97,10 @@ export function convertNodeToASTResult<T extends ts.Node>(
     reference: ReferenceKind.NONE,
     attributes: [],
     tag: "IheritObjProperty",
-    nodes: [addTodoComment(tsModule, node, "Can't convert this object property.", false)],
+    nodes: [tsHelper.addTodoComment(node, "Can't convert this object property.", false)],
   };
 }
 
-// ts.createIdentifier() cannot call getText function, it's a hack.
-export function createIdentifier(tsModule: typeof ts, text: string): ts.Identifier {
-  const temp = tsModule.factory.createIdentifier(text);
-  // eslint-disable-next-line @typescript-eslint/unbound-method
-  temp.getText = () => text;
-  return temp;
-}
-
-export function isString(val: any): val is string {
+export function isString(val: unknown): val is string {
   return typeof val === "string";
 }