ava 4.3.3 → 5.0.0

package/entrypoints/main.d.cts

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

package/entrypoints/main.d.ts

@@ -0,0 +1,12 @@
+import type {TestFn} from '../types/test-fn.js';
+
+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;
+
+/** Call to declare a test, or chain to declare hooks or test modifiers */
+export default test;

package/entrypoints/plugin.d.cts

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

package/{plugin.d.ts → entrypoints/plugin.d.ts}

@@ -1,4 +1,4 @@
-import {URL} from 'node:url';
+import type {URL} from 'node:url';
 
 export namespace SharedWorker {
 	export type ProtocolIdentifier = 'ava-4';

package/lib/api.js

@@ -246,14 +246,16 @@ export default class Api extends Emittery {
 				}
 			}));
 
-			// Resolve the correct concurrency value.
-			let concurrency = Math.min(os.cpus().length, isCi ? 2 : Number.POSITIVE_INFINITY);
-			if (apiOptions.concurrency > 0) {
-				concurrency = apiOptions.concurrency;
-			}
-
+			// Resolve the correct concurrency value. Note that `os.cpus()` can return empty arrays on
+			// platforms not officially supported by Node.js. Use 1 as a minimum.
+			// See <https://github.com/nodejs/node/issues/38190>.
+			let concurrency = Math.max(1, os.cpus().length);
 			if (apiOptions.serial) {
 				concurrency = 1;
+			} else if (apiOptions.concurrency > 0) {
+				concurrency = apiOptions.concurrency;
+			} else if (isCi) {
+				concurrency = 2;
 			}
 
 			const deregisteredSharedWorkers = [];

package/lib/assert.js

@@ -8,8 +8,10 @@ import {SnapshotError, VersionMismatchError} from './snapshot-manager.js';
 
 function formatDescriptorDiff(actualDescriptor, expectedDescriptor, options) {
 	options = {...options, ...concordanceOptions};
+	const {diffGutters} = options.theme;
+	const {insertLine, deleteLine} = options.theme.string.diff;
 	return {
-		label: 'Difference:',
+		label: `Difference (${diffGutters.actual}${deleteLine.open}actual${deleteLine.close}, ${diffGutters.expected}${insertLine.open}expected${insertLine.close}):`,
 		formatted: concordance.diffDescriptors(actualDescriptor, expectedDescriptor, options),
 	};
 }

package/lib/cli.js

@@ -5,10 +5,10 @@ import process from 'node:process';
 
 import arrify from 'arrify';
 import ciParallelVars from 'ci-parallel-vars';
-import del from 'del';
+import {deleteAsync} from 'del';
 import figures from 'figures';
 import yargs from 'yargs';
-import {hideBin} from 'yargs/helpers'; // eslint-disable-line node/file-extension-in-import
+import {hideBin} from 'yargs/helpers'; // eslint-disable-line n/file-extension-in-import
 
 import Api from './api.js';
 import {chalk} from './chalk.js';
