vitest 0.0.125 → 0.0.126

package/dist/cli.js

@@ -8,7 +8,7 @@ import { m as mergeStream, g as getStream, c as crossSpawn } from './index-6e709
 import require$$0, { constants } from 'os';
 import { s as signalExit } from './index-648e7ab2.js';
 import { e as ensurePackageInstalled } from './index-9fdde2e8.js';
-import { c as createVitest } from './index-37193236.js';
+import { c as createVitest } from './index-e04b9e4c.js';
 import './_commonjsHelpers-c9e3b764.js';
 import 'fs';
 import 'stream';
@@ -1700,7 +1700,7 @@ function execa(file, args, options) {
 	return mergePromise(spawned, handlePromiseOnce);
 }
 
-var version = "0.0.125";
+var version = "0.0.126";
 
 const CLOSE_TIMEOUT = 1e3;
 const cli = cac("vitest");

package/dist/entry.js

@@ -1,5 +1,5 @@
 import fs, { promises } from 'fs';
-import { f as format_1, h as getSerializers, p as plugins_1, b as getState, j as equals, k as iterableEquality, l as subsetEquality, m as isA, J as JestChaiExpect, n as clearContext, o as defaultSuite, q as setHooks, r as getHooks, u as context, s as setState, x as getFn, e as vi } from './vi-56df0b20.js';
+import { f as format_1, h as getSerializers, p as plugins_1, j as equals, b as getState, k as iterableEquality, l as subsetEquality, m as isA, J as JestChaiExpect, n as clearContext, o as defaultSuite, q as setHooks, r as getHooks, u as context, s as setState, x as getFn, e as vi } from './vi-5ff3926d.js';
 import { Console } from 'console';
 import { Writable } from 'stream';
 import { importModule } from 'local-pkg';
@@ -11,7 +11,7 @@ import { l as getOriginalPos, m as posToNumber, n as parseStacktrace, u as unifi
 import { performance as performance$1 } from 'perf_hooks';
 import { createHash } from 'crypto';
 import { format } from 'util';
-import './jest-mock-038a01b3.js';
+import './jest-mock-30625866.js';
 import 'tinyspy';
 import 'url';
 import 'tty';
@@ -985,12 +985,11 @@ const getMatcherState = (assertion) => {
     iterableEquality,
     subsetEquality
   });
