vitest 0.15.2 → 0.16.0

package/dist/{chunk-api-setup.8cd5e92a.mjs → chunk-api-setup.f43cd039.mjs}

@@ -1,5 +1,5 @@
 import { promises } from 'fs';
-import { c as createBirpc } from './chunk-vite-node-utils.1bbdb2c1.mjs';
+import { c as createBirpc } from './chunk-vite-node-utils.7450fc0c.mjs';
 import require$$0$1 from 'stream';
 import require$$0 from 'zlib';
 import require$$3 from 'net';

package/dist/{chunk-runtime-mocker.d3ca0a4e.mjs → chunk-runtime-mocker.110e3634.mjs}

@@ -1,4 +1,4 @@
-import { n as normalizeRequestId, i as isNodeBuiltin, b as toFilePath, V as ViteNodeRunner } from './chunk-vite-node-utils.1bbdb2c1.mjs';
+import { n as normalizeRequestId, i as isNodeBuiltin, b as toFilePath, V as ViteNodeRunner } from './chunk-vite-node-utils.7450fc0c.mjs';
 import { normalizePath } from 'vite';
 import { a as getWorkerState, J as isWindows, K as mergeSlashes, d as dirname, m as resolve, l as basename, L as getType, M as getAllProperties, s as slash } from './chunk-utils-global.79a8b1cc.mjs';
 import { existsSync, readdirSync } from 'fs';

package/dist/{chunk-vite-node-externalize.0ec89ad1.mjs → chunk-vite-node-externalize.58e10976.mjs}

@@ -12,7 +12,7 @@ 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.1bbdb2c1.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.7450fc0c.mjs';
 import createDebug from 'debug';
 import { MessageChannel } from 'worker_threads';
 import { createHash } from 'crypto';
@@ -26,7 +26,7 @@ import childProcess from 'child_process';
 import MagicString from './chunk-magic-string.efe26975.mjs';
 import { p as prompts } from './vendor-index.98e769c1.mjs';
 