@@ -124,7 +124,7 @@ export default async function loadCli() { // eslint-disable-line complexity
 	// run AVA with the debug command, though it's allowed.
 	let activeInspector = false;
 	try {
-		const {default: inspector} = await import('node:inspector'); // eslint-disable-line node/no-unsupported-features/es-syntax
+		const {default: inspector} = await import('node:inspector');
 
 		activeInspector = inspector.url() !== undefined;
 	} catch {}
@@ -242,11 +242,11 @@ export default async function loadCli() { // eslint-disable-line complexity
 
 	const chalkOptions = {level: 0};
 	if (combined.color !== false) {
-		const {supportsColor: {level}} = await import('chalk'); // eslint-disable-line node/no-unsupported-features/es-syntax, unicorn/import-style
+		const {supportsColor: {level}} = await import('chalk'); // eslint-disable-line unicorn/import-style
 		chalkOptions.level = level;
 	}
 
-	const {set: setChalk} = await import('./chalk.js'); // eslint-disable-line node/no-unsupported-features/es-syntax
+	const {set: setChalk} = await import('./chalk.js');
 	setChalk(chalkOptions);
 
 	if (confError) {
@@ -262,7 +262,7 @@ export default async function loadCli() { // eslint-disable-line complexity
 		const cacheDir = path.join(projectDir, 'node_modules', '.cache', 'ava');
 
 		try {
-			const deletedFilePaths = await del('*', {cwd: cacheDir});
+			const deletedFilePaths = await deleteAsync('*', {cwd: cacheDir});
 
 			if (deletedFilePaths.length === 0) {
 				console.log(`\n${chalk.green(figures.tick)} No cache files to remove`);

package/lib/code-excerpt.js

@@ -43,7 +43,7 @@ export default function exceptCode(source, options = {}) {
 			const coloredLineNumber = isErrorSource ? lineNumber : chalk.grey(lineNumber);
 			const result = ` ${coloredLineNumber} ${item.value.padEnd(extendedWidth)}`;
 
-			return isErrorSource ? chalk.bgRed(result) : result;
+			return isErrorSource ? chalk.bgRed.bold(result) : result;
 		})
 		.join('\n');
 }

package/lib/concordance-options.js

@@ -85,7 +85,7 @@ const colorTheme = {
 	undefined: ansiStyles.yellow,
 };
 
-const plainTheme = JSON.parse(JSON.stringify(colorTheme), value => typeof value === 'string' ? stripAnsi(value) : value);
+const plainTheme = JSON.parse(JSON.stringify(colorTheme), (_name, value) => typeof value === 'string' ? stripAnsi(value) : value);
 
 const theme = chalk.level > 0 ? colorTheme : plainTheme;
 

package/lib/load-config.js

@@ -11,7 +11,7 @@ const MISSING_DEFAULT_EXPORT = Symbol('missing default export');
 const EXPERIMENTS = new Set();
 
 const importConfig = async ({configFile, fileForErrorMessage}) => {
-	const {default: config = MISSING_DEFAULT_EXPORT} = await import(url.pathToFileURL(configFile)); // eslint-disable-line node/no-unsupported-features/es-syntax
+	const {default: config = MISSING_DEFAULT_EXPORT} = await import(url.pathToFileURL(configFile));
 	if (config === MISSING_DEFAULT_EXPORT) {
 		throw new Error(`${fileForErrorMessage} must have a default export`);
 	}

package/lib/plugin-support/shared-worker-loader.js

@@ -156,7 +156,7 @@ function broadcastMessage(data) {
 }
 
 async function loadFactory() {
-	const {default: factory} = await import(workerData.filename); // eslint-disable-line node/no-unsupported-features/es-syntax
+	const {default: factory} = await import(workerData.filename);
 	return factory;
 }
 

package/lib/provider-manager.js

@@ -15,7 +15,7 @@ const levelsByProtocol = {
 
 async function load(providerModule, projectDir) {
 	const ava = {version: pkg.version};
-	const {default: makeProvider} = await import(providerModule); // eslint-disable-line node/no-unsupported-features/es-syntax
+	const {default: makeProvider} = await import(providerModule);
 
 	let fatal;
 	let level;

package/lib/reporters/default.js

@@ -233,6 +233,16 @@ export default class Reporter {
 				break;
 			}
 
+			case 'process-exit': {
+				this.write(colors.error(`${figures.cross} Exiting due to process.exit() when running ${this.relativeFile(event.testFile)}`));
+
+				this.lineWriter.writeLine();
+				this.lineWriter.writeLine(colors.errorStack(event.stack));
+				this.lineWriter.writeLine();
+
+				break;
+			}
+
 			case 'hook-finished': {
 				if (event.logs.length > 0) {
 					this.lineWriter.writeLine(`  ${this.prefixTitle(event.testFile, event.title)}`);
@@ -244,9 +254,9 @@ export default class Reporter {
 
 			case 'selected-test': {
 				if (event.skip) {
-					this.lineWriter.writeLine(colors.skip(`- ${this.prefixTitle(event.testFile, event.title)}`));
+					this.lineWriter.writeLine(colors.skip(`- [skip] ${this.prefixTitle(event.testFile, event.title)}`));
 				} else if (event.todo) {
-					this.lineWriter.writeLine(colors.todo(`- ${this.prefixTitle(event.testFile, event.title)}`));
+					this.lineWriter.writeLine(colors.todo(`- [todo] ${this.prefixTitle(event.testFile, event.title)}`));
 				}
 
 				break;
@@ -504,15 +514,30 @@ export default class Reporter {
 	}
 
 	writeTestSummary(event) {
+		// Prefix icon indicates matched expectations vs. not.
+		// Prefix color indicates passed-as-expected vs. not (fail or unexpected pass).
+		// This yields four possibilities, which in the standard configuration render as:
+		// * normal test, pass:        <green>✔</green>
+		// * normal test, fail:          <red>✘ [fail]</red>
+		// * fail-expected test, fail:   <red>✔ [expected fail]</red>
+		// * fail-expected test, pass:   <red>✘ [unexpected pass]</red>
+		let prefix;
+		let suffix;
 		if (event.type === 'hook-failed' || event.type === 'test-failed') {
-			this.write(`${colors.error(figures.cross)} ${this.prefixTitle(event.testFile, event.title)} ${colors.error(event.err.message)}`);
+			const type = event.knownFailing ? '[unexpected pass]' : '[fail]';
+			prefix = colors.error(`${figures.cross} ${type}:`);
+			suffix = chalk.italic(colors.error(event.err.message));
 		} else if (event.knownFailing) {
-			this.write(`${colors.error(figures.tick)} ${colors.error(this.prefixTitle(event.testFile, event.title))}`);
+			prefix = colors.error(figures.tick + ' [expected fail]');
 		} else {
-			const duration = event.duration > this.durationThreshold ? colors.duration(' (' + prettyMs(event.duration) + ')') : '';
-			this.write(`${colors.pass(figures.tick)} ${this.prefixTitle(event.testFile, event.title)}${duration}`);
+			prefix = colors.pass(figures.tick);
+			if (event.duration > this.durationThreshold) {
+				suffix = colors.duration(`(${prettyMs(event.duration)})`);
+			}
 		}
 
+		const label = this.prefixTitle(event.testFile, event.title);
+		this.write(`${prefix} ${label}${suffix ? ' ' + suffix : ''}`);
 		this.writeLogs(event);
 	}
 
@@ -658,8 +683,8 @@ 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.stats.timedOutTests > 0) {
+			this.lineWriter.writeLine(colors.error(`${this.stats.timedOutTests} ${plur('test', this.stats.timedOutTests)} remained pending after a timeout`));
 		}
 
 		if (this.previousFailures > 0) {

package/lib/reporters/tap.js

@@ -29,7 +29,7 @@ function dumpError(error) {
 		}
 
 		if (error.values.length > 0) {
-			object.values = Object.fromEntries(error.values.map(({label, formatted}) => [label, stripAnsi(formatted)]));
+			object.values = Object.fromEntries(error.values.map(({label, formatted}) => [stripAnsi(label), stripAnsi(formatted)]));
 		}
 	}
 
@@ -128,6 +128,17 @@ export default class TapReporter {
 		}
 	}
 
+	writeProcessExit(evt) {
+		const error = new Error(`Exiting due to process.exit() when running ${this.relativeFile(evt.testFile)}`);
+		error.stack = evt.stack;
+
+		for (const [testFile, tests] of evt.pendingTests) {
+			for (const title of tests) {
+				this.writeTest({testFile, title, err: error}, {passed: false, todo: false, skip: false});
+			}
+		}
+	}
+
 	writeTimeout(evt) {
 		const error = new Error(`Exited because no new tests completed within the last ${evt.period}ms of inactivity`);
 
@@ -158,6 +169,9 @@ export default class TapReporter {
 				this.filesWithMissingAvaImports.add(evt.testFile);
 				this.writeCrash(evt, `No tests found in ${this.relativeFile(evt.testFile)}, make sure to import "ava" at the top of your test file`);
 				break;
+			case 'process-exit':
+				this.writeProcessExit(evt);
+				break;
 			case 'selected-test':
 				if (evt.skip) {
 					this.writeTest(evt, {passed: true, todo: false, skip: true});

package/lib/run-status.js

@@ -33,6 +33,7 @@ export default class RunStatus extends Emittery {
 			selectedTests: 0,
 			sharedWorkerErrors: 0,
 			skippedTests: 0,
+			timedOutTests: 0,
 			timeouts: 0,
 			todoTests: 0,
 			uncaughtExceptions: 0,
@@ -62,6 +63,7 @@ export default class RunStatus extends Emittery {
 		worker.onStateChange(data => this.emitStateChange(data));
 	}
 
+	// eslint-disable-next-line complexity
 	emitStateChange(event) {
 		const {stats} = this;
 		const fileStats = stats.byFile.get(event.testFile);
@@ -123,10 +125,11 @@ export default class RunStatus extends Emittery {
 				this.removePendingTest(event);
 				break;
 			case 'timeout':
+				stats.timeouts++;
 				event.pendingTests = this.pendingTests;
 				this.pendingTests = new Map();
 				for (const testsInFile of event.pendingTests.values()) {
-					stats.timeouts += testsInFile.size;
+					stats.timedOutTests += testsInFile.size;
 				}
 
 				break;
@@ -134,6 +137,10 @@ export default class RunStatus extends Emittery {
 				event.pendingTests = this.pendingTests;
 				this.pendingTests = new Map();
 				break;
+			case 'process-exit':
+				event.pendingTests = this.pendingTests;
+				this.pendingTests = new Map();
+				break;
 			case 'uncaught-exception':
 				stats.uncaughtExceptions++;
 				fileStats.uncaughtExceptions++;
@@ -175,6 +182,7 @@ export default class RunStatus extends Emittery {
 			|| this.stats.failedHooks > 0
 			|| this.stats.failedTests > 0
 			|| this.stats.failedWorkers > 0
+			|| this.stats.remainingTests > 0
 			|| this.stats.sharedWorkerErrors > 0
 			|| this.stats.timeouts > 0
 			|| this.stats.uncaughtExceptions > 0

package/lib/watcher.js

@@ -294,6 +294,7 @@ export default class Watcher {
 				switch (evt.type) {
 					case 'hook-failed':
 					case 'internal-error':
+					case 'process-exit':
 					case 'test-failed':
 					case 'uncaught-exception':
 					case 'unhandled-rejection':

package/lib/worker/base.js

@@ -19,6 +19,41 @@ import {flags, refs, sharedWorkerTeardowns} from './state.cjs';
 import {isRunningInThread, isRunningInChildProcess} from './utils.cjs';
 
 const currentlyUnhandled = setUpCurrentlyUnhandled();
+let runner;
+
+// Override process.exit with an undetectable replacement
+// to report when it is called from a test (which it should never be).
+const {apply} = Reflect;
+const realExit = process.exit;
+
+async function exit(code, forceSync = false) {
+	dependencyTracking.flush();
+	const flushing = channel.flush();
+	if (!forceSync) {
+		await flushing;
+	}
+
+	apply(realExit, process, [code]);
+}
+
+const handleProcessExit = (fn, receiver, args) => {
+	const error = new Error('Unexpected process.exit()');
+	Error.captureStackTrace(error, handleProcessExit);
+	const {stack} = serializeError('', true, error);
+	channel.send({type: 'process-exit', stack});
+
+	// Make sure to extract the code only from `args` rather than e.g. `Array.prototype`.
+	// This level of paranoia is usually unwarranted, but we're dealing with test code
+	// that has already colored outside the lines.
+	const code = args.length > 0 ? args[0] : undefined;
+
+	// Force a synchronous exit as guaranteed by the real process.exit().
+	exit(code, true);
+};
+
+process.exit = new Proxy(realExit, {
+	apply: handleProcessExit,
+});
 
 const run = async options => {
 	setOptions(options);
@@ -29,16 +64,6 @@ const run = async options => {
 		global.console = Object.assign(global.console, new console.Console({stdout, stderr, colorMode: true}));
 	}
 
-	async function exit(code) {
-		if (!process.exitCode) {
-			process.exitCode = code;
-		}
-
-		dependencyTracking.flush();
-		await channel.flush();
-		process.exit(); // eslint-disable-line unicorn/no-process-exit
-	}
-
 	let checkSelectedByLineNumbers;
 	try {
 		checkSelectedByLineNumbers = lineNumberSelection({
@@ -50,7 +75,7 @@ const run = async options => {
 		checkSelectedByLineNumbers = () => false;
 	}
 
-	const runner = new Runner({
+	runner = new Runner({
 		checkSelectedByLineNumbers,
 		experiments: options.experiments,
 		failFast: options.failFast,
@@ -141,7 +166,7 @@ const run = async options => {
 
 		for (const extension of extensionsToLoadAsModules) {
 			if (ref.endsWith(`.${extension}`)) {
-				return import(pathToFileURL(ref)); // eslint-disable-line node/no-unsupported-features/es-syntax
+				return import(pathToFileURL(ref));
 			}
 		}
 
@@ -161,7 +186,7 @@ const run = async options => {
 		if (options.debug && options.debug.port !== undefined && options.debug.host !== undefined) {
 			// If an inspector was active when the main process started, and is
 			// already active for the worker process, do not open a new one.
-			const {default: inspector} = await import('node:inspector'); // eslint-disable-line node/no-unsupported-features/es-syntax
+			const {default: inspector} = await import('node:inspector');
 			if (!options.debug.active || inspector.url() === undefined) {
 				inspector.open(options.debug.port, options.debug.host, true);
 			}

package/lib/worker/channel.cjs

@@ -15,7 +15,7 @@ let pEvent = async (emitter, event, options) => {
 	emitter.on(event, addToBuffer);
 
 	try {
-		({pEvent} = await import('p-event')); // eslint-disable-line node/no-unsupported-features/es-syntax
+		({pEvent} = await import('p-event'));
 	} finally {
 		emitter.off(event, addToBuffer);
 	}

package/lib/worker/line-numbers.js

@@ -12,7 +12,7 @@ function parse(file) {
 	const walk = require('acorn-walk');
 
 	const ast = acorn.parse(fs.readFileSync(file, 'utf8'), {
-		ecmaVersion: 11,
+		ecmaVersion: 'latest',
 		locations: true,
 		sourceType: 'module',
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ava",
-	"version": "4.3.3",
+	"version": "5.0.0",
 	"description": "Node.js test runner that lets you develop with confidence.",
 	"license": "MIT",
 	"repository": "avajs/ava",
@@ -11,18 +11,18 @@
 	"exports": {
 		".": {
 			"import": {
-				"types": "./index.d.ts",
+				"types": "./entrypoints/main.d.ts",
 				"default": "./entrypoints/main.mjs"
 			},
 			"require": {
-				"types": "./entrypoints/index.d.cts",
+				"types": "./entrypoints/main.d.cts",
 				"default": "./entrypoints/main.cjs"
 			}
 		},
 		"./eslint-plugin-helper": "./entrypoints/eslint-plugin-helper.cjs",
 		"./plugin": {
 			"import": {
-				"types": "./plugin.d.ts",
+				"types": "./entrypoints/plugin.d.ts",
 				"default": "./entrypoints/plugin.mjs"
 			},
 			"require": {
@@ -33,18 +33,16 @@
 	},
 	"type": "module",
 	"engines": {
-		"node": ">=12.22 <13 || >=14.17 <15 || >=16.4 <17 || >=18"
+		"node": ">=14.19 <15 || >=16.15 <17 || >=18"
 	},
 	"scripts": {
 		"cover": "c8 --report=none test-ava && c8 --report=none --no-clean tap && c8 report",
-		"test": "xo && tsd && npm run -s cover"
+		"test": "xo && tsc --noEmit && npm run -s cover"
 	},
 	"files": [
 		"entrypoints",
 		"lib",
-		"types",
-		"index.d.ts",
-		"plugin.d.ts"
+		"types"
 	],
 	"keywords": [
 		"🦄",
@@ -82,7 +80,7 @@
 		"typescript"
 	],
 	"dependencies": {
-		"acorn": "^8.7.1",
+		"acorn": "^8.8.0",
 		"acorn-walk": "^8.2.0",
 		"ansi-styles": "^6.1.0",
 		"arrgv": "^1.0.2",
@@ -92,7 +90,7 @@
 		"chalk": "^5.0.1",
 		"chokidar": "^3.5.3",
 		"chunkd": "^2.0.1",
-		"ci-info": "^3.3.1",
+		"ci-info": "^3.3.2",
 		"ci-parallel-vars": "^1.0.1",
 		"clean-yaml-object": "^0.1.0",
 		"cli-truncate": "^3.1.0",
@@ -101,10 +99,10 @@
 		"concordance": "^5.0.4",
 		"currently-unhandled": "^0.4.1",
 		"debug": "^4.3.4",
-		"del": "^6.1.1",
-		"emittery": "^0.11.0",
-		"figures": "^4.0.1",
-		"globby": "^13.1.1",
+		"del": "^7.0.0",
+		"emittery": "^0.13.1",
+		"figures": "^5.0.0",
+		"globby": "^13.1.2",
 		"ignore-by-default": "^2.1.0",
 		"indent-string": "^5.0.0",
 		"is-error": "^2.2.2",
@@ -114,39 +112,40 @@
 		"mem": "^9.0.2",
 		"ms": "^2.1.3",
 		"p-event": "^5.0.1",
-		"p-map": "^5.4.0",
+		"p-map": "^5.5.0",
 		"picomatch": "^2.3.1",
 		"pkg-conf": "^4.0.0",
 		"plur": "^5.1.0",
-		"pretty-ms": "^7.0.1",
+		"pretty-ms": "^8.0.0",
 		"resolve-cwd": "^3.0.0",
 		"slash": "^3.0.0",
 		"stack-utils": "^2.0.5",
 		"strip-ansi": "^7.0.1",
 		"supertap": "^3.0.1",
 		"temp-dir": "^2.0.0",
-		"write-file-atomic": "^4.0.1",
+		"write-file-atomic": "^4.0.2",
 		"yargs": "^17.5.1"
 	},
 	"devDependencies": {
 		"@ava/test": "github:avajs/test",
 		"@ava/typescript": "^3.0.1",
+		"@sindresorhus/tsconfig": "^3.0.1",
 		"@sinonjs/fake-timers": "^9.1.2",
 		"ansi-escapes": "^5.0.0",
-		"c8": "^7.11.3",
+		"c8": "^7.12.0",
 		"delay": "^5.0.0",
 		"execa": "^6.1.0",
 		"fs-extra": "^10.1.0",
 		"get-stream": "^6.0.1",
 		"replace-string": "^4.0.0",
-		"sinon": "^13.0.2",
-		"tap": "^16.2.0",
+		"sinon": "^14.0.0",
+		"tap": "^16.3.0",
 		"temp-write": "^5.0.0",
-		"tempy": "^2.0.0",
+		"tempy": "^3.0.0",
 		"touch": "^3.1.0",
-		"tsd": "^0.20.0",
-		"typescript": "^4.7.2",
-		"xo": "^0.49.0",
+		"tsd": "^0.22.0",
+		"typescript": "^4.7.3",
+		"xo": "^0.52.2",
 		"zen-observable": "^0.8.15"
 	},
 	"peerDependencies": {
@@ -158,7 +157,7 @@
 		}
 	},
 	"volta": {
-		"node": "18.3.0",
-		"npm": "8.12.0"
+		"node": "18.8.0",
+		"npm": "8.18.0"
 	}
 }

package/types/assertions.d.ts

@@ -18,7 +18,7 @@ export type ThrowsExpectation = {
 	name?: string;
 };
 
-export interface Assertions {
+export type Assertions = {
 	/**
 	 * Assert that `actual` is [truthy](https://developer.mozilla.org/en-US/docs/Glossary/Truthy), returning a boolean
 	 * indicating whether the assertion passed.
@@ -118,9 +118,9 @@ export interface Assertions {
 	 * indicating whether the assertion passed.
 	 */
 	truthy: TruthyAssertion;
-}
+};
 
-export interface AssertAssertion {
+export type AssertAssertion = {
 	/**
 	 * Assert that `actual` is [truthy](https://developer.mozilla.org/en-US/docs/Glossary/Truthy), returning a boolean
 	 * indicating whether the assertion passed.
@@ -129,9 +129,9 @@ export interface AssertAssertion {
 
 	/** Skip this assertion. */
 	skip(actual: any, message?: string): void;
-}
+};
 
-export interface DeepEqualAssertion {
+export type DeepEqualAssertion = {
 	/**
 	 * Assert that `actual` is [deeply equal](https://github.com/concordancejs/concordance#comparison-details) to
 	 * `expected`, returning a boolean indicating whether the assertion passed.
@@ -152,9 +152,9 @@ export interface DeepEqualAssertion {
 
 	/** Skip this assertion. */
 	skip(actual: any, expected: any, message?: string): void;
-}
+};
 
-export interface LikeAssertion {
+export type LikeAssertion = {
 	/**
 	 * Assert that `value` is like `selector`, returning a boolean indicating whether the assertion passed.
 	 */
@@ -162,17 +162,17 @@ export interface LikeAssertion {
 
 	/** Skip this assertion. */
 	skip(value: any, selector: any, message?: string): void;
-}
+};
 
-export interface FailAssertion {
+export type FailAssertion = {
 	/** Fail the test, always returning `false`. */
 	(message?: string): boolean;
 
 	/** Skip this assertion. */
 	skip(message?: string): void;
-}
+};
 
-export interface FalseAssertion {
+export type FalseAssertion = {
 	/**
 	 * Assert that `actual` is strictly false, returning a boolean indicating whether the assertion passed.
 	 */
@@ -180,9 +180,9 @@ export interface FalseAssertion {
 
 	/** Skip this assertion. */
 	skip(actual: any, message?: string): void;
-}
+};
 
-export interface FalsyAssertion {
+export type FalsyAssertion = {
 	/**
 	 * Assert that `actual` is [falsy](https://developer.mozilla.org/en-US/docs/Glossary/Falsy), returning a boolean
 	 * indicating whether the assertion passed.
@@ -191,9 +191,9 @@ export interface FalsyAssertion {
 
 	/** Skip this assertion. */
 	skip(actual: any, message?: string): void;
-}
+};
 
-export interface IsAssertion {
+export type IsAssertion = {
 	/**
 	 * Assert that `actual` is [the same
 	 * value](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is) as `expected`,
@@ -203,9 +203,9 @@ export interface IsAssertion {
 
 	/** Skip this assertion. */
 	skip(actual: any, expected: any, message?: string): void;
-}
+};
 
-export interface NotAssertion {
+export type NotAssertion = {
 	/**
 	 * Assert that `actual` is not [the same
 	 * value](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is) as `expected`,
@@ -215,9 +215,9 @@ export interface NotAssertion {
 
 	/** Skip this assertion. */
 	skip(actual: any, expected: any, message?: string): void;
-}
+};
 
-export interface NotDeepEqualAssertion {
+export type NotDeepEqualAssertion = {
 	/**
 	 * Assert that `actual` is not [deeply equal](https://github.com/concordancejs/concordance#comparison-details) to
 	 * `expected`, returning a boolean indicating whether the assertion passed.
@@ -226,9 +226,9 @@ export interface NotDeepEqualAssertion {
 
 	/** Skip this assertion. */
 	skip(actual: any, expected: any, message?: string): void;
-}
+};
 
-export interface NotRegexAssertion {
+export type NotRegexAssertion = {
 	/**
 	 * Assert that `string` does not match the regular expression, returning a boolean indicating whether the assertion
 	 * passed.
@@ -237,17 +237,17 @@ export interface NotRegexAssertion {
 
 	/** Skip this assertion. */
 	skip(string: string, regex: RegExp, message?: string): void;
-}
+};
 
-export interface NotThrowsAssertion {
+export type NotThrowsAssertion = {
 	/** Assert that the function does not throw. */
 	(fn: () => any, message?: string): void;
 
 	/** Skip this assertion. */
 	skip(fn: () => any, message?: string): void;
-}
+};
 
-export interface NotThrowsAsyncAssertion {
+export type NotThrowsAsyncAssertion = {
 	/** Assert that the async function does not throw. You must await the result. */
 	(fn: () => PromiseLike<any>, message?: string): Promise<void>;
 
@@ -256,17 +256,17 @@ export interface NotThrowsAsyncAssertion {
 
 	/** Skip this assertion. */
 	skip(nonThrower: any, message?: string): void;
-}
+};
 
-export interface PassAssertion {
+export type PassAssertion = {
 	/** Count a passing assertion, always returning `true`. */
 	(message?: string): boolean;
 
 	/** Skip this assertion. */
 	skip(message?: string): void;
-}
+};
 
-export interface RegexAssertion {
+export type RegexAssertion = {
 	/**
 	 * Assert that `string` matches the regular expression, returning a boolean indicating whether the assertion passed.
 	 */
@@ -274,9 +274,9 @@ export interface RegexAssertion {
 
 	/** Skip this assertion. */
 	skip(string: string, regex: RegExp, message?: string): void;
-}
+};
 
-export interface SnapshotAssertion {
+export type SnapshotAssertion = {
 	/**
 	 * Assert that `expected` is [deeply equal](https://github.com/concordancejs/concordance#comparison-details) to a
 	 * previously recorded [snapshot](https://github.com/concordancejs/concordance#serialization-details), or if
@@ -286,9 +286,9 @@ export interface SnapshotAssertion {
 
 	/** Skip this assertion. */
 	skip(expected: any, message?: string): void;
-}
+};
 
-export interface ThrowsAssertion {
+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.
@@ -297,9 +297,9 @@ export interface ThrowsAssertion {
 
 	/** Skip this assertion. */
 	skip(fn: () => any, expectations?: any, message?: string): void;
-}
+};
 
-export interface ThrowsAsyncAssertion {
+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.
@@ -315,9 +315,9 @@ export interface ThrowsAsyncAssertion {
 
 	/** Skip this assertion. */
 	skip(thrower: any, expectations?: any, message?: string): void;
-}
+};
 
-export interface TrueAssertion {
+export type TrueAssertion = {
 	/**
 	 * Assert that `actual` is strictly true, returning a boolean indicating whether the assertion passed.
 	 */
@@ -325,9 +325,9 @@ export interface TrueAssertion {
 
 	/** Skip this assertion. */
 	skip(actual: any, message?: string): void;
-}
+};
 
-export interface TruthyAssertion {
+export type TruthyAssertion = {
 	/**
 	 * Assert that `actual` is [truthy](https://developer.mozilla.org/en-US/docs/Glossary/Truthy), returning a boolean
 	 * indicating whether the assertion passed.
@@ -336,4 +336,4 @@ export interface TruthyAssertion {
 
 	/** Skip this assertion. */
 	skip(actual: any, message?: string): void;
-}
+};

package/types/subscribable.d.ts

@@ -1,6 +1,6 @@
-export interface Subscribable {
+export type Subscribable = {
 	subscribe(observer: {
 		error(error: any): void;
 		complete(): void;
 	}): void;
-}
+};

package/types/test-fn.d.ts

@@ -3,7 +3,7 @@ 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 {
+export type ExecutionContext<Context = unknown> = {
 	/** Test context, shared with hooks. */
 	context: Context;
 
@@ -18,17 +18,17 @@ export interface ExecutionContext<Context = unknown> extends Assertions {
 	readonly teardown: TeardownFn;
 	readonly timeout: TimeoutFn;
 	readonly try: TryFn<Context>;
-}
+} & Assertions;
 
-export interface LogFn {
+export type LogFn = {
 	/** Log one or more values. */
 	(...values: any[]): void;
 
 	/** Skip logging. */
 	skip(...values: any[]): void;
-}
+};
 
-export interface PlanFn {
+export type PlanFn = {
 	/**
 	 * Plan how many assertion there are in the test. The test will fail if the actual assertion count doesn't match the
 	 * number of planned assertions. See [assertion planning](https://github.com/avajs/ava#assertion-planning).
@@ -37,7 +37,7 @@ export interface PlanFn {
 
 	/** Don't plan assertions. */
 	skip(count: number): void;
-}
+};
 
 /**
  * Set a timeout for the test, in milliseconds. The test will fail if the timeout is exceeded.
@@ -67,7 +67,7 @@ export type Macro<Args extends unknown[], Context = unknown> = {
 /** A test or hook implementation. */
 export type Implementation<Args extends unknown[], Context = unknown> = ImplementationFn<Args, Context> | Macro<Args, Context>;
 
-export interface TestFn<Context = unknown> {
+export type TestFn<Context = unknown> = {
 	/** Declare a concurrent test. Additional arguments are passed to the implementation or macro. */
 	<Args extends unknown[]>(title: string, implementation: Implementation<Args, Context>, ...args: Args): void;
 
@@ -88,9 +88,9 @@ export interface TestFn<Context = unknown> {
 	serial: SerialFn<Context>;
 	skip: SkipFn<Context>;
 	todo: TodoFn;
-}
+};
 
-export interface AfterFn<Context = unknown> {
+export type AfterFn<Context = unknown> = {
 	/**
 	 * Declare a hook that is run once, after all tests have passed.
 	 * Additional arguments are passed to the implementation or macro.
@@ -105,9 +105,9 @@ export interface AfterFn<Context = unknown> {
 
 	always: AlwaysInterface<Context>;
 	skip: HookSkipFn<Context>;
-}
+};
 
-export interface AlwaysInterface<Context = unknown> {
+export type AlwaysInterface<Context = unknown> = {
 	/**
 	 * Declare a hook that is run once, after all tests are done.
 	 * Additional arguments are passed to the implementation or macro.
@@ -121,9 +121,9 @@ export interface AlwaysInterface<Context = unknown> {
 	<Args extends unknown[]>(implementation: Implementation<Args, Context>, ...args: Args): void;
 
 	skip: HookSkipFn<Context>;
-}
+};
 
-export interface BeforeFn<Context = unknown> {
+export type BeforeFn<Context = unknown> = {
 	/**
 	 * Declare a hook that is run once, before all tests.
 	 * Additional arguments are passed to the implementation or macro.
@@ -137,9 +137,9 @@ export interface BeforeFn<Context = unknown> {
 	<Args extends unknown[]>(implementation: Implementation<Args, Context>, ...args: Args): void;
 
 	skip: HookSkipFn<Context>;
-}
+};
 
-export interface FailingFn<Context = unknown> {
+export type FailingFn<Context = unknown> = {
 	/**
 	 * Declare a concurrent test that is expected to fail.
 	 * Additional arguments are passed to the implementation or macro.
@@ -154,17 +154,17 @@ export interface FailingFn<Context = unknown> {
 
 	only: OnlyFn<Context>;
 	skip: SkipFn<Context>;
-}
+};
 
-export interface HookSkipFn<Context = unknown> {
+export type HookSkipFn<Context = unknown> = {
 	/** Skip this hook. */
 	<Args extends unknown[]>(title: string, implementation: Implementation<Args, Context>, ...args: Args): void;
 
 	/** Skip this hook. */
 	<Args extends unknown[]>(implementation: Implementation<Args, Context>, ...args: Args): void;
-}
+};
 
-export interface OnlyFn<Context = unknown> {
+export type OnlyFn<Context = unknown> = {
 	/**
 	 * Declare a test. Only this test and others declared with `.only()` are run.
 	 * Additional arguments are passed to the implementation or macro.
@@ -176,9 +176,9 @@ export interface OnlyFn<Context = unknown> {
 	 * Additional arguments are passed to the macro. The macro is responsible for generating a unique test title.
 	 */
 	<Args extends unknown[]>(macro: Macro<Args, Context>, ...args: Args): void;
-}
+};
 
-export interface SerialFn<Context = unknown> {
+export type SerialFn<Context = unknown> = {
 	/** Declare a serial test. Additional arguments are passed to the implementation or macro. */
 	<Args extends unknown[]>(title: string, implementation: Implementation<Args, Context>, ...args: Args): void;
 
@@ -195,15 +195,15 @@ export interface SerialFn<Context = unknown> {
 	only: OnlyFn<Context>;
 	skip: SkipFn<Context>;
 	todo: TodoFn;
-}
+};
 
-export interface SkipFn<Context = unknown> {
+export type SkipFn<Context = unknown> = {
 	/** Skip this test. */
 	<Args extends unknown[]>(title: string, implementation: Implementation<Args, Context>, ...args: Args): void;
 
 	/** Skip this test. */
 	<Args extends unknown[]>(macro: Macro<Args, Context>, ...args: Args): void;
-}
+};
 
 /** Declare a test that should be implemented later. */
 export type TodoFn = (title: string) => void;
@@ -216,16 +216,16 @@ export type MacroDeclarationOptions<Args extends unknown[], Context = unknown> =
 	title: TitleFn<Args>;
 };
 
-export interface MacroFn<Context = unknown> {
+export type 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>;
-}
+};
 
-export interface Meta {
+export type Meta = {
 	/** Path to the test file being executed. */
 	file: string;
 
 	/** Directory where snapshots are stored. */
 	snapshotDirectory: string;
-}
+};

package/types/try-fn.d.ts

@@ -7,9 +7,9 @@ export type CommitDiscardOptions = {
 	retainLogs?: boolean;
 };
 
-export interface AssertionError extends Error {}
+export type AssertionError = Record<string, unknown> & Error;
 
-export interface TryResult {
+export type TryResult = {
 	/**
 	* Title of the attempt, helping you tell attempts aparts.
 	*/
@@ -40,9 +40,9 @@ export interface TryResult {
 	 * Discard the attempt.
 	 */
 	discard(options?: CommitDiscardOptions): void;
-}
+};
 
-export interface TryFn<Context = unknown> {
+export type TryFn<Context = unknown> = {
 	/**
 	 * Attempt to run some assertions. The result must be explicitly committed or discarded or else
 	 * the test will fail. The title may help distinguish attempts from one another.
@@ -54,5 +54,5 @@ export interface TryFn<Context = unknown> {
 	 * the test will fail.
 	 */
 	<Args extends unknown[]>(fn: Implementation<Args, Context>, ...args: Args): Promise<TryResult>;
-}
+};
 

package/entrypoints/index.d.cts

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

package/index.d.ts

@@ -1,12 +0,0 @@
-import type {TestFn} from './types/test-fn.js';
-
-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;
-
-/** Call to declare a test, or chain to declare hooks or test modifiers */
-export default test;