vitest 0.0.79 → 0.0.80

package/dist/cli.js

@@ -4,7 +4,7 @@ import path, { isAbsolute, relative, dirname, basename, resolve } from 'path';
 import process$2 from 'process';
 import { promises } from 'fs';
 import { createServer } from 'vite';
-import { d as defaultIncludes, a as defaultExcludes, b as defaultPort, c as configFiles, e as distDir } from './constants-2435fa16.js';
+import { d as defaultIncludes, a as defaultExcludes, b as defaultPort, c as configFiles, e as distDir } from './constants-9da0006f.js';
 import { performance } from 'perf_hooks';
 import { g as getNames, s as slash, a as getTests, b as getSuites, t as toArray, h as hasFailed } from './utils-9dcc4050.js';
 import require$$0 from 'assert';
@@ -632,7 +632,7 @@ const cac = (name = "") => new CAC(name);
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-var version = "0.0.79";
+var version = "0.0.80";
 
 /*
 How it works:
@@ -2182,7 +2182,7 @@ async function initVitest(options = {}) {
         },
         async configureServer(server2) {
           if (resolved.api)
-            server2.middlewares.use((await import('./middleware-37267df8.js')).default());
+            server2.middlewares.use((await import('./middleware-fe2b1f7f.js')).default());
         }
       }
     ],

package/dist/{constants-2435fa16.js → constants-9da0006f.js}

@@ -22,10 +22,9 @@ const globalApis = [
   "chai",
   "expect",
   "assert",
-  "sinon",
   "spy",
-  "mock",
-  "stub",
+  "spyOn",
+  "vitest",
   "beforeAll",
   "afterAll",
   "beforeEach",

package/dist/entry.js

@@ -2,7 +2,6 @@ import { Console } from 'console';
 import { Writable } from 'stream';
 import { importModule } from 'local-pkg';
 import chai, { expect, util } from 'chai';
-import SinonChai from 'sinon-chai';
 import Subset from 'chai-subset';
 import path, { basename } from 'path';
 import { r as rpc, s as send } from './rpc-7de86f29.js';
@@ -3500,31 +3499,22 @@ function JestChaiExpect() {
       utils.expectTypes(this, ["number"]);
       return this.closeTo(number, numDigits);
     });
-    function isSpy(putativeSpy) {
-      return typeof putativeSpy === "function" && typeof putativeSpy.getCall === "function" && typeof putativeSpy.calledWithExactly === "function";
-    }
-    function isCall(putativeCall) {
-      return putativeCall && isSpy(putativeCall.proxy);
-    }
-    const assertIsMock = (assertion) => {
-      if (!isSpy(assertion._obj) && !isCall(assertion._obj))
-        throw new TypeError(`${utils.inspect(assertion._obj)} is not a spy or a call to a spy!`);
+    const getSpy = (assertion) => {
+      return assertion._obj;
     };
     def(["toHaveBeenCalledTimes", "toBeCalledTimes"], function(number) {
-      assertIsMock(this);
-      return this.callCount(number);
+      return this.assert(getSpy(this).callCount === number, "expected spy to be called #{exp} times", "expected spy to not be called #{exp} times", number);
     });
     def("toHaveBeenCalledOnce", function() {
-      assertIsMock(this);
-      return this.callCount(1);
+      return this.assert(getSpy(this).callCount === 1, "expected spy to be called once", "expected spy to not be called once", 1);
     });
     def(["toHaveBeenCalled", "toBeCalled"], function() {
-      assertIsMock(this);
-      return this.called;
+      return this.assert(getSpy(this).called, "expected spy to be called at least once", "expected spy to not be called at all", true);
     });
     def(["toHaveBeenCalledWith", "toBeCalledWith"], function(...args) {
-      assertIsMock(this);
-      return this.calledWith(...args);
+      const spy = getSpy(this);
+      const pass = spy.calls.some((callArg) => equals(callArg, args));
+      return this.assert(pass, "expected spy to be called with arguments: #{exp}", "expected spy to not be called with arguments: #{exp}", args);
     });
     const ordinalOf = (i) => {
       const j = i % 10;
@@ -3538,16 +3528,14 @@ function JestChaiExpect() {
       return `${i}th`;
     };
     def(["toHaveBeenNthCalledWith", "nthCalledWith"], function(times, ...args) {
-      assertIsMock(this);
-      const spy = utils.flag(this, "object");
-      const nthCall = spy.getCall(times - 1);
-      this.assert(nthCall.calledWith(...args), `expected ${ordinalOf(times)} spy call to have been called with #{exp}`, `expected ${ordinalOf(times)} spy call not to have been called with #{exp}`, args, nthCall.args);
+      const spy = getSpy(this);
+      const nthCall = spy.calls[times - 1];
+      this.assert(equals(nthCall, args), `expected ${ordinalOf(times)} spy call to have been called with #{exp}`, `expected ${ordinalOf(times)} spy call to not have been called with #{exp}`, args, nthCall);
     });
     def(["toHaveBeenLastCalledWith", "lastCalledWith"], function(...args) {
-      assertIsMock(this);
-      const spy = utils.flag(this, "object");
-      const lastCall = spy.getCall(spy.returnValues.length - 1);
-      this.assert(lastCall.calledWith(...args), "expected last spy call to have been called with #{exp}", "expected last spy call not to have been called with #{exp}", args, lastCall.args);
+      const spy = getSpy(this);
+      const lastCall = spy.calls.at(-1);
+      this.assert(equals(lastCall, args), "expected last spy call to have been called with #{exp}", "expected last spy call to not have been called with #{exp}", args, lastCall);
     });
     def(["toThrow", "toThrowError"], function(expected) {
       const negate = utils.flag(this, "negate");
@@ -3557,37 +3545,35 @@ function JestChaiExpect() {
         this.to.throw(expected);
     });
     def(["toHaveReturned", "toReturn"], function() {
-      assertIsMock(this);
-      const spy = utils.flag(this, "object");
-      const calledAndNotThrew = spy.called && !spy.alwaysThrew();
-      this.assert(calledAndNotThrew, "expected spy to be successfully called at least once", "expected spy not to be successfully called", calledAndNotThrew, !calledAndNotThrew);
+      const spy = getSpy(this);
+      const calledAndNotThrew = spy.called && !spy.results.some(([type]) => type === "error");
+      this.assert(calledAndNotThrew, "expected spy to be successfully called at least once", "expected spy to not be successfully called", calledAndNotThrew, !calledAndNotThrew);
     });
     def(["toHaveReturnedTimes", "toReturnTimes"], function(times) {
-      assertIsMock(this);
-      const spy = utils.flag(this, "object");
-      const successfullReturns = spy.getCalls().reduce((success, call) => call.threw() ? success : ++success, 0);
-      this.assert(successfullReturns === times, `expected spy to be successfully called ${times} times`, `expected spy not to be successfully called ${times} times`, `expected number of returns: ${times}`, `recieved number of returns: ${successfullReturns}`);
+      const spy = getSpy(this);
+      const successfullReturns = spy.results.reduce((success, [type]) => type === "error" ? success : ++success, 0);
+      this.assert(successfullReturns === times, `expected spy to be successfully called ${times} times`, `expected spy to not be successfully called ${times} times`, `expected number of returns: ${times}`, `recieved number of returns: ${successfullReturns}`);
     });
     def(["toHaveReturnedWith", "toReturnWith"], function(value) {
-      assertIsMock(this);
-      return this.returned(value);
+      const spy = getSpy(this);
+      const pass = spy.results.some(([type, result]) => type === "ok" && equals(value, result));
+      this.assert(pass, "expected spy to be successfully called with #{exp}", "expected spy to not be successfully called with #{exp}", value);
     });
     def(["toHaveLastReturnedWith", "lastReturnedWith"], function(value) {
-      assertIsMock(this);
-      const spy = utils.flag(this, "object");
-      const lastReturn = spy.lastCall.returned(value);
-      this.assert(lastReturn, "expected last spy call to return #{exp}", "expected last spy call not to return #{exp}", value, spy.lastCall.returnValue);
+      const spy = getSpy(this);
+      const lastResult = spy.returns.at(-1);
+      const pass = equals(lastResult, value);
+      this.assert(pass, "expected last spy call to return #{exp}", "expected last spy call to not return #{exp}", value, lastResult);
     });
     def(["toHaveNthReturnedWith", "nthReturnedWith"], function(nthCall, value) {
-      assertIsMock(this);
-      const spy = utils.flag(this, "object");
+      const spy = getSpy(this);
       const isNot = utils.flag(this, "negate");
-      const call = spy.getCall(nthCall - 1);
+      const [callType, callResult] = spy.results[nthCall - 1];
       const ordinalCall = `${ordinalOf(nthCall)} call`;
-      if (!isNot && call.threw())
+      if (!isNot && callType === "error")
         chai.assert.fail(`expected ${ordinalCall} to return #{exp}, but instead it threw an error`);
-      const nthCallReturn = call.returned(value);
-      this.assert(nthCallReturn, `expected ${ordinalCall} spy call to return #{exp}`, `expected ${ordinalCall} spy call not to return #{exp}`, value, call.returnValue);
+      const nthCallReturn = equals(callResult, value);
+      this.assert(nthCallReturn, `expected ${ordinalCall} spy call to return #{exp}`, `expected ${ordinalCall} spy call to not return #{exp}`, value, callResult);
     });
   };
 }
@@ -3596,7 +3582,6 @@ let installed = false;
 async function setupChai() {
   if (installed)
     return;
-  chai.use(SinonChai);
   chai.use(JestExtend());
   chai.use(JestChaiExpect());
   chai.use(Subset);
@@ -3612,7 +3597,7 @@ async function setupGlobalEnv(config) {
   setupConsoleLogSpy();
   await setupChai();
   if (config.global)
-    (await import('./global-38c2f902.js')).registerApiGlobally();
+    (await import('./global-6446cca1.js')).registerApiGlobally();
 }
 function setupConsoleLogSpy() {
   const stdout = new Writable({

package/dist/{global-38c2f902.js → global-6446cca1.js}

@@ -1,11 +1,11 @@
-import { g as globalApis } from './constants-2435fa16.js';
-import { i as index } from './index-6feda5ef.js';
+import { g as globalApis } from './constants-9da0006f.js';
+import { i as index } from './index-16a06164.js';
 import 'path';
 import 'url';
 import './suite-95be5909.js';
 import './index-9e71c815.js';
 import 'chai';
-import 'sinon';
+import 'tinyspy';
 
 function registerApiGlobally() {
   globalApis.forEach((api) => {

package/dist/{index-6feda5ef.js → index-16a06164.js}

@@ -1,14 +1,16 @@
 import { g as getCurrentSuite, w as withTimeout, a as getDefaultHookTimeout, s as suite, t as test, d as describe, i as it } from './suite-95be5909.js';
 import chai, { assert, should, expect } from 'chai';
-import sinon from 'sinon';
+import { spyOn, spy } from 'tinyspy';
 
 const beforeAll = (fn, timeout) => getCurrentSuite().on("beforeAll", withTimeout(fn, timeout ?? getDefaultHookTimeout()));
 const afterAll = (fn, timeout) => getCurrentSuite().on("afterAll", withTimeout(fn, timeout ?? getDefaultHookTimeout()));
 const beforeEach = (fn, timeout) => getCurrentSuite().on("beforeEach", withTimeout(fn, timeout ?? getDefaultHookTimeout()));
 const afterEach = (fn, timeout) => getCurrentSuite().on("afterEach", withTimeout(fn, timeout ?? getDefaultHookTimeout()));
 
-const { mock, spy, stub } = sinon;
-sinon.fn = sinon.spy;
+const vitest = {
+  spyOn,
+  fn: spy
+};
 
 var index = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -24,10 +26,9 @@ var index = /*#__PURE__*/Object.freeze({
   should: should,
   expect: expect,
   chai: chai,
-  sinon: sinon,
-  mock: mock,
   spy: spy,
-  stub: stub
+  spyOn: spyOn,
+  vitest: vitest
 });
 
