typescript-eslint · armano2 · Feb 3, 2019 · Jan 28, 2019 · Jan 28, 2019 · Jan 28, 2019
diff --git a/packages/typescript-estree/src/ast-converter.ts b/packages/typescript-estree/src/ast-converter.ts
@@ -5,11 +5,11 @@
  * @copyright jQuery Foundation and other contributors, https://jquery.org/
  * MIT License
  */
-import convert, { getASTMaps, resetASTMaps, convertError } from './convert';
+import { convertError, Converter } from './convert';
 import { convertComments } from './convert-comments';
 import { convertTokens } from './node-utils';
 import ts from 'typescript';
-import { Extra } from './temp-types-based-on-js-source';
+import { Extra } from './parser-options';
 
 export default function astConverter(
   ast: ts.SourceFile,
@@ -27,17 +27,14 @@ export default function astConverter(
   /**
    * Recursively convert the TypeScript AST into an ESTree-compatible AST
    */
-  const estree: any = convert({
-    node: ast,
-    parent: null,
-    ast,
-    additionalOptions: {
-      errorOnUnknownASTType: extra.errorOnUnknownASTType || false,
-      useJSXTextNode: extra.useJSXTextNode || false,
-      shouldProvideParserServices
-    }
+  const instance = new Converter(ast, {
+    errorOnUnknownASTType: extra.errorOnUnknownASTType || false,
+    useJSXTextNode: extra.useJSXTextNode || false,
+    shouldProvideParserServices
   });
 
+  const estree = instance.convertProgram();
+
   /**
    * Optionally convert and include all tokens in the AST
    */
@@ -52,11 +49,9 @@ export default function astConverter(
     estree.comments = convertComments(ast, extra.code);
   }
 
-  let astMaps = undefined;
-  if (shouldProvideParserServices) {
-    astMaps = getASTMaps();
-    resetASTMaps();
-  }
+  const astMaps = shouldProvideParserServices
+    ? instance.getASTMaps()
+    : undefined;
 
   return { estree, astMaps };
 }
diff --git a/packages/typescript-estree/src/convert-comments.ts b/packages/typescript-estree/src/convert-comments.ts
@@ -7,31 +7,28 @@
 
 import ts from 'typescript';
 import { getLocFor, getNodeContainer } from './node-utils';
-import {
-  ESTreeComment,
-  LineAndColumnData
-} from './temp-types-based-on-js-source';
+import * as es from './typedefs';
 
 /**
  * Converts a TypeScript comment to an Esprima comment.
- * @param {boolean} block True if it's a block comment, false if not.
- * @param {string} text The text of the comment.
- * @param {number} start The index at which the comment starts.
- * @param {number} end The index at which the comment ends.
- * @param {LineAndColumnData} startLoc The location at which the comment starts.
- * @param {LineAndColumnData} endLoc The location at which the comment ends.
- * @returns {Object} The comment object.
- * @private
+ * @param block True if it's a block comment, false if not.
+ * @param text The text of the comment.
+ * @param start The index at which the comment starts.
+ * @param end The index at which the comment ends.
+ * @param startLoc The location at which the comment starts.
+ * @param endLoc The location at which the comment ends.
+ * @returns The comment object.
+ * @internal
  */
 function convertTypeScriptCommentToEsprimaComment(
   block: boolean,
   text: string,
   start: number,
   end: number,
-  startLoc: LineAndColumnData,
-  endLoc: LineAndColumnData
-): ESTreeComment {
-  const comment: ESTreeComment = {
+  startLoc: es.LineAndColumnData,
+  endLoc: es.LineAndColumnData
+): es.Comment {
+  const comment: es.OptionalRangeAndLoc<es.Comment> = {
     type: block ? 'Block' : 'Line',
     value: text
   };
@@ -47,22 +44,22 @@ function convertTypeScriptCommentToEsprimaComment(
     };
   }
 
-  return comment;
+  return comment as es.Comment;
 }
 
 /**
  * Convert comment from TypeScript Triva Scanner.
- * @param  {ts.Scanner} triviaScanner TS Scanner
- * @param  {ts.SourceFile} ast the AST object
- * @param  {string} code TypeScript code
- * @returns {ESTreeComment}     the converted ESTreeComment
+ * @param triviaScanner TS Scanner
+ * @param ast the AST object
+ * @param code TypeScript code
+ * @returns the converted Comment
  * @private
  */
 function getCommentFromTriviaScanner(
   triviaScanner: ts.Scanner,
   ast: ts.SourceFile,
   code: string
-): ESTreeComment {
+): es.Comment {
   const kind = triviaScanner.getToken();
   const isBlock = kind === ts.SyntaxKind.MultiLineCommentTrivia;
   const range = {
@@ -77,30 +74,28 @@ function getCommentFromTriviaScanner(
     : comment.replace(/^\/\//, '');
   const loc = getLocFor(range.pos, range.end, ast);
 
-  const esprimaComment = convertTypeScriptCommentToEsprimaComment(
+  return convertTypeScriptCommentToEsprimaComment(
     isBlock,
     text,
     range.pos,
     range.end,
     loc.start,
     loc.end
   );
-
-  return esprimaComment;
 }
 
 /**
  * Convert all comments for the given AST.
- * @param  {ts.SourceFile} ast the AST object
- * @param  {string} code the TypeScript code
- * @returns {ESTreeComment[]}     the converted ESTreeComment
+ * @param ast the AST object
+ * @param code the TypeScript code
+ * @returns the converted ESTreeComment
  * @private
  */
 export function convertComments(
   ast: ts.SourceFile,
   code: string
-): ESTreeComment[] {
-  const comments: ESTreeComment[] = [];
+): es.Comment[] {
+  const comments: es.Comment[] = [];
 
   /**
    * Create a TypeScript Scanner, with skipTrivia set to false so that