@typescript-eslint/typescript-estree 8.51.1-alpha.2 → 8.51.1-alpha.4

package/dist/ast-converter.js

@@ -53,7 +53,7 @@ function astConverter(ast, parseSettings, shouldPreserveNodeMaps) {
      * Optionally convert and include all comments in the AST
      */
     if (parseSettings.comment) {
-        estree.comments = (0, convert_comments_1.convertComments)(ast, parseSettings.codeFullText);
+        estree.comments = (0, convert_comments_1.convertComments)(ast);
     }
     const astMaps = instance.getASTMaps();
     return { astMaps, estree };

package/dist/convert-comments.d.ts

@@ -3,8 +3,7 @@ import type { TSESTree } from './ts-estree';
 /**
  * Convert all comments for the given AST.
  * @param ast the AST object
- * @param code the TypeScript code
  * @returns the converted ESTreeComment
  * @private
  */
-export declare function convertComments(ast: ts.SourceFile, code: string): TSESTree.Comment[];
+export declare function convertComments(ast: ts.SourceFile): TSESTree.Comment[];

package/dist/convert-comments.js

@@ -41,31 +41,21 @@ const ts_estree_1 = require("./ts-estree");
 /**
  * Convert all comments for the given AST.
  * @param ast the AST object
- * @param code the TypeScript code
  * @returns the converted ESTreeComment
  * @private
  */
-function convertComments(ast, code) {
-    const comments = [];
-    tsutils.forEachComment(ast, (_, comment) => {
-        const type = comment.kind === ts.SyntaxKind.SingleLineCommentTrivia
+function convertComments(ast) {
+    return Array.from(tsutils.iterateComments(ast), ({ end, kind, pos, value }) => {
+        const type = kind === ts.SyntaxKind.SingleLineCommentTrivia
             ? ts_estree_1.AST_TOKEN_TYPES.Line
             : ts_estree_1.AST_TOKEN_TYPES.Block;
-        const range = [comment.pos, comment.end];
+        const range = [pos, end];
         const loc = (0, node_utils_1.getLocFor)(range, ast);
-        // both comments start with 2 characters - /* or //
-        const textStart = range[0] + 2;
-        const textEnd = comment.kind === ts.SyntaxKind.SingleLineCommentTrivia
-            ? // single line comments end at the end
-                range[1]
-            : // multiline comments end 2 characters early
-                range[1] - 2;
-        comments.push({
+        return {
             type,
             loc,
             range,
-            value: code.slice(textStart, textEnd),
-        });
-    }, ast);
-    return comments;
+            value,
+        };
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/typescript-estree",
-  "version": "8.51.1-alpha.2",
+  "version": "8.51.1-alpha.4",
   "description": "A parser that converts TypeScript source code into an ESTree compatible form",
   "files": [
     "dist",
@@ -52,15 +52,15 @@
     "typecheck": "yarn run -BT nx typecheck"
   },
   "dependencies": {
-    "@typescript-eslint/project-service": "8.51.1-alpha.2",
-    "@typescript-eslint/tsconfig-utils": "8.51.1-alpha.2",
-    "@typescript-eslint/types": "8.51.1-alpha.2",
-    "@typescript-eslint/visitor-keys": "8.51.1-alpha.2",
+    "@typescript-eslint/project-service": "8.51.1-alpha.4",
+    "@typescript-eslint/tsconfig-utils": "8.51.1-alpha.4",
+    "@typescript-eslint/types": "8.51.1-alpha.4",
+    "@typescript-eslint/visitor-keys": "8.51.1-alpha.4",
     "debug": "^4.3.4",
     "minimatch": "^9.0.4",
     "semver": "^7.6.0",
     "tinyglobby": "^0.2.15",
-    "ts-api-utils": "^2.2.0"
+    "ts-api-utils": "^2.3.0"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^3.1.3",