vitest 0.0.118 → 0.0.119

package/dist/cli.js

@@ -7,8 +7,8 @@ import process$1 from 'process';
 import { m as mergeStream, g as getStream, c as crossSpawn } from './index-6e709f57.js';
 import require$$0, { constants } from 'os';
 import { s as signalExit } from './index-648e7ab2.js';
-import { e as ensurePackageInstalled } from './index-80671389.js';
-import { c as createVitest } from './index-62869b66.js';
+import { e as ensurePackageInstalled } from './index-090545ef.js';
+import { c as createVitest } from './index-478354a1.js';
 import './_commonjsHelpers-c9e3b764.js';
 import 'fs';
 import 'stream';
@@ -18,10 +18,10 @@ import 'url';
 import 'tty';
 import 'local-pkg';
 import 'vite';
-import './constants-56bfb5ab.js';
+import './constants-22bbd600.js';
 import './magic-string.es-94000aea.js';
 import 'perf_hooks';
-import './diff-d87307c6.js';
+import './diff-a295cb37.js';
 import 'module';
 import 'worker_threads';
 import 'tinypool';
@@ -1700,8 +1700,9 @@ function execa(file, args, options) {
 	return mergePromise(spawned, handlePromiseOnce);
 }
 
-var version = "0.0.118";
+var version = "0.0.119";
 
+const CLOSE_TIMEOUT = 1e3;
 const cli = cac("vitest");
 cli.version(version).option("-r, --root <path>", "root path").option("-c, --config <path>", "path to config file").option("-u, --update", "update snapshot").option("-w, --watch", "watch mode").option("-o, --open", "open UI", { default: false }).option("-t, --testNamePattern <pattern>", "run test names with the specified pattern").option("--api", "listen to port and serve API").option("--threads", "enabled threads", { default: true }).option("--silent", "silent console output from tests").option("--reporter <name>", "reporter").option("--coverage", "use c8 for coverage").option("--run", "do not watch").option("--global", "inject apis globally").option("--dom", "mock browser api with happy-dom").option("--environment <env>", "runner environment", { default: "node" }).option("--passWithNoTests", "pass when no tests found").help();
 cli.command("run [...filters]").action(run);
@@ -1751,18 +1752,35 @@ async function run(cliFilters, options) {
       await ctx.close();
   }
   if (!ctx.config.watch) {
-    setTimeout(() => process.exit(), 1e3).unref();
+    setTimeout(() => process.exit(), CLOSE_TIMEOUT).unref();
   }
 }
+function closeServerAndExitProcess(ctx) {
+  const closePromise = ctx.close();
+  let timeout;
+  const timeoutPromise = new Promise((resolve, reject) => {
+    timeout = setTimeout(() => reject(new Error(`close timed out after ${CLOSE_TIMEOUT}ms`)), CLOSE_TIMEOUT);
+  });
+  Promise.race([closePromise, timeoutPromise]).then(() => {
+    clearTimeout(timeout);
+    process.exit(0);
+  }, (err) => {
+    clearTimeout(timeout);
+    console.error("error during close", err);
+    process.exit(1);
+  });
+}
 function registerConsoleShortcuts(ctx) {
   require$$0$1.emitKeypressEvents(process.stdin);
   process.stdin.setRawMode(true);
   process.stdin.on("keypress", (str, key) => {
-    if (str === "" || str === "" || key && key.ctrl && key.name === "c")
-      process.exit();
+    if (str === "" || str === "" || key && key.ctrl && key.name === "c") {
+      closeServerAndExitProcess(ctx);
+      return;
+    }
     if (ctx.runningPromise)
       return;
     if (ctx.isFirstRun)
-      process.exit();
+      closeServerAndExitProcess(ctx);
   });
 }

package/dist/{constants-56bfb5ab.js → constants-22bbd600.js}

@@ -1,5 +1,5 @@
 import { fileURLToPath } from 'url';
