vitest 0.0.114 → 0.0.115

package/dist/{index-ea5153a0.js → index-7c024e16.js}

@@ -345,11 +345,36 @@ async function ensurePackageInstalled(dependency, promptInstall = !process.env.C
     message: c.reset(`Do you want to install ${c.green(dependency)}?`)
   });
   if (install) {
-    await (await import('./index-9f4b9905.js')).installPackage(dependency, { dev: true });
+    await (await import('./index-ce49e384.js')).installPackage(dependency, { dev: true });
     return true;
   }
   return false;
 }
+function deepMerge(target, ...sources) {
+  if (!sources.length)
+    return target;
+  const source = sources.shift();
+  if (source === void 0)
+    return target;
+  if (isMergableObject(target) && isMergableObject(source)) {
+    Object.keys(source).forEach((key) => {
+      if (isMergableObject(source[key])) {
+        if (!target[key])
+          target[key] = {};
+        deepMerge(target[key], source[key]);
+      } else {
+        target[key] = source[key];
+      }
+    });
+  }
+  return deepMerge(target, ...sources);
+}
+function isMergableObject(item) {
+  return isObject(item) && !Array.isArray(item);
+}
+function isObject(val) {
+  return toString.call(val) === "[object Object]";
+}
 function toFilePath(id, root) {
   let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(dirname(root)) ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
   if (absolute.startsWith("//"))
@@ -357,4 +382,4 @@ function toFilePath(id, root) {
   return isWindows && absolute.startsWith("/") ? fileURLToPath(pathToFileURL(absolute.slice(1)).href) : absolute;
 }
 
-export { getSuites as a, basename as b, c, dirname as d, ensurePackageInstalled as e, getTests as f, getFullName as g, hasFailed as h, isAbsolute as i, resolve as j, toArray as k, join as l, notNullish as m, noop as n, mergeSlashes as o, index as p, getNames as q, relative as r, slash as s, toFilePath as t, interpretOnlyMode as u, partitionSuiteChildren as v, hasTests as w, isWindows as x, getTasks as y };
+export { isAbsolute as a, basename as b, c, dirname as d, ensurePackageInstalled as e, getSuites as f, getFullName as g, hasFailed as h, isObject as i, getTests as j, resolve as k, deepMerge as l, toFilePath as m, noop as n, notNullish as o, mergeSlashes as p, index as q, relative as r, slash as s, toArray as t, getNames as u, interpretOnlyMode as v, partitionSuiteChildren as w, hasTests as x, isWindows as y, getTasks as z };

package/dist/{index-ebf35a56.js → index-7f57c252.js}

@@ -1,4 +1,4 @@
-import { g as getCurrentSuite, w as withTimeout, a as getDefaultHookTimeout, b as getState, s as setState, c as suite, t as test, d as describe, i as it, v as vitest, e as vi } from './vi-67e478ef.js';
+import { g as getCurrentSuite, w as withTimeout, a as getDefaultHookTimeout, b as getState, s as setState, c as suite, t as test, d as describe, i as it, v as vitest, e as vi } from './vi-2115c609.js';
 import chai, { assert, should } from 'chai';
 import { s as spies, a as spyOn, f as fn } from './jest-mock-4a754991.js';
 

package/dist/{index-36694964.js → index-b4f86684.js}

@@ -1,21 +1,22 @@
-import fs$8, { promises, existsSync } from 'fs';
-import { pathToFileURL } from 'url';
-import { c, s as slash$1, i as isAbsolute, r as relative, d as dirname, b as basename, g as getFullName, h as hasFailed, a as getSuites, f as getTests, j as resolve, t as toFilePath, n as noop$1, k as toArray, l as join } from './index-ea5153a0.js';
+import { c, s as slash$1, a as isAbsolute, r as relative, d as dirname, b as basename, g as getFullName, h as hasFailed, f as getSuites, j as getTests, t as toArray, k as resolve, l as deepMerge, m as toFilePath, n as noop$1 } from './index-7c024e16.js';
 import { createServer, mergeConfig } from 'vite';
 import path$a from 'path';
 import process$1 from 'process';
+import fs$8, { promises, existsSync } from 'fs';
 import require$$0 from 'os';
 import require$$0$1 from 'util';
 import require$$0$2 from 'stream';
 import require$$2 from 'events';
-import { d as defaultInclude, a as defaultExclude, b as defaultPort, c as distDir, e as configFiles } from './constants-9c7f06df.js';
+import { d as defaultInclude, a as defaultExclude, b as defaultPort, c as distDir, e as configFiles } from './constants-5968a78c.js';
 import MagicString from './magic-string.es-94000aea.js';
-import { performance as performance$1 } from 'perf_hooks';
-import { F as F_POINTER, a as F_DOWN, s as stripAnsi, b as F_LONG_DASH, c as F_DOWN_RIGHT, d as F_DOT, e as F_CHECK, f as F_CROSS, g as F_RIGHT, p as printError, h as stringWidth, i as ansiStyles, j as sliceAnsi, k as cliTruncate } from './diff-3cfdad26.js';
-import { o as onetime, s as signalExit } from './index-61c8686f.js';
+import { performance } from 'perf_hooks';
+import { F as F_POINTER, a as F_DOWN, s as stripAnsi, b as F_LONG_DASH, c as F_DOWN_RIGHT, d as F_DOT, e as F_CHECK, f as F_CROSS, g as F_RIGHT, p as printError, h as stringWidth, i as ansiStyles, j as sliceAnsi, k as cliTruncate } from './diff-67678e1f.js';
+import { o as onetime, s as signalExit } from './index-648e7ab2.js';
+import { createRequire } from 'module';
+import { pathToFileURL } from 'url';
 import { MessageChannel } from 'worker_threads';
 import { Tinypool } from 'tinypool';
-import { c as createBirpc } from './index-7889832e.js';
+import { c as createBirpc } from './index-e909c175.js';
 
 /*
 How it works:
@@ -6965,23 +6966,26 @@ function elegantSpinner() {
 }
 
 class BaseReporter {
-  constructor(ctx) {
-    this.ctx = ctx;
+  constructor() {
     this.start = 0;
     this.end = 0;
     this.isTTY = process.stdout.isTTY && !process.env.CI;
+    this.ctx = void 0;
     this.isFirstWatchRun = true;
-    const mode = ctx.config.watch ? c.blue(" WATCH ") : c.cyan(" RUN ");
+  }
+  onInit(ctx) {
+    this.ctx = ctx;
+    const mode = this.ctx.config.watch ? c.blue(" WATCH ") : c.cyan(" RUN ");
     this.ctx.log(`
 ${c.inverse(c.bold(mode))} ${c.gray(this.ctx.config.root)}
 `);
-    this.start = performance$1.now();
+    this.start = performance.now();
   }
   relative(path) {
     return relative(this.ctx.config.root, path);
   }
   async onFinished(files = this.ctx.state.getFiles()) {
-    this.end = performance$1.now();
+    this.end = performance.now();
     await this.reportSummary(files);
   }
   onTaskUpdate(pack) {
@@ -7639,11 +7643,10 @@ function renderTree(tasks, options, level = 0) {
   }
   return output.slice(0, MAX_HEIGHT).join("\n");
 }
-const createListRenderer = (_tasks, options = {}) => {
+const createListRenderer = (_tasks, options) => {
   let tasks = _tasks;
   let timer;
-  const stdout = process.stdout;
-  const log = createLogUpdate(stdout);
+  const log = createLogUpdate(options.outputStream);
   function update() {
     log(renderTree(tasks, options));
   }
@@ -7665,7 +7668,7 @@ const createListRenderer = (_tasks, options = {}) => {
         timer = void 0;
       }
       log.clear();
-      stdout.write(`${renderTree(tasks, options)}
+      options.outputStream.write(`${renderTree(tasks, options)}
 `);
       return this;
     },
@@ -7682,6 +7685,7 @@ class DefaultReporter extends BaseReporter {
   }
   onStart() {
     if (this.isTTY) {
+      this.rendererOptions.outputStream = this.ctx.outputStream;
       const files = this.ctx.state.getFiles(this.watchFilters);
       if (!this.renderer)
         this.renderer = createListRenderer(files, this.rendererOptions).start();
@@ -7735,11 +7739,10 @@ function render(tasks) {
     }
   }).join("");
 }
-const createDotRenderer = (_tasks) => {
+const createDotRenderer = (_tasks, options) => {
   let tasks = _tasks;
   let timer;
-  const stdout = process.stdout;
-  const log = createLogUpdate(stdout);
+  const log = createLogUpdate(options.outputStream);
   function update() {
     log(render(tasks));
   }
@@ -7761,7 +7764,7 @@ const createDotRenderer = (_tasks) => {
         timer = void 0;
       }
       log.clear();
-      stdout.write(`${render(tasks)}
+      options.outputStream.write(`${render(tasks)}
 `);
       return this;
     },
@@ -7776,7 +7779,7 @@ class DotReporter extends BaseReporter {
     if (this.isTTY) {
       const files = this.ctx.state.getFiles(this.watchFilters);
       if (!this.renderer)
-        this.renderer = createDotRenderer(files).start();
+        this.renderer = createDotRenderer(files, { outputStream: this.ctx.outputStream }).start();
       else
         this.renderer.update(files);
     }
@@ -7808,8 +7811,8 @@ class DotReporter extends BaseReporter {
 }
 
 class VerboseReporter extends DefaultReporter {
-  constructor(ctx) {
-    super(ctx);
+  constructor() {
+    super();
     this.rendererOptions.renderSucceed = true;
   }
 }
@@ -7820,6 +7823,80 @@ const ReportersMap = {
   dot: DotReporter
 };
 
+var __defProp$1 = Object.defineProperty;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
+var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
+var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$1 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$1.call(b, prop))
+      __defNormalProp$1(a, prop, b[prop]);
+  if (__getOwnPropSymbols$1)
+    for (var prop of __getOwnPropSymbols$1(b)) {
+      if (__propIsEnum$1.call(b, prop))
+        __defNormalProp$1(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+const defaultExcludes = [
+  "coverage/**",
+  "packages/*/test{,s}/**",
+  "**/*.d.ts",
+  "test{,s}/**",
+  "test{,-*}.{js,cjs,mjs,ts,tsx,jsx}",
+  "**/*{.,-}test.{js,cjs,mjs,ts,tsx,jsx}",
+  "**/__tests__/**",
+  "**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc}.config.{js,cjs,mjs,ts}",
+  "**/.{eslint,mocha}rc.{js,cjs}"
+];
+function resolveC8Options(options, root) {
+  const resolved = __spreadValues$1({
+    enabled: false,
+    clean: true,
+    cleanOnRerun: false,
+    reportsDirectory: "./coverage",
+    excludeNodeModules: true,
+    exclude: defaultExcludes,
+    reporter: "text",
+    allowExternal: false
+  }, options);
+  resolved.reporter = toArray(resolved.reporter);
+  resolved.reportsDirectory = resolve(root, resolved.reportsDirectory);
+  resolved.tempDirectory = process.env.NODE_V8_COVERAGE || resolve(resolved.reportsDirectory, "tmp");
+  return resolved;
+}
+async function cleanCoverage(options, clean = true) {
+  if (clean && existsSync(options.reportsDirectory))
+    await promises.rmdir(options.reportsDirectory, { recursive: true });
+  if (!existsSync(options.tempDirectory))
+    await promises.mkdir(options.tempDirectory, { recursive: true });
+}
+async function prepareCoverage(options) {
+  if (options.enabled)
+    return false;
+  await cleanCoverage(options, options.clean);
+}
+const require2 = createRequire(import.meta.url);
+async function reportCoverage(ctx) {
+  const createReport = require2("c8/lib/report");
+  const report = createReport(ctx.config.coverage);
+  Array.from(ctx.visitedFilesMap.entries()).filter((i) => !i[0].includes("/node_modules/")).forEach(([file, map]) => {
+    if (!existsSync(file))
+      return;
+    const url = pathToFileURL(file).href;
+    report.sourceMapCache[url] = {
+      data: __spreadProps$1(__spreadValues$1({}, map), {
+        sources: map.sources.map((i) => pathToFileURL(i).href) || [url]
+      })
+    };
+  });
+  await report.run();
+}
+
 class StateManager {
   constructor() {
     this.filesMap = {};
@@ -7855,32 +7932,33 @@ class StateManager {
   }
 }
 
-var __defProp$1 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$1 = (a, b) => {
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop))
-      __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop))
-        __defNormalProp$1(a, prop, b[prop]);
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 function resolveConfig(options, viteConfig) {
   var _a, _b;
   if (options.dom)
     options.environment = "happy-dom";
-  const resolved = __spreadProps$1(__spreadValues$1(__spreadValues$1({}, options), viteConfig.test), {
+  const resolved = __spreadProps(__spreadValues({}, deepMerge(options, viteConfig.test)), {
     root: viteConfig.root
   });
+  resolved.coverage = resolveC8Options(resolved.coverage, resolved.root);
   resolved.depsInline = [...((_a = resolved.deps) == null ? void 0 : _a.inline) || []];
   resolved.depsExternal = [...((_b = resolved.deps) == null ? void 0 : _b.external) || []];
   resolved.environment = resolved.environment || "node";
@@ -8021,22 +8099,24 @@ function createChannel(ctx) {
   const workerPort = channel.port1;
   createBirpc({
     functions: {
-      processExit(code) {
+      onWorkerExit(code) {
         process.exit(code || 1);
       },
       snapshotSaved(snapshot) {
         ctx.snapshot.add(snapshot);
       },
-      getSourceMap(id, force) {
+      async getSourceMap(id, force) {
         if (force) {
           const mod = ctx.server.moduleGraph.getModuleById(id);
           if (mod)
             ctx.server.moduleGraph.invalidateModule(mod);
         }
-        return transformRequest(ctx, id).then((r) => r == null ? void 0 : r.map);
+        const r = await transformRequest(ctx, id);
+        return r == null ? void 0 : r.map;
       },
-      fetch(id) {
-        return transformRequest(ctx, id).then((r) => r == null ? void 0 : r.code);
+      async fetch(id) {
+        const r = await transformRequest(ctx, id);
+        return r == null ? void 0 : r.code;
       },
       onCollected(files) {
         ctx.state.collectFiles(files);
@@ -8046,7 +8126,7 @@ function createChannel(ctx) {
         ctx.state.updateTasks([pack]);
         ctx.report("onTaskUpdate", pack);
       },
-      log(msg) {
+      onUserLog(msg) {
         ctx.report("onUserConsoleLog", msg);
       }
     },
@@ -8060,25 +8140,6 @@ function createChannel(ctx) {
   return { workerPort, port };
 }
 
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 const WATCHER_DEBOUNCE = 100;
 class Vitest {
   constructor() {
@@ -8087,6 +8148,8 @@ class Vitest {
     this.state = void 0;
     this.snapshot = void 0;
     this.reporters = void 0;
+    this.outputStream = process.stdout;
+    this.errorStream = process.stderr;
     this.invalidates = /* @__PURE__ */ new Set();
     this.changedTests = /* @__PURE__ */ new Set();
     this.visitedFilesMap = /* @__PURE__ */ new Map();
@@ -8096,7 +8159,7 @@ class Vitest {
     this.unregisterWatcher = noop$1;
     this.console = globalThis.console;
   }
-  setServer(options, server) {
+  async setServer(options, server) {
     var _a, _b;
     (_a = this.unregisterWatcher) == null ? void 0 : _a.call(this);
     clearTimeout(this._rerunTimer);
@@ -8113,18 +8176,21 @@ class Vitest {
         const Reporter = ReportersMap[i];
         if (!Reporter)
           throw new Error(`Unknown reporter: ${i}`);
-        return new Reporter(this);
+        return new Reporter();
       }
       return i;
     });
     if (!this.reporters.length)
-      this.reporters.push(new DefaultReporter(this));
+      this.reporters.push(new DefaultReporter());
     if (this.config.watch)
       this.registerWatcher();
     this.runningPromise = void 0;
     this._onRestartListeners.forEach((fn) => fn());
+    if (resolved.coverage.enabled)
+      await prepareCoverage(resolved.coverage);
   }
   async start(filters) {
+    this.report("onInit", this);
     const files = await this.globTestFiles(filters);
     if (!files.length) {
       if (this.config.passWithNoTests)
@@ -8136,7 +8202,8 @@ class Vitest {
     await this.runFiles(files);
     if (this.config.watch)
       await this.report("onWatcherStart");
-    await this.writeC8Sourcemap();
+    if (this.config.coverage.enabled)
+      await reportCoverage(this);
   }
   async runFiles(files) {
     await this.runningPromise;
@@ -8178,9 +8245,14 @@ class Vitest {
       this.snapshot.clear();
       const files = Array.from(this.changedTests);
       this.changedTests.clear();
+      this.console.log("return");
+      if (this.config.coverage.enabled && this.config.coverage.cleanOnRerun)
+        await cleanCoverage(this.config.coverage);
       await this.report("onWatcherRerun", files, triggerId);
       await this.runFiles(files);
       await this.report("onWatcherStart");
+      if (this.config.coverage.enabled)
+        await reportCoverage(this);
     }, WATCHER_DEBOUNCE);
   }
   registerWatcher() {
@@ -8253,28 +8325,6 @@ class Vitest {
       files = files.filter((i) => filters.some((f) => i.includes(f)));
     return files;
   }
-  async writeC8Sourcemap() {
-    const coverageDir = process.env.NODE_V8_COVERAGE;
-    if (!coverageDir)
-      return;
-    const cache = {};
-    const files = Array.from(this.visitedFilesMap.entries()).filter((i) => !i[0].includes("/node_modules/"));
-    files.forEach(([file, map]) => {
-      if (!existsSync(file))
-        return;
-      const url = pathToFileURL(file).href;
-      cache[url] = {
-        data: __spreadProps(__spreadValues({}, map), {
-          sources: map.sources.map((i) => pathToFileURL(i).href) || [url]
-        })
-      };
-    });
-    await promises.writeFile(join(coverageDir, "vitest-source-map.json"), JSON.stringify({
-      "result": [],
-      "timestamp": performance.now(),
-      "source-map-cache": cache
-    }), "utf-8");
-  }
   isTargetFile(id) {
     if (micromatch_1.isMatch(id, this.config.exclude))
       return false;
@@ -8300,10 +8350,10 @@ async function createVitest(options, viteOverrides = {}) {
         async configureServer(server2) {
           if (haveStarted)
             await ctx.report("onServerRestart");
-          ctx.setServer(options, server2);
+          await ctx.setServer(options, server2);
           haveStarted = true;
           if (options.api)
-            server2.middlewares.use((await import('./middleware-85ff8fbf.js')).default(ctx));
+            server2.middlewares.use((await import('./middleware-647438b9.js')).default(ctx));
         }
       },
       MocksPlugin()