@vitest/expect 3.1.3 → 3.2.0-beta.2

package/dist/index.d.ts

@@ -9,6 +9,67 @@ declare const JEST_MATCHERS_OBJECT: unique symbol;
 declare const GLOBAL_EXPECT: unique symbol;
 declare const ASYMMETRIC_MATCHERS_OBJECT: unique symbol;
 
+interface AsymmetricMatcherInterface {
+	asymmetricMatch: (other: unknown) => boolean;
+	toString: () => string;
+	getExpectedType?: () => string;
+	toAsymmetricMatcher?: () => string;
+}
+declare abstract class AsymmetricMatcher<
+	T,
+	State extends MatcherState = MatcherState
+> implements AsymmetricMatcherInterface {
+	protected sample: T;
+	protected inverse: boolean;
+	$$typeof: symbol;
+	constructor(sample: T, inverse?: boolean);
+	protected getMatcherContext(expect?: Chai.ExpectStatic): State;
+	abstract asymmetricMatch(other: unknown): boolean;
+	abstract toString(): string;
+	getExpectedType?(): string;
+	toAsymmetricMatcher?(): string;
+}
+declare class StringContaining extends AsymmetricMatcher<string> {
+	constructor(sample: string, inverse?: boolean);
+	asymmetricMatch(other: string): boolean;
+	toString(): string;
+	getExpectedType(): string;
+}
+declare class Anything extends AsymmetricMatcher<void> {
+	asymmetricMatch(other: unknown): boolean;
+	toString(): string;
+	toAsymmetricMatcher(): string;
+}
+declare class ObjectContaining extends AsymmetricMatcher<Record<string, unknown>> {
+	constructor(sample: Record<string, unknown>, inverse?: boolean);
+	getPrototype(obj: object): any;
+	hasProperty(obj: object | null, property: string): boolean;
+	asymmetricMatch(other: any): 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;
+	toString(): string;
+	getExpectedType(): string;
+}
+declare class Any extends AsymmetricMatcher<any> {
+	constructor(sample: unknown);
+	fnNameFor(func: Function): string;
+	asymmetricMatch(other: unknown): boolean;
+	toString(): string;
+	getExpectedType(): string;
+	toAsymmetricMatcher(): string;
+}
+declare class StringMatching extends AsymmetricMatcher<RegExp> {
+	constructor(sample: string | RegExp, inverse?: boolean);
+	asymmetricMatch(other: string): boolean;
+	toString(): string;
+	getExpectedType(): string;
+}
+declare const JestAsymmetricMatchers: ChaiPlugin;
+
 declare function matcherHint(matcherName: string, received?: string, expected?: string, options?: MatcherHintOptions): string;
 declare function printReceived(object: unknown): string;
 declare function printExpected(value: unknown): string;
