ava 5.2.0 → 5.3.1

package/lib/assert.js

@@ -55,7 +55,7 @@ export class AssertionError extends Error {
 }
 
 export function checkAssertionMessage(assertion, message) {
-	if (typeof message === 'undefined' || typeof message === 'string') {
+	if (message === undefined || typeof message === 'string') {
 		return true;
 	}
 
@@ -253,7 +253,7 @@ function assertExpectations({assertion, actual, expectations, message, prefix, s
 		});
 	}
 
-	if (typeof expectations.code !== 'undefined' && actual.code !== expectations.code) {
+	if (expectations.code !== undefined && actual.code !== expectations.code) {
 		throw new AssertionError({
 			assertion,
 			message,

package/lib/cli.js

@@ -5,7 +5,6 @@ import process from 'node:process';
 
 import arrify from 'arrify';
 import ciParallelVars from 'ci-parallel-vars';
-import {deleteAsync} from 'del';
 import figures from 'figures';
 import yargs from 'yargs';
 import {hideBin} from 'yargs/helpers'; // eslint-disable-line n/file-extension-in-import
@@ -140,6 +139,7 @@ export default async function loadCli() { // eslint-disable-line complexity
 
 	let resetCache = false;
 	const {argv} = yargs(hideBin(process.argv))
+		.scriptName('ava')
 		.version(pkg.version)
 		.parserConfiguration({
 			'boolean-negation': true,
@@ -260,11 +260,23 @@ export default async function loadCli() { // eslint-disable-line complexity
 	const {nonSemVerExperiments: experiments, projectDir} = conf;
 	if (resetCache) {
 		const cacheDir = path.join(projectDir, 'node_modules', '.cache', 'ava');
-
 		try {
-			const deletedFilePaths = await deleteAsync('*', {cwd: cacheDir});
+			let entries;
+			try {
+				entries = fs.readdirSync(cacheDir);
+			} catch (error) {
+				if (error.code === 'ENOENT') {
+					entries = [];
+				} else {
+					throw error;
+				}
+			}
+
+			for (const entry of entries) {
+				fs.rmSync(path.join(cacheDir, entry), {recursive: true, force: true});
+			}
 
-			if (deletedFilePaths.length === 0) {
+			if (entries.length === 0) {
 				console.log(`\n${chalk.green(figures.tick)} No cache files to remove`);
 			} else {
 				console.log(`\n${chalk.green(figures.tick)} Removed AVA cache files in ${cacheDir}`);

package/lib/glob-helpers.cjs

@@ -4,7 +4,8 @@ const process = require('node:process');
 
 const ignoreByDefault = require('ignore-by-default');
 const picomatch = require('picomatch');
-const slash = require('slash');
+
+const slash = require('./slash.cjs');
 
 const defaultIgnorePatterns = [...ignoreByDefault.directories(), '**/node_modules'];
 exports.defaultIgnorePatterns = defaultIgnorePatterns;

package/lib/like-selector.js

@@ -1,29 +1,40 @@
+const isPrimitive = value => value === null || typeof value !== 'object';
+
 export function isLikeSelector(selector) {
-	return selector !== null
-		&& typeof selector === 'object'
-		&& Reflect.getPrototypeOf(selector) === Object.prototype
-		&& Reflect.ownKeys(selector).length > 0;
+	// Require selector to be an array or plain object.
+	if (
+		isPrimitive(selector)
+		|| (!Array.isArray(selector) && Reflect.getPrototypeOf(selector) !== Object.prototype)
+	) {
+		return false;
+	}
+
+	// Also require at least one enumerable property.
+	const descriptors = Object.getOwnPropertyDescriptors(selector);
+	return Reflect.ownKeys(descriptors).some(key => descriptors[key].enumerable === true);
 }
 
 export const CIRCULAR_SELECTOR = new Error('Encountered a circular selector');
 
-export function selectComparable(lhs, selector, circular = new Set()) {
-	if (circular.has(selector)) {
-		throw CIRCULAR_SELECTOR;
+export function selectComparable(actual, selector, circular = [selector]) {
+	if (isPrimitive(actual)) {
+		return actual;
 	}
 
-	circular.add(selector);
-
-	if (lhs === null || typeof lhs !== 'object') {
-		return lhs;
-	}
+	const comparable = Array.isArray(selector) ? [] : {};
+	const enumerableKeys = Reflect.ownKeys(selector).filter(key => Reflect.getOwnPropertyDescriptor(selector, key).enumerable);
+	for (const key of enumerableKeys) {
+		const subselector = Reflect.get(selector, key);
+		if (isLikeSelector(subselector)) {
+			if (circular.includes(subselector)) {
+				throw CIRCULAR_SELECTOR;
+			}
 
-	const comparable = {};
-	for (const [key, rhs] of Object.entries(selector)) {
-		if (isLikeSelector(rhs)) {
-			comparable[key] = selectComparable(Reflect.get(lhs, key), rhs, circular);
+			circular.push(subselector);
+			comparable[key] = selectComparable(Reflect.get(actual, key), subselector, circular);
+			circular.pop();
 		} else {
-			comparable[key] = Reflect.get(lhs, key);
+			comparable[key] = Reflect.get(actual, key);
 		}
 	}
 

package/lib/slash.cjs

@@ -0,0 +1,36 @@
+/*
+Inlined from
+<https://github.com/sindresorhus/slash/blob/98b618f5a3bfcb5dd374b204868818845b87bb2f/index.js>,
+since we need a CJS version.
+
+Copyright 2023 Sindre Sorhus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the “Software”), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+function slash(path) {
+	const isExtendedLengthPath = path.startsWith('\\\\?\\');
+
+	if (isExtendedLengthPath) {
+		return path;
+	}
+
+	return path.replace(/\\/g, '/');
+}
+
+module.exports = slash;

package/lib/snapshot-manager.js

@@ -10,10 +10,10 @@ import cbor from 'cbor';
 import concordance from 'concordance';
 import indentString from 'indent-string';
 import mem from 'mem';
-import slash from 'slash';
 import writeFileAtomic from 'write-file-atomic';
 
 import {snapshotManager as concordanceOptions} from './concordance-options.js';
+import slash from './slash.cjs';
 
 // Increment if encoding layout or Concordance serialization versions change. Previous AVA versions will not be able to
 // decode buffers generated by a newer version, so changing this value will require a major version bump of AVA itself.

package/lib/test.js

@@ -7,6 +7,22 @@ import concordanceOptions from './concordance-options.js';
 import nowAndTimers from './now-and-timers.cjs';
 import parseTestArgs from './parse-test-args.js';
 
+const hasOwnProperty = (object, prop) => Object.prototype.hasOwnProperty.call(object, prop);
+
+function isExternalAssertError(error) {
+	if (typeof error !== 'object' || error === null) {
+		return false;
+	}
+
+	// Match errors thrown by <https://www.npmjs.com/package/expect>.
+	if (hasOwnProperty(error, 'matcherResult')) {
+		return true;
+	}
+
+	// Match errors thrown by <https://www.npmjs.com/package/chai> and <https://nodejs.org/api/assert.html>.
+	return hasOwnProperty(error, 'actual') && hasOwnProperty(error, 'expected');
+}
+
 function formatErrorValue(label, error) {
 	const formatted = concordance.format(error, concordanceOptions);
 	return {label, formatted};
@@ -519,11 +535,19 @@ export default class Test {
 
 		const result = this.callFn();
 		if (!result.ok) {
-			this.saveFirstError(new AssertionError({
-				message: 'Error thrown in test',
-				savedError: result.error instanceof Error && result.error,
-				values: [formatErrorValue('Error thrown in test:', result.error)],
-			}));
+			if (isExternalAssertError(result.error)) {
+				this.saveFirstError(new AssertionError({
+					message: 'Assertion failed',
+					savedError: result.error instanceof Error && result.error,
+					values: [{label: 'Assertion failed: ', formatted: result.error.message}],
+				}));
+			} else {
+				this.saveFirstError(new AssertionError({
+					message: 'Error thrown in test',
+					savedError: result.error instanceof Error && result.error,
+					values: [formatErrorValue('Error thrown in test:', result.error)],
+				}));
+			}
 
 			return this.finish();
 		}
@@ -564,11 +588,19 @@ export default class Test {
 
 				promise
 					.catch(error => {
-						this.saveFirstError(new AssertionError({
-							message: 'Rejected promise returned by test',
-							savedError: error instanceof Error && error,
-							values: [formatErrorValue('Rejected promise returned by test. Reason:', error)],
-						}));
+						if (isExternalAssertError(error)) {
+							this.saveFirstError(new AssertionError({
+								message: 'Assertion failed',
+								savedError: error instanceof Error && error,
+								values: [{label: 'Assertion failed: ', formatted: error.message}],
+							}));
+						} else {
+							this.saveFirstError(new AssertionError({
+								message: 'Rejected promise returned by test',
+								savedError: error instanceof Error && error,
+								values: [formatErrorValue('Rejected promise returned by test. Reason:', error)],
+							}));
+						}
 					})
 					.then(() => resolve(this.finish()));
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ava",
-	"version": "5.2.0",
+	"version": "5.3.1",
 	"description": "Node.js test runner that lets you develop with confidence.",
 	"license": "MIT",
 	"repository": "avajs/ava",
@@ -81,7 +81,7 @@
 		"typescript"
 	],
 	"dependencies": {
-		"acorn": "^8.8.1",
+		"acorn": "^8.8.2",
 		"acorn-walk": "^8.2.0",
 		"ansi-styles": "^6.2.1",
 		"arrgv": "^1.0.2",
@@ -91,7 +91,7 @@
 		"chalk": "^5.2.0",
 		"chokidar": "^3.5.3",
 		"chunkd": "^2.0.1",
-		"ci-info": "^3.7.1",
+		"ci-info": "^3.8.0",
 		"ci-parallel-vars": "^1.0.1",
 		"clean-yaml-object": "^0.1.0",
 		"cli-truncate": "^3.1.0",
@@ -100,10 +100,9 @@
 		"concordance": "^5.0.4",
 		"currently-unhandled": "^0.4.1",
 		"debug": "^4.3.4",
-		"del": "^7.0.0",
 		"emittery": "^1.0.1",
 		"figures": "^5.0.0",
-		"globby": "^13.1.3",
+		"globby": "^13.1.4",
 		"ignore-by-default": "^2.1.0",
 		"indent-string": "^5.0.0",
 		"is-error": "^2.2.2",
@@ -119,33 +118,33 @@
 		"plur": "^5.1.0",
 		"pretty-ms": "^8.0.0",
 		"resolve-cwd": "^3.0.0",
-		"slash": "^3.0.0",
 		"stack-utils": "^2.0.6",
 		"strip-ansi": "^7.0.1",
 		"supertap": "^3.0.1",
 		"temp-dir": "^3.0.0",
-		"write-file-atomic": "^5.0.0",
-		"yargs": "^17.6.2"
+		"write-file-atomic": "^5.0.1",
+		"yargs": "^17.7.2"
 	},
 	"devDependencies": {
 		"@ava/test": "github:avajs/test",
-		"@ava/typescript": "^3.0.1",
+		"@ava/typescript": "^4.0.0",
 		"@sindresorhus/tsconfig": "^3.0.1",
-		"ansi-escapes": "^6.0.0",
-		"c8": "^7.12.0",
+		"ansi-escapes": "^6.2.0",
+		"c8": "^7.13.0",
 		"delay": "^5.0.0",
-		"execa": "^6.1.0",
-		"fs-extra": "^11.1.0",
+		"execa": "^7.1.1",
+		"expect": "^29.5.0",
+		"fs-extra": "^11.1.1",
 		"get-stream": "^6.0.1",
 		"replace-string": "^4.0.0",
-		"sinon": "^15.0.1",
-		"tap": "^16.3.3",
+		"sinon": "^15.1.0",
+		"tap": "^16.3.4",
 		"temp-write": "^5.0.0",
 		"tempy": "^3.0.0",
 		"touch": "^3.1.0",
-		"tsd": "^0.25.0",
-		"typescript": "^4.9.4",
-		"xo": "^0.53.1",
+		"tsd": "^0.28.1",
+		"typescript": "^4.9.5",
+		"xo": "^0.54.2",
 		"zen-observable": "^0.10.0"
 	},
 	"peerDependencies": {
@@ -157,7 +156,6 @@
 		}
 	},
 	"volta": {
-		"node": "18.13.0",
-		"npm": "9.3.0"
+		"node": "20.2.0"
 	}
 }