ava 5.1.0 → 5.1.1

package/entrypoints/eslint-plugin-helper.cjs

@@ -1,8 +1,8 @@
 'use strict';
-const path = require('path');
-const url = require('url');
-const v8 = require('v8');
-const {Worker} = require('worker_threads');
+const path = require('node:path');
+const url = require('node:url');
+const v8 = require('node:v8');
+const {Worker} = require('node:worker_threads');
 
 const {
 	classify,

package/lib/assert.js

@@ -50,7 +50,7 @@ export class AssertionError extends Error {
 		// use the values for custom diff views
 		this.raw = options.raw;
 
-		this.savedError = options.savedError ? options.savedError : getErrorWithLongStackTrace();
+		this.savedError = options.savedError || getErrorWithLongStackTrace();
 	}
 }
 
@@ -143,14 +143,17 @@ function validateExpectations(assertion, expectations, numberArgs) { // eslint-d
 				case 'is':
 				case 'message':
 				case 'name':
-				case 'code':
+				case 'code': {
 					continue;
-				default:
+				}
+
+				default: {
 					throw new AssertionError({
 						assertion,
 						message: `The second argument to \`t.${assertion}()\` contains unexpected properties`,
 						values: [formatWithLabel('Called with:', expectations)],
 					});
+				}
 			}
 		}
 	}

package/lib/eslint-plugin-helper-worker.js

@@ -33,7 +33,7 @@ const buildGlobs = ({conf, providers, projectDir, overrideExtensions, overrideFi
 		cwd: projectDir,
 		...normalizeGlobs({
 			extensions,
-			files: overrideFiles ? overrideFiles : conf.files,
+			files: overrideFiles || conf.files,
 			providers,
 		}),
 	};
@@ -69,5 +69,5 @@ const handleMessage = async ({projectDir, overrideExtensions, overrideFiles}) =>
 };
 
 parentPort.on('message', handleMessage);
-handleMessage(workerData.firstMessage);
+handleMessage(workerData.firstMessage); // eslint-disable-line unicorn/prefer-top-level-await
 delete workerData.firstMessage;

package/lib/fork.js

