@vitest/expect 4.0.0-beta.10 → 4.0.0-beta.11

package/dist/index.d.ts

@@ -1,8 +1,9 @@
 import { MockInstance } from '@vitest/spy';
-import { stringify, Constructable } from '@vitest/utils';
+import { Constructable } from '@vitest/utils';
 import { Formatter } from 'tinyrainbow';
 import { diff, printDiffOrStringify } from '@vitest/utils/diff';
 export { DiffOptions } from '@vitest/utils/diff';
+import { stringify } from '@vitest/utils/display';
 import * as chai from 'chai';
 export { chai };
 
@@ -12,7 +13,7 @@ declare const GLOBAL_EXPECT: unique symbol;
 declare const ASYMMETRIC_MATCHERS_OBJECT: unique symbol;
 
 interface AsymmetricMatcherInterface {
-	asymmetricMatch: (other: unknown) => boolean;
+	asymmetricMatch: (other: unknown, customTesters?: Array<Tester>) => boolean;
 	toString: () => string;
 	getExpectedType?: () => string;
 	toAsymmetricMatcher?: () => string;
@@ -26,7 +27,7 @@ declare abstract class AsymmetricMatcher<
 	$$typeof: symbol;
 	constructor(sample: T, inverse?: boolean);
 	protected getMatcherContext(expect?: Chai.ExpectStatic): State;
-	abstract asymmetricMatch(other: unknown): boolean;
+	abstract asymmetricMatch(other: unknown, customTesters?: Array<Tester>): boolean;
 	abstract toString(): string;
 	getExpectedType?(): string;
 	toAsymmetricMatcher?(): string;
@@ -47,13 +48,13 @@ declare class ObjectContaining extends AsymmetricMatcher<Record<string | symbol
 	getPrototype(obj: object): any;
 	hasProperty(obj: object | null, property: string | symbol): boolean;
 	getProperties(obj: object): (string | symbol)[];
-	asymmetricMatch(other: any): boolean;
+	asymmetricMatch(other: any, customTesters?: Array<Tester>): boolean;
 	toString(): string;
 	getExpectedType(): string;
 }
 declare class ArrayContaining<T = unknown> extends AsymmetricMatcher<Array<T>> {
 	constructor(sample: Array<T>, inverse?: boolean);
-	asymmetricMatch(other: Array<T>): boolean;
+	asymmetricMatch(other: Array<T>, customTesters?: Array<Tester>): boolean;
 	toString(): string;
 	getExpectedType(): string;
 }
@@ -753,7 +754,7 @@ declare const JestChaiExpect: ChaiPlugin;
 declare const JestExtend: ChaiPlugin;
 
 declare function equals(a: unknown, b: unknown, customTesters?: Array<Tester>, strictCheck?: boolean): boolean;
-declare function isAsymmetric(obj: any): boolean;
+declare function isAsymmetric(obj: any): obj is AsymmetricMatcher<any>;
 declare function hasAsymmetric(obj: any, seen?: Set<any>): boolean;
 declare function isA(typeName: string, value: unknown): boolean;
 declare function fnNameFor(func: Function): string;

package/dist/index.js

@@ -1,5 +1,6 @@
-import { getType, stringify, isObject, noop, assertTypes } from '@vitest/utils';
 import { printDiffOrStringify, diff } from '@vitest/utils/diff';
+import { stringify } from '@vitest/utils/display';
+import { getType, isObject, noop, assertTypes } from '@vitest/utils/helpers';
 import c from 'tinyrainbow';
 import { isMockFunction } from '@vitest/spy';
 import { processError } from '@vitest/utils/error';
@@ -180,24 +181,24 @@ function hasAsymmetric(obj, seen = new Set()) {
 	}
 	return false;
 }
-function asymmetricMatch(a, b) {
+function asymmetricMatch(a, b, customTesters) {
 	const asymmetricA = isAsymmetric(a);
 	const asymmetricB = isAsymmetric(b);
 	if (asymmetricA && asymmetricB) {
 		return undefined;
 	}
 	if (asymmetricA) {
-		return a.asymmetricMatch(b);
+		return a.asymmetricMatch(b, customTesters);
 	}
 	if (asymmetricB) {
-		return b.asymmetricMatch(a);
+		return b.asymmetricMatch(a, customTesters);
 	}
 }
 // Equality function lovingly adapted from isEqual in
 //   [Underscore](http://underscorejs.org)
 function eq(a, b, aStack, bStack, customTesters, hasKey) {
 	let result = true;
-	const asymmetricResult = asymmetricMatch(a, b);
+	const asymmetricResult = asymmetricMatch(a, b, customTesters);
 	if (asymmetricResult !== undefined) {
 		return asymmetricResult;
 	}
@@ -782,12 +783,11 @@ class ObjectContaining extends AsymmetricMatcher {
 			return (_Object$getOwnPropert = Object.getOwnPropertyDescriptor(obj, s)) === null || _Object$getOwnPropert === void 0 ? void 0 : _Object$getOwnPropert.enumerable;
 		})];
 	}