-export { afterAll as a, beforeAll as b, beforeEach as c, afterEach as d, stub as e, index as i, mock as m, spy as s };
+export { afterAll as a, beforeAll as b, beforeEach as c, afterEach as d, index as i, vitest as v };

package/dist/index.d.ts

@@ -3,8 +3,8 @@ import { TransformResult, ViteDevServer } from 'vite';
 import { OptionsReceived } from 'pretty-format';
 import { MessagePort } from 'worker_threads';
 export { assert, default as chai, expect, should } from 'chai';
-import sinon from 'sinon';
-export { default as sinon } from 'sinon';
+import { spyOn, spy } from 'tinyspy';
+export { spy, spyOn } from 'tinyspy';
 
 declare const EXPECTED_COLOR: Formatter;
 declare const RECEIVED_COLOR: Formatter;
@@ -567,9 +567,10 @@ declare const afterAll: (fn: SuiteHooks['afterAll'][0], timeout?: number | undef
 declare const beforeEach: (fn: SuiteHooks['beforeEach'][0], timeout?: number | undefined) => void;
 declare const afterEach: (fn: SuiteHooks['afterEach'][0], timeout?: number | undefined) => void;
 
-declare const mock: sinon.SinonMockStatic;
-declare const spy: sinon.SinonSpyStatic;
-declare const stub: sinon.SinonStubStatic;
+declare const vitest: {
+    spyOn: typeof spyOn;
+    fn: typeof spy;
+};
 
 declare module 'vite' {
     interface UserConfig {
@@ -636,4 +637,4 @@ declare global {
     }
 }
 
-export { Arrayable, Awaitable, CliOptions, ComputeMode, Environment, EnvironmentReturn, File, HookListener, ModuleCache, Nullable, Reporter, ResolvedConfig, RpcCall, RpcMap, RpcPayload, RpcSend, RunMode, RuntimeContext, SnapshotData, SnapshotMatchOptions, SnapshotResult, SnapshotStateOptions, SnapshotSummary, SnapshotUpdateState, Suite, SuiteCollector, SuiteHooks, Task, TaskBase, TaskResult, TaskResultPack, TaskState, Test, TestCollector, TestFactory, TestFunction, UncheckedSnapshot, UserConsoleLog, UserOptions, VitestContext, WorkerContext, afterAll, afterEach, beforeAll, beforeEach, describe, it, mock, spy, stub, suite, test };
+export { Arrayable, Awaitable, CliOptions, ComputeMode, Environment, EnvironmentReturn, File, HookListener, ModuleCache, Nullable, Reporter, ResolvedConfig, RpcCall, RpcMap, RpcPayload, RpcSend, RunMode, RuntimeContext, SnapshotData, SnapshotMatchOptions, SnapshotResult, SnapshotStateOptions, SnapshotSummary, SnapshotUpdateState, Suite, SuiteCollector, SuiteHooks, Task, TaskBase, TaskResult, TaskResultPack, TaskState, Test, TestCollector, TestFactory, TestFunction, UncheckedSnapshot, UserConsoleLog, UserOptions, VitestContext, WorkerContext, afterAll, afterEach, beforeAll, beforeEach, describe, it, suite, test, vitest };

package/dist/index.js

@@ -1,5 +1,5 @@
 export { d as describe, i as it, s as suite, t as test } from './suite-95be5909.js';
-export { a as afterAll, d as afterEach, b as beforeAll, c as beforeEach, m as mock, s as spy, e as stub } from './index-6feda5ef.js';
+export { a as afterAll, d as afterEach, b as beforeAll, c as beforeEach, v as vitest } from './index-16a06164.js';
 export { assert, default as chai, expect, should } from 'chai';
-export { default as sinon } from 'sinon';
+export { spy, spyOn } from 'tinyspy';
 import './index-9e71c815.js';

package/dist/{middleware-37267df8.js → middleware-fe2b1f7f.js}

@@ -1,5 +1,5 @@
 import { stringify } from 'flatted';
-import { A as API_PATH } from './constants-2435fa16.js';
+import { A as API_PATH } from './constants-9da0006f.js';
 import 'path';
 import 'url';
 

package/dist/worker.js

@@ -1,6 +1,6 @@
 import { resolve, dirname } from 'path';
 import { n as nanoid } from './index-9e71c815.js';
-import { e as distDir } from './constants-2435fa16.js';
+import { e as distDir } from './constants-9da0006f.js';
 import { builtinModules, createRequire } from 'module';
 import { pathToFileURL, fileURLToPath } from 'url';
 import vm from 'vm';

package/global.d.ts

@@ -5,10 +5,9 @@ declare global {
   const it: typeof import('vitest')['it']
   const expect: typeof import('vitest')['expect']
   const assert: typeof import('vitest')['assert']
-  const sinon: typeof import('vitest')['sinon']
   const spy: typeof import('vitest')['spy']
-  const mock: typeof import('vitest')['mock']
-  const stub: typeof import('vitest')['stub']
+  const spyOn: typeof import('vitest')['spyOn']
+  const vitest: typeof import('vitest')['vitest']
   const beforeAll: typeof import('vitest')['beforeAll']
   const afterAll: typeof import('vitest')['afterAll']
   const beforeEach: typeof import('vitest')['beforeEach']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.0.79",
+  "version": "0.0.80",
   "description": "A blazing fast unit test framework powered by Vite",
   "keywords": [
     "vite",
@@ -41,8 +41,6 @@
   "dependencies": {
     "@types/chai": "^4.3.0",
     "@types/chai-subset": "^1.3.3",
-    "@types/sinon": "^10.0.6",
-    "@types/sinon-chai": "^3.2.6",
     "chai": "^4.3.4",
     "chai-subset": "^1.6.0",
     "fast-glob": "^3.2.7",
@@ -50,9 +48,8 @@
     "local-pkg": "^0.4.0",
     "micromatch": "^4.0.4",
     "piscina": "^3.2.0",
-    "sinon": "^12.0.1",
-    "sinon-chai": "^3.7.0",
-    "source-map": "^0.7.3"
+    "source-map": "^0.7.3",
+    "tinyspy": "^0.0.6"
   },
   "devDependencies": {
     "@types/diff": "^5.0.1",