From 016067b11a8a17383fea73f5e28959153a1deeb9 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Tue, 20 Aug 2024 12:48:48 +0200 Subject: [PATCH] refactor: remove deprecated types (#458) --- src/api/resolve.ts | 2 -- src/runner/runner.ts | 8 ++++---- src/testTree.ts | 8 ++++---- src/worker/coverage.ts | 2 +- src/worker/debugger.ts | 2 +- src/worker/init.ts | 2 +- src/worker/reporter.ts | 10 ++++++---- src/worker/vitest.ts | 3 +-- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/api/resolve.ts b/src/api/resolve.ts index fca68a6f..6d34b0dd 100644 --- a/src/api/resolve.ts +++ b/src/api/resolve.ts @@ -3,8 +3,6 @@ import type * as vscode from 'vscode' import { dirname, resolve } from 'pathe' import { getConfig } from '../config' -const _require = require - export interface VitestResolution { vitestPackageJsonPath: string vitestNodePath: string diff --git a/src/runner/runner.ts b/src/runner/runner.ts index a6041645..e599b381 100644 --- a/src/runner/runner.ts +++ b/src/runner/runner.ts @@ -3,7 +3,7 @@ import { rm } from 'node:fs/promises' import stripAnsi from 'strip-ansi' import * as vscode from 'vscode' import { getTasks } from '@vitest/ws-client' -import type { ErrorWithDiff, File, ParsedStack, TaskResult } from 'vitest' +import type { ParsedStack, RunnerTestFile, TaskResult, TestError } from 'vitest' import { basename, normalize, relative } from 'pathe' import { TestCase, TestFile, TestFolder, getTestData } from '../testTreeData' import type { TestTree } from '../testTree' @@ -348,7 +348,7 @@ export class TestRunner extends vscode.Disposable { } } - public async reportCoverage(files: File[]) { + public async reportCoverage(files: RunnerTestFile[]) { if (!('FileCoverage' in vscode)) return @@ -397,7 +397,7 @@ export class TestRunner extends vscode.Disposable { switch (result.state) { case 'fail': { const errors = result.errors?.map(err => - testMessageForTestError(test, err), + testMessageForTestError(test, err as TestError), ) || [] if (!errors.length) { log.verbose?.(`Test failed, but no errors found for "${test.label}"`) @@ -447,7 +447,7 @@ export class TestRunner extends vscode.Disposable { } } -function testMessageForTestError(testItem: vscode.TestItem, error: ErrorWithDiff | undefined): vscode.TestMessage { +function testMessageForTestError(testItem: vscode.TestItem, error: TestError | undefined): vscode.TestMessage { if (!error) return new vscode.TestMessage('Unknown error') diff --git a/src/testTree.ts b/src/testTree.ts index 1a5a240e..093e7da8 100644 --- a/src/testTree.ts +++ b/src/testTree.ts @@ -1,6 +1,6 @@ import * as vscode from 'vscode' import { basename, dirname, normalize } from 'pathe' -import type { File, Task } from 'vitest' +import type { RunnerTask, RunnerTestFile } from 'vitest' import { TestCase, TestFile, TestFolder, TestSuite, getTestData } from './testTreeData' import { log } from './log' import type { VitestFolderAPI } from './api' @@ -242,7 +242,7 @@ export class TestTree extends vscode.Disposable { return testItem || undefined } - public getTestItemByTask(task: Task): vscode.TestItem | null { + public getTestItemByTask(task: RunnerTask): vscode.TestItem | null { const cachedItem = this.flatTestItems.get(task.id) if (cachedItem) return cachedItem @@ -265,7 +265,7 @@ export class TestTree extends vscode.Disposable { return files } - collectFile(api: VitestFolderAPI, file: File) { + collectFile(api: VitestFolderAPI, file: RunnerTestFile) { const fileTestItem = this.getOrCreateFileTestItem(api, file.projectName || '', file.filepath) fileTestItem.error = undefined this.flatTestItems.set(file.id, fileTestItem) @@ -281,7 +281,7 @@ export class TestTree extends vscode.Disposable { fileTestItem.canResolveChildren = false } - collectTasks(tag: vscode.TestTag, fileData: TestFile, tasks: Task[], parent: vscode.TestItem) { + collectTasks(tag: vscode.TestTag, fileData: TestFile, tasks: RunnerTask[], parent: vscode.TestItem) { for (const task of tasks) { const testItem = this.flatTestItems.get(task.id) || this.controller.createTestItem( task.id, diff --git a/src/worker/coverage.ts b/src/worker/coverage.ts index 97591c15..2b2bf508 100644 --- a/src/worker/coverage.ts +++ b/src/worker/coverage.ts @@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto' import { existsSync } from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'pathe' -import type { CoverageProvider, ResolvedCoverageOptions, Vitest as VitestCore } from 'vitest' +import type { CoverageProvider, ResolvedCoverageOptions, Vitest as VitestCore } from 'vitest/node' import type { Vitest } from './vitest' export class VitestCoverage { diff --git a/src/worker/debugger.ts b/src/worker/debugger.ts index 5e01ecc8..9f2cd7a5 100644 --- a/src/worker/debugger.ts +++ b/src/worker/debugger.ts @@ -1,4 +1,4 @@ -import type { Vitest as VitestCore } from 'vitest' +import type { Vitest as VitestCore } from 'vitest/node' import type { Vitest } from './vitest' export class VitestDebugger { diff --git a/src/worker/init.ts b/src/worker/init.ts index 5fb93595..6fce7456 100644 --- a/src/worker/init.ts +++ b/src/worker/init.ts @@ -1,4 +1,4 @@ -import type { UserConfig } from 'vitest' +import type { UserConfig } from 'vitest/node' import { VSCodeReporter } from './reporter' import type { WorkerMeta } from './types' diff --git a/src/worker/reporter.ts b/src/worker/reporter.ts index 6a30d49d..726697d2 100644 --- a/src/worker/reporter.ts +++ b/src/worker/reporter.ts @@ -3,7 +3,9 @@ import { Writable } from 'node:stream' import { Console } from 'node:console' import { parseErrorStacktrace } from '@vitest/utils/source-map' import type { BirpcReturn } from 'birpc' -import type { File, Reporter, TaskResultPack, UserConsoleLog, Vitest as VitestCore } from 'vitest' +import type { Reporter } from 'vitest/reporters' +import type { RunnerTestFile, TaskResultPack, UserConsoleLog } from 'vitest' +import type { Vitest as VitestCore } from 'vitest/node' import type { VitestEvents, VitestMethods } from '../api/rpc' import { setupFilePath } from '../constants' import { Vitest } from './vitest' @@ -81,7 +83,7 @@ export class VSCodeReporter implements Reporter { this.rpc.onTaskUpdate(packs) } - async onFinished(files?: File[], errors: unknown[] = this.ctx.state.getUnhandledErrors()) { + async onFinished(files?: RunnerTestFile[], errors: unknown[] = this.ctx.state.getUnhandledErrors()) { const collecting = this.collecting let output = '' @@ -108,11 +110,11 @@ export class VSCodeReporter implements Reporter { }) } - onCollected(files?: File[]) { + onCollected(files?: RunnerTestFile[]) { this.rpc.onCollected(files, this.collecting) } - onWatcherStart(files?: File[], errors?: unknown[]) { + onWatcherStart(files?: RunnerTestFile[], errors?: unknown[]) { this.rpc.onWatcherStart(files, errors, this.collecting) } diff --git a/src/worker/vitest.ts b/src/worker/vitest.ts index 8f869392..6b4f5f7a 100644 --- a/src/worker/vitest.ts +++ b/src/worker/vitest.ts @@ -1,5 +1,4 @@ -import type { Vitest as VitestCore } from 'vitest' -import type { WorkspaceProject } from 'vitest/node' +import type { Vitest as VitestCore, WorkspaceProject } from 'vitest/node' import type { VitestMethods } from '../api/rpc' import { VitestWatcher } from './watcher' import { VitestCoverage } from './coverage'