vitest 0.0.81 → 0.0.85

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { Formatter } from 'picocolors/types';
-import { TransformResult, ViteDevServer } from 'vite';
 import { OptionsReceived } from 'pretty-format';
 import { MessagePort } from 'worker_threads';
 export { assert, default as chai, expect, should } from 'chai';
@@ -110,31 +109,14 @@ declare type MatchersObject<T extends MatcherState = MatcherState> = {
     [id: string]: RawMatcherFn<T>;
 };
 
-declare class StateManager {
-    filesMap: Record<string, File>;
-    idMap: Record<string, Task>;
-    taskFileMap: WeakMap<Task, File>;
-    getFiles(keys?: string[]): File[];
-    collectFiles(files: File[]): void;
-    updateId(task: Task): void;
-    updateTasks(packs: TaskResultPack[]): void;
-}
-
-declare class SnapshotManager {
-    config: ResolvedConfig;
-    summary: SnapshotSummary;
-    constructor(config: ResolvedConfig);
-    clear(): void;
-    add(result: SnapshotResult): void;
-}
-
 declare type Awaitable<T> = T | PromiseLike<T>;
 declare type Nullable<T> = T | null | undefined;
 declare type Arrayable<T> = T | Array<T>;
+declare type ArgumentsType<T> = T extends (...args: infer U) => any ? U : never;
 interface ModuleCache {
     promise?: Promise<any>;
     exports?: any;
-    transformResult?: TransformResult;
+    code?: string;
 }
 interface EnvironmentReturn {
     teardown: (global: any) => Awaitable<void>;
@@ -143,14 +125,6 @@ interface Environment {
     name: string;
     setup(global: any): Awaitable<EnvironmentReturn>;
 }
-interface VitestContext {
-    config: ResolvedConfig;
-    server: ViteDevServer;
-    state: StateManager;
-    snapshot: SnapshotManager;
-    reporters: Reporter[];
-    console: Console;
-}
 interface UserConsoleLog {
     content: string;
     type: 'stdout' | 'stderr';
@@ -189,7 +163,8 @@ interface Test extends TaskBase {
     result?: TaskResult;
 }
 declare type Task = Test | Suite | File;
-declare type TestFunction = () => Awaitable<void>;
+declare type DoneCallback = (error?: any) => void;
+declare type TestFunction = (done: DoneCallback) => Awaitable<void>;
 declare type TestCollectorFn = (name: string, fn: TestFunction, timeout?: number) => void;
 interface ConcurrentCollector {
     (name: string, fn: TestFunction, timeout?: number): void;
@@ -294,7 +269,7 @@ interface SnapshotSummary {
     updated: number;
 }
 
-interface UserOptions {
+interface InlineConfig {
     /**
      * Include globs for test files
      *
@@ -397,28 +372,26 @@ interface UserOptions {
      * @default false
      */
     silent?: boolean;
-    /**
-     * Open Vitest UI
-     */
-    open?: boolean;
     /**
      * Path to setup files
      */
     setupFiles?: string | string[];
+    /**
+     * Open Vitest UI
+     * @internal WIP
+     */
+    open?: boolean;
     /**
      * Listen to port and serve API
      *
      * When set to true, the default port is 55555
      *
+     * @internal WIP
      * @default false
      */
     api?: boolean | number;
 }
-interface CliOptions extends UserOptions {
-    /**
-     * Filters by name
-     */
-    cliFilters?: string[];
+interface UserConfig extends InlineConfig {
     /**
      * Path to the config file.
      *
@@ -431,7 +404,7 @@ interface CliOptions extends UserOptions {
     config?: string | undefined;
     dom?: boolean;
 }
-interface ResolvedConfig extends Omit<Required<CliOptions>, 'config' | 'filters'> {
+interface ResolvedConfig extends Omit<Required<UserConfig>, 'config' | 'filters'> {
     config?: string;
     filters?: string[];
     depsInline: (string | RegExp)[];
@@ -446,7 +419,7 @@ interface WorkerContext {
     invalidates?: string[];
 }
 interface RpcMap {
-    fetch: [[id: string], TransformResult | null | undefined];
+    fetch: [[id: string], string | undefined];
     log: [[UserConsoleLog], void];
     processExit: [[code?: number], void];
     onCollected: [[files: File[]], void];
@@ -577,7 +550,7 @@ declare module 'vite' {
         /**
          * Options for Vitest
          */
-        test?: UserOptions;
+        test?: InlineConfig;
     }
 }
 declare global {
@@ -637,4 +610,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, suite, test, vitest };
+export { ArgumentsType, Arrayable, Awaitable, ComputeMode, DoneCallback, Environment, EnvironmentReturn, File, HookListener, InlineConfig, 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, UserConfig, UserConsoleLog, 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, v as vitest } from './index-16a06164.js';
+export { d as describe, i as it, s as suite, t as test } from './suite-0e21bf9b.js';
+export { a as afterAll, d as afterEach, b as beforeAll, c as beforeEach, v as vitest } from './index-906ac3f9.js';
 export { assert, default as chai, expect, should } from 'chai';
 export { spy, spyOn } from 'tinyspy';
 import './index-9e71c815.js';

package/dist/{middleware-b567041c.js → middleware-650c5fa0.js}

@@ -1,5 +1,5 @@
 import { stringify } from 'flatted';
-import { A as API_PATH } from './constants-1268ea5c.js';
+import { A as API_PATH } from './constants-adef7ffb.js';
 import 'path';
 import 'url';
 

package/dist/node.js

@@ -0,0 +1,19 @@
+export { c as createVitest } from './index-c033f95e.js';
+import 'path';
+import 'vite';
+import 'process';
+import 'fs';
+import './constants-adef7ffb.js';
+import 'url';
+import './utils-9dcc4050.js';
+import 'perf_hooks';
+import './error-c651f5ae.js';
+import 'tty';
+import 'source-map';
+import 'assert';
+import 'events';
+import 'worker_threads';
+import 'piscina';
+import 'fast-glob';
+import 'micromatch';
+import 'readline';

package/dist/{suite-95be5909.js → suite-0e21bf9b.js}

@@ -36,6 +36,17 @@ function withTimeout(fn, _timeout) {
     })]);
   };
 }
