vitest 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/{vendor-reporters.b9600369.js → vendor-reporters.d24d80a4.js}

@@ -1,6 +1,6 @@
 import { performance } from 'node:perf_hooks';
 import c from 'picocolors';
-import { b as isNode, c as relativePath } from './vendor-index.29282562.js';
+import { b as isNode, c as relativePath } from './vendor-index.2b92937b.js';
 import { UNKNOWN_TEST_ID } from './chunk-runtime-console.f3263f87.js';
 import { isAbsolute, relative, dirname, basename, resolve } from 'pathe';
 import { s as slash } from './vendor-base.9c08bbd0.js';
@@ -2599,4 +2599,4 @@ const ReportersMap = {
   "hanging-process": HangingProcessReporter
 };
 
-export { BenchmarkReportsMap as B, DefaultReporter as D, F_POINTER as F, HangingProcessReporter as H, JsonReporter$1 as J, ReportersMap as R, TapReporter as T, VerboseReporter as V, ansiStyles as a, stripAnsi as b, sliceAnsi as c, divider as d, cliTruncate as e, BasicReporter as f, DotReporter as g, JUnitReporter as h, TapFlatReporter as i, stringWidth as s };
+export { BenchmarkReportsMap as B, DefaultReporter as D, F_POINTER as F, HangingProcessReporter as H, JsonReporter$1 as J, ReportersMap as R, TapReporter as T, VerboseReporter as V, ansiStyles as a, BasicReporter as b, cliTruncate as c, divider as d, DotReporter as e, JUnitReporter as f, TapFlatReporter as g, stripAnsi as s };

package/dist/{vendor-rpc.cbd8e972.js → vendor-rpc.171f65fb.js}

@@ -1,5 +1,5 @@
 import { getSafeTimers } from '@vitest/utils';
-import { g as getWorkerState } from './vendor-global.97e4527c.js';
+import { g as getWorkerState } from './vendor-global.c3664e75.js';
 
 const { get } = Reflect;
 function withSafeTimers(fn) {

package/dist/{vendor-run-once.3e5ef7d7.js → vendor-run-once.fb836747.js}

@@ -1,4 +1,4 @@
-import { g as getWorkerState } from './vendor-global.97e4527c.js';
+import { g as getWorkerState } from './vendor-global.c3664e75.js';
 
 const filesCount = /* @__PURE__ */ new Map();
 const cache = /* @__PURE__ */ new Map();

package/dist/{vendor-vi.d30b47ae.js → vendor-vi.3baa7c4a.js}

@@ -1,16 +1,16 @@
 import * as chai$1 from 'chai';
 import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './vendor-_commonjsHelpers.7d1333e8.js';
-import { equals, iterableEquality, subsetEquality, JestExtend, JestChaiExpect, JestAsymmetricMatchers, GLOBAL_EXPECT as GLOBAL_EXPECT$1, getState, setState } from '@vitest/expect';
+import { equals, iterableEquality, subsetEquality, JestExtend, JestChaiExpect, JestAsymmetricMatchers, GLOBAL_EXPECT as GLOBAL_EXPECT$1, ASYMMETRIC_MATCHERS_OBJECT as ASYMMETRIC_MATCHERS_OBJECT$1, getState, setState } from '@vitest/expect';
 import { stripSnapshotIndentation, addSerializer, SnapshotClient } from '@vitest/snapshot';
 import { getNames } from '@vitest/runner/utils';
 import '@vitest/utils/error';
 import { getCurrentTest } from '@vitest/runner';
 import { g as getFullName } from './vendor-tasks.f9d75aed.js';
-import { g as getWorkerState, a as getCurrentEnvironment } from './vendor-global.97e4527c.js';
+import { g as getWorkerState, a as getCurrentEnvironment } from './vendor-global.c3664e75.js';
 import { getSafeTimers, assertTypes, createSimpleStackTrace } from '@vitest/utils';
 import { parseSingleStack } from '@vitest/utils/source-map';
 import { R as RealDate, r as resetDate, m as mockDate } from './vendor-date.6e993429.js';
-import { spyOn, fn, isMockFunction, spies } from '@vitest/spy';
+import { spyOn, fn, isMockFunction, mocks } from '@vitest/spy';
 
 function resetModules(modules, resetMocks = false) {
   const skipPaths = [
@@ -144,10 +144,12 @@ var Subset = /*@__PURE__*/getDefaultExportFromCjs(chaiSubsetExports);
 const MATCHERS_OBJECT = Symbol.for("matchers-object");
 const JEST_MATCHERS_OBJECT = Symbol.for("$$jest-matchers-object");
 const GLOBAL_EXPECT = Symbol.for("expect-global");
+const ASYMMETRIC_MATCHERS_OBJECT = Symbol.for("asymmetric-matchers-object");
 
 if (!Object.prototype.hasOwnProperty.call(globalThis, MATCHERS_OBJECT)) {
   const globalState = /* @__PURE__ */ new WeakMap();
   const matchers = /* @__PURE__ */ Object.create(null);
+  const assymetricMatchers = /* @__PURE__ */ Object.create(null);
   Object.defineProperty(globalThis, MATCHERS_OBJECT, {
     get: () => globalState
   });
@@ -158,6 +160,9 @@ if (!Object.prototype.hasOwnProperty.call(globalThis, MATCHERS_OBJECT)) {
       matchers
     })
   });
+  Object.defineProperty(globalThis, ASYMMETRIC_MATCHERS_OBJECT, {
+    get: () => assymetricMatchers
+  });
 }
 
 function recordAsyncExpect(test, promise) {
@@ -185,21 +190,16 @@ function getSnapshotClient() {
   }
   return _client;
 }