-	asymmetricMatch(other) {
+	asymmetricMatch(other, customTesters) {
 		if (typeof this.sample !== "object") {
 			throw new TypeError(`You must provide an object to ${this.toString()}, not '${typeof this.sample}'.`);
 		}
 		let result = true;
-		const matcherContext = this.getMatcherContext();
 		const properties = this.getProperties(this.sample);
 		for (const property of properties) {
 			var _Object$getOwnPropert2, _Object$getOwnPropert3;
@@ -797,7 +797,7 @@ class ObjectContaining extends AsymmetricMatcher {
 			}
 			const value = ((_Object$getOwnPropert2 = Object.getOwnPropertyDescriptor(this.sample, property)) === null || _Object$getOwnPropert2 === void 0 ? void 0 : _Object$getOwnPropert2.value) ?? this.sample[property];
 			const otherValue = ((_Object$getOwnPropert3 = Object.getOwnPropertyDescriptor(other, property)) === null || _Object$getOwnPropert3 === void 0 ? void 0 : _Object$getOwnPropert3.value) ?? other[property];
-			if (!equals(value, otherValue, matcherContext.customTesters)) {
+			if (!equals(value, otherValue, customTesters)) {
 				result = false;
 				break;
 			}
@@ -815,12 +815,11 @@ class ArrayContaining extends AsymmetricMatcher {
 	constructor(sample, inverse = false) {
 		super(sample, inverse);
 	}
-	asymmetricMatch(other) {
+	asymmetricMatch(other, customTesters) {
 		if (!Array.isArray(this.sample)) {
 			throw new TypeError(`You must provide an array to ${this.toString()}, not '${typeof this.sample}'.`);
 		}
-		const matcherContext = this.getMatcherContext();
-		const result = this.sample.length === 0 || Array.isArray(other) && this.sample.every((item) => other.some((another) => equals(item, another, matcherContext.customTesters)));
+		const result = this.sample.length === 0 || Array.isArray(other) && this.sample.every((item) => other.some((another) => equals(item, another, customTesters)));
 		return this.inverse ? !result : result;
 	}
 	toString() {
@@ -1715,6 +1714,7 @@ function getMatcherState(assertion, expect) {
 	const obj = assertion._obj;
 	const isNot = util.flag(assertion, "negate");
 	const promise = util.flag(assertion, "promise") || "";
+	const customMessage = util.flag(assertion, "message");
 	const jestUtils = {
 		...getMatcherUtils(),
 		diff,
@@ -1736,7 +1736,8 @@ function getMatcherState(assertion, expect) {
 	return {
 		state: matcherState,
 		isNot,
-		obj
+		obj,
+		customMessage
 	};
 }
 class JestExtendError extends Error {
@@ -1750,19 +1751,21 @@ function JestExtendPlugin(c, expect, matchers) {
 	return (_, utils) => {
 		Object.entries(matchers).forEach(([expectAssertionName, expectAssertion]) => {
 			function expectWrapper(...args) {
-				const { state, isNot, obj } = getMatcherState(this, expect);
+				const { state, isNot, obj, customMessage } = getMatcherState(this, expect);
 				const result = expectAssertion.call(state, obj, ...args);
 				if (result && typeof result === "object" && typeof result.then === "function") {
 					const thenable = result;
 					return thenable.then(({ pass, message, actual, expected }) => {
 						if (pass && isNot || !pass && !isNot) {
-							throw new JestExtendError(message(), actual, expected);
+							const errorMessage = customMessage != null ? customMessage : message();
+							throw new JestExtendError(errorMessage, actual, expected);
 						}
 					});
 				}
 				const { pass, message, actual, expected } = result;
 				if (pass && isNot || !pass && !isNot) {
-					throw new JestExtendError(message(), actual, expected);
+					const errorMessage = customMessage != null ? customMessage : message();
+					throw new JestExtendError(errorMessage, actual, expected);
 				}
 			}
 			const softWrapper = wrapAssertion(utils, expectAssertionName, expectWrapper);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/expect",
   "type": "module",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0-beta.11",
   "description": "Jest's expect matchers as a Chai plugin",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -31,12 +31,12 @@
   "dependencies": {
     "@types/chai": "^5.2.2",
     "chai": "^6.0.1",
-    "tinyrainbow": "^2.0.0",
-    "@vitest/spy": "4.0.0-beta.10",
-    "@vitest/utils": "4.0.0-beta.10"
+    "tinyrainbow": "^3.0.3",
+    "@vitest/spy": "4.0.0-beta.11",
+    "@vitest/utils": "4.0.0-beta.11"
   },
   "devDependencies": {
-    "@vitest/runner": "4.0.0-beta.10"
+    "@vitest/runner": "4.0.0-beta.11"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",