vitest 0.18.0 → 0.18.1

package/LICENSE.md

@@ -1245,7 +1245,7 @@ Repository: unjs/mlly
 
 > MIT License
 > 
-> Copyright (c) 2021
+> Copyright (c) 2022 UnJS
 > 
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal

package/dist/{chunk-api-setup.63babd7c.mjs → chunk-api-setup.9d3f7670.mjs}

@@ -1,5 +1,5 @@
 import { promises } from 'fs';
-import { c as createBirpc } from './chunk-vite-node-utils.af8ead96.mjs';
+import { c as createBirpc } from './chunk-vite-node-utils.8077cd3c.mjs';
 import require$$0$1 from 'stream';
 import require$$0 from 'zlib';
 import require$$3 from 'net';
@@ -9,14 +9,14 @@ import require$$2 from 'events';
 import require$$1 from 'https';
 import require$$2$1 from 'http';
 import url from 'url';
-import { A as API_PATH } from './chunk-constants.8eb2ed35.mjs';
-import { j as interpretSourcePos, b as parseStacktrace } from './chunk-utils-source-map.957e7756.mjs';
+import { A as API_PATH } from './chunk-constants.d4406290.mjs';
+import { j as interpretSourcePos, b as parseStacktrace } from './chunk-utils-source-map.c03f8bc4.mjs';
 import 'module';
 import 'vm';
-import './chunk-utils-global.1b22c4fd.mjs';
+import './chunk-utils-global.0a7416cf.mjs';
+import 'path';
 import 'tty';
 import 'local-pkg';
-import 'path';
 import 'assert';
 import 'util';
 import 'debug';