-var version = "0.15.2";
+var version = "0.16.0";
 
 class EndError extends Error {
 	constructor(value) {
@@ -7054,8 +7054,7 @@ function createPool(ctx) {
         config,
         files,
         invalidates,
-        workerId,
-        poolId: !ctx.config.threads ? 1 : (workerId - 1) % maxThreads + 1
+        workerId
       };
       try {
         await pool.run(data, { transferList: [workerPort], name });
@@ -10937,7 +10936,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.8cd5e92a.mjs')).setup(ctx);
+            (await import('./chunk-api-setup.f43cd039.mjs')).setup(ctx);
         } catch (err) {
           ctx.printError(err, true);
           process.exit(1);

package/dist/{chunk-vite-node-utils.1bbdb2c1.mjs → chunk-vite-node-utils.7450fc0c.mjs}

@@ -8851,7 +8851,7 @@ function mergeSlashes(str) {
 function normalizeRequestId(id, base) {
   if (base && id.startsWith(base))
     id = `/${id.slice(base.length)}`;
-  return id.replace(/^\/@id\/__x00__/, "\0").replace(/^\/@id\//, "").replace(/^__vite-browser-external:/, "").replace(/^(node|file):/, "").replace(/^\/+/, "/").replace(/\?v=\w+/, "?").replace(/&v=\w+/, "").replace(/\?t=\w+/, "?").replace(/&t=\w+/, "").replace(/\?import/, "?").replace(/&import/, "").replace(/\?+$/, "");
+  return id.replace(/^\/@id\/__x00__/, "\0").replace(/^\/@id\//, "").replace(/^__vite-browser-external:/, "").replace(/^(node|file):/, "").replace(/^\/+/, "/").replace(/\?v=\w+/, "?").replace(/&v=\w+/, "").replace(/\?t=\w+/, "?").replace(/&t=\w+/, "").replace(/\?import/, "?").replace(/&import/, "").replace(/\?&/, "?").replace(/\?+$/, "");
 }
 function normalizeModuleId(id) {
   return id.replace(/\\/g, "/").replace(/^\/@fs\//, "/").replace(/^file:\//, "/").replace(/^\/+/, "/");
@@ -8860,7 +8860,7 @@ function isPrimitive(v) {
   return v !== Object(v);
 }
 function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(dirname$2(root)) && dirname$2(root) !== "/" ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
+  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(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;

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import { p as picocolors } from './chunk-utils-global.79a8b1cc.mjs';
-import { v as version, s as startVitest, d as divider } from './chunk-vite-node-externalize.0ec89ad1.mjs';
+import { v as version, s as startVitest, d as divider } from './chunk-vite-node-externalize.58e10976.mjs';
 import 'tty';
 import 'local-pkg';
 import 'path';
@@ -16,7 +16,7 @@ import 'os';
 import 'util';
 import 'stream';
 import './vendor-_commonjsHelpers.4da45ef5.mjs';
-import './chunk-vite-node-utils.1bbdb2c1.mjs';
+import './chunk-vite-node-utils.7450fc0c.mjs';
 import 'vm';
 import 'assert';
 import 'debug';

package/dist/index.d.ts

@@ -496,7 +496,7 @@ declare type DeepMerge<F, S> = MergeInsertions<{
 declare type MutableArray<T extends readonly any[]> = {
     -readonly [k in keyof T]: T[k];
 };
-interface Constructable {
+interface Constructable$1 {
     new (...args: any[]): any;
 }
 interface ModuleCache {
@@ -768,14 +768,14 @@ declare type SuiteAPI<ExtraContext = {}> = ChainableFunction<'concurrent' | 'onl
     skipIf(condition: any): SuiteAPI<ExtraContext>;
     runIf(condition: any): SuiteAPI<ExtraContext>;
 };
-declare type HookListener<T extends any[], Return = void> = (...args: T) => Awaitable<Return | void>;
+declare type HookListener<T extends any[], Return = void> = (...args: T) => Awaitable<Return>;
+declare type HookCleanupCallback = (() => Awaitable<unknown>) | void;
 interface SuiteHooks {
-    beforeAll: HookListener<[Suite | File], () => Awaitable<void>>[];
+    beforeAll: HookListener<[Suite | File], HookCleanupCallback>[];
     afterAll: HookListener<[Suite | File]>[];
-    beforeEach: HookListener<[TestContext, Suite], () => Awaitable<void>>[];
+    beforeEach: HookListener<[TestContext, Suite], HookCleanupCallback>[];
     afterEach: HookListener<[TestContext, Suite]>[];
 }
-declare type HookCleanupCallback = (() => Awaitable<void>) | void;
 interface SuiteCollector<ExtraContext = {}> {
     readonly name: string;
     readonly mode: RunMode;
@@ -1460,8 +1460,8 @@ declare global {
             nthCalledWith<E extends any[]>(nthCall: number, ...args: E): void;
             toHaveBeenLastCalledWith<E extends any[]>(...args: E): void;
             lastCalledWith<E extends any[]>(...args: E): void;
-            toThrow(expected?: string | Constructable | RegExp | Error): void;
-            toThrowError(expected?: string | Constructable | RegExp | Error): void;
+            toThrow(expected?: string | Constructable$1 | RegExp | Error): void;
+            toThrowError(expected?: string | Constructable$1 | RegExp | Error): void;
             toReturn(): void;
             toHaveReturned(): void;
             toReturnTimes(times: number): void;
@@ -1499,7 +1499,6 @@ declare type BirpcReturn<RemoteFunctions> = {
 
 interface WorkerContext {
     workerId: number;
-    poolId: number;
     port: MessagePort;
     config: ResolvedConfig;
     files: string[];
@@ -1542,7 +1541,7 @@ interface MockResultThrow {
     value: any;
 }
 declare type MockResult<T> = MockResultReturn<T> | MockResultThrow | MockResultIncomplete;
-interface SpyContext<TArgs, TReturns> {
+interface MockContext<TArgs, TReturns> {
     calls: TArgs[];
     instances: TReturns[];
     invocationCallOrder: number[];
@@ -1560,10 +1559,9 @@ declare type Classes<T> = {
     [K in keyof T]: T[K] extends new (...args: any[]) => any ? K : never;
 }[keyof T] & (string | symbol);
 interface SpyInstance<TArgs extends any[] = any[], TReturns = any> {
-    (...args: TArgs): TReturns;
     getMockName(): string;
     mockName(n: string): this;
-    mock: SpyContext<TArgs, TReturns>;
+    mock: MockContext<TArgs, TReturns>;
     mockClear(): this;
     mockReset(): this;
     mockRestore(): void;
@@ -1578,15 +1576,17 @@ interface SpyInstance<TArgs extends any[] = any[], TReturns = any> {
     mockRejectedValue(obj: any): this;
     mockRejectedValueOnce(obj: any): this;
 }
-interface SpyInstanceFn<TArgs extends any[] = any, TReturns = any> extends SpyInstance<TArgs, TReturns> {
-    (...args: TArgs): TReturns;
+interface MockInstance<A extends any[] = any[], R = any> extends SpyInstance<A, R> {
+}
+interface Mock<TArgs extends any[] = any, TReturns = any> extends SpyInstance<TArgs, TReturns> {
     new (...args: TArgs): TReturns;
+    (...args: TArgs): TReturns;
 }
-declare type MaybeMockedConstructor<T> = T extends new (...args: Array<any>) => infer R ? SpyInstanceFn<ConstructorParameters<T>, R> : T;
-declare type MockedFunction<T extends Procedure> = SpyInstanceFn<Parameters<T>, ReturnType<T>> & {
+declare type MaybeMockedConstructor<T> = T extends new (...args: Array<any>) => infer R ? Mock<ConstructorParameters<T>, R> : T;
+declare type MockedFunction<T extends Procedure> = Mock<Parameters<T>, ReturnType<T>> & {
     [K in keyof T]: T[K];
 };
-declare type MockedFunctionDeep<T extends Procedure> = SpyInstanceFn<Parameters<T>, ReturnType<T>> & MockedObjectDeep<T>;
+declare type MockedFunctionDeep<T extends Procedure> = Mock<Parameters<T>, ReturnType<T>> & MockedObjectDeep<T>;
 declare type MockedObject<T> = MaybeMockedConstructor<T> & {
     [K in Methods<T>]: T[K] extends Procedure ? MockedFunction<T[K]> : T[K];
 } & {
@@ -1599,12 +1599,23 @@ declare type MockedObjectDeep<T> = MaybeMockedConstructor<T> & {
 };
 declare type MaybeMockedDeep<T> = T extends Procedure ? MockedFunctionDeep<T> : T extends object ? MockedObjectDeep<T> : T;
 declare type MaybeMocked<T> = T extends Procedure ? MockedFunction<T> : T extends object ? MockedObject<T> : T;
+interface Constructable {
+    new (...args: any[]): any;
+}
+declare type MockedClass<T extends Constructable> = MockInstance<InstanceType<T>, T extends new (...args: infer P) => any ? P : never> & {
+    prototype: T extends {
+        prototype: any;
+    } ? Mocked<T['prototype']> : never;
+} & T;
+declare type Mocked<T> = {
+    [P in keyof T]: T[P] extends (...args: infer Args) => infer Returns ? MockInstance<Args, Returns> : T[P] extends Constructable ? MockedClass<T[P]> : T[P];
+} & T;
 declare type EnhancedSpy<TArgs extends any[] = any[], TReturns = any> = SpyInstance<TArgs, TReturns> & SpyImpl<TArgs, TReturns>;
 declare function spyOn<T, S extends Properties<Required<T>>>(obj: T, methodName: S, accessType: 'get'): SpyInstance<[], T[S]>;
 declare function spyOn<T, G extends Properties<Required<T>>>(obj: T, methodName: G, accessType: 'set'): SpyInstance<[T[G]], void>;
 declare function spyOn<T, M extends (Methods<Required<T>> | Classes<Required<T>>)>(obj: T, methodName: M): Required<T>[M] extends (...args: infer A) => infer R | (new (...args: infer A) => infer R) ? SpyInstance<A, R> : never;
-declare function fn<TArgs extends any[] = any[], R = any>(): SpyInstanceFn<TArgs, R>;
-declare function fn<TArgs extends any[] = any[], R = any>(implementation: (...args: TArgs) => R): SpyInstanceFn<TArgs, R>;
+declare function fn<TArgs extends any[] = any[], R = any>(): Mock<TArgs, R>;
+declare function fn<TArgs extends any[] = any[], R = any>(implementation: (...args: TArgs) => R): Mock<TArgs, R>;
 
 declare const suite: SuiteAPI<{}>;
 declare const test: TestAPI<{}>;
@@ -1761,4 +1772,4 @@ interface WebSocketHandlers {
 interface WebSocketEvents extends Pick<Reporter, 'onCollected' | 'onFinished' | 'onTaskUpdate' | 'onUserConsoleLog'> {
 }
 
-export { ApiConfig, ArgumentsType$1 as ArgumentsType, Arrayable, Awaitable, BuiltinEnvironment, C8Options, Constructable, CoverageReporter, DeepMerge, DoneCallback, EnhancedSpy, Environment, EnvironmentOptions, EnvironmentReturn, ErrorWithDiff, File, HookCleanupCallback, HookListener, InlineConfig, JSDOMOptions, MergeInsertions, MockedFunction, MockedObject, ModuleCache, ModuleGraphData, MutableArray, Nullable, ParsedStack, Position, Reporter, ResolveIdFunction, ResolvedC8Options, ResolvedConfig, RunMode, RuntimeContext, SnapshotData, SnapshotMatchOptions, SnapshotResult, SnapshotStateOptions, SnapshotSummary, SnapshotUpdateState, SpyContext, SpyInstance, SpyInstanceFn, Suite, SuiteAPI, SuiteCollector, SuiteFactory, SuiteHooks, Task, TaskBase, TaskResult, TaskResultPack, TaskState, Test, TestAPI, TestContext, TestFunction, TransformResultWithSource, UncheckedSnapshot, UserConfig, UserConsoleLog, Vitest, WebSocketEvents, WebSocketHandlers, WorkerContext, WorkerGlobalState, WorkerRPC, afterAll, afterEach, beforeAll, beforeEach, createExpect, describe, globalExpect as expect, getRunningMode, isFirstRun, isWatchMode, it, runOnce, suite, test, vi, vitest, withCallback };
+export { ApiConfig, ArgumentsType$1 as ArgumentsType, Arrayable, Awaitable, BuiltinEnvironment, C8Options, Constructable$1 as Constructable, CoverageReporter, DeepMerge, DoneCallback, EnhancedSpy, Environment, EnvironmentOptions, EnvironmentReturn, ErrorWithDiff, File, HookCleanupCallback, HookListener, InlineConfig, JSDOMOptions, MergeInsertions, Mock, MockContext, MockInstance, Mocked, MockedClass, MockedFunction, MockedObject, ModuleCache, ModuleGraphData, MutableArray, Nullable, ParsedStack, Position, Reporter, ResolveIdFunction, ResolvedC8Options, ResolvedConfig, RunMode, RuntimeContext, SnapshotData, SnapshotMatchOptions, SnapshotResult, SnapshotStateOptions, SnapshotSummary, SnapshotUpdateState, SpyInstance, Suite, SuiteAPI, SuiteCollector, SuiteFactory, SuiteHooks, Task, TaskBase, TaskResult, TaskResultPack, TaskState, Test, TestAPI, TestContext, TestFunction, TransformResultWithSource, UncheckedSnapshot, UserConfig, UserConsoleLog, Vitest, WebSocketEvents, WebSocketHandlers, WorkerContext, WorkerGlobalState, WorkerRPC, afterAll, afterEach, beforeAll, beforeEach, createExpect, describe, globalExpect as expect, getRunningMode, isFirstRun, isWatchMode, it, runOnce, suite, test, vi, vitest, withCallback };

package/dist/node.d.ts

@@ -604,11 +604,12 @@ interface Test<ExtraContext = {}> extends TaskBase {
     context: TestContext & ExtraContext;
 }
 declare type Task = Test | Suite | File;
-declare type HookListener<T extends any[], Return = void> = (...args: T) => Awaitable<Return | void>;
+declare type HookListener<T extends any[], Return = void> = (...args: T) => Awaitable<Return>;
+declare type HookCleanupCallback = (() => Awaitable<unknown>) | void;
 interface SuiteHooks {
-    beforeAll: HookListener<[Suite | File], () => Awaitable<void>>[];
+    beforeAll: HookListener<[Suite | File], HookCleanupCallback>[];
     afterAll: HookListener<[Suite | File]>[];
-    beforeEach: HookListener<[TestContext, Suite], () => Awaitable<void>>[];
+    beforeEach: HookListener<[TestContext, Suite], HookCleanupCallback>[];
     afterEach: HookListener<[TestContext, Suite]>[];
 }
 interface TestContext {

package/dist/node.mjs

@@ -1,5 +1,5 @@
-export { V as VitestPlugin, c as createVitest, s as startVitest } from './chunk-vite-node-externalize.0ec89ad1.mjs';
-export { V as VitestRunner } from './chunk-runtime-mocker.d3ca0a4e.mjs';
+export { V as VitestPlugin, c as createVitest, s as startVitest } from './chunk-vite-node-externalize.58e10976.mjs';
+export { V as VitestRunner } from './chunk-runtime-mocker.110e3634.mjs';
 import './chunk-utils-global.79a8b1cc.mjs';
 import 'tty';
 import 'local-pkg';
@@ -17,7 +17,7 @@ import 'util';
 import 'stream';
 import 'events';
 import './vendor-_commonjsHelpers.4da45ef5.mjs';
-import './chunk-vite-node-utils.1bbdb2c1.mjs';
+import './chunk-vite-node-utils.7450fc0c.mjs';
 import 'vm';
 import 'assert';
 import 'debug';

package/dist/worker.mjs

@@ -1,7 +1,8 @@
 import { m as resolve, a as getWorkerState } from './chunk-utils-global.79a8b1cc.mjs';
-import { c as createBirpc, M as ModuleCacheMap } from './chunk-vite-node-utils.1bbdb2c1.mjs';
+import { c as createBirpc, M as ModuleCacheMap } from './chunk-vite-node-utils.7450fc0c.mjs';
+import { workerId } from 'tinypool';
 import { d as distDir } from './chunk-constants.7b9cfc82.mjs';
-import { e as executeInViteNode } from './chunk-runtime-mocker.d3ca0a4e.mjs';
+import { e as executeInViteNode } from './chunk-runtime-mocker.110e3634.mjs';
 import { r as rpc } from './chunk-runtime-rpc.5e78af38.mjs';
 import 'tty';
 import 'local-pkg';
@@ -55,9 +56,9 @@ async function startViteNode(ctx) {
 function init(ctx) {
   if (typeof __vitest_worker__ !== "undefined" && ctx.config.threads && ctx.config.isolate)
     throw new Error(`worker for ${ctx.files.join(",")} already initialized by ${getWorkerState().ctx.files.join(",")}. This is probably an internal bug of Vitest.`);
-  const { config, port, workerId, poolId } = ctx;
-  process.env.VITEST_WORKER_ID = String(workerId);
-  process.env.VITEST_POOL_ID = String(poolId);
+  const { config, port, workerId: workerId$1 } = ctx;
+  process.env.VITEST_WORKER_ID = String(workerId$1);
+  process.env.VITEST_POOL_ID = String(workerId);
   globalThis.__vitest_worker__ = {
     ctx,
     moduleCache,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.15.2",
+  "version": "0.16.0",
   "description": "A blazing fast unit test framework powered by Vite",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -83,7 +83,7 @@
     "chai": "^4.3.6",
     "debug": "^4.3.4",
     "local-pkg": "^0.4.1",
-    "tinypool": "^0.1.3",
+    "tinypool": "^0.2.1",
     "tinyspy": "^0.3.3",
     "vite": "^2.9.12"
   },
@@ -96,7 +96,7 @@
     "@types/natural-compare": "^1.4.1",
     "@types/prompts": "^2.4.0",
     "@types/sinonjs__fake-timers": "^8.1.2",
-    "@vitest/ui": "0.15.2",
+    "@vitest/ui": "0.16.0",
     "birpc": "^0.2.3",
     "c8": "^7.11.3",
     "cac": "^6.7.12",
@@ -124,7 +124,7 @@
     "source-map-js": "^1.0.2",
     "strip-ansi": "^7.0.1",
     "typescript": "^4.7.4",
-    "vite-node": "0.15.2",
+    "vite-node": "0.16.0",
     "ws": "^8.8.0"
   },
   "scripts": {