chore: enable no-unsafe-call locally (typescript-eslint#3281)

Josh Goldberg · web-flow · commit b4cf0da0232e · 2021-04-19T09:45:10.000-07:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -64,7 +64,6 @@ module.exports = {
 
     // TODO - enable these new recommended rules
     '@typescript-eslint/no-unsafe-assignment': 'off',
-    '@typescript-eslint/no-unsafe-call': 'off',
     '@typescript-eslint/no-unsafe-member-access': 'off',
     '@typescript-eslint/no-unsafe-return': 'off',
     '@typescript-eslint/restrict-template-expressions': 'off',
@@ -191,6 +190,8 @@ module.exports = {
     {
       files: ['tests/**/*.js'],
       rules: {
+        '@typescript-eslint/explicit-function-return-type': 'off',
+        '@typescript-eslint/no-unsafe-call': 'off',
         '@typescript-eslint/restrict-plus-operands': 'off',
       },
     },
diff --git a/package.json b/package.json
@@ -84,6 +84,7 @@
     "@types/lodash": "^4.14.149",
     "@types/marked": "^2.0.0",
     "@types/node": "^14.14.27",
+    "@types/node-fetch": "^2.5.10",
     "@types/prettier": "^2.2.1",
     "@types/rimraf": "^3.0.0",
     "@types/semver": "^7.3.4",
@@ -99,13 +100,13 @@
     "eslint-plugin-jest": "^24.1.3",
     "glob": "^7.1.6",
     "husky": "^5.0.9",
-    "isomorphic-fetch": "^3.0.0",
     "jest": "^26.6.3",
     "jest-specific-snapshot": "^4.0.0",
     "lerna": "^3.22.1",
     "lint-staged": "^10.2.13",
     "make-dir": "^3.1.0",
     "markdownlint-cli": "^0.27.1",
+    "node-fetch": "^2.6.1",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2",
     "ts-jest": "^26.5.1",
diff --git a/packages/eslint-plugin-tslint/src/custom-linter.ts b/packages/eslint-plugin-tslint/src/custom-linter.ts
@@ -1,11 +1,8 @@
 import { ILinterOptions, Linter, LintResult } from 'tslint';
 import { Program, SourceFile } from 'typescript';
 
-// We need to access the program, but Linter has private program already
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const TSLintLinter = Linter as any;
-
-export class CustomLinter extends TSLintLinter {
+// @ts-expect-error - We need to access the program, but Linter has private program already
+export class CustomLinter extends Linter {
   constructor(options: ILinterOptions, private readonly program: Program) {
     super(options, program);
   }
diff --git a/packages/experimental-utils/src/eslint-utils/RuleTester.ts b/packages/experimental-utils/src/eslint-utils/RuleTester.ts
@@ -32,6 +32,7 @@ class RuleTester extends TSESLint.RuleTester {
       try {
         // instead of creating a hard dependency, just use a soft require
         // a bit weird, but if they're using this tooling, it'll be installed
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         require(parser).clearCaches();
       } catch {
         // ignored
diff --git a/packages/parser/tests/tools/test-utils.ts b/packages/parser/tests/tools/test-utils.ts
@@ -53,13 +53,13 @@ export function createSnapshotTestBlock(
     try {
       const result = parse();
       expect(result).toMatchSnapshot();
-    } catch (e) {
+    } catch (error) {
       /**
        * If we are deliberately throwing because of encountering an unknown
        * AST_NODE_TYPE, we rethrow to cause the test to fail
        */
-      if (e.message.match('Unknown AST_NODE_TYPE')) {
-        throw new Error(e);
+      if (/Unknown AST_NODE_TYPE/.exec((error as Error).message)) {
+        throw new Error(error);
       }
       expect(parse).toThrowErrorMatchingSnapshot();
     }
diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -1,5 +1,5 @@
 // There's lots of funny stuff due to the typing of ts.Node
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-call */
 import * as ts from 'typescript';
 import {
   canContainDirective,
diff --git a/packages/typescript-estree/tests/lib/convert.test.ts b/packages/typescript-estree/tests/lib/convert.test.ts
@@ -1,5 +1,5 @@
 // deeplyCopy is private internal
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-call */
 import { Converter } from '../../src/convert';
 import * as ts from 'typescript';
 
diff --git a/packages/typescript-estree/tests/lib/parse.test.ts b/packages/typescript-estree/tests/lib/parse.test.ts
@@ -506,7 +506,7 @@ describe('parseAndGenerateServices', () => {
         /**
          * Aligns paths between environments, node for windows uses `\`, for linux and mac uses `/`
          */
-        error.message = error.message.replace(/\\(?!["])/gm, '/');
+        error.message = (error as Error).message.replace(/\\(?!["])/gm, '/');
         throw error;
       }
     };
diff --git a/packages/typescript-estree/tools/test-utils.ts b/packages/typescript-estree/tools/test-utils.ts
@@ -35,13 +35,13 @@ export function createSnapshotTestBlock(
     try {
       const result = parse();
       expect(result).toMatchSnapshot();
-    } catch (e) {
+    } catch (error) {
       /**
        * If we are deliberately throwing because of encountering an unknown
        * AST_NODE_TYPE, we rethrow to cause the test to fail
        */
-      if (e.message.match('Unknown AST_NODE_TYPE')) {
-        throw new Error(e);
+      if (/Unknown AST_NODE_TYPE/.exec((error as Error).message)) {
+        throw new Error(error);
       }
       expect(parse).toThrowErrorMatchingSnapshot();
     }
diff --git a/tests/integration/utils/jest-snapshot-resolver.js b/tests/integration/utils/jest-snapshot-resolver.js
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
 /**
  * Use a jest snapshotResolver to map the test snapshot output back to the
  * linked volume. This means that even though we are running our tests inside
diff --git a/tools/generate-contributors.ts b/tools/generate-contributors.ts
@@ -3,7 +3,7 @@
 // this endpoint returns a list of contributors sorted by number of contributions
 
 import * as fs from 'fs';
-import 'isomorphic-fetch';
+import fetch from 'node-fetch';
 import * as path from 'path';
 
 const IGNORED_USERS = new Set([
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
@@ -1,4 +1,7 @@
 {
+  "compilerOptions": {
+    "types": ["@types/node"]
+  },
   "extends": "./tsconfig.base.json",
   "include": ["tests/**/*.ts", "tools/**/*.ts", ".eslintrc.js"]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1932,6 +1932,14 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
+"@types/node-fetch@^2.5.10":
+  version "2.5.10"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.10.tgz#9b4d4a0425562f9fcea70b12cb3fcdd946ca8132"
+  integrity sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
 "@types/node@*", "@types/node@>= 8", "@types/node@^14.14.27":
   version "14.14.37"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
@@ -2861,7 +2869,7 @@ columnify@^1.5.4:
     strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4179,6 +4187,15 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -5169,14 +5186,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isomorphic-fetch@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz#0267b005049046d2421207215d45d6a262b8b8b4"
-  integrity sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==
-  dependencies:
-    node-fetch "^2.6.1"
-    whatwg-fetch "^3.4.1"
-
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -8898,11 +8907,6 @@ whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-fetch@^3.4.1:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz#605a2cd0a7146e5db141e29d1c62ab84c0c4c868"
-  integrity sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==
-
 whatwg-mimetype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ describe('parseAndGenerateServices', () => {`
`506`	`506`	`/**`
`507`	`507`	* Aligns paths between environments, node for windows uses `\`, for linux and mac uses `/`
`508`	`508`	`*/`
`509`		`- error.message = error.message.replace(/\\(?!["])/gm, '/');`
	`509`	`+ error.message = (error as Error).message.replace(/\\(?!["])/gm, '/');`
`510`	`510`	`throw error;`
`511`	`511`	`}`
`512`	`512`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* eslint-disable @typescript-eslint/explicit-function-return-type */`
`2`	`1`	`/**`
`3`	`2`	`* Use a jest snapshotResolver to map the test snapshot output back to the`
`4`	`3`	`* linked volume. This means that even though we are running our tests inside`