vitest 0.31.0 → 0.31.2

package/dist/{vendor-cli-api.de0530cb.js → vendor-cli-api.35332ab3.js}

@@ -25,7 +25,7 @@ import { ViteNodeServer } from 'vite-node/server';
 import { d as distDir, r as rootDir } from './vendor-paths.84fc7a99.js';
 import v8 from 'node:v8';
 import { fork } from 'node:child_process';
-import { g as groupBy, a as getEnvironmentTransformMode, c as createBirpc, A as AggregateErrorPonyfill, s as slash$1, t as toArray, i as isPrimitive, d as deepMerge, n as noop$1, b as stdout } from './vendor-index.7dcbfa46.js';
+import { g as groupBy, a as getEnvironmentTransformMode, c as createBirpc, A as AggregateErrorPonyfill, s as slash$1, t as toArray, i as isPrimitive, d as deepMerge, n as noop$1, b as stdout } from './vendor-index.5037f2c0.js';
 import { MessageChannel } from 'node:worker_threads';
 import { cpus, hostname } from 'node:os';
 import Tinypool from 'tinypool';
@@ -60,7 +60,7 @@ function _mergeNamespaces(n, m) {
   return Object.freeze(n);
 }
 
-var version$1 = "0.31.0";
+var version$1 = "0.31.2";
 
 const __dirname$1 = url.fileURLToPath(new URL(".", import.meta.url));
 async function ensurePackageInstalled(dependency, root) {
@@ -79,7 +79,7 @@ async function ensurePackageInstalled(dependency, root) {
     message: c.reset(`Do you want to install ${c.green(dependency)}?`)
   });
   if (install) {
-    await (await import('./chunk-install-pkg.e0e70dba.js')).installPackage(dependency, { dev: true });
+    await (await import('./chunk-install-pkg.4207d842.js')).installPackage(dependency, { dev: true });
     process.stderr.write(c.yellow(`
 Package ${dependency} installed, re-run the command to start.
 `));
@@ -7301,10 +7301,22 @@ function createThreadsPool(ctx, { execArgv, env }) {
 
 function createBrowserPool(ctx) {
   const providers = /* @__PURE__ */ new Set();
-  const waitForTest = (id) => {
+  const waitForTest = async (provider, id) => {
     const defer = createDefer();
     ctx.state.browserTestPromises.set(id, defer);
-    return defer;
+    const off = provider.catchError((error) => {
+      if (id !== "no-isolate") {
+        Object.defineProperty(error, "VITEST_TEST_PATH", {
+          value: id
+        });
+      }
+      defer.reject(error);
+    });
+    try {
+      return await defer;
+    } finally {
+      off();
+    }
   };
   const runTests = async (project, files) => {
     var _a;
@@ -7328,14 +7340,14 @@ function createBrowserPool(ctx) {
         url.searchParams.append("path", path);
         url.searchParams.set("id", path);
         await provider.openPage(url.toString());
-        await waitForTest(path);
+        await waitForTest(provider, path);
       }
     } else {
       const url = new URL("/", origin);
       url.searchParams.set("id", "no-isolate");
       paths.forEach((path) => url.searchParams.append("path", path));
       await provider.openPage(url.toString());
-      await waitForTest("no-isolate");
+      await waitForTest(provider, "no-isolate");
     }
   };
   const runWorkspaceTests = async (specs) => {
@@ -9056,35 +9068,54 @@ function getIcon(task) {
       return pending;
   }
 }
-function render(tasks) {
+function render(tasks, width) {
   const all = getTests(tasks);
-  const output = [];
   let currentIcon = pending;
   let currentTasks = 0;
-  const addOutput = () => output.push(currentIcon.color(currentIcon.char.repeat(currentTasks)));
+  let previousLineWidth = 0;
+  let output = "";
+  const addOutput = () => {
+    const { char, color } = currentIcon;
+    const availableWidth = width - previousLineWidth;
+    if (availableWidth > currentTasks) {
+      output += color(char.repeat(currentTasks));
+      previousLineWidth += currentTasks;
+    } else {
+      let buf = `${char.repeat(availableWidth)}
+`;
+      const remaining = currentTasks - availableWidth;
+      const fullRows = Math.floor(remaining / width);
+      buf += `${char.repeat(width)}
+`.repeat(fullRows);
+      const partialRow = remaining % width;
+      if (partialRow > 0) {
+        buf += char.repeat(partialRow);
+        previousLineWidth = partialRow;
+      } else {
+        previousLineWidth = 0;
+      }
+      output += color(buf);
+    }
+  };
   for (const task of all) {
     const icon = getIcon(task);
-    const isLast = all.indexOf(task) === all.length - 1;
     if (icon === currentIcon) {
       currentTasks++;
-      if (isLast)
-        addOutput();
       continue;
     }
     addOutput();
     currentTasks = 1;
     currentIcon = icon;
-    if (isLast)
-      addOutput();
   }
-  return output.join("");
+  addOutput();
+  return output;
 }
 function createDotRenderer(_tasks, options) {
   let tasks = _tasks;
   let timer;
-  const log = options.logger.logUpdate;
+  const { logUpdate: log, outputStream } = options.logger;
   function update() {
-    log(render(tasks));
+    log(render(tasks, outputStream.columns));
   }
   return {
     start() {
@@ -9103,7 +9134,7 @@ function createDotRenderer(_tasks, options) {
         timer = void 0;
       }
       log.clear();
-      options.logger.log(render(tasks));
+      options.logger.log(render(tasks, outputStream.columns));
       return this;
     },
     clear() {
@@ -9466,6 +9497,7 @@ class JUnitReporter {
       if (!existsSync(outputDirectory))
         await promises.mkdir(outputDirectory, { recursive: true });
       const fileFd = await promises.open(this.reportFile, "w+");
+      this.fileFd = fileFd;
       this.baseLog = async (text) => await promises.writeFile(fileFd, `${text}
 `);
     } else {
@@ -9541,14 +9573,15 @@ class JUnitReporter {
     }
   }
   async onFinished(files = this.ctx.state.getFiles()) {
+    var _a;
     await this.logger.log('<?xml version="1.0" encoding="UTF-8" ?>');
     const transformed = files.map((file) => {
       const tasks = file.tasks.flatMap((task) => flattenTasks$1(task));
       const stats2 = tasks.reduce(
         (stats3, task) => {
-          var _a, _b;
+          var _a2, _b;
           return {
-            passed: stats3.passed + Number(((_a = task.result) == null ? void 0 : _a.state) === "pass"),
+            passed: stats3.passed + Number(((_a2 = task.result) == null ? void 0 : _a2.state) === "pass"),
             failures: stats3.failures + Number(((_b = task.result) == null ? void 0 : _b.state) === "fail"),
             skipped: stats3.skipped + Number(task.mode === "skip" || task.mode === "todo")
           };
@@ -9596,6 +9629,7 @@ class JUnitReporter {
     });
     if (this.reportFile)
       this.ctx.logger.log(`JUNIT report written to ${this.reportFile}`);
+    await ((_a = this.fileFd) == null ? void 0 : _a.close());
   }
 }
 
@@ -9994,7 +10028,10 @@ class StateManager {
   catchError(err, type) {
     if (isAggregateError(err))
       return err.errors.forEach((error) => this.catchError(error, type));
-    err.type = type;
+    if (err === Object(err))
+      err.type = type;
+    else
+      err = { type, message: err };
     this.errorsSet.add(err);
   }
   clearErrors() {
@@ -10063,9 +10100,12 @@ class StateManager {
     }
   }
   updateTasks(packs) {
-    for (const [id, result] of packs) {
-      if (this.idMap.has(id))
-        this.idMap.get(id).result = result;
+    for (const [id, result, meta] of packs) {
+      const task = this.idMap.get(id);
+      if (task) {
+        task.result = result;
+        task.meta = meta;
+      }
     }
   }
   updateUserLog(log) {
@@ -10092,6 +10132,7 @@ class StateManager {
       result: {
         state: "skip"
       },
+      meta: {},
       // Cancelled files have not yet collected tests
       tasks: []
     })));
@@ -10127,6 +10168,7 @@ const coverageConfigDefaults = {
   cleanOnRerun: true,
   reportsDirectory: "./coverage",
   exclude: defaultCoverageExcludes,
+  reportOnFailure: true,
   reporter: [["text", {}], ["html", {}], ["clover", {}], ["json", {}]],
   // default extensions used by c8, plus '.vue' and '.svelte'
   // see https://github.com/istanbuljs/schema/blob/master/default-extension.js
@@ -10406,7 +10448,7 @@ function resolveApiServerConfig(options) {
   return api;
 }
 function resolveConfig(mode, options, viteConfig) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   if (options.dom) {
     if (((_a = viteConfig.test) == null ? void 0 : _a.environment) != null && viteConfig.test.environment !== "happy-dom") {
       console.warn(
@@ -10458,10 +10500,18 @@ function resolveConfig(mode, options, viteConfig) {
       resolved.deps.inline.push(...extraInlineDeps);
     }
   }
+  (_c = resolved.deps).moduleDirectories ?? (_c.moduleDirectories = ["/node_modules/"]);
+  resolved.deps.moduleDirectories = resolved.deps.moduleDirectories.map((dir) => {
+    if (!dir.startsWith("/"))
+      dir = `/${dir}`;
+    if (!dir.endsWith("/"))
+      dir += "/";
+    return normalize(dir);
+  });
   if (resolved.runner) {
     resolved.runner = resolveModule(resolved.runner, { paths: [resolved.root] }) ?? resolve$2(resolved.root, resolved.runner);
   }
-  (_c = resolved.deps).registerNodeLoader ?? (_c.registerNodeLoader = false);
+  (_d = resolved.deps).registerNodeLoader ?? (_d.registerNodeLoader = false);
   resolved.testNamePattern = resolved.testNamePattern ? resolved.testNamePattern instanceof RegExp ? resolved.testNamePattern : new RegExp(resolved.testNamePattern) : void 0;
   const UPDATE_SNAPSHOT = resolved.update || process.env.UPDATE_SNAPSHOT;
   resolved.snapshotOptions = {
@@ -10526,19 +10576,19 @@ function resolveConfig(mode, options, viteConfig) {
     resolved.passWithNoTests ?? (resolved.passWithNoTests = true);
   resolved.css ?? (resolved.css = {});
   if (typeof resolved.css === "object") {
-    (_d = resolved.css).modules ?? (_d.modules = {});
-    (_e = resolved.css.modules).classNameStrategy ?? (_e.classNameStrategy = "stable");
+    (_e = resolved.css).modules ?? (_e.modules = {});
+    (_f = resolved.css.modules).classNameStrategy ?? (_f.classNameStrategy = "stable");
   }
   resolved.cache ?? (resolved.cache = { dir: "" });
   if (resolved.cache)
     resolved.cache.dir = VitestCache.resolveCacheDir(resolved.root, resolved.cache.dir);
   resolved.sequence ?? (resolved.sequence = {});
-  if (!((_f = resolved.sequence) == null ? void 0 : _f.sequencer)) {
+  if (!((_g = resolved.sequence) == null ? void 0 : _g.sequencer)) {
     resolved.sequence.sequencer = resolved.sequence.shuffle ? RandomSequencer : BaseSequencer;
   }
-  (_g = resolved.sequence).hooks ?? (_g.hooks = "parallel");
+  (_h = resolved.sequence).hooks ?? (_h.hooks = "parallel");
   if (resolved.sequence.sequencer === RandomSequencer)
-    (_h = resolved.sequence).seed ?? (_h.seed = Date.now());
+    (_i = resolved.sequence).seed ?? (_i.seed = Date.now());
   resolved.typecheck = {
     ...configDefaults.typecheck,
     ...resolved.typecheck
@@ -10549,9 +10599,9 @@ function resolveConfig(mode, options, viteConfig) {
     resolved.exclude = resolved.typecheck.exclude;
   }
   resolved.browser ?? (resolved.browser = {});
-  (_i = resolved.browser).enabled ?? (_i.enabled = false);
-  (_j = resolved.browser).headless ?? (_j.headless = isCI);
-  (_k = resolved.browser).slowHijackESM ?? (_k.slowHijackESM = true);
+  (_j = resolved.browser).enabled ?? (_j.enabled = false);
+  (_k = resolved.browser).headless ?? (_k.headless = isCI);
+  (_l = resolved.browser).slowHijackESM ?? (_l.slowHijackESM = true);
   resolved.browser.api = resolveApiServerConfig(resolved.browser) || {
     port: defaultBrowserPort
   };
@@ -11110,7 +11160,7 @@ createLogUpdate(process$1.stdout);
 
 createLogUpdate(process$1.stderr);
 
-var version = "0.31.0";
+var version = "0.31.2";
 
 const comma = ','.charCodeAt(0);
 const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
@@ -11778,9 +11828,9 @@ async function makeTscErrorInfo(errInfo) {
   ];
 }
 async function getTsconfig(root, config) {
-  var _a;
-  const configName = ((_a = config.tsconfig) == null ? void 0 : _a.includes("jsconfig.json")) ? "jsconfig.json" : void 0;
-  const tsconfig = kn(config.tsconfig || root, configName);
+  const configName = config.tsconfig ? basename(config.tsconfig) : void 0;
+  const configSearchPath = config.tsconfig ? dirname(resolve$2(root, config.tsconfig)) : root;
+  const tsconfig = kn(configSearchPath, configName);
   if (!tsconfig)
     throw new Error("no tsconfig.json found");
   const tempConfigPath = join(dirname(tsconfig.path), "tsconfig.vitest-temp.json");
@@ -11980,6 +12030,7 @@ class Typechecker {
       files: [],
       sourceErrors: []
     };
+    this._output = "";
     this._tests = {};
   }
   onParseStart(fn) {
@@ -12139,6 +12190,13 @@ class Typechecker {
     this.tempConfigPath = path;
     this.allowJs = typecheck.allowJs || config.allowJs || false;
   }
+  getExitCode() {
+    var _a;
+    return ((_a = this.process) == null ? void 0 : _a.exitCode) != null && this.process.exitCode;
+  }
+  getOutput() {
+    return this._output;
+  }
   async start() {
     var _a, _b, _c;
     if (!this.tempConfigPath)
@@ -12149,7 +12207,7 @@ class Typechecker {
       args.push("--watch");
     if (typecheck.allowJs)
       args.push("--allowJs", "--checkJs");
-    let output = "";
+    this._output = "";
     const child = execa(typecheck.checker, args, {
       cwd: root,
       stdout: "pipe",
@@ -12160,29 +12218,29 @@ class Typechecker {
     let rerunTriggered = false;
     (_b = child.stdout) == null ? void 0 : _b.on("data", (chunk) => {
       var _a2;
-      output += chunk;
+      this._output += chunk;
       if (!watch)
         return;
-      if (output.includes("File change detected") && !rerunTriggered) {
+      if (this._output.includes("File change detected") && !rerunTriggered) {
         (_a2 = this._onWatcherRerun) == null ? void 0 : _a2.call(this);
         this._result.sourceErrors = [];
         this._result.files = [];
         this._tests = null;
         rerunTriggered = true;
       }
-      if (/Found \w+ errors*. Watching for/.test(output)) {
+      if (/Found \w+ errors*. Watching for/.test(this._output)) {
         rerunTriggered = false;
-        this.prepareResults(output).then((result) => {
+        this.prepareResults(this._output).then((result) => {
           var _a3;
           this._result = result;
           (_a3 = this._onParseEnd) == null ? void 0 : _a3.call(this, result);
         });
-        output = "";
+        this._output = "";
       }
     });
     if (!watch) {
       await child;
-      this._result = await this.prepareResults(output);
+      this._result = await this.prepareResults(this._output);
       await ((_c = this._onParseEnd) == null ? void 0 : _c.call(this, this._result));
     }
   }
@@ -12193,7 +12251,7 @@ class Typechecker {
     return Object.values(this._tests || {}).map((i) => i.file);
   }
   getTestPacks() {
-    return Object.values(this._tests || {}).map(({ file }) => getTasks(file)).flat().map((i) => [i.id, void 0]);
+    return Object.values(this._tests || {}).map(({ file }) => getTasks(file)).flat().map((i) => [i.id, void 0, { typecheck: true }]);
   }
 }
 
@@ -12223,13 +12281,15 @@ async function printError(error, ctx, options = {}) {
   if (type)
     printErrorType(type, ctx);
   printErrorMessage(e, ctx.logger);
+  if (e.diff)
+    displayDiff(e.diff, ctx.logger.console);
   if (e.frame) {
     ctx.logger.error(c.yellow(e.frame));
   } else {
     printStack(ctx, stacks, nearest, errorProperties, (s) => {
       if (showCodeFrame && s === nearest && nearest) {
         const sourceCode = readFileSync(nearest.file, "utf-8");
-        ctx.logger.error(c.yellow(generateCodeFrame(sourceCode, 4, s.line, s.column)));
+        ctx.logger.error(generateCodeFrame(sourceCode, 4, s.line, s.column));
       }
     });
   }
@@ -12251,8 +12311,6 @@ async function printError(error, ctx, options = {}) {
     await printError(e.cause, ctx, { fullStack, showCodeFrame: false });
   }
   handleImportOutsideModuleError(e.stack || e.stackStr || "", ctx);
-  if (e.diff)
-    displayDiff(e.diff, ctx.logger.console);
 }
 function printErrorType(type, ctx) {
   ctx.logger.error(`
@@ -12327,7 +12385,9 @@ function printModuleWarningForSourceCode(logger, path) {
   ));
 }
 function displayDiff(diff, console) {
-  console.error(diff);
+  console.error(`
+${diff}
+`);
 }
 function printErrorMessage(error, logger) {
   const errorName = error.name || error.nameStr || "Unknown Error";
@@ -12336,9 +12396,9 @@ function printErrorMessage(error, logger) {
 function printStack(ctx, stack, highlight, errorProperties, onStack) {
   const logger = ctx.logger;
   for (const frame of stack) {
-    const color = frame === highlight ? c.yellow : c.gray;
+    const color = frame === highlight ? c.cyan : c.gray;
     const path = relative(ctx.config.root, frame.file);
-    logger.error(color(` ${c.dim(F_POINTER)} ${[frame.method, c.dim(`${path}:${frame.line}:${frame.column}`)].filter(Boolean).join(" ")}`));
+    logger.error(color(` ${c.dim(F_POINTER)} ${[frame.method, `${path}:${c.dim(`${frame.line}:${frame.column}`)}`].filter(Boolean).join(" ")}`));
     onStack == null ? void 0 : onStack(frame);
   }
   if (stack.length)
@@ -12691,7 +12751,7 @@ async function createBrowserServer(project, options) {
   });
   await server.listen();
   await server.watcher.close();
-  (await import('./chunk-api-setup.df3106cd.js')).setup(project, server);
+  (await import('./chunk-api-setup.3854747a.js')).setup(project, server);
   return server;
 }
 
@@ -12723,6 +12783,14 @@ class PlaywrightBrowserProvider {
     });
     return this.cachedBrowser;
   }
+  catchError(cb) {
+    var _a;
+    (_a = this.cachedBrowser) == null ? void 0 : _a.on("pageerror", cb);
+    return () => {
+      var _a2;
+      (_a2 = this.cachedBrowser) == null ? void 0 : _a2.off("pageerror", cb);
+    };
+  }
   async openPage(url) {
     const browserInstance = await this.openBrowser();
     await browserInstance.goto(url);
@@ -12780,6 +12848,11 @@ class WebdriverBrowserProvider {
     const browserInstance = await this.openBrowser();
     await browserInstance.url(url);
   }
+  // TODO
+  catchError(_cb) {
+    return () => {
+    };
+  }
   async close() {
     var _a, _b, _c;
     await Promise.all([
@@ -13132,9 +13205,9 @@ class WorkspaceProject {
     return this.ctx.reporters;
   }
   async globTestFiles(filters = []) {
-    const { dir, root } = this.config;
-    const testFiles = await this.globAllTestFiles(this.config, dir || root);
-    return this.filterFiles(testFiles, filters);
+    const dir = this.config.dir || this.config.root;
+    const testFiles = await this.globAllTestFiles(this.config, dir);
+    return this.filterFiles(testFiles, filters, dir);
   }
   async globAllTestFiles(config, cwd) {
     const { include, exclude, includeSource } = config;
@@ -13178,11 +13251,17 @@ class WorkspaceProject {
   isInSourceTestFile(code) {
     return code.includes("import.meta.vitest");
   }
-  filterFiles(testFiles, filters = []) {
+  filterFiles(testFiles, filters = [], dir) {
     if (filters.length && process.platform === "win32")
       filters = filters.map((f) => toNamespacedPath(f));
-    if (filters.length)
-      return testFiles.filter((i) => filters.some((f) => i.includes(f)));
+    if (filters.length) {
+      return testFiles.filter((t) => {
+        const testFile = relative(dir, t);
+        return filters.some((f) => {
+          return testFile.includes(f) || testFile.includes(relative(dir, f));
+        });
+      });
+    }
     return testFiles;
   }
   async initBrowserServer(options) {
@@ -13213,19 +13292,27 @@ class WorkspaceProject {
     return this.ctx.report(name, ...args);
   }
   async typecheck(filters = []) {
-    const { dir, root } = this.config;
+    const dir = this.config.dir || this.config.root;
     const { include, exclude } = this.config.typecheck;
-    const testsFilesList = this.filterFiles(await this.globFiles(include, exclude, dir || root), filters);
+    const testFiles = await this.globFiles(include, exclude, dir);
+    const testsFilesList = this.filterFiles(testFiles, filters, dir);
     const checker = new Typechecker(this, testsFilesList);
     this.typechecker = checker;
     checker.onParseEnd(async ({ files, sourceErrors }) => {
       this.ctx.state.collectFiles(checker.getTestFiles());
       await this.report("onTaskUpdate", checker.getTestPacks());
       await this.report("onCollected");
+      const failedTests = hasFailed(files);
+      const exitCode = !failedTests && checker.getExitCode();
+      if (exitCode) {
+        const error = new Error(checker.getOutput());
+        error.stack = "";
+        this.ctx.state.catchError(error, "Typecheck Error");
+      }
       if (!files.length) {
         this.ctx.logger.printNoTestFound();
       } else {
-        if (hasFailed(files))
+        if (failedTests)
           process.exitCode = 1;
         await this.report("onFinished", files);
       }
@@ -13234,8 +13321,9 @@ class WorkspaceProject {
         await this.ctx.logger.printSourceTypeErrors(sourceErrors);
       }
       if (!files.length) {
-        const exitCode = this.config.passWithNoTests ? process.exitCode ?? 0 : 1;
-        process.exit(exitCode);
+        const exitCode2 = this.config.passWithNoTests ? process.exitCode ?? 0 : 1;
+        await this.close();
+        process.exit(exitCode2);
       }
       if (this.config.watch) {
         await this.report("onWatcherStart", files, [
@@ -13521,10 +13609,13 @@ class Vitest {
       await this.typecheck(filters);
       return;
     }
-    await this.report("onInit", this);
-    await this.initCoverageProvider();
-    await ((_a = this.coverageProvider) == null ? void 0 : _a.clean(this.config.coverage.clean));
-    await this.initBrowserProviders();
+    try {
+      await this.initCoverageProvider();
+      await ((_a = this.coverageProvider) == null ? void 0 : _a.clean(this.config.coverage.clean));
+      await this.initBrowserProviders();
+    } finally {
+      await this.report("onInit", this);
+    }
     const files = await this.filterTestsBySource(
       await this.globTestFiles(filters)
     );
@@ -13822,21 +13913,21 @@ class Vitest {
     return files;
   }
   async reportCoverage(allTestsRun) {
+    if (!this.config.coverage.reportOnFailure && this.state.getCountOfFailedTests() > 0)
+      return;
     if (this.coverageProvider) {
       this.logger.log(c.blue(" % ") + c.dim("Coverage report from ") + c.yellow(this.coverageProvider.name));
       await this.coverageProvider.reportCoverage({ allTestsRun });
     }
   }
   async close() {
-    var _a;
     if (!this.closingPromise) {
-      const closePromises = this.projects.map((w) => w.close());
+      const closePromises = this.projects.map((w) => w.close().then(() => w.server = void 0));
       if (this.coreWorkspace && !this.projects.includes(this.coreWorkspace))
-        closePromises.push(this.server.close());
-      this.closingPromise = Promise.allSettled([
-        (_a = this.pool) == null ? void 0 : _a.close(),
-        ...closePromises
-      ].filter(Boolean)).then((results) => {
+        closePromises.push(this.server.close().then(() => this.server = void 0));
+      if (this.pool)
+        closePromises.push(this.pool.close().then(() => this.pool = void 0));
+      this.closingPromise = Promise.allSettled(closePromises).then((results) => {
         results.filter((r) => r.status === "rejected").forEach((err) => {
           this.logger.error("error during close", err.reason);
         });
@@ -13852,6 +13943,16 @@ class Vitest {
       this.report("onProcessTimeout").then(() => {
         console.warn(`close timed out after ${this.config.teardownTimeout}ms`);
         this.state.getProcessTimeoutCauses().forEach((cause) => console.warn(cause));
+        if (!this.pool) {
+          const runningServers = [this.server, ...this.projects.map((p) => p.server)].filter(Boolean).length;
+          if (runningServers === 1)
+            console.warn("Tests closed successfully but something prevents Vite server from exiting");
+          else if (runningServers > 1)
+            console.warn(`Tests closed successfully but something prevents ${runningServers} Vite servers from exiting`);
+          else
+            console.warn("Tests closed successfully but something prevents the main process from exiting");
+          console.warn('You can try to identify the cause by enabling "hanging-process" reporter. See https://vitest.dev/config/#reporters');
+        }
         process.exit();
       });
     }, this.config.teardownTimeout).unref();
@@ -14036,7 +14137,7 @@ async function VitestPlugin(options = {}, ctx = new Vitest("test")) {
         try {
           await ctx.setServer(options, server, userConfig);
           if (options.api && options.watch)
-            (await import('./chunk-api-setup.df3106cd.js')).setup(ctx);
+            (await import('./chunk-api-setup.3854747a.js')).setup(ctx);
         } catch (err) {
           await ctx.logger.printError(err, true);
           process.exit(1);
@@ -20347,27 +20448,33 @@ var index = /*#__PURE__*/_mergeNamespaces({
 }, [prompts]);
 
 const keys = [
-  ["a", "rerun all tests"],
+  [["a", "return"], "rerun all tests"],
+  ["r", "rerun current pattern tests"],
   ["f", "rerun only failed tests"],
   ["u", "update snapshot"],
   ["p", "filter by a filename"],
   ["t", "filter by a test name regex pattern"],
   ["q", "quit"]
 ];
-const cancelKeys = ["space", "c", ...keys.map((key) => key[0])];
+const cancelKeys = ["space", "c", ...keys.map((key) => key[0]).flat()];
 function printShortcutsHelp() {
   stdout().write(
     `
 ${c.bold("  Watch Usage")}
-${keys.map((i) => c.dim("  press ") + c.reset(c.bold(i[0])) + c.dim(` to ${i[1]}`)).join("\n")}
+${keys.map((i) => c.dim("  press ") + c.reset([i[0]].flat().map(c.bold).join(", ")) + c.dim(` to ${i[1]}`)).join("\n")}
 `
   );
 }
 function registerConsoleShortcuts(ctx) {
   let latestFilename = "";
   async function _keypressHandler(str, key) {
-    if (str === "" || str === "\x1B" || key && key.ctrl && key.name === "c")
+    if (str === "" || str === "\x1B" || key && key.ctrl && key.name === "c") {
+      if (!ctx.isCancelling) {
+        await ctx.cancelCurrentRun("keyboard-input");
+        await ctx.runningPromise;
+      }
       return ctx.exit(true);
+    }
     if (!isWindows && key && key.ctrl && key.name === "z") {
       process.kill(process.ppid, "SIGTSTP");
       process.kill(process.pid, "SIGTSTP");
@@ -20389,6 +20496,8 @@ function registerConsoleShortcuts(ctx) {
       return ctx.updateSnapshot();
     if (name === "a" || name === "return")
       return ctx.changeNamePattern("");
+    if (name === "r")
+      return ctx.rerunFiles();
     if (name === "f")
       return ctx.rerunFailed();
     if (name === "t")
@@ -20442,7 +20551,7 @@ function registerConsoleShortcuts(ctx) {
   on();
 }
 
-async function startVitest(mode, cliFilters, options, viteOverrides) {
+async function startVitest(mode, cliFilters = [], options = {}, viteOverrides) {
   var _a;
   process.env.TEST = "true";
   process.env.VITEST = "true";
@@ -20480,6 +20589,8 @@ async function startVitest(mode, cliFilters, options, viteOverrides) {
   }
   if (process.stdin.isTTY && ctx.config.watch)
     registerConsoleShortcuts(ctx);
+  else
+    process.on("SIGINT", () => ctx.cancelCurrentRun("keyboard-input"));
   ctx.onServerRestart((reason) => {
     ctx.report("onServerRestart", reason);
     if (process.env.VITEST_CLI_WRAPPER)