@@ -92,8 +153,8 @@ type MatchersObject<T extends MatcherState = MatcherState> = Record<string, RawM
 interface ExpectStatic extends Chai.ExpectStatic, AsymmetricMatchersContaining {
 	<T>(actual: T, message?: string): Assertion<T>;
 	extend: (expects: MatchersObject) => void;
-	anything: () => any;
-	any: (constructor: unknown) => any;
+	anything: () => AsymmetricMatcher<unknown>;
+	any: (constructor: unknown) => AsymmetricMatcher<unknown>;
 	getState: () => MatcherState;
 	setState: (state: Partial<MatcherState>) => void;
 	not: AsymmetricMatchersContaining;
@@ -135,14 +196,14 @@ interface AsymmetricMatchersContaining extends CustomMatcher {
 	* @example
 	* expect({ a: '1', b: 2 }).toEqual(expect.objectContaining({ a: '1' }))
 	*/
-	objectContaining: <T = any>(expected: T) => any;
+	objectContaining: <T = any>(expected: DeeplyAllowMatchers<T>) => any;
 	/**
 	* Matches if the received array contains all elements in the expected array.
 	*
 	* @example
 	* expect(['a', 'b', 'c']).toEqual(expect.arrayContaining(['b', 'a']));
 	*/
-	arrayContaining: <T = unknown>(expected: Array<T>) => any;
+	arrayContaining: <T = unknown>(expected: Array<DeeplyAllowMatchers<T>>) => any;
 	/**
 	* Matches if the received string or regex matches the expected pattern.
 	*
@@ -162,6 +223,7 @@ interface AsymmetricMatchersContaining extends CustomMatcher {
 	*/
 	closeTo: (expected: number, precision?: number) => any;
 }
+type DeeplyAllowMatchers<T> = T extends Array<infer Element> ? (DeeplyAllowMatchers<Element> | Element)[] : T extends object ? { [K in keyof T] : DeeplyAllowMatchers<T[K]> | AsymmetricMatcher<unknown> } : T;
 interface JestAssertion<T = any> extends jest.Matchers<void, T>, CustomMatcher {
 	/**
 	* Used when you want to check that two objects have the same value.
@@ -170,14 +232,14 @@ interface JestAssertion<T = any> extends jest.Matchers<void, T>, CustomMatcher {
 	* @example
 	* expect(user).toEqual({ name: 'Alice', age: 30 });
 	*/
-	toEqual: <E>(expected: E) => void;
+	toEqual: <E>(expected: DeeplyAllowMatchers<E>) => void;
 	/**
 	* Use to test that objects have the same types as well as structure.
 	*
 	* @example
 	* expect(user).toStrictEqual({ name: 'Alice', age: 30 });
 	*/
-	toStrictEqual: <E>(expected: E) => void;
+	toStrictEqual: <E>(expected: DeeplyAllowMatchers<E>) => void;
 	/**
 	* Checks that a value is what you expect. It calls `Object.is` to compare values.
 	* Don't use `toBe` with floating-point numbers.
@@ -204,7 +266,7 @@ interface JestAssertion<T = any> extends jest.Matchers<void, T>, CustomMatcher {
 	*   address: { city: 'Wonderland' }
 	* });
 	*/
-	toMatchObject: <E extends object | any[]>(expected: E) => void;
+	toMatchObject: <E extends object | any[]>(expected: DeeplyAllowMatchers<E>) => void;
 	/**
 	* Used when you want to check that an item is in a list.
 	* For testing the items in the list, this uses `===`, a strict equality check.
@@ -671,67 +733,6 @@ declare global {
 
 declare const customMatchers: MatchersObject;
 
-interface AsymmetricMatcherInterface {
-	asymmetricMatch: (other: unknown) => boolean;
-	toString: () => string;
-	getExpectedType?: () => string;
-	toAsymmetricMatcher?: () => string;
-}
-declare abstract class AsymmetricMatcher<
-	T,
-	State extends MatcherState = MatcherState
-> implements AsymmetricMatcherInterface {
-	protected sample: T;
-	protected inverse: boolean;
-	$$typeof: symbol;
-	constructor(sample: T, inverse?: boolean);
-	protected getMatcherContext(expect?: Chai.ExpectStatic): State;
-	abstract asymmetricMatch(other: unknown): boolean;
-	abstract toString(): string;
-	getExpectedType?(): string;
-	toAsymmetricMatcher?(): string;
-}
-declare class StringContaining extends AsymmetricMatcher<string> {
-	constructor(sample: string, inverse?: boolean);
-	asymmetricMatch(other: string): boolean;
-	toString(): string;
-	getExpectedType(): string;
-}
-declare class Anything extends AsymmetricMatcher<void> {
-	asymmetricMatch(other: unknown): boolean;
-	toString(): string;
-	toAsymmetricMatcher(): string;
-}
-declare class ObjectContaining extends AsymmetricMatcher<Record<string, unknown>> {
-	constructor(sample: Record<string, unknown>, inverse?: boolean);
-	getPrototype(obj: object): any;
-	hasProperty(obj: object | null, property: string): boolean;
-	asymmetricMatch(other: any): 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;
-	toString(): string;
-	getExpectedType(): string;
-}
-declare class Any extends AsymmetricMatcher<any> {
-	constructor(sample: unknown);
-	fnNameFor(func: Function): string;
-	asymmetricMatch(other: unknown): boolean;
-	toString(): string;
-	getExpectedType(): string;
-	toAsymmetricMatcher(): string;
-}
-declare class StringMatching extends AsymmetricMatcher<RegExp> {
-	constructor(sample: string | RegExp, inverse?: boolean);
-	asymmetricMatch(other: string): boolean;
-	toString(): string;
-	getExpectedType(): string;
-}
-declare const JestAsymmetricMatchers: ChaiPlugin;
-
 declare const JestChaiExpect: ChaiPlugin;
 
 declare const JestExtend: ChaiPlugin;
@@ -761,4 +762,4 @@ declare function getState<State extends MatcherState = MatcherState>(expect: Exp
 declare function setState<State extends MatcherState = MatcherState>(state: Partial<State>, expect: ExpectStatic): void;
 
 export { ASYMMETRIC_MATCHERS_OBJECT, Any, Anything, ArrayContaining, AsymmetricMatcher, GLOBAL_EXPECT, JEST_MATCHERS_OBJECT, JestAsymmetricMatchers, JestChaiExpect, JestExtend, MATCHERS_OBJECT, ObjectContaining, StringContaining, StringMatching, addCustomEqualityTesters, arrayBufferEquality, customMatchers, equals, fnNameFor, generateToBeMessage, getObjectKeys, getObjectSubset, getState, hasAsymmetric, hasProperty, isA, isAsymmetric, isImmutableUnorderedKeyed, isImmutableUnorderedSet, iterableEquality, pluralize, setState, sparseArrayEquality, subsetEquality, typeEquality };
-export type { Assertion, AsymmetricMatcherInterface, AsymmetricMatchersContaining, AsyncExpectationResult, ChaiPlugin, ExpectStatic, ExpectationResult, JestAssertion, MatcherHintOptions, MatcherState, MatchersObject, PromisifyAssertion, RawMatcherFn, SyncExpectationResult, Tester, TesterContext };
+export type { Assertion, AsymmetricMatcherInterface, AsymmetricMatchersContaining, AsyncExpectationResult, ChaiPlugin, DeeplyAllowMatchers, ExpectStatic, ExpectationResult, JestAssertion, MatcherHintOptions, MatcherState, MatchersObject, PromisifyAssertion, RawMatcherFn, SyncExpectationResult, Tester, TesterContext };

package/dist/index.js

@@ -446,7 +446,7 @@ function iterableEquality(a, b, customTesters = [], aStack = [], bStack = []) {
 	if (!isImmutableList(a) && !isImmutableOrderedKeyed(a) && !isImmutableOrderedSet(a) && !isImmutableRecord(a)) {
 		const aEntries = Object.entries(a);
 		const bEntries = Object.entries(b);
-		if (!equals(aEntries, bEntries)) {
+		if (!equals(aEntries, bEntries, filteredCustomTesters)) {
 			return false;
 		}
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/expect",
   "type": "module",
-  "version": "3.1.3",
+  "version": "3.2.0-beta.2",
   "description": "Jest's expect matchers as a Chai plugin",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -30,15 +30,15 @@
     "dist"
   ],
   "dependencies": {
+    "@types/chai": "^5.2.2",
     "chai": "^5.2.0",
     "tinyrainbow": "^2.0.0",
-    "@vitest/utils": "3.1.3",
-    "@vitest/spy": "3.1.3"
+    "@vitest/spy": "3.2.0-beta.2",
+    "@vitest/utils": "3.2.0-beta.2"
   },
   "devDependencies": {
-    "@types/chai": "5.0.1",
     "rollup-plugin-copy": "^3.5.0",
-    "@vitest/runner": "3.1.3"
+    "@vitest/runner": "3.2.0-beta.2"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",