-function getErrorMessage(err) {
-  if (err instanceof Error)
-    return err.message;
-  return err;
-}
-function getErrorString(expected, promise) {
+function getError(expected, promise) {
   if (typeof expected !== "function") {
     if (!promise)
       throw new Error(`expected must be a function, received ${typeof expected}`);
-    return getErrorMessage(expected);
+    return expected;
   }
   try {
     expected();
   } catch (e) {
-    return getErrorMessage(e);
+    return e;
   }
   throw new Error("snapshot function didn't throw");
 }
@@ -296,7 +296,7 @@ const SnapshotPlugin = (chai, utils) => {
       const promise = utils.flag(this, "promise");
       const errorMessage = utils.flag(this, "message");
       getSnapshotClient().assert({
-        received: getErrorString(expected, promise),
+        received: getError(expected, promise),
         message,
         errorMessage,
         ...getTestNames(test)
@@ -317,7 +317,7 @@ const SnapshotPlugin = (chai, utils) => {
       const promise = utils.flag(this, "promise");
       const errorMessage = utils.flag(this, "message");
       getSnapshotClient().assert({
-        received: getErrorString(expected, promise),
+        received: getError(expected, promise),
         message,
         inlineSnapshot,
         isInline: true,
@@ -353,6 +353,7 @@ function createExpect(test) {
       return assert2;
   };
   Object.assign(expect, chai$1.expect);
+  Object.assign(expect, globalThis[ASYMMETRIC_MATCHERS_OBJECT$1]);
   expect.getState = () => getState(expect);
   expect.setState = (state) => setState(state, expect);
   const globalState = getState(globalThis[GLOBAL_EXPECT$1]) || {};
@@ -3297,10 +3298,6 @@ function createVitest() {
   let _mockedDate = null;
   let _config = null;
   const workerState = getWorkerState();
-  if (!workerState) {
-    const errorMsg = 'Vitest failed to access its internal state.\n\nOne of the following is possible:\n- "vitest" is imported directly without running "vitest" command\n- "vitest" is imported inside "globalSetup" (to fix this, use "setupFiles" instead, because "globalSetup" runs in a different context)\n- Otherwise, it might be a Vitest bug. Please report it to https://github.com/vitest-dev/vitest/issues\n';
-    throw new Error(errorMsg);
-  }
   const _timers = new FakeTimers({
     global: globalThis,
     config: workerState.config.fakeTimers
@@ -3316,18 +3313,17 @@ function createVitest() {
   const utils = {
     useFakeTimers(config) {
       var _a, _b, _c, _d;
-      const workerState2 = getWorkerState();
-      if (workerState2.isChildProcess) {
-        if (((_a = config == null ? void 0 : config.toFake) == null ? void 0 : _a.includes("nextTick")) || ((_d = (_c = (_b = workerState2.config) == null ? void 0 : _b.fakeTimers) == null ? void 0 : _c.toFake) == null ? void 0 : _d.includes("nextTick"))) {
+      if (workerState.isChildProcess) {
+        if (((_a = config == null ? void 0 : config.toFake) == null ? void 0 : _a.includes("nextTick")) || ((_d = (_c = (_b = workerState.config) == null ? void 0 : _b.fakeTimers) == null ? void 0 : _c.toFake) == null ? void 0 : _d.includes("nextTick"))) {
           throw new Error(
             'vi.useFakeTimers({ toFake: ["nextTick"] }) is not supported in node:child_process. Use --pool=threads if mocking nextTick is required.'
           );
         }
       }
       if (config)
-        _timers.configure({ ...workerState2.config.fakeTimers, ...config });
+        _timers.configure({ ...workerState.config.fakeTimers, ...config });
       else
-        _timers.configure(workerState2.config.fakeTimers);
+        _timers.configure(workerState.config.fakeTimers);
       _timers.useFakeTimers();
       return utils;
     },
@@ -3415,7 +3411,12 @@ function createVitest() {
       _mocker.queueUnmock(path, getImporter());
     },
     doMock(path, factory) {
-      _mocker.queueMock(path, getImporter(), factory);
+      const importer = getImporter();
+      _mocker.queueMock(
+        path,
+        importer,
+        factory ? () => factory(() => _mocker.importActual(path, importer)) : void 0
+      );
     },
     doUnmock(path) {
       _mocker.queueUnmock(path, getImporter());
@@ -3433,15 +3434,15 @@ function createVitest() {
       return isMockFunction(fn2);
     },
     clearAllMocks() {
-      spies.forEach((spy) => spy.mockClear());
+      mocks.forEach((spy) => spy.mockClear());
       return utils;
     },
     resetAllMocks() {
-      spies.forEach((spy) => spy.mockReset());
+      mocks.forEach((spy) => spy.mockReset());
       return utils;
     },
     restoreAllMocks() {
-      spies.forEach((spy) => spy.mockRestore());
+      mocks.forEach((spy) => spy.mockRestore());
       return utils;
     },
     stubGlobal(name, value) {
@@ -3482,24 +3483,20 @@ function createVitest() {
       return utils;
     },
     resetModules() {
-      const state = getWorkerState();
-      resetModules(state.moduleCache);
+      resetModules(workerState.moduleCache);
       return utils;
     },
     async dynamicImportSettled() {
       return waitForImportsToResolve();
     },
     setConfig(config) {
-      const state = getWorkerState();
       if (!_config)
-        _config = { ...state.config };
-      Object.assign(state.config, config);
+        _config = { ...workerState.config };
+      Object.assign(workerState.config, config);
     },
     resetConfig() {
-      if (_config) {
-        const state = getWorkerState();
-        Object.assign(state.config, _config);
-      }
+      if (_config)
+        Object.assign(workerState.config, _config);
     }
   };
   return utils;

package/dist/vm.js

@@ -8,9 +8,9 @@ import { resolve } from 'pathe';
 import { installSourcemapsSupport } from 'vite-node/source-map';
 import { d as distDir } from './vendor-paths.84fc7a99.js';
 import { l as loadEnvironment } from './vendor-loader.9c966f23.js';
-import { b as startVitestExecutor } from './vendor-execute.e6e4e89b.js';
+import { b as startVitestExecutor } from './vendor-execute.157302d6.js';
 import { createCustomConsole } from './chunk-runtime-console.f3263f87.js';
-import { c as createSafeRpc } from './vendor-rpc.cbd8e972.js';
+import { c as createSafeRpc } from './vendor-rpc.171f65fb.js';
 import 'acorn';
 import 'node:module';
 import 'node:fs';
@@ -24,19 +24,19 @@ import 'node:console';
 import 'local-pkg';
 import 'vite-node/utils';
 import '@vitest/utils/error';
-import './vendor-global.97e4527c.js';
 import '@vitest/utils';
 import './vendor-base.9c08bbd0.js';
 import 'vite-node/constants';
 import 'node:stream';
 import './vendor-date.6e993429.js';
+import './vendor-global.c3664e75.js';
 
 const entryFile = pathToFileURL(resolve(distDir, "entry-vm.js")).href;
 async function run(ctx) {
   var _a;
   const moduleCache = new ModuleCacheMap();
   const mockMap = /* @__PURE__ */ new Map();
-  const { config, port } = ctx;
+  const { config, port, providedContext } = ctx;
   let setCancel = (_reason) => {
   };
   const onCancel = new Promise((resolve2) => {
@@ -79,7 +79,8 @@ async function run(ctx) {
       environment: performance.now(),
       prepare: performance.now()
     },
-    rpc
+    rpc,
+    providedContext
   };
   installSourcemapsSupport({
     getSourceMap: (source) => moduleCache.getSourceMap(source)

package/dist/worker.js

@@ -1,11 +1,11 @@
 import { performance } from 'node:perf_hooks';
 import { c as createBirpc } from './vendor-index.1ca68bd5.js';
 import { workerId } from 'tinypool';
-import { g as getWorkerState } from './vendor-global.97e4527c.js';
+import { g as getWorkerState } from './vendor-global.c3664e75.js';
 import { l as loadEnvironment } from './vendor-loader.9c966f23.js';
-import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor-execute.e6e4e89b.js';
+import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor-execute.157302d6.js';
 import { s as setupInspect } from './vendor-inspector.209edf5a.js';
-import { r as rpcDone, c as createSafeRpc } from './vendor-rpc.cbd8e972.js';
+import { r as rpcDone, c as createSafeRpc } from './vendor-rpc.171f65fb.js';
 import 'pathe';
 import 'acorn';
 import 'node:module';
@@ -34,7 +34,7 @@ async function init(ctx) {
   const isIsolatedThreads = ctx.config.pool === "threads" && (((_b = (_a = ctx.config.poolOptions) == null ? void 0 : _a.threads) == null ? void 0 : _b.isolate) ?? true);
   if (isInitialized && isIsolatedThreads)
     throw new Error(`worker for ${ctx.files.join(",")} already initialized by ${getWorkerState().ctx.files.join(",")}. This is probably an internal bug of Vitest.`);
-  const { config, port, workerId: workerId$1 } = ctx;
+  const { config, port, workerId: workerId$1, providedContext } = ctx;
   process.env.VITEST_WORKER_ID = String(workerId$1);
   process.env.VITEST_POOL_ID = String(workerId);
   let setCancel = (_reason) => {
@@ -74,7 +74,8 @@ async function init(ctx) {
       environment: 0,
       prepare: performance.now()
     },
-    rpc
+    rpc,
+    providedContext
   };
   Object.defineProperty(globalThis, "__vitest_worker__", {
     value: state,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vitest",
   "type": "module",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "Next generation testing framework powered by Vite",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -144,12 +144,12 @@
     "tinypool": "^0.8.1",
     "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0",
     "why-is-node-running": "^2.2.2",
-    "@vitest/expect": "1.0.0-beta.3",
-    "@vitest/runner": "1.0.0-beta.3",
-    "@vitest/snapshot": "1.0.0-beta.3",
-    "@vitest/spy": "1.0.0-beta.3",
-    "@vitest/utils": "1.0.0-beta.3",
-    "vite-node": "1.0.0-beta.3"
+    "@vitest/spy": "1.0.0-beta.4",
+    "@vitest/expect": "1.0.0-beta.4",
+    "@vitest/runner": "1.0.0-beta.4",
+    "@vitest/snapshot": "1.0.0-beta.4",
+    "@vitest/utils": "1.0.0-beta.4",
+    "vite-node": "1.0.0-beta.4"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.1",
@@ -175,7 +175,7 @@
     "get-tsconfig": "^4.6.2",
     "happy-dom": "^9.20.3",
     "jsdom": "^22.1.0",
-    "log-update": "^5.0.1",
+    "log-update": "^6.0.0",
     "micromatch": "^4.0.5",
     "mlly": "^1.4.0",
     "p-limit": "^4.0.0",

package/dist/vendor-global.97e4527c.js

@@ -1,9 +0,0 @@
-function getWorkerState() {
-  return globalThis.__vitest_worker__;
-}
-function getCurrentEnvironment() {
-  const state = getWorkerState();
-  return state == null ? void 0 : state.environment.name;
-}
-
-export { getCurrentEnvironment as a, getWorkerState as g };