@typescript-eslint/typescript-estree 8.70.1-alpha.11 → 8.70.1-alpha.13

package/dist/node-utils.js

@@ -521,8 +521,16 @@ function convertTokens(ast) {
         if (isComment(node) || isJSDocComment(node)) {
             return;
         }
-        if (isToken(node) && node.kind !== SyntaxKind.EndOfFileToken) {
-            result.push(convertToken(node, ast));
+        const { kind } = node;
+        if (isToken(node) && kind !== SyntaxKind.EndOfFileToken) {
+            const token = convertToken(node, ast);
+            // TypeScript drops first half of a `<<` in some cases.
+            // Gating on `kind` (a cheap check) keeps the rest of the check,
+            // which has to look at the text, off the hot path.
+            if (kind === SyntaxKind.LessThanToken) {
+                addMissingLessThanToken(result, token, ast);
+            }
+            result.push(token);
         }
         else {
             node.getChildren(ast).forEach(walk);
@@ -531,6 +539,43 @@ function convertTokens(ast) {
     walk(ast);
     return result;
 }
+/**
+ * TypeScript recovers the tokens its parser did not keep as children of a node
+ * (`<` and `>` of a type argument list, for instance) by re-scanning the source
+ * text in the gaps between the children it did keep, and discards any token
+ * that runs past the end of the gap being filled.
+ *
+ * Its scanner produces `<<` as a single token, which the parser splits back
+ * apart when the second `<` opens a type parameter list, as in
+ * `ReturnType<<T>(x: T) => number>`. The re-scan is not aware of that split,
+ * so the `<<` it scans overruns the gap left by the first `<`, and that token
+ * is dropped from `getChildren()` entirely.
+ *
+ * Text skipped in front of a token can otherwise only be trivia, and no trivia
+ * can end in a `<`: line comments, shebangs and conflict markers all run to the
+ * end of a line, and block comments all end in `*` + `/`. So a `<` sitting
+ * directly in front of a token, with anything at all skipped before it,
+ * is unambiguously a token TypeScript lost.
+ *
+ * Only ever called for a `<` token — see the caller.
+ */
+function addMissingLessThanToken(result, token, ast) {
+    if (result.length === 0) {
+        return;
+    }
+    const currentTokenStart = token.range[0];
+    const previousTokenEnd = result[result.length - 1].range[1];
+    if (currentTokenStart > previousTokenEnd &&
+        ast.text[currentTokenStart - 1] === '<') {
+        const range = [currentTokenStart - 1, currentTokenStart];
+        result.push({
+            type: ts_estree_1.AST_TOKEN_TYPES.Punctuator,
+            loc: getLocFor(range, ast),
+            range,
+            value: '<',
+        });
+    }
+}
 class TSError extends Error {
     fileName;
     location;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/typescript-estree",
-  "version": "8.70.1-alpha.11",
+  "version": "8.70.1-alpha.13",
   "description": "A parser that converts TypeScript source code into an ESTree compatible form",
   "files": [
     "dist",
@@ -43,10 +43,10 @@
     "syntax"
   ],
   "dependencies": {
-    "@typescript-eslint/project-service": "8.70.1-alpha.11",
-    "@typescript-eslint/tsconfig-utils": "8.70.1-alpha.11",
-    "@typescript-eslint/types": "8.70.1-alpha.11",
-    "@typescript-eslint/visitor-keys": "8.70.1-alpha.11",
+    "@typescript-eslint/project-service": "8.70.1-alpha.13",
+    "@typescript-eslint/tsconfig-utils": "8.70.1-alpha.13",
+    "@typescript-eslint/types": "8.70.1-alpha.13",
+    "@typescript-eslint/visitor-keys": "8.70.1-alpha.13",
     "debug": "^4.4.3",
     "minimatch": "^10.2.2",
     "semver": "^7.7.3",