chore: update typescript-eslint to v4.23.0

package.json

@@ -34,8 +34,8 @@
         "@types/lodash": "4.14.169",
         "@types/minimatch": "3.0.4",
         "@types/node": "12.20.13",
-        "@typescript-eslint/eslint-plugin": "4.20.0",
-        "@typescript-eslint/parser": "4.20.0",
+        "@typescript-eslint/eslint-plugin": "4.23.0",
+        "@typescript-eslint/parser": "4.23.0",
         "babel-jest": "26.6.3",
         "eslint": "7.26.0",
         "husky": "6.0.0",

src/converters/comments/convertComments.test.ts

@@ -27,7 +27,7 @@ describe("convertComments", () => {
             dependencies,
             { comments: undefined },
             createStubOriginalConfigurationsData(),
-            new Map(),
+            new Map<string, string[]>(),
         );
 
         // Assert
@@ -49,7 +49,7 @@ describe("convertComments", () => {
             dependencies,
             { comments: true },
             createStubOriginalConfigurationsData(),
-            new Map(),
+            new Map<string, string[]>(),
         );
 
         // Assert
@@ -74,7 +74,7 @@ describe("convertComments", () => {
             dependencies,
             { comments: true },
             createStubOriginalConfigurationsData(),
-            new Map(),
+            new Map<string, string[]>(),
         );
 
         // Assert
@@ -96,7 +96,7 @@ describe("convertComments", () => {
             dependencies,
             { comments: ["*.ts"] },
             createStubOriginalConfigurationsData(),
-            new Map(),
+            new Map<string, string[]>(),
         );
 
         // Assert
@@ -115,7 +115,7 @@ describe("convertComments", () => {
             dependencies,
             { comments: ["*.ts"] },
             createStubOriginalConfigurationsData(),
-            new Map(),
+            new Map<string, string[]>(),
         );
 
         // Assert

src/converters/comments/convertFileComments.test.ts

@@ -26,7 +26,12 @@ describe("convertFileComments", () => {
         const dependencies = createStubDependencies(readFileError);
 
         // Act
-        const result = await convertFileComments(dependencies, stubFileName, new Map(), new Map());
+        const result = await convertFileComments(
+            dependencies,
+            stubFileName,
+            new Map<string, string[]>(),
+            new Map<string, string[]>(),
+        );
 
         // Assert
         expect(result).toBe(readFileError);
@@ -39,7 +44,12 @@ describe("convertFileComments", () => {
 `);
 
         // Act
-        await convertFileComments(dependencies, stubFileName, new Map(), new Map());
+        await convertFileComments(
+            dependencies,
+            stubFileName,
+            new Map<string, string[]>(),
+            new Map<string, string[]>(),
+        );
 
         // Assert
         expect(dependencies.fileSystem.writeFile).not.toHaveBeenCalled();
@@ -70,7 +80,12 @@ export const g = true;
 `);
 
         // Act
-        await convertFileComments(dependencies, stubFileName, new Map(), new Map());
+        await convertFileComments(
+            dependencies,
+            stubFileName,
+            new Map<string, string[]>(),
+            new Map<string, string[]>(),
+        );
 
         // Assert
         expect(dependencies.fileSystem.writeFile).toHaveBeenCalledWith(
@@ -110,7 +125,12 @@ export const b = true;
 `);
 
         // Act
-        await convertFileComments(dependencies, stubFileName, new Map(), new Map());
+        await convertFileComments(
+            dependencies,
+            stubFileName,
+            new Map<string, string[]>(),
+            new Map<string, string[]>(),
+        );
 
         // Assert
         expect(dependencies.fileSystem.writeFile).toHaveBeenCalledWith(
@@ -136,7 +156,7 @@ export const a = true;
         await convertFileComments(
             dependencies,
             stubFileName,
-            new Map(),
+            new Map<string, string[]>(),
             new Map([["ts-a", ["es-cached"]]]),
         );
 
@@ -162,7 +182,7 @@ export const a = true;
             dependencies,
             stubFileName,
             new Map([["ts-a", ["es-cached"]]]),
-            new Map(),
+            new Map<string, string[]>(),
         );
 
         // Assert
@@ -183,7 +203,12 @@ export const a = true;
 `);
 
         // Act
-        await convertFileComments(dependencies, stubFileName, new Map(), new Map());
+        await convertFileComments(
+            dependencies,
+            stubFileName,
+            new Map<string, string[]>(),
+            new Map<string, string[]>(),
+        );
 
         // Assert
         expect(dependencies.fileSystem.writeFile).toHaveBeenCalledWith(
@@ -203,7 +228,12 @@ export const a = true;
 `);
 
         // Act
-        await convertFileComments(dependencies, stubFileName, new Map(), new Map());
+        await convertFileComments(
+            dependencies,
+            stubFileName,
+            new Map<string, string[]>(),
+            new Map<string, string[]>(),
+        );
 
         // Assert
         expect(dependencies.fileSystem.writeFile).toHaveBeenCalledWith(

src/converters/editorConfigs/converters/convertVSCodeConfig.ts

@@ -13,12 +13,16 @@ const knownMissingSettings = [
 ];
 
 export const convertVSCodeConfig: EditorConfigConverter = (rawEditorSettings, settings) => {
-    const editorSettings = parseJson(rawEditorSettings);
-    const autoFixOnSave = editorSettings["editor.codeActionsOnSave"]?.["source.fixAll.tslint"];
+    const editorSettings: Record<string, string | number | symbol> = parseJson(rawEditorSettings);
+    const autoFixOnSave =
+        editorSettings["editor.codeActionsOnSave"] &&
+        typeof editorSettings["editor.codeActionsOnSave"] === "object" &&
+        editorSettings["editor.codeActionsOnSave"]?.["source.fixAll.tslint"];
 
     // Only create a new config file path if the input and output configs roughly match
     const eslintPathMatches =
         editorSettings["tslint.configFile"] &&
+        typeof editorSettings["tslint.configFile"] === "string" &&
         !path.relative(
             path.dirname(editorSettings["tslint.configFile"]),
             path.dirname(settings.config),

src/converters/lintConfigs/convertLintConfig.test.ts

@@ -36,7 +36,7 @@ describe("convertLintConfig", () => {
             dependencies,
             stubSettings,
             createStubOriginalConfigurationsData(),
-            new Map(),
+            new Map<string, string[]>(),
         );
 
         // Assert
@@ -62,7 +62,7 @@ describe("convertLintConfig", () => {
             dependencies,
             stubSettings,
             createStubOriginalConfigurationsData(),
-            new Map(),
+            new Map<string, string[]>(),
         );
 
         // Assert

src/converters/lintConfigs/createESLintConfiguration.test.ts

@@ -17,7 +17,7 @@ describe("createESLintConfiguration", () => {
             dependencies,
             originalConfigurations,
             true,
-            new Map(),
+            new Map<string, string[]>(),
         );
 
         // Assert

src/converters/lintConfigs/formatting/formatters/withKeysSorted.ts

@@ -1,6 +1,6 @@
-export const withKeysSorted = (input: any) => {
-    const output: Record<string, any> = {};
-    const keys = Object.keys(input).sort((a, b) => a.localeCompare(b));
+export const withKeysSorted = <T extends Record<string, unknown>>(input: T) => {
+    const output = {} as T;
+    const keys: (keyof T)[] = Object.keys(input).sort((a, b) => a.localeCompare(b));
 
     for (const key of keys) {
         output[key] = input[key];

src/converters/lintConfigs/pruning/removeExtendsDuplicatedRules.test.ts

@@ -33,7 +33,7 @@ describe("removeExtendsDuplicatedRules", () => {
         });
 
         // Act
-        const { differentRules } = removeExtendsDuplicatedRules(allRules, new Map());
+        const { differentRules } = removeExtendsDuplicatedRules(allRules, new Map<string, ESLintRuleOptionsWithArguments>());
 
         // Assert
         expect(differentRules.size).toBe(1);

src/converters/lintConfigs/rules/convertRule.test.ts

@@ -6,7 +6,7 @@ import { TSLintRuleOptions } from "./types";
 describe("convertRule", () => {
     it("returns undefined when no converter exists for a rule", () => {
         // Arrange
-        const converters = new Map();
+        const converters = new Map<string, RuleConverter>();
 
         // Act
         const result = convertRule(

src/converters/lintConfigs/rules/convertRule.ts

@@ -13,7 +13,8 @@ export const convertRule = (
 
     try {
         return converter(tslintRule);
-    } catch (error) {
-        return ConversionError.forRuleError(error, tslintRule);
+    } catch (error: unknown) {
+        // TODO: Maybe we can provide a different error message for generic errors.
+        return ConversionError.forRuleError(error as Error, tslintRule);
     }
 };