-  const matcherState = __spreadProps(__spreadValues({
+  const matcherState = __spreadProps(__spreadValues({}, getState()), {
     isNot,
     utils: jestUtils,
     promise,
-    equals
-  }, getState()), {
+    equals,
     suppressedErrors: []
   });
   return {
@@ -1226,7 +1225,7 @@ async function setupGlobalEnv(config) {
   setupConsoleLogSpy();
   await setupChai();
   if (config.global)
-    (await import('./global-3b7dd162.js')).registerApiGlobally();
+    (await import('./global-eb23b22e.js')).registerApiGlobally();
 }
 function setupConsoleLogSpy() {
   const stdout = new Writable({

package/dist/{global-3b7dd162.js → global-eb23b22e.js}

@@ -1,15 +1,15 @@
 import { g as globalApis } from './constants-8b3a9b31.js';
-import { i as index } from './index-7f52a6d6.js';
+import { i as index } from './index-4b6e78b4.js';
 import 'url';
 import './index-9fdde2e8.js';
 import 'tty';
 import 'local-pkg';
 import 'path';
-import './vi-56df0b20.js';
-import './_commonjsHelpers-c9e3b764.js';
-import './jest-mock-038a01b3.js';
+import './vi-5ff3926d.js';
+import './jest-mock-30625866.js';
 import 'chai';
 import 'tinyspy';
+import './_commonjsHelpers-c9e3b764.js';
 
 function registerApiGlobally() {
   globalApis.forEach((api) => {

package/dist/{index-7f52a6d6.js → index-4b6e78b4.js}

@@ -1,6 +1,6 @@
-import { g as getCurrentSuite, w as withTimeout, a as getDefaultHookTimeout, b as getState, s as setState, c as suite, t as test, d as describe, i as it, v as vitest, e as vi } from './vi-56df0b20.js';
+import { g as getCurrentSuite, w as withTimeout, a as getDefaultHookTimeout, b as getState, s as setState, c as suite, t as test, d as describe, i as it, v as vitest, e as vi } from './vi-5ff3926d.js';
 import chai, { assert, should } from 'chai';
-import { s as spies, a as spyOn, f as fn } from './jest-mock-038a01b3.js';
+import { s as spies, i as isMockFunction, a as spyOn, f as fn } from './jest-mock-30625866.js';
 
 const beforeAll = (fn, timeout) => getCurrentSuite().on("beforeAll", withTimeout(fn, timeout ?? getDefaultHookTimeout()));
 const afterAll = (fn, timeout) => getCurrentSuite().on("afterAll", withTimeout(fn, timeout ?? getDefaultHookTimeout()));
@@ -29,6 +29,7 @@ var index = /*#__PURE__*/Object.freeze({
   chai: chai,
   expect: expect,
   spies: spies,
+  isMockFunction: isMockFunction,
   spyOn: spyOn,
   fn: fn,
   vitest: vitest,

package/dist/{index-37193236.js → index-e04b9e4c.js}

@@ -7597,7 +7597,6 @@ createLogUpdate(process$1.stdout);
 createLogUpdate(process$1.stderr);
 
 const DURATION_LONG = 300;
-const MAX_HEIGHT = 20;
 const outputMap = new WeakMap();
 function formatFilepath(path) {
   const lastSlash = Math.max(path.lastIndexOf("/") + 1, 0);
@@ -7643,7 +7642,7 @@ function renderTree(tasks, options, level = 0) {
         output = output.concat(renderTree(task.tasks, options, level + 1));
     }
   }
-  return output.slice(0, MAX_HEIGHT).join("\n");
+  return output.join("\n");
 }
 const createListRenderer = (_tasks, options) => {
   let tasks = _tasks;

package/dist/index.d.ts

@@ -822,6 +822,7 @@ interface MockWithArgs<T extends MockableFunction> extends JestMockCompatFn<Argu
     (...args: ArgumentsOf<T>): ReturnType<T>;
 }
 declare const spies: Set<JestMockCompat<any[], any>>;
+declare function isMockFunction(fn: any): fn is EnhancedSpy;
 declare function spyOn<T, K extends keyof T>(obj: T, method: K, accessType?: 'get' | 'set'): T[K] extends (...args: infer TArgs) => infer TReturnValue ? JestMockCompat<TArgs, TReturnValue> : JestMockCompat;
 declare type Awaited<T> = T extends Promise<infer R> ? R : never;
 declare function fn<TArgs extends any[] = any[], R = any>(): JestMockCompatFn<TArgs, R>;
@@ -899,7 +900,7 @@ declare class VitestUtils {
      */
     mocked<T>(item: T, deep?: false): MaybeMocked<T>;
     mocked<T>(item: T, deep: true): MaybeMockedDeep<T>;
-    isMockFunction(fn: any): any;
+    isMockFunction(fn: any): fn is EnhancedSpy;
     clearAllMocks(): this;
     resetAllMocks(): this;
     restoreAllMocks(): this;
@@ -1011,4 +1012,4 @@ declare global {
     }
 }
 
-export { ArgumentsOf, ArgumentsType, Arrayable, Awaitable, BuiltinEnvironment, ConstructorArgumentsOf, DoneCallback, EnhancedSpy, Environment, EnvironmentReturn, ErrorWithDiff, File, HookListener, InlineConfig, JestMockCompat, JestMockCompatContext, JestMockCompatFn, MaybeMocked, MaybeMockedConstructor, MaybeMockedDeep, MethodKeysOf, MockWithArgs, MockableFunction, MockedFunction, MockedFunctionDeep, MockedObject, MockedObjectDeep, ModuleCache, Nullable, ParsedStack, Position, PropertyKeysOf, Reporter, ResolvedConfig, RunMode, RuntimeContext, SnapshotData, SnapshotMatchOptions, SnapshotResult, SnapshotStateOptions, SnapshotSummary, SnapshotUpdateState, Suite, SuiteCollector, SuiteHooks, Task, TaskBase, TaskResult, TaskResultPack, TaskState, Test, TestCollector, TestFactory, TestFunction, UncheckedSnapshot, UserConfig, UserConsoleLog, WebSocketEvents, WebSocketHandlers, WorkerContext, WorkerRPC, afterAll, afterEach, beforeAll, beforeEach, describe, expect, fn, it, spies, spyOn, suite, test, vi, vitest };
+export { ArgumentsOf, ArgumentsType, Arrayable, Awaitable, BuiltinEnvironment, ConstructorArgumentsOf, DoneCallback, EnhancedSpy, Environment, EnvironmentReturn, ErrorWithDiff, File, HookListener, InlineConfig, JestMockCompat, JestMockCompatContext, JestMockCompatFn, MaybeMocked, MaybeMockedConstructor, MaybeMockedDeep, MethodKeysOf, MockWithArgs, MockableFunction, MockedFunction, MockedFunctionDeep, MockedObject, MockedObjectDeep, ModuleCache, Nullable, ParsedStack, Position, PropertyKeysOf, Reporter, ResolvedConfig, RunMode, RuntimeContext, SnapshotData, SnapshotMatchOptions, SnapshotResult, SnapshotStateOptions, SnapshotSummary, SnapshotUpdateState, Suite, SuiteCollector, SuiteHooks, Task, TaskBase, TaskResult, TaskResultPack, TaskState, Test, TestCollector, TestFactory, TestFunction, UncheckedSnapshot, UserConfig, UserConsoleLog, WebSocketEvents, WebSocketHandlers, WorkerContext, WorkerRPC, afterAll, afterEach, beforeAll, beforeEach, describe, expect, fn, isMockFunction, it, spies, spyOn, suite, test, vi, vitest };

package/dist/index.js

@@ -1,6 +1,6 @@
-export { d as describe, i as it, c as suite, t as test, e as vi, v as vitest } from './vi-56df0b20.js';
-export { a as afterAll, d as afterEach, b as beforeAll, c as beforeEach, e as expect } from './index-7f52a6d6.js';
-export { f as fn, s as spies, a as spyOn } from './jest-mock-038a01b3.js';
+export { d as describe, i as it, c as suite, t as test, e as vi, v as vitest } from './vi-5ff3926d.js';
+export { a as afterAll, d as afterEach, b as beforeAll, c as beforeEach, e as expect } from './index-4b6e78b4.js';
+export { f as fn, i as isMockFunction, s as spies, a as spyOn } from './jest-mock-30625866.js';
 export { assert, default as chai, should } from 'chai';
 import './index-9fdde2e8.js';
 import 'url';

package/dist/{jest-mock-038a01b3.js → jest-mock-30625866.js}

@@ -2,6 +2,9 @@ import { util } from 'chai';
 import * as tinyspy from 'tinyspy';
 
 const spies = new Set();
+function isMockFunction(fn2) {
+  return typeof fn2 === "function" && "__isSpy" in fn2 && fn2.__isSpy;
+}
 function spyOn(obj, method, accessType) {
   const dictionary = {
     get: "getter",
@@ -87,4 +90,4 @@ function fn(implementation) {
   }) }, "fn"));
 }
 
-export { spyOn as a, fn as f, spies as s };
+export { spyOn as a, fn as f, isMockFunction as i, spies as s };

package/dist/node.js

@@ -1,4 +1,4 @@
-export { c as createVitest } from './index-37193236.js';
+export { c as createVitest } from './index-e04b9e4c.js';
 import 'fs';
 import './index-9fdde2e8.js';
 import 'url';

package/dist/{vi-56df0b20.js → vi-5ff3926d.js}

@@ -1,6 +1,6 @@
 import { n as noop, i as isObject } from './index-9fdde2e8.js';
+import { i as isMockFunction, a as spyOn, f as fn, s as spies } from './jest-mock-30625866.js';
 import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './_commonjsHelpers-c9e3b764.js';
-import { a as spyOn, f as fn, s as spies } from './jest-mock-038a01b3.js';
 
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
@@ -2861,12 +2861,7 @@ const JestChaiExpect = (chai, utils) => {
   def("toContainEqual", function(expected) {
     const obj = utils.flag(this, "object");
     const index = Array.from(obj).findIndex((item) => {
-      try {
-        chai.assert.deepEqual(item, expected);
-      } catch {
-        return false;
-      }
-      return true;
+      return equals(item, expected);
     });
     this.assert(index !== -1, "expected #{this} to deep equally contain #{exp}", "expected #{this} to not deep equally contain #{exp}", expected);
   });
@@ -2915,15 +2910,24 @@ const JestChaiExpect = (chai, utils) => {
   def("toHaveProperty", function(...args) {
     return this.have.deep.nested.property(...args);
   });
-  def("toBeCloseTo", function(number, numDigits = 2) {
-    utils.expectTypes(this, ["number"]);
-    return this.closeTo(number, numDigits);
+  def("toBeCloseTo", function(received, precision = 2) {
+    const expected = this._obj;
+    let pass = false;
+    let expectedDiff = 0;
+    let receivedDiff = 0;
+    if (received === Infinity && expected === Infinity) {
+      pass = true;
+    } else if (received === -Infinity && expected === -Infinity) {
+      pass = true;
+    } else {
+      expectedDiff = Math.pow(10, -precision) / 2;
+      receivedDiff = Math.abs(expected - received);
+      pass = receivedDiff < expectedDiff;
+    }
+    return this.assert(pass, `expected #{this} to be close to #{exp}, recieved difference is ${receivedDiff}, but expected ${expectedDiff}`, `expected #{this} to not be close to #{exp}, recieved difference is ${receivedDiff}, but expected ${expectedDiff}`, received, expected);
   });
-  function isSpy(putativeSpy) {
-    return typeof putativeSpy === "function" && "__isSpy" in putativeSpy && putativeSpy.__isSpy;
-  }
   const assertIsMock = (assertion) => {
-    if (!isSpy(assertion._obj))
+    if (!isMockFunction(assertion._obj))
       throw new TypeError(`${utils.inspect(assertion._obj)} is not a spy or a call to a spy!`);
   };
   const getSpy = (assertion) => {
@@ -2933,23 +2937,26 @@ const JestChaiExpect = (chai, utils) => {
   def(["toHaveBeenCalledTimes", "toBeCalledTimes"], function(number) {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
-    return this.assert(spy.callCount === number, `expected "${spyName}" to be called #{exp} times`, `expected "${spyName}" to not be called #{exp} times`, number, spy.callCount);
+    const callCount = spy.mock.calls.length;
+    return this.assert(callCount === number, `expected "${spyName}" to be called #{exp} times`, `expected "${spyName}" to not be called #{exp} times`, number, callCount);
   });
   def("toHaveBeenCalledOnce", function() {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
-    return this.assert(spy.callCount === 1, `expected "${spyName}" to be called once`, `expected "${spyName}" to not be called once`, 1, spy.callCount);
+    const callCount = spy.mock.calls.length;
+    return this.assert(callCount === 1, `expected "${spyName}" to be called once`, `expected "${spyName}" to not be called once`, 1, callCount);
   });
   def(["toHaveBeenCalled", "toBeCalled"], function() {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
-    return this.assert(spy.called, `expected "${spyName}" to be called at least once`, `expected "${spyName}" to not be called at all`, true, spy.called);
+    const called = spy.mock.calls.length > 0;
+    return this.assert(called, `expected "${spyName}" to be called at least once`, `expected "${spyName}" to not be called at all`, true, called);
   });
   def(["toHaveBeenCalledWith", "toBeCalledWith"], function(...args) {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
-    const pass = spy.calls.some((callArg) => equals(callArg, args, [iterableEquality]));
-    return this.assert(pass, `expected "${spyName}" to be called with arguments: #{exp}`, `expected "${spyName}" to not be called with arguments: #{exp}`, args, spy.calls);
+    const pass = spy.mock.calls.some((callArg) => equals(callArg, args, [iterableEquality]));
+    return this.assert(pass, `expected "${spyName}" to be called with arguments: #{exp}`, `expected "${spyName}" to not be called with arguments: #{exp}`, args, spy.mock.calls);
   });
   const ordinalOf = (i) => {
     const j = i % 10;
@@ -2965,44 +2972,40 @@ const JestChaiExpect = (chai, utils) => {
   def(["toHaveBeenNthCalledWith", "nthCalledWith"], function(times, ...args) {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
-    const nthCall = spy.calls[times - 1];
+    const nthCall = spy.mock.calls[times - 1];
     this.assert(equals(nthCall, args, [iterableEquality]), `expected ${ordinalOf(times)} "${spyName}" call to have been called with #{exp}`, `expected ${ordinalOf(times)} "${spyName}" call to not have been called with #{exp}`, args, nthCall);
   });
   def(["toHaveBeenLastCalledWith", "lastCalledWith"], function(...args) {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
-    const lastCall = spy.calls[spy.calls.length - 1];
+    const lastCall = spy.mock.calls[spy.calls.length - 1];
     this.assert(equals(lastCall, args, [iterableEquality]), `expected last "${spyName}" call to have been called with #{exp}`, `expected last "${spyName}" call to not have been called with #{exp}`, args, lastCall);
   });
   def(["toThrow", "toThrowError"], function(expected) {
-    const negate = utils.flag(this, "negate");
-    if (negate)
-      this.not.to.throw(expected);
-    else
-      this.to.throw(expected);
+    return this.to.throw(expected);
   });
   def(["toHaveReturned", "toReturn"], function() {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
-    const calledAndNotThrew = spy.called && !spy.results.some(([type]) => type === "error");
+    const calledAndNotThrew = spy.mock.calls.length > 0 && !spy.mock.results.some(({ type }) => type === "throw");
     this.assert(calledAndNotThrew, `expected "${spyName}" to be successfully called at least once`, `expected "${spyName}" to not be successfully called`, calledAndNotThrew, !calledAndNotThrew);
   });
   def(["toHaveReturnedTimes", "toReturnTimes"], function(times) {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
-    const successfullReturns = spy.results.reduce((success, [type]) => type === "error" ? success : ++success, 0);
+    const successfullReturns = spy.mock.results.reduce((success, { type }) => type === "throw" ? success : ++success, 0);
     this.assert(successfullReturns === times, `expected "${spyName}" to be successfully called ${times} times`, `expected "${spyName}" to not be successfully called ${times} times`, `expected number of returns: ${times}`, `received number of returns: ${successfullReturns}`);
   });
   def(["toHaveReturnedWith", "toReturnWith"], function(value) {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
-    const pass = spy.results.some(([type, result]) => type === "ok" && equals(value, result));
+    const pass = spy.mock.results.some(({ type, value: result }) => type === "return" && equals(value, result));
     this.assert(pass, `expected "${spyName}" to be successfully called with #{exp}`, `expected "${spyName}" to not be successfully called with #{exp}`, value);
   });
   def(["toHaveLastReturnedWith", "lastReturnedWith"], function(value) {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
-    const lastResult = spy.returns[spy.returns.length - 1];
+    const { value: lastResult } = spy.mock.results[spy.returns.length - 1];
     const pass = equals(lastResult, value);
     this.assert(pass, `expected last "${spyName}" call to return #{exp}`, `expected last "${spyName}" call to not return #{exp}`, value, lastResult);
   });
@@ -3010,9 +3013,9 @@ const JestChaiExpect = (chai, utils) => {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
     const isNot = utils.flag(this, "negate");
-    const [callType, callResult] = spy.results[nthCall - 1];
+    const { type: callType, value: callResult } = spy.mock.results[nthCall - 1];
     const ordinalCall = `${ordinalOf(nthCall)} call`;
-    if (!isNot && callType === "error")
+    if (!isNot && callType === "throw")
       chai.assert.fail(`expected ${ordinalCall} to return #{exp}, but instead it threw an error`);
     const nthCallReturn = equals(callResult, value);
     this.assert(nthCallReturn, `expected ${ordinalCall} "${spyName}" call to return #{exp}`, `expected ${ordinalCall} "${spyName}" call to not return #{exp}`, value, callResult);
@@ -3362,7 +3365,7 @@ class FakeTimers {
       this._setInterval,
       this._clearTimeout,
       this._clearInterval
-    ], 'timers are not mocked. try calling "vitest.useFakeTimers()" first');
+    ], 'timers are not mocked. try calling "vi.useFakeTimers()" first');
   }
 }
 
@@ -3419,7 +3422,7 @@ class VitestUtils {
     return item;
   }
   isMockFunction(fn2) {
-    return typeof fn2 === "function" && "__isSpy" in fn2 && fn2.__isSpy;
+    return isMockFunction(fn2);
   }
   clearAllMocks() {
     __vitest__clearMocks__({ clearMocks: true });

package/dist/worker.js

@@ -6,7 +6,7 @@ import { pathToFileURL, fileURLToPath } from 'url';
 import vm from 'vm';
 import { s as shouldExternalize } from './externalize-2f63779d.js';
 import { existsSync, readdirSync } from 'fs';
-import { a as spyOn, s as spies } from './jest-mock-038a01b3.js';
+import { a as spyOn, s as spies } from './jest-mock-30625866.js';
 import { r as rpc } from './rpc-8c7cc374.js';
 import 'tty';
 import 'local-pkg';
@@ -383,7 +383,7 @@ async function startViteNode(ctx) {
   return _viteNode;
 }
 function init(ctx) {
-  if (process.__vitest_worker__ && ctx.config.threads)
+  if (process.__vitest_worker__ && ctx.config.threads && ctx.config.isolate)
     throw new Error(`worker for ${ctx.files.join(",")} already initialized by ${process.__vitest_worker__.ctx.files.join(",")}. This is probably an internal bug of Vitest.`);
   process.stdout.write("\0");
   const { config, port } = ctx;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.0.125",
+  "version": "0.0.126",
   "description": "A blazing fast unit test framework powered by Vite",
   "keywords": [
     "vite",
@@ -91,7 +91,7 @@
     "strip-ansi": "^7.0.1",
     "typescript": "^4.5.4",
     "ws": "^8.4.0",
-    "@vitest/ui": "0.0.125"
+    "@vitest/ui": "0.0.126"
   },
   "peerDependencies": {
     "c8": "*",