chore(deps): update typescript-eslint monorepo to v6 (major) (#4289)

* chore(deps): update typescript-eslint monorepo to v6

* fix new lint issues

---------
Co-authored-by: Matt Seddon <[email protected]>

Author: renovate[bot]

extension/.eslintrc.js

@@ -35,6 +35,10 @@ module.exports = {
         'jest/valid-expect': 'off',
         'no-unused-expressions': 'off'
       }
+    },
+    {
+      files: ['src/test/e2e/**/*'],
+      rules: { '@typescript-eslint/no-unsafe-declaration-merging': 'off' }
     }
   ]
 }

extension/src/cli/dvc/constants.ts

@@ -53,7 +53,7 @@ export enum SubCommand {
 
 export enum Flag {
   ALL_COMMITS = '-A',
-  FOLLOW = '-f',
+  FOLLOW = '--follow',
   DEFAULT = '-d',
   FORCE = '-f',
   GLOBAL = '--global',

extension/src/cli/git/constants.ts

@@ -41,7 +41,6 @@ export enum Flag {
   OTHERS = '--others',
   QUIET = '-q',
   RAW_WITH_NUL = '-z',
-  SEPARATE_WITH_NULL = '-z',
   SHOW_TOPLEVEL = '--show-toplevel'
 }
 
@@ -53,4 +52,4 @@ export const DEFAULT_REMOTE = 'origin'
 
 export const COMMITS_SEPARATOR = '\u0000'
 
-export type Args = (Command | Flag | Commit | typeof DEFAULT_REMOTE | string)[]
+export type Args = (Command | Flag | Commit | string)[]

extension/src/cli/git/reader.ts

@@ -55,7 +55,7 @@ export class GitReader extends GitCli {
         Command.LOG,
         revision,
         Flag.PRETTY_FORMAT_COMMIT_MESSAGE,
-        Flag.SEPARATE_WITH_NULL,
+        Flag.RAW_WITH_NUL,
         Flag.NUMBER,
         revisions
       ],

extension/src/commands/internal.ts

@@ -16,7 +16,7 @@ import { Toast } from '../vscode/toast'
 import { Response } from '../vscode/response'
 import { Disposable } from '../class/dispose'
 
-type Command = (...args: Args) => unknown | Promise<unknown>
+type Command = (...args: Args) => unknown
 
 export const AvailableCommands = Object.assign(
   {},

extension/src/experiments/model/collect.ts

@@ -473,7 +473,7 @@ export const collectRunningInWorkspace = (
     if (!ids.has(id)) {
       continue
     }
-    if (executor === EXPERIMENT_WORKSPACE_ID) {
+    if (executor === (EXPERIMENT_WORKSPACE_ID as Executor)) {
       return id
     }
   }

extension/src/experiments/model/filterBy/quickPick.test.ts

@@ -79,7 +79,10 @@ describe('pickFilterToAdd', () => {
     expect(mockedQuickPickValue).toHaveBeenCalledWith(
       OPERATORS.filter(
         ({ types }) =>
-          !(types.length === 1 && types[0] === ColumnType.TIMESTAMP)
+          !(
+            types.length === 1 &&
+            (types[0] as ColumnType) === ColumnType.TIMESTAMP
+          )
       ),
       {
         title: Title.SELECT_OPERATOR

extension/src/setup/collect.ts

@@ -15,7 +15,7 @@ export const collectSectionCollapsed = (
 
   const acc = { ...DEFAULT_SECTION_COLLAPSED }
   for (const section of Object.keys(acc)) {
-    if (section !== focusedSection) {
+    if ((section as SetupSection) !== focusedSection) {
       acc[section as SetupSection] = true
     }
   }

extension/src/setup/commands/index.ts

@@ -173,10 +173,10 @@ const modifyRemote = async (
   dvcRoot: string,
   remote: RemoteWithConfig
 ): Promise<void> => {
-  const option = await quickPickOne(
+  const option = (await quickPickOne(
     Object.values(ModifyOptions),
     'Select an Option to Modify'
-  )
+  )) as ModifyOptions | undefined
 
   if (!option) {
     return

extension/src/vscode/quickPick.test.ts

@@ -13,15 +13,11 @@ import { Title } from './title'
 jest.mock('vscode')
 
 const mockedShowQuickPick = jest.mocked<
-  (
-    items: QuickPickItemWithValue[],
+  <T>(
+    items: QuickPickItemWithValue<T>[],
     options: QuickPickOptionsWithTitle
   ) => Thenable<
-    | QuickPickItemWithValue[]
-    | QuickPickItemWithValue
-    | string
-    | undefined
-    | unknown
+    QuickPickItemWithValue<T>[] | QuickPickItemWithValue<T> | string | undefined
   >
 >(window.showQuickPick)
 
@@ -31,7 +27,9 @@ beforeEach(() => {
 
 describe('quickPickValue', () => {
   it('should call window.showQuickPick with the correct arguments', async () => {
-    mockedShowQuickPick.mockResolvedValueOnce({ value: 'c' } as unknown)
+    mockedShowQuickPick.mockResolvedValueOnce({
+      value: 'c'
+    } as QuickPickItemWithValue)
     const placeHolder = 'these letters are very important'
     const title = 'Choose a letter, any letter...' as Title
     const items = [
@@ -69,7 +67,7 @@ describe('quickPickManyValues', () => {
     mockedShowQuickPick.mockResolvedValueOnce([
       { value: 'b' },
       { value: 'c' }
-    ] as unknown[])
+    ] as QuickPickItemWithValue[])
     const placeHolder = 'these letters are very important'
     const title = 'Choose a letter, any letter...' as Title
     const items = [
@@ -126,7 +124,7 @@ describe('quickPickYesOrNo', () => {
       description: yesDescription,
       label: Response.YES,
       value: true
-    }
+    } as QuickPickItemWithValue<boolean>
     const noDescription = 'me'
     mockedShowQuickPick.mockResolvedValueOnce(yesItem)