Skip to content

Commit

Permalink
chore: cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
sheremet-va committed Feb 8, 2024
1 parent c8ed690 commit 4c6e008
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 20 deletions.
8 changes: 7 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,14 @@ export default antfu(
'node/prefer-global/process': 'off',
'no-empty-pattern': 'off',
'antfu/indent-binary-ops': 'off',
'style/member-delimiter-style': ['error', { multiline: { delimiter: 'none' }, singleline: { delimiter: 'semi' } }],
'unused-imports/no-unused-imports': 'error',
'style/member-delimiter-style': [
'error',
{
multiline: { delimiter: 'none' },
singleline: { delimiter: 'semi' },
},
],

'ts/no-invalid-this': 'off',

Expand Down
16 changes: 8 additions & 8 deletions packages/browser/src/client/runner.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { File, TaskResultPack, Test, VitestRunner } from '@vitest/runner'
import type { File, Task, TaskResultPack, VitestRunner } from '@vitest/runner'
import type { ResolvedConfig } from 'vitest'
import type { VitestExecutor } from 'vitest/execute'
import { rpc } from './rpc'
Expand All @@ -16,10 +16,10 @@ interface CoverageHandler {
}

export function createBrowserRunner(
VitestRunner: { new(config: ResolvedConfig): VitestRunner },
runnerClass: { new(config: ResolvedConfig): VitestRunner },
coverageModule: CoverageHandler | null,
): { new(options: BrowserRunnerOptions): VitestRunner } {
return class BrowserTestRunner extends VitestRunner {
return class BrowserTestRunner extends runnerClass implements VitestRunner {
public config: ResolvedConfig
hashMap = browserHashMap

Expand All @@ -28,7 +28,7 @@ export function createBrowserRunner(
this.config = options.config
}

async onAfterRunTask(task: Test) {
onAfterRunTask = async (task: Task) => {
await super.onAfterRunTask?.(task)

if (this.config.bail && task.result?.state === 'fail') {
Expand All @@ -42,7 +42,7 @@ export function createBrowserRunner(
}
}

async onAfterRunFiles(files: File[]) {
onAfterRunFiles = async (files: File[]) => {
await super.onAfterRunFiles?.(files)
const coverage = await coverageModule?.takeCoverage?.()

Expand All @@ -55,15 +55,15 @@ export function createBrowserRunner(
}
}

onCollected(files: File[]): unknown {
onCollected = (files: File[]): unknown => {
return rpc().onCollected(files)
}

onTaskUpdate(task: TaskResultPack[]): Promise<void> {
onTaskUpdate = (task: TaskResultPack[]): Promise<void> => {
return rpc().onTaskUpdate(task)
}

async importFile(filepath: string) {
importFile = async (filepath: string) => {
let [test, hash] = this.hashMap.get(filepath) ?? [false, '']
if (hash === '') {
hash = Date.now().toString()
Expand Down
27 changes: 23 additions & 4 deletions packages/runner/src/types/runner.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
import type { DiffOptions } from '@vitest/utils/diff'
import type { Custom, ExtendedContext, File, SequenceHooks, SequenceSetupFiles, Suite, Task, TaskContext, TaskPopulated, TaskResultPack, Test } from './tasks'
import type {
Custom,
ExtendedContext,
File,
SequenceHooks,
SequenceSetupFiles,
Suite,
Task,
TaskContext,
TaskResultPack,
Test,
} from './tasks'

export interface VitestRunnerConfig {
root: string
Expand Down Expand Up @@ -31,7 +42,10 @@ export interface VitestRunnerConstructor {
new(config: VitestRunnerConfig): VitestRunner
}

export type CancelReason = 'keyboard-input' | 'test-failure' | string & Record<string, never>
export type CancelReason =
| 'keyboard-input'
| 'test-failure'
| string & Record<string, never>

export interface VitestRunner {
/**
Expand Down Expand Up @@ -65,7 +79,10 @@ export interface VitestRunner {
/**
* Called right after running the test function. Doesn't have new state yet. Will not be called, if the test function throws.
*/
onAfterTryTask?: (test: Task, options: { retry: number; repeats: number }) => unknown
onAfterTryTask?: (
test: Task,
options: { retry: number; repeats: number }
) => unknown

/**
* Called before running a single suite. Doesn't have "result" yet.
Expand Down Expand Up @@ -108,7 +125,9 @@ export interface VitestRunner {
*
* @see https://vitest.dev/advanced/runner.html#your-task-function
*/
extendTaskContext?: <T extends Test | Custom>(context: TaskContext<T>) => ExtendedContext<T>
extendTaskContext?: <T extends Test | Custom>(
context: TaskContext<T>
) => ExtendedContext<T>
/**
* Called, when files are imported. Can be called in two situations: when collecting tests and when importing setup files.
*/
Expand Down
5 changes: 3 additions & 2 deletions packages/vitest/src/runtime/workers/threads.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import type { ContextRPC } from '../../types/rpc'
import type { WorkerContext, WorkerGlobalState } from '../../types/worker'
import { runBaseTests } from './base'
import type { VitestWorker } from './types'
import { createThreadsRpcOptions } from './utils'

class ThreadsBaseWorker implements VitestWorker {
getRpcOptions(ctx: WorkerContext) {
return createThreadsRpcOptions(ctx)
getRpcOptions(ctx: ContextRPC) {
return createThreadsRpcOptions(ctx as WorkerContext)
}

runTests(state: WorkerGlobalState): unknown {
Expand Down
5 changes: 3 additions & 2 deletions packages/vitest/src/runtime/workers/vmThreads.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import type { ContextRPC } from '../../types/rpc'
import type { WorkerContext, WorkerGlobalState } from '../../types/worker'
import type { VitestWorker, WorkerRpcOptions } from './types'
import { createThreadsRpcOptions } from './utils'
import { runVmTests } from './vm'

class ThreadsVmWorker implements VitestWorker {
getRpcOptions(ctx: WorkerContext): WorkerRpcOptions {
return createThreadsRpcOptions(ctx)
getRpcOptions(ctx: ContextRPC): WorkerRpcOptions {
return createThreadsRpcOptions(ctx as WorkerContext)
}

runTests(state: WorkerGlobalState): unknown {
Expand Down
6 changes: 5 additions & 1 deletion packages/vitest/src/types/browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ export interface BrowserProviderInitializationOptions {
export interface BrowserProvider {
name: string
getSupportedBrowsers: () => readonly string[]
initialize: (ctx: WorkspaceProject, options: BrowserProviderInitializationOptions) => Awaitable<void>
openPage: (url: string) => Awaitable<void>
close: () => Awaitable<void>
// eslint-disable-next-line ts/method-signature-style -- we want to allow extended options
initialize(
ctx: WorkspaceProject,
options: BrowserProviderInitializationOptions
): Awaitable<void>
}

export interface BrowserProviderModule {
Expand Down
2 changes: 1 addition & 1 deletion test/coverage-test/custom-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class CustomCoverageProvider implements CoverageProvider {
this.calls.add(`initialized ${ctx ? 'with' : 'without'} context`)
}

clean(force: boolean) {
clean(force?: boolean) {
this.calls.add(`clean ${force ? 'with' : 'without'} force`)
}

Expand Down
2 changes: 1 addition & 1 deletion test/coverage-test/test/configuration-options.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ test('provider module', () => {
processingConcurrency: 1,
}
},
clean(_: boolean) {},
clean(_?: boolean) {},
onBeforeFilesRun() {},
onAfterSuiteRun({ coverage: _coverage }) {},
reportCoverage() {},
Expand Down

0 comments on commit 4c6e008

Please sign in to comment.