vitest 0.0.22 → 0.0.23

package/README.md

@@ -2,7 +2,7 @@
 
 [![NPM version](https://img.shields.io/npm/v/vitest?color=a1b858&label=)](https://www.npmjs.com/package/vitest)
 
-A blazing fast test runner powered by Vite.
+A blazing fast unit test framework powered by Vite.
 
 ## Features
 
@@ -155,8 +155,8 @@ describe('suite', () => {
 - [x] Task filter
 - [x] Mock
 - [x] Global Mode & Types
-- [ ] Parallel Executing
-- [ ] CLI Help (Use yargs)
+- [ ] Concurrent Executing
+- [x] CLI Help
 - [x] JSDom
 - [x] Watch
 - [ ] Source Map

package/bin/vitest.mjs

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 'use strict'
 
-import '../dist/entry.js'
+import '../dist/cli.js'

package/dist/cli.d.ts

@@ -1 +1,10 @@
-export {};
+import type { UserOptions } from './types';
+declare global {
+    namespace NodeJS {
+        interface Process {
+            __vitest__: {
+                options: Required<UserOptions>;
+            };
+        }
+    }
+}

package/dist/cli.js

@@ -1,29 +1,56 @@
-import minimist from 'minimist';
-import c from 'picocolors';
-import { run } from './run';
-const { log } = console;
-const argv = minimist(process.argv.slice(2), {
-    alias: {
-        u: 'update',
-        w: 'watch',
-    },
-    string: ['root', 'config'],
-    boolean: ['update', 'dev', 'global', 'watch', 'jsdom'],
-    unknown(name) {
-        if (name[0] === '-') {
-            console.error(c.red(`Unknown argument: ${name}`));
-            help();
-            process.exit(1);
-        }
-        return true;
-    },
-});
-if (!process.__vite_node__)
-    throw new Error('Vite can only run in Vite environment, please use the CLI to start the process');
-const server = process.__vite_node__.server;
-const viteConfig = (server === null || server === void 0 ? void 0 : server.config) || {};
-const testOptions = viteConfig.test || {};
-await run(Object.assign(Object.assign(Object.assign({}, argv), testOptions), { server, updateSnapshot: argv.update, rootDir: argv.root || process.cwd(), nameFilters: argv._ }));
-function help() {
-    log('Help: finish help');
-}
+import { fileURLToPath } from 'url';
+import { resolve, dirname } from 'path';
+import { findUp } from 'find-up';
+import sade from 'sade';
+import { run as startViteNode } from './node/index.js';
+// TODO: use bundler
+const version = '0.0.0';
+sade('vitest [filter]', true)
+    .version(version)
+    .describe('A blazing fast unit test framework powered by Vite.')
+    .option('-r, --root', 'root path', process.cwd())
+    .option('-c, --config', 'path to config file')
+    .option('-w, --watch', 'watch mode', false)
+    .option('-u, --update', 'update snapshot', false)
+    .option('--global', 'inject apis globally', false)
+    .option('--dev', 'dev mode', false)
+    .option('--jsdom', 'mock browser api using JSDOM', false)
+    .action(async (filters, options) => {
+    process.env.VITEST = 'true';
+    const __dirname = dirname(fileURLToPath(import.meta.url));
+    const root = resolve(options.root || process.cwd());
+    const configPath = options.config
+        ? resolve(root, options.config)
+        : await findUp(['vitest.config.ts', 'vitest.config.js', 'vitest.config.mjs', 'vite.config.ts', 'vite.config.js', 'vite.config.mjs'], { cwd: root });
+    options.config = configPath;
+    options.root = root;
+    options.filters = filters
+        ? Array.isArray(filters)
+            ? filters
+            : [filters]
+        : undefined;
+    process.__vitest__ = {
+        options,
+    };
+    await startViteNode({
+        root,
+        files: [
+            resolve(__dirname, options.dev ? '../src/entry.ts' : './entry.js'),
+        ],
+        config: configPath,
+        defaultConfig: {
+            optimizeDeps: {
+                exclude: [
+                    'vitest',
+                ],
+            },
+        },
+        shouldExternalize(id) {
+            if (id.includes('/node_modules/vitest/'))
+                return false;
+            else
+                return id.includes('/node_modules/');
+        },
+    });
+})
+    .parse(process.argv);

package/dist/entry.js

@@ -1,38 +1,6 @@
-import { fileURLToPath } from 'url';
-import { resolve, dirname } from 'path';
-import minimist from 'minimist';
-import { findUp } from 'find-up';
-import { run } from './node/index.js';
-process.env.VITEST = 'true';
-const argv = minimist(process.argv.slice(2), {
-    alias: {
-        c: 'config',
-    },
-    string: ['root', 'config'],
-    boolean: ['dev'],
-});
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const root = resolve(argv.root || process.cwd());
-const configPath = argv.config
-    ? resolve(root, argv.config)
-    : await findUp(['vitest.config.ts', 'vitest.config.js', 'vitest.config.mjs', 'vite.config.ts', 'vite.config.js', 'vite.config.mjs'], { cwd: root });
-await run({
-    root,
-    files: [
-        resolve(__dirname, argv.dev ? '../src/cli.ts' : './cli.js'),
-    ],
-    config: configPath,
-    defaultConfig: {
-        optimizeDeps: {
-            exclude: [
-                'vitest',
-            ],
-        },
-    },
-    shouldExternalize(id) {
-        if (id.includes('/node_modules/vitest/'))
-            return false;
-        else
-            return id.includes('/node_modules/');
-    },
-});
+import { run } from './run';
+if (!process.__vite_node__ || !process.__vitest__)
+    throw new Error('Vitest can only run in vite-node environment, please use the CLI to start the process');
+const inlineOptions = process.__vite_node__.server.config.test || {};
+const cliOptions = process.__vitest__.options || {};
+await run(Object.assign(Object.assign({}, inlineOptions), cliOptions));

package/dist/integrations/chai/setup.d.ts

@@ -1,2 +1,2 @@
-import { Config } from 'vitest';
-export declare function setupChai(config: Config): Promise<void>;
+import { ResolvedConfig } from 'vitest';
+export declare function setupChai(config: ResolvedConfig): Promise<void>;

package/dist/integrations/chai/setup.js

@@ -5,8 +5,5 @@ import { SnapshotPlugin } from './snapshot';
 export async function setupChai(config) {
     chai.use(SinonChai);
     chai.use(JestChaiExpect());
-    chai.use(await SnapshotPlugin({
-        rootDir: config.rootDir || process.cwd(),
-        update: config.updateSnapshot,
-    }));
+    chai.use(await SnapshotPlugin(config));
 }

package/dist/integrations/chai/snapshot/index.d.ts

@@ -1,7 +1,7 @@
 import { ChaiPlugin } from '../types';
 import { SnapshotManager } from './manager';
 export interface SnapshotOptions {
-    rootDir: string;
+    root: string;
     update?: boolean;
 }
 export declare function getSnapshotManager(): SnapshotManager;

package/dist/integrations/chai/snapshot/index.js

@@ -6,7 +6,7 @@ export function getSnapshotManager() {
     return _manager;
 }
 export async function SnapshotPlugin(options) {
-    const { rootDir } = options;
+    const { root: rootDir } = options;
     _manager = new SnapshotManager({
         rootDir,
         update: options.update,

package/dist/run/index.d.ts

@@ -1,8 +1,8 @@
-import { File, Config, Task, RunnerContext, Suite } from '../types';
+import { File, ResolvedConfig, Task, RunnerContext, Suite } from '../types';
 export declare function runTask(task: Task, ctx: RunnerContext): Promise<void>;
 export declare function collectFiles(paths: string[]): Promise<Record<string, File>>;
 export declare function runSite(suite: Suite, ctx: RunnerContext): Promise<void>;
 export declare function runFile(file: File, ctx: RunnerContext): Promise<void>;
 export declare function runFiles(filesMap: Record<string, File>, ctx: RunnerContext): Promise<void>;
-export declare function run(config: Config): Promise<void>;
+export declare function run(config: ResolvedConfig): Promise<void>;
 export declare function startWatcher(ctx: RunnerContext): Promise<void>;

package/dist/run/index.js

@@ -143,12 +143,12 @@ export async function run(config) {
     // collect files
     let testFilepaths = await fg(config.includes || defaultIncludes, {
         absolute: true,
-        cwd: config.rootDir,
+        cwd: config.root,
         ignore: config.excludes || defaultExcludes,
     });
     // if name filters are provided by the CLI
-    if ((_a = config.nameFilters) === null || _a === void 0 ? void 0 : _a.length)
-        testFilepaths = testFilepaths.filter(i => config.nameFilters.some(f => i.includes(f)));
+    if ((_a = config.filters) === null || _a === void 0 ? void 0 : _a.length)
+        testFilepaths = testFilepaths.filter(i => config.filters.some(f => i.includes(f)));
     if (!testFilepaths.length) {
         console.error('No test files found');
         process.exitCode = 1;

package/dist/types.d.ts

@@ -1,4 +1,3 @@
-import { ViteDevServer } from 'vite';
 export declare type Awaitable<T> = Promise<T> | T;
 export interface UserOptions {
     includes?: string[];
@@ -21,13 +20,22 @@ export interface UserOptions {
      * @default false
      */
     parallel?: boolean;
-}
-export interface Config extends UserOptions {
-    rootDir?: string;
-    updateSnapshot?: boolean;
-    nameFilters?: string[];
-    server: ViteDevServer;
+    /**
+     * Update snapshot files
+     *
+     * @default false
+     */
+    update?: boolean;
+    /**
+     * Watch mode
+     *
+     * @default false
+     */
     watch?: boolean;
+    root?: string;
+}
+export interface ResolvedConfig extends Required<UserOptions> {
+    filters?: string[];
 }
 export declare type RunMode = 'run' | 'skip' | 'only' | 'todo';
 export declare type TaskState = RunMode | 'pass' | 'fail';
@@ -82,7 +90,7 @@ export interface RunnerContext {
     files: File[];
     suites: Suite[];
     tasks: Task[];
-    config: Config;
+    config: ResolvedConfig;
     reporter: Reporter;
 }
 export interface GlobalContext {
@@ -90,7 +98,7 @@ export interface GlobalContext {
     currentSuite: SuiteCollector | null;
 }
 export interface Reporter {
-    onStart?: (userOptions: Config) => Awaitable<void>;
+    onStart?: (userOptions: ResolvedConfig) => Awaitable<void>;
     onCollected?: (files: File[], ctx: RunnerContext) => Awaitable<void>;
     onFinished?: (ctx: RunnerContext) => Awaitable<void>;
     onSuiteBegin?: (suite: Suite, ctx: RunnerContext) => Awaitable<void>;

package/package.json

@@ -1,8 +1,13 @@
 {
   "name": "vitest",
-  "version": "0.0.22",
-  "description": "",
-  "keywords": [],
+  "version": "0.0.23",
+  "description": "A blazing fast unit test framework powered by Vite",
+  "keywords": [
+    "vite",
+    "vite-node",
+    "test",
+    "jest"
+  ],
   "homepage": "https://github.com/antfu/vitest#readme",
   "bugs": {
     "url": "https://github.com/antfu/vitest/issues"
@@ -44,9 +49,8 @@
     "jest-util": "^27.4.2",
     "jsdom": "^19.0.0",
     "listr": "^0.14.3",
-    "minimist": "^1.2.5",
-    "ora": "^6.0.1",
     "picocolors": "^1.0.0",
+    "sade": "^1.7.4",
     "sinon": "^12.0.1",
     "sinon-chai": "^3.7.0"
   },
@@ -55,8 +59,8 @@
     "@antfu/ni": "^0.11.0",
     "@types/jsdom": "^16.2.13",
     "@types/listr": "^0.14.4",
-    "@types/minimist": "^1.2.2",
     "@types/node": "^16.11.11",
+    "@types/sade": "^1.7.3",
     "@types/sinon": "^10.0.6",
     "bumpp": "^7.1.1",
     "eslint": "^8.3.0",