-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(reporters): rewrite
dot renderer without log-update
- Loading branch information
1 parent
80cde2a
commit d7a87a0
Showing
5 changed files
with
235 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,129 @@ | ||
| import type { UserConsoleLog } from '../../types/general' | ||
| import type { File, TaskResultPack, TaskState, Test } from '@vitest/runner' | ||
| import type { Vitest } from '../core' | ||
| import c from 'tinyrainbow' | ||
| import { BaseReporter } from './base' | ||
| import { createDotRenderer } from './renderers/dotRenderer' | ||
| import { WindowRenderer } from './renderers/windowedRenderer' | ||
| import { TaskParser } from './task-parser' | ||
|
|
||
| export class DotReporter extends BaseReporter { | ||
| renderer?: ReturnType<typeof createDotRenderer> | ||
| private summary?: DotSummary | ||
|
|
||
| onTaskUpdate() {} | ||
| onInit(ctx: Vitest) { | ||
| super.onInit(ctx) | ||
|
|
||
| onCollected() { | ||
| if (this.isTTY) { | ||
| const files = this.ctx.state.getFiles(this.watchFilters) | ||
| if (!this.renderer) { | ||
| this.renderer = createDotRenderer(files, { | ||
| logger: this.ctx.logger, | ||
| }).start() | ||
| } | ||
| else { | ||
| this.renderer.update(files) | ||
| } | ||
| this.summary = new DotSummary() | ||
| this.summary.onInit(ctx) | ||
| } | ||
| } | ||
|
|
||
| onTaskUpdate(packs: TaskResultPack[]) { | ||
| this.summary?.onTaskUpdate(packs) | ||
|
|
||
| if (!this.isTTY) { | ||
| super.onTaskUpdate(packs) | ||
| } | ||
| } | ||
|
|
||
| async onFinished( | ||
| files = this.ctx.state.getFiles(), | ||
| errors = this.ctx.state.getUnhandledErrors(), | ||
| ) { | ||
| await this.stopListRender() | ||
| this.ctx.logger.log() | ||
| onWatcherRerun(files: string[], trigger?: string) { | ||
| this.summary?.onWatcherRerun() | ||
| super.onWatcherRerun(files, trigger) | ||
| } | ||
|
|
||
| onFinished(files?: File[], errors?: unknown[]) { | ||
| this.summary?.onFinished() | ||
| super.onFinished(files, errors) | ||
| } | ||
| } | ||
|
|
||
| async onWatcherStart() { | ||
| await this.stopListRender() | ||
| super.onWatcherStart() | ||
| class DotSummary extends TaskParser { | ||
| private renderer!: WindowRenderer | ||
| private tests = new Map<Test['id'], TaskState>() | ||
|
|
||
| onInit(ctx: Vitest): void { | ||
| this.ctx = ctx | ||
|
|
||
| this.renderer = new WindowRenderer({ | ||
| logger: ctx.logger, | ||
| getWindow: () => this.createSummary(), | ||
| }) | ||
|
|
||
| this.ctx.onClose(() => this.renderer.stop()) | ||
| } | ||
|
|
||
| async stopListRender() { | ||
| this.renderer?.stop() | ||
| this.renderer = undefined | ||
| await new Promise(resolve => setTimeout(resolve, 10)) | ||
| onWatcherRerun() { | ||
| this.tests.clear() | ||
| this.renderer.start() | ||
| } | ||
|
|
||
| async onWatcherRerun(files: string[], trigger?: string) { | ||
| await this.stopListRender() | ||
| super.onWatcherRerun(files, trigger) | ||
| onFinished() { | ||
| const finalLog = Array.from(this.tests.values()).map(getIcon).join('') | ||
| this.ctx.logger.log(finalLog) | ||
|
|
||
| this.tests.clear() | ||
| this.renderer.finish() | ||
| } | ||
|
|
||
| onTestStart(test: Test) { | ||
| if (!this.tests.has(test.id)) { | ||
| this.tests.set(test.id, 'run') | ||
| } | ||
| } | ||
|
|
||
| onTestFinished(test: Test) { | ||
| this.tests.set(test.id, test.result?.state || 'skip') | ||
| } | ||
|
|
||
| onUserConsoleLog(log: UserConsoleLog) { | ||
| this.renderer?.clear() | ||
| super.onUserConsoleLog(log) | ||
| onTestFileFinished() { | ||
| const columns = this.renderer.getColumns() | ||
|
|
||
| if (this.tests.size < columns) { | ||
| return | ||
| } | ||
|
|
||
| const finishedTests = Array.from(this.tests).filter(entry => entry[1] !== 'run') | ||
|
|
||
| if (finishedTests.length < columns) { | ||
| return | ||
| } | ||
|
|
||
| // Remove finished tests from state and render them in static output | ||
| let output = '' | ||
| let count = 0 | ||
|
|
||
| for (const [id, state] of finishedTests) { | ||
| if (count++ >= columns) { | ||
| break | ||
| } | ||
|
|
||
| this.tests.delete(id) | ||
| output += getIcon(state) | ||
| } | ||
|
|
||
| this.ctx.logger.log(output) | ||
| } | ||
|
|
||
| private createSummary() { | ||
| const summary = [] | ||
|
|
||
| const row = Array.from(this.tests.values()).map(getIcon).join('') | ||
| summary.push(row) | ||
|
|
||
| summary.push('') | ||
| return summary | ||
| } | ||
| } | ||
|
|
||
| function getIcon(state: TaskState) { | ||
| switch (state) { | ||
| case 'pass': | ||
| return c.green('·') | ||
| case 'fail': | ||
| return c.red('x') | ||
| case 'skip': | ||
| case 'todo': | ||
| return c.dim(c.gray('-')) | ||
| default: | ||
| return c.yellow('*') | ||
| } | ||
| } |
130 changes: 0 additions & 130 deletions
130
packages/vitest/src/node/reporters/renderers/dotRenderer.ts
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.