@@ -109,9 +109,11 @@ export default function loadFork(file, options, execArgv = process.execArgv) {
 			}
 
 			switch (message.ava.type) {
-				case 'ready-for-options':
+				case 'ready-for-options': {
 					send({type: 'options', options});
 					break;
+				}
+
 				case 'shared-worker-connect': {
 					const {channelId, filename, initialData, port} = message.ava;
 					emitter.emit('connectSharedWorker', {
@@ -125,11 +127,14 @@ export default function loadFork(file, options, execArgv = process.execArgv) {
 					break;
 				}
 
-				case 'ping':
+				case 'ping': {
 					send({type: 'pong'});
 					break;
-				default:
+				}
+
+				default: {
 					emitStateChange(message.ava);
+				}
 			}
 		});
 

package/lib/glob-helpers.cjs

@@ -1,6 +1,6 @@
 'use strict';
-const path = require('path');
-const process = require('process');
+const path = require('node:path');
+const process = require('node:process');
 
 const ignoreByDefault = require('ignore-by-default');
 const picomatch = require('picomatch');

package/lib/module-types.js

@@ -6,21 +6,28 @@ const requireTrueValue = value => {
 
 const normalize = (extension, type, defaultModuleType) => {
 	switch (extension) {
-		case 'cjs':
+		case 'cjs': {
 			requireTrueValue(type);
 			return 'commonjs';
-		case 'mjs':
+		}
+
+		case 'mjs': {
 			requireTrueValue(type);
 			return 'module';
-		case 'js':
+		}
+
+		case 'js': {
 			requireTrueValue(type);
 			return defaultModuleType;
-		default:
+		}
+
+		default: {
 			if (type !== 'commonjs' && type !== 'module') {
 				throw new TypeError(`Module type for ’${extension}’ must be ’commonjs’ or ’module’`);
 			}
 
 			return type;
+		}
 	}
 };
 
@@ -37,17 +44,24 @@ const deriveFromArray = (extensions, defaultModuleType) => {
 	const moduleTypes = {};
 	for (const extension of extensions) {
 		switch (extension) {
-			case 'cjs':
+			case 'cjs': {
 				moduleTypes.cjs = 'commonjs';
 				break;
-			case 'mjs':
+			}
+
+			case 'mjs': {
 				moduleTypes.mjs = 'module';
 				break;
-			case 'js':
+			}
+
+			case 'js': {
 				moduleTypes.js = defaultModuleType;
 				break;
-			default:
+			}
+
+			default: {
 				moduleTypes[extension] = 'commonjs';
+			}
 		}
 	}
 

package/lib/now-and-timers.cjs

@@ -1,5 +1,5 @@
 'use strict';
-const timers = require('timers');
+const timers = require('node:timers');
 
 Object.assign(exports, timers);
 exports.now = Date.now;

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

@@ -166,7 +166,8 @@ let signalAvailable = () => {
 };
 
 let fatal;
-loadFactory(workerData.filename).then(factory => {
+try {
+	const factory = await loadFactory(workerData.filename);
 	if (typeof factory !== 'function') {
 		throw new TypeError(`Missing default factory function export for shared worker plugin at ${workerData.filename}`);
 	}
@@ -236,14 +237,12 @@ loadFactory(workerData.filename).then(factory => {
 			};
 		},
 	});
-}).catch(error => {
-	if (fatal === undefined) {
-		fatal = error;
-	}
-}).finally(() => {
+} catch (error) {
+	fatal = fatal ?? error;
+} finally {
 	if (fatal !== undefined) {
 		process.nextTick(() => {
 			throw fatal;
 		});
 	}
-});
+}

package/lib/plugin-support/shared-workers.js

@@ -49,35 +49,54 @@ function launchWorker(filename, initialData) {
 }
 
 export async function observeWorkerProcess(fork, runStatus) {
-	let registrationCount = 0;
-	let signalDeregistered;
-	const deregistered = new Promise(resolve => {
-		signalDeregistered = resolve;
+	let signalDone;
+
+	const done = new Promise(resolve => {
+		signalDone = () => {
+			resolve();
+		};
 	});
 
-	fork.promise.finally(() => {
-		if (registrationCount === 0) {
-			signalDeregistered();
+	const activeInstances = new Set();
+
+	const removeInstance = instance => {
+		instance.worker.unref();
+		activeInstances.delete(instance);
+
+		if (activeInstances.size === 0) {
+			signalDone();
+		}
+	};
+
+	const removeAllInstances = () => {
+		if (activeInstances.size === 0) {
+			signalDone();
+			return;
 		}
+
+		for (const instance of activeInstances) {
+			removeInstance(instance);
+		}
+	};
+
+	fork.promise.finally(() => {
+		removeAllInstances();
 	});
 
 	fork.onConnectSharedWorker(async ({filename, initialData, port, signalError}) => {
 		const launched = launchWorker(filename, initialData);
+		activeInstances.add(launched);
 
 		const handleWorkerMessage = async message => {
 			if (message.type === 'deregistered-test-worker' && message.id === fork.threadId) {
 				launched.worker.off('message', handleWorkerMessage);
-
-				registrationCount--;
-				if (registrationCount === 0) {
-					signalDeregistered();
-				}
+				removeInstance(launched);
 			}
 		};
 
 		launched.statePromises.error.then(error => {
-			signalDeregistered();
 			launched.worker.off('message', handleWorkerMessage);
+			removeAllInstances();
 			runStatus.emitStateChange({type: 'shared-worker-error', err: serializeError('Shared worker error', true, error)});
 			signalError();
 		});
@@ -85,8 +104,6 @@ export async function observeWorkerProcess(fork, runStatus) {
 		try {
 			await launched.statePromises.available;
 
-			registrationCount++;
-
 			port.postMessage({type: 'ready'});
 
 			launched.worker.postMessage({
@@ -104,15 +121,8 @@ export async function observeWorkerProcess(fork, runStatus) {
 			});
 
 			launched.worker.on('message', handleWorkerMessage);
-		} catch {
-			return;
-		} finally {
-			// Attaching listeners has the side-effect of referencing the worker.
-			// Explicitly unreference it now so it does not prevent the main process
-			// from exiting.
-			launched.worker.unref();
-		}
+		} catch {}
 	});
 
-	return deregistered;
+	return done;
 }

package/lib/reporters/tap.js

@@ -153,26 +153,38 @@ export default class TapReporter {
 		const fileStats = this.stats && evt.testFile ? this.stats.byFile.get(evt.testFile) : null;
 
 		switch (evt.type) {
-			case 'declared-test':
+			case 'declared-test': {
 				// Ignore
 				break;
-			case 'hook-failed':
+			}
+
+			case 'hook-failed': {
 				this.writeTest(evt, {passed: false, todo: false, skip: false});
 				break;
-			case 'hook-finished':
+			}
+
+			case 'hook-finished': {
 				this.writeComment(evt, {});
 				break;
-			case 'internal-error':
+			}
+
+			case 'internal-error': {
 				this.writeCrash(evt);
 				break;
-			case 'missing-ava-import':
+			}
+
+			case 'missing-ava-import': {
 				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':
+			}
+
+			case 'process-exit': {
 				this.writeProcessExit(evt);
 				break;
-			case 'selected-test':
+			}
+
+			case 'selected-test': {
 				if (evt.skip) {
 					this.writeTest(evt, {passed: true, todo: false, skip: true});
 				} else if (evt.todo) {
@@ -180,25 +192,39 @@ export default class TapReporter {
 				}
 
 				break;
-			case 'stats':
+			}
+
+			case 'stats': {
 				this.stats = evt.stats;
 				break;
-			case 'test-failed':
+			}
+
+			case 'test-failed': {
 				this.writeTest(evt, {passed: false, todo: false, skip: false});
 				break;
-			case 'test-passed':
+			}
+
+			case 'test-passed': {
 				this.writeTest(evt, {passed: true, todo: false, skip: false});
 				break;
-			case 'timeout':
+			}
+
+			case 'timeout': {
 				this.writeTimeout(evt);
 				break;
-			case 'uncaught-exception':
+			}
+
+			case 'uncaught-exception': {
 				this.writeCrash(evt);
 				break;
-			case 'unhandled-rejection':
+			}
+
+			case 'unhandled-rejection': {
 				this.writeCrash(evt);
 				break;
-			case 'worker-failed':
+			}
+
+			case 'worker-failed': {
 				if (!this.filesWithMissingAvaImports.has(evt.testFile)) {
 					if (evt.nonZeroExitCode) {
 						this.writeCrash(evt, `${this.relativeFile(evt.testFile)} exited with a non-zero exit code: ${evt.nonZeroExitCode}`);
@@ -208,7 +234,9 @@ export default class TapReporter {
 				}
 
 				break;
-			case 'worker-finished':
+			}
+
+			case 'worker-finished': {
 				if (!evt.forcedExit && !this.filesWithMissingAvaImports.has(evt.testFile)) {
 					if (fileStats.declaredTests === 0) {
 						this.writeCrash(evt, `No tests found in ${this.relativeFile(evt.testFile)}`);
@@ -218,12 +246,17 @@ export default class TapReporter {
 				}
 
 				break;
+			}
+
 			case 'worker-stderr':
-			case 'worker-stdout':
+			case 'worker-stdout': {
 				this.stdStream.write(evt.chunk);
 				break;
-			default:
+			}
+
+			default: {
 				break;
+			}
 		}
 	}
 }

package/lib/run-status.js

@@ -72,22 +72,28 @@ export default class RunStatus extends Emittery {
 
 		let changedStats = true;
 		switch (event.type) {
-			case 'declared-test':
+			case 'declared-test': {
 				stats.declaredTests++;
 				fileStats.declaredTests++;
 				break;
-			case 'hook-failed':
+			}
+
+			case 'hook-failed': {
 				stats.failedHooks++;
 				fileStats.failedHooks++;
 				break;
-			case 'internal-error':
+			}
+
+			case 'internal-error': {
 				stats.internalErrors++;
 				if (event.testFile) {
 					fileStats.internalErrors++;
 				}
 
 				break;
-			case 'selected-test':
+			}
+
+			case 'selected-test': {
 				stats.selectedTests++;
 				fileStats.selectedTests++;
 				if (event.skip) {
@@ -103,17 +109,23 @@ export default class RunStatus extends Emittery {
 				}
 
 				break;
-			case 'shared-worker-error':
+			}
+
+			case 'shared-worker-error': {
 				stats.sharedWorkerErrors++;
 				break;
-			case 'test-failed':
+			}
+
+			case 'test-failed': {
 				stats.failedTests++;
 				fileStats.failedTests++;
 				stats.remainingTests--;
 				fileStats.remainingTests--;
 				this.removePendingTest(event);
 				break;
-			case 'test-passed':
+			}
+
+			case 'test-passed': {
 				if (event.knownFailing) {
 					stats.passedKnownFailingTests++;
 					fileStats.passedKnownFailingTests++;
@@ -126,10 +138,14 @@ export default class RunStatus extends Emittery {
 				fileStats.remainingTests--;
 				this.removePendingTest(event);
 				break;
-			case 'test-register-log-reference':
+			}
+
+			case 'test-register-log-reference': {
 				this.addPendingTestLogs(event);
 				break;
-			case 'timeout':
+			}
+
+			case 'timeout': {
 				stats.timeouts++;
 				event.pendingTests = this.pendingTests;
 				event.pendingTestsLogs = this.pendingTestsLogs;
@@ -140,35 +156,50 @@ export default class RunStatus extends Emittery {
 				}
 
 				break;
-			case 'interrupt':
+			}
+
+			case 'interrupt': {
 				event.pendingTests = this.pendingTests;
 				event.pendingTestsLogs = this.pendingTestsLogs;
 				this.pendingTests = new Map();
 				this.pendingTestsLogs = new Map();
 				break;
-			case 'process-exit':
+			}
+
+			case 'process-exit': {
 				event.pendingTests = this.pendingTests;
 				event.pendingTestsLogs = this.pendingTestsLogs;
 				this.pendingTests = new Map();
 				this.pendingTestsLogs = new Map();
 				break;
-			case 'uncaught-exception':
+			}
+
+			case 'uncaught-exception': {
 				stats.uncaughtExceptions++;
 				fileStats.uncaughtExceptions++;
 				break;
-			case 'unhandled-rejection':
+			}
+
+			case 'unhandled-rejection': {
 				stats.unhandledRejections++;
 				fileStats.unhandledRejections++;
 				break;
-			case 'worker-failed':
+			}
+
+			case 'worker-failed': {
 				stats.failedWorkers++;
 				break;
-			case 'worker-finished':
+			}
+
+			case 'worker-finished': {
 				stats.finishedWorkers++;
 				break;
-			default:
+			}
+
+			default: {
 				changedStats = false;
 				break;
+			}
 		}
 
 		if (changedStats) {

package/lib/watcher.js

@@ -298,11 +298,14 @@ export default class Watcher {
 					case 'test-failed':
 					case 'uncaught-exception':
 					case 'unhandled-rejection':
-					case 'worker-failed':
+					case 'worker-failed': {
 						this.countFailure(evt.testFile, currentVector);
 						break;
-					default:
+					}
+
+					default: {
 						break;
+					}
 				}
 			});
 		});

package/lib/worker/base.js

@@ -222,12 +222,18 @@ const onError = error => {
 	});
 };
 
+let options;
 if (isRunningInThread) {
 	channel.send({type: 'starting'}); // AVA won't terminate the worker thread until it's seen this message.
-	const {options} = workerData;
+	({options} = workerData);
 	delete workerData.options; // Don't allow user code access.
-	run(options).catch(onError);
 } else if (isRunningInChildProcess) {
 	channel.send({type: 'ready-for-options'});
-	channel.options.then(run).catch(onError);
+	options = await channel.options;
+}
+
+try {
+	await run(options);
+} catch (error) {
+	onError(error);
 }

package/lib/worker/channel.cjs

@@ -1,7 +1,7 @@
 'use strict';
-const events = require('events');
-const process = require('process');
-const {MessageChannel, threadId} = require('worker_threads');
+const events = require('node:events');
+const process = require('node:process');
+const {MessageChannel, threadId} = require('node:worker_threads');
 
 const timers = require('../now-and-timers.cjs');
 
@@ -125,7 +125,7 @@ if (isRunningInChildProcess) {
 	const {controlFlow} = require('../ipc-flow-control.cjs');
 	handle = new IpcHandle(controlFlow(process));
 } else if (isRunningInThread) {
-	const {parentPort} = require('worker_threads');
+	const {parentPort} = require('node:worker_threads');
 	handle = new MessagePortHandle(parentPort);
 }
 
@@ -133,7 +133,7 @@ if (isRunningInChildProcess) {
 // Node.js. In order to keep track, explicitly reference before attaching.
 handle.ref();
 
-exports.options = pEvent(handle.channel, 'message', selectAvaMessage('options')).then(message => message.ava.options);
+exports.options = pEvent(handle.channel, 'message', selectAvaMessage('options')).then(message => message.ava.options); // eslint-disable-line unicorn/prefer-top-level-await
 exports.peerFailed = pEvent(handle.channel, 'message', selectAvaMessage('peer-failed'));
 exports.send = handle.send.bind(handle);
 exports.unref = handle.unref.bind(handle);

package/lib/worker/guard-environment.cjs

@@ -1,6 +1,6 @@
 'use strict';
-const path = require('path');
-const process = require('process');
+const path = require('node:path');
+const process = require('node:process');
 
 const {isRunningInThread, isRunningInChildProcess} = require('./utils.cjs');
 

package/lib/worker/main.cjs

@@ -1,7 +1,7 @@
 'use strict';
 require('./guard-environment.cjs'); // eslint-disable-line import/no-unassigned-import
 
-const assert = require('assert');
+const assert = require('node:assert');
 
 const {flags, refs} = require('./state.cjs');
 

package/lib/worker/utils.cjs

@@ -1,6 +1,6 @@
 'use strict';
-const process = require('process');
-const {isMainThread} = require('worker_threads');
+const process = require('node:process');
+const {isMainThread} = require('node:worker_threads');
 
 exports.isRunningInThread = isMainThread === false;
 exports.isRunningInChildProcess = typeof process.send === 'function';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ava",
-	"version": "5.1.0",
+	"version": "5.1.1",
 	"description": "Node.js test runner that lets you develop with confidence.",
 	"license": "MIT",
 	"repository": "avajs/ava",
@@ -88,10 +88,10 @@
 		"arrify": "^3.0.0",
 		"callsites": "^4.0.0",
 		"cbor": "^8.1.0",
-		"chalk": "^5.1.2",
+		"chalk": "^5.2.0",
 		"chokidar": "^3.5.3",
 		"chunkd": "^2.0.1",
-		"ci-info": "^3.6.1",
+		"ci-info": "^3.7.1",
 		"ci-parallel-vars": "^1.0.1",
 		"clean-yaml-object": "^0.1.0",
 		"cli-truncate": "^3.1.0",
@@ -103,7 +103,7 @@
 		"del": "^7.0.0",
 		"emittery": "^1.0.1",
 		"figures": "^5.0.0",
-		"globby": "^13.1.2",
+		"globby": "^13.1.3",
 		"ignore-by-default": "^2.1.0",
 		"indent-string": "^5.0.0",
 		"is-error": "^2.2.2",
@@ -131,23 +131,22 @@
 		"@ava/test": "github:avajs/test",
 		"@ava/typescript": "^3.0.1",
 		"@sindresorhus/tsconfig": "^3.0.1",
-		"@sinonjs/fake-timers": "^10.0.0",
 		"ansi-escapes": "^6.0.0",
 		"c8": "^7.12.0",
 		"delay": "^5.0.0",
 		"execa": "^6.1.0",
-		"fs-extra": "^10.1.0",
+		"fs-extra": "^11.1.0",
 		"get-stream": "^6.0.1",
 		"replace-string": "^4.0.0",
-		"sinon": "^14.0.2",
-		"tap": "^16.3.0",
+		"sinon": "^15.0.1",
+		"tap": "^16.3.3",
 		"temp-write": "^5.0.0",
 		"tempy": "^3.0.0",
 		"touch": "^3.1.0",
-		"tsd": "^0.24.1",
-		"typescript": "^4.8.4",
-		"xo": "^0.52.4",
-		"zen-observable": "^0.9.0"
+		"tsd": "^0.25.0",
+		"typescript": "^4.9.4",
+		"xo": "^0.53.1",
+		"zen-observable": "^0.10.0"
 	},
 	"peerDependencies": {
 		"@ava/typescript": "*"
@@ -158,7 +157,7 @@
 		}
 	},
 	"volta": {
-		"node": "18.8.0",
-		"npm": "8.18.0"
+		"node": "18.13.0",
+		"npm": "9.3.0"
 	}
 }