@@ -3217,11 +3217,11 @@ function initAsClient(websocket, address, protocols, options) {
     ? parsedUrl.hostname.slice(1, -1)
     : parsedUrl.hostname;
   opts.headers = {
+    ...opts.headers,
     'Sec-WebSocket-Version': opts.protocolVersion,
     'Sec-WebSocket-Key': key,
     Connection: 'Upgrade',
-    Upgrade: 'websocket',
-    ...opts.headers
+    Upgrade: 'websocket'
   };
   opts.path = parsedUrl.pathname + parsedUrl.search;
   opts.timeout = opts.handshakeTimeout;
@@ -3275,8 +3275,11 @@ function initAsClient(websocket, address, protocols, options) {
 
   if (opts.followRedirects) {
     if (websocket._redirects === 0) {
+      websocket._originalUnixSocket = isUnixSocket;
       websocket._originalSecure = isSecure;
-      websocket._originalHost = parsedUrl.host;
+      websocket._originalHostOrSocketPath = isUnixSocket
+        ? opts.socketPath
+        : parsedUrl.host;
 
       const headers = options && options.headers;
 
@@ -3292,7 +3295,13 @@ function initAsClient(websocket, address, protocols, options) {
         }
       }
     } else if (websocket.listenerCount('redirect') === 0) {
-      const isSameHost = parsedUrl.host === websocket._originalHost;
+      const isSameHost = isUnixSocket
+        ? websocket._originalUnixSocket
+          ? opts.socketPath === websocket._originalHostOrSocketPath
+          : false
+        : websocket._originalUnixSocket
+        ? false
+        : parsedUrl.host === websocket._originalHostOrSocketPath;
 
       if (!isSameHost || (websocket._originalSecure && !isSecure)) {
         //

package/dist/{chunk-constants.8eb2ed35.mjs → chunk-constants.d4406290.mjs}

@@ -1,5 +1,5 @@
 import { fileURLToPath } from 'url';
-import { q as resolve } from './chunk-utils-global.1b22c4fd.mjs';
+import { q as resolve } from './chunk-utils-global.0a7416cf.mjs';
 
 const distDir = resolve(fileURLToPath(import.meta.url), "../../dist");
 const defaultPort = 51204;

package/dist/{chunk-env-node.26c72624.mjs → chunk-env-node.bbba78e5.mjs}

@@ -2,7 +2,7 @@ import { importModule } from 'local-pkg';
 import { existsSync, promises } from 'fs';
 import { createRequire } from 'module';
 import { pathToFileURL } from 'url';
-import { F as toArray, q as resolve } from './chunk-utils-global.1b22c4fd.mjs';
+import { F as toArray, q as resolve } from './chunk-utils-global.0a7416cf.mjs';
 
 var node = {
   name: "node",
@@ -533,6 +533,7 @@ const defaultCoverageExcludes = [
   "test{,s}/**",
   "test{,-*}.{js,cjs,mjs,ts,tsx,jsx}",
   "**/*{.,-}test.{js,cjs,mjs,ts,tsx,jsx}",
+  "**/*{.,-}spec.{js,cjs,mjs,ts,tsx,jsx}",
   "**/__tests__/**",
   "**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc}.config.{js,cjs,mjs,ts}",
   "**/.{eslint,mocha,prettier}rc.{js,cjs,yml}"

package/dist/chunk-integrations-globals.00b6e1ad.mjs

@@ -0,0 +1,23 @@
+import { g as globalApis } from './chunk-constants.d4406290.mjs';
+import { i as index } from './chunk-runtime-chain.b60d57da.mjs';
+import 'url';
+import './chunk-utils-global.0a7416cf.mjs';
+import 'path';
+import 'tty';
+import 'local-pkg';
+import 'util';
+import 'chai';
+import './vendor-_commonjsHelpers.4da45ef5.mjs';
+import './chunk-runtime-rpc.9d1f4c48.mjs';
+import 'fs';
+import './chunk-utils-source-map.c03f8bc4.mjs';
+import './spy.mjs';
+import 'tinyspy';
+
+function registerApiGlobally() {
+  globalApis.forEach((api) => {
+    globalThis[api] = index[api];
+  });
+}
+
+export { registerApiGlobally };

package/dist/{chunk-runtime-chain.eb764dff.mjs → chunk-runtime-chain.b60d57da.mjs}

@@ -1,11 +1,11 @@
-import chai$1, { expect, AssertionError, util } from 'chai';
+import require$$0, { format } from 'util';
+import { i as isObject, j as join, d as dirname, g as getCallLastIndex, s as slash, a as getWorkerState, b as getNames, c as assertTypes, p as picocolors, e as getFullName, f as safeSetTimeout, h as safeClearTimeout, n as noop, R as RealDate, r as resetDate, m as mockDate, k as resetModules } from './chunk-utils-global.0a7416cf.mjs';
+import chai$1, { expect, AssertionError, util, assert, should } from 'chai';
 import { c as commonjsGlobal } from './vendor-_commonjsHelpers.4da45ef5.mjs';
-import { r as rpc } from './chunk-runtime-rpc.cc6a06a2.mjs';
-import { i as isObject, j as join, d as dirname, g as getCallLastIndex, s as slash, a as getWorkerState, b as getNames, c as assertTypes, p as picocolors, e as getFullName, f as safeSetTimeout, h as safeClearTimeout, n as noop, R as RealDate, r as resetDate, m as mockDate, k as resetModules } from './chunk-utils-global.1b22c4fd.mjs';
+import { r as rpc } from './chunk-runtime-rpc.9d1f4c48.mjs';
 import fs, { promises } from 'fs';
-import { p as plugins_1, f as format_1, g as getOriginalPos, a as posToNumber, n as numberToPos, l as lineSplitRE, b as parseStacktrace, u as unifiedDiff, s as stringify, m as matcherUtils } from './chunk-utils-source-map.957e7756.mjs';
-import { i as isMockFunction, s as spyOn, f as fn, a as spies } from './chunk-integrations-spy.674b628e.mjs';
-import require$$0, { format } from 'util';
+import { p as plugins_1, f as format_1, g as getOriginalPos, a as posToNumber, n as numberToPos, l as lineSplitRE, b as parseStacktrace, u as unifiedDiff, s as stringify, m as matcherUtils } from './chunk-utils-source-map.c03f8bc4.mjs';
+import { isMockFunction, spyOn, fn, spies } from './spy.mjs';
 
 function createChainable(keys, fn) {
   function create(obj) {
@@ -4799,4 +4799,28 @@ function isWatchMode() {
   return getRunningMode() === "watch";
 }
 
-export { getState as A, GLOBAL_EXPECT as G, isFirstRun as a, beforeAll as b, afterAll as c, describe as d, beforeEach as e, afterEach as f, createExpect as g, globalExpect as h, it as i, vi as j, getRunningMode as k, isWatchMode as l, resetRunOnceCounter as m, clearCollectorContext as n, defaultSuite as o, setHooks as p, getHooks as q, runOnce as r, suite as s, test as t, collectorContext as u, vitest as v, withCallback as w, getSnapshotClient as x, setState as y, getFn as z };
+var index = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  suite: suite,
+  test: test,
+  describe: describe,
+  it: it,
+  runOnce: runOnce,
+  isFirstRun: isFirstRun,
+  beforeAll: beforeAll,
+  afterAll: afterAll,
+  beforeEach: beforeEach,
+  afterEach: afterEach,
+  withCallback: withCallback,
+  assert: assert,
+  should: should,
+  createExpect: createExpect,
+  chai: chai$1,
+  expect: globalExpect,
+  vitest: vitest,
+  vi: vi,
+  getRunningMode: getRunningMode,
+  isWatchMode: isWatchMode
+});
+
+export { getRunningMode as A, isWatchMode as B, GLOBAL_EXPECT as G, collectorContext as a, getSnapshotClient as b, clearCollectorContext as c, defaultSuite as d, setState as e, getFn as f, getHooks as g, getState as h, index as i, suite as j, describe as k, it as l, runOnce as m, isFirstRun as n, beforeAll as o, afterAll as p, beforeEach as q, resetRunOnceCounter as r, setHooks as s, test as t, afterEach as u, vi as v, withCallback as w, createExpect as x, globalExpect as y, vitest as z };

package/dist/{chunk-runtime-mocker.79ccc3de.mjs → chunk-runtime-mocker.1d853e3a.mjs}

@@ -1,9 +1,30 @@
-import { n as normalizeRequestId, i as isNodeBuiltin, b as toFilePath, V as ViteNodeRunner } from './chunk-vite-node-utils.af8ead96.mjs';
+import { n as normalizeRequestId, i as isNodeBuiltin, b as toFilePath, V as ViteNodeRunner } from './chunk-vite-node-utils.8077cd3c.mjs';
 import { normalizePath } from 'vite';
-import { a as getWorkerState, M as isWindows, N as mergeSlashes, d as dirname, j as join, o as basename, q as resolve, O as getType, P as getAllProperties, s as slash } from './chunk-utils-global.1b22c4fd.mjs';
+import { a as getWorkerState, M as isWindows, N as mergeSlashes, d as dirname, j as join, o as basename, q as resolve, s as slash, O as getType, P as getAllProperties } from './chunk-utils-global.0a7416cf.mjs';
 import { existsSync, readdirSync } from 'fs';
-import { d as distDir } from './chunk-constants.8eb2ed35.mjs';
+import { d as distDir } from './chunk-constants.d4406290.mjs';
 
+class RefTracker {
+  constructor() {
+    this.idMap = /* @__PURE__ */ new Map();
+    this.mockedValueMap = /* @__PURE__ */ new Map();
+  }
+  getId(value) {
+    return this.idMap.get(value);
+  }
+  getMockedValue(id) {
+    return this.mockedValueMap.get(id);
+  }
+  track(originalValue, mockedValue) {
+    const newId = this.idMap.size;
+    this.idMap.set(originalValue, newId);
+    this.mockedValueMap.set(newId, mockedValue);
+    return newId;
+  }
+}
+function isSpecialProp(prop, parentType) {
+  return parentType.includes("Function") && typeof prop === "string" && ["arguments", "callee", "caller", "length", "name"].includes(prop);
+}
 const _VitestMocker = class {
   constructor(options, moduleCache, request) {
     this.options = options;
@@ -91,27 +112,54 @@ const _VitestMocker = class {
     const fullPath = resolve(dir, "__mocks__", baseId);
     return existsSync(fullPath) ? fullPath : null;
   }
-  mockValue(value) {
+  mockObject(object) {
     if (!_VitestMocker.spyModule) {
       throw new Error("Error: Spy module is not defined. This is likely an internal bug in Vitest. Please report it to https://github.com/vitest-dev/vitest/issues");
     }
-    const type = getType(value);
-    if (Array.isArray(value))
-      return [];
-    else if (type !== "Object" && type !== "Module")
-      return value;
-    const newObj = {};
-    const properties = getAllProperties(value);
-    for (const k of properties) {
-      newObj[k] = this.mockValue(value[k]);
-      const type2 = getType(value[k]);
-      if (type2.includes("Function") && !value[k]._isMockFunction) {
-        _VitestMocker.spyModule.spyOn(newObj, k).mockImplementation(() => void 0);
-        Object.defineProperty(newObj[k], "length", { value: 0 });
+    const spyModule = _VitestMocker.spyModule;
+    const finalizers = new Array();
+    const refs = new RefTracker();
+    const mockPropertiesOf = (container, newContainer) => {
+      const containerType = getType(container);
+      const isModule = containerType === "Module" || !!container.__esModule;
+      for (const property of getAllProperties(container)) {
+        if (!isModule) {
+          const descriptor = Object.getOwnPropertyDescriptor(container, property);
+          if ((descriptor == null ? void 0 : descriptor.get) || (descriptor == null ? void 0 : descriptor.set))
+            continue;
+        }
+        if (isSpecialProp(property, containerType))
+          continue;
+        const value = container[property];
+        const refId = refs.getId(value);
+        if (refId) {
+          finalizers.push(() => newContainer[property] = refs.getMockedValue(refId));
+          continue;
+        }
+        const type = getType(value);
+        if (Array.isArray(value)) {
+          newContainer[property] = [];
+          continue;
+        }
+        const isFunction = type.includes("Function") && typeof value === "function";
+        if ((!isFunction || value.__isMockFunction) && type !== "Object" && type !== "Module") {
+          newContainer[property] = value;
+          continue;
+        }
+        newContainer[property] = isFunction ? value : {};
+        if (isFunction) {
+          spyModule.spyOn(newContainer, property).mockImplementation(() => void 0);
+          Object.defineProperty(newContainer[property], "length", { value: 0 });
+        }
+        refs.track(value, newContainer[property]);
+        mockPropertiesOf(value, newContainer[property]);
       }
-    }
-    Object.setPrototypeOf(newObj, Object.getPrototypeOf(value));
-    return newObj;
+    };
+    const mockedObject = {};
+    mockPropertiesOf(object, mockedObject);
+    for (const finalizer of finalizers)
+      finalizer();
+    return mockedObject;
   }
   unmockPath(path) {
     const suitefile = this.getSuiteFilepath();
@@ -142,7 +190,7 @@ const _VitestMocker = class {
     if (mock === null) {
       await this.ensureSpy();
       const mod = await this.request(fsPath);
-      return this.mockValue(mod);
+      return this.mockObject(mod);
     }
     if (typeof mock === "function")
       return this.callFunctionMock(fsPath, mock);
@@ -168,7 +216,7 @@ const _VitestMocker = class {
         return cache.exports;
       const cacheKey = toFilePath(dep, this.root);
       const mod = ((_a = this.moduleCache.get(cacheKey)) == null ? void 0 : _a.exports) || await this.request(dep);
-      const exports = this.mockValue(mod);
+      const exports = this.mockObject(mod);
       this.moduleCache.set(cacheName, { exports });
       return exports;
     }

package/dist/{chunk-runtime-rpc.cc6a06a2.mjs → chunk-runtime-rpc.9d1f4c48.mjs}

@@ -1,4 +1,4 @@
-import { a as getWorkerState, w as withSafeTimers } from './chunk-utils-global.1b22c4fd.mjs';
+import { a as getWorkerState, w as withSafeTimers } from './chunk-utils-global.0a7416cf.mjs';
 
 const rpc = () => {
   const { rpc: rpc2 } = getWorkerState();

package/dist/{chunk-utils-global.1b22c4fd.mjs → chunk-utils-global.0a7416cf.mjs}

@@ -1,6 +1,6 @@
+import path from 'path';
 import require$$0 from 'tty';
 import { isPackageExists } from 'local-pkg';
-import path from 'path';
 
 var picocolors = {exports: {}};
 

package/dist/{chunk-utils-source-map.957e7756.mjs → chunk-utils-source-map.c03f8bc4.mjs}

@@ -1,4 +1,4 @@
-import { s as slash, l as notNullish, p as picocolors } from './chunk-utils-global.1b22c4fd.mjs';
+import { s as slash, l as notNullish, p as picocolors } from './chunk-utils-global.0a7416cf.mjs';
 
 var build = {};
 

package/dist/{chunk-vite-node-externalize.0791f2ed.mjs → chunk-vite-node-externalize.6956d2d9.mjs}

@@ -1,22 +1,22 @@
-import { p as pLimit, c as configDefaults, r as resolveC8Options, a as cleanCoverage, b as reportCoverage, e as envPackageNames } from './chunk-env-node.26c72624.mjs';
-import { j as join, o as basename, d as dirname, q as resolve, A as AggregateErrorPonyfill, p as picocolors, s as slash$2, t as isAbsolute, u as relative, v as isNode, x as getTests, e as getFullName, y as hasFailed, z as hasFailedSnapshot, B as safeSetInterval, C as safeClearInterval, D as getSuites, f as safeSetTimeout, E as shuffle, F as toArray$1, G as normalize, n as noop$1, h as safeClearTimeout, H as deepMerge, I as toNamespacedPath, g as getCallLastIndex, l as notNullish, J as ensurePackageInstalled, K as stdout } from './chunk-utils-global.1b22c4fd.mjs';
+import { p as pLimit, c as configDefaults, r as resolveC8Options, a as cleanCoverage, b as reportCoverage, e as envPackageNames } from './chunk-env-node.bbba78e5.mjs';
+import { j as join, o as basename, d as dirname, q as resolve, A as AggregateErrorPonyfill, p as picocolors, t as isAbsolute, u as relative, s as slash$2, v as isNode, x as getTests, e as getFullName, y as hasFailed, z as hasFailedSnapshot, B as safeSetInterval, C as safeClearInterval, D as getSuites, f as safeSetTimeout, E as shuffle, F as toArray$1, G as normalize, n as noop$1, h as safeClearTimeout, H as deepMerge, I as toNamespacedPath, g as getCallLastIndex, l as notNullish, J as ensurePackageInstalled, K as stdout } from './chunk-utils-global.0a7416cf.mjs';
 import { loadConfigFromFile, createServer, mergeConfig } from 'vite';
 import path$a from 'path';
 import url, { fileURLToPath, pathToFileURL } from 'url';
 import process$1 from 'process';
 import fs$8, { promises, existsSync, readFileSync } from 'fs';
-import { d as distDir, c as configFiles, a as defaultPort } from './chunk-constants.8eb2ed35.mjs';
+import { d as distDir, c as configFiles, a as defaultPort } from './chunk-constants.d4406290.mjs';
 import require$$0, { cpus, hostname, constants as constants$5 } from 'os';
 import require$$0$1 from 'util';
 import require$$0$2 from 'stream';
 import require$$2 from 'events';
 import { c as commonjsGlobal } from './vendor-_commonjsHelpers.4da45ef5.mjs';
-import { i as isNodeBuiltin, a as isValidNodeImport, s as slash$1, t as toArray, b as toFilePath, w as withInlineSourcemap, c as createBirpc, V as ViteNodeRunner } from './chunk-vite-node-utils.af8ead96.mjs';
+import { i as isNodeBuiltin, a as isValidNodeImport, s as slash$1, t as toArray, b as toFilePath, w as withInlineSourcemap, c as createBirpc, V as ViteNodeRunner } from './chunk-vite-node-utils.8077cd3c.mjs';
 import createDebug from 'debug';
 import { MessageChannel } from 'worker_threads';
 import { Tinypool } from 'tinypool';
 import { performance } from 'perf_hooks';
-import { c as stripAnsi, d as cliTruncate, b as parseStacktrace, e as stringWidth, h as ansiStyles, i as sliceAnsi, j as interpretSourcePos, s as stringify$5, u as unifiedDiff, a as posToNumber, l as lineSplitRE } from './chunk-utils-source-map.957e7756.mjs';
+import { c as stripAnsi, d as cliTruncate, b as parseStacktrace, e as stringWidth, h as ansiStyles, i as sliceAnsi, j as interpretSourcePos, s as stringify$5, u as unifiedDiff, a as posToNumber, l as lineSplitRE } from './chunk-utils-source-map.c03f8bc4.mjs';
 import { resolveModule } from 'local-pkg';
 import { createHash } from 'crypto';
 import { Buffer } from 'buffer';
@@ -26,7 +26,7 @@ import MagicString from './chunk-magic-string.efe26975.mjs';
 import require$$0$3 from 'readline';
 import { p as prompts } from './vendor-index.de788b6a.mjs';
 
-var version$1 = "0.18.0";
+var version$1 = "0.18.1";
 
 class EndError extends Error {
 	constructor(value) {
@@ -6736,7 +6736,7 @@ function assertPatternsInput(input) {
 var out = FastGlob;
 
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
-const ESM_FOLDER_RE = /\/esm\/(.*\.js)$/;
+const ESM_FOLDER_RE = /\/(es|esm)\/(.*\.js)$/;
 const defaultInline = [
   /virtual:/,
   /\.ts$/
@@ -6761,6 +6761,7 @@ function guessCJSversion(id) {
     for (const i of [
       id.replace(ESM_FOLDER_RE, "/umd/$1"),
       id.replace(ESM_FOLDER_RE, "/cjs/$1"),
+      id.replace(ESM_FOLDER_RE, "/lib/$1"),
       id.replace(ESM_FOLDER_RE, "/$1")
     ]) {
       if (existsSync(i))
@@ -10136,7 +10137,7 @@ createLogUpdate(process$1.stdout);
 
 createLogUpdate(process$1.stderr);
 
-var version = "0.18.0";
+var version = "0.18.1";
 
 function fileFromParsedStack(stack) {
   var _a, _b;
@@ -11065,7 +11066,7 @@ async function VitestPlugin(options = {}, ctx = new Vitest()) {
           await ctx.setServer(options, server);
           haveStarted = true;
           if (options.api && options.watch)
-            (await import('./chunk-api-setup.63babd7c.mjs')).setup(ctx);
+            (await import('./chunk-api-setup.9d3f7670.mjs')).setup(ctx);
         } catch (err) {
           ctx.logger.printError(err, true);
           process.exit(1);