ava 6.3.0 → 6.4.1

package/entrypoints/main.d.cts

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

package/entrypoints/main.d.mts

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

package/lib/api.js

@@ -88,7 +88,7 @@ export default class Api extends Emittery {
 		}
 	}
 
-	async run({files: selectedFiles = [], filter = [], runtimeOptions = {}} = {}) { // eslint-disable-line complexity
+	async run({files: selectedFiles = [], filter = [], runtimeOptions = {}, testFileSelector} = {}) { // eslint-disable-line complexity
 		let setupOrGlobError;
 
 		const apiOptions = this.options;
@@ -149,13 +149,17 @@ export default class Api extends Emittery {
 		let testFiles;
 		try {
 			testFiles = await globs.findTests({cwd: this.options.projectDir, ...apiOptions.globs});
-			if (selectedFiles.length === 0) {
-				selectedFiles = filter.length === 0 ? testFiles : globs.applyTestFileFilter({
-					cwd: this.options.projectDir,
-					filter: filter.map(({pattern}) => pattern),
-					providers,
-					testFiles,
-				});
+			if (typeof testFileSelector === 'function') {
+				selectedFiles = testFileSelector(testFiles, selectedFiles);
+			} else if (selectedFiles.length === 0) {
+				selectedFiles = filter.length === 0
+					? testFiles
+					: globs.applyTestFileFilter({
+						cwd: this.options.projectDir,
+						filter: filter.map(({pattern}) => pattern),
+						providers,
+						testFiles,
+					});
 			}
 		} catch (error) {
 			selectedFiles = [];
@@ -163,7 +167,7 @@ export default class Api extends Emittery {
 		}
 
 		const selectionInsights = {
-			filter,
+			filter: selectedFiles.appliedFilters ?? filter,
 			ignoredFilterPatternFiles: selectedFiles.ignoredFilterPatternFiles ?? [],
 			testFileCount: testFiles.length,
 			selectionCount: selectedFiles.length,
@@ -201,9 +205,8 @@ export default class Api extends Emittery {
 				failFastEnabled: failFast,
 				filePathPrefix: getFilePathPrefix(selectedFiles),
 				files: selectedFiles,
-				matching: apiOptions.match.length > 0,
-				previousFailures: runtimeOptions.previousFailures ?? 0,
-				runOnlyExclusive: runtimeOptions.runOnlyExclusive === true,
+				matching: apiOptions.match.length > 0 || runtimeOptions.interactiveMatchPattern !== undefined,
+				previousFailures: runtimeOptions.countPreviousFailures?.() ?? 0,
 				firstRun: runtimeOptions.firstRun ?? true,
 				status: runStatus,
 			});
@@ -266,14 +269,13 @@ export default class Api extends Emittery {
 
 				const lineNumbers = getApplicableLineNumbers(globs.normalizeFileForMatching(apiOptions.projectDir, file), filter);
 				// Removing `providers` and `sortTestFiles` fields because they cannot be transferred to the worker threads.
-				const {providers, sortTestFiles, ...forkOptions} = apiOptions;
+				const {providers, sortTestFiles, match, ...forkOptions} = apiOptions;
 				const options = {
 					...forkOptions,
 					providerStates,
 					lineNumbers,
 					recordNewSnapshots: !isCi,
-					// If we're looking for matches, run every single test process in exclusive-only mode
-					runOnlyExclusive: apiOptions.match.length > 0 || runtimeOptions.runOnlyExclusive === true,
+					match: runtimeOptions.interactiveMatchPattern === undefined ? match : [...match, runtimeOptions.interactiveMatchPattern],
 				};
 
 				if (runtimeOptions.updateSnapshots) {
@@ -291,7 +293,7 @@ export default class Api extends Emittery {
 				deregisteredSharedWorkers.push(observeWorkerProcess(worker, runStatus));
 
 				pendingWorkers.add(worker);
-				worker.promise.then(() => {
+				worker.promise.then(() => { // eslint-disable-line promise/prefer-await-to-then
 					pendingWorkers.delete(worker);
 				});
 				timeoutTrigger.debounce();

package/lib/assert.js

@@ -490,7 +490,7 @@ export class Assertions {
 				// Record the stack before it gets lost in the promise chain.
 				const assertionStack = getAssertionStack();
 				// Handle "promise like" objects by casting to a real Promise.
-				const intermediate = Promise.resolve(promise).then(value => { // eslint-disable-line promise/prefer-await-to-then
+				const intermediate = Promise.resolve(promise).then(value => { // eslint-disable-line promise/prefer-catch, promise/prefer-await-to-then
 					throw failPending(new AssertionError(message, {
 						assertion: 't.throwsAsync()',
 						assertionStack,
@@ -592,7 +592,7 @@ export class Assertions {
 				// Create an error object to record the stack before it gets lost in the promise chain.
 				const assertionStack = getAssertionStack();
 				// Handle "promise like" objects by casting to a real Promise.
-				const intermediate = Promise.resolve(promise).then(noop, error => { // eslint-disable-line promise/prefer-await-to-then
+				const intermediate = Promise.resolve(promise).then(noop, error => { // eslint-disable-line promise/prefer-catch, promise/prefer-await-to-then
 					throw failPending(new AssertionError(message, {
 						assertion: 't.notThrowsAsync()',
 						assertionStack,

package/lib/chalk.js

@@ -1,6 +1,6 @@
 import {Chalk} from 'chalk'; // eslint-disable-line unicorn/import-style
 
-let chalk = new Chalk(); // eslint-disable-line import/no-mutable-exports
+let chalk = new Chalk(); // eslint-disable-line import-x/no-mutable-exports
 
 export {chalk};
 

package/lib/cli.js

@@ -100,9 +100,7 @@ export default async function loadCli() { // eslint-disable-line complexity
 		const {argv: {config: configFile}} = yargs(hideBin(process.argv)).help(false).version(false);
 		const loaded = await loadConfig({configFile});
 		if (loaded.unsupportedFiles.length > 0) {
-			console.log(chalk.magenta(
-				`  ${figures.warning} AVA does not support JSON config, ignoring:\n\n    ${loaded.unsupportedFiles.join('\n    ')}`,
-			));
+			console.log(chalk.magenta(`  ${figures.warning} AVA does not support JSON config, ignoring:\n\n    ${loaded.unsupportedFiles.join('\n    ')}`));
 		}
 
 		conf = loaded.config;
@@ -130,7 +128,8 @@ export default async function loadCli() { // eslint-disable-line complexity
 			files: [],
 			host: undefined,
 			port: undefined,
-		} : null;
+		}
+		: null;
 
 	let resetCache = false;
 	const {argv} = yargs(hideBin(process.argv))
@@ -165,6 +164,7 @@ export default async function loadCli() { // eslint-disable-line complexity
 		})
 		.command('* [<pattern>...]', 'Run tests', yargs => yargs.options(FLAGS).positional('pattern', {
 			array: true,
+			// eslint-disable-next-line @stylistic/max-len
 			describe: 'Select which test files to run. Leave empty if you want AVA to run all test files as per your configuration. Accepts glob patterns, directories that (recursively) contain test files, and file paths optionally suffixed with a colon and comma-separated numbers and/or ranges identifying the 1-based line(s) of specific tests to run',
 			type: 'string',
 		}), argv => {
@@ -192,6 +192,7 @@ export default async function loadCli() { // eslint-disable-line complexity
 				},
 			}).positional('pattern', {
 				demand: true,
+				// eslint-disable-next-line @stylistic/max-len
 				describe: 'Glob pattern to select a single test file to debug, optionally suffixed with a colon and comma-separated numbers and/or ranges identifying the 1-based line(s) of specific tests to run',
 				type: 'string',
 			}),
@@ -203,14 +204,16 @@ export default async function loadCli() { // eslint-disable-line complexity
 					host: argv.host,
 					port: argv.port,
 				};
-			})
+			},
+		)
 		.command(
 			'reset-cache',
 			'Delete any temporary files and state kept by AVA, then exit',
 			yargs => yargs,
 			() => {
 				resetCache = true;
-			})
+			},
+		)
 		.example('$0')
 		.example('$0 test.js')
 		.example('$0 test.js:4,7-9')

package/lib/fork.js

@@ -104,6 +104,11 @@ export default function loadFork(file, options, execArgv = process.execArgv) {
 			}
 
 			switch (message.ava.type) {
+				case 'worker-finished': {
+					send({type: 'free-worker'});
+					break;
+				}
+
 				case 'ready-for-options': {
 					send({type: 'options', options});
 					break;

package/lib/line-numbers.js

@@ -16,23 +16,21 @@ const parseNumber = string => Number.parseInt(string, 10);
 const removeAllWhitespace = string => string.replaceAll(/\s/g, '');
 const range = (start, end) => Array.from({length: end - start + 1}).fill(start).map((element, index) => element + index);
 
-const parseLineNumbers = suffix => sortNumbersAscending(distinctArray(
-	suffix.split(',').flatMap(part => {
-		if (NUMBER_REGEX.test(part)) {
-			return parseNumber(part);
-		}
+const parseLineNumbers = suffix => sortNumbersAscending(distinctArray(suffix.split(',').flatMap(part => {
+	if (NUMBER_REGEX.test(part)) {
+		return parseNumber(part);
+	}
 
-		const {groups: {startGroup, endGroup}} = RANGE_REGEX.exec(part);
-		const start = parseNumber(startGroup);
-		const end = parseNumber(endGroup);
+	const {groups: {startGroup, endGroup}} = RANGE_REGEX.exec(part);
+	const start = parseNumber(startGroup);
+	const end = parseNumber(endGroup);
 
-		if (start > end) {
-			return range(end, start);
-		}
+	if (start > end) {
+		return range(end, start);
+	}
 
-		return range(start, end);
-	}),
-));
+	return range(start, end);
+})));
 
 export function splitPatternAndLineNumbers(pattern) {
 	const parts = pattern.split(DELIMITER);
@@ -49,9 +47,7 @@ export function splitPatternAndLineNumbers(pattern) {
 }
 
 export function getApplicableLineNumbers(normalizedFilePath, filter) {
-	return sortNumbersAscending(distinctArray(
-		filter
-			.filter(({pattern, lineNumbers}) => lineNumbers && picomatch.isMatch(normalizedFilePath, pattern))
-			.flatMap(({lineNumbers}) => lineNumbers),
-	));
+	return sortNumbersAscending(distinctArray(filter
+		.filter(({pattern, lineNumbers}) => lineNumbers && picomatch.isMatch(normalizedFilePath, pattern))
+		.flatMap(({lineNumbers}) => lineNumbers)));
 }

package/lib/reporters/default.js

@@ -26,7 +26,7 @@ class LineWriter extends stream.Writable {
 
 		this.dest = dest;
 		this.columns = dest.columns ?? 80;
-		this.lastLineIsEmpty = false;
+		this.lastLineIsEmpty = true;
 	}
 
 	_write(chunk, _, callback) {
@@ -34,9 +34,9 @@ class LineWriter extends stream.Writable {
 		callback();
 	}
 
-	writeLine(string) {
+	writeLine(string, indent = true) {
 		if (string) {
-			this.write(indentString(string, 2) + os.EOL);
+			this.write((indent ? indentString(string, 2) : string) + os.EOL);
 			this.lastLineIsEmpty = false;
 		} else {
 			this.write(os.EOL);
@@ -44,6 +44,11 @@ class LineWriter extends stream.Writable {
 		}
 	}
 
+	write(string) {
+		this.lastLineIsEmpty = false;
+		super.write(string);
+	}
+
 	ensureEmptyLine() {
 		if (!this.lastLineIsEmpty) {
 			this.writeLine();
@@ -120,7 +125,6 @@ export default class Reporter {
 		this.previousFailures = 0;
 
 		this.failFastEnabled = false;
-		this.lastLineIsEmpty = false;
 		this.matching = false;
 
 		this.removePreviousListener = null;
@@ -323,6 +327,7 @@ export default class Reporter {
 
 						this.lineWriter.writeLine(colors.error(`${figures.cross} Line numbers for ${this.relativeFile(event.testFile)} did not match any tests`));
 					} else if (!this.failFastEnabled && fileStats.remainingTests > 0) {
+						// eslint-disable-next-line @stylistic/max-len
 						this.lineWriter.writeLine(colors.error(`${figures.cross} ${fileStats.remainingTests} ${plur('test', fileStats.remainingTests)} remaining in ${this.relativeFile(event.testFile)}`));
 					}
 				}
@@ -628,7 +633,8 @@ export default class Reporter {
 				this.lineWriter.writeLine(colors.error(`${figures.cross} Couldn’t find any files to test` + firstLinePostfix));
 			} else {
 				const {testFileCount: count} = this.selectionInsights;
-				this.lineWriter.writeLine(colors.error(`${figures.cross} Based on your configuration, ${count} test ${plur('file was', 'files were', count)} found, but did not match the CLI arguments:` + firstLinePostfix));
+				// eslint-disable-next-line @stylistic/max-len
+				this.lineWriter.writeLine(colors.error(`${figures.cross} Based on your configuration, ${count} test ${plur('file was', 'files were', count)} found, but did not match the filters:` + firstLinePostfix));
 				this.lineWriter.writeLine();
 				for (const {pattern} of this.selectionInsights.filter) {
 					this.lineWriter.writeLine(colors.error(`* ${pattern}`));
@@ -708,8 +714,7 @@ export default class Reporter {
 			&& this.stats.failedTests === 0
 			&& this.stats.passedTests > 0
 		) {
-			this.lineWriter.writeLine(colors.pass(`${this.stats.passedTests} ${plur('test', this.stats.passedTests)} passed`) + firstLinePostfix,
-			);
+			this.lineWriter.writeLine(colors.pass(`${this.stats.passedTests} ${plur('test', this.stats.passedTests)} passed`) + firstLinePostfix);
 			firstLinePostfix = '';
 		}
 

package/lib/runner.js

@@ -2,7 +2,7 @@ import process from 'node:process';
 import {pathToFileURL} from 'node:url';
 
 import Emittery from 'emittery';
-import {matcher} from 'matcher';
+import * as matcher from 'matcher';
 
 import ContextRef from './context-ref.js';
 import createChain from './create-chain.js';
@@ -13,6 +13,15 @@ import Runnable from './test.js';
 import {waitForReady} from './worker/state.cjs';
 
 const makeFileURL = file => file.startsWith('file://') ? file : pathToFileURL(file).toString();
+
+const isTitleMatch = (title, patterns) => {
+	if (patterns.length === 0) {
+		return true;
+	}
+
+	return matcher.isMatch(title, patterns);
+};
+
 export default class Runner extends Emittery {
 	constructor(options = {}) {
 		super();
@@ -22,10 +31,9 @@ export default class Runner extends Emittery {
 		this.failWithoutAssertions = options.failWithoutAssertions !== false;
 		this.file = options.file;
 		this.checkSelectedByLineNumbers = options.checkSelectedByLineNumbers;
-		this.match = options.match ?? [];
+		this.matchPatterns = options.match ?? [];
 		this.projectDir = options.projectDir;
 		this.recordNewSnapshots = options.recordNewSnapshots === true;
-		this.runOnlyExclusive = options.runOnlyExclusive === true;
 		this.serial = options.serial === true;
 		this.snapshotDir = options.snapshotDir;
 		this.updateSnapshots = options.updateSnapshots;
@@ -34,6 +42,7 @@ export default class Runner extends Emittery {
 		this.boundCompareTestSnapshot = this.compareTestSnapshot.bind(this);
 		this.boundSkipSnapshot = this.skipSnapshot.bind(this);
 		this.interrupted = false;
+		this.runOnlyExclusive = false;
 
 		this.nextTaskIndex = 0;
 		this.tasks = {
@@ -92,9 +101,7 @@ export default class Runner extends Emittery {
 
 			const {args, implementation, title} = parseTestArgs(testArgs);
 
-			if (this.checkSelectedByLineNumbers) {
-				metadata.selected = this.checkSelectedByLineNumbers();
-			}
+			metadata.selected &&= this.checkSelectedByLineNumbers?.() ?? true;
 
 			if (metadata.todo) {
 				if (implementation) {
@@ -110,10 +117,7 @@ export default class Runner extends Emittery {
 				}
 
 				// --match selects TODO tests.
-				if (this.match.length > 0 && matcher(title.value, this.match).length === 1) {
-					metadata.exclusive = true;
-					this.runOnlyExclusive = true;
-				}
+				metadata.selected &&= isTitleMatch(title.value, this.matchPatterns);
 
 				this.tasks.todo.push({title: title.value, metadata});
 				this.emit('stateChange', {
@@ -154,14 +158,10 @@ export default class Runner extends Emittery {
 				};
 
 				if (metadata.type === 'test') {
-					if (this.match.length > 0) {
-						// --match overrides .only()
-						task.metadata.exclusive = matcher(title.value, this.match).length === 1;
-					}
-
-					if (task.metadata.exclusive) {
-						this.runOnlyExclusive = true;
-					}
+					task.metadata.selected &&= isTitleMatch(title.value, this.matchPatterns);
+					// Unmatched .only() are not selected and won't run. However, runOnlyExclusive can only be true if no titles
+					// are being matched.
+					this.runOnlyExclusive ||= this.matchPatterns.length === 0 && task.metadata.exclusive && task.metadata.selected;
 
 					this.tasks[metadata.serial ? 'serial' : 'concurrent'].push(task);
 
@@ -181,6 +181,7 @@ export default class Runner extends Emittery {
 			serial: false,
 			exclusive: false,
 			skipped: false,
+			selected: true,
 			todo: false,
 			failing: false,
 			callback: false,
@@ -253,23 +254,21 @@ export default class Runner extends Emittery {
 		let waitForSerial = Promise.resolve();
 		await runnables.reduce((previous, runnable) => { // eslint-disable-line unicorn/no-array-reduce
 			if (runnable.metadata.serial || this.serial) {
-				waitForSerial = previous.then(() =>
+				waitForSerial = previous.then(() => // eslint-disable-line promise/prefer-await-to-then
 					// Serial runnables run as long as there was no previous failure, unless
 					// the runnable should always be run.
-					(allPassed || runnable.metadata.always) && runAndStoreResult(runnable),
-				);
+					(allPassed || runnable.metadata.always) && runAndStoreResult(runnable));
 				return waitForSerial;
 			}
 
 			return Promise.all([
 				previous,
-				waitForSerial.then(() =>
+				waitForSerial.then(() => // eslint-disable-line promise/prefer-await-to-then
 					// Concurrent runnables are kicked off after the previous serial
 					// runnables have completed, as long as there was no previous failure
 					// (or if the runnable should always be run). One concurrent runnable's
 					// failure does not prevent the next runnable from running.
-					(allPassed || runnable.metadata.always) && runAndStoreResult(runnable),
-				),
+					(allPassed || runnable.metadata.always) && runAndStoreResult(runnable)),
 			]);
 		}, waitForSerial);
 
@@ -378,7 +377,8 @@ export default class Runner extends Emittery {
 					{
 						titleSuffix: hookSuffix,
 						testPassed: testOk,
-					});
+					},
+				);
 			} else {
 				this.emit('stateChange', {
 					type: 'test-failed',
@@ -398,20 +398,16 @@ export default class Runner extends Emittery {
 			{
 				titleSuffix: hookSuffix,
 				testPassed: testOk,
-			});
+			},
+		);
 		return alwaysOk && hooksOk && testOk;
 	}
 
-	async start() { // eslint-disable-line complexity
+	async start() {
 		const concurrentTests = [];
 		const serialTests = [];
 		for (const task of this.tasks.serial) {
-			if (this.runOnlyExclusive && !task.metadata.exclusive) {
-				this.snapshots.skipBlock(task.title, task.metadata.taskIndex);
-				continue;
-			}
-
-			if (this.checkSelectedByLineNumbers && !task.metadata.selected) {
+			if (!task.metadata.selected || (this.runOnlyExclusive && !task.metadata.exclusive)) {
 				this.snapshots.skipBlock(task.title, task.metadata.taskIndex);
 				continue;
 			}
@@ -432,12 +428,7 @@ export default class Runner extends Emittery {
 		}
 
 		for (const task of this.tasks.concurrent) {
-			if (this.runOnlyExclusive && !task.metadata.exclusive) {
-				this.snapshots.skipBlock(task.title, task.metadata.taskIndex);
-				continue;
-			}
-
-			if (this.checkSelectedByLineNumbers && !task.metadata.selected) {
+			if (!task.metadata.selected || (this.runOnlyExclusive && !task.metadata.exclusive)) {
 				this.snapshots.skipBlock(task.title, task.metadata.taskIndex);
 				continue;
 			}
@@ -460,11 +451,7 @@ export default class Runner extends Emittery {
 		}
 
 		for (const task of this.tasks.todo) {
-			if (this.runOnlyExclusive && !task.metadata.exclusive) {
-				continue;
-			}
-
-			if (this.checkSelectedByLineNumbers && !task.metadata.selected) {
+			if (!task.metadata.selected || (this.runOnlyExclusive && !task.metadata.exclusive)) {
 				continue;
 			}
 

package/lib/snapshot-manager.js

@@ -160,26 +160,24 @@ class BufferBuilder {
 }
 
 function sortBlocks(blocksByTitle, blockIndices) {
-	return [...blocksByTitle].sort(
-		([aTitle], [bTitle]) => {
-			const a = blockIndices.get(aTitle);
-			const b = blockIndices.get(bTitle);
-
-			if (a === undefined) {
-				if (b === undefined) {
-					return 0;
-				}
-
-				return 1;
-			}
+	return [...blocksByTitle].sort(([aTitle], [bTitle]) => {
+		const a = blockIndices.get(aTitle);
+		const b = blockIndices.get(bTitle);
 
+		if (a === undefined) {
 			if (b === undefined) {
-				return -1;
+				return 0;
 			}
 
-			return a - b;
-		},
-	);
+			return 1;
+		}
+
+		if (b === undefined) {
+			return -1;
+		}
+
+		return a - b;
+	});
 }
 
 async function encodeSnapshots(snapshotData) {
@@ -368,9 +366,7 @@ class Manager {
 		}
 
 		const snapshots = {
-			blocks: sortBlocks(this.newBlocksByTitle, this.blockIndices).map(
-				([title, block]) => ({title, ...block}),
-			),
+			blocks: sortBlocks(this.newBlocksByTitle, this.blockIndices).map(([title, block]) => ({title, ...block})),
 		};
 
 		const buffer = await encodeSnapshots(snapshots);

package/lib/test.js

@@ -630,11 +630,13 @@ export default class Test {
 		if (this.metadata.failing) {
 			passed = !passed;
 
-			error = passed ? null : new AssertionError('Test was expected to fail, but succeeded, you should stop marking the test as failing', {
-				// TODO: Provide an assertion stack that traces to the test declaration,
-				// rather than AVA internals.
-				assertionStack: '',
-			});
+			error = passed
+				? null
+				: new AssertionError('Test was expected to fail, but succeeded, you should stop marking the test as failing', {
+					// TODO: Provide an assertion stack that traces to the test declaration,
+					// rather than AVA internals.
+					assertionStack: '',
+				});
 		}
 
 		return {

package/lib/watcher.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import nodePath from 'node:path';
 import process from 'node:process';
+import * as readline from 'node:readline/promises';
 import v8 from 'node:v8';
 
 import {nodeFileTrace} from '@vercel/nft';
@@ -9,6 +10,7 @@ import createDebug from 'debug';
 import {chalk} from './chalk.js';
 import {
 	applyTestFileFilter, classify, buildIgnoreMatcher, findTests,
+	normalizePattern,
 } from './globs.js';
 import {levels as providerLevels} from './provider-manager.js';
 
@@ -18,8 +20,6 @@ const debug = createDebug('ava:watcher');
 // to make Node.js write out interim reports in various places.
 const takeCoverageForSelfTests = process.env.TEST_AVA ? v8.takeCoverage : undefined;
 
-const END_MESSAGE = chalk.gray('Type `r` and press enter to rerun tests\nType `u` and press enter to update snapshots\n');
-
 export function available(projectDir) {
 	try {
 		fs.watch(projectDir, {persistent: false, recursive: true, signal: AbortSignal.abort()});
@@ -34,18 +34,156 @@ export function available(projectDir) {
 	return true;
 }
 
+const cancel = Symbol('cancel');
+const close = Symbol('close');
+
+const promiseWithResolvers = Promise.withResolvers?.bind(Promise) ?? (() => {
+	let resolve;
+	let reject;
+	const promise = new Promise((_resolve, _reject) => {
+		resolve = _resolve;
+		reject = _reject;
+	});
+	return {promise, resolve, reject};
+});
+
+async function * readLines(stream) {
+	const rl = readline.createInterface({input: stream, output: process.stdout});
+	let promise;
+	let resolve;
+	let values = [];
+	rl.addListener('close', () => {
+		values.push(close);
+		resolve?.();
+	});
+	rl.addListener('SIGINT', () => {
+		values.push(cancel);
+		resolve?.();
+	});
+	rl.addListener('line', line => {
+		values.push(line.trim());
+		resolve?.();
+	});
+
+	while (true) {
+		yield * values;
+		values = [];
+		await promise; // eslint-disable-line no-await-in-loop
+		// Immediately create a new promise to wait for the next line.
+		({promise, resolve} = promiseWithResolvers());
+	}
+}
+
+const eachLine = async (lineReader, callback) => {
+	for await (const line of lineReader) {
+		await callback(line);
+	}
+};
+
+const writeCommandInstructions = (reporter, interactiveGlobPattern, interactiveMatchPattern) => {
+	reporter.lineWriter.writeLine(chalk.gray('Type `g` followed by enter to filter test files by a glob pattern'));
+	reporter.lineWriter.writeLine(chalk.gray('Type `m` followed by enter to filter tests by their title (similar to --match)'));
+	if (interactiveGlobPattern || interactiveMatchPattern) {
+		reporter.lineWriter.writeLine(chalk.gray('Type `a` followed by enter to rerun all tests (while preserving filters)'));
+		reporter.lineWriter.writeLine(chalk.gray('Type `r` followed by enter to rerun tests that match your filters'));
+	} else {
+		reporter.lineWriter.writeLine(chalk.gray('Type `r` followed by enter to rerun tests'));
+	}
+
+	reporter.lineWriter.writeLine(chalk.gray('Type `u` followed by enter to update snapshots in selected tests'));
+
+	if (interactiveGlobPattern || interactiveMatchPattern) {
+		reporter.lineWriter.writeLine();
+
+		if (interactiveGlobPattern) {
+			reporter.lineWriter.writeLine(chalk.gray(`Current test file glob pattern: ${chalk.italic(interactiveGlobPattern)}`));
+		}
+
+		if (interactiveMatchPattern) {
+			reporter.lineWriter.writeLine(chalk.gray(`Current test title match pattern: ${chalk.italic(interactiveMatchPattern)}`));
+		}
+	}
+
+	reporter.lineWriter.writeLine();
+	reporter.lineWriter.write('> ');
+};
+
+const promptForGlobPattern = async (reporter, lineReader, currentPattern, projectDir) => {
+	reporter.lineWriter.ensureEmptyLine();
+	reporter.lineWriter.writeLine('Type the glob pattern then press enter. Leave blank to clear.', false);
+	if (currentPattern === undefined) {
+		reporter.lineWriter.writeLine();
+		reporter.lineWriter.writeLine(chalk.italic('Tip: Start with `**/` to select files in any directory.'), false);
+		reporter.lineWriter.writeLine(chalk.italic('Tip: Start with `!` to exclude files.'), false);
+	} else {
+		reporter.lineWriter.writeLine();
+		reporter.lineWriter.writeLine(`Current glob pattern is: ${chalk.italic(currentPattern)}`, false);
+		reporter.lineWriter.writeLine();
+		reporter.lineWriter.writeLine(chalk.italic('Tip: Ctrl+C to exit without any changes.'), false);
+	}
+
+	reporter.lineWriter.write('> ');
+
+	const {value} = await lineReader.next();
+	if (value === close || value === cancel) {
+		return value;
+	}
+
+	if (value === '') {
+		return undefined;
+	}
+
+	return normalizePattern(nodePath.relative(projectDir, nodePath.resolve(process.cwd(), value)));
+};
+
+const promptForMatchPattern = async (reporter, lineReader, currentPattern) => {
+	reporter.lineWriter.writeLine();
+	reporter.lineWriter.writeLine('Type the match pattern then press enter. Leave blank to clear.', false);
+	if (currentPattern === undefined) {
+		reporter.lineWriter.writeLine();
+		reporter.lineWriter.writeLine(chalk.italic('Tip: Start with `*` to match suffixes'), false);
+		reporter.lineWriter.writeLine(chalk.italic('Tip: End with `*` to match prefixes.'), false);
+		reporter.lineWriter.writeLine(chalk.italic('Tip: Start with `!` to exclude titles.'), false);
+	} else {
+		reporter.lineWriter.writeLine();
+		reporter.lineWriter.writeLine(`Current match pattern is: ${chalk.italic(currentPattern)}`, false);
+		reporter.lineWriter.writeLine();
+		reporter.lineWriter.writeLine(chalk.italic('Tip: Ctrl+C to exit without any changes.'), false);
+	}
+
+	reporter.lineWriter.write('> ');
+
+	const {value} = await lineReader.next();
+	return value === '' ? undefined : value;
+};
+
 export async function start({api, filter, globs, projectDir, providers, reporter, stdin, signal}) {
 	providers = providers.filter(({level}) => level >= providerLevels.ava6);
-	for await (const {files, ...runtimeOptions} of plan({
-		api, filter, globs, projectDir, providers, stdin, abortSignal: signal,
+	for await (const {files, testFileSelector, ...runtimeOptions} of plan({
+		api,
+		filter,
+		globs,
+		projectDir,
+		providers,
+		stdin,
+		abortSignal: signal,
+		reporter,
 	})) {
-		await api.run({files, filter, runtimeOptions});
+		await api.run({files, testFileSelector, runtimeOptions});
 		reporter.endRun();
-		reporter.lineWriter.writeLine(END_MESSAGE);
 	}
 }
 
-async function * plan({api, filter, globs, projectDir, providers, stdin, abortSignal}) {
+async function * plan({
+	api,
+	filter,
+	globs,
+	projectDir,
+	providers,
+	stdin,
+	abortSignal,
+	reporter,
+}) {
 	const fileTracer = new FileTracer({base: projectDir});
 	const isIgnored = buildIgnoreMatcher(globs);
 	const patternFilters = filter.map(({pattern}) => pattern);
@@ -79,11 +217,19 @@ async function * plan({api, filter, globs, projectDir, providers, stdin, abortSi
 	}))));
 
 	// State tracked for test runs.
-	const filesWithExclusiveTests = new Set();
 	const touchedFiles = new Set();
 	const temporaryFiles = new Set();
 	const failureCounts = new Map();
 
+	const countPreviousFailures = () => {
+		let previousFailures = 0;
+		for (const count of failureCounts.values()) {
+			previousFailures += count;
+		}
+
+		return previousFailures;
+	};
+
 	// Observe all test runs.
 	api.on('run', ({status}) => {
 		status.on('stateChange', evt => {
@@ -117,17 +263,6 @@ async function * plan({api, filter, globs, projectDir, providers, stdin, abortSi
 					break;
 				}
 
-				case 'worker-finished': {
-					const fileStats = status.stats.byFile.get(evt.testFile);
-					if (fileStats.selectedTests > 0 && fileStats.declaredTests > fileStats.selectedTests) {
-						filesWithExclusiveTests.add(nodePath.relative(projectDir, evt.testFile));
-					} else {
-						filesWithExclusiveTests.delete(nodePath.relative(projectDir, evt.testFile));
-					}
-
-					break;
-				}
-
 				default: {
 					break;
 				}
@@ -151,21 +286,124 @@ async function * plan({api, filter, globs, projectDir, providers, stdin, abortSi
 		updateSnapshots = false;
 	};
 
-	// Support interactive commands.
-	stdin.setEncoding('utf8');
-	stdin.on('data', data => {
-		data = data.trim().toLowerCase();
-		runAll ||= data === 'r';
-		updateSnapshots ||= data === 'u';
-		if (runAll || updateSnapshots) {
-			signalChanged({});
+	// Interactive filters.
+	let interactiveGlobPattern;
+	let interactiveMatchPattern;
+	const testFileSelector = (allTestFiles, selectedFiles = [], skipInteractive = runAll) => {
+		if (selectedFiles.length === 0) {
+			selectedFiles = allTestFiles;
 		}
-	});
+
+		if (patternFilters.length > 0) {
+			selectedFiles = applyTestFileFilter({
+				cwd: projectDir,
+				filter: patternFilters,
+				testFiles: selectedFiles,
+				treatFilterPatternsAsFiles: runAll, // This option is additive, so only select individual files on full runs.
+			});
+			selectedFiles.appliedFilters = filter; // `filter` is the original input.
+		}
+
+		if (!skipInteractive && interactiveGlobPattern !== undefined) {
+			const {appliedFilters = [], ignoredFilterPatternFiles} = selectedFiles;
+			selectedFiles = applyTestFileFilter({
+				cwd: projectDir,
+				filter: [interactiveGlobPattern],
+				testFiles: selectedFiles,
+				treatFilterPatternsAsFiles: false,
+			});
+			selectedFiles.appliedFilters = [...appliedFilters, {pattern: interactiveGlobPattern}];
+			selectedFiles.ignoredFilterPatternFiles = ignoredFilterPatternFiles;
+		}
+
+		// Remove previous failures for tests that will run again.
+		for (const file of selectedFiles) {
+			const path = nodePath.relative(projectDir, file);
+			failureCounts.delete(path);
+		}
+
+		return selectedFiles;
+	};
+
+	const lineReader = readLines(stdin);
+
+	// Don't let the reader keep the process alive.
 	stdin.unref();
 
-	// Whether tests are currently running. Used to control when the next run
-	// is prepared.
-	let testsAreRunning = false;
+	// Handle commands.
+	eachLine(lineReader, async line => {
+		if (line === cancel || line === close) {
+			process.exit(); // eslint-disable-line unicorn/no-process-exit
+		}
+
+		switch (line.toLowerCase()) {
+			case 'r': {
+				signalChanged();
+				break;
+			}
+
+			case 'u': {
+				updateSnapshots = true;
+				signalChanged();
+				break;
+			}
+
+			case 'a': {
+				runAll = true;
+				signalChanged();
+				break;
+			}
+
+			case 'g': {
+				respondToChanges = false;
+				const oldGlobPattern = interactiveGlobPattern;
+				const promptValue = await promptForGlobPattern(reporter, lineReader, interactiveGlobPattern, projectDir);
+				respondToChanges = true;
+				reporter.lineWriter.writeLine();
+				if (promptValue === close) {
+					process.exit(); // eslint-disable-line unicorn/no-process-exit
+				}
+
+				if (promptValue === cancel || (promptValue === oldGlobPattern)) {
+					signalChanged();
+					break;
+				}
+
+				interactiveGlobPattern = promptValue;
+				signalChanged();
+
+				break;
+			}
+
+			case 'm': {
+				respondToChanges = false;
+				const oldMatchPattern = interactiveMatchPattern;
+				const promptValue = await promptForMatchPattern(reporter, lineReader, interactiveMatchPattern);
+				respondToChanges = true;
+				reporter.lineWriter.writeLine();
+				if (promptValue === close) {
+					process.exit(); // eslint-disable-line unicorn/no-process-exit
+				}
+
+				if (promptValue === cancel || (promptValue === oldMatchPattern)) {
+					signalChanged();
+					break;
+				}
+
+				interactiveMatchPattern = promptValue;
+				signalChanged();
+
+				break;
+			}
+
+			default: {
+				break;
+			}
+		}
+	});
+
+	// Whether to respond to file system changes. Used to control when the next run is prepared.
+	let respondToChanges = true;
 
 	// Tracks file paths we know have changed since the previous test run.
 	const dirtyPaths = new Set();
@@ -177,9 +415,9 @@ async function * plan({api, filter, globs, projectDir, providers, stdin, abortSi
 			return;
 		}
 
-		// Equally, if tests are currently running, then keep accumulating changes.
-		// The timer is refreshed after tests finish running.
-		if (testsAreRunning) {
+		// Equally, if tests are currently running, or the user is being prompted, then keep accumulating changes.
+		// The timer is refreshed when we're ready to resume.
+		if (!respondToChanges) {
 			takeCoverageForSelfTests?.();
 			return;
 		}
@@ -327,42 +565,12 @@ async function * plan({api, filter, globs, projectDir, providers, stdin, abortSi
 			fileTracer.update(changes);
 		}
 
-		// Select the test files to run, and how to run them.
-		let testFiles = [...uniqueTestFiles];
-		let runOnlyExclusive = false;
-
-		if (testFiles.length > 0) {
-			const exclusiveFiles = testFiles.filter(path => filesWithExclusiveTests.has(path));
-			runOnlyExclusive = exclusiveFiles.length !== filesWithExclusiveTests.size;
-			if (runOnlyExclusive) {
-				// The test files that previously contained exclusive tests are always
-				// run, together with the test files.
-				debug('Running exclusive tests in %o', [...filesWithExclusiveTests]);
-				testFiles = [...new Set([...filesWithExclusiveTests, ...testFiles])];
-			}
-		}
-
-		if (filter.length > 0) {
-			testFiles = applyTestFileFilter({
-				cwd: projectDir,
-				expandDirectories: false,
-				filter: patternFilters,
-				testFiles,
-				treatFilterPatternsAsFiles: false,
-			});
-		}
-
 		if (nonTestFiles.length > 0) {
 			debug('Non-test files changed, running all tests');
 			failureCounts.clear(); // All tests are run, so clear previous failures.
-			signalChanged({runOnlyExclusive});
-		} else if (testFiles.length > 0) {
-			// Remove previous failures for tests that will run again.
-			for (const path of testFiles) {
-				failureCounts.delete(path);
-			}
-
-			signalChanged({runOnlyExclusive, testFiles});
+			signalChanged();
+		} else if (uniqueTestFiles.size > 0) {
+			signalChanged({testFiles: [...uniqueTestFiles]});
 		}
 
 		takeCoverageForSelfTests?.();
@@ -378,34 +586,61 @@ async function * plan({api, filter, globs, projectDir, providers, stdin, abortSi
 	});
 
 	abortSignal?.addEventListener('abort', () => {
-		signalChanged?.({});
+		signalChanged?.();
 	});
 
 	// And finally, the watch loop.
 	while (abortSignal?.aborted !== true) {
-		const {testFiles: files = [], runOnlyExclusive = false} = await changed; // eslint-disable-line no-await-in-loop
+		const {testFiles = []} = (await changed) ?? {}; // eslint-disable-line no-await-in-loop
 
 		if (abortSignal?.aborted) {
 			break;
 		}
 
-		let previousFailures = 0;
-		for (const count of failureCounts.values()) {
-			previousFailures += count;
+		// Values are changed by refresh() so copy them now.
+		const instructFirstRun = firstRun;
+		const skipInteractive = runAll;
+		const instructUpdateSnapshots = updateSnapshots;
+		reset(); // Make sure the next run can be triggered.
+
+		let files = testFiles.map(file => nodePath.join(projectDir, file));
+		let instructTestFileSelector = testFileSelector;
+		if (files.length > 0) {
+			files = testFileSelector(files, [], skipInteractive);
+			if (files.length === 0) {
+				debug('Filters rejected all test files');
+				continue;
+			}
+
+			// Make a no-op for the API to avoid filtering `files` again.
+			instructTestFileSelector = () => files;
+		} else if (skipInteractive) {
+			instructTestFileSelector = (allTestFiles, selectedFiles = []) => testFileSelector(allTestFiles, selectedFiles, true);
+		}
+
+		// Clear any prompt.
+		if (!reporter.lineWriter.lastLineIsEmpty && reporter.reportStream.isTTY) {
+			reporter.reportStream.clearLine(0);
+			reporter.lineWriter.writeLine();
 		}
 
-		const instructions = {
-			files: files.map(file => nodePath.join(projectDir, file)),
-			firstRun, // Value is changed by refresh() so record now.
-			previousFailures,
-			runOnlyExclusive,
-			updateSnapshots, // Value is changed by refresh() so record now.
+		// Let the tests run.
+		respondToChanges = false;
+		yield {
+			countPreviousFailures,
+			files,
+			firstRun: instructFirstRun,
+			testFileSelector: instructTestFileSelector,
+			updateSnapshots: instructUpdateSnapshots,
+			interactiveMatchPattern: skipInteractive ? undefined : interactiveMatchPattern,
 		};
-		reset(); // Make sure the next run can be triggered.
-		testsAreRunning = true;
-		yield instructions; // Let the tests run.
-		testsAreRunning = false;
-		debounce.refresh(); // Trigger the callback, which if there were changes will run the tests again.
+		respondToChanges = true;
+
+		// Write command instructions after the tests have run and been reported.
+		writeCommandInstructions(reporter, interactiveGlobPattern, interactiveMatchPattern);
+
+		// Trigger the callback, which if there were changes will run the tests again.
+		debounce.refresh();
 	}
 }
 

package/lib/worker/base.js

@@ -81,7 +81,6 @@ const run = async options => {
 		match: options.match,
 		projectDir: options.projectDir,
 		recordNewSnapshots: options.recordNewSnapshots,
-		runOnlyExclusive: options.runOnlyExclusive,
 		serial: options.serial,
 		snapshotDir: options.snapshotDir,
 		updateSnapshots: options.updateSnapshots,
@@ -121,6 +120,15 @@ const run = async options => {
 			return;
 		}
 
+		channel.send({type: 'worker-finished'});
+
+		// Reference the channel until the worker is freed. This should prevent Node.js from terminating the child process
+		// prematurely, which has been witnessed on Windows. See discussion at
+		// <https://github.com/avajs/ava/issues/3390#issuecomment-3056119361>.
+		channel.ref();
+		await channel.workerFreed;
+		channel.unref();
+
 		nowAndTimers.setImmediate(() => {
 			const unhandled = currentlyUnhandled();
 			if (unhandled.length === 0) {

package/lib/worker/channel.cjs

@@ -107,7 +107,9 @@ 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);
 
 let channelCounter = 0;

package/lib/worker/main.cjs

@@ -1,5 +1,5 @@
 'use strict';
-require('./guard-environment.cjs'); // eslint-disable-line import/no-unassigned-import
+require('./guard-environment.cjs'); // eslint-disable-line import-x/no-unassigned-import
 
 const assert = require('node:assert');
 

package/lib/worker/plugin.cjs

@@ -4,7 +4,7 @@ const {registerSharedWorker: register} = require('./channel.cjs');
 const options = require('./options.cjs');
 const {sharedWorkerTeardowns, waitForReady} = require('./state.cjs');
 
-require('./guard-environment.cjs'); // eslint-disable-line import/no-unassigned-import
+require('./guard-environment.cjs'); // eslint-disable-line import-x/no-unassigned-import
 
 const workers = new Map();
 const workerTeardownFns = new WeakMap();

package/package.json

@@ -1,9 +1,12 @@
 {
 	"name": "ava",
-	"version": "6.3.0",
+	"version": "6.4.1",
 	"description": "Node.js test runner that lets you develop with confidence.",
 	"license": "MIT",
-	"repository": "avajs/ava",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/avajs/ava.git"
+	},
 	"homepage": "https://avajs.dev",
 	"bin": {
 		"ava": "entrypoints/cli.mjs"
@@ -36,7 +39,7 @@
 	},
 	"type": "module",
 	"engines": {
-		"node": "^18.18 || ^20.8 || ^22 || >=23"
+		"node": "^18.18 || ^20.8 || ^22 || ^23 || >=24"
 	},
 	"scripts": {
 		"test": "./scripts/test.sh"
@@ -83,25 +86,25 @@
 		"typescript"
 	],
 	"dependencies": {
-		"@vercel/nft": "^0.29.2",
-		"acorn": "^8.14.1",
+		"@vercel/nft": "^0.29.4",
+		"acorn": "^8.15.0",
 		"acorn-walk": "^8.3.4",
 		"ansi-styles": "^6.2.1",
 		"arrgv": "^1.0.2",
 		"arrify": "^3.0.0",
 		"callsites": "^4.2.0",
-		"cbor": "^10.0.3",
+		"cbor": "^10.0.9",
 		"chalk": "^5.4.1",
 		"chunkd": "^2.0.1",
-		"ci-info": "^4.2.0",
+		"ci-info": "^4.3.0",
 		"ci-parallel-vars": "^1.0.1",
 		"cli-truncate": "^4.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.0",
-		"emittery": "^1.1.0",
+		"debug": "^4.4.1",
+		"emittery": "^1.2.0",
 		"figures": "^6.1.0",
 		"globby": "^14.1.0",
 		"ignore-by-default": "^2.1.0",
@@ -126,19 +129,19 @@
 	},
 	"devDependencies": {
 		"@ava/test": "github:avajs/test",
-		"@ava/typescript": "^5.0.0",
+		"@ava/typescript": "^6.0.0",
 		"@sindresorhus/tsconfig": "^5.1.1",
-		"@types/node": "^22.14.1",
+		"@types/node": "^22.16.3",
 		"ansi-escapes": "^7.0.0",
 		"c8": "^10.1.3",
-		"execa": "^9.5.2",
-		"expect": "^29.7.0",
-		"sinon": "^20.0.0",
+		"execa": "^9.6.0",
+		"expect": "^30.0.4",
+		"sinon": "^21.0.0",
 		"tap": "^21.1.0",
 		"tempy": "^3.1.0",
 		"tsd": "^0.32.0",
 		"typescript": "~5.8.3",
-		"xo": "^0.60.0",
+		"xo": "^1.1.1",
 		"zen-observable": "^0.10.0"
 	},
 	"peerDependencies": {
@@ -150,7 +153,7 @@
 		}
 	},
 	"volta": {
-		"node": "22.14.0",
-		"npm": "11.3.0"
+		"node": "22.16.0",
+		"npm": "11.4.1"
 	}
 }

package/types/assertions.d.cts

@@ -143,7 +143,7 @@ export type Assertions = {
 	truthy: TruthyAssertion;
 };
 
-type FalsyValue = false | 0 | 0n | '' | null | undefined; // eslint-disable-line @typescript-eslint/ban-types
+type FalsyValue = false | 0 | 0n | '' | undefined;
 type Falsy<T> = T extends Exclude<T, FalsyValue> ? (T extends number | string | bigint ? T & FalsyValue : never) : T;
 
 export type AssertAssertion = {

package/types/shared-worker.d.cts

@@ -2,7 +2,7 @@ export namespace SharedWorker {
 	export type ProtocolIdentifier = 'ava-4';
 
 	export type FactoryOptions = {
-		negotiateProtocol <Data = unknown>(supported: readonly ['ava-4']): Protocol<Data>;
+		negotiateProtocol<Data = unknown>(supported: readonly ['ava-4']): Protocol<Data>;
 		// Add overloads for additional protocols.
 	};