vitest 2.0.4 → 2.0.5

package/dist/{vendor/execute.jzOWtys_.js → chunks/execute.Cjlr2CRw.js}

@@ -7,7 +7,7 @@ import { resolve, isAbsolute, dirname, join, basename, extname, normalize, relat
 import { processError } from '@vitest/utils/error';
 import { distDir } from '../path.js';
 import { highlight, getType } from '@vitest/utils';
-import { g as getAllMockableProperties } from './base.DRHPZCCj.js';
+import { g as getAllMockableProperties } from './base.DSsbfkDg.js';
 
 const { existsSync, readdirSync } = fs;
 const spyModulePath = resolve(distDir, "spy.js");
@@ -136,7 +136,7 @@ class VitestMocker {
     return {
       id,
       fsPath,
-      external
+      external: external ? this.normalizePath(external) : external
     };
   }
   async resolveMocks() {
@@ -160,8 +160,7 @@ class VitestMocker {
     VitestMocker.pendingIds = [];
   }
   async callFunctionMock(dep, mock) {
-    var _a, _b;
-    const cached = (_a = this.moduleCache.get(dep)) == null ? void 0 : _a.exports;
+    const cached = this.moduleCache.get(dep)?.exports;
     if (cached) {
       return cached;
     }
@@ -176,7 +175,7 @@ class VitestMocker {
       throw vitestError;
     }
     const filepath = dep.slice(5);
-    const mockpath = ((_b = this.resolveCache.get(this.getSuiteFilepath())) == null ? void 0 : _b[filepath]) || filepath;
+    const mockpath = this.resolveCache.get(this.getSuiteFilepath())?.[filepath] || filepath;
     if (exports === null || typeof exports !== "object") {
       throw this.createError(
         `[vitest] vi.mock("${mockpath}", factory?: () => unknown) is not returning an object. Did you mean to return an object with a "default" key?`
@@ -229,6 +228,23 @@ If you need to partially mock a module, you can use "importOriginal" helper insi
   resolveMockPath(mockPath, external) {
     const path = external || mockPath;
     if (external || isNodeBuiltin(mockPath) || !existsSync(mockPath)) {
+      let findFile2 = function(files2, baseOriginal2) {
+        for (const file of files2) {
+          const baseFile = basename(file, extname(file));
+          if (baseFile === baseOriginal2) {
+            const path2 = resolve(mockFolder, file);
+            if (fs.statSync(path2).isFile()) {
+              return path2;
+            } else {
+              const indexFile = findFile2(readdirSync(path2), "index");
+              if (indexFile) {
+                return indexFile;
+              }
+            }
+          }
+        }
+        return null;
+      };
       const mockDirname = dirname(path);
       const mockFolder = join(this.root, "__mocks__", mockDirname);
       if (!existsSync(mockFolder)) {
@@ -236,13 +252,7 @@ If you need to partially mock a module, you can use "importOriginal" helper insi
       }
       const files = readdirSync(mockFolder);
       const baseOriginal = basename(path);
-      for (const file of files) {
-        const baseFile = basename(file, extname(file));
-        if (baseFile === baseOriginal) {
-          return resolve(mockFolder, file);
-        }
-      }
-      return null;
+      return findFile2(files, baseOriginal);
     }
     const dir = dirname(path);
     const baseId = basename(path);
@@ -365,7 +375,7 @@ If you need to partially mock a module, you can use "importOriginal" helper insi
     const suitefile = this.getSuiteFilepath();
     const mocks = this.mockMap.get(suitefile) || {};
     const resolves = this.resolveCache.get(suitefile) || {};
-    mocks[id] = factory || this.resolveMockPath(path, external);
+    mocks[id] = factory || this.resolveMockPath(id, external);
     resolves[id] = originalId;
     this.mockMap.set(suitefile, mocks);
     this.resolveCache.set(suitefile, resolves);
@@ -385,7 +395,7 @@ If you need to partially mock a module, you can use "importOriginal" helper insi
     const normalizedId = this.normalizePath(fsPath);
     let mock = this.getDependencyMock(normalizedId);
     if (mock === void 0) {
-      mock = this.resolveMockPath(fsPath, external);
+      mock = this.resolveMockPath(normalizedId, external);
     }
     if (mock === null) {
       const mod = await this.executor.cachedRequest(id, fsPath, [importee]);
@@ -459,7 +469,6 @@ function listenForErrors(state) {
   dispose.forEach((fn) => fn());
   dispose.length = 0;
   function catchError(err, type, event) {
-    var _a;
     const worker = state();
     if (worker.current) {
       const listeners = process.listeners(event);
@@ -469,7 +478,7 @@ function listenForErrors(state) {
     }
     const error = processError(err);
     if (!isPrimitive(error)) {
-      error.VITEST_TEST_NAME = (_a = worker.current) == null ? void 0 : _a.name;
+      error.VITEST_TEST_NAME = worker.current?.name;
       if (worker.filepath) {
         error.VITEST_TEST_PATH = relative(state().config.root, worker.filepath);
       }
@@ -559,7 +568,7 @@ function updateStyle(id, css) {
   style.setAttribute("type", "text/css");
   style.setAttribute("data-vite-dev-id", id);
   style.textContent = css;
-  head == null ? void 0 : head.appendChild(style);
+  head?.appendChild(style);
 }
 function removeStyle(id) {
   if (typeof document === "undefined") {
@@ -629,11 +638,10 @@ class VitestExecutor extends ViteNodeRunner {
     return globalThis.__vitest_worker__ || this.options.state;
   }
   shouldResolveId(id, _importee) {
-    var _a;
     if (isInternalRequest(id) || id.startsWith("data:")) {
       return false;
     }
-    const transformMode = ((_a = this.state.environment) == null ? void 0 : _a.transformMode) ?? "ssr";
+    const transformMode = this.state.environment?.transformMode ?? "ssr";
     return transformMode === "ssr" ? !isNodeBuiltin(id) : !id.startsWith("node:");
   }
   async originalResolveUrl(id, importer) {

package/dist/chunks/globals.BliuJFNR.js

@@ -0,0 +1,31 @@
+import { g as globalApis } from './constants.CaAN7icJ.js';
+import { V as VitestIndex } from './index.BfeNhc0N.js';
+import '@vitest/runner';
+import './benchmark.DDmpNjj-.js';
+import '@vitest/runner/utils';
+import '@vitest/utils';
+import './index.DYufA6CZ.js';
+import 'pathe';
+import './utils.Ck2hJTRs.js';
+import './env.BU041cs9.js';
+import 'std-env';
+import './run-once.Sxe67Wng.js';
+import './vi.fiQ7lMRF.js';
+import 'chai';
+import './_commonjsHelpers.BFTU3MAI.js';
+import '@vitest/expect';
+import '@vitest/snapshot';
+import '@vitest/utils/error';
+import './tasks.BZnCS9aT.js';
+import '@vitest/utils/source-map';
+import './base.DSsbfkDg.js';
+import './date.W2xKR2qe.js';
+import '@vitest/spy';
+
+function registerApiGlobally() {
+  globalApis.forEach((api) => {
+    globalThis[api] = VitestIndex[api];
+  });
+}
+
+export { registerApiGlobally };

package/dist/{vendor/index.DI9daj1Q.js → chunks/index.BfeNhc0N.js}

@@ -1,23 +1,11 @@
 import { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, onTestFinished, suite, test } from '@vitest/runner';
-import { b as bench } from './benchmark.B6pblCp2.js';
-import { i as isFirstRun, a as runOnce } from './run-once.Db8Hgq9X.js';
-import { c as createExpect, a as globalExpect, v as vi, b as vitest } from './vi.Elqer9-7.js';
-import { g as getWorkerState } from './global.7bFbnyXl.js';
+import { b as bench } from './benchmark.DDmpNjj-.js';
+import { i as isFirstRun, a as runOnce } from './run-once.Sxe67Wng.js';
+import { c as createExpect, a as globalExpect, v as vi, b as vitest } from './vi.fiQ7lMRF.js';
+import { g as getWorkerState } from './utils.Ck2hJTRs.js';
 import * as chai from 'chai';
 import { assert, should } from 'chai';
 
-function getRunningMode() {
-  return process.env.VITEST_MODE === "WATCH" ? "watch" : "run";
-}
-function isWatchMode() {
-  return getRunningMode() === "watch";
-}
-
-function inject(key) {
-  const workerState = getWorkerState();
-  return workerState.providedContext[key];
-}
-
 var dist = {};
 
 (function (exports) {
@@ -99,33 +87,45 @@ function noop() {
 }
 const assertType = noop;
 
+function getRunningMode() {
+  return process.env.VITEST_MODE === "WATCH" ? "watch" : "run";
+}
+function isWatchMode() {
+  return getRunningMode() === "watch";
+}
+
+function inject(key) {
+  const workerState = getWorkerState();
+  return workerState.providedContext[key];
+}
+
 var VitestIndex = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  afterAll: afterAll,
-  afterEach: afterEach,
-  assert: assert,
-  assertType: assertType,
-  beforeAll: beforeAll,
-  beforeEach: beforeEach,
-  bench: bench,
-  chai: chai,
-  createExpect: createExpect,
-  describe: describe,
-  expect: globalExpect,
-  expectTypeOf: dist.expectTypeOf,
-  getRunningMode: getRunningMode,
-  inject: inject,
-  isFirstRun: isFirstRun,
-  isWatchMode: isWatchMode,
-  it: it,
-  onTestFailed: onTestFailed,
-  onTestFinished: onTestFinished,
-  runOnce: runOnce,
-  should: should,
-  suite: suite,
-  test: test,
-  vi: vi,
-  vitest: vitest
+    __proto__: null,
+    afterAll: afterAll,
+    afterEach: afterEach,
+    assert: assert,
+    assertType: assertType,
+    beforeAll: beforeAll,
+    beforeEach: beforeEach,
+    bench: bench,
+    chai: chai,
+    createExpect: createExpect,
+    describe: describe,
+    expect: globalExpect,
+    expectTypeOf: dist.expectTypeOf,
+    getRunningMode: getRunningMode,
+    inject: inject,
+    isFirstRun: isFirstRun,
+    isWatchMode: isWatchMode,
+    it: it,
+    onTestFailed: onTestFailed,
+    onTestFinished: onTestFinished,
+    runOnce: runOnce,
+    should: should,
+    suite: suite,
+    test: test,
+    vi: vi,
+    vitest: vitest
 });
 
-export { VitestIndex as V, isWatchMode as a, assertType as b, dist as d, getRunningMode as g, inject as i };
+export { VitestIndex as V, assertType as a, inject as b, dist as d, getRunningMode as g, isWatchMode as i };

package/dist/{vendor/index.D6GZqexG.js → chunks/index.CM5UI-4O.js}

@@ -546,7 +546,7 @@ function requireClear$1 () {
 	if (hasRequiredClear$1) return clear$1;
 	hasRequiredClear$1 = 1;
 
-	function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike  ) { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+	function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike) { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 	function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
@@ -3505,7 +3505,7 @@ function requireDist () {
 
 	function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-	function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike  ) { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+	function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike) { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 	function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 

package/dist/{vendor/index.BJmtb_7W.js → chunks/index.DYufA6CZ.js}

@@ -1,8 +1,8 @@
 import { relative } from 'pathe';
 import '@vitest/runner/utils';
 import '@vitest/utils';
-import { g as getWorkerState } from './global.7bFbnyXl.js';
-import './env.2ltrQNq0.js';
+import { g as getWorkerState } from './utils.Ck2hJTRs.js';
+import './env.BU041cs9.js';
 
 function getRunMode() {
   return getWorkerState().config.mode;