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 {
11+ ESTreeComment ,
12+ ESTreeToken ,
13+ LineAndColumnData
14+ } from './temp-types-based-on-js-source' ;
2015
2116/**
2217 * Converts a TypeScript comment to an Esprima comment.
2318 * @param {boolean } block True if it's a block comment, false if not.
2419 * @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.
20+ * @param {number } start The index at which the comment starts.
21+ * @param {number } end The index at which the comment ends.
22+ * @param {LineAndColumnData } startLoc The location at which the comment starts.
23+ * @param {LineAndColumnData } endLoc The location at which the comment ends.
2924 * @returns {Object } The comment object.
3025 * @private
3126 */
3227function convertTypeScriptCommentToEsprimaComment (
33- block ,
34- text ,
35- start ,
36- end ,
37- startLoc ,
38- endLoc
39- ) {
40- const comment = {
28+ block : boolean ,
29+ text : string ,
30+ start : number ,
31+ end : number ,
32+ startLoc : LineAndColumnData ,
33+ endLoc : LineAndColumnData
34+ ) : ESTreeComment {
35+ const comment : Partial < ESTreeToken > = {
4136 type : block ? 'Block' : 'Line' ,
4237 value : text
4338 } ;
@@ -53,18 +48,22 @@ function convertTypeScriptCommentToEsprimaComment(
5348 } ;
5449 }
5550
56- return comment ;
51+ return comment as ESTreeComment ;
5752}
5853
5954/**
6055 * Convert comment from TypeScript Triva Scanner.
61- * @param {Object } triviaScanner TS Scanner
62- * @param {Object } ast the AST object
56+ * @param {ts.Scanner } triviaScanner TS Scanner
57+ * @param {ts.SourceFile } ast the AST object
6358 * @param {string } code TypeScript code
6459 * @returns {ESTreeComment } the converted ESTreeComment
6560 * @private
6661 */
67- function getCommentFromTriviaScanner ( triviaScanner , ast , code ) {
62+ function getCommentFromTriviaScanner (
63+ triviaScanner : ts . Scanner ,
64+ ast : ts . SourceFile ,
65+ code : string
66+ ) : ESTreeComment {
6867 const kind = triviaScanner . getToken ( ) ;
6968 const isBlock = kind === ts . SyntaxKind . MultiLineCommentTrivia ;
7069 const range = {
@@ -91,23 +90,18 @@ function getCommentFromTriviaScanner(triviaScanner, ast, code) {
9190 return esprimaComment ;
9291}
9392
94- //------------------------------------------------------------------------------
95- // Public
96- //------------------------------------------------------------------------------
97-
98- module . exports = {
99- convertComments
100- } ;
101-
10293/**
10394 * Convert all comments for the given AST.
104- * @param {Object } ast the AST object
95+ * @param {ts.SourceFile } ast the AST object
10596 * @param {string } code the TypeScript code
10697 * @returns {ESTreeComment[] } the converted ESTreeComment
10798 * @private
10899 */
109- function convertComments ( ast , code ) {
110- const comments = [ ] ;
100+ export function convertComments (
101+ ast : ts . SourceFile ,
102+ code : string
103+ ) : ESTreeComment [ ] {
104+ const comments : ESTreeComment [ ] = [ ] ;
111105
112106 /**
113107 * Create a TypeScript Scanner, with skipTrivia set to false so that
@@ -120,7 +114,7 @@ function convertComments(ast, code) {
120114 const start = triviaScanner . getTokenPos ( ) ;
121115 const end = triviaScanner . getTextPos ( ) ;
122116
123- let container = null ;
117+ let container : ts . Token < any > | null = null ;
124118 switch ( kind ) {
125119 case ts . SyntaxKind . SingleLineCommentTrivia :
126120 case ts . SyntaxKind . MultiLineCommentTrivia : {
@@ -130,7 +124,7 @@ function convertComments(ast, code) {
130124 break ;
131125 }
132126 case ts . SyntaxKind . CloseBraceToken :
133- container = nodeUtils . getNodeContainer ( ast , start , end ) ;
127+ container = nodeUtils . getNodeContainer ( ast , start , end ) as ts . Node ;
134128
135129 if (
136130 container . kind === ts . SyntaxKind . TemplateMiddle ||
@@ -142,7 +136,7 @@ function convertComments(ast, code) {
142136 break ;
143137 case ts . SyntaxKind . SlashToken :
144138 case ts . SyntaxKind . SlashEqualsToken :
145- container = nodeUtils . getNodeContainer ( ast , start , end ) ;
139+ container = nodeUtils . getNodeContainer ( ast , start , end ) as ts . Node ;
146140
147141 if ( container . kind === ts . SyntaxKind . RegularExpressionLiteral ) {
148142 kind = triviaScanner . reScanSlashToken ( ) ;
0 commit comments