vitest 0.0.117 → 0.0.121

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-bf29f0e6.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-080f26e8.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';
@@ -8,7 +8,7 @@ import path from 'path';
 import fs, { promises, realpathSync, statSync, Stats, existsSync, readdirSync } from 'fs';
 import assert from 'assert';
 import { format as format$2, inspect } from 'util';
-import { a as spyOn, s as spies } from './jest-mock-4a754991.js';
+import { a as spyOn, s as spies } from './jest-mock-038a01b3.js';
 import { r as rpc } from './rpc-8c7cc374.js';
 import 'tty';
 import 'local-pkg';
@@ -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,12 +9320,14 @@ function createMocker(root, mockMap) {
     getActualPath,
     mockObject,
     getSuiteFilepath,
-    resolveMockPath
+    resolveMockPath,
+    resolveDependency
   };
 }
 
 const defaultInline = [
   "vitest/dist",
+  /vitest-virtual-\w+\/dist/,
   /virtual:/,
   /\.ts$/,
   /\/esm\/.*\.js$/,
@@ -9343,29 +9352,33 @@ const stubRequests = {
     }
   }
 };
+function hasNestedDefault(target) {
+  return "__esModule" in target && target.__esModule && "default" in target.default;
+}
+function proxyMethod(name, isNested) {
+  return function(target, key, ...args) {
+    const result = Reflect[name](target, key, ...args);
+    if (isNested && key === "default" || !result)
+      return Reflect[name](target.default, key, ...args);
+    return result;
+  };
+}
 async function interpretedImport(path, interpretDefault) {
   const mod = await import(path);
   if (interpretDefault && "default" in mod) {
+    const isNested = hasNestedDefault(mod);
     return new Proxy(mod, {
-      get(target, key, receiver) {
-        return Reflect.get(target, key, receiver) || Reflect.get(target.default, key, receiver);
-      },
-      set(target, key, value, receiver) {
-        return Reflect.set(target, key, value, receiver) || Reflect.set(target.default, key, value, receiver);
-      },
-      has(target, key) {
-        return Reflect.has(target, key) || Reflect.has(target.default, key);
-      },
-      deleteProperty(target, key) {
-        return Reflect.deleteProperty(target, key) || Reflect.deleteProperty(target.default, key);
-      }
+      get: proxyMethod("get", isNested),
+      set: proxyMethod("set", isNested),
+      has: proxyMethod("has", isNested),
+      deleteProperty: proxyMethod("deleteProperty", isNested)
     });
   }
   return mod;
 }
 async function executeInViteNode(options) {
   const { moduleCache, root, files, fetch, mockMap } = options;
-  const externalCache = /* @__PURE__ */ new Map();
+  const externalCache = new Map();
   builtinModules.forEach((m) => externalCache.set(m, true));
   const {
     getActualPath,
@@ -9374,7 +9387,8 @@ async function executeInViteNode(options) {
     mockPath,
     clearMocks,
     unmockPath,
-    resolveMockPath
+    resolveMockPath,
+    resolveDependency
   } = createMocker(root, mockMap);
   const result = [];
   for (const file of files)
@@ -9397,7 +9411,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")
@@ -9554,7 +9568,7 @@ function patchWindowsImportPath(path) {
 }
 
 let _viteNode;
-const moduleCache = /* @__PURE__ */ new Map();
+const moduleCache = new Map();
 const mockMap = {};
 async function startViteNode(ctx) {
   if (_viteNode)

package/package.json

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