+function ensureAsyncTest(fn) {
+  if (!fn.length)
+    return fn;
+  return () => new Promise((resolve, reject) => {
+    const done = (...args) => args[0] ? reject(args[0]) : resolve();
+    fn(done);
+  });
+}
+function normalizeTest(fn, timeout) {
+  return withTimeout(ensureAsyncTest(fn), timeout);
+}
 
 const fnMap = new WeakMap();
 const hooksMap = new WeakMap();
@@ -136,24 +147,24 @@ function createSuiteCollector(name, factory = () => {
 }
 function createTestCollector(collectTest) {
   function test2(name, fn, timeout) {
-    collectTest(name, withTimeout(fn, timeout), "run");
+    collectTest(name, normalizeTest(fn, timeout), "run");
   }
   test2.concurrent = concurrent;
   test2.skip = skip;
   test2.only = only;
   test2.todo = todo;
   function concurrent(name, fn, timeout) {
-    collectTest(name, withTimeout(fn, timeout), "run", "concurrent");
+    collectTest(name, normalizeTest(fn, timeout), "run", "concurrent");
   }
-  concurrent.skip = (name, fn, timeout) => collectTest(name, withTimeout(fn, timeout), "skip", "concurrent");
-  concurrent.only = (name, fn, timeout) => collectTest(name, withTimeout(fn, timeout), "only", "concurrent");
+  concurrent.skip = (name, fn, timeout) => collectTest(name, normalizeTest(fn, timeout), "skip", "concurrent");
+  concurrent.only = (name, fn, timeout) => collectTest(name, normalizeTest(fn, timeout), "only", "concurrent");
   concurrent.todo = todo;
   function skip(name, fn, timeout) {
-    collectTest(name, withTimeout(fn, timeout), "skip");
+    collectTest(name, normalizeTest(fn, timeout), "skip");
   }
   skip.concurrent = concurrent.skip;
   function only(name, fn, timeout) {
-    collectTest(name, withTimeout(fn, timeout), "only");
+    collectTest(name, normalizeTest(fn, timeout), "only");
   }
   only.concurrent = concurrent.only;
   function todo(name) {

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-1268ea5c.js';
+import { c as distDir } from './constants-adef7ffb.js';
 import { builtinModules, createRequire } from 'module';
 import { pathToFileURL, fileURLToPath } from 'url';
 import vm from 'vm';
@@ -19,7 +19,8 @@ const defaultInline = [
   /\.(es|esm|esm-browser|esm-bundler|es6).js$/
 ];
 const depsExternal = [
-  /\.cjs.js$/
+  /\.cjs.js$/,
+  /\.mjs$/
 ];
 const isWindows = process.platform === "win32";
 const stubRequests = {
@@ -54,18 +55,6 @@ async function interpretedImport(path, interpretDefault) {
   }
   return mod;
 }
-let SOURCEMAPPING_URL = "sourceMa";
-SOURCEMAPPING_URL += "ppingURL";
-async function withInlineSourcemap(result) {
-  const { code, map } = result;
-  if (code.includes(`${SOURCEMAPPING_URL}=`))
-    return result;
-  if (map)
-    result.code = `${code}
-
-//# ${SOURCEMAPPING_URL}=data:application/json;charset=utf-8;base64,${Buffer.from(JSON.stringify(map), "utf-8").toString("base64")}`;
-  return result;
-}
 async function executeInViteNode(options) {
   const { moduleCache, root, files, fetch } = options;
   const externaled = new Set(builtinModules);
@@ -89,17 +78,26 @@ ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
     };
     if (id in stubRequests)
       return stubRequests[id];
-    const result2 = await fetch(id);
-    if (!result2)
+    const transformed = await fetch(id);
+    if (!transformed)
       throw new Error(`failed to load ${id}`);
-    if (process.env.NODE_V8_COVERAGE)
-      withInlineSourcemap(result2);
     const url = pathToFileURL(fsPath).href;
     const exports = {};
-    setCache(fsPath, { transformResult: result2, exports });
+    setCache(fsPath, { code: transformed, exports });
     const __filename = fileURLToPath(url);
+    const moduleProxy = {
+      set exports(value) {
+        exportAll(exports, value);
+        exports.default = value;
+      },
+      get exports() {
+        return exports.default;
+      }
+    };
     const context = {
       require: createRequire(url),
+      exports,
+      module: moduleProxy,
       __filename,
       __dirname: dirname(__filename),
       __vite_ssr_import__: request,
@@ -108,7 +106,7 @@ ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
       __vite_ssr_exportAll__: (obj) => exportAll(exports, obj),
       __vite_ssr_import_meta__: { url }
     };
-    const fn = vm.runInThisContext(`async (${Object.keys(context).join(",")})=>{${result2.code}
+    const fn = vm.runInThisContext(`async (${Object.keys(context).join(",")})=>{${transformed}
 }`, {
       filename: fsPath,
       lineOffset: 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.0.81",
+  "version": "0.0.85",
   "description": "A blazing fast unit test framework powered by Vite",
   "keywords": [
     "vite",
@@ -25,6 +25,13 @@
       "import": "./dist/index.js",
       "types": "./dist/index.d.ts"
     },
+    "./node": {
+      "import": "./dist/node.js",
+      "types": "./dist/node.d.ts"
+    },
+    "./global": {
+      "types": "./global.d.ts"
+    },
     "./*": "./*"
   },
   "main": "./dist/index.js",
@@ -49,7 +56,7 @@
     "micromatch": "^4.0.4",
     "piscina": "^3.2.0",
     "source-map": "^0.7.3",
-    "tinyspy": "^0.0.6"
+    "tinyspy": "^0.0.13"
   },
   "devDependencies": {
     "@types/diff": "^5.0.1",
@@ -69,6 +76,7 @@
     "natural-compare": "^1.4.0",
     "picocolors": "^1.0.0",
     "pretty-format": "^27.4.2",
+    "rollup": "^2.61.1",
     "strip-ansi": "^7.0.1"
   },
   "peerDependencies": {