npm - vitest - Versions diffs - 0.0.15 → 0.0.16 - Mend

vitest 0.0.15 → 0.0.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/reporters/default.d.ts +13 -8
package/dist/reporters/default.js +60 -54
package/dist/run.js +11 -8
package/dist/types.d.ts +10 -10
package/index.d.ts +1 -0
package/package.json +3 -1

package/dist/reporters/default.d.ts CHANGED Viewed

@@ -1,19 +1,24 @@
-import { File, Reporter, RunnerContext, Suite, Task } from '../types';
+import Listr from 'listr';
+import { Reporter, RunnerContext, Task } from '../types';
+interface TaskPromise {
+    promise: Promise<void>;
+    resolve: () => void;
+    reject: (e: unknown) => void;
+}
 export declare class DefaultReporter implements Reporter {
     indent: number;
     start: number;
     end: number;
+    listr: Listr | null;
+    listrPromise: Promise<void> | null;
+    taskMap: Map<Task, TaskPromise>;
     onStart(): void;
-    onCollected(): void;
-    onSuiteBegin(suite: Suite): void;
-    onSuiteEnd(suite: Suite): void;
-    onFileBegin(file: File): void;
-    onFileEnd(): void;
-    onTaskBegin(task: Task): void;
+    onCollected(ctx: RunnerContext): void;
     onTaskEnd(task: Task): void;
-    onFinished({ files }: RunnerContext): void;
+    onFinished({ files }: RunnerContext): Promise<void>;
     private getIndent;
     private log;
     private error;
     onSnapshotUpdate(): void;
 }
+export {};

package/dist/reporters/default.js CHANGED Viewed

@@ -1,69 +1,75 @@
-import { relative } from 'path';
 import { performance } from 'perf_hooks';
+import { relative } from 'path';
 import c from 'picocolors';
