chore: enable no-unsafe-assignment internally (#3280)

* chore: enable no-unsafe-assignment internally * Remove unnecessary disable * Properly fix in generate-contributors * Update packages/eslint-plugin-tslint/src/rules/config.ts Co-authored-by: Brad Zacher <brad.zacher@gmail.com> * Update packages/scope-manager/tests/util/serializers/baseSerializer.ts Co-authored-by: Brad Zacher <brad.zacher@gmail.com> * Update from the Twitch stream ✨ * Long delayed cleanups * Cleaned up a final few lint complaints * fix: TSESTree import * fix: moving around disables Co-authored-by: Brad Zacher <brad.zacher@gmail.com>
typescript-eslint · May 28, 2021 · 9524424 · 9524424
1 parent 5af8db6
commit 9524424
Show file tree

Hide file tree

Showing 26 changed files with 56 additions and 45 deletions.
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-member-access': 'off',
     '@typescript-eslint/no-unsafe-return': 'off',
     '@typescript-eslint/restrict-template-expressions': 'off',
@@ -172,6 +171,7 @@ module.exports = {
         'jest/globals': true,
       },
       rules: {
+        '@typescript-eslint/no-unsafe-assignment': 'off',
         'eslint-plugin/no-identical-tests': 'error',
         'jest/no-disabled-tests': 'warn',
         'jest/no-focused-tests': 'error',

diff --git a/packages/eslint-plugin-internal/src/util/createRule.ts b/packages/eslint-plugin-internal/src/util/createRule.ts
@@ -1,7 +1,8 @@
 import { ESLintUtils } from '@typescript-eslint/experimental-utils';
 
 // note - cannot migrate this to an import statement because it will make TSC copy the package.json to the dist folder
-const version = require('../../package.json').version;
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+const version: string = require('../../package.json');
 
 const createRule = ESLintUtils.RuleCreator(
   name =>

diff --git a/packages/eslint-plugin-tslint/src/rules/config.ts b/packages/eslint-plugin-tslint/src/rules/config.ts
@@ -4,7 +4,8 @@ import { Configuration, RuleSeverity } from 'tslint';
 import { CustomLinter } from '../custom-linter';
 
 // note - cannot migrate this to an import statement because it will make TSC copy the package.json to the dist folder
-const version = require('../../package.json').version;
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+const version: string = require('../../package.json');
 
 const createRule = ESLintUtils.RuleCreator(
   () =>
@@ -62,8 +63,8 @@ export default createRule<Options, MessageIds>({
     docs: {
       description:
         'Wraps a TSLint configuration and lints the whole source using TSLint',
-      // one off special category for this plugin
-      category: 'TSLint' as any, // eslint-disable-line @typescript-eslint/no-explicit-any
+      // @ts-expect-error - We know this is a one off special category for this plugin
+      category: 'TSLint',
       recommended: false,
     },
     fixable: 'code',

diff --git a/packages/eslint-plugin/src/rules/indent-new-do-not-use/TokenInfo.ts b/packages/eslint-plugin/src/rules/indent-new-do-not-use/TokenInfo.ts
@@ -9,7 +9,7 @@ import { TokenOrComment } from './BinarySearchTree';
  */
 export class TokenInfo {
   private readonly sourceCode: TSESLint.SourceCode;
-  public firstTokensByLineNumber: Map<number, TSESTree.Token>;
+  public readonly firstTokensByLineNumber: Map<number, TSESTree.Token>;
 
   constructor(sourceCode: TSESLint.SourceCode) {
     this.sourceCode = sourceCode;
@@ -28,7 +28,7 @@ export class TokenInfo {
         }
         return map;
       },
-      new Map(),
+      new Map<number, TSESTree.Token>(),
     );
   }
 

diff --git a/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts b/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
@@ -1664,12 +1664,10 @@ export default createRule<Options, MessageIds>({
 
             return commentMap.set(
               comment,
-              commentMap.has(tokenOrCommentBefore)
-                ? commentMap.get(tokenOrCommentBefore)
-                : tokenOrCommentBefore,
+              commentMap.get(tokenOrCommentBefore) ?? tokenOrCommentBefore,
             );
           },
-          new WeakMap(),
+          new WeakMap<TokenOrComment, TSESTree.Token>(),
         );
 
         sourceCode.lines.forEach((_, lineIndex) => {
@@ -1700,7 +1698,7 @@ export default createRule<Options, MessageIds>({
           }
 
           if (isCommentToken(firstTokenOfLine)) {
-            const tokenBefore = precedingTokens.get(firstTokenOfLine);
+            const tokenBefore = precedingTokens.get(firstTokenOfLine)!;
             const tokenAfter = tokenBefore
               ? sourceCode.getTokenAfter(tokenBefore)!
               : sourceCode.ast.tokens[0];

diff --git a/packages/eslint-plugin/src/rules/indent.ts b/packages/eslint-plugin/src/rules/indent.ts
@@ -3,7 +3,7 @@
  * This is due to some really funky type conversions between different node types.
  * This is done intentionally based on the internal implementation of the base indent rule.
  */
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment  */
 
 import {
   TSESTree,
@@ -396,7 +396,7 @@ export default util.createRule<Options, MessageIds>({
               computed: false,
               method: false,
               shorthand: false,
-            } as any,
+            },
           ],
 
           // location data

diff --git a/packages/eslint-plugin/src/rules/naming-convention.ts b/packages/eslint-plugin/src/rules/naming-convention.ts
@@ -81,17 +81,17 @@ export default util.createRule<Options, MessageIds>({
   },
   defaultOptions: defaultCamelCaseAllTheThingsConfig,
   create(contextWithoutDefaults) {
-    const context: Context =
+    const context =
       contextWithoutDefaults.options &&
       contextWithoutDefaults.options.length > 0
         ? contextWithoutDefaults
         : // only apply the defaults when the user provides no config
-          Object.setPrototypeOf(
+          (Object.setPrototypeOf(
             {
               options: defaultCamelCaseAllTheThingsConfig,
             },
             contextWithoutDefaults,
-          );
+          ) as Context);
 
     const validators = parseOptions(context);
 

diff --git a/packages/eslint-plugin/src/rules/no-extra-parens.ts b/packages/eslint-plugin/src/rules/no-extra-parens.ts
@@ -1,5 +1,5 @@
 // any is required to work around manipulating the AST in weird ways
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment */
 
 import {
   AST_NODE_TYPES,

diff --git a/packages/eslint-plugin/src/rules/unified-signatures.ts b/packages/eslint-plugin/src/rules/unified-signatures.ts
@@ -471,7 +471,7 @@ export default util.createRule({
 
     const scopes: Scope[] = [];
     let currentScope: Scope = {
-      overloads: new Map(),
+      overloads: new Map<string, OverloadNode[]>(),
     };
 
     function createScope(
@@ -480,7 +480,7 @@ export default util.createRule({
     ): void {
       currentScope && scopes.push(currentScope);
       currentScope = {
-        overloads: new Map(),
+        overloads: new Map<string, OverloadNode[]>(),
         parent,
         typeParameters,
       };

diff --git a/packages/eslint-plugin/src/util/createRule.ts b/packages/eslint-plugin/src/util/createRule.ts
@@ -1,7 +1,8 @@
 import { ESLintUtils } from '@typescript-eslint/experimental-utils';
 
 // note - cannot migrate this to an import statement because it will make TSC copy the package.json to the dist folder
-const version = require('../../package.json').version;
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+const version: string = require('../../package.json');
 
 export const createRule = ESLintUtils.RuleCreator(
   name =>

diff --git a/packages/experimental-utils/src/ast-utils/eslint-utils/ReferenceTracker.ts b/packages/experimental-utils/src/ast-utils/eslint-utils/ReferenceTracker.ts
@@ -1,13 +1,14 @@
 /* eslint-disable @typescript-eslint/no-namespace */
-
 import * as eslintUtils from 'eslint-utils';
 import { TSESTree } from '../../ts-estree';
 import * as TSESLint from '../../ts-eslint';
 
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 const ReferenceTrackerREAD: unique symbol = eslintUtils.ReferenceTracker.READ;
 const ReferenceTrackerCALL: unique symbol = eslintUtils.ReferenceTracker.CALL;
 const ReferenceTrackerCONSTRUCT: unique symbol =
   eslintUtils.ReferenceTracker.CONSTRUCT;
+/* eslint-enable @typescript-eslint/no-unsafe-assignment */
 
 interface ReferenceTracker {
   /**

diff --git a/packages/experimental-utils/src/eslint-utils/applyDefault.ts b/packages/experimental-utils/src/eslint-utils/applyDefault.ts
@@ -8,13 +8,13 @@ import { deepMerge, isObjectNotArray } from './deepMerge';
  * @returns the options with defaults
  */
 function applyDefault<TUser extends readonly unknown[], TDefault extends TUser>(
-  defaultOptions: TDefault,
-  userOptions: TUser | null,
+  defaultOptions: Readonly<TDefault>,
+  userOptions: Readonly<TUser> | null,
 ): TDefault {
   // clone defaults
-  const options: AsMutable<TDefault> = JSON.parse(
+  const options = JSON.parse(
     JSON.stringify(defaultOptions),
-  );
+  ) as AsMutable<TDefault>;
 
   if (userOptions === null || userOptions === undefined) {
     return options;

diff --git a/packages/experimental-utils/src/ts-eslint-scope/index.ts b/packages/experimental-utils/src/ts-eslint-scope/index.ts
@@ -9,4 +9,6 @@ export * from './Referencer';
 export * from './Scope';
 export * from './ScopeManager';
 export * from './Variable';
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 export const version: string = ESLintVersion;
diff --git a/packages/experimental-utils/typings/eslint-scope.d.ts b/packages/experimental-utils/typings/eslint-scope.d.ts
@@ -57,7 +57,6 @@ declare module 'eslint-scope/lib/scope-manager' {
   export = ScopeManager;
 }
 declare module 'eslint-scope' {
-  const version: string;
-  const analyze: unknown;
-  export { analyze, version };
+  export const version: string;
+  export const analyze: unknown;
 }
diff --git a/packages/experimental-utils/typings/eslint-utils.d.ts b/packages/experimental-utils/typings/eslint-utils.d.ts
@@ -32,9 +32,9 @@ declare module 'eslint-utils' {
   export const isSemicolonToken: unknown;
   export const PatternMatcher: unknown;
   export const ReferenceTracker: {
-    READ: never;
-    CALL: never;
-    CONSTRUCT: never;
+    readonly READ: never;
+    readonly CALL: never;
+    readonly CONSTRUCT: never;
     new (): never;
   };
 }
diff --git a/packages/parser/src/index.ts b/packages/parser/src/index.ts
@@ -5,4 +5,5 @@ export {
 } from '@typescript-eslint/typescript-estree';
 
 // note - cannot migrate this to an import statement because it will make TSC copy the package.json to the dist folder
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 export const version: string = require('../package.json').version;
diff --git a/packages/scope-manager/src/scope/GlobalScope.ts b/packages/scope-manager/src/scope/GlobalScope.ts
@@ -34,7 +34,7 @@ class GlobalScope extends ScopeBase<
   constructor(scopeManager: ScopeManager, block: GlobalScope['block']) {
     super(scopeManager, ScopeType.global, null, block, false);
     this.implicit = {
-      set: new Map(),
+      set: new Map<string, Variable>(),
       variables: [],
       leftToBeResolved: [],
     };

diff --git a/packages/scope-manager/tests/util/serializers/baseSerializer.ts b/packages/scope-manager/tests/util/serializers/baseSerializer.ts
@@ -33,7 +33,9 @@ function createSerializer<TConstructor extends ConstructorSignature>(
     ): string {
       const id = thing.$id != null ? `$${thing.$id}` : '';
       // If `type` is a base class, we should print out the name of the subclass
-      const constructorName = Object.getPrototypeOf(thing).constructor.name;
+      // eslint-disable-next-line @typescript-eslint/ban-types
+      const constructorName = (Object.getPrototypeOf(thing) as Object)
+        .constructor.name;
 
       if (constructorName === 'ImplicitLibVariable' && thing.name === 'const') {
         return 'ImplicitGlobalConstTypeVariable';

diff --git a/packages/typescript-estree/src/ast-converter.ts b/packages/typescript-estree/src/ast-converter.ts
@@ -15,9 +15,7 @@ export function astConverter(
    * The TypeScript compiler produced fundamental parse errors when parsing the
    * source.
    */
-  // internal typescript api...
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const parseDiagnostics = (ast as any).parseDiagnostics;
+  const { parseDiagnostics } = ast;
   if (parseDiagnostics.length) {
     throw convertError(parseDiagnostics[0]);
   }

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, @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call */
 import * as ts from 'typescript';
 import {
   canContainDirective,

diff --git a/packages/typescript-estree/src/index.ts b/packages/typescript-estree/src/index.ts
@@ -8,4 +8,5 @@ export { clearCaches } from './create-program/createWatchProgram';
 export { visitorKeys } from '@typescript-eslint/visitor-keys';
 
 // note - cannot migrate this to an import statement because it will make TSC copy the package.json to the dist folder
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 export const version: string = require('../package.json').version;
diff --git a/packages/typescript-estree/tests/ast-alignment/parse.ts b/packages/typescript-estree/tests/ast-alignment/parse.ts
@@ -1,9 +1,11 @@
-/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/restrict-plus-operands */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 
 import type babelParser from '@babel/parser';
 import { ParserPlugin } from '@babel/parser';
 import { codeFrameColumns } from '@babel/code-frame';
+import type { File } from '@babel/types';
 import * as parser from '../../src/parser';
+import { TSESTree } from '@typescript-eslint/types';
 
 function createError(
   message: string,
@@ -19,8 +21,8 @@ function createError(
   return error;
 }
 
-function parseWithBabelParser(text: string, jsx = true): any {
-  const babel: typeof babelParser = require('@babel/parser');
+function parseWithBabelParser(text: string, jsx = true): File {
+  const babel = require('@babel/parser') as typeof babelParser;
   const plugins: ParserPlugin[] = [
     'classProperties',
     'decorators-legacy',
@@ -96,7 +98,7 @@ export function parse(
         );
     }
   } catch (error) {
-    const loc = error.loc;
+    const loc = error.loc as TSESTree.LineAndColumnData | undefined;
     if (loc) {
       error.codeFrame = codeFrameColumns(
         text,
@@ -112,6 +114,7 @@ export function parse(
       );
       error.message += `\n${error.codeFrame}`;
     }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     result.parseError = error;
   }
 

diff --git a/packages/typescript-estree/tests/ast-alignment/utils.ts b/packages/typescript-estree/tests/ast-alignment/utils.ts
@@ -1,5 +1,5 @@
 // babel types are something we don't really care about
-/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/restrict-plus-operands */
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/restrict-plus-operands */
 import { AST_NODE_TYPES, TSESTree } from '../../src/ts-estree';
 import { deeplyCopy, omitDeep } from '../../tools/test-utils';
 import * as BabelTypes from '@babel/types';

diff --git a/packages/typescript-estree/typings/typescript.d.ts b/packages/typescript-estree/typings/typescript.d.ts
@@ -4,5 +4,6 @@ declare module 'typescript' {
   interface SourceFile {
     // this is marked as internal to typescript
     externalModuleIndicator?: Node;
+    parseDiagnostics: DiagnosticWithLocation[];
   }
 }
diff --git a/tests/integration/utils/generate-package-json.js b/tests/integration/utils/generate-package-json.js
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+
 const fs = require('fs');
 // eslint-disable-next-line import/no-absolute-path
 const rootPackageJSON = require('/usr/root-package.json');

diff --git a/tools/generate-contributors.ts b/tools/generate-contributors.ts
@@ -42,9 +42,9 @@ async function* fetchUsers(page = 1): AsyncIterableIterator<Contributor[]> {
     const response = await fetch(`${contributorsApiUrl}&page=${page}`, {
       method: 'GET',
     });
-    const contributors:
+    const contributors = (await response.json()) as
       | Contributor[]
-      | { message: string } = await response.json();
+      | { message: string };
 
     if (!Array.isArray(contributors)) {
       throw new Error(contributors.message);