vitest 0.0.112 → 0.0.116

package/dist/utils.js

@@ -1,4 +1,5 @@
-export { e as ensurePackageInstalled, g as getFullName, o as getNames, f as getSuites, v as getTasks, a as getTests, j as hasFailed, u as hasTests, p as interpretOnlyMode, m as mergeSlashes, n as noop, k as notNullish, q as partitionSuiteChildren, h as resolvePath, s as slash, t as toArray } from './utils-cb6b1266.js';
-import 'local-pkg';
+export { l as deepMerge, e as ensurePackageInstalled, g as getFullName, u as getNames, f as getSuites, z as getTasks, j as getTests, h as hasFailed, x as hasTests, v as interpretOnlyMode, i as isObject, y as isWindows, p as mergeSlashes, n as noop, o as notNullish, w as partitionSuiteChildren, k as resolvePath, s as slash, t as toArray, m as toFilePath } from './index-bf29f0e6.js';
+import 'url';
 import 'tty';
+import 'local-pkg';
 import 'path';

package/dist/{vi-cb9e4e4e.js → vi-b3412f83.js}

@@ -1,6 +1,6 @@
-import { n as nanoid, a as spyOn, f as fn, s as spies } from './jest-mock-a57b745c.js';
-import { n as noop } from './utils-cb6b1266.js';
+import { n as noop, i as isObject } from './index-bf29f0e6.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-4a754991.js';
 
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
@@ -134,7 +134,7 @@ function createSuiteCollector(name, factory = () => {
     const mode2 = this.only ? "only" : this.skip ? "skip" : this.todo ? "todo" : "run";
     const computeMode = this.concurrent ? "concurrent" : void 0;
     const test3 = {
-      id: nanoid(),
+      id: "",
       type: "test",
       name: name2,
       mode: mode2,
@@ -160,7 +160,7 @@ function createSuiteCollector(name, factory = () => {
   }
   function initSuite() {
     suite2 = {
-      id: nanoid(),
+      id: "",
       type: "suite",
       computeMode: "serial",
       name,
@@ -199,7 +199,6 @@ function createSuite() {
   });
 }
 
-const isObject = (val) => toString.call(val) === "[object Object]";
 function equals(a, b, customTesters, strictCheck) {
   customTesters = customTesters || [];
   return eq(a, b, [], [], customTesters, strictCheck ? hasKey : hasDefinedKey);

package/dist/worker.js

@@ -1,14 +1,15 @@
-import { h as resolve, d as dirname$2, b as basename$2, m as mergeSlashes, s as slash } from './utils-cb6b1266.js';
-import { a as spyOn, s as spies, n as nanoid } from './jest-mock-a57b745c.js';
-import { c as distDir } from './constants-2b0310b7.js';
+import { k as resolve, d as dirname$2, b as basename$2, p as mergeSlashes, s as slash, m as toFilePath } from './index-bf29f0e6.js';
+import { c as createBirpc } from './index-e909c175.js';
+import { c as distDir } from './constants-080f26e8.js';
 import { builtinModules, createRequire } from 'module';
 import { pathToFileURL, fileURLToPath as fileURLToPath$2, URL as URL$1 } from 'url';
 import vm from 'vm';
 import path from 'path';
-import fs, { promises, realpathSync, statSync, Stats, readdirSync, existsSync } from 'fs';
+import fs, { promises, realpathSync, statSync, Stats, existsSync, readdirSync } from 'fs';
 import assert from 'assert';
 import { format as format$2, inspect } from 'util';
-import { s as send } from './rpc-7de86f29.js';
+import { a as spyOn, s as spies } from './jest-mock-4a754991.js';
+import { r as rpc } from './rpc-8c7cc374.js';
 import 'tty';
 import 'local-pkg';
 import 'chai';
@@ -7663,7 +7664,7 @@ function find(dir) {
 
 // Manually “tree shaken” from:
 
-const isWindows$2 = process.platform === 'win32';
+const isWindows = process.platform === 'win32';
 
 const own$1 = {}.hasOwnProperty;
 
@@ -7837,7 +7838,7 @@ codes.ERR_UNSUPPORTED_ESM_URL_SCHEME = createError(
     let message =
       'Only file and data URLs are supported by the default ESM loader';
 
-    if (isWindows$2 && url.protocol.length === 2) {
+    if (isWindows && url.protocol.length === 2) {
       message += '. On Windows, absolute paths must be valid file:// URLs';
     }
 
@@ -9218,6 +9219,8 @@ var __spreadValues = (a, b) => {
 function resolveMockPath(mockPath, root, nmName) {
   if (nmName) {
     const mockFolder = resolve(root, "__mocks__");
+    if (!existsSync(mockFolder))
+      return null;
     const files = readdirSync(mockFolder);
     for (const file of files) {
       const [basename2] = file.split(".");
@@ -9325,7 +9328,6 @@ const depsExternal = [
   /\.cjs.js$/,
   /\.mjs$/
 ];
-const isWindows = process.platform === "win32";
 const stubRequests = {
   "/@vite/client": {
     injectQuery: (id) => id,
@@ -9530,12 +9532,6 @@ async function shouldExternalize(id, config) {
     return false;
   return id.includes("/node_modules/") && await isValidNodeImport(id);
 }
-function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(dirname$2(root)) ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
-  if (absolute.startsWith("//"))
-    absolute = absolute.slice(1);
-  return isWindows && absolute.startsWith("/") ? fileURLToPath$2(pathToFileURL(absolute.slice(1)).href) : absolute;
-}
 function matchExternalizePattern(id, patterns) {
   for (const ex of patterns) {
     if (typeof ex === "string") {
@@ -9565,10 +9561,10 @@ async function startViteNode(ctx) {
     return _viteNode;
   const processExit = process.exit;
   process.on("beforeExit", (code) => {
-    send("processExit", code);
+    rpc().onWorkerExit(code);
   });
   process.exit = (code = process.exitCode || 0) => {
-    send("processExit", code);
+    rpc().onWorkerExit(code);
     return processExit(code);
   };
   const { config } = ctx;
@@ -9578,7 +9574,7 @@ async function startViteNode(ctx) {
       resolve(distDir, "entry.js")
     ],
     fetch(id) {
-      return process.__vitest_worker__.rpc("fetch", id);
+      return rpc().fetch(id);
     },
     inline: config.depsInline,
     external: config.depsExternal,
@@ -9594,31 +9590,21 @@ function init(ctx) {
     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;
-  const rpcPromiseMap = /* @__PURE__ */ new Map();
   process.__vitest_worker__ = {
     ctx,
     moduleCache,
     config,
-    rpc: (method, ...args) => {
-      return new Promise((resolve2, reject) => {
-        const id = nanoid();
-        rpcPromiseMap.set(id, { resolve: resolve2, reject });
-        port.postMessage({ method, args, id });
-      });
-    },
-    send(method, ...args) {
-      port.postMessage({ method, args });
-    }
+    rpc: createBirpc({
+      functions: {},
+      eventNames: ["onUserLog", "onCollected", "onWorkerExit"],
+      post(v) {
+        port.postMessage(v);
+      },
+      on(fn) {
+        port.addListener("message", fn);
+      }
+    })
   };
-  port.addListener("message", async (data) => {
-    const api = rpcPromiseMap.get(data.id);
-    if (api) {
-      if (data.error)
-        api.reject(data.error);
-      else
-        api.resolve(data.result);
-    }
-  });
   if (ctx.invalidates)
     ctx.invalidates.forEach((i) => moduleCache.delete(i));
   ctx.files.forEach((i) => moduleCache.delete(i));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.0.112",
+  "version": "0.0.116",
   "description": "A blazing fast unit test framework powered by Vite",
   "keywords": [
     "vite",
@@ -62,11 +62,13 @@
     "@types/natural-compare": "^1.4.1",
     "@types/node": "^17.0.4",
     "@types/prompts": "^2.4.0",
+    "birpc": "^0.0.2",
     "c8": "^7.10.0",
     "cac": "^6.7.12",
     "chai-subset": "^1.6.0",
     "cli-truncate": "^3.1.0",
     "diff": "^5.0.0",
+    "execa": "^6.0.0",
     "fast-glob": "^3.2.7",
     "find-up": "^6.2.0",
     "flatted": "^3.2.4",
@@ -77,7 +79,6 @@
     "micromatch": "^4.0.4",
     "mlly": "^0.3.16",
     "mockdate": "^3.0.5",
-    "nanoid": "^3.1.30",
     "natural-compare": "^1.4.0",
     "pathe": "^0.2.0",
     "picocolors": "^1.0.0",
@@ -87,7 +88,8 @@
     "rollup": "^2.62.0",
     "source-map-js": "^1.0.1",
     "strip-ansi": "^7.0.1",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.4",
+    "ws": "^8.4.0"
   },
   "peerDependencies": {
     "c8": "*",
@@ -111,8 +113,7 @@
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",
-    "dev": "rollup -c --watch src",
-    "typecheck": "tsc --noEmit"
+    "dev": "rollup -c --watch src"
   },
   "readme": "# vitest\n\n[![NPM version](https://img.shields.io/npm/v/vitest?color=a1b858&label=)](https://www.npmjs.com/package/vitest)\n\nA blazing fast unit test framework powered by Vite.\n\n> **This project is currently in closed beta exclusively for Sponsors.**<br>\n> Become a Sponsor of [@patak-dev](https://github.com/sponsors/patak-dev) or [@antfu](https://github.com/sponsors/antfu) to access the source code and issues tracker.\n> Learn more at [vitest.dev](https://vitest.dev)\n"
 }

package/vitest.mjs

@@ -1,21 +1,2 @@
 #!/usr/bin/env node
-
-import { fileURLToPath } from 'url'
-import { ensurePackageInstalled, resolvePath } from './dist/utils.js'
-
-const argv = process.argv.slice(2)
-
-if (!await ensurePackageInstalled('vite'))
-  process.exit(1)
-
-if (argv.includes('--coverage')) {
-  if (!await ensurePackageInstalled('c8'))
-    process.exit(1)
-  const filename = fileURLToPath(import.meta.url)
-  const entry = resolvePath(filename, '../dist/cli.js')
-  process.argv.splice(2, 0, process.argv[0], entry)
-  await import('c8/bin/c8.js')
-}
-else {
-  await import('./dist/cli.js')
-}
+import('./dist/cli.js')

package/dist/middleware-2028dfa0.js

@@ -1,81 +0,0 @@
-import { A as API_PATH } from './constants-2b0310b7.js';
-import 'url';
-import './utils-cb6b1266.js';
-import 'tty';
-import 'local-pkg';
-import 'path';
-
-/*! (c) 2020 Andrea Giammarchi */
-
-const {parse: $parse, stringify: $stringify} = JSON;
-
-const Primitive = String;   // it could be Number
-const primitive = 'string'; // it could be 'number'
-const object = 'object';
-
-const noop = (_, value) => value;
-
-const set = (known, input, value) => {
-  const index = Primitive(input.push(value) - 1);
-  known.set(value, index);
-  return index;
-};
-
-const stringify = (value, replacer, space) => {
-  const $ = replacer && typeof replacer === object ?
-            (k, v) => (k === '' || -1 < replacer.indexOf(k) ? v : void 0) :
-            (replacer || noop);
-  const known = new Map;
-  const input = [];
-  const output = [];
-  let i = +set(known, input, $.call({'': value}, '', value));
-  let firstRun = !i;
-  while (i < input.length) {
-    firstRun = true;
-    output[i] = $stringify(input[i++], replace, space);
-  }
-  return '[' + output.join(',') + ']';
-  function replace(key, value) {
-    if (firstRun) {
-      firstRun = !firstRun;
-      return value;
-    }
-    const after = $.call(this, key, value);
-    switch (typeof after) {
-      case object:
-        if (after === null) return after;
-      case primitive:
-        return known.get(after) || set(known, input, after);
-    }
-    return after;
-  }
-};
-
-function sendFlatted(res, data) {
-  res.setHeader("Content-Type", "application/json");
-  res.write(stringify(data));
-  res.statusCode = 200;
-  res.end();
-}
-function middlewareAPI(ctx) {
-  return (req, res, next) => {
-    var _a;
-    if (!((_a = req.url) == null ? void 0 : _a.startsWith(API_PATH)))
-      return next();
-    const url = req.url.slice(API_PATH.length);
-    if (url === "/") {
-      return sendFlatted(res, {
-        files: ctx.state.filesMap
-      });
-    }
-    if (url === "/files") {
-      return sendFlatted(res, {
-        files: Object.keys(ctx.state.filesMap)
-      });
-    }
-    res.statusCode = 404;
-    res.end();
-  };
-}
-
-export { middlewareAPI as default, sendFlatted };

package/dist/rpc-7de86f29.js

@@ -1,10 +0,0 @@
-const rpc = async (method, ...args) => {
-  var _a;
-  return (_a = process.__vitest_worker__) == null ? void 0 : _a.rpc(method, ...args);
-};
-const send = async (method, ...args) => {
-  var _a;
-  return (_a = process.__vitest_worker__) == null ? void 0 : _a.send(method, ...args);
-};
-
-export { rpc as r, send as s };