vitest 2.0.0-beta.2 → 2.0.0-beta.5

package/dist/vendor/{vi.ClD3hi7L.js → vi.C6AfDXK6.js}

@@ -1,6 +1,6 @@
 import * as chai$1 from 'chai';
 import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './_commonjsHelpers.BFTU3MAI.js';
-import { equals, iterableEquality, subsetEquality, JestExtend, JestChaiExpect, JestAsymmetricMatchers, GLOBAL_EXPECT as GLOBAL_EXPECT$1, ASYMMETRIC_MATCHERS_OBJECT as ASYMMETRIC_MATCHERS_OBJECT$1, getState, setState, addCustomEqualityTesters } from '@vitest/expect';
+import { equals, iterableEquality, subsetEquality, JestExtend, JestChaiExpect, JestAsymmetricMatchers, GLOBAL_EXPECT, ASYMMETRIC_MATCHERS_OBJECT, getState, setState, addCustomEqualityTesters } from '@vitest/expect';
 import { stripSnapshotIndentation, addSerializer, SnapshotClient } from '@vitest/snapshot';
 import { getNames } from '@vitest/runner/utils';
 import '@vitest/utils/error';
@@ -8,6 +8,8 @@ import { getCurrentTest } from '@vitest/runner';
 import { g as getTestName } from './tasks.WC7M-K-v.js';
 import { g as getWorkerState, a as getCurrentEnvironment } from './global.7bFbnyXl.js';
 import { getSafeTimers, assertTypes, createSimpleStackTrace } from '@vitest/utils';
+import 'pathe';
+import './env.bmJgw1qP.js';
 import { parseSingleStack } from '@vitest/utils/source-map';
 import { i as isChildProcess } from './base._gnK9Slw.js';
 import { R as RealDate, r as resetDate, m as mockDate } from './date.BKM1wewY.js';
@@ -142,32 +144,6 @@ var chaiSubset = {exports: {}};
 var chaiSubsetExports = chaiSubset.exports;
 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 customEqualityTesters = [];