-import { k as resolve } from './index-80671389.js';
+import { k as resolve } from './index-090545ef.js';
 
 const distDir = resolve(fileURLToPath(import.meta.url), "../../dist");
 const defaultInclude = ["**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"];

package/dist/{diff-d87307c6.js → diff-a295cb37.js}

@@ -1,5 +1,5 @@
 import { existsSync, promises } from 'fs';
-import { o as notNullish, c, r as relative } from './index-80671389.js';
+import { o as notNullish, c, r as relative } from './index-090545ef.js';
 
 function Diff() {}
 Diff.prototype = {

package/dist/entry.js

@@ -1,13 +1,13 @@
 import fs, { promises } from 'fs';
-import { f as equals, h as iterableEquality, j as subsetEquality, k as isA, J as JestChaiExpect, l as clearContext, m as defaultSuite, n as setHooks, o as getHooks, p as context, s as setState, q as getFn, b as getState, e as vi } from './vi-85b65e90.js';
+import { f as equals, h as iterableEquality, j as subsetEquality, k as isA, J as JestChaiExpect, l as clearContext, m as defaultSuite, n as setHooks, o as getHooks, p as context, s as setState, q as getFn, b as getState, e as vi } from './vi-092f86e3.js';
 import { Console } from 'console';
 import { Writable } from 'stream';
 import { importModule } from 'local-pkg';
 import chai$1, { expect, util } from 'chai';
 import { a as commonjsRequire, c as commonjsGlobal } from './_commonjsHelpers-c9e3b764.js';
-import { q as index, s as slash, u as getNames, c as c$1, t as toArray, r as relative, v as partitionSuiteChildren, w as hasTests, h as hasFailed } from './index-80671389.js';
+import { u as index, s as slash, v as getNames, c as c$1, t as toArray, r as relative, w as partitionSuiteChildren, x as hasTests, h as hasFailed } from './index-090545ef.js';
 import { r as rpc } from './rpc-8c7cc374.js';
-import { l as getOriginalPos, m as posToNumber, n as parseStack, u as unifiedDiff } from './diff-d87307c6.js';
+import { l as getOriginalPos, m as posToNumber, n as parseStack, u as unifiedDiff } from './diff-a295cb37.js';
 import { performance } from 'perf_hooks';
 import { createHash } from 'crypto';
 import { format as format$1 } from 'util';
@@ -3532,7 +3532,7 @@ async function setupGlobalEnv(config) {
   setupConsoleLogSpy();
   await setupChai();
   if (config.global)
-    (await import('./global-fc93e939.js')).registerApiGlobally();
+    (await import('./global-8f03a13e.js')).registerApiGlobally();
 }
 function setupConsoleLogSpy() {
   const stdout = new Writable({
@@ -3663,28 +3663,32 @@ async function collectTests(paths, config) {
       process.stdout.write("\0");
     }
     calculateHash(file);
+    interpretTaskModes(file, config.testNamePattern);
     files.push(file);
   }
-  interpretTaskModes(files, config.testNamePattern);
   return files;
 }
-function interpretTaskModes(tasks, namePattern) {
-  if (tasks.some((t) => t.mode === "only")) {
-    tasks.forEach((t) => {
-      if (t.mode === "run")
+function interpretTaskModes(suite, namePattern, onlyMode) {
+  if (onlyMode === void 0)
+    onlyMode = someTasksAreOnly(suite);
+  suite.tasks.forEach((t) => {
+    if (onlyMode) {
+      if (t.type === "suite" && someTasksAreOnly(t)) {
+        if (t.mode === "only")
+          t.mode = "run";
+        interpretTaskModes(t, namePattern, onlyMode);
+      } else if (t.mode === "run") {
         t.mode = "skip";
-      else if (t.mode === "only")
+      } else if (t.mode === "only") {
         t.mode = "run";
-    });
-  }
-  tasks.forEach((t) => {
+      }
+    }
     if (t.type === "test") {
       if (namePattern && !t.name.match(namePattern))
         t.mode = "skip";
     } else if (t.type === "suite") {
       if (t.mode === "skip")
-        t.tasks.forEach((c) => c.mode === "run" && (c.mode = "skip"));
-      interpretTaskModes(t.tasks, namePattern);
+        skipAllTasks(t);
       if (t.mode === "run") {
         if (t.tasks.every((i) => i.mode !== "run"))
           t.mode = "skip";
@@ -3692,6 +3696,18 @@ function interpretTaskModes(tasks, namePattern) {
     }
   });
 }
+function someTasksAreOnly(suite) {
+  return suite.tasks.some((t) => t.mode === "only" || t.type === "suite" && someTasksAreOnly(t));
+}
+function skipAllTasks(suite) {
+  suite.tasks.forEach((t) => {
+    if (t.mode === "run") {
+      t.mode = "skip";
+      if (t.type === "suite")
+        skipAllTasks(t);
+    }
+  });
+}
 function calculateHash(parent) {
   parent.tasks.forEach((t, idx) => {
     t.id = `${parent.id}_${idx}`;

package/dist/{global-fc93e939.js → global-8f03a13e.js}

@@ -1,11 +1,11 @@
-import { g as globalApis } from './constants-56bfb5ab.js';
-import { i as index } from './index-be3cc31e.js';
+import { g as globalApis } from './constants-22bbd600.js';
+import { i as index } from './index-31a38185.js';
 import 'url';
-import './index-80671389.js';
+import './index-090545ef.js';
 import 'tty';
 import 'local-pkg';
 import 'path';
-import './vi-85b65e90.js';
+import './vi-092f86e3.js';
 import './_commonjsHelpers-c9e3b764.js';
 import './jest-mock-4a754991.js';
 import 'chai';

package/dist/{index-80671389.js → index-090545ef.js}

@@ -365,4 +365,4 @@ function toFilePath(id, root) {
   return isWindows && absolute.startsWith("/") ? fileURLToPath(pathToFileURL(absolute.slice(1)).href) : absolute;
 }
 
-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, 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, join as q, relative as r, slash as s, toArray as t, index as u, getNames as v, partitionSuiteChildren as w, hasTests as x, isWindows as y, getTasks as z };

package/dist/{index-be3cc31e.js → index-31a38185.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-85b65e90.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-092f86e3.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-62869b66.js → index-478354a1.js}

@@ -1,4 +1,4 @@
-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-80671389.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-090545ef.js';
 import { createServer, mergeConfig } from 'vite';
 import path$a from 'path';
 import process$1 from 'process';
@@ -7,10 +7,10 @@ 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-56bfb5ab.js';
+import { d as defaultInclude, a as defaultExclude, b as defaultPort, c as distDir, e as configFiles } from './constants-22bbd600.js';
 import MagicString from './magic-string.es-94000aea.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-d87307c6.js';
+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-a295cb37.js';
 import { o as onetime, s as signalExit } from './index-648e7ab2.js';
 import { createRequire } from 'module';
 import { pathToFileURL } from 'url';
@@ -7873,7 +7873,7 @@ function resolveC8Options(options, root) {
 }
 async function cleanCoverage(options, clean = true) {
   if (clean && existsSync(options.reportsDirectory))
-    await promises.rmdir(options.reportsDirectory, { recursive: true });
+    await promises.rm(options.reportsDirectory, { recursive: true, force: true });
   if (!existsSync(options.tempDirectory))
     await promises.mkdir(options.tempDirectory, { recursive: true });
 }
@@ -7881,13 +7881,11 @@ const require2 = createRequire(import.meta.url);
 async function reportCoverage(ctx) {
   const createReport = require2("c8/lib/report");
   const report = createReport(ctx.config.coverage);
-  await report.getCoverageMapFromAllCoverageFiles();
   Array.from(ctx.visitedFilesMap.entries()).filter((i) => !i[0].includes("/node_modules/")).forEach(([file, map]) => {
     const url = pathToFileURL(file).href;
+    const sources = map.sources.length ? map.sources.map((i) => pathToFileURL(i).href) : [url];
     report.sourceMapCache[url] = {
-      data: __spreadProps$1(__spreadValues$1({}, map), {
-        sources: map.sources.map((i) => pathToFileURL(i).href) || [url]
-      })
+      data: __spreadProps$1(__spreadValues$1({}, map), { sources })
     };
   });
   await report.run();
@@ -8004,10 +8002,24 @@ async function _transformRequest(ctx, id) {
     if (result)
       result = await ctx.server.ssrTransform(result.code, result.map, id);
   }
+  if (result)
+    withInlineSourcemap(result);
   if ((result == null ? void 0 : result.map) && process.env.NODE_V8_COVERAGE)
     ctx.visitedFilesMap.set(toFilePath(id, ctx.config.root), result.map);
   return result;
 }
+let SOURCEMAPPING_URL = "sourceMa";
+SOURCEMAPPING_URL += "ppingURL";
+async function withInlineSourcemap(result) {
+  const { code, map } = result;
+  if (code.includes(`${SOURCEMAPPING_URL}=`))
+    return result;
+  if (map)
+    result.code = `${code}
+
+//# ${SOURCEMAPPING_URL}=data:application/json;charset=utf-8;base64,${Buffer.from(JSON.stringify(map), "utf-8").toString("base64")}`;
+  return result;
+}
 
 function createPool(ctx) {
   if (ctx.config.threads)
@@ -8289,8 +8301,17 @@ class Vitest {
   }
   async close() {
     var _a;
-    await ((_a = this.pool) == null ? void 0 : _a.close());
-    await this.server.close();
+    if (!this.closingPromise) {
+      this.closingPromise = Promise.allSettled([
+        (_a = this.pool) == null ? void 0 : _a.close(),
+        this.server.close()
+      ].filter(Boolean)).then((results) => {
+        results.filter((r) => r.status === "rejected").forEach((err) => {
+          this.error("error during close", err.reason);
+        });
+      });
+    }
+    return this.closingPromise;
   }
   async report(name, ...args) {
     await Promise.all(this.reporters.map((r) => {
@@ -8336,7 +8357,7 @@ async function createVitest(options, viteOverrides = {}) {
           await ctx.setServer(options, server2);
           haveStarted = true;
           if (options.api)
-            (await import('./setup-b87afd31.js')).setup(ctx);
+            (await import('./setup-638014f2.js')).setup(ctx);
         }
       },
       MocksPlugin()

package/dist/index.d.ts

@@ -204,6 +204,7 @@ declare class Vitest {
     changedTests: Set<string>;
     visitedFilesMap: Map<string, RawSourceMap>;
     runningPromise?: Promise<void>;
+    closingPromise?: Promise<void>;
     isFirstRun: boolean;
     restartsCount: number;
     private _onRestartListeners;

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-85b65e90.js';
-export { a as afterAll, d as afterEach, b as beforeAll, c as beforeEach, e as expect } from './index-be3cc31e.js';
+export { d as describe, i as it, c as suite, t as test, e as vi, v as vitest } from './vi-092f86e3.js';
+export { a as afterAll, d as afterEach, b as beforeAll, c as beforeEach, e as expect } from './index-31a38185.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-80671389.js';
+import './index-090545ef.js';
 import 'url';
 import 'tty';
 import 'local-pkg';

package/dist/node.d.ts

@@ -440,6 +440,7 @@ declare class Vitest {
     changedTests: Set<string>;
     visitedFilesMap: Map<string, RawSourceMap>;
     runningPromise?: Promise<void>;
+    closingPromise?: Promise<void>;
     isFirstRun: boolean;
     restartsCount: number;
     private _onRestartListeners;

package/dist/node.js

@@ -1,5 +1,5 @@
-export { c as createVitest } from './index-62869b66.js';
-import './index-80671389.js';
+export { c as createVitest } from './index-478354a1.js';
+import './index-090545ef.js';
 import 'url';
 import 'tty';
 import 'local-pkg';
@@ -11,10 +11,10 @@ import 'os';
 import 'util';
 import 'stream';
 import 'events';
-import './constants-56bfb5ab.js';
+import './constants-22bbd600.js';
 import './magic-string.es-94000aea.js';
 import 'perf_hooks';
-import './diff-d87307c6.js';
+import './diff-a295cb37.js';
 import './index-648e7ab2.js';
 import './_commonjsHelpers-c9e3b764.js';
 import 'assert';

package/dist/{setup-b87afd31.js → setup-638014f2.js}

@@ -9,8 +9,8 @@ import require$$2 from 'events';
 import require$$1 from 'https';
 import require$$2$1 from 'http';
 import require$$7 from 'url';
-import { A as API_PATH } from './constants-56bfb5ab.js';
-import './index-80671389.js';
+import { A as API_PATH } from './constants-22bbd600.js';
+import './index-090545ef.js';
 import 'tty';
 import 'local-pkg';
 import 'path';

package/dist/utils.js

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

package/dist/{vi-85b65e90.js → vi-092f86e3.js}

@@ -1,4 +1,4 @@
-import { n as noop, i as isObject } from './index-80671389.js';
+import { n as noop, i as isObject } from './index-090545ef.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';
 

package/dist/worker.js

@@ -1,6 +1,6 @@
-import { k as resolve, d as dirname$2, b as basename$2, p as mergeSlashes, s as slash, m as toFilePath } from './index-80671389.js';
+import { d as dirname$2, b as basename$2, k as resolve, p as mergeSlashes, q as join$2, s as slash, m as toFilePath } from './index-090545ef.js';
 import { c as createBirpc } from './index-e909c175.js';
-import { c as distDir } from './constants-56bfb5ab.js';
+import { c as distDir } from './constants-22bbd600.js';
 import { builtinModules, createRequire } from 'module';
 import { pathToFileURL, fileURLToPath as fileURLToPath$2, URL as URL$1 } from 'url';
 import vm from 'vm';
@@ -9218,13 +9218,15 @@ var __spreadValues = (a, b) => {
 };
 function resolveMockPath(mockPath, root, nmName) {
   if (nmName) {
-    const mockFolder = resolve(root, "__mocks__");
+    const mockDirname = dirname$2(nmName);
+    const baseFilename = basename$2(nmName);
+    const mockFolder = resolve(root, "__mocks__", mockDirname);
     if (!existsSync(mockFolder))
       return null;
     const files = readdirSync(mockFolder);
     for (const file of files) {
       const [basename2] = file.split(".");
-      if (basename2 === nmName)
+      if (basename2 === baseFilename)
         return resolve(mockFolder, file).replace(root, "");
     }
     return null;
@@ -9306,6 +9308,11 @@ function createMocker(root, mockMap) {
         s.mockClear();
     });
   }
+  function resolveDependency(dep) {
+    if (dep.startsWith("/node_modules/"))
+      return mergeSlashes(`/@fs/${join$2(root, dep)}`);
+    return dep;
+  }
   return {
     mockPath,
     unmockPath,
@@ -9313,7 +9320,8 @@ function createMocker(root, mockMap) {
     getActualPath,
     mockObject,
     getSuiteFilepath,
-    resolveMockPath
+    resolveMockPath,
+    resolveDependency
   };
 }
 
@@ -9374,7 +9382,8 @@ async function executeInViteNode(options) {
     mockPath,
     clearMocks,
     unmockPath,
-    resolveMockPath
+    resolveMockPath,
+    resolveDependency
   } = createMocker(root, mockMap);
   const result = [];
   for (const file of files)
@@ -9397,7 +9406,7 @@ async function executeInViteNode(options) {
       var _a;
       if (canMock) {
         const mocks2 = mockMap[suite || ""] || {};
-        const mock = mocks2[dep];
+        const mock = mocks2[resolveDependency(dep)];
         if (typeof mock === "function")
           return callFunctionMock(dep, mock);
         if (typeof mock === "string")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.0.118",
+  "version": "0.0.119",
   "description": "A blazing fast unit test framework powered by Vite",
   "keywords": [
     "vite",