55 * MIT License
66 */
77
8- 'use strict' ;
9-
10- //------------------------------------------------------------------------------
11- // Requirements
12- //------------------------------------------------------------------------------
13-
14- const ts = require ( 'typescript' ) ,
15- nodeUtils = require ( './node-utils' ) ;
16-
17- //------------------------------------------------------------------------------
18- // Private
19- //------------------------------------------------------------------------------
8+ import ts from 'typescript' ;
9+ import nodeUtils from './node-utils' ;
10+ import { ESTreeComment , ESTreeToken , LineAndColumnData } from './temp-types-based-on-js-source' ;
2011
2112/**
2213 * Converts a TypeScript comment to an Esprima comment.
2314 * @param {boolean } block True if it's a block comment, false if not.
2415 * @param {string } text The text of the comment.
25- * @param {int } start The index at which the comment starts.
26- * @param {int } end The index at which the comment ends.
27- * @param {Location } startLoc The location at which the comment starts.
28- * @param {Location } endLoc The location at which the comment ends.
16+ * @param {number } start The index at which the comment starts.
17+ * @param {number } end The index at which the comment ends.
18+ * @param {LineAndColumnData } startLoc The location at which the comment starts.
19+ * @param {LineAndColumnData } endLoc The location at which the comment ends.
2920 * @returns {Object } The comment object.
3021 * @private
3122 */
3223function convertTypeScriptCommentToEsprimaComment (
33- block ,
34- text ,
35- start ,
36- end ,
37- startLoc ,
38- endLoc
39- ) {
40- const comment = {
24+ block : boolean ,
25+ text : string ,
26+ start : number ,
27+ end : number ,
28+ startLoc : LineAndColumnData ,
29+ endLoc : LineAndColumnData
30+ ) : ESTreeComment {
31+ const comment : Partial < ESTreeToken > = {
4132 type : block ? 'Block' : 'Line' ,
4233 value : text
4334 } ;
@@ -53,18 +44,22 @@ function convertTypeScriptCommentToEsprimaComment(
5344 } ;
5445 }
5546
56- return comment ;
47+ return comment as ESTreeComment ;
5748}
5849
5950/**
6051 * Convert comment from TypeScript Triva Scanner.
61- * @param {Object } triviaScanner TS Scanner
62- * @param {Object } ast the AST object
52+ * @param {ts.Scanner } triviaScanner TS Scanner
53+ * @param {ts.SourceFile } ast the AST object
6354 * @param {string } code TypeScript code
6455 * @returns {ESTreeComment } the converted ESTreeComment
6556 * @private
6657 */
67- function getCommentFromTriviaScanner ( triviaScanner , ast , code ) {
58+ function getCommentFromTriviaScanner (
59+ triviaScanner : ts . Scanner ,
60+ ast : ts . SourceFile ,
61+ code : string
62+ ) : ESTreeComment {
6863 const kind = triviaScanner . getToken ( ) ;
6964 const isBlock = kind === ts . SyntaxKind . MultiLineCommentTrivia ;
7065 const range = {
@@ -91,23 +86,18 @@ function getCommentFromTriviaScanner(triviaScanner, ast, code) {
9186 return esprimaComment ;
9287}
9388
94- //------------------------------------------------------------------------------
95- // Public
96- //------------------------------------------------------------------------------
97-
98- module . exports = {
99- convertComments
100- } ;
101-
10289/**
10390 * Convert all comments for the given AST.
104- * @param {Object } ast the AST object
91+ * @param {ts.SourceFile } ast the AST object
10592 * @param {string } code the TypeScript code
10693 * @returns {ESTreeComment[] } the converted ESTreeComment
10794 * @private
10895 */
109- function convertComments ( ast , code ) {
110- const comments = [ ] ;
96+ export function convertComments (
97+ ast : ts . SourceFile ,
98+ code : string
99+ ) : ESTreeComment [ ] {
100+ const comments : ESTreeComment [ ] = [ ] ;
111101
112102 /**
113103 * Create a TypeScript Scanner, with skipTrivia set to false so that
@@ -120,7 +110,7 @@ function convertComments(ast, code) {
120110 const start = triviaScanner . getTokenPos ( ) ;
121111 const end = triviaScanner . getTextPos ( ) ;
122112
123- let container = null ;
113+ let container : ts . Token < any > | null = null ;
124114 switch ( kind ) {
125115 case ts . SyntaxKind . SingleLineCommentTrivia :
126116 case ts . SyntaxKind . MultiLineCommentTrivia : {
@@ -130,7 +120,7 @@ function convertComments(ast, code) {
130120 break ;
131121 }
132122 case ts . SyntaxKind . CloseBraceToken :
133- container = nodeUtils . getNodeContainer ( ast , start , end ) ;
123+ container = nodeUtils . getNodeContainer ( ast , start , end ) as ts . Node ;
134124
135125 if (
136126 container . kind === ts . SyntaxKind . TemplateMiddle ||
@@ -142,7 +132,7 @@ function convertComments(ast, code) {
142132 break ;
143133 case ts . SyntaxKind . SlashToken :
144134 case ts . SyntaxKind . SlashEqualsToken :
145- container = nodeUtils . getNodeContainer ( ast , start , end ) ;
135+ container = nodeUtils . getNodeContainer ( ast , start , end ) as ts . Node ;
146136
147137 if ( container . kind === ts . SyntaxKind . RegularExpressionLiteral ) {
148138 kind = triviaScanner . reScanSlashToken ( ) ;
0 commit comments