ava 4.2.0 → 4.3.0

package/entrypoints/index.d.cts

@@ -0,0 +1,2 @@
+export {default} from '../index.js';
+export * from '../index.js';

package/entrypoints/plugin.d.cts

@@ -0,0 +1 @@
+export * from '../plugin.js'

package/index.d.ts

@@ -1,9 +1,9 @@
-import type {TestFn} from './types/test-fn';
+import type {TestFn} from './types/test-fn.js';
 
-export * from './types/assertions';
-export * from './types/try-fn';
-export * from './types/test-fn';
-export * from './types/subscribable';
+export * from './types/assertions.js';
+export * from './types/try-fn.js';
+export * from './types/test-fn.js';
+export * from './types/subscribable.js';
 
 /** Call to declare a test, or chain to declare hooks or test modifiers */
 declare const test: TestFn;

package/lib/assert.js

@@ -106,10 +106,15 @@ function validateExpectations(assertion, expectations, numberArgs) { // eslint-d
 			});
 		}
 
-		if (hasOwnProperty(expectations, 'message') && typeof expectations.message !== 'string' && !(expectations.message instanceof RegExp)) {
+		if (
+			hasOwnProperty(expectations, 'message')
+			&& typeof expectations.message !== 'string'
+			&& !(expectations.message instanceof RegExp)
+			&& !(typeof expectations.message === 'function')
+		) {
 			throw new AssertionError({
 				assertion,
-				message: `The \`message\` property of the second argument to \`t.${assertion}()\` must be a string or regular expression`,
+				message: `The \`message\` property of the second argument to \`t.${assertion}()\` must be a string, regular expression or a function`,
 				values: [formatWithLabel('Called with:', expectations)],
 			});
 		}
@@ -230,6 +235,19 @@ function assertExpectations({assertion, actual, expectations, message, prefix, s
 		});
 	}
 
