vitest 0.0.92 → 0.0.93

package/bin/vitest.mjs

@@ -6,6 +6,9 @@ import { ensurePackageInstalled } 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)

package/dist/cli.js

@@ -1,7 +1,7 @@
 import require$$0 from 'readline';
 import { EventEmitter } from 'events';
-import { c, e as ensurePackageInstalled } from './utils-860e5f7e.js';
-import { c as createVitest } from './index-40ecbcb4.js';
+import { c, e as ensurePackageInstalled } from './utils-576876dc.js';
+import { c as createVitest } from './index-880654a3.js';
 import 'tty';
 import 'local-pkg';
 import 'path';
@@ -13,7 +13,7 @@ import 'util';
 import './constants-9cfa4d7b.js';
 import 'url';
 import 'perf_hooks';
-import './error-4b0c4b4b.js';
+import './error-bf2213e4.js';
 import 'source-map';
 import './index-5cc247ff.js';
 import 'assert';
@@ -633,7 +633,7 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.0.92";
+var version = "0.0.93";
 
 const cli = cac("vitest");
 cli.version(version).option("-r, --root <path>", "root path").option("-c, --config <path>", "path to config file").option("-u, --update", "update snapshot").option("-w, --watch", "watch mode").option("-o, --open", "open Vitest UI").option("--api", "listen to port and serve API").option("--threads", "enabled threads", { default: true }).option("--silent", "silent").option("--global", "inject apis globally").option("--dom", "mock browser api with happy-dom").option("--environment <env>", "runner environment", {
@@ -654,16 +654,18 @@ async function run(cliFilters, options) {
   process.env.NODE_ENV = "test";
   if (!options.silent) {
     console.log(c.magenta(c.bold("\nVitest is in closed beta exclusively for Sponsors")));
-    console.log(c.yellow("Learn more at https://vitest.dev\n"));
+    console.log(c.yellow("Learn more at https://vitest.dev"));
   }
   const ctx = await createVitest(options);
-  process.__vitest__ = ctx;
   process.chdir(ctx.config.root);
   registerConsoleShortcuts(ctx);
   if (ctx.config.environment && ctx.config.environment !== "node") {
     if (!await ensurePackageInstalled(ctx.config.environment))
       process.exit(1);
   }
+  ctx.onServerRestarted(() => {
+    ctx.start(cliFilters);
+  });
   try {
     await ctx.start(cliFilters);
   } catch (e) {

package/dist/entry.js

@@ -6,8 +6,8 @@ import chai, { expect, util } from 'chai';
 import Subset from 'chai-subset';
 import path, { basename } from 'path';
 import { r as rpc, s as send } from './rpc-7de86f29.js';
-import { g as getNames, c as c$1, t as toArray, i as interpretOnlyMode, p as partitionSuiteChildren, d as hasTests, h as hasFailed } from './utils-860e5f7e.js';
-import { u as unifiedDiff } from './error-4b0c4b4b.js';
+import { g as getNames, c as c$1, t as toArray, i as interpretOnlyMode, p as partitionSuiteChildren, f as hasTests, h as hasFailed } from './utils-576876dc.js';
+import { u as unifiedDiff } from './error-bf2213e4.js';
 import { performance } from 'perf_hooks';
 import { b as setHooks, c as createSuiteHooks, e as clearContext, f as defaultSuite, h as context, j as getHooks, k as getFn } from './suite-b8c6cb53.js';
 import { n as nanoid } from './index-9e71c815.js';
@@ -3534,7 +3534,7 @@ const JestChaiExpect = (chai, utils) => {
   def(["toHaveBeenCalledWith", "toBeCalledWith"], function(...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);
+    return this.assert(pass, "expected spy to be called with arguments: #{exp}", "expected spy to not be called with arguments: #{exp}", args, spy.calls);
   });
   const ordinalOf = (i) => {
     const j = i % 10;
@@ -3629,7 +3629,7 @@ class StringContaining extends AsymmetricMatcher {
 }
 class Anything extends AsymmetricMatcher {
   asymmetricMatch(other) {
-    return other !== void 0 && other !== null;
+    return other != null;
   }
   toString() {
     return "Anything";
@@ -3638,11 +3638,127 @@ class Anything extends AsymmetricMatcher {
     return "Anything";
   }
 }
+class ObjectContaining extends AsymmetricMatcher {
+  constructor(sample, inverse = false) {
+    super(sample, inverse);
+  }
+  getPrototype(obj) {
+    if (Object.getPrototypeOf)
+      return Object.getPrototypeOf(obj);
+    if (obj.constructor.prototype === obj)
+      return null;
+    return obj.constructor.prototype;
+  }
+  hasProperty(obj, property) {
+    if (!obj)
+      return false;
+    if (Object.prototype.hasOwnProperty.call(obj, property))
+      return true;
+    return this.hasProperty(this.getPrototype(obj), property);
+  }
+  asymmetricMatch(other) {
+    if (typeof this.sample !== "object") {
+      throw new TypeError(`You must provide an object to ${this.toString()}, not '${typeof this.sample}'.`);
+    }
+    let result = true;
+    for (const property in this.sample) {
+      if (!this.hasProperty(other, property) || !equals(this.sample[property], other[property])) {
+        result = false;
+        break;
+      }
+    }
+    return this.inverse ? !result : result;
+  }
+  toString() {
+    return `Object${this.inverse ? "Not" : ""}Containing`;
+  }
+  getExpectedType() {
+    return "object";
+  }
+}
+class ArrayContaining extends AsymmetricMatcher {
+  constructor(sample, inverse = false) {
+    super(sample, inverse);
+  }
+  asymmetricMatch(other) {
+    if (!Array.isArray(this.sample)) {
+      throw new TypeError(`You must provide an array to ${this.toString()}, not '${typeof this.sample}'.`);
+    }
+    const result = this.sample.length === 0 || Array.isArray(other) && this.sample.every((item) => other.some((another) => equals(item, another)));
+    return this.inverse ? !result : result;
+  }
+  toString() {
+    return `Array${this.inverse ? "Not" : ""}Containing`;
+  }
+  getExpectedType() {
+    return "array";
+  }
+}
+class Any extends AsymmetricMatcher {
+  constructor(sample) {
+    if (typeof sample === "undefined") {
+      throw new TypeError("any() expects to be passed a constructor function. Please pass one or use anything() to match any object.");
+    }
+    super(sample);
+  }
+  fnNameFor(func) {
+    if (func.name)
+      return func.name;
+    const functionToString = Function.prototype.toString;
+    const matches = functionToString.call(func).match(/^(?:async)?\s*function\s*\*?\s*([\w$]+)\s*\(/);
+    return matches ? matches[1] : "<anonymous>";
+  }
+  asymmetricMatch(other) {
+    if (this.sample === String)
+      return typeof other == "string" || other instanceof String;
+    if (this.sample === Number)
+      return typeof other == "number" || other instanceof Number;
+    if (this.sample === Function)
+      return typeof other == "function" || other instanceof Function;
+    if (this.sample === Boolean)
+      return typeof other == "boolean" || other instanceof Boolean;
+    if (this.sample === BigInt)
+      return typeof other == "bigint" || other instanceof BigInt;
+    if (this.sample === Symbol)
+      return typeof other == "symbol" || other instanceof Symbol;
+    if (this.sample === Object)
+      return typeof other == "object";
+    return other instanceof this.sample;
+  }
+  toString() {
+    return "Any";
+  }
+  getExpectedType() {
+    if (this.sample === String)
+      return "string";
+    if (this.sample === Number)
+      return "number";
+    if (this.sample === Function)
+      return "function";
+    if (this.sample === Object)
+      return "object";
+    if (this.sample === Boolean)
+      return "boolean";
+    return this.fnNameFor(this.sample);
+  }
+  toAsymmetricMatcher() {
+    return `Any<${this.fnNameFor(this.sample)}>`;
+  }
+}
 const JestAsymmetricMatchers = (chai, utils) => {
   utils.addMethod(chai.expect, "stringContaining", (expected) => new StringContaining(expected));
   utils.addMethod(chai.expect, "anything", () => {
     return new Anything();
   });
+  utils.addMethod(chai.expect, "objectContaining", (expected) => {
+    return new ObjectContaining(expected);
+  });
+  utils.addMethod(chai.expect, "any", (expected) => {
+    return new Any(expected);
+  });
+  utils.addMethod(chai.expect, "arrayContaining", (expected) => {
+    return new ArrayContaining(expected);
+  });
 };
 
 let installed = false;

package/dist/{error-4b0c4b4b.js → error-bf2213e4.js}

@@ -1,6 +1,6 @@
 import { existsSync, promises } from 'fs';
 import { relative } from 'path';
-import { n as notNullish, c } from './utils-860e5f7e.js';
+import { d as notNullish, c } from './utils-576876dc.js';
 import { SourceMapConsumer } from 'source-map';
 
 function Diff() {}

package/dist/{index-40ecbcb4.js → index-880654a3.js}

@@ -5,9 +5,9 @@ import { promises } from 'fs';
 import fg from 'fast-glob';
 import require$$0 from 'util';
 import { d as defaultInclude, a as defaultExclude, b as defaultPort, c as distDir, e as configFiles } from './constants-9cfa4d7b.js';
-import { c, g as getNames, s as slash, a as getTests, b as getSuites, t as toArray, h as hasFailed } from './utils-860e5f7e.js';
+import { c, g as getNames, s as slash, a as getTests, b as getSuites, n as noop, t as toArray, h as hasFailed } from './utils-576876dc.js';
 import { performance } from 'perf_hooks';
-import { s as stringWidth, a as ansiStyles, b as stripAnsi, c as sliceAnsi, F as F_POINTER, d as F_DOWN, e as F_LONG_DASH, f as F_DOWN_RIGHT, g as F_DOT, h as F_CHECK, i as F_CROSS, j as cliTruncate, k as F_RIGHT, p as printError } from './error-4b0c4b4b.js';
+import { s as stringWidth, a as ansiStyles, b as stripAnsi, c as sliceAnsi, F as F_POINTER, d as F_DOWN, e as F_LONG_DASH, f as F_DOWN_RIGHT, g as F_DOT, h as F_CHECK, i as F_CROSS, j as cliTruncate, k as F_RIGHT, p as printError } from './error-bf2213e4.js';
 import { o as onetime, s as signalExit } from './index-5cc247ff.js';
 import { MessageChannel } from 'worker_threads';
 import { pathToFileURL } from 'url';
@@ -4971,7 +4971,8 @@ class ConsoleReporter {
     this.console = globalThis.console;
     this.isFirstWatchRun = true;
     const mode = ctx.config.watch ? c.yellow(" DEV ") : c.cyan(" RUN ");
-    this.log(`${c.inverse(c.bold(mode))} ${c.gray(this.ctx.config.root)}
+    this.log(`
+${c.inverse(c.bold(mode))} ${c.gray(this.ctx.config.root)}
 `);
     this.start = performance.now();
   }
@@ -5110,7 +5111,6 @@ ${c.bold(c.inverse(c.green(" PASS ")))}${c.green(" Waiting for file changes...")
 `);
   }
   onServerRestart() {
-    this.console.clear();
     this.log(c.cyan("Restarted due to config changes..."));
   }
 }
@@ -5343,11 +5343,17 @@ class Vitest {
     this.invalidates = /* @__PURE__ */ new Set();
     this.changedTests = /* @__PURE__ */ new Set();
     this.isFirstRun = true;
+    this.restartsCount = 0;
+    this._onRestartListeners = [];
+    this.unregisterWatcher = noop;
     this.console = globalThis.console;
   }
   setServer(options, server) {
-    var _a;
-    (_a = this.pool) == null ? void 0 : _a.close();
+    var _a, _b;
+    (_a = this.unregisterWatcher) == null ? void 0 : _a.call(this);
+    clearTimeout(this._rerunTimer);
+    this.restartsCount += 1;
+    (_b = this.pool) == null ? void 0 : _b.close();
     this.pool = void 0;
     const resolved = resolveConfig(options, server.config);
     this.server = server;
@@ -5360,6 +5366,7 @@ class Vitest {
     if (this.config.watch)
       this.registerWatcher();
     this.runningPromise = void 0;
+    this._onRestartListeners.forEach((fn) => fn());
   }
   async start(filters) {
     const files = await this.globTestFiles(filters);
@@ -5368,11 +5375,8 @@ class Vitest {
       process.exitCode = 1;
     }
     await this.runFiles(files);
-    if (this.config.watch) {
+    if (this.config.watch)
       await this.report("onWatcherStart");
-      await new Promise(() => {
-      });
-    }
   }
   async runFiles(files) {
     await this.runningPromise;
@@ -5390,44 +5394,59 @@ class Vitest {
     });
     return await this.runningPromise;
   }
+  async scheduleRerun(triggerId) {
+    const currentCount = this.restartsCount;
+    clearTimeout(this._rerunTimer);
+    await this.runningPromise;
+    clearTimeout(this._rerunTimer);
+    if (this.restartsCount !== currentCount)
+      return;
+    this._rerunTimer = setTimeout(async () => {
+      if (this.changedTests.size === 0) {
+        this.invalidates.clear();
+        return;
+      }
+      if (this.restartsCount !== currentCount)
+        return;
+      this.isFirstRun = false;
+      const files = Array.from(this.changedTests);
+      await this.report("onWatcherRerun", files, triggerId);
+      await this.runFiles(files);
+      await this.report("onWatcherStart");
+    }, WATCHER_DEBOUNCE);
+  }
   registerWatcher() {
-    let timer;
-    const scheduleRerun = async (id) => {
-      await this.runningPromise;
-      clearTimeout(timer);
-      timer = setTimeout(async () => {
-        if (this.changedTests.size === 0) {
-          this.invalidates.clear();
-          return;
-        }
-        this.isFirstRun = false;
-        const files = Array.from(this.changedTests);
-        await this.report("onWatcherRerun", files, id);
-        await this.runFiles(files);
-        await this.report("onWatcherStart");
-      }, WATCHER_DEBOUNCE);
-    };
-    this.server.watcher.on("change", (id) => {
+    const onChange = (id) => {
       id = slash(id);
       this.handleFileChanged(id);
       if (this.changedTests.size)
-        scheduleRerun(id);
-    });
-    this.server.watcher.on("unlink", (id) => {
+        this.scheduleRerun(id);
+    };
+    const onUnlink = (id) => {
       id = slash(id);
       this.invalidates.add(id);
       if (id in this.state.filesMap) {
         delete this.state.filesMap[id];
         this.changedTests.delete(id);
       }
-    });
-    this.server.watcher.on("add", async (id) => {
+    };
+    const onAdd = (id) => {
       id = slash(id);
       if (this.isTargetFile(id)) {
         this.changedTests.add(id);
-        scheduleRerun(id);
+        this.scheduleRerun(id);
       }
-    });
+    };
+    const watcher = this.server.watcher;
+    watcher.on("change", onChange);
+    watcher.on("unlink", onUnlink);
+    watcher.on("add", onAdd);
+    this.unregisterWatcher = () => {
+      watcher.off("change", onChange);
+      watcher.off("unlink", onUnlink);
+      watcher.off("add", onAdd);
+      this.unregisterWatcher = noop;
+    };
   }
   handleFileChanged(id) {
     if (this.changedTests.has(id) || this.invalidates.has(id) || id.includes("/node_modules/") || id.includes("/vitest/dist/"))
@@ -5471,6 +5490,9 @@ class Vitest {
       return false;
     return micromatch_1.isMatch(id, this.config.include);
   }
+  onServerRestarted(fn) {
+    this._onRestartListeners.push(fn);
+  }
 }
 async function createVitest(options, viteOverrides = {}) {
   const ctx = new Vitest();
@@ -5491,7 +5513,7 @@ async function createVitest(options, viteOverrides = {}) {
           ctx.setServer(options, server2);
           haveStarted = true;
           if (options.api)
-            server2.middlewares.use((await import('./middleware-b1884a99.js')).default());
+            server2.middlewares.use((await import('./middleware-bf0f818d.js')).default(ctx));
         }
       }
     ],
@@ -5507,6 +5529,8 @@ async function createVitest(options, viteOverrides = {}) {
   };
   const server = await createServer(mergeConfig(config, viteOverrides));
   await server.pluginContainer.buildStart({});
+  if (options.api === true)
+    options.api = defaultPort;
   if (typeof options.api === "number")
     await server.listen(options.api);
   return ctx;

package/dist/index.d.ts

@@ -129,6 +129,28 @@ declare class Anything extends AsymmetricMatcher<void> {
     toString(): string;
     toAsymmetricMatcher(): string;
 }
+declare class ObjectContaining extends AsymmetricMatcher<Record<string, unknown>> {
+    constructor(sample: Record<string, unknown>, inverse?: boolean);
+    getPrototype(obj: object): any;
+    hasProperty(obj: object | null, property: string): boolean;
+    asymmetricMatch(other: any): boolean;
+    toString(): string;
+    getExpectedType(): string;
+}
+declare class ArrayContaining extends AsymmetricMatcher<Array<unknown>> {
+    constructor(sample: Array<unknown>, inverse?: boolean);
+    asymmetricMatch(other: Array<unknown>): boolean;
+    toString(): string;
+    getExpectedType(): string;
+}
+declare class Any extends AsymmetricMatcher<any> {
+    constructor(sample: unknown);
+    fnNameFor(func: Function): string;
+    asymmetricMatch(other: unknown): boolean;
+    toString(): string;
+    getExpectedType(): string;
+    toAsymmetricMatcher(): string;
+}
 
 declare type Awaitable<T> = T | PromiseLike<T>;
 declare type Nullable<T> = T | null | undefined;
@@ -642,6 +664,9 @@ declare global {
             extend(expects: MatchersObject): void;
             stringContaining(expected: string): void;
             anything(): Anything;
+            objectContaining(expected: any): ObjectContaining;
+            any(constructor: unknown): Any;
+            arrayContaining(expected: any): ArrayContaining;
         }
         interface Assertion {
             chaiEqual(expected: any): void;

package/dist/{middleware-b1884a99.js → middleware-bf0f818d.js}

@@ -54,13 +54,12 @@ function sendFlatted(res, data) {
   res.statusCode = 200;
   res.end();
 }
-function middlewareAPI() {
+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);
-    const ctx = process.__vitest__;
     if (url === "/") {
       return sendFlatted(res, {
         files: ctx.state.filesMap

package/dist/node.js

@@ -1,4 +1,4 @@
-export { c as createVitest } from './index-40ecbcb4.js';
+export { c as createVitest } from './index-880654a3.js';
 import 'path';
 import 'vite';
 import 'process';
@@ -7,11 +7,11 @@ import 'fast-glob';
 import 'util';
 import './constants-9cfa4d7b.js';
 import 'url';
-import './utils-860e5f7e.js';
+import './utils-576876dc.js';
 import 'tty';
 import 'local-pkg';
 import 'perf_hooks';
-import './error-4b0c4b4b.js';
+import './error-bf2213e4.js';
 import 'source-map';
 import './index-5cc247ff.js';
 import 'assert';

package/dist/{utils-860e5f7e.js → utils-576876dc.js}

@@ -76,6 +76,8 @@ function notNullish(v) {
 function slash(str) {
   return str.replace(/\\/g, "/");
 }
+const noop = () => {
+};
 function partitionSuiteChildren(suite) {
   let tasksGroup = [];
   const tasksGroups = [];
@@ -148,7 +150,7 @@ async function ensurePackageInstalled(dependency, promptInstall = !process.env.C
   const { install } = await prompts.prompt({
     type: "confirm",
     name: "install",
-    message: `Do you want to install ${c.green(dependency)}?`
+    message: c.reset(`Do you want to install ${c.green(dependency)}?`)
   });
   if (install) {
     await (await import('./index-e7a421bb.js')).installPackage(dependency);
@@ -157,4 +159,4 @@ async function ensurePackageInstalled(dependency, promptInstall = !process.env.C
   return false;
 }
 
-export { getTests as a, getSuites as b, c, hasTests as d, ensurePackageInstalled as e, getTasks as f, getNames as g, hasFailed as h, interpretOnlyMode as i, notNullish as n, partitionSuiteChildren as p, slash as s, toArray as t };
+export { getTests as a, getSuites as b, c, notNullish as d, ensurePackageInstalled as e, hasTests as f, getNames as g, hasFailed as h, interpretOnlyMode as i, getTasks as j, noop as n, partitionSuiteChildren as p, slash as s, toArray as t };

package/dist/utils.js

@@ -1,3 +1,3 @@
-export { e as ensurePackageInstalled, g as getNames, b as getSuites, f as getTasks, a as getTests, h as hasFailed, d as hasTests, i as interpretOnlyMode, n as notNullish, p as partitionSuiteChildren, s as slash, t as toArray } from './utils-860e5f7e.js';
+export { e as ensurePackageInstalled, g as getNames, b as getSuites, j as getTasks, a as getTests, h as hasFailed, f as hasTests, i as interpretOnlyMode, n as noop, d as notNullish, p as partitionSuiteChildren, s as slash, t as toArray } from './utils-576876dc.js';
 import 'local-pkg';
 import 'tty';

package/dist/worker.js

@@ -4,7 +4,7 @@ import { c as distDir } from './constants-9cfa4d7b.js';
 import { builtinModules, createRequire } from 'module';
 import { pathToFileURL, fileURLToPath, URL as URL$1 } from 'url';
 import vm from 'vm';
-import { s as slash } from './utils-860e5f7e.js';
+import { s as slash } from './utils-576876dc.js';
 import fs, { realpathSync, statSync, Stats, promises } from 'fs';
 import assert from 'assert';
 import { format as format$3, inspect } from 'util';
@@ -8371,15 +8371,7 @@ ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
   }
 }
 function normalizeId(id) {
-  if (id && id.startsWith("/@id/__x00__"))
-    id = `\0${id.slice("/@id/__x00__".length)}`;
-  if (id && id.startsWith("/@id/"))
-    id = id.slice("/@id/".length);
-  if (id.startsWith("__vite-browser-external:"))
-    id = id.slice("__vite-browser-external:".length);
-  if (id.startsWith("node:"))
-    id = id.slice("node:".length);
-  return id;
+  return id.replace(/^\/@id\/__x00__/, "\0").replace(/^\/@id\//, "").replace(/^__vite-browser-external:/, "").replace(/^node:/, "").replace(/[?&]v=\w+/, "?").replace(/\?$/, "");
 }
 async function shouldExternalize(id, config) {
   if (matchExternalizePattern(id, config.inline))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.0.92",
+  "version": "0.0.93",
   "description": "A blazing fast unit test framework powered by Vite",
   "keywords": [
     "vite",
@@ -57,8 +57,6 @@
     "tinyspy": "^0.1.0"
   },
   "devDependencies": {
-    "flatted": "^3.2.4",
-    "micromatch": "^4.0.4",
     "@antfu/install-pkg": "^0.1.0",
     "@types/diff": "^5.0.1",
     "@types/jsdom": "^16.2.13",
@@ -71,9 +69,11 @@
     "cli-truncate": "^3.1.0",
     "diff": "^5.0.0",
     "find-up": "^6.2.0",
+    "flatted": "^3.2.4",
     "happy-dom": "^2.24.5",
     "jsdom": "^19.0.0",
     "log-update": "^5.0.0",
+    "micromatch": "^4.0.4",
     "mlly": "^0.3.15",
     "nanoid": "^3.1.30",
     "natural-compare": "^1.4.0",