chore: Stricter eslint rules

eslint.config.mjs

@@ -1,26 +1,22 @@
-import tsPlugin from '@typescript-eslint/eslint-plugin'
-import tsParser from '@typescript-eslint/parser'
+import eslint from '@eslint/js'
+import tseslint from 'typescript-eslint'
 
-export default [{
-    files: ['**/*.ts']
-}, {
-    plugins: {
-        '@typescript-eslint': tsPlugin
-    },
-    languageOptions: {
-        parser: tsParser,
-        ecmaVersion: 2022,
-        sourceType: 'module'
-    },
-    rules: {
-        '@typescript-eslint/naming-convention': ['warn', {
-            selector: 'import',
-            format: ['camelCase', 'PascalCase']
-        }],
-        'curly': 'warn',
-        'eqeqeq': 'warn',
-        'no-throw-literal': 'warn',
-        'semi': 'off',
-        'quotes': ['error', 'single']
+export default tseslint.config(
+    eslint.configs.recommended,
+    tseslint.configs.strict,
+    tseslint.configs.stylistic,
+    {
+        rules: {
+            'curly': 'error',
+            'eol-last': ['error', 'always'],
+            'eqeqeq': 'error',
+            'no-throw-literal': 'error',
+            'quotes': ['error', 'single'],
+            'semi': ["error", "never"],
+            '@typescript-eslint/naming-convention': ['warn', {
+                selector: 'import',
+                format: ['camelCase', 'PascalCase']
+            }]
+        }
     }
-}]
+)

package.json

@@ -46,14 +46,14 @@
     "simple-git": "^3.27.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.17.0",
     "@types/node": "20.x",
     "@types/vscode": "^1.96.0",
-    "@typescript-eslint/eslint-plugin": "^8.17.0",
-    "@typescript-eslint/parser": "^8.17.0",
-    "eslint": "^9.16.0",
+    "eslint": "^9.17.0",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.2",
+    "typescript-eslint": "^8.19.0"
   },
   "repository": {
     "type": "git",

src/GitFacade.ts

@@ -16,7 +16,7 @@ export class GitFacade {
     }
 
     async hasStagedFiles(): Promise<boolean> {
-        const diff = await this.git.diff(['--name-only', '--cached']);
+        const diff = await this.git.diff(['--name-only', '--cached'])
         return (diff.trim() !== '')
     }
 
@@ -51,7 +51,7 @@ export class GitFacade {
     async getCommitsNotInUpstream(): Promise<readonly Commit[] | typeof NO_UPSTREAM> { 
         try {
             return (await this.queryCommits('@{u}..'))
-        } catch (e: any) {
+        } catch (e) {
             if (e.message?.includes('no upstream configured')) {
                 return NO_UPSTREAM
             }
@@ -85,7 +85,7 @@ export class GitFacade {
                 GIT_SEQUENCE_EDITOR: 'true'  // bypass the interactive editor
             }).rebase(['--autosquash', '--autostash', '-i', `${hash}~`])
             return false
-        } catch (e: any) {
+        } catch (e) {
             if (e.message?.includes('Merge conflict')) {
                 return true
             }

src/extension.ts

@@ -70,7 +70,7 @@ export const activate = (context: vscode.ExtensionContext): void => {
                 writeToOutputChannel(successMessage)
                 vscode.window.showInformationMessage(successMessage)
             }
-        } catch (error: any) {
+        } catch (error) {
             vscode.window.showErrorMessage(error.message)
         }
     })

src/types.ts

@@ -5,4 +5,4 @@ export type BranchName = string
 export interface Commit {
     hash: ShortCommitHash
     subject: string
-}
+}

test/GitFacade.test.ts

@@ -75,4 +75,4 @@ describe('GitFacade', () => {
         await git.commit('-')
         expect(await facade.hasStagedFiles()).toBe(false)
     })
-})
+})

tsconfig.json

@@ -11,7 +11,8 @@
 		"strict": true,
 		"noImplicitReturns": true,
 		"noFallthroughCasesInSwitch": true,
-		"noUnusedParameters": true
+		"noUnusedParameters": true,
+		"useUnknownInCatchVariables": false
 	},
 	"exclude": ["test/*"]
 }