+	if (typeof expectations.message === 'function' && expectations.message(actual.message) === false) {
+		throw new AssertionError({
+			assertion,
+			message,
+			savedError,
+			actualStack,
+			values: [
+				formatWithLabel(`${prefix} unexpected exception:`, actual),
+				formatWithLabel('Expected message to return true:', expectations.message),
+			],
+		});
+	}
+
 	if (typeof expectations.code !== 'undefined' && actual.code !== expectations.code) {
 		throw new AssertionError({
 			assertion,

package/lib/create-chain.js

@@ -101,11 +101,13 @@ export default function createChain(fn, defaults, meta) {
 
 	root.meta = meta;
 
-	// Our type definition uses ESM syntax; when using CJS with VSCode, the
-	// auto-completion assumes the root is accessed through `require('ava').default`.
-	// Placate VSCode by adding a mostly hidden default property on the root.
-	// This is available through both CJS and ESM imports. We use a proxy so that
-	// we don't end up with root.default.default.default chains.
+	// The ESM and CJS type definitions export the chain (`test()` function) as
+	// the default. TypeScript's CJS output (when `esModuleInterop` is disabled)
+	// assume `require('ava').default` is available. The same goes for `import ava
+	// = require('ava')` syntax.
+	//
+	// Add `test.default` to make this work. Use a proxy to avoid
+	// `test.default.default` chains.
 	Object.defineProperty(root, 'default', {
 		configurable: false,
 		enumerable: false,

package/lib/reporters/default.js

@@ -231,7 +231,7 @@ export default class Reporter {
 			}
 
 			case 'hook-finished': {
-				if (true && event.logs.length > 0) {
+				if (event.logs.length > 0) {
 					this.lineWriter.writeLine(`  ${this.prefixTitle(event.testFile, event.title)}`);
 					this.writeLogs(event);
 				}
@@ -312,7 +312,7 @@ export default class Reporter {
 						this.filesWithoutMatchedLineNumbers.add(event.testFile);
 
 						this.lineWriter.writeLine(colors.error(`${figures.cross} Line numbers for ${this.relativeFile(event.testFile)} did not match any tests`));
-					} else if (true && !this.failFastEnabled && fileStats.remainingTests > 0) {
+					} else if (!this.failFastEnabled && fileStats.remainingTests > 0) {
 						this.lineWriter.writeLine(colors.error(`${figures.cross} ${fileStats.remainingTests} ${plur('test', fileStats.remainingTests)} remaining in ${this.relativeFile(event.testFile)}`));
 					}
 				}
@@ -515,7 +515,8 @@ export default class Reporter {
 
 	writeFailure(event) {
 		this.lineWriter.writeLine(colors.title(this.prefixTitle(event.testFile, event.title)));
-		if (!this.writeLogs(event, true)) {
+
+		if (!event.logs || event.logs.length === 0) {
 			this.lineWriter.writeLine();
 		}
 
@@ -570,17 +571,12 @@ export default class Reporter {
 		this.lineWriter.writeLine();
 
 		if (this.failures.length > 0) {
-			const writeTrailingLines = this.internalErrors.length > 0 || this.sharedWorkerErrors.length > 0 || this.uncaughtExceptions.length > 0 || this.unhandledRejections.length > 0;
-
 			const lastFailure = this.failures[this.failures.length - 1];
 			for (const event of this.failures) {
 				this.writeFailure(event);
 				if (event !== lastFailure) {
 					this.lineWriter.writeLine();
 					this.lineWriter.writeLine();
-				} else if (!true && writeTrailingLines) {
-					this.lineWriter.writeLine();
-					this.lineWriter.writeLine();
 				}
 			}
 
@@ -659,6 +655,10 @@ export default class Reporter {
 			this.lineWriter.writeLine(colors.error(`${this.stats.uncaughtExceptions} uncaught ${plur('exception', this.stats.uncaughtExceptions)}`));
 		}
 
+		if (this.stats.timeouts > 0) {
+			this.lineWriter.writeLine(colors.error(`${this.stats.timeouts} ${plur('test', this.stats.timeouts)} remained pending after a timeout`));
+		}
+
 		if (this.previousFailures > 0) {
 			this.lineWriter.writeLine(colors.error(`${this.previousFailures} previous ${plur('failure', this.previousFailures)} in test files that were not rerun`));
 		}

package/lib/run-status.js

@@ -125,7 +125,10 @@ export default class RunStatus extends Emittery {
 			case 'timeout':
 				event.pendingTests = this.pendingTests;
 				this.pendingTests = new Map();
-				stats.timeouts++;
+				for (const testsInFile of event.pendingTests.values()) {
+					stats.timeouts += testsInFile.size;
+				}
+
 				break;
 			case 'interrupt':
 				event.pendingTests = this.pendingTests;

package/lib/runner.js

@@ -524,7 +524,7 @@ export default class Runner extends Emittery {
 			// If a concurrent test fails, even if `failFast` is enabled it won't
 			// stop other concurrent tests from running.
 			const allOkays = await Promise.all(concurrentTests.map(task => this.runTest(task, contextRef.copy())));
-			return allOkays.every(ok => ok);
+			return allOkays.every(Boolean);
 		});
 
 		const beforeExitHandler = this.beforeExitHandler.bind(this);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ava",
-	"version": "4.2.0",
+	"version": "4.3.0",
 	"description": "Node.js test runner that lets you develop with confidence.",
 	"license": "MIT",
 	"repository": "avajs/ava",
@@ -10,18 +10,30 @@
 	},
 	"exports": {
 		".": {
-			"import": "./entrypoints/main.mjs",
-			"require": "./entrypoints/main.cjs"
+			"import": {
+				"types": "./index.d.ts",
+				"default": "./entrypoints/main.mjs"
+			},
+			"require": {
+				"types": "./entrypoints/index.d.cts",
+				"default": "./entrypoints/main.cjs"
+			}
 		},
 		"./eslint-plugin-helper": "./entrypoints/eslint-plugin-helper.cjs",
 		"./plugin": {
-			"import": "./entrypoints/plugin.mjs",
-			"require": "./entrypoints/plugin.cjs"
+			"import": {
+				"types": "./plugin.d.ts",
+				"default": "./entrypoints/plugin.mjs"
+			},
+			"require": {
+				"types": "./entrypoints/plugin.d.cts",
+				"default": "./entrypoints/plugin.cjs"
+			}
 		}
 	},
 	"type": "module",
 	"engines": {
-		"node": ">=12.22 <13 || >=14.17 <15 || >=16.4 <17 || >=17"
+		"node": ">=12.22 <13 || >=14.17 <15 || >=16.4 <17 || >=18"
 	},
 	"scripts": {
 		"cover": "c8 --report=none test-ava && c8 --report=none --no-clean tap && c8 report",
@@ -70,17 +82,17 @@
 		"typescript"
 	],
 	"dependencies": {
-		"acorn": "^8.7.0",
+		"acorn": "^8.7.1",
 		"acorn-walk": "^8.2.0",
 		"ansi-styles": "^6.1.0",
 		"arrgv": "^1.0.2",
 		"arrify": "^3.0.0",
 		"callsites": "^4.0.0",
 		"cbor": "^8.1.0",
-		"chalk": "^5.0.0",
+		"chalk": "^5.0.1",
 		"chokidar": "^3.5.3",
 		"chunkd": "^2.0.1",
-		"ci-info": "^3.3.0",
+		"ci-info": "^3.3.1",
 		"ci-parallel-vars": "^1.0.1",
 		"clean-yaml-object": "^0.1.0",
 		"cli-truncate": "^3.1.0",
@@ -88,12 +100,12 @@
 		"common-path-prefix": "^3.0.0",
 		"concordance": "^5.0.4",
 		"currently-unhandled": "^0.4.1",
-		"debug": "^4.3.3",
-		"del": "^6.0.0",
-		"emittery": "^0.10.1",
-		"figures": "^4.0.0",
+		"debug": "^4.3.4",
+		"del": "^6.1.1",
+		"emittery": "^0.11.0",
+		"figures": "^4.0.1",
 		"globby": "^13.1.1",
-		"ignore-by-default": "^2.0.0",
+		"ignore-by-default": "^2.1.0",
 		"indent-string": "^5.0.0",
 		"is-error": "^2.2.2",
 		"is-plain-object": "^5.0.0",
@@ -102,7 +114,7 @@
 		"mem": "^9.0.2",
 		"ms": "^2.1.3",
 		"p-event": "^5.0.1",
-		"p-map": "^5.3.0",
+		"p-map": "^5.4.0",
 		"picomatch": "^2.3.1",
 		"pkg-conf": "^4.0.0",
 		"plur": "^5.1.0",
@@ -114,27 +126,27 @@
 		"supertap": "^3.0.1",
 		"temp-dir": "^2.0.0",
 		"write-file-atomic": "^4.0.1",
-		"yargs": "^17.3.1"
+		"yargs": "^17.5.1"
 	},
 	"devDependencies": {
 		"@ava/test": "github:avajs/test",
 		"@ava/typescript": "^3.0.1",
-		"@sinonjs/fake-timers": "^9.1.1",
+		"@sinonjs/fake-timers": "^9.1.2",
 		"ansi-escapes": "^5.0.0",
-		"c8": "^7.11.0",
+		"c8": "^7.11.3",
 		"delay": "^5.0.0",
 		"execa": "^6.1.0",
-		"fs-extra": "^10.0.1",
+		"fs-extra": "^10.1.0",
 		"get-stream": "^6.0.1",
 		"replace-string": "^4.0.0",
-		"sinon": "^13.0.1",
-		"tap": "^16.0.0",
+		"sinon": "^13.0.2",
+		"tap": "^16.2.0",
 		"temp-write": "^5.0.0",
 		"tempy": "^2.0.0",
 		"touch": "^3.1.0",
-		"tsd": "^0.19.1",
-		"typescript": "^4.6.2",
-		"xo": "^0.48.0",
+		"tsd": "^0.20.0",
+		"typescript": "^4.7.2",
+		"xo": "^0.49.0",
 		"zen-observable": "^0.8.15"
 	},
 	"peerDependencies": {
@@ -144,5 +156,9 @@
 		"@ava/typescript": {
 			"optional": true
 		}
+	},
+	"volta": {
+		"node": "18.3.0",
+		"npm": "8.12.0"
 	}
 }

package/readme.md

@@ -11,7 +11,7 @@ Read our [contributing guide](.github/CONTRIBUTING.md) if you're looking to cont
 ![](media/verbose-reporter.png)
 
 
-Translations: [Español](https://github.com/avajs/ava-docs/blob/master/es_ES/readme.md), [Français](https://github.com/avajs/ava-docs/blob/master/fr_FR/readme.md), [Italiano](https://github.com/avajs/ava-docs/blob/master/it_IT/readme.md), [日本語](https://github.com/avajs/ava-docs/blob/master/ja_JP/readme.md), [한국어](https://github.com/avajs/ava-docs/blob/master/ko_KR/readme.md), [Português](https://github.com/avajs/ava-docs/blob/master/pt_BR/readme.md), [Русский](https://github.com/avajs/ava-docs/blob/master/ru_RU/readme.md), [简体中文](https://github.com/avajs/ava-docs/blob/master/zh_CN/readme.md)
+Translations: [Español](https://github.com/avajs/ava-docs/blob/main/es_ES/readme.md), [Français](https://github.com/avajs/ava-docs/blob/main/fr_FR/readme.md), [Italiano](https://github.com/avajs/ava-docs/blob/main/it_IT/readme.md), [日本語](https://github.com/avajs/ava-docs/blob/main/ja_JP/readme.md), [한국어](https://github.com/avajs/ava-docs/blob/main/ko_KR/readme.md), [Português](https://github.com/avajs/ava-docs/blob/main/pt_BR/readme.md), [Русский](https://github.com/avajs/ava-docs/blob/main/ru_RU/readme.md), [简体中文](https://github.com/avajs/ava-docs/blob/main/zh_CN/readme.md)
 
 
 ## Why AVA?

package/types/assertions.d.ts

@@ -12,7 +12,7 @@ export type ThrowsExpectation = {
 	is?: Error;
 
 	/** The thrown error must have a message that equals the given string, or matches the regular expression. */
-	message?: string | RegExp;
+	message?: string | RegExp | ((message: string) => boolean);
 
 	/** The thrown error must have a name that equals the given string. */
 	name?: string;
@@ -252,7 +252,7 @@ export interface NotThrowsAsyncAssertion {
 	(fn: () => PromiseLike<any>, message?: string): Promise<void>;
 
 	/** Assert that the promise does not reject. You must await the result. */
-	(promise: PromiseLike<any>, message?: string): Promise<void>; // eslint-disable-line @typescript-eslint/unified-signatures
+	(promise: PromiseLike<any>, message?: string): Promise<void>;
 
 	/** Skip this assertion. */
 	skip(nonThrower: any, message?: string): void;
@@ -311,7 +311,7 @@ export interface ThrowsAsyncAssertion {
 	 * rejection reason. Returns undefined when the assertion fails. You must await the result. The error must satisfy all
 	 * expectations.
 	 */
-	<ThrownError extends Error>(promise: PromiseLike<any>, expectations?: ThrowsExpectation, message?: string): Promise<ThrownError | undefined>; // eslint-disable-line @typescript-eslint/unified-signatures
+	<ThrownError extends Error>(promise: PromiseLike<any>, expectations?: ThrowsExpectation, message?: string): Promise<ThrownError | undefined>;
 
 	/** Skip this assertion. */
 	skip(thrower: any, expectations?: any, message?: string): void;

package/types/test-fn.d.ts

@@ -1,6 +1,6 @@
-import type {Assertions} from './assertions';
-import type {Subscribable} from './subscribable';
-import type {TryFn} from './try-fn';
+import type {Assertions} from './assertions.js';
+import type {Subscribable} from './subscribable.js';
+import type {TryFn} from './try-fn.js';
 
 /** The `t` value passed to test & hook implementations. */
 export interface ExecutionContext<Context = unknown> extends Assertions {
@@ -219,7 +219,7 @@ export type MacroDeclarationOptions<Args extends unknown[], Context = unknown> =
 export interface MacroFn<Context = unknown> {
 	/** Declare a reusable test implementation. */
 	<Args extends unknown[]>(/** The function that is executed when the macro is used. */ exec: ImplementationFn<Args, Context>): Macro<Args, Context>;
-	<Args extends unknown[]>(declaration: MacroDeclarationOptions<Args, Context>): Macro<Args, Context>; // eslint-disable-line @typescript-eslint/unified-signatures
+	<Args extends unknown[]>(declaration: MacroDeclarationOptions<Args, Context>): Macro<Args, Context>;
 }
 
 export interface Meta {

package/types/try-fn.d.ts

@@ -1,4 +1,4 @@
-import type {Implementation} from './test-fn';
+import type {Implementation} from './test-fn.js';
 
 export type CommitDiscardOptions = {
 	/**