vitest 1.0.0-beta.4 → 1.0.0-beta.6

package/dist/config.js

@@ -76,7 +76,7 @@ const config = {
   api: false,
   ui: false,
   uiBase: "/__vitest__/",
-  open: true,
+  open: !isCI,
   css: {
     include: []
   },

package/dist/coverage.d.ts

@@ -1,4 +1,4 @@
-import { B as BaseCoverageOptions, a as ResolvedCoverageOptions } from './reporters-50c2bd49.js';
+import { B as BaseCoverageOptions, a as ResolvedCoverageOptions } from './reporters-vMlHjCdM.js';
 import 'vite';
 import '@vitest/runner';
 import 'vite-node';
@@ -14,12 +14,6 @@ import 'node:worker_threads';
 import 'node:fs';
 import 'chai';
 
-// Type definitions for istanbul-lib-coverage 2.0
-// Project: https://istanbul.js.org, https://github.com/istanbuljs/istanbuljs
-// Definitions by: Jason Cheatham <https://github.com/jason0x43>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
-
 interface CoverageSummaryData {
     lines: Totals;
     statements: Totals;
@@ -125,24 +119,40 @@ declare class FileCoverage implements FileCoverageData {
 }
 
 type Threshold = 'lines' | 'functions' | 'statements' | 'branches';
+interface ResolvedThreshold {
+    coverageMap: CoverageMap;
+    name: string;
+    thresholds: Partial<Record<Threshold, number | undefined>>;
+}
 declare class BaseCoverageProvider {
     /**
      * Check if current coverage is above configured thresholds and bump the thresholds if needed
      */
-    updateThresholds({ configurationFile, coverageMap, thresholds, perFile }: {
-        coverageMap: CoverageMap;
-        thresholds: Record<Threshold, number | undefined>;
+    updateThresholds({ thresholds: allThresholds, perFile, configurationFile }: {
+        thresholds: ResolvedThreshold[];
         perFile?: boolean;
-        configurationFile?: string;
+        configurationFile: {
+            read(): unknown;
+            write(): void;
+        };
     }): void;
     /**
-     * Checked collected coverage against configured thresholds. Sets exit code to 1 when thresholds not reached.
+     * Check collected coverage against configured thresholds. Sets exit code to 1 when thresholds not reached.
      */
-    checkThresholds({ coverageMap, thresholds, perFile }: {
-        coverageMap: CoverageMap;
-        thresholds: Record<Threshold, number | undefined>;
+    checkThresholds({ thresholds: allThresholds, perFile }: {
+        thresholds: ResolvedThreshold[];
         perFile?: boolean;
     }): void;
+    /**
+     * Constructs collected coverage and users' threshold options into separate sets
+     * where each threshold set holds their own coverage maps. Threshold set is either
+     * for specific files defined by glob pattern or global for all other files.
+     */
+    resolveThresholds({ coverageMap, thresholds, createCoverageMap }: {
+        coverageMap: CoverageMap;
+        thresholds: NonNullable<BaseCoverageOptions['thresholds']>;
+        createCoverageMap: () => CoverageMap;
+    }): ResolvedThreshold[];
     /**
      * Resolve reporters from various configuration options
      */

package/dist/coverage.js

@@ -1,70 +1,120 @@
-import { readFileSync, writeFileSync } from 'node:fs';
 import { relative } from 'pathe';
+import { m as mm } from './vendor/index.xL8XjTLv.js';
+import './vendor/_commonjsHelpers.jjO7Zipk.js';
+import 'util';
+import 'path';
 
 const THRESHOLD_KEYS = ["lines", "functions", "statements", "branches"];
+const GLOBAL_THRESHOLDS_KEY = "global";
 class BaseCoverageProvider {
   /**
    * Check if current coverage is above configured thresholds and bump the thresholds if needed
    */
-  updateThresholds({ configurationFile, coverageMap, thresholds, perFile }) {
-    if (!configurationFile)
-      throw new Error('Missing configurationFile. The "coverage.thresholdAutoUpdate" can only be enabled when configuration file is used.');
-    const summaries = perFile ? coverageMap.files().map((file) => coverageMap.fileCoverageFor(file).toSummary()) : [coverageMap.getCoverageSummary()];
-    const thresholdsToUpdate = [];
-    for (const key of THRESHOLD_KEYS) {
-      const threshold = thresholds[key] ?? 100;
-      const actual = Math.min(...summaries.map((summary) => summary[key].pct));
-      if (actual > threshold)
-        thresholdsToUpdate.push([key, actual]);
-    }
-    if (thresholdsToUpdate.length === 0)
-      return;
-    const originalConfig = readFileSync(configurationFile, "utf8");
-    let updatedConfig = originalConfig;
-    for (const [threshold, newValue] of thresholdsToUpdate) {
-      const previousThreshold = (thresholds[threshold] ?? 100).toString();
-      const pattern = new RegExp(`(${threshold}\\s*:\\s*)${previousThreshold.replace(".", "\\.")}`);
-      const matches = originalConfig.match(pattern);
-      if (matches)
-        updatedConfig = updatedConfig.replace(matches[0], matches[1] + newValue);
-      else
-        console.error(`Unable to update coverage threshold ${threshold}. No threshold found using pattern ${pattern}`);
+  updateThresholds({ thresholds: allThresholds, perFile, configurationFile }) {
+    let updatedThresholds = false;
+    const config = configurationFile.read();
+    assertConfigurationModule(config);
+    for (const { coverageMap, thresholds, name } of allThresholds) {
+      const summaries = perFile ? coverageMap.files().map((file) => coverageMap.fileCoverageFor(file).toSummary()) : [coverageMap.getCoverageSummary()];
+      const thresholdsToUpdate = [];
+      for (const key of THRESHOLD_KEYS) {
+        const threshold = thresholds[key] ?? 100;
+        const actual = Math.min(...summaries.map((summary) => summary[key].pct));
+        if (actual > threshold)
+          thresholdsToUpdate.push([key, actual]);
+      }
+      if (thresholdsToUpdate.length === 0)
+        continue;
+      updatedThresholds = true;
+      for (const [threshold, newValue] of thresholdsToUpdate) {
+        if (name === GLOBAL_THRESHOLDS_KEY) {
+          config.test.coverage.thresholds[threshold] = newValue;
+        } else {
+          const glob = config.test.coverage.thresholds[name];
+          glob[threshold] = newValue;
+        }
+      }
     }
-    if (updatedConfig !== originalConfig) {
+    if (updatedThresholds) {
       console.log("Updating thresholds to configuration file. You may want to push with updated coverage thresholds.");
-      writeFileSync(configurationFile, updatedConfig, "utf-8");
+      configurationFile.write();
     }
   }
   /**
-   * Checked collected coverage against configured thresholds. Sets exit code to 1 when thresholds not reached.
+   * Check collected coverage against configured thresholds. Sets exit code to 1 when thresholds not reached.
    */
-  checkThresholds({ coverageMap, thresholds, perFile }) {
-    const summaries = perFile ? coverageMap.files().map((file) => ({
-      file,
-      summary: coverageMap.fileCoverageFor(file).toSummary()
-    })) : [{
-      file: null,
-      summary: coverageMap.getCoverageSummary()
-    }];
-    for (const { summary, file } of summaries) {
-      for (const thresholdKey of ["lines", "functions", "statements", "branches"]) {
-        const threshold = thresholds[thresholdKey];
-        if (threshold !== void 0) {
-          const coverage = summary.data[thresholdKey].pct;
-          if (coverage < threshold) {
-            process.exitCode = 1;
-            let errorMessage = `ERROR: Coverage for ${thresholdKey} (${coverage}%) does not meet`;
-            if (!perFile)
-              errorMessage += " global";
-            errorMessage += ` threshold (${threshold}%)`;
-            if (perFile && file)
-              errorMessage += ` for ${relative("./", file).replace(/\\/g, "/")}`;
-            console.error(errorMessage);
+  checkThresholds({ thresholds: allThresholds, perFile }) {
+    for (const { coverageMap, thresholds, name } of allThresholds) {
+      if (thresholds.branches === void 0 && thresholds.functions === void 0 && thresholds.lines === void 0 && thresholds.statements === void 0)
+        continue;
+      const summaries = perFile ? coverageMap.files().map((file) => ({
+        file,
+        summary: coverageMap.fileCoverageFor(file).toSummary()
+      })) : [{
+        file: null,
+        summary: coverageMap.getCoverageSummary()
+      }];
+      for (const { summary, file } of summaries) {
+        for (const thresholdKey of ["lines", "functions", "statements", "branches"]) {
+          const threshold = thresholds[thresholdKey];
+          if (threshold !== void 0) {
+            const coverage = summary.data[thresholdKey].pct;
+            if (coverage < threshold) {
+              process.exitCode = 1;
+              let errorMessage = `ERROR: Coverage for ${thresholdKey} (${coverage}%) does not meet ${name === GLOBAL_THRESHOLDS_KEY ? name : `"${name}"`} threshold (${threshold}%)`;
+              if (perFile && file)
+                errorMessage += ` for ${relative("./", file).replace(/\\/g, "/")}`;
+              console.error(errorMessage);
+            }
           }
         }
       }
     }
   }
+  /**
+   * Constructs collected coverage and users' threshold options into separate sets
+   * where each threshold set holds their own coverage maps. Threshold set is either
+   * for specific files defined by glob pattern or global for all other files.
+   */
+  resolveThresholds({ coverageMap, thresholds, createCoverageMap }) {
+    const resolvedThresholds = [];
+    const files = coverageMap.files();
+    const filesMatchedByGlobs = [];
+    const globalCoverageMap = createCoverageMap();
+    for (const key of Object.keys(thresholds)) {
+      if (key === "perFile" || key === "autoUpdate" || key === "100" || THRESHOLD_KEYS.includes(key))
+        continue;
+      const glob = key;
+      const globThresholds = resolveGlobThresholds(thresholds[glob]);
+      const globCoverageMap = createCoverageMap();
+      const matchingFiles = files.filter((file) => mm.isMatch(file, glob));
+      filesMatchedByGlobs.push(...matchingFiles);
+      for (const file of matchingFiles) {
+        const fileCoverage = coverageMap.fileCoverageFor(file);
+        globCoverageMap.addFileCoverage(fileCoverage);
+      }
+      resolvedThresholds.push({
+        name: glob,
+        coverageMap: globCoverageMap,
+        thresholds: globThresholds
+      });
+    }
+    for (const file of files.filter((file2) => !filesMatchedByGlobs.includes(file2))) {
+      const fileCoverage = coverageMap.fileCoverageFor(file);
+      globalCoverageMap.addFileCoverage(fileCoverage);
+    }
+    resolvedThresholds.unshift({
+      name: GLOBAL_THRESHOLDS_KEY,
+      coverageMap: globalCoverageMap,
+      thresholds: {
+        branches: thresholds.branches,
+        functions: thresholds.functions,
+        lines: thresholds.lines,
+        statements: thresholds.statements
+      }
+    });
+    return resolvedThresholds;
+  }
   /**
    * Resolve reporters from various configuration options
    */
@@ -82,5 +132,24 @@ class BaseCoverageProvider {
     return resolvedReporters;
   }
 }
+function resolveGlobThresholds(thresholds) {
+  if (!thresholds || typeof thresholds !== "object")
+    return {};
+  return {
+    lines: "lines" in thresholds && typeof thresholds.lines === "number" ? thresholds.lines : void 0,
+    branches: "branches" in thresholds && typeof thresholds.branches === "number" ? thresholds.branches : void 0,
+    functions: "functions" in thresholds && typeof thresholds.functions === "number" ? thresholds.functions : void 0,
+    statements: "statements" in thresholds && typeof thresholds.statements === "number" ? thresholds.statements : void 0
+  };
+}
+function assertConfigurationModule(config) {
+  try {
+    if (typeof config.test.coverage.thresholds !== "object")
+      throw new Error("Expected config.test.coverage.thresholds to be an object");
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Unable to parse thresholds from configuration file: ${message}`);
+  }
+}
 
 export { BaseCoverageProvider };

package/dist/entry-vm.js

@@ -5,30 +5,30 @@ import timers from 'node:timers';
 import { performance } from 'node:perf_hooks';
 import { startTests } from '@vitest/runner';
 import { setupColors, createColors } from '@vitest/utils';
-import { V as VitestSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './vendor-index.57925a34.js';
-import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './vendor-coverage.78040316.js';
-import { g as getWorkerState } from './vendor-global.c3664e75.js';
-import { i as index } from './vendor-index.72df742e.js';
+import { V as VitestSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './vendor/index.h0j9y5vy.js';
+import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './vendor/coverage.v6aD8iAh.js';
+import { g as getWorkerState } from './vendor/global.L7JRz1qU.js';
+import { i as index } from './vendor/index.VL3WbvjT.js';
 import { setupCommonEnv } from './browser.js';
 import 'chai';
 import '@vitest/snapshot/environment';
 import 'pathe';
-import './vendor-paths.84fc7a99.js';
+import './paths.js';
 import 'node:url';
-import './vendor-rpc.171f65fb.js';
-import './vendor-benchmark.b6befc50.js';
+import './vendor/rpc.Bl-ysZIr.js';
+import './vendor/benchmark.WVm6DARl.js';
 import '@vitest/runner/utils';
-import './vendor-index.2b92937b.js';
+import './vendor/index.XU72Rmy8.js';
 import 'std-env';
-import './vendor-run-once.fb836747.js';
-import './vendor-vi.3baa7c4a.js';
-import './vendor-_commonjsHelpers.7d1333e8.js';
+import './vendor/run-once.X3E7xx3F.js';
+import './vendor/vi.JXuS6emb.js';
+import './vendor/_commonjsHelpers.jjO7Zipk.js';
 import '@vitest/expect';
 import '@vitest/snapshot';
 import '@vitest/utils/error';
-import './vendor-tasks.f9d75aed.js';
+import './vendor/tasks.IknbGB2n.js';
 import '@vitest/utils/source-map';
-import './vendor-date.6e993429.js';
+import './vendor/date.Ns1pGd_X.js';
 import '@vitest/spy';
 
 async function run(files, config, executor) {

package/dist/entry.js

@@ -1,36 +1,36 @@
 import { performance } from 'node:perf_hooks';
 import { startTests } from '@vitest/runner';
-import './vendor-index.2b92937b.js';
-import { a as globalExpect, r as resetModules, v as vi } from './vendor-vi.3baa7c4a.js';
-import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './vendor-coverage.78040316.js';
-import { V as VitestSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './vendor-index.57925a34.js';
+import './vendor/index.XU72Rmy8.js';
+import { a as globalExpect, r as resetModules, v as vi } from './vendor/vi.JXuS6emb.js';
+import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './vendor/coverage.v6aD8iAh.js';
+import { V as VitestSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './vendor/index.h0j9y5vy.js';
 import { createRequire } from 'node:module';
 import util from 'node:util';
 import timers from 'node:timers';
 import { isatty } from 'node:tty';
 import { installSourcemapsSupport } from 'vite-node/source-map';
 import { setupColors, createColors, getSafeTimers } from '@vitest/utils';
-import { i as index } from './vendor-index.72df742e.js';
+import { i as index } from './vendor/index.VL3WbvjT.js';
 import { setupCommonEnv } from './browser.js';
-import { g as getWorkerState } from './vendor-global.c3664e75.js';
+import { g as getWorkerState } from './vendor/global.L7JRz1qU.js';
 import 'pathe';
 import 'std-env';
 import '@vitest/runner/utils';
 import 'chai';
-import './vendor-_commonjsHelpers.7d1333e8.js';
+import './vendor/_commonjsHelpers.jjO7Zipk.js';
 import '@vitest/expect';
 import '@vitest/snapshot';
 import '@vitest/utils/error';
-import './vendor-tasks.f9d75aed.js';
+import './vendor/tasks.IknbGB2n.js';
 import '@vitest/utils/source-map';
-import './vendor-date.6e993429.js';
+import './vendor/date.Ns1pGd_X.js';
 import '@vitest/spy';
 import '@vitest/snapshot/environment';
-import './vendor-paths.84fc7a99.js';
+import './paths.js';
 import 'node:url';
-import './vendor-rpc.171f65fb.js';
-import './vendor-benchmark.b6befc50.js';
-import './vendor-run-once.fb836747.js';
+import './vendor/rpc.Bl-ysZIr.js';
+import './vendor/benchmark.WVm6DARl.js';
+import './vendor/run-once.X3E7xx3F.js';
 
 let globalSetup = false;
 async function setupGlobalEnv(config, { environment }) {
@@ -66,7 +66,7 @@ async function setupGlobalEnv(config, { environment }) {
   await setupConsoleLogSpy(state);
 }
 async function setupConsoleLogSpy(state) {
-  const { createCustomConsole } = await import('./chunk-runtime-console.f3263f87.js');
+  const { createCustomConsole } = await import('./chunks/runtime-console.hf2msWA9.js');
   globalThis.console = createCustomConsole(state);
 }
 async function withEnv({ environment }, options, fn) {

package/dist/environments.d.ts

@@ -1,4 +1,4 @@
-import { E as Environment } from './reporters-50c2bd49.js';
+import { E as Environment } from './reporters-vMlHjCdM.js';
 import 'vite';
 import '@vitest/runner';
 import 'vite-node';

package/dist/environments.js

@@ -1,3 +1,3 @@
-export { e as builtinEnvironments, p as populateGlobal } from './vendor-environments.dcc4a34e.js';
+export { e as builtinEnvironments, p as populateGlobal } from './vendor/environments.ewIbzajW.js';
 import 'node:console';
 import 'local-pkg';

package/dist/execute.d.ts

@@ -1,7 +1,7 @@
 import vm from 'node:vm';
 import { ViteNodeRunner } from 'vite-node/client';
 import { ViteNodeRunnerOptions } from 'vite-node';
-import { al as PendingSuiteMock, am as MockFactory, an as MockMap, a1 as WorkerGlobalState, Q as RuntimeRPC } from './reporters-50c2bd49.js';
+import { am as PendingSuiteMock, an as MockFactory, ao as MockMap, a2 as WorkerGlobalState, g as RuntimeRPC } from './reporters-vMlHjCdM.js';
 import 'vite';
 import '@vitest/runner';
 import '@vitest/snapshot';

package/dist/execute.js

@@ -1,14 +1,14 @@
-export { V as VitestExecutor } from './vendor-execute.157302d6.js';
+export { V as VitestExecutor } from './vendor/execute.aMjV5C9u.js';
 import 'node:url';
 import 'node:vm';
 import 'vite-node/client';
 import 'vite-node/utils';
 import 'pathe';
 import '@vitest/utils/error';
-import './vendor-paths.84fc7a99.js';
+import './paths.js';
 import 'node:fs';
 import '@vitest/utils';
-import './vendor-base.9c08bbd0.js';
+import './vendor/base._79unx2z.js';
 import 'node:path';
 import 'node:module';
 import 'vite-node/constants';