Update to TypeScript 4.9

eslint-bridge/package.json

@@ -74,7 +74,7 @@
     "scslre": "0.1.6",
     "stylelint": "14.13.0",
     "tmp": "0.2.1",
-    "typescript": "4.8.3",
+    "typescript": "4.9.3",
     "vue-eslint-parser": "9.1.0",
     "yaml": "2.1.1"
   },

eslint-bridge/src/linting/eslint/rules/helpers/ast.ts

@@ -267,12 +267,12 @@ export function getUniqueWriteUsageOrNode(
   }
 }
 
-export function getValueOfExpression<T extends Node['type']>(
+export function getValueOfExpression<T extends estree.Node['type']>(
   context: Rule.RuleContext,
-  expr: Node | undefined | null,
+  expr: estree.Node | undefined | null,
   type: T,
   recursive = false,
-): Extract<Node, { type: T }> | undefined {
+): Extract<estree.Node, { type: T }> | undefined {
   if (!expr) {
     return undefined;
   }

eslint-bridge/src/linting/eslint/rules/helpers/module.ts

@@ -20,6 +20,7 @@
 import assert from 'assert';
 import { Rule, Scope } from 'eslint';
 import * as estree from 'estree';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 import {
   Node,
   isDefaultSpecifier,
@@ -270,7 +271,7 @@ export function hasFullyQualifiedName(
  */
 export function getFullyQualifiedName(
   context: Rule.RuleContext,
-  node: Node,
+  node: estree.Node,
   fqn: string[] = [],
   scope?: Scope.Scope,
 ): string | null {
@@ -339,7 +340,7 @@ export function getFullyQualifiedName(
  * @param node the Node to traverse
  * @param fqn the array with the qualifiers
  */
-export function reduceToIdentifier(node: Node, fqn: string[] = []): Node {
+export function reduceToIdentifier(node: estree.Node, fqn: string[] = []): estree.Node {
   return reduceTo('Identifier', node, fqn);
 }
 
@@ -351,8 +352,12 @@ export function reduceToIdentifier(node: Node, fqn: string[] = []): Node {
  * @param node the Node to traverse
  * @param fqn the array with the qualifiers
  */
-export function reduceTo<T extends Node['type']>(type: T, node: Node, fqn: string[] = []): Node {
-  let nodeToCheck: Node = node;
+export function reduceTo<T extends estree.Node['type']>(
+  type: T,
+  node: estree.Node,
+  fqn: string[] = [],
+): estree.Node {
+  let nodeToCheck: estree.Node = node;
 
   while (nodeToCheck.type !== type) {
     if (nodeToCheck.type === 'MemberExpression') {
@@ -369,8 +374,10 @@ export function reduceTo<T extends Node['type']>(type: T, node: Node, fqn: strin
       nodeToCheck = nodeToCheck.callee;
     } else if (nodeToCheck.type === 'ChainExpression') {
       nodeToCheck = nodeToCheck.expression;
-    } else if (nodeToCheck.type === 'TSNonNullExpression') {
-      nodeToCheck = nodeToCheck.expression;
+    } else if ((nodeToCheck as TSESTree.Node).type === 'TSNonNullExpression') {
+      // we should migrate to use only TSESTree types everywhere to avoid casting
+      nodeToCheck = (nodeToCheck as unknown as TSESTree.TSNonNullExpression)
+        .expression as estree.Expression;
     } else {
       break;
     }

its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/EslintCustomRulesTest.java

@@ -98,7 +98,7 @@ void test() {
     BuildResult buildResult = runBuild(orchestrator);
     assertThat(buildResult.getLogsLines(l -> l.matches(".*DEBUG: Deploying custom rules bundle jar:file:.*/custom-eslint-based-rules-1\\.0\\.0\\.tgz to .*"))).hasSize(1);
     assertThat(buildResult.getLogsLines(l -> l.contains("Custom JavaScript rules are deprecated and API will be removed in future version."))).isEmpty();
-    assertThat(buildResult.getLogsLines(l -> l.contains("TS API in custom rule: TS version 4.8.3"))).hasSize(2);
+    assertThat(buildResult.getLogsLines(l -> l.contains("TS API in custom rule: TS version 4.9.3"))).hasSize(2);
     List<Issue> issues = findIssues("eslint-custom-rules:sqKey", orchestrator);
     assertThat(issues).hasSize(2);
     assertThat(issues).extracting(Issue::getRule, Issue::getComponent, Issue::getLine, Issue::getMessage)

its/ruling/src/test/expected/js/es5-shim/javascript-S1874.json

@@ -1,4 +1,7 @@
 {
+'es5-shim:es5-sham.js':[
+214,
+],
 'es5-shim:es5-shim.js':[
 1949,
 1950,

its/ruling/src/test/expected/js/mootools-core/javascript-S1874.json

@@ -1,4 +1,7 @@
 {
+'mootools-core:Source/Fx/Fx.CSS.js':[
+125,
+],
 'mootools-core:Source/Types/Function.js':[
 91,
 ],

its/ruling/src/test/expected/js/prototype/javascript-S1874.json

@@ -1,4 +1,7 @@
 {
+'prototype:src/prototype/ajax/request.js':[
+327,
+],
 'prototype:src/prototype/ajax/response.js':[
 159,
 ],

its/ruling/src/test/expected/ts/TypeScript/typescript-S4325.json

@@ -180,6 +180,7 @@
 917,
 985,
 1362,
+1366,
 ],
 'TypeScript:src/compiler/declarationEmitter.ts':[
 789,

its/ruling/src/test/expected/ts/ant-design/typescript-S1874.json

@@ -29,4 +29,7 @@
 90,
 91,
 ],
+'ant-design:site/theme/template/Layout/Header/SearchBar.tsx':[
+38,
+],
 }