@typescript-eslint/typescript-estree 8.51.1-alpha.1 → 8.51.1-alpha.3

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/check-syntax-errors.d.ts

@@ -0,0 +1,2 @@
+import * as ts from 'typescript';
+export declare function checkSyntaxError(tsNode: ts.Node): void;

package/dist/check-syntax-errors.js

@@ -0,0 +1,79 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkSyntaxError = checkSyntaxError;
+const ts = __importStar(require("typescript"));
+const check_modifiers_1 = require("./check-modifiers");
+const node_utils_1 = require("./node-utils");
+const SyntaxKind = ts.SyntaxKind;
+function checkSyntaxError(tsNode) {
+    (0, check_modifiers_1.checkModifiers)(tsNode);
+    const node = tsNode;
+    switch (node.kind) {
+        case SyntaxKind.ForInStatement:
+        case SyntaxKind.ForOfStatement: {
+            checkForStatementDeclaration(node);
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+}
+function checkForStatementDeclaration(node) {
+    const { initializer, kind } = node;
+    const loop = kind === SyntaxKind.ForInStatement ? 'for...in' : 'for...of';
+    if (ts.isVariableDeclarationList(initializer)) {
+        if (initializer.declarations.length !== 1) {
+            throw (0, node_utils_1.createError)(initializer, `Only a single variable declaration is allowed in a '${loop}' statement.`);
+        }
+        const declaration = initializer.declarations[0];
+        if (declaration.initializer) {
+            throw (0, node_utils_1.createError)(declaration, `The variable declaration of a '${loop}' statement cannot have an initializer.`);
+        }
+        else if (declaration.type) {
+            throw (0, node_utils_1.createError)(declaration, `The variable declaration of a '${loop}' statement cannot have a type annotation.`);
+        }
+        if (kind === SyntaxKind.ForInStatement &&
+            initializer.flags & ts.NodeFlags.Using) {
+            throw (0, node_utils_1.createError)(initializer, "The left-hand side of a 'for...in' statement cannot be a 'using' declaration.");
+        }
+    }
+    else if (!(0, node_utils_1.isValidAssignmentTarget)(initializer) &&
+        initializer.kind !== SyntaxKind.ObjectLiteralExpression &&
+        initializer.kind !== SyntaxKind.ArrayLiteralExpression) {
+        throw (0, node_utils_1.createError)(initializer, `The left-hand side of a '${loop}' statement must be a variable or a property access.`);
+    }
+}

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/dist/convert.js

@@ -38,7 +38,7 @@ exports.convertError = convertError;
 // There's lots of funny stuff due to the typing of ts.Node
 /* eslint-disable @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-unnecessary-condition, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access */
 const ts = __importStar(require("typescript"));
-const check_modifiers_1 = require("./check-modifiers");
+const check_syntax_errors_1 = require("./check-syntax-errors");
 const getModifiers_1 = require("./getModifiers");
 const node_utils_1 = require("./node-utils");
 const ts_estree_1 = require("./ts-estree");
@@ -76,35 +76,11 @@ class Converter {
         this.ast = ast;
         this.options = { ...options };
     }
-    #checkForStatementDeclaration(initializer, kind) {
-        const loop = kind === ts.SyntaxKind.ForInStatement ? 'for...in' : 'for...of';
-        if (ts.isVariableDeclarationList(initializer)) {
-            if (initializer.declarations.length !== 1) {
-                this.#throwError(initializer, `Only a single variable declaration is allowed in a '${loop}' statement.`);
-            }
-            const declaration = initializer.declarations[0];
-            if (declaration.initializer) {
-                this.#throwError(declaration, `The variable declaration of a '${loop}' statement cannot have an initializer.`);
-            }
-            else if (declaration.type) {
-                this.#throwError(declaration, `The variable declaration of a '${loop}' statement cannot have a type annotation.`);
-            }
-            if (kind === ts.SyntaxKind.ForInStatement &&
-                initializer.flags & ts.NodeFlags.Using) {
-                this.#throwError(initializer, "The left-hand side of a 'for...in' statement cannot be a 'using' declaration.");
-            }
-        }
-        else if (!(0, node_utils_1.isValidAssignmentTarget)(initializer) &&
-            initializer.kind !== ts.SyntaxKind.ObjectLiteralExpression &&
-            initializer.kind !== ts.SyntaxKind.ArrayLiteralExpression) {
-            this.#throwError(initializer, `The left-hand side of a '${loop}' statement must be a variable or a property access.`);
-        }
-    }
-    #checkModifiers(node) {
+    #checkSyntaxError(node) {
         if (this.options.allowInvalidAST) {
             return;
         }
-        (0, check_modifiers_1.checkModifiers)(node);
+        (0, check_syntax_errors_1.checkSyntaxError)(node);
     }
     #throwError(node, message) {
         if (this.options.allowInvalidAST) {
@@ -364,7 +340,7 @@ class Converter {
         if (!node) {
             return null;
         }
-        this.#checkModifiers(node);
+        this.#checkSyntaxError(node);
         const pattern = this.allowPattern;
         if (allowPattern != null) {
             this.allowPattern = allowPattern;
@@ -653,7 +629,6 @@ class Converter {
                     update: this.convertChild(node.incrementor),
                 });
             case SyntaxKind.ForInStatement:
-                this.#checkForStatementDeclaration(node.initializer, node.kind);
                 return this.createNode(node, {
                     type: ts_estree_1.AST_NODE_TYPES.ForInStatement,
                     body: this.convertChild(node.statement),
@@ -661,7 +636,6 @@ class Converter {
                     right: this.convertChild(node.expression),
                 });
             case SyntaxKind.ForOfStatement: {
-                this.#checkForStatementDeclaration(node.initializer, node.kind);
                 return this.createNode(node, {
                     type: ts_estree_1.AST_NODE_TYPES.ForOfStatement,
                     await: node.awaitModifier?.kind === SyntaxKind.AwaitKeyword,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/typescript-estree",
-  "version": "8.51.1-alpha.1",
+  "version": "8.51.1-alpha.3",
   "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.1",
-    "@typescript-eslint/tsconfig-utils": "8.51.1-alpha.1",
-    "@typescript-eslint/types": "8.51.1-alpha.1",
-    "@typescript-eslint/visitor-keys": "8.51.1-alpha.1",
+    "@typescript-eslint/project-service": "8.51.1-alpha.3",
+    "@typescript-eslint/tsconfig-utils": "8.51.1-alpha.3",
+    "@typescript-eslint/types": "8.51.1-alpha.3",
+    "@typescript-eslint/visitor-keys": "8.51.1-alpha.3",
     "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",