-  const assymetricMatchers = /* @__PURE__ */ Object.create(null);
-  Object.defineProperty(globalThis, MATCHERS_OBJECT, {
-    get: () => globalState
-  });
-  Object.defineProperty(globalThis, JEST_MATCHERS_OBJECT, {
-    configurable: true,
-    get: () => ({
-      state: globalState.get(globalThis[GLOBAL_EXPECT]),
-      matchers,
-      customEqualityTesters
-    })
-  });
-  Object.defineProperty(globalThis, ASYMMETRIC_MATCHERS_OBJECT, {
-    get: () => assymetricMatchers
-  });
-}
-
 function recordAsyncExpect(test, promise) {
   if (test && promise instanceof Promise) {
     promise = promise.finally(() => {
@@ -359,10 +335,85 @@ chai$1.use(Subset);
 chai$1.use(SnapshotPlugin);
 chai$1.use(JestAsymmetricMatchers);
 
+const unsupported = [
+  // .poll is meant to retry matchers until they succeed, and
+  // snapshots will always succeed as long as the poll method doesn't thow an error
+  // in this case using the `vi.waitFor` method is more appropriate
+  "matchSnapshot",
+  "toMatchSnapshot",
+  "toMatchInlineSnapshot",
+  "toThrowErrorMatchingSnapshot",
+  "toThrowErrorMatchingInlineSnapshot",
+  // toThrow will never succeed because we call the poll callback until it doesn't throw
+  "throws",
+  "Throw",
+  "throw",
+  "toThrow",
+  "toThrowError"
+  // these are not supported because you can call them without `.poll`,
+  // we throw an error inside the rejects/resolves methods to prevent this
+  // rejects,
+  // resolves
+];
+function createExpectPoll(expect) {
+  return function poll(fn, options = {}) {
+    var _a;
+    const state = getWorkerState();
+    const defaults = ((_a = state.config.expect) == null ? void 0 : _a.poll) ?? {};
+    const {
+      interval = defaults.interval ?? 50,
+      timeout = defaults.timeout ?? 1e3,
+      message
+    } = options;
+    const assertion = expect(null, message).withContext({ poll: true });
+    const proxy = new Proxy(assertion, {
+      get(target, key, receiver) {
+        const result = Reflect.get(target, key, receiver);
+        if (typeof result !== "function")
+          return result instanceof chai$1.Assertion ? proxy : result;
+        if (key === "assert")
+          return result;
+        if (typeof key === "string" && unsupported.includes(key))
+          throw new SyntaxError(`expect.poll() is not supported in combination with .${key}(). Use vi.waitFor() if your assertion condition is unstable.`);
+        return function(...args) {
+          const STACK_TRACE_ERROR = new Error("STACK_TRACE_ERROR");
+          return new Promise((resolve, reject) => {
+            let intervalId;
+            let lastError;
+            const { setTimeout, clearTimeout } = getSafeTimers();
+            const timeoutId = setTimeout(() => {
+              clearTimeout(intervalId);
+              reject(copyStackTrace$1(new Error(`Matcher did not succeed in ${timeout}ms`, { cause: lastError }), STACK_TRACE_ERROR));
+            }, timeout);
+            const check = async () => {
+              try {
+                chai$1.util.flag(this, "object", await fn());
+                resolve(await result.call(this, ...args));
+                clearTimeout(intervalId);
+                clearTimeout(timeoutId);
+              } catch (err) {
+                lastError = err;
+                intervalId = setTimeout(check, interval);
+              }
+            };
+            check();
+          });
+        };
+      }
+    });
+    return proxy;
+  };
+}
+function copyStackTrace$1(target, source) {
+  if (source.stack !== void 0)
+    target.stack = source.stack.replace(source.message, target.message);
+  return target;
+}
+
 function createExpect(test) {
   const expect = (value, message) => {
     const { assertionCalls } = getState(expect);
-    setState({ assertionCalls: assertionCalls + 1, soft: false }, expect);
+    setState({ assertionCalls: assertionCalls + 1 }, expect);
     const assert2 = chai$1.expect(value, message);
     const _test = test || getCurrentTest();
     if (_test)
@@ -371,10 +422,10 @@ function createExpect(test) {
       return assert2;
   };
   Object.assign(expect, chai$1.expect);
-  Object.assign(expect, globalThis[ASYMMETRIC_MATCHERS_OBJECT$1]);
+  Object.assign(expect, globalThis[ASYMMETRIC_MATCHERS_OBJECT]);
   expect.getState = () => getState(expect);
   expect.setState = (state) => setState(state, expect);
-  const globalState = getState(globalThis[GLOBAL_EXPECT$1]) || {};
+  const globalState = getState(globalThis[GLOBAL_EXPECT]) || {};
   const testPath = getTestFile(test);
   setState({
     // this should also add "snapshotState" that is added conditionally
@@ -391,12 +442,9 @@ function createExpect(test) {
   expect.extend = (matchers) => chai$1.expect.extend(expect, matchers);
   expect.addEqualityTesters = (customTesters) => addCustomEqualityTesters(customTesters);
   expect.soft = (...args) => {
-    const assert2 = expect(...args);
-    expect.setState({
-      soft: true
-    });
-    return assert2;
+    return expect(...args).withContext({ soft: true });
   };
+  expect.poll = createExpectPoll(expect);
   expect.unreachable = (message) => {
     chai$1.assert.fail(`expected${message ? ` "${message}" ` : " "}not to be reached`);
   };
@@ -429,7 +477,7 @@ function getTestFile(test) {
   return state.filepath;
 }
 const globalExpect = createExpect();
-Object.defineProperty(globalThis, GLOBAL_EXPECT$1, {
+Object.defineProperty(globalThis, GLOBAL_EXPECT, {
   value: globalExpect,
   writable: true,
   configurable: true
@@ -3343,10 +3391,13 @@ function createVitest() {
   const _stubsGlobal = /* @__PURE__ */ new Map();
   const _stubsEnv = /* @__PURE__ */ new Map();
   const _envBooleans = ["PROD", "DEV", "SSR"];
-  const getImporter = () => {
-    const stackTrace = createSimpleStackTrace({ stackTraceLimit: 4 });
-    const importerStack = stackTrace.split("\n")[4];
-    const stack = parseSingleStack(importerStack);
+  const getImporter = (name) => {
+    const stackTrace = createSimpleStackTrace({ stackTraceLimit: 5 });
+    const stackArray = stackTrace.split("\n");
+    const importerStackIndex = stackArray.findIndex((stack2) => {
+      return stack2.includes(` at Object.${name}`) || stack2.includes(`${name}@`);
+    });
+    const stack = parseSingleStack(stackArray[importerStackIndex + 1]);
     return (stack == null ? void 0 : stack.file) || "";
   };
   const utils = {
@@ -3441,7 +3492,7 @@ function createVitest() {
     mock(path, factory) {
       if (typeof path !== "string")
         throw new Error(`vi.mock() expects a string path, but received a ${typeof path}`);
-      const importer = getImporter();
+      const importer = getImporter("mock");
       _mocker.queueMock(
         path,
         importer,
@@ -3452,12 +3503,12 @@ function createVitest() {
     unmock(path) {
       if (typeof path !== "string")
         throw new Error(`vi.unmock() expects a string path, but received a ${typeof path}`);
-      _mocker.queueUnmock(path, getImporter());
+      _mocker.queueUnmock(path, getImporter("unmock"));
     },
     doMock(path, factory) {
       if (typeof path !== "string")
         throw new Error(`vi.doMock() expects a string path, but received a ${typeof path}`);
-      const importer = getImporter();
+      const importer = getImporter("doMock");
       _mocker.queueMock(
         path,
         importer,
@@ -3468,17 +3519,17 @@ function createVitest() {
     doUnmock(path) {
       if (typeof path !== "string")
         throw new Error(`vi.doUnmock() expects a string path, but received a ${typeof path}`);
-      _mocker.queueUnmock(path, getImporter());
+      _mocker.queueUnmock(path, getImporter("doUnmock"));
     },
     async importActual(path) {
       return _mocker.importActual(
         path,
-        getImporter(),
+        getImporter("importActual"),
         _mocker.getMockContext().callstack
       );
     },
     async importMock(path) {
-      return _mocker.importMock(path, getImporter());
+      return _mocker.importMock(path, getImporter("importMock"));
     },
     // this is typed in the interface so it's not necessary to type it here
     mocked(item, _options = {}) {

package/dist/vendor/{vm.Bi3bljci.js → vm.Ow-X2mkS.js}

@@ -1,8 +1,8 @@
 import vm, { isContext } from 'node:vm';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { dirname, basename, extname, normalize, join, resolve } from 'pathe';
-import { createCustomConsole } from '../chunks/runtime-console.CUES-L8X.js';
-import { g as getDefaultRequestStubs, s as startVitestExecutor } from './execute.CLLNVNnK.js';
+import { createCustomConsole } from '../chunks/runtime-console.DiVMr5d4.js';
+import { g as getDefaultRequestStubs, s as startVitestExecutor } from './execute.BHj6OMh4.js';
 import { distDir } from '../path.js';
 import { dirname as dirname$1 } from 'node:path';
 import { statSync, existsSync, promises, readFileSync } from 'node:fs';

package/dist/workers/forks.js

@@ -1,10 +1,10 @@
 import v8 from 'node:v8';
 import { c as createForksRpcOptions, u as unwrapSerializableConfig } from '../vendor/utils.CUjzkRH7.js';
-import { r as runBaseTests } from '../vendor/base.VFkIJ66g.js';
+import { r as runBaseTests } from '../vendor/base.D4XK-wRp.js';
 import '@vitest/utils';
 import 'vite-node/client';
 import '../vendor/global.7bFbnyXl.js';
-import '../vendor/execute.CLLNVNnK.js';
+import '../vendor/execute.BHj6OMh4.js';
 import 'node:vm';
 import 'node:url';
 import 'node:fs';

package/dist/workers/runVmTests.js

@@ -6,11 +6,11 @@ import { performance } from 'node:perf_hooks';
 import { startTests } from '@vitest/runner';
 import { setupColors, createColors } from '@vitest/utils';
 import { installSourcemapsSupport } from 'vite-node/source-map';
-import { s as setupChaiConfig, r as resolveTestRunner, a as resolveSnapshotEnvironment } from '../vendor/index.BfoZyXD1.js';
+import { s as setupChaiConfig, r as resolveTestRunner, a as resolveSnapshotEnvironment } from '../vendor/index.DHRpy7zp.js';
 import { a as startCoverageInsideWorker, s as stopCoverageInsideWorker } from '../vendor/coverage.ChSqD-qS.js';
 import { g as getWorkerState } from '../vendor/global.7bFbnyXl.js';
-import { V as VitestIndex } from '../vendor/index.CmILuxzC.js';
-import { s as setupCommonEnv } from '../vendor/setup-common.XeoZAW8t.js';
+import { V as VitestIndex } from '../vendor/index.DwR86H5i.js';
+import { s as setupCommonEnv } from '../vendor/setup-common.BhJvzjns.js';
 import { c as closeInspector } from '../vendor/inspector.hPQncR7V.js';
 import 'chai';
 import 'pathe';
@@ -23,8 +23,7 @@ import '@vitest/runner/utils';
 import '../vendor/index._7XLd8Kd.js';
 import '../vendor/env.bmJgw1qP.js';
 import 'std-env';
-import '../vendor/run-once.DLomgGUH.js';
-import '../vendor/vi.ClD3hi7L.js';
+import '../vendor/vi.C6AfDXK6.js';
 import '../vendor/_commonjsHelpers.BFTU3MAI.js';
 import '@vitest/expect';
 import '@vitest/snapshot';

package/dist/workers/threads.js

@@ -1,8 +1,8 @@
-import { r as runBaseTests } from '../vendor/base.VFkIJ66g.js';
+import { r as runBaseTests } from '../vendor/base.D4XK-wRp.js';
 import { a as createThreadsRpcOptions } from '../vendor/utils.CUjzkRH7.js';
 import 'vite-node/client';
 import '../vendor/global.7bFbnyXl.js';
-import '../vendor/execute.CLLNVNnK.js';
+import '../vendor/execute.BHj6OMh4.js';
 import 'node:vm';
 import 'node:url';
 import 'node:fs';

package/dist/workers/vmForks.js

@@ -1,11 +1,11 @@
 import v8 from 'node:v8';
 import { c as createForksRpcOptions, u as unwrapSerializableConfig } from '../vendor/utils.CUjzkRH7.js';
-import { r as runVmTests } from '../vendor/vm.Bi3bljci.js';
+import { r as runVmTests } from '../vendor/vm.Ow-X2mkS.js';
 import '@vitest/utils';
 import 'node:vm';
 import 'node:url';
 import 'pathe';
-import '../chunks/runtime-console.CUES-L8X.js';
+import '../chunks/runtime-console.DiVMr5d4.js';
 import 'node:stream';
 import 'node:console';
 import 'node:path';
@@ -14,7 +14,7 @@ import '@vitest/runner/utils';
 import '../vendor/global.7bFbnyXl.js';
 import '../vendor/env.bmJgw1qP.js';
 import 'std-env';
-import '../vendor/execute.CLLNVNnK.js';
+import '../vendor/execute.BHj6OMh4.js';
 import 'node:fs';
 import 'vite-node/client';
 import 'vite-node/utils';

package/dist/workers/vmThreads.js

@@ -1,10 +1,10 @@
 import { a as createThreadsRpcOptions } from '../vendor/utils.CUjzkRH7.js';
-import { r as runVmTests } from '../vendor/vm.Bi3bljci.js';
+import { r as runVmTests } from '../vendor/vm.Ow-X2mkS.js';
 import '@vitest/utils';
 import 'node:vm';
 import 'node:url';
 import 'pathe';
-import '../chunks/runtime-console.CUES-L8X.js';
+import '../chunks/runtime-console.DiVMr5d4.js';
 import 'node:stream';
 import 'node:console';
 import 'node:path';
@@ -13,7 +13,7 @@ import '@vitest/runner/utils';
 import '../vendor/global.7bFbnyXl.js';
 import '../vendor/env.bmJgw1qP.js';
 import 'std-env';
-import '../vendor/execute.CLLNVNnK.js';
+import '../vendor/execute.BHj6OMh4.js';
 import 'node:fs';
 import 'vite-node/client';
 import 'vite-node/utils';

package/dist/workers.d.ts

@@ -1,5 +1,5 @@
 import * as v8 from 'v8';
-import { d as BirpcOptions, e as RuntimeRPC, f as ContextRPC, W as WorkerGlobalState, g as WorkerContext, R as ResolvedConfig } from './reporters-DFgqsvtL.js';
+import { d as BirpcOptions, e as RuntimeRPC, f as ContextRPC, W as WorkerGlobalState, g as WorkerContext, R as ResolvedConfig } from './reporters-qky6mwBH.js';
 import { Awaitable } from '@vitest/utils';
 import 'vite';
 import '@vitest/runner';

package/dist/workers.js

@@ -1,8 +1,8 @@
 export { c as createForksRpcOptions, a as createThreadsRpcOptions, u as unwrapSerializableConfig } from './vendor/utils.CUjzkRH7.js';
 export { p as provideWorkerState } from './vendor/global.7bFbnyXl.js';
 export { run as runVitestWorker } from './worker.js';
-export { r as runVmTests } from './vendor/vm.Bi3bljci.js';
-export { r as runBaseTests } from './vendor/base.VFkIJ66g.js';
+export { r as runVmTests } from './vendor/vm.Ow-X2mkS.js';
+export { r as runBaseTests } from './vendor/base.D4XK-wRp.js';
 import '@vitest/utils';
 import 'node:url';
 import 'tinypool';
@@ -17,14 +17,14 @@ import 'node:module';
 import './vendor/rpc.DRDE9Pu1.js';
 import './vendor/index.BpSiYbpB.js';
 import 'node:vm';
-import './chunks/runtime-console.CUES-L8X.js';
+import './chunks/runtime-console.DiVMr5d4.js';
 import 'node:stream';
 import 'node:path';
 import './vendor/date.BKM1wewY.js';
 import '@vitest/runner/utils';
 import './vendor/env.bmJgw1qP.js';
 import 'std-env';
-import './vendor/execute.CLLNVNnK.js';
+import './vendor/execute.BHj6OMh4.js';
 import 'vite-node/utils';
 import '@vitest/utils/error';
 import './path.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vitest",
   "type": "module",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.5",
   "description": "Next generation testing framework powered by Vite",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -119,8 +119,8 @@
     "@types/node": "^18.0.0 || >=20.0.0",
     "happy-dom": "*",
     "jsdom": "*",
-    "@vitest/ui": "2.0.0-beta.2",
-    "@vitest/browser": "2.0.0-beta.2"
+    "@vitest/browser": "2.0.0-beta.5",
+    "@vitest/ui": "2.0.0-beta.5"
   },
   "peerDependenciesMeta": {
     "@edge-runtime/vm": {
@@ -151,15 +151,15 @@
     "picocolors": "^1.0.0",
     "std-env": "^3.7.0",
     "tinybench": "^2.8.0",
-    "tinypool": "^0.8.4",
+    "tinypool": "^0.9.0",
     "vite": "^5.0.0",
     "why-is-node-running": "^2.2.2",
-    "@vitest/expect": "2.0.0-beta.2",
-    "@vitest/runner": "2.0.0-beta.2",
-    "@vitest/spy": "2.0.0-beta.2",
-    "@vitest/snapshot": "2.0.0-beta.2",
-    "@vitest/utils": "2.0.0-beta.2",
-    "vite-node": "2.0.0-beta.2"
+    "@vitest/expect": "2.0.0-beta.5",
+    "@vitest/runner": "2.0.0-beta.5",
+    "@vitest/utils": "2.0.0-beta.5",
+    "@vitest/spy": "2.0.0-beta.5",
+    "@vitest/snapshot": "2.0.0-beta.5",
+    "vite-node": "2.0.0-beta.5"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.3.0",

package/dist/vendor/run-once.DLomgGUH.js

@@ -1,27 +0,0 @@
-import { g as getWorkerState } from './global.7bFbnyXl.js';
-
-const filesCount = /* @__PURE__ */ new Map();
-const cache = /* @__PURE__ */ new Map();
-function runOnce(fn, key) {
-  const filepath = getWorkerState().filepath || "__unknown_files__";
-  if (!key) {
-    filesCount.set(filepath, (filesCount.get(filepath) || 0) + 1);
-    key = String(filesCount.get(filepath));
-  }
-  const id = `${filepath}:${key}`;
-  if (!cache.has(id))
-    cache.set(id, fn());
-  return cache.get(id);
-}
-function isFirstRun() {
-  let firstRun = false;
-  runOnce(() => {
-    firstRun = true;
-  }, "__vitest_first_run__");
-  return firstRun;
-}
-function resetRunOnceCounter() {
-  filesCount.clear();
-}
-
-export { runOnce as a, isFirstRun as i, resetRunOnceCounter as r };