-import ora from 'ora';
-const DOT = '· ';
-const CHECK = '✔ ';
-const CROSS = '⤫ ';
+import Listr from 'listr';
+const CROSS = '✖ ';
 export class DefaultReporter {
     constructor() {
         this.indent = 0;
         this.start = 0;
         this.end = 0;
+        this.listr = null;
+        this.listrPromise = null;
+        this.taskMap = new Map();
     }
     onStart() {
         this.indent = 0;
     }
-    onCollected() {
+    onCollected(ctx) {
         this.start = performance.now();
-    }
-    onSuiteBegin(suite) {
-        if (suite.name) {
-            this.indent += 1;
-            const name = DOT + suite.name;
-            if (suite.mode === 'skip')
-                this.log(c.dim(c.yellow(`${name} (skipped)`)));
-            else if (suite.mode === 'todo')
-                this.log(c.dim(`${name} (todo)`));
-            else
-                this.log(name);
-        }
-    }
-    onSuiteEnd(suite) {
-        if (suite.name)
-            this.indent -= 1;
-    }
-    onFileBegin(file) {
-        this.log(`- ${relative(process.cwd(), file.filepath)} ${c.dim(`(${file.suites.flatMap(i => i.tasks).length} tests)`)}`);
-    }
-    onFileEnd() {
-        this.log();
-    }
-    onTaskBegin(task) {
-        this.indent += 1;
-        // @ts-expect-error
-        task.__ora = ora({ text: task.name, prefixText: this.getIndent().slice(1), spinner: 'arc' }).start();
+        this.taskMap = new Map();
+        const tasks = ctx.files.reduce((acc, file) => acc.concat(file.suites.flatMap(i => i.tasks)), []);
+        tasks.forEach((t) => {
+            const obj = {};
+            obj.promise = new Promise((resolve, reject) => {
+                obj.resolve = resolve;
+                obj.reject = reject;
+            });
+            this.taskMap.set(t, obj);
+        });
+        const createTasksListr = (tasks) => {
+            return tasks.map((task) => {
+                return {
+                    title: task.name,
+                    skip: () => task.mode === 'skip',
+                    task: async () => {
+                        var _a;
+                        return await ((_a = this.taskMap.get(task)) === null || _a === void 0 ? void 0 : _a.promise);
+                    },
+                };
+            });
+        };
+        const listrOptions = {
+            exitOnError: false,
+        };
+        this.listr = new Listr(ctx.files.map((file) => {
+            return {
+                title: relative(process.cwd(), file.filepath),
+                task: () => {
+                    return new Listr(file.suites.flatMap((suite) => {
+                        if (!suite.name)
+                            return createTasksListr(suite.tasks);
+                        return [{
+                                title: suite.name,
+                                skip: () => suite.mode !== 'run',
+                                task: () => new Listr(createTasksListr(suite.tasks), listrOptions),
+                            }];
+                    }), listrOptions);
+                },
+            };
+        }), listrOptions);
+        this.listrPromise = this.listr.run().catch(() => { });
     }
     onTaskEnd(task) {
-        var _a;
-        // @ts-expect-error
-        (_a = task.__ora) === null || _a === void 0 ? void 0 : _a.stop();
-        if (task.state === 'pass') {
-            this.log(`${c.green(CHECK + task.name)}`);
-        }
-        else if (task.state === 'skip') {
-            this.log(c.dim(c.yellow(`${DOT + task.name} (skipped)`)));
-        }
-        else if (task.state === 'todo') {
-            this.log(c.dim(`${DOT + task.name} (todo)`));
-        }
-        else {
-            this.error(`${c.red(`${CROSS}${task.name}`)}`);
-            process.exitCode = 1;
-        }
-        this.indent -= 1;
+        var _a, _b;
+        if (task.state === 'fail')
+            (_a = this.taskMap.get(task)) === null || _a === void 0 ? void 0 : _a.reject(task.error);
+        else
+            (_b = this.taskMap.get(task)) === null || _b === void 0 ? void 0 : _b.resolve();
     }
-    onFinished({ files }) {
+    async onFinished({ files }) {
+        await this.listrPromise;
+        this.log();
         this.end = performance.now();
         const failedFiles = files.filter(i => i.error);
         const tasks = files.reduce((acc, file) => acc.concat(file.suites.flatMap(i => i.tasks)), []);
@@ -85,14 +91,14 @@ export class DefaultReporter {
             this.error(c.bold(`\nFailed Tests (${failed.length})`));
             failed.forEach((task) => {
                 var _a;
-                this.error(`\n${CROSS + c.inverse(c.red(' FAIL '))} ${[task.suite.name, task.name].filter(Boolean).join(' > ')} ${c.gray(`${(_a = task.file) === null || _a === void 0 ? void 0 : _a.filepath}`)}`);
+                this.error(`\n${CROSS + c.inverse(c.red(' FAIL '))} ${[task.suite.name, task.name].filter(Boolean).join(' > ')} ${c.gray(c.dim(`${(_a = task.file) === null || _a === void 0 ? void 0 : _a.filepath}`))}`);
                 console.error(task.error || 'Unknown error');
                 this.log();
             });
         }
-        this.log(c.green(`Passed   ${passed.length} / ${runable.length}`));
+        this.log(c.bold(c.green(`Passed   ${passed.length} / ${runable.length}`)));
         if (failed.length)
-            this.log(c.red(`Failed   ${failed.length} / ${runable.length}`));
+            this.log(c.bold(c.red(`Failed   ${failed.length} / ${runable.length}`)));
         if (skipped.length)
             this.log(c.yellow(`Skipped  ${skipped.length}`));
         if (todo.length)

package/dist/run.js CHANGED Viewed

@@ -72,23 +72,26 @@ function interpretOnlyMode(items) {
     }
 }
 export async function runFile(file, ctx) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     const { reporter } = ctx;
     const runableSuites = file.suites.filter(i => i.mode === 'run');
     if (runableSuites.length === 0)
         return;
     await ((_a = reporter.onFileBegin) === null || _a === void 0 ? void 0 : _a.call(reporter, file, ctx));
     await beforeFileHook.fire(file);
-    for (const suite of file.suites) {
-        await ((_b = reporter.onSuiteBegin) === null || _b === void 0 ? void 0 : _b.call(reporter, suite, ctx));
+    // TODO: support toggling parallel or serial
+    await Promise.all(file.suites.map(async (suite) => {
+        var _a, _b;
+        await ((_a = reporter.onSuiteBegin) === null || _a === void 0 ? void 0 : _a.call(reporter, suite, ctx));
         await beforeSuiteHook.fire(suite);
-        for (const t of suite.tasks)
-            await runTask(t, ctx);
+        await Promise.all(suite.tasks.map(i => runTask(i, ctx)));
+        // for (const t of suite.tasks)
+        //   await runTask(t, ctx)
         await afterSuiteHook.fire(suite);
-        await ((_c = reporter.onSuiteEnd) === null || _c === void 0 ? void 0 : _c.call(reporter, suite, ctx));
-    }
+        await ((_b = reporter.onSuiteEnd) === null || _b === void 0 ? void 0 : _b.call(reporter, suite, ctx));
+    }));
     await afterFileHook.fire(file);
-    await ((_d = reporter.onFileEnd) === null || _d === void 0 ? void 0 : _d.call(reporter, file, ctx));
+    await ((_b = reporter.onFileEnd) === null || _b === void 0 ? void 0 : _b.call(reporter, file, ctx));
 }
 export async function run(config) {
     var _a, _b, _c, _d;

package/dist/types.d.ts CHANGED Viewed

@@ -71,14 +71,14 @@ export interface GlobalContext {
     currentSuite: SuiteCollector | null;
 }
 export interface Reporter {
-    onStart: (userOptions: Config) => Awaitable<void>;
-    onCollected: (ctx: RunnerContext) => Awaitable<void>;
-    onFinished: (ctx: RunnerContext) => Awaitable<void>;
-    onSuiteBegin: (suite: Suite, ctx: RunnerContext) => Awaitable<void>;
-    onSuiteEnd: (suite: Suite, ctx: RunnerContext) => Awaitable<void>;
-    onFileBegin: (file: File, ctx: RunnerContext) => Awaitable<void>;
-    onFileEnd: (file: File, ctx: RunnerContext) => Awaitable<void>;
-    onTaskBegin: (task: Task, ctx: RunnerContext) => Awaitable<void>;
-    onTaskEnd: (task: Task, ctx: RunnerContext) => Awaitable<void>;
-    onSnapshotUpdate: () => Awaitable<void>;
+    onStart?: (userOptions: Config) => Awaitable<void>;
+    onCollected?: (ctx: RunnerContext) => Awaitable<void>;
+    onFinished?: (ctx: RunnerContext) => Awaitable<void>;
+    onSuiteBegin?: (suite: Suite, ctx: RunnerContext) => Awaitable<void>;
+    onSuiteEnd?: (suite: Suite, ctx: RunnerContext) => Awaitable<void>;
+    onFileBegin?: (file: File, ctx: RunnerContext) => Awaitable<void>;
+    onFileEnd?: (file: File, ctx: RunnerContext) => Awaitable<void>;
+    onTaskBegin?: (task: Task, ctx: RunnerContext) => Awaitable<void>;
+    onTaskEnd?: (task: Task, ctx: RunnerContext) => Awaitable<void>;
+    onSnapshotUpdate?: () => Awaitable<void>;
 }

package/index.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export * from './dist/index'

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "",
   "keywords": [],
   "homepage": "https://github.com/antfu/vitest#readme",
@@ -53,6 +53,7 @@
     "jest-snapshot": "^27.4.2",
     "jest-util": "^27.4.2",
     "jsdom": "^19.0.0",
+    "listr": "^0.14.3",
     "minimist": "^1.2.5",
     "ora": "^6.0.1",
     "picocolors": "^1.0.0",
@@ -63,6 +64,7 @@
     "@antfu/eslint-config": "^0.11.1",
     "@antfu/ni": "^0.11.0",
     "@types/jsdom": "^16.2.13",
+    "@types/listr": "^0.14.4",
     "@types/minimist": "^1.2.2",
     "@types/node": "^16.11.11",
     "@types/sinon": "^10.0.6",