Replace devDependency @typescript-eslint/experimental-utils with `@…

…typescript-eslint/utils` (SonarSource#453)
ericmorand-sonarsource · Mar 22, 2024 · abcd666 · abcd666
1 parent e8d2d08
commit abcd666
Show file tree

Hide file tree

Showing 51 changed files with 52 additions and 76 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,8 +44,8 @@
     "@types/lodash": "4.14.182",
     "@types/minimist": "1.2.2",
     "@types/node": "14.14.31",
-    "@typescript-eslint/experimental-utils": "5.30.7",
     "@typescript-eslint/parser": "5.30.7",
+    "@typescript-eslint/utils": "5.30.7",
     "eslint": "8.47.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-import": "2.26.0",

diff --git a/src/index.ts b/src/index.ts
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import type { TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESLint } from '@typescript-eslint/utils';
 
 const sonarjsRules: string[] = [
   'cognitive-complexity',

diff --git a/src/rules/cognitive-complexity.ts b/src/rules/cognitive-complexity.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S3776
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import { isIfStatement, isLogicalExpression } from '../utils/nodes';
 import {
   getFirstToken,

diff --git a/src/rules/elseif-without-else.ts b/src/rules/elseif-without-else.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S126
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import docsUrl from '../utils/docs-url';
 
 const rule: TSESLint.RuleModule<string, string[]> = {

diff --git a/src/rules/max-switch-cases.ts b/src/rules/max-switch-cases.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1479
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import docsUrl from '../utils/docs-url';
 
 const DEFAULT_MAX_SWITCH_CASES = 30;

diff --git a/src/rules/no-all-duplicated-branches.ts b/src/rules/no-all-duplicated-branches.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S3923
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { isIfStatement } from '../utils/nodes';
 import { areEquivalent } from '../utils/equivalence';
 import { collectIfBranches, collectSwitchBranches } from '../utils/conditions';

diff --git a/src/rules/no-collapsible-if.ts b/src/rules/no-collapsible-if.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1066
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { isIfStatement, isBlockStatement } from '../utils/nodes';
 import { report, issueLocation } from '../utils/locations';
 import docsUrl from '../utils/docs-url';

diff --git a/src/rules/no-collection-size-mischeck.ts b/src/rules/no-collection-size-mischeck.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S3981
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { isRequiredParserServices, RequiredParserServices } from '../utils/parser-services';
 import docsUrl from '../utils/docs-url';
 

diff --git a/src/rules/no-duplicate-string.ts b/src/rules/no-duplicate-string.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1192
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import docsUrl from '../utils/docs-url';
 import { issueLocation, report } from '../utils/locations';
 

diff --git a/src/rules/no-duplicated-branches.ts b/src/rules/no-duplicated-branches.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1871
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { isIfStatement, isBlockStatement } from '../utils/nodes';
 import { areEquivalent } from '../utils/equivalence';
 import { collectIfBranches, takeWithoutBreak, collectSwitchBranches } from '../utils/conditions';

diff --git a/src/rules/no-element-overwrite.ts b/src/rules/no-element-overwrite.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S4143
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import { areEquivalent } from '../utils/equivalence';
 import {
   isExpressionStatement,

diff --git a/src/rules/no-empty-collection.ts b/src/rules/no-empty-collection.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S4158
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import {
   isIdentifier,
   findFirstMatchingAncestor,

diff --git a/src/rules/no-extra-arguments.ts b/src/rules/no-extra-arguments.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S930
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import {
   isArrowFunctionExpression,
   isFunctionDeclaration,

diff --git a/src/rules/no-gratuitous-expressions.ts b/src/rules/no-gratuitous-expressions.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S2589
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import { report } from '../utils/locations';
 import { isIdentifier, isIfStatement } from '../utils/nodes';
 import docsUrl from '../utils/docs-url';

diff --git a/src/rules/no-identical-conditions.ts b/src/rules/no-identical-conditions.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1862
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { areEquivalent } from '../utils/equivalence';
 import { report, issueLocation } from '../utils/locations';
 import docsUrl from '../utils/docs-url';

diff --git a/src/rules/no-identical-expressions.ts b/src/rules/no-identical-expressions.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1764
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { isIdentifier, isLiteral } from '../utils/nodes';
 import { areEquivalent } from '../utils/equivalence';
 import { report, issueLocation, IssueLocation } from '../utils/locations';

diff --git a/src/rules/no-identical-functions.ts b/src/rules/no-identical-functions.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S4144
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { areEquivalent } from '../utils/equivalence';
 import { getMainFunctionTokenLocation, report, issueLocation } from '../utils/locations';
 import docsUrl from '../utils/docs-url';

diff --git a/src/rules/no-ignored-return.ts b/src/rules/no-ignored-return.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S2201
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { isRequiredParserServices, RequiredParserServices } from '../utils/parser-services';
 import docsUrl from '../utils/docs-url';
 import { getTypeFromTreeNode } from '../utils';

diff --git a/src/rules/no-inverted-boolean-check.ts b/src/rules/no-inverted-boolean-check.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1940
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { isBinaryExpression } from '../utils/nodes';
 import docsUrl from '../utils/docs-url';
 

diff --git a/src/rules/no-nested-switch.ts b/src/rules/no-nested-switch.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1821
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import docsUrl from '../utils/docs-url';
 
 const rule: TSESLint.RuleModule<string, string[]> = {

diff --git a/src/rules/no-nested-template-literals.ts b/src/rules/no-nested-template-literals.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S4624
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { ancestorsChain } from '../utils';
 import docsUrl from '../utils/docs-url';
 

diff --git a/src/rules/no-one-iteration-loop.ts b/src/rules/no-one-iteration-loop.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1751
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { Rule } from 'eslint';
 import { isContinueStatement } from '../utils/nodes';
 import docsUrl from '../utils/docs-url';
@@ -38,7 +38,7 @@ const rule: TSESLint.RuleModule<string, string[]> = {
       url: docsUrl(__filename),
     },
   },
-  // @ts-ignore The typings of @typescript-eslint/experimental-utils does not contain the 'onX' methods.
+  // @ts-ignore The typings of @typescript-eslint/utils does not contain the 'onX' methods.
   create(context) {
     const loopingNodes: Set<TSESTree.Node> = new Set();
     const loops: Set<TSESTree.Node> = new Set();

diff --git a/src/rules/no-redundant-boolean.ts b/src/rules/no-redundant-boolean.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1125
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { isBooleanLiteral, isIfStatement, isConditionalExpression } from '../utils/nodes';
 import docsUrl from '../utils/docs-url';
 

diff --git a/src/rules/no-redundant-jump.ts b/src/rules/no-redundant-jump.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S3626
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import docsUrl from '../utils/docs-url';
 
 const loops = 'WhileStatement, ForStatement, DoWhileStatement, ForInStatement, ForOfStatement';

diff --git a/src/rules/no-same-line-conditional.ts b/src/rules/no-same-line-conditional.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S3972
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import docsUrl from '../utils/docs-url';
 import { issueLocation, report } from '../utils/locations';
 

diff --git a/src/rules/no-small-switch.ts b/src/rules/no-small-switch.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1301
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import docsUrl from '../utils/docs-url';
 
 const rule: TSESLint.RuleModule<string, string[]> = {

diff --git a/src/rules/no-unused-collection.ts b/src/rules/no-unused-collection.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S4030
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import { collectionConstructor, writingMethods } from '../utils/collections';
 import docsUrl from '../utils/docs-url';
 

diff --git a/src/rules/no-use-of-empty-return-value.ts b/src/rules/no-use-of-empty-return-value.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S3699
 
-import { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import { isFunctionExpression, isArrowFunctionExpression, isBlockStatement } from '../utils/nodes';
 import docsUrl from '../utils/docs-url';
 

diff --git a/src/rules/no-useless-catch.ts b/src/rules/no-useless-catch.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1940
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import { isThrowStatement } from '../utils/nodes';
 import { areEquivalent } from '../utils/equivalence';
 import docsUrl from '../utils/docs-url';

diff --git a/src/rules/non-existent-operator.ts b/src/rules/non-existent-operator.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S2757
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import docsUrl from '../utils/docs-url';
 
 const rule: TSESLint.RuleModule<string, string[]> = {

diff --git a/src/rules/prefer-immediate-return.ts b/src/rules/prefer-immediate-return.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1488
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import {
   isReturnStatement,
   isThrowStatement,

diff --git a/src/rules/prefer-object-literal.ts b/src/rules/prefer-object-literal.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S2428
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import {
   isModuleDeclaration,
   isVariableDeclaration,

diff --git a/src/rules/prefer-single-boolean-return.ts b/src/rules/prefer-single-boolean-return.ts
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1126
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 import {
   isReturnStatement,
   isBlockStatement,

diff --git a/src/rules/prefer-while.ts b/src/rules/prefer-while.ts
@@ -19,7 +19,7 @@
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1264
 
-import type { TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import docsUrl from '../utils/docs-url';
 
 const rule: TSESLint.RuleModule<string, string[]> = {

diff --git a/src/utils/conditions.ts b/src/utils/conditions.ts
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import type { TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESTree } from '@typescript-eslint/utils';
 import { isIfStatement } from './nodes';
 
 /** Returns a list of statements corresponding to a `if - else if - else` chain */

diff --git a/src/utils/equivalence.ts b/src/utils/equivalence.ts
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 
 /**
  * Equivalence is implemented by comparing node types and their tokens.

diff --git a/src/utils/jsx.ts b/src/utils/jsx.ts
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import type { TSESTree } from '@typescript-eslint/experimental-utils';
+import type { TSESTree } from '@typescript-eslint/utils';
 
 export function getJsxShortCircuitNodes(logicalExpression: TSESTree.LogicalExpression) {
   if (logicalExpression.parent?.type !== 'JSXExpressionContainer') {

diff --git a/src/utils/locations.ts b/src/utils/locations.ts
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import type { TSESTree, TSESLint } from '@typescript-eslint/experimental-utils';
+import type { TSESTree, TSESLint } from '@typescript-eslint/utils';
 
 type Writeable<T> = { -readonly [P in keyof T]: T[P] };
 export type MutableReportDescriptor = Writeable<TSESLint.ReportDescriptor<string>>;