vitest 0.0.17 → 0.0.21

package/README.md

@@ -156,8 +156,8 @@ describe('suite', () => {
 - [x] Mock
 - [x] Global Mode & Types
 - [ ] Parallel Executing
-- [ ] CLI Help
-- [ ] JSDom
+- [ ] CLI Help (Use yargs)
+- [x] JSDom
 - [ ] Watch
 - [ ] Source Map
 - [ ] Coverage

package/dist/index.d.ts

@@ -3,3 +3,29 @@ export * from './suite';
 export * from './config';
 export * from './integrations/chai';
 export * from './integrations/sinon';
+declare global {
+    namespace Chai {
+        interface Assertion {
+            toMatchSnapshot(message?: string): Assertion;
+            matchSnapshot(message?: string): Assertion;
+            toEqual(expected: any): void;
+            toStrictEqual(expected: any): void;
+            toBe(expected: any): void;
+            toContain(item: any): void;
+            toBeTruthy(): void;
+            toBeFalsy(): void;
+            toBeNaN(): void;
+            toBeUndefined(): void;
+            toBeNull(): void;
+            toBeDefined(): void;
+            toBeInstanceOf(c: any): void;
+            toBeCalledTimes(n: number): void;
+            toBeCalledOnce(): void;
+            toBeCalled(): void;
+            toHaveBeenCalled(): void;
+        }
+        interface ExpectStatic {
+            addSnapshotSerializer: import('pretty-format').Plugin;
+        }
+    }
+}

package/dist/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-namespace */
 export * from './types';
 export * from './suite';
 export * from './config';

package/dist/integrations/chai/jest-expect.d.ts

@@ -1,21 +1,2 @@
 import { ChaiPlugin } from './types';
 export declare function JestChaiExpect(): ChaiPlugin;
-declare global {
-    namespace Chai {
-        interface Assertion {
-            toEqual(expected: any): void;
-            toStrictEqual(expected: any): void;
-            toBe(expected: any): void;
-            toContain(item: any): void;
-            toBeTruthy(): void;
-            toBeFalsy(): void;
-            toBeNaN(): void;
-            toBeUndefined(): void;
-            toBeNull(): void;
-            toBeDefined(): void;
-        }
-        interface ExpectStatic {
-            addSnapshotSerializer: import('pretty-format').Plugin;
-        }
-    }
-}

package/dist/integrations/chai/jest-expect.js

@@ -10,7 +10,7 @@ export function JestChaiExpect() {
             return this.equal(expected);
         });
         utils.addMethod(proto, 'toBe', function (expected) {
-            return this.be(expected);
+            return this.equal(expected);
         });
         utils.addMethod(proto, 'toContain', function (item) {
             return this.contain(item);
@@ -19,7 +19,7 @@ export function JestChaiExpect() {
             const obj = utils.flag(this, 'object');
             this.assert(Boolean(obj), 'expected #{this} to be truthy', 'expected #{this} to not be truthy', obj);
         });
-        utils.addMethod(proto, 'toFalsy', function () {
+        utils.addMethod(proto, 'toBeFalsy', function () {
             const obj = utils.flag(this, 'object');
             this.assert(!obj, 'expected #{this} to be falsy', 'expected #{this} to not be falsy', obj);
         });
@@ -35,5 +35,21 @@ export function JestChaiExpect() {
         utils.addMethod(proto, 'toBeDefined', function () {
             return this.not.be.undefined;
         });
+        utils.addMethod(proto, 'toBeInstanceOf', function (obj) {
+            return this.instanceOf(obj);
+        });
+        // mock
+        utils.addMethod(proto, 'toBeCalledTimes', function (number) {
+            return this.callCount(number);
+        });
+        utils.addMethod(proto, 'toBeCalledOnce', function () {
+            return this.callCount(1);
+        });
+        utils.addMethod(proto, 'toBeCalled', function () {
+            return this.called;
+        });
+        utils.addMethod(proto, 'toHaveBeenCalled', function () {
+            return this.called;
+        });
     };
 }

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

@@ -6,14 +6,3 @@ export interface SnapshotOptions {
 }
 export declare function getSnapshotManager(): SnapshotManager;
 export declare function SnapshotPlugin(options: SnapshotOptions): Promise<ChaiPlugin>;
-declare global {
-    namespace Chai {
-        interface Assertion {
-            toMatchSnapshot(message?: string): Assertion;
-            matchSnapshot(message?: string): Assertion;
-        }
-        interface ExpectStatic {
-            addSnapshotSerializer: import('pretty-format').Plugin;
-        }
-    }
-}

package/dist/integrations/{jsdom.js → jsdom/index.js}

@@ -1,4 +1,5 @@
 import { JSDOM } from 'jsdom';
+import { KEYS } from './keys';
 export function setupJSDOM(global) {
     const dom = new JSDOM('<!DOCTYPE html>', {
         pretendToBeVisual: true,
@@ -6,7 +7,7 @@ export function setupJSDOM(global) {
         // TODO: options
         url: 'http://localhost:3000',
     });
-    const keys = Object.getOwnPropertyNames(dom.window)
+    const keys = KEYS.concat(Object.getOwnPropertyNames(dom.window))
         .filter(k => !k.startsWith('_'))
         .filter(k => !(k in global));
     for (const key of keys)

package/dist/integrations/jsdom/keys.d.ts

@@ -0,0 +1 @@
+export declare const KEYS: string[];

package/dist/integrations/jsdom/keys.js

@@ -0,0 +1,220 @@
+// SEE https://github.com/jsdom/jsdom/blob/master/lib/jsdom/living/interfaces.js
+const LIVING_KEYS = [
+    'DOMException',
+    'URL',
+    'URLSearchParams',
+    'EventTarget',
+    'NamedNodeMap',
+    'Node',
+    'Attr',
+    'Element',
+    'DocumentFragment',
+    'DOMImplementation',
+    'Document',
+    'XMLDocument',
+    'CharacterData',
+    'Text',
+    'CDATASection',
+    'ProcessingInstruction',
+    'Comment',
+    'DocumentType',
+    'NodeList',
+    'HTMLCollection',
+    'HTMLOptionsCollection',
+    'DOMStringMap',
+    'DOMTokenList',
+    'StyleSheetList',
+    'HTMLElement',
+    'HTMLHeadElement',
+    'HTMLTitleElement',
+    'HTMLBaseElement',
+    'HTMLLinkElement',
+    'HTMLMetaElement',
+    'HTMLStyleElement',
+    'HTMLBodyElement',
+    'HTMLHeadingElement',
+    'HTMLParagraphElement',
+    'HTMLHRElement',
+    'HTMLPreElement',
+    'HTMLUListElement',
+    'HTMLOListElement',
+    'HTMLLIElement',
+    'HTMLMenuElement',
+    'HTMLDListElement',
+    'HTMLDivElement',
+    'HTMLAnchorElement',
+    'HTMLAreaElement',
+    'HTMLBRElement',
+    'HTMLButtonElement',
+    'HTMLCanvasElement',
+    'HTMLDataElement',
+    'HTMLDataListElement',
+    'HTMLDetailsElement',
+    'HTMLDialogElement',
+    'HTMLDirectoryElement',
+    'HTMLFieldSetElement',
+    'HTMLFontElement',
+    'HTMLFormElement',
+    'HTMLHtmlElement',
+    'HTMLImageElement',
+    'HTMLInputElement',
+    'HTMLLabelElement',
+    'HTMLLegendElement',
+    'HTMLMapElement',
+    'HTMLMarqueeElement',
+    'HTMLMediaElement',
+    'HTMLMeterElement',
+    'HTMLModElement',
+    'HTMLOptGroupElement',
+    'HTMLOptionElement',
+    'HTMLOutputElement',
+    'HTMLPictureElement',
+    'HTMLProgressElement',
+    'HTMLQuoteElement',
+    'HTMLScriptElement',
+    'HTMLSelectElement',
+    'HTMLSlotElement',
+    'HTMLSourceElement',
+    'HTMLSpanElement',
+    'HTMLTableCaptionElement',
+    'HTMLTableCellElement',
+    'HTMLTableColElement',
+    'HTMLTableElement',
+    'HTMLTimeElement',
+    'HTMLTableRowElement',
+    'HTMLTableSectionElement',
+    'HTMLTemplateElement',
+    'HTMLTextAreaElement',
+    'HTMLUnknownElement',
+    'HTMLFrameElement',
+    'HTMLFrameSetElement',
+    'HTMLIFrameElement',
+    'HTMLEmbedElement',
+    'HTMLObjectElement',
+    'HTMLParamElement',
+    'HTMLVideoElement',
+    'HTMLAudioElement',
+    'HTMLTrackElement',
+    'SVGElement',
+    'SVGGraphicsElement',
+    'SVGSVGElement',
+    'SVGTitleElement',
+    'SVGAnimatedString',
+    'SVGNumber',
+    'SVGStringList',
+    'Event',
+    'CloseEvent',
+    'CustomEvent',
+    'MessageEvent',
+    'ErrorEvent',
+    'HashChangeEvent',
+    'PopStateEvent',
+    'StorageEvent',
+    'ProgressEvent',
+    'PageTransitionEvent',
+    'UIEvent',
+    'FocusEvent',
+    'InputEvent',
+    'MouseEvent',
+    'KeyboardEvent',
+    'TouchEvent',
+    'CompositionEvent',
+    'WheelEvent',
+    'BarProp',
+    'External',
+    'Location',
+    'History',
+    'Screen',
+    'Performance',
+    'Navigator',
+    'PluginArray',
+    'MimeTypeArray',
+    'Plugin',
+    'MimeType',
+    'FileReader',
+    'Blob',
+    'File',
+    'FileList',
+    'ValidityState',
+    'DOMParser',
+    'XMLSerializer',
+    'FormData',
+    'XMLHttpRequestEventTarget',
+    'XMLHttpRequestUpload',
+    'XMLHttpRequest',
+    'WebSocket',
+    'NodeFilter',
+    'NodeIterator',
+    'TreeWalker',
+    'AbstractRange',
+    'Range',
+    'StaticRange',
+    'Selection',
+    'Storage',
+    'CustomElementRegistry',
+    'ShadowRoot',
+    'MutationObserver',
+    'MutationRecord',
+    'Headers',
+    'AbortController',
+    'AbortSignal',
+];
+const OTHER_KEYS = [
+    'addEventListener',
+    'alert',
+    'atob',
+    'blur',
+    'btoa',
+    /* 'clearInterval', */
+    /* 'clearTimeout', */
+    'close',
+    'confirm',
+    /* 'console', */
+    'createPopup',
+    'dispatchEvent',
+    'document',
+    'focus',
+    'frames',
+    'getComputedStyle',
+    'history',
+    'innerHeight',
+    'innerWidth',
+    'length',
+    'location',
+    'moveBy',
+    'moveTo',
+    'name',
+    'navigator',
+    'open',
+    'outerHeight',
+    'outerWidth',
+    'pageXOffset',
+    'pageYOffset',
+    'parent',
+    'postMessage',
+    'print',
+    'prompt',
+    'removeEventListener',
+    'resizeBy',
+    'resizeTo',
+    'screen',
+    'screenLeft',
+    'screenTop',
+    'screenX',
+    'screenY',
+    'scroll',
+    'scrollBy',
+    'scrollLeft',
+    'scrollTo',
+    'scrollTop',
+    'scrollX',
+    'scrollY',
+    'self',
+    /* 'setInterval', */
+    /* 'setTimeout', */
+    'stop',
+    /* 'toString', */
+    'top',
+    'window',
+];
+export const KEYS = LIVING_KEYS.concat(OTHER_KEYS);

package/dist/integrations/sinon.js

@@ -1,3 +1,5 @@
 import sinon from 'sinon';
 export { sinon };
 export const { mock, spy, stub } = sinon;
+// @ts-expect-error
+sinon.fn = sinon.spy;

package/dist/reporters/default.js

@@ -71,8 +71,10 @@ export class DefaultReporter {
         await this.listrPromise;
         this.log();
         this.end = performance.now();
-        const failedFiles = files.filter(i => i.error);
+        const suites = files.reduce((acc, file) => acc.concat(file.suites), []);
         const tasks = files.reduce((acc, file) => acc.concat(file.suites.flatMap(i => i.tasks)), []);
+        const failedFiles = files.filter(i => i.error);
+        const failedSuites = suites.filter(i => i.error);
         const runable = tasks.filter(i => i.state === 'pass' || i.state === 'fail');
         const passed = tasks.filter(i => i.state === 'pass');
         const failed = tasks.filter(i => i.state === 'fail');
@@ -87,6 +89,15 @@ export class DefaultReporter {
                 this.log();
             });
         }
+        if (failedSuites.length) {
+            this.error(c.bold(`\nFailed to run ${failedSuites.length} suites:`));
+            failedSuites.forEach((i) => {
+                var _a;
+                this.error(`\n- ${(_a = i.file) === null || _a === void 0 ? void 0 : _a.filepath} > ${i.name}`);
+                console.error(i.error || 'Unknown error');
+                this.log();
+            });
+        }
         if (failed.length) {
             this.error(c.bold(`\nFailed Tests (${failed.length})`));
             failed.forEach((task) => {

package/dist/run.d.ts

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

package/dist/run.js

@@ -14,16 +14,24 @@ export async function runTask(task, ctx) {
     (_a = getSnapshotManager()) === null || _a === void 0 ? void 0 : _a.setTask(task);
     await ((_b = reporter.onTaskBegin) === null || _b === void 0 ? void 0 : _b.call(reporter, task, ctx));
     if (task.mode === 'run') {
-        await callHook(task.suite, 'afterEach', [task, task.suite]);
         try {
+            await callHook(task.suite, 'beforeEach', [task, task.suite]);
             await task.fn();
             task.state = 'pass';
         }
         catch (e) {
             task.state = 'fail';
             task.error = e;
+            process.exitCode = 1;
+        }
+        try {
+            await callHook(task.suite, 'afterEach', [task, task.suite]);
+        }
+        catch (e) {
+            task.state = 'fail';
+            task.error = e;
+            process.exitCode = 1;
         }
-        await callHook(task.suite, 'afterEach', [task, task.suite]);
     }
     await ((_c = reporter.onTaskEnd) === null || _c === void 0 ? void 0 : _c.call(reporter, task, ctx));
 }
@@ -75,6 +83,32 @@ function interpretOnlyMode(items) {
         });
     }
 }
+export async function runSite(suite, ctx) {
+    var _a, _b;
+    const { reporter } = ctx;
+    await ((_a = reporter.onSuiteBegin) === null || _a === void 0 ? void 0 : _a.call(reporter, suite, ctx));
+    if (suite.mode === 'skip') {
+        suite.status = 'skip';
+    }
+    else if (suite.mode === 'todo') {
+        suite.status = 'todo';
+    }
+    else {
+        try {
+            await callHook(suite, 'beforeAll', [suite]);
+            await Promise.all(suite.tasks.map(i => runTask(i, ctx)));
+            // for (const t of suite.tasks)
+            //   await runTask(t, ctx)
+            await callHook(suite, 'afterAll', [suite]);
+        }
+        catch (e) {
+            suite.error = e;
+            suite.status = 'fail';
+            process.exitCode = 1;
+        }
+    }
+    await ((_b = reporter.onSuiteEnd) === null || _b === void 0 ? void 0 : _b.call(reporter, suite, ctx));
+}
 export async function runFile(file, ctx) {
     var _a, _b;
     const { reporter } = ctx;
@@ -82,17 +116,13 @@ export async function runFile(file, ctx) {
     if (runableSuites.length === 0)
         return;
     await ((_a = reporter.onFileBegin) === null || _a === void 0 ? void 0 : _a.call(reporter, file, ctx));
-    // TODO: support toggling parallel or serial
-    await Promise.all(file.suites.map(async (suite) => {
-        var _a, _b;
-        await ((_a = reporter.onSuiteBegin) === null || _a === void 0 ? void 0 : _a.call(reporter, suite, ctx));
-        await callHook(suite, 'beforeAll', [suite]);
-        await Promise.all(suite.tasks.map(i => runTask(i, ctx)));
-        // for (const t of suite.tasks)
-        //   await runTask(t, ctx)
-        await callHook(suite, 'afterAll', [suite]);
-        await ((_b = reporter.onSuiteEnd) === null || _b === void 0 ? void 0 : _b.call(reporter, suite, ctx));
-    }));
+    if (ctx.config.parallel) {
+        await Promise.all(file.suites.map(suite => runSite(suite, ctx)));
+    }
+    else {
+        for (const suite of file.suites)
+            await runSite(suite, ctx);
+    }
     await ((_b = reporter.onFileEnd) === null || _b === void 0 ? void 0 : _b.call(reporter, file, ctx));
 }
 export async function run(config) {

package/dist/types.d.ts

@@ -15,6 +15,12 @@ export interface UserOptions {
      * @default false
      */
     jsdom?: boolean;
+    /**
+     * Run tests files in parallel
+     *
+     * @default false
+     */
+    parallel?: boolean;
 }
 export interface Config extends UserOptions {
     rootDir?: string;
@@ -47,6 +53,8 @@ export interface Suite {
     mode: RunMode;
     tasks: Task[];
     file?: File;
+    error?: unknown;
+    status?: TaskState;
     hooks: {
         beforeAll: HookListener<[Suite]>[];
         afterAll: HookListener<[Suite]>[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.0.17",
+  "version": "0.0.21",
   "description": "",
   "keywords": [],
   "homepage": "https://github.com/antfu/vitest#readme",

package/index.d.ts

@@ -1 +0,0 @@
-export * from './dist/index'