ava 7.0.0 → 8.0.1

package/lib/worker/{channel.cjs → channel.js}

@@ -1,11 +1,11 @@
-'use strict';
-const events = require('node:events');
-const process = require('node:process');
-const {MessageChannel, threadId} = require('node:worker_threads');
+import events from 'node:events';
+import process from 'node:process';
+import {MessageChannel, parentPort, threadId} from 'node:worker_threads';
 
-const timers = require('../now-and-timers.cjs');
+import {controlFlow} from '../ipc-flow-control.js';
+import {setTimeout as setTimeoutTimer} from '../now-and-timers.js';
 
-const {isRunningInChildProcess, isRunningInThread} = require('./utils.cjs');
+import {isRunningInChildProcess, isRunningInThread} from './utils.js';
 
 const selectAvaMessage = async (channel, type) => {
 	for await (const [message] of events.on(channel, 'message')) {
@@ -16,10 +16,6 @@ const selectAvaMessage = async (channel, type) => {
 };
 
 class RefCounter {
-	constructor() {
-		this.count = 0;
-	}
-
 	refAndTest() {
 		return ++this.count === 1;
 	}
@@ -27,6 +23,8 @@ class RefCounter {
 	testAndUnref() {
 		return this.count > 0 && --this.count === 0;
 	}
+
+	count = 0;
 }
 
 class MessagePortHandle {
@@ -36,7 +34,7 @@ class MessagePortHandle {
 		this.channel = port;
 		// Referencing the port does not immediately prevent the thread from
 		// exiting. Use a timer to keep a reference for at least a second.
-		this.workaroundTimer = timers.setTimeout(() => {}, 1000).unref();
+		this.workaroundTimer = setTimeoutTimer(() => {}, 1000).unref();
 	}
 
 	forceUnref() {
@@ -94,10 +92,8 @@ class IpcHandle {
 
 let handle;
 if (isRunningInChildProcess) {
-	const {controlFlow} = require('../ipc-flow-control.cjs');
 	handle = new IpcHandle(controlFlow(process));
 } else if (isRunningInThread) {
-	const {parentPort} = require('node:worker_threads');
 	handle = new MessagePortHandle(parentPort);
 }
 
@@ -105,12 +101,14 @@ if (isRunningInChildProcess) {
 // Node.js. In order to keep track, explicitly reference before attaching.
 handle.ref();
 
-exports.options = selectAvaMessage(handle.channel, 'options').then(message => message.ava.options);
-exports.peerFailed = selectAvaMessage(handle.channel, 'peer-failed');
-exports.workerFreed = selectAvaMessage(handle.channel, 'free-worker');
-exports.send = handle.send.bind(handle);
-exports.ref = handle.ref.bind(handle);
-exports.unref = handle.unref.bind(handle);
+/* eslint-disable unicorn/prefer-top-level-await */
+export const options = selectAvaMessage(handle.channel, 'options').then(message => message.ava.options);
+export const peerFailed = selectAvaMessage(handle.channel, 'peer-failed');
+export const workerFreed = selectAvaMessage(handle.channel, 'free-worker');
+/* eslint-enable unicorn/prefer-top-level-await */
+export const send = handle.send.bind(handle);
+export const ref = handle.ref.bind(handle);
+export const unref = handle.unref.bind(handle);
 
 let channelCounter = 0;
 let messageCounter = 0;
@@ -138,7 +136,7 @@ function createChannelEmitter(channelId) {
 	return [emitter, () => channelEmitters.delete(channelId)];
 }
 
-function registerSharedWorker(filename, initialData) {
+export function registerSharedWorker(filename, initialData) {
 	const channelId = `${threadId}/channel/${++channelCounter}`;
 
 	const {port1: ourPort, port2: theirPort} = new MessageChannel();
@@ -160,9 +158,9 @@ function registerSharedWorker(filename, initialData) {
 	// The attaching of message listeners will cause the port to be referenced by
 	// Node.js. In order to keep track, explicitly reference before attaching.
 	sharedWorkerHandle.ref();
-	const ready = selectAvaMessage(ourPort, 'ready').then(() => { // eslint-disable-line promise/prefer-await-to-then
+	const ready = selectAvaMessage(ourPort, 'ready').then(() => {
 		currentlyAvailable = error === null;
-	}).finally(() => { // eslint-disable-line promise/prefer-await-to-then
+	}).finally(() => {
 		// Once ready, it's up to user code to subscribe to messages, which (see
 		// below) causes us to reference the port.
 		sharedWorkerHandle.unref();
@@ -172,7 +170,7 @@ function registerSharedWorker(filename, initialData) {
 
 	// Errors are received over the test worker channel, not the message port
 	// dedicated to the shared worker.
-	events.once(channelEmitter, 'shared-worker-error').then(() => { // eslint-disable-line promise/prefer-await-to-then
+	events.once(channelEmitter, 'shared-worker-error').then(() => {
 		unsubscribe();
 		sharedWorkerHandle.forceUnref();
 		error = new Error('The shared worker is no longer available');
@@ -244,5 +242,3 @@ function registerSharedWorker(filename, initialData) {
 		},
 	};
 }
-
-exports.registerSharedWorker = registerSharedWorker;

package/lib/worker/completion-handlers.js

@@ -1,13 +1,13 @@
 import process from 'node:process';
 
-import state from './state.cjs';
+import {completionHandlers} from './state.js';
 
 export function runCompletionHandlers() {
-	for (const handler of state.completionHandlers) {
+	for (const handler of completionHandlers) {
 		process.nextTick(() => handler());
 	}
 }
 
 export function registerCompletionHandler(handler) {
-	state.completionHandlers.push(handler);
+	completionHandlers.push(handler);
 }

package/lib/worker/{guard-environment.cjs → guard-environment.js}

@@ -1,8 +1,7 @@
-'use strict';
-const path = require('node:path');
-const process = require('node:process');
+import path from 'node:path';
+import process from 'node:process';
 
-const {isRunningInThread, isRunningInChildProcess} = require('./utils.cjs');
+import {isRunningInThread, isRunningInChildProcess} from './utils.js';
 
 // Check if the test is being run without AVA cli
 if (!isRunningInChildProcess && !isRunningInThread) {
@@ -14,6 +13,6 @@ if (!isRunningInChildProcess && !isRunningInThread) {
 
 		process.exit(1); // eslint-disable-line unicorn/no-process-exit
 	} else {
-		throw new Error('The ’ava’ module can only be imported in test files');
+		throw new Error('The \u2018ava\u2019 module can only be imported in test files');
 	}
 }

package/lib/worker/line-numbers.js

@@ -1,16 +1,12 @@
 import * as fs from 'node:fs';
-import {createRequire, findSourceMap} from 'node:module';
+import {findSourceMap} from 'node:module';
 import {pathToFileURL} from 'node:url';
 
+import * as acorn from 'acorn';
+import * as walk from 'acorn-walk';
 import callsites from 'callsites';
 
-const require = createRequire(import.meta.url);
-
 function parse(file) {
-	// Avoid loading these until we actually need to select tests by line number.
-	const acorn = require('acorn');
-	const walk = require('acorn-walk');
-
 	const ast = acorn.parse(fs.readFileSync(file, 'utf8'), {
 		ecmaVersion: 'latest',
 		locations: true,

package/lib/worker/main.js

@@ -0,0 +1,11 @@
+import './guard-environment.js'; // eslint-disable-line import-x/no-unassigned-import
+
+import assert from 'node:assert';
+
+import {flags, refs} from './state.js';
+
+assert.ok(refs.runnerChain);
+
+flags.loadedMain = true;
+
+export default refs.runnerChain;

package/lib/worker/{options.cjs → options.js}

@@ -1,17 +1,16 @@
-'use strict';
 let options = null;
-exports.get = () => {
+export function get() {
 	if (!options) {
 		throw new Error('Options have not yet been set');
 	}
 
 	return options;
-};
+}
 
-exports.set = newOptions => {
+export function set(newOptions) {
 	if (options) {
 		throw new Error('Options have already been set');
 	}
 
 	options = newOptions;
-};
+}

package/lib/worker/{plugin.cjs → plugin.js}

@@ -1,10 +1,10 @@
-const pkg = require('../../package.json');
+import pkg from '../pkg.js';
 
-const {registerSharedWorker: register} = require('./channel.cjs');
-const options = require('./options.cjs');
-const {sharedWorkerTeardowns, waitForReady} = require('./state.cjs');
+import {registerSharedWorker as register} from './channel.js';
+import {get as getOptions} from './options.js';
+import {sharedWorkerTeardowns, waitForReady} from './state.js';
 
-require('./guard-environment.cjs'); // eslint-disable-line import-x/no-unassigned-import
+import './guard-environment.js'; // eslint-disable-line import-x/no-unassigned-import
 
 const workers = new Map();
 const workerTeardownFns = new WeakMap();
@@ -83,13 +83,13 @@ function createSharedWorker(filename, initialData, teardown) {
 	};
 }
 
-function registerSharedWorker({
+export function registerSharedWorker({
 	filename,
 	initialData,
 	supportedProtocols,
 	teardown,
 }) {
-	const options_ = options.get();
+	const options_ = getOptions();
 
 	if (!options_.workerThreads) {
 		throw new Error('Shared workers can be used only when worker threads are enabled');
@@ -108,7 +108,7 @@ function registerSharedWorker({
 			// order. Any error will crash the worker.
 			const teardownFns = workerTeardownFns.get(worker);
 			if (teardownFns !== undefined) {
-				for await (const fn of [...teardownFns].reverse()) {
+				for await (const fn of [...teardownFns].toReversed()) {
 					await fn();
 				}
 			}
@@ -126,5 +126,3 @@ function registerSharedWorker({
 
 	return worker;
 }
-
-exports.registerSharedWorker = registerSharedWorker;

package/lib/worker/state.js

@@ -0,0 +1,5 @@
+export const flags = {loadedMain: false};
+export const refs = {runnerChain: null};
+export const completionHandlers = [];
+export const sharedWorkerTeardowns = [];
+export const waitForReady = [];

package/lib/worker/utils.js

@@ -0,0 +1,5 @@
+import process from 'node:process';
+import {isMainThread} from 'node:worker_threads';
+
+export const isRunningInThread = isMainThread === false;
+export const isRunningInChildProcess = typeof process.send === 'function';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ava",
-	"version": "7.0.0",
+	"version": "8.0.1",
 	"description": "Node.js test runner that lets you develop with confidence.",
 	"license": "MIT",
 	"repository": {
@@ -9,37 +9,25 @@
 	},
 	"homepage": "https://avajs.dev",
 	"bin": {
-		"ava": "entrypoints/cli.mjs"
+		"ava": "entrypoints/cli.js"
 	},
 	"exports": {
 		".": {
-			"import": {
-				"types": "./entrypoints/main.d.mts",
-				"default": "./entrypoints/main.mjs"
-			},
-			"require": {
-				"types": "./entrypoints/main.d.cts",
-				"default": "./entrypoints/main.cjs"
-			}
+			"types": "./entrypoints/main.d.ts",
+			"default": "./entrypoints/main.js"
 		},
-		"./eslint-plugin-helper": "./entrypoints/eslint-plugin-helper.cjs",
+		"./eslint-plugin-helper": "./entrypoints/eslint-plugin-helper.js",
 		"./plugin": {
-			"import": {
-				"types": "./entrypoints/plugin.d.mts",
-				"default": "./entrypoints/plugin.mjs"
-			},
-			"require": {
-				"types": "./entrypoints/plugin.d.cts",
-				"default": "./entrypoints/plugin.cjs"
-			}
+			"types": "./entrypoints/plugin.d.ts",
+			"default": "./entrypoints/plugin.js"
 		},
 		"./internal": {
-			"types": "./entrypoints/internal.d.mts"
+			"types": "./entrypoints/internal.d.ts"
 		}
 	},
 	"type": "module",
 	"engines": {
-		"node": "^20.19 || ^22.20 || ^24.12 || >=25"
+		"node": "^22.20 || ^24.12 || >=26"
 	},
 	"scripts": {
 		"test": "./scripts/test.sh"
@@ -86,66 +74,70 @@
 		"typescript"
 	],
 	"dependencies": {
-		"@vercel/nft": "^1.3.2",
+		"@vercel/nft": "^1.5.0",
 		"acorn": "^8.16.0",
 		"acorn-walk": "^8.3.5",
 		"ansi-styles": "^6.2.3",
 		"arrgv": "^1.0.2",
 		"arrify": "^3.0.0",
 		"callsites": "^4.2.0",
-		"cbor": "^10.0.11",
+		"cbor2": "^2.3.0",
 		"chalk": "^5.6.2",
 		"chunkd": "^2.0.1",
 		"ci-info": "^4.4.0",
 		"ci-parallel-vars": "^1.0.1",
-		"cli-truncate": "^5.1.1",
+		"cli-truncate": "^6.0.0",
 		"code-excerpt": "^4.0.0",
 		"common-path-prefix": "^3.0.0",
 		"concordance": "^5.0.4",
 		"currently-unhandled": "^0.4.1",
 		"debug": "^4.4.3",
-		"emittery": "^1.2.0",
+		"emittery": "^2.0.0",
 		"figures": "^6.1.0",
-		"globby": "^16.1.1",
+		"globby": "^16.2.0",
 		"ignore-by-default": "^2.1.0",
 		"indent-string": "^5.0.0",
 		"is-plain-object": "^5.0.0",
 		"is-promise": "^4.0.0",
 		"matcher": "^6.0.0",
-		"memoize": "^10.2.0",
+		"memoize": "^11.0.0",
 		"ms": "^2.1.3",
 		"p-map": "^7.0.4",
 		"package-config": "^5.0.0",
-		"picomatch": "^4.0.3",
+		"picomatch": "^4.0.4",
 		"plur": "^6.0.0",
 		"pretty-ms": "^9.3.0",
 		"resolve-cwd": "^3.0.0",
+		"slash": "^5.1.0",
 		"stack-utils": "^2.0.6",
 		"supertap": "^3.0.1",
 		"temp-dir": "^3.0.0",
-		"write-file-atomic": "^7.0.0",
+		"write-file-atomic": "^7.0.1",
 		"yargs": "^18.0.0"
 	},
 	"devDependencies": {
 		"@ava/test": "github:avajs/test",
-		"@ava/typescript": "^6.0.0",
+		"@ava/typescript": "^7.0.0",
 		"@sindresorhus/tsconfig": "^8.1.0",
-		"@types/node": "^24.10.15",
+		"@types/node": "^24.12.4",
 		"ansi-escapes": "^7.3.0",
 		"c8": "^11.0.0",
 		"execa": "^9.6.1",
-		"expect": "^30.2.0",
-		"sinon": "^21.0.1",
-		"tap": "^21.6.2",
+		"expect": "^30.4.1",
+		"sinon": "^22.0.0",
+		"tap": "^21.7.4",
 		"tempy": "^3.2.0",
 		"tsd": "^0.33.0",
-		"typescript": "~5.9.3",
-		"xo": "^1.2.3",
+		"typescript": "~6.0.3",
+		"xo": "^2.0.2",
 		"zen-observable": "^0.10.0"
 	},
 	"overrides": {
 		"c8": {
 			"yargs": "^18.0.0"
+		},
+		"test-exclude": {
+			"glob": ">=13"
 		}
 	},
 	"peerDependencies": {
@@ -157,7 +149,7 @@
 		}
 	},
 	"volta": {
-		"node": "24.14.0",
-		"npm": "11.11.0"
+		"node": "24.15.0",
+		"npm": "11.14.1"
 	}
 }

package/plugin.d.ts

@@ -1,3 +1,3 @@
 // For compatibility with resolution algorithms other than Node16.
 
-export * from './entrypoints/plugin.cjs';
+export * from './entrypoints/plugin.js';

package/types/{test-fn.d.cts → test-fn.d.ts}

@@ -1,6 +1,6 @@
-import type {Assertions} from './assertions.cjs';
-import type {Subscribable} from './subscribable.cjs';
-import type {TryFn} from './try-fn.cjs';
+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 type ExecutionContext<Context = unknown> = {
@@ -15,6 +15,7 @@ export type ExecutionContext<Context = unknown> = {
 
 	readonly log: LogFn;
 	readonly plan: PlanFn;
+	/** Declare a function to be run after the test has ended. */
 	readonly teardown: TeardownFn;
 	readonly timeout: TimeoutFn;
 	readonly try: TryFn<Context>;
@@ -90,8 +91,13 @@ export type TestFn<Context = unknown> = {
 	macro: MacroFn<Context>;
 	meta: Meta;
 	only: OnlyFn<Context>;
+	/** Declare a test that only runs when `condition` is true; otherwise the test is skipped. */
+	runIf: RunIfFn<TestFn<Context>>;
 	serial: SerialFn<Context>;
 	skip: SkipFn<Context>;
+	/** Declare a test that is skipped when `condition` is true. */
+	skipIf: SkipIfFn<TestFn<Context>>;
+	/** Declare a test that should be implemented later. */
 	todo: TodoFn;
 };
 
@@ -158,7 +164,11 @@ export type FailingFn<Context = unknown> = {
 	<Args extends unknown[]>(macro: Macro<Args, Context>, ...args: Args): void;
 
 	only: OnlyFn<Context>;
+	/** Declare a test that only runs when `condition` is true; otherwise the test is skipped. */
+	runIf: RunIfFn<FailingFn<Context>>;
 	skip: SkipFn<Context>;
+	/** Declare a test that is skipped when `condition` is true. */
+	skipIf: SkipIfFn<FailingFn<Context>>;
 };
 
 export type HookSkipFn<Context = unknown> = {
@@ -183,6 +193,9 @@ export type OnlyFn<Context = unknown> = {
 	<Args extends unknown[]>(macro: Macro<Args, Context>, ...args: Args): void;
 };
 
+/** Declare a test that only runs when `condition` is true; otherwise the test is skipped. */
+export type RunIfFn<Chain> = (condition: boolean) => Chain;
+
 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;
@@ -198,7 +211,12 @@ export type SerialFn<Context = unknown> = {
 	beforeEach: BeforeFn<Context>;
 	failing: FailingFn<Context>;
 	only: OnlyFn<Context>;
+	/** Declare a test that only runs when `condition` is true; otherwise the test is skipped. */
+	runIf: RunIfFn<SerialFn<Context>>;
 	skip: SkipFn<Context>;
+	/** Declare a test that is skipped when `condition` is true. */
+	skipIf: SkipIfFn<SerialFn<Context>>;
+	/** Declare a test that should be implemented later. */
 	todo: TodoFn;
 };
 
@@ -210,6 +228,9 @@ export type SkipFn<Context = unknown> = {
 	<Args extends unknown[]>(macro: Macro<Args, Context>, ...args: Args): void;
 };
 
+/** Declare a test that is skipped when `condition` is true. */
+export type SkipIfFn<Chain> = (condition: boolean) => Chain;
+
 /** Declare a test that should be implemented later. */
 export type TodoFn = (title: string) => void;
 

package/types/{try-fn.d.cts → try-fn.d.ts}

@@ -1,4 +1,4 @@
-import type {Implementation} from './test-fn.cjs';
+import type {Implementation} from './test-fn.js';
 
 export type CommitDiscardOptions = {
 	/**
@@ -55,4 +55,3 @@ export type TryFn<Context = unknown> = {
 	 */
 	<Args extends unknown[]>(fn: Implementation<Args, Context>, ...args: Args): Promise<TryResult>;
 };
-

package/entrypoints/main.cjs

@@ -1,2 +0,0 @@
-'use strict';
-module.exports = require('../lib/worker/main.cjs');

package/entrypoints/main.d.cts

@@ -1,12 +0,0 @@
-import type {TestFn} from '../types/test-fn.cjs';
-
-export type * from '../types/assertions.cjs';
-export type * from '../types/try-fn.cjs';
-export type * from '../types/test-fn.cjs';
-export type * from '../types/subscribable.cjs';
-
-/** 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.cjs

@@ -1,2 +0,0 @@
-'use strict';
-module.exports = require('../lib/worker/plugin.cjs');

package/entrypoints/plugin.d.mts

@@ -1,6 +0,0 @@
-import type {SharedWorker} from '../types/shared-worker.cjs';
-
-export function registerSharedWorker<Data = unknown>(options: SharedWorker.Plugin.RegistrationOptions<'ava-4', Data>): SharedWorker.Plugin.Protocol<Data>;
-// Add overloads for additional protocols.
-
-export type {SharedWorker} from '../types/shared-worker.cjs';

package/entrypoints/plugin.mjs

@@ -1,4 +0,0 @@
-import * as plugin from '../lib/worker/plugin.cjs';
-
-const {registerSharedWorker} = plugin;
-export {registerSharedWorker};

package/lib/module-types.js

@@ -1,85 +0,0 @@
-const requireTrueValue = value => {
-	if (value !== true) {
-		throw new TypeError('When specifying module types, use `true` for ’cjs’, ’mjs’ and ’js’ extensions');
-	}
-};
-
-const normalize = (extension, type, defaultModuleType) => {
-	switch (extension) {
-		case 'cjs': {
-			requireTrueValue(type);
-			return 'commonjs';
-		}
-
-		case 'mjs': {
-			requireTrueValue(type);
-			return 'module';
-		}
-
-		case 'js': {
-			requireTrueValue(type);
-			return defaultModuleType;
-		}
-
-		default: {
-			if (type !== 'commonjs' && type !== 'module') {
-				throw new TypeError(`Module type for ’${extension}’ must be ’commonjs’ or ’module’`);
-			}
-
-			return type;
-		}
-	}
-};
-
-const deriveFromObject = (extensionsObject, defaultModuleType) => {
-	const moduleTypes = {};
-	for (const [extension, type] of Object.entries(extensionsObject)) {
-		moduleTypes[extension] = normalize(extension, type, defaultModuleType);
-	}
-
-	return moduleTypes;
-};
-
-const deriveFromArray = (extensions, defaultModuleType) => {
-	const moduleTypes = {};
-	for (const extension of extensions) {
-		switch (extension) {
-			case 'cjs': {
-				moduleTypes.cjs = 'commonjs';
-				break;
-			}
-
-			case 'mjs': {
-				moduleTypes.mjs = 'module';
-				break;
-			}
-
-			case 'js': {
-				moduleTypes.js = defaultModuleType;
-				break;
-			}
-
-			default: {
-				moduleTypes[extension] = 'commonjs';
-			}
-		}
-	}
-
-	return moduleTypes;
-};
-
-export default function moduleTypes(configuredExtensions, defaultModuleType) {
-	if (configuredExtensions === undefined) {
-		return {
-			cjs: 'commonjs',
-			mjs: 'module',
-			js: defaultModuleType,
-		};
-	}
-
-	if (Array.isArray(configuredExtensions)) {
-		return deriveFromArray(configuredExtensions, defaultModuleType);
-	}
-
-	return deriveFromObject(configuredExtensions, defaultModuleType);
-}

package/lib/pkg.cjs

@@ -1,2 +0,0 @@
-'use strict';
-module.exports = require('../package.json');