ava 5.1.1 → 5.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ava",
-	"version": "5.1.1",
+	"version": "5.2.0",
 	"description": "Node.js test runner that lets you develop with confidence.",
 	"license": "MIT",
 	"repository": "avajs/ava",

package/readme.md

@@ -45,11 +45,12 @@ Your `package.json` will then look like this (exact version notwithstanding):
 ```json
 {
 	"name": "awesome-package",
+	"type": "module",
 	"scripts": {
 		"test": "ava"
 	},
 	"devDependencies": {
-		"ava": "^1.0.0"
+		"ava": "^5.0.0"
 	}
 }
 ```
@@ -72,7 +73,9 @@ Don't forget to configure the `test` script in your `package.json` as per above.
 
 ### Create your test file
 
-Create a file named `test.js` in the project root directory:
+Create a file named `test.js` in the project root directory.
+
+_Note that AVA's documentation assumes you're using ES modules._
 
 ```js
 import test from 'ava';

package/types/assertions.d.cts

@@ -1,15 +1,20 @@
-export type ErrorConstructor = new (...args: any[]) => Error;
+export type ErrorConstructor<ErrorType extends Error = Error> = {
+	new (...args: any[]): ErrorType;
+	readonly prototype: ErrorType;
+}
+
+export type ThrownError<ErrorType extends ErrorConstructor | Error> = ErrorType extends ErrorConstructor ? ErrorType['prototype'] : ErrorType;
 
 /** Specify one or more expectations the thrown error must satisfy. */
-export type ThrowsExpectation = {
+export type ThrowsExpectation<ErrorType extends ErrorConstructor | Error> = {
 	/** The thrown error must have a code that equals the given string or number. */
 	code?: string | number;
 
 	/** The thrown error must be an instance of this constructor. */
-	instanceOf?: ErrorConstructor;
+	instanceOf?: ErrorType extends ErrorConstructor ? ErrorType : ErrorType extends Error ? ErrorConstructor<ErrorType> : never;
 
 	/** The thrown error must be strictly equal to this value. */
-	is?: Error;
+	is?: ErrorType extends ErrorConstructor ? ErrorType['prototype'] : ErrorType;
 
 	/** The thrown error must have a message that equals the given string, or matches the regular expression. */
 	message?: string | RegExp | ((message: string) => boolean);
@@ -293,7 +298,7 @@ export type ThrowsAssertion = {
 	 * Assert that the function throws [an error](https://www.npmjs.com/package/is-error). If so, returns the error value.
 	 * The error must satisfy all expectations. Returns undefined when the assertion fails.
 	 */
-	<ThrownError extends Error>(fn: () => any, expectations?: ThrowsExpectation, message?: string): ThrownError | undefined;
+	<ErrorType extends ErrorConstructor | Error>(fn: () => any, expectations?: ThrowsExpectation<ErrorType>, message?: string): ThrownError<ErrorType> | undefined;
 
 	/** Skip this assertion. */
 	skip(fn: () => any, expectations?: any, message?: string): void;
@@ -304,14 +309,14 @@ export type ThrowsAsyncAssertion = {
 	 * Assert that the async function throws [an error](https://www.npmjs.com/package/is-error). If so, returns the error
 	 * value. Returns undefined when the assertion fails. You must await the result. The error must satisfy all expectations.
 	 */
-	<ThrownError extends Error>(fn: () => PromiseLike<any>, expectations?: ThrowsExpectation, message?: string): Promise<ThrownError | undefined>;
+	<ErrorType extends ErrorConstructor | Error>(fn: () => PromiseLike<any>, expectations?: ThrowsExpectation<ErrorType>, message?: string): Promise<ThrownError<ErrorType> | undefined>;
 
 	/**
 	 * Assert that the promise rejects with [an error](https://www.npmjs.com/package/is-error). If so, returns the
 	 * 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>;
+	<ErrorType extends ErrorConstructor | Error>(promise: PromiseLike<any>, expectations?: ThrowsExpectation<ErrorType>, message?: string): Promise<ThrownError<ErrorType> | undefined>;
 
 	/** Skip this assertion. */
 	skip(thrower: any, expectations?: any, message?: string): void;