vitest 0.0.114 → 0.0.115

package/dist/{index-7889832e.js → index-e909c175.js}

@@ -2,24 +2,25 @@ function createBirpc({
   functions,
   post,
   on,
+  eventNames = [],
   serialize = (i) => i,
   deserialize = (i) => i
 }) {
   const rpcPromiseMap = /* @__PURE__ */ new Map();
   on(async (data) => {
     const msg = deserialize(data);
-    if (msg.type === "req") {
-      const { method, args, ack } = msg;
+    if (msg.t === "q") {
+      const { m: method, a: args } = msg;
       let result, error;
       try {
         result = await functions[method](...args);
       } catch (e) {
         error = e;
       }
-      if (ack)
-        await post(serialize({ type: "res", ack, result, error }));
+      if (msg.i)
+        post(serialize({ t: "s", i: msg.i, r: result, e: error }));
     } else {
-      const { ack, result, error } = msg;
+      const { i: ack, r: result, e: error } = msg;
       const promise = rpcPromiseMap.get(ack);
       if (error)
         promise?.reject(error);
@@ -28,18 +29,26 @@ function createBirpc({
       rpcPromiseMap.delete(ack);
     }
   });
-  return {
-    call(method, ...args) {
-      return new Promise((resolve, reject) => {
-        const ack = nanoid();
-        rpcPromiseMap.set(ack, { resolve, reject });
-        post(serialize({ method, args, ack, type: "req" }));
-      });
-    },
-    send(method, ...args) {
-      post(serialize({ method, args, type: "req" }));
+  return new Proxy({}, {
+    get(_, method) {
+      const sendEvent = (...args) => {
+        post(serialize({ m: method, a: args, t: "q" }));
+      };
+      if (eventNames.includes(method)) {
+        sendEvent.asEvent = sendEvent;
+        return sendEvent;
+      }
+      const sendCall = (...args) => {
+        return new Promise((resolve, reject) => {
+          const id = nanoid();
+          rpcPromiseMap.set(id, { resolve, reject });
+          post(serialize({ m: method, a: args, i: id, t: "q" }));
+        });
+      };
+      sendCall.asEvent = sendEvent;
+      return sendCall;
     }
-  };
+  });
 }
 const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
 function nanoid(size = 21) {

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { Formatter } from 'picocolors/types';
 import { ViteDevServer } from 'vite';
 import { RawSourceMap } from 'source-map-js';
 import { OptionsReceived } from 'pretty-format';
+import { Arrayable as Arrayable$1 } from 'vitest';
 import { MessagePort } from 'worker_threads';
 export { Spy, SpyFn } from 'tinyspy';
 export { assert, default as chai, should } from 'chai';
@@ -194,6 +195,12 @@ declare class Vitest {
     reporters: Reporter[];
     console: Console;
     pool: WorkerPool | undefined;
+    outputStream: NodeJS.WriteStream & {
+        fd: 1;
+    };
+    errorStream: NodeJS.WriteStream & {
+        fd: 2;
+    };
     invalidates: Set<string>;
     changedTests: Set<string>;
     visitedFilesMap: Map<string, RawSourceMap>;
@@ -202,7 +209,7 @@ declare class Vitest {
     restartsCount: number;
     private _onRestartListeners;
     constructor();
-    setServer(options: UserConfig, server: ViteDevServer): void;
+    setServer(options: UserConfig, server: ViteDevServer): Promise<void>;
     start(filters?: string[]): Promise<void>;
     runFiles(files: string[]): Promise<void>;
     log(...args: any[]): void;
@@ -215,18 +222,17 @@ declare class Vitest {
     close(): Promise<void>;
     report<T extends keyof Reporter>(name: T, ...args: ArgumentsType<Reporter[T]>): Promise<void>;
     globTestFiles(filters?: string[]): Promise<string[]>;
-    writeC8Sourcemap(): Promise<void>;
     isTargetFile(id: string): boolean;
     onServerRestarted(fn: () => void): void;
 }
 
 declare abstract class BaseReporter implements Reporter {
-    ctx: Vitest;
     start: number;
     end: number;
     watchFilters?: string[];
     isTTY: boolean;
-    constructor(ctx: Vitest);
+    ctx: Vitest;
+    onInit(ctx: Vitest): void;
     relative(path: string): string;
     onFinished(files?: File[]): Promise<void>;
     onTaskUpdate(pack: TaskResultPack): void;
@@ -241,8 +247,9 @@ declare abstract class BaseReporter implements Reporter {
 
 interface ListRendererOptions {
     renderSucceed?: boolean;
+    outputStream: NodeJS.WritableStream;
 }
-declare const createListRenderer: (_tasks: Task[], options?: ListRendererOptions) => {
+declare const createListRenderer: (_tasks: Task[], options: ListRendererOptions) => {
     start(): any;
     update(_tasks: Task[]): any;
     stop(): Promise<any>;
@@ -271,7 +278,7 @@ declare class DotReporter extends BaseReporter {
 }
 
 declare class VerboseReporter extends DefaultReporter {
-    constructor(ctx: Vitest);
+    constructor();
 }
 
 declare const ReportersMap: {
@@ -281,6 +288,56 @@ declare const ReportersMap: {
 };
 declare type BuiltinReporters = keyof typeof ReportersMap;
 
+declare type Reporter$1 = 'clover' | 'cobertura' | 'html-spa' | 'html' | 'json-summary' | 'json' | 'lcov' | 'lcovonly' | 'none' | 'teamcity' | 'text-lcov' | 'text-summary' | 'text';
+interface C8Options {
+    /**
+     * Enable coverage, pass `--coverage` to enable
+     *
+     * @default false
+     */
+    enabled?: boolean;
+    /**
+     * Directory to write coverage report to
+     */
+    reportsDirectory?: string;
+    /**
+     * Clean coverage before running tests
+     *
+     * @default true
+     */
+    clean?: boolean;
+    /**
+     * Clean coverage report on watch rerun
+     *
+     * @default false
+     */
+    cleanOnRerun?: boolean;
+    /**
+     * Allow files from outside of your cwd.
+     *
+     * @default false
+     */
+    allowExternal?: any;
+    /**
+     * Reporters
+     *
+     * @default 'text'
+     */
+    reporter?: Arrayable$1<Reporter$1>;
+    /**
+     * Exclude coverage under /node_modules/
+     *
+     * @default true
+     */
+    excludeNodeModules?: boolean;
+    exclude?: string[];
+    include?: string[];
+    skipFull?: boolean;
+}
+interface ResolvedC8Options extends Required<C8Options> {
+    tempDirectory: string;
+}
+
 declare type Awaitable<T> = T | PromiseLike<T>;
 declare type Nullable<T> = T | null | undefined;
 declare type Arrayable<T> = T | Array<T>;
@@ -383,6 +440,7 @@ interface RuntimeContext {
 }
 
 interface Reporter {
+    onInit(ctx: Vitest): void;
     onStart?: (files?: string[]) => Awaitable<void>;
     onFinished?: (files?: File[]) => Awaitable<void>;
     onTaskUpdate?: (pack: TaskResultPack) => Awaitable<void>;
@@ -558,6 +616,10 @@ interface InlineConfig {
      * @default true
      */
     isolate?: boolean;
+    /**
+     * Coverage options
+     */
+    coverage?: C8Options;
     /**
      * Open Vitest UI
      * @internal WIP
@@ -612,11 +674,12 @@ interface UserConfig extends InlineConfig {
      */
     passWithNoTests?: boolean;
 }
-interface ResolvedConfig extends Omit<Required<UserConfig>, 'config' | 'filters'> {
+interface ResolvedConfig extends Omit<Required<UserConfig>, 'config' | 'filters' | 'coverage'> {
     config?: string;
     filters?: string[];
     depsInline: (string | RegExp)[];
     depsExternal: (string | RegExp)[];
+    coverage: ResolvedC8Options;
     snapshotOptions: SnapshotStateOptions;
 }
 
@@ -629,8 +692,8 @@ interface WorkerContext {
 interface WorkerRPC {
     fetch: (id: string) => Promise<string | undefined>;
     getSourceMap: (id: string, force?: boolean) => Promise<RawSourceMap | undefined>;
-    log: (log: UserConsoleLog) => void;
-    processExit: (code?: number) => void;
+    onWorkerExit: (code?: number) => void;
+    onUserLog: (log: UserConsoleLog) => void;
     onCollected: (files: File[]) => void;
     onTaskUpdate: (pack: TaskResultPack) => void;
     snapshotSaved: (snapshot: SnapshotResult) => void;

package/dist/index.js

@@ -1,8 +1,8 @@
-export { d as describe, i as it, c as suite, t as test, e as vi, v as vitest } from './vi-67e478ef.js';
-export { a as afterAll, d as afterEach, b as beforeAll, c as beforeEach, e as expect } from './index-ebf35a56.js';
+export { d as describe, i as it, c as suite, t as test, e as vi, v as vitest } from './vi-2115c609.js';
+export { a as afterAll, d as afterEach, b as beforeAll, c as beforeEach, e as expect } from './index-7f57c252.js';
 export { f as fn, s as spies, a as spyOn } from './jest-mock-4a754991.js';
 export { assert, default as chai, should } from 'chai';
-import './index-ea5153a0.js';
+import './index-7c024e16.js';
 import 'url';
 import 'tty';
 import 'local-pkg';

package/dist/{middleware-85ff8fbf.js → middleware-647438b9.js}

@@ -1,6 +1,6 @@
-import { A as API_PATH } from './constants-9c7f06df.js';
+import { A as API_PATH } from './constants-5968a78c.js';
 import 'url';
-import './index-ea5153a0.js';
+import './index-7c024e16.js';
 import 'tty';
 import 'local-pkg';
 import 'path';

package/dist/node.d.ts

@@ -1,14 +1,15 @@
 import { ViteDevServer, UserConfig as UserConfig$1 } from 'vite';
 import { RawSourceMap } from 'source-map-js';
+import { Arrayable as Arrayable$1 } from 'vitest';
 import { OptionsReceived } from 'pretty-format';
 
 declare abstract class BaseReporter implements Reporter {
-    ctx: Vitest;
     start: number;
     end: number;
     watchFilters?: string[];
     isTTY: boolean;
-    constructor(ctx: Vitest);
+    ctx: Vitest;
+    onInit(ctx: Vitest): void;
     relative(path: string): string;
     onFinished(files?: File[]): Promise<void>;
     onTaskUpdate(pack: TaskResultPack): void;
@@ -23,8 +24,9 @@ declare abstract class BaseReporter implements Reporter {
 
 interface ListRendererOptions {
     renderSucceed?: boolean;
+    outputStream: NodeJS.WritableStream;
 }
-declare const createListRenderer: (_tasks: Task[], options?: ListRendererOptions) => {
+declare const createListRenderer: (_tasks: Task[], options: ListRendererOptions) => {
     start(): any;
     update(_tasks: Task[]): any;
     stop(): Promise<any>;
@@ -53,7 +55,7 @@ declare class DotReporter extends BaseReporter {
 }
 
 declare class VerboseReporter extends DefaultReporter {
-    constructor(ctx: Vitest);
+    constructor();
 }
 
 declare const ReportersMap: {
@@ -63,6 +65,56 @@ declare const ReportersMap: {
 };
 declare type BuiltinReporters = keyof typeof ReportersMap;
 
+declare type Reporter$1 = 'clover' | 'cobertura' | 'html-spa' | 'html' | 'json-summary' | 'json' | 'lcov' | 'lcovonly' | 'none' | 'teamcity' | 'text-lcov' | 'text-summary' | 'text';
+interface C8Options {
+    /**
+     * Enable coverage, pass `--coverage` to enable
+     *
+     * @default false
+     */
+    enabled?: boolean;
+    /**
+     * Directory to write coverage report to
+     */
+    reportsDirectory?: string;
+    /**
+     * Clean coverage before running tests
+     *
+     * @default true
+     */
+    clean?: boolean;
+    /**
+     * Clean coverage report on watch rerun
+     *
+     * @default false
+     */
+    cleanOnRerun?: boolean;
+    /**
+     * Allow files from outside of your cwd.
+     *
+     * @default false
+     */
+    allowExternal?: any;
+    /**
+     * Reporters
+     *
+     * @default 'text'
+     */
+    reporter?: Arrayable$1<Reporter$1>;
+    /**
+     * Exclude coverage under /node_modules/
+     *
+     * @default true
+     */
+    excludeNodeModules?: boolean;
+    exclude?: string[];
+    include?: string[];
+    skipFull?: boolean;
+}
+interface ResolvedC8Options extends Required<C8Options> {
+    tempDirectory: string;
+}
+
 declare type Awaitable<T> = T | PromiseLike<T>;
 declare type Arrayable<T> = T | Array<T>;
 declare type ArgumentsType<T> = T extends (...args: infer U) => any ? U : never;
@@ -107,6 +159,7 @@ interface Test extends TaskBase {
 declare type Task = Test | Suite | File;
 
 interface Reporter {
+    onInit(ctx: Vitest): void;
     onStart?: (files?: string[]) => Awaitable<void>;
     onFinished?: (files?: File[]) => Awaitable<void>;
     onTaskUpdate?: (pack: TaskResultPack) => Awaitable<void>;
@@ -273,6 +326,10 @@ interface InlineConfig {
      * @default true
      */
     isolate?: boolean;
+    /**
+     * Coverage options
+     */
+    coverage?: C8Options;
     /**
      * Open Vitest UI
      * @internal WIP
@@ -327,11 +384,12 @@ interface UserConfig extends InlineConfig {
      */
     passWithNoTests?: boolean;
 }
-interface ResolvedConfig extends Omit<Required<UserConfig>, 'config' | 'filters'> {
+interface ResolvedConfig extends Omit<Required<UserConfig>, 'config' | 'filters' | 'coverage'> {
     config?: string;
     filters?: string[];
     depsInline: (string | RegExp)[];
     depsExternal: (string | RegExp)[];
+    coverage: ResolvedC8Options;
     snapshotOptions: SnapshotStateOptions;
 }
 
@@ -368,6 +426,12 @@ declare class Vitest {
     reporters: Reporter[];
     console: Console;
     pool: WorkerPool | undefined;
+    outputStream: NodeJS.WriteStream & {
+        fd: 1;
+    };
+    errorStream: NodeJS.WriteStream & {
+        fd: 2;
+    };
     invalidates: Set<string>;
     changedTests: Set<string>;
     visitedFilesMap: Map<string, RawSourceMap>;
@@ -376,7 +440,7 @@ declare class Vitest {
     restartsCount: number;
     private _onRestartListeners;
     constructor();
-    setServer(options: UserConfig, server: ViteDevServer): void;
+    setServer(options: UserConfig, server: ViteDevServer): Promise<void>;
     start(filters?: string[]): Promise<void>;
     runFiles(files: string[]): Promise<void>;
     log(...args: any[]): void;
@@ -389,7 +453,6 @@ declare class Vitest {
     close(): Promise<void>;
     report<T extends keyof Reporter>(name: T, ...args: ArgumentsType<Reporter[T]>): Promise<void>;
     globTestFiles(filters?: string[]): Promise<string[]>;
-    writeC8Sourcemap(): Promise<void>;
     isTargetFile(id: string): boolean;
     onServerRestarted(fn: () => void): void;
 }

package/dist/node.js

@@ -1,23 +1,24 @@
-export { c as createVitest } from './index-36694964.js';
-import 'fs';
+export { c as createVitest } from './index-b4f86684.js';
+import './index-7c024e16.js';
 import 'url';
-import './index-ea5153a0.js';
 import 'tty';
 import 'local-pkg';
 import 'path';
 import 'vite';
 import 'process';
+import 'fs';
 import 'os';
 import 'util';
 import 'stream';
 import 'events';
-import './constants-9c7f06df.js';
+import './constants-5968a78c.js';
 import './magic-string.es-94000aea.js';
 import 'perf_hooks';
-import './diff-3cfdad26.js';
-import './index-61c8686f.js';
+import './diff-67678e1f.js';
+import './index-648e7ab2.js';
 import './_commonjsHelpers-c9e3b764.js';
 import 'assert';
+import 'module';
 import 'worker_threads';
 import 'tinypool';
-import './index-7889832e.js';
+import './index-e909c175.js';

package/dist/rpc-8c7cc374.js

@@ -0,0 +1,5 @@
+const rpc = () => {
+  return process.__vitest_worker__.rpc;
+};
+
+export { rpc as r };

package/dist/utils.js

@@ -1,4 +1,4 @@
-export { e as ensurePackageInstalled, g as getFullName, q as getNames, a as getSuites, y as getTasks, f as getTests, h as hasFailed, w as hasTests, u as interpretOnlyMode, x as isWindows, o as mergeSlashes, n as noop, m as notNullish, v as partitionSuiteChildren, j as resolvePath, s as slash, k as toArray, t as toFilePath } from './index-ea5153a0.js';
+export { l as deepMerge, e as ensurePackageInstalled, g as getFullName, u as getNames, f as getSuites, z as getTasks, j as getTests, h as hasFailed, x as hasTests, v as interpretOnlyMode, i as isObject, y as isWindows, p as mergeSlashes, n as noop, o as notNullish, w as partitionSuiteChildren, k as resolvePath, s as slash, t as toArray, m as toFilePath } from './index-7c024e16.js';
 import 'url';
 import 'tty';
 import 'local-pkg';

package/dist/{vi-67e478ef.js → vi-2115c609.js}

@@ -1,4 +1,4 @@
-import { n as noop } from './index-ea5153a0.js';
+import { n as noop, i as isObject } from './index-7c024e16.js';
 import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './_commonjsHelpers-c9e3b764.js';
 import { a as spyOn, f as fn, s as spies } from './jest-mock-4a754991.js';
 
@@ -210,7 +210,6 @@ function createSuite() {
   });
 }
 
-const isObject = (val) => toString.call(val) === "[object Object]";
 function equals(a, b, customTesters, strictCheck) {
   customTesters = customTesters || [];
   return eq(a, b, [], [], customTesters, strictCheck ? hasKey : hasDefinedKey);

package/dist/worker.js

@@ -1,6 +1,6 @@
-import { j as resolve, d as dirname$2, b as basename$2, o as mergeSlashes, s as slash, t as toFilePath } from './index-ea5153a0.js';
-import { c as createBirpc } from './index-7889832e.js';
-import { c as distDir } from './constants-9c7f06df.js';
+import { k as resolve, d as dirname$2, b as basename$2, p as mergeSlashes, s as slash, m as toFilePath } from './index-7c024e16.js';
+import { c as createBirpc } from './index-e909c175.js';
+import { c as distDir } from './constants-5968a78c.js';
 import { builtinModules, createRequire } from 'module';
 import { pathToFileURL, fileURLToPath as fileURLToPath$2, URL as URL$1 } from 'url';
 import vm from 'vm';
@@ -9,7 +9,7 @@ import fs, { promises, realpathSync, statSync, Stats, existsSync, readdirSync }
 import assert from 'assert';
 import { format as format$2, inspect } from 'util';
 import { a as spyOn, s as spies } from './jest-mock-4a754991.js';
-import { s as send } from './rpc-85fe6402.js';
+import { r as rpc } from './rpc-8c7cc374.js';
 import 'tty';
 import 'local-pkg';
 import 'chai';
@@ -9561,10 +9561,10 @@ async function startViteNode(ctx) {
     return _viteNode;
   const processExit = process.exit;
   process.on("beforeExit", (code) => {
-    send("processExit", code);
+    rpc().onWorkerExit(code);
   });
   process.exit = (code = process.exitCode || 0) => {
-    send("processExit", code);
+    rpc().onWorkerExit(code);
     return processExit(code);
   };
   const { config } = ctx;
@@ -9574,7 +9574,7 @@ async function startViteNode(ctx) {
       resolve(distDir, "entry.js")
     ],
     fetch(id) {
-      return process.__vitest_worker__.rpc.call("fetch", id);
+      return rpc().fetch(id);
     },
     inline: config.depsInline,
     external: config.depsExternal,
@@ -9596,6 +9596,7 @@ function init(ctx) {
     config,
     rpc: createBirpc({
       functions: {},
+      eventNames: ["onUserLog", "onCollected", "onTaskUpdate", "onWorkerExit"],
       post(v) {
         port.postMessage(v);
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.0.114",
+  "version": "0.0.115",
   "description": "A blazing fast unit test framework powered by Vite",
   "keywords": [
     "vite",
@@ -62,12 +62,13 @@
     "@types/natural-compare": "^1.4.1",
     "@types/node": "^17.0.4",
     "@types/prompts": "^2.4.0",
-    "birpc": "^0.0.0",
+    "birpc": "^0.0.2",
     "c8": "^7.10.0",
     "cac": "^6.7.12",
     "chai-subset": "^1.6.0",
     "cli-truncate": "^3.1.0",
     "diff": "^5.0.0",
+    "execa": "^6.0.0",
     "fast-glob": "^3.2.7",
     "find-up": "^6.2.0",
     "flatted": "^3.2.4",

package/vitest.mjs

@@ -1,21 +1,2 @@
 #!/usr/bin/env node
-
-import { fileURLToPath } from 'url'
-import { ensurePackageInstalled, resolvePath } from './dist/utils.js'
-
-const argv = process.argv.slice(2)
-
-if (!await ensurePackageInstalled('vite'))
-  process.exit(1)
-
-if (argv.includes('--coverage')) {
-  if (!await ensurePackageInstalled('c8'))
-    process.exit(1)
-  const filename = fileURLToPath(import.meta.url)
-  const entry = resolvePath(filename, '../dist/cli.js')
-  process.argv.splice(2, 0, process.argv[0], entry)
-  await import('c8/bin/c8.js')
-}
-else {
-  await import('./dist/cli.js')
-}
+import('./dist/cli.js')

package/dist/rpc-85fe6402.js

@@ -1,10 +0,0 @@
-const rpc = (method, ...args) => {
-  var _a;
-  return (_a = process.__vitest_worker__) == null ? void 0 : _a.rpc.call(method, ...args);
-};
-const send = (method, ...args) => {
-  var _a;
-  return (_a = process.__vitest_worker__) == null ? void 0 : _a.rpc.send(method, ...args);
-};
-
-export { rpc as r, send as s };