ava 5.3.1 → 6.0.1

package/entrypoints/internal.d.mts

@@ -0,0 +1,7 @@
+import type {StateChangeEvent} from '../types/state-change-events.d';
+
+export type Event = StateChangeEvent;
+
+export type ObservedRun = {
+	events: AsyncIterableIterator<Event>;
+};

package/lib/api-event-iterator.js

@@ -0,0 +1,12 @@
+export async function * asyncEventIteratorFromApi(api) {
+	// TODO: support multiple runs (watch mode)
+	const {value: plan} = await api.events('run').next();
+
+	for await (const stateChange of plan.status.events('stateChange')) {
+		yield stateChange;
+
+		if (stateChange.type === 'end' || stateChange.type === 'interrupt') {
+			break;
+		}
+	}
+}

package/lib/api.js

@@ -9,7 +9,6 @@ import commonPathPrefix from 'common-path-prefix';
 import Emittery from 'emittery';
 import ms from 'ms';
 import pMap from 'p-map';
-import resolveCwd from 'resolve-cwd';
 import tempDir from 'temp-dir';
 
 import fork from './fork.js';
@@ -22,15 +21,13 @@ import RunStatus from './run-status.js';
 import scheduler from './scheduler.js';
 import serializeError from './serialize-error.js';
 
-function resolveModules(modules) {
-	return arrify(modules).map(name => {
-		const modulePath = resolveCwd.silent(name);
-
-		if (modulePath === undefined) {
-			throw new Error(`Could not resolve required module ’${name}’`);
+function normalizeRequireOption(require) {
+	return arrify(require).map(name => {
+		if (typeof name === 'string') {
+			return arrify(name);
 		}
 
-		return modulePath;
+		return name;
 	});
 }
 
@@ -81,7 +78,7 @@ export default class Api extends Emittery {
 		super();
 
 		this.options = {match: [], moduleTypes: {}, ...options};
-		this.options.require = resolveModules(this.options.require);
+		this.options.require = normalizeRequireOption(this.options.require);
 
 		this._cacheDir = null;
 		this._interruptHandler = () => {};
@@ -167,7 +164,7 @@ export default class Api extends Emittery {
 
 		const selectionInsights = {
 			filter,
-			ignoredFilterPatternFiles: selectedFiles.ignoredFilterPatternFiles || [],
+			ignoredFilterPatternFiles: selectedFiles.ignoredFilterPatternFiles ?? [],
 			testFileCount: testFiles.length,
 			selectionCount: selectedFiles.length,
 		};
@@ -179,7 +176,7 @@ export default class Api extends Emittery {
 
 				// The files must be in the same order across all runs, so sort them.
 				const defaultComparator = (a, b) => a.localeCompare(b, [], {numeric: true});
-				selectedFiles = selectedFiles.sort(this.options.sortTestFiles || defaultComparator);
+				selectedFiles = selectedFiles.sort(this.options.sortTestFiles ?? defaultComparator);
 				selectedFiles = chunkd(selectedFiles, currentIndex, totalRuns);
 
 				const currentFileCount = selectedFiles.length;
@@ -200,15 +197,14 @@ export default class Api extends Emittery {
 
 			await this.emit('run', {
 				bailWithoutReporting: debugWithoutSpecificFile,
-				clearLogOnNextRun: runtimeOptions.clearLogOnNextRun === true,
 				debug: Boolean(this.options.debug),
 				failFastEnabled: failFast,
 				filePathPrefix: getFilePathPrefix(selectedFiles),
 				files: selectedFiles,
 				matching: apiOptions.match.length > 0,
-				previousFailures: runtimeOptions.previousFailures || 0,
+				previousFailures: runtimeOptions.previousFailures ?? 0,
 				runOnlyExclusive: runtimeOptions.runOnlyExclusive === true,
-				runVector: runtimeOptions.runVector || 0,
+				firstRun: runtimeOptions.firstRun ?? true,
 				status: runStatus,
 			});
 
@@ -306,19 +302,14 @@ export default class Api extends Emittery {
 
 			// Allow shared workers to clean up before the run ends.
 			await Promise.all(deregisteredSharedWorkers);
-			scheduler.storeFailedTestFiles(runStatus, this.options.cacheEnabled === false ? null : this._createCacheDir());
+			const files = scheduler.storeFailedTestFiles(runStatus, this.options.cacheEnabled === false ? null : this._createCacheDir());
+			runStatus.emitStateChange({type: 'touched-files', files});
 		} catch (error) {
-			if (error && error.name === 'AggregateError') {
-				for (const error_ of error.errors) {
-					runStatus.emitStateChange({type: 'internal-error', err: serializeError('Internal error', false, error_)});
-				}
-			} else {
-				runStatus.emitStateChange({type: 'internal-error', err: serializeError('Internal error', false, error)});
-			}
+			runStatus.emitStateChange({type: 'internal-error', err: serializeError(error)});
 		}
 
 		timeoutTrigger.discard();
-		return runStatus;
+		return runStatus.end();
 	}
 
 	_getLocalCacheDir() {