Upgrade: typescript-estree to 9.0.0 and add new tests

Author: armano2

analyze-scope.js

@@ -355,6 +355,23 @@ class Referencer extends OriginalReferencer {
         }
     }
 
+    /**
+     * Visit as expression.
+     * @param {TSAsExpression} node The TSAsExpression node to visit.
+     * @returns {void}
+     */
+    TSAsExpression(node) {
+        this.visit(node.expression);
+
+        if (this.typeMode) {
+            this.visit(node.typeAnnotation);
+        } else {
+            this.typeMode = true;
+            this.visit(node.typeAnnotation);
+            this.typeMode = false;
+        }
+    }
+
     /**
      * Switch to the type mode and visit child nodes to find `typeof x` expression in type declarations.
      * @param {TSTypeAnnotation} node The TSTypeAnnotation node to visit.
@@ -400,6 +417,14 @@ class Referencer extends OriginalReferencer {
         }
     }
 
+    /**
+     * @param {TSInferType} node The TSInferType node to visit.
+     * @returns {void}
+     */
+    TSInferType(node) {
+        this.visitTypeNodes(node);
+    }
+
     /**
      * @param {TSTypeReference} node The TSTypeReference node to visit.
      * @returns {void}
@@ -659,11 +684,11 @@ class Referencer extends OriginalReferencer {
      * @returns {void}
      */
     TSImportEqualsDeclaration(node) {
-        const { name, moduleReference } = node;
-        if (name && name.type === "Identifier") {
+        const { id, moduleReference } = node;
+        if (id && id.type === "Identifier") {
             this.currentScope().__define(
-                name,
-                new Definition("ImportBinding", name, node, null, null, null)
+                id,
+                new Definition("ImportBinding", id, node, null, null, null)
             );
         }
         this.visit(moduleReference);

package.json

@@ -46,7 +46,7 @@
   "dependencies": {
     "eslint-scope": "^4.0.0",
     "eslint-visitor-keys": "^1.0.0",
-    "typescript-estree": "8.1.0"
+    "typescript-estree": "9.0.0"
   },
   "devDependencies": {
     "eslint": "^4.19.1",

tests/fixtures/scope-analysis/expression-as.ts

@@ -0,0 +1 @@
+(a as number as any) = 42;

tests/fixtures/scope-analysis/types-infer.ts

@@ -0,0 +1,5 @@
+type Unpacked<T> =
+    T extends (infer U)[] ? U :
+        T extends infer U ? U :
+            T extends Promise<infer U> ? U :
+                T;

tests/lib/__snapshots__/scope-analysis.js.snap

@@ -3396,6 +3396,53 @@ Object {
 }
 `;
 
+exports[`TypeScript scope analysis tests/fixtures/scope-analysis/expression-as.ts 1`] = `
+Object {
+  "$id": 1,
+  "block": Object {
+    "range": Array [
+      0,
+      27,
+    ],
+    "type": "Program",
+  },
+  "childScopes": Array [],
+  "functionExpressionScope": false,
+  "isStrict": false,
+  "references": Array [
+    Object {
+      "$id": 0,
+      "from": Object {
+        "$ref": 1,
+      },
+      "identifier": Object {
+        "name": "a",
+        "range": Array [
+          1,
+          2,
+        ],
+        "type": "Identifier",
+      },
+      "kind": "r",
+      "resolved": null,
+      "writeExpr": undefined,
+    },
+  ],
+  "throughReferences": Array [
+    Object {
+      "$ref": 0,
+    },
+  ],
+  "type": "global",
+  "upperScope": null,
+  "variableMap": Object {},
+  "variableScope": Object {
+    "$ref": 1,
+  },
+  "variables": Array [],
+}
+`;
+
 exports[`TypeScript scope analysis tests/fixtures/scope-analysis/expression-type-parameters.ts 1`] = `
 Object {
   "$id": 14,
@@ -7339,6 +7386,31 @@ Object {
 }
 `;
 
+exports[`TypeScript scope analysis tests/fixtures/scope-analysis/types-infer.ts 1`] = `
+Object {
+  "$id": 0,
+  "block": Object {
+    "range": Array [
+      0,
+      147,
+    ],
+    "type": "Program",
+  },
+  "childScopes": Array [],
+  "functionExpressionScope": false,
+  "isStrict": false,
+  "references": Array [],
+  "throughReferences": Array [],
+  "type": "global",
+  "upperScope": null,
+  "variableMap": Object {},
+  "variableScope": Object {
+    "$ref": 0,
+  },
+  "variables": Array [],
+}
+`;
+
 exports[`TypeScript scope analysis tests/fixtures/scope-analysis/types-intersection-type.src.ts 1`] = `
 Object {
   "$id": 0,

visitor-keys.js

@@ -32,7 +32,9 @@ module.exports = Evk.unionWith({
     TSAbstractMethodDefinition: ["key", "value"],
     TSAnyKeyword: [],
     TSArrayType: ["elementType"],
+    TSAsExpression: ["expression", "typeAnnotation"],
     TSAsyncKeyword: [],
+    TSBigIntKeyword: [],
     TSBooleanKeyword: [],
     TSCallSignature: ["typeParameters", "parameters", "typeAnnotation"],
     TSConditionalType: ["checkType", "extendsType", "trueType", "falseType"],
@@ -48,14 +50,15 @@ module.exports = Evk.unionWith({
     TSExportKeyword: [],
     TSExternalModuleReference: ["expression"],
     TSImportType: ["parameter", "qualifier", "typeParameters"],
+    TSInferType: ["typeParameter"],
     TSLiteralType: ["literal"],
     TSIntersectionType: ["types"],
     TSIndexedAccessType: ["indexType", "objectType"],
     TSIndexSignature: ["typeAnnotation", "index"],
     TSInterfaceBody: ["body"],
     TSInterfaceDeclaration: ["id", "typeParameters", "heritage", "body"],
     TSInterfaceHeritage: ["id", "typeParameters"],
-    TSImportEqualsDeclaration: ["name", "moduleReference"],
+    TSImportEqualsDeclaration: ["id", "moduleReference"],
     TSFunctionType: ["parameters", "typeAnnotation"],
     TSMappedType: ["typeParameter"],
     TSMethodSignature: ["typeAnnotation", "typeParameters", "key", "params"],
@@ -81,6 +84,7 @@ module.exports = Evk.unionWith({
     TSStaticKeyword: [],
     TSStringKeyword: [],
     TSSymbolKeyword: [],
+    TSThisType: [],
     TSTupleType: ["elementTypes"],
     TSTypeAnnotation: ["typeAnnotation"],
     TSTypeAliasDeclaration: ["id", "typeParameters", "typeAnnotation"],
@@ -94,5 +98,6 @@ module.exports = Evk.unionWith({
     TSTypeQuery: ["exprName"],
     TSUnionType: ["types"],
     TSUndefinedKeyword: [],
+    TSUnknownKeyword: [],
     TSVoidKeyword: []
 });