@vitest/expect 4.0.0-beta.2 → 4.0.0-beta.3

package/dist/index.d.ts

@@ -43,10 +43,11 @@ declare class Anything extends AsymmetricMatcher<void> {
 	toString(): string;
 	toAsymmetricMatcher(): string;
 }
-declare class ObjectContaining extends AsymmetricMatcher<Record<string, unknown>> {
+declare class ObjectContaining extends AsymmetricMatcher<Record<string | symbol | number, unknown>> {
 	constructor(sample: Record<string, unknown>, inverse?: boolean);
 	getPrototype(obj: object): any;
-	hasProperty(obj: object | null, property: string): boolean;
+	hasProperty(obj: object | null, property: string | symbol): boolean;
+	getProperties(obj: object): (string | symbol)[];
 	asymmetricMatch(other: any): boolean;
 	toString(): string;
 	getExpectedType(): string;
@@ -77,17 +78,17 @@ declare function matcherHint(matcherName: string, received?: string, expected?:
 declare function printReceived(object: unknown): string;
 declare function printExpected(value: unknown): string;
 declare function getMatcherUtils(): {
-	EXPECTED_COLOR: Formatter
-	RECEIVED_COLOR: Formatter
-	INVERTED_COLOR: Formatter
-	BOLD_WEIGHT: Formatter
-	DIM_COLOR: Formatter
-	diff: typeof diff
-	matcherHint: typeof matcherHint
-	printReceived: typeof printReceived
-	printExpected: typeof printExpected
-	printDiffOrStringify: typeof printDiffOrStringify
-	printWithType: typeof printWithType
+	EXPECTED_COLOR: Formatter;
+	RECEIVED_COLOR: Formatter;
+	INVERTED_COLOR: Formatter;
+	BOLD_WEIGHT: Formatter;
+	DIM_COLOR: Formatter;
+	diff: typeof diff;
+	matcherHint: typeof matcherHint;
+	printReceived: typeof printReceived;
+	printExpected: typeof printExpected;
+	printDiffOrStringify: typeof printDiffOrStringify;
+	printWithType: typeof printWithType;
 };
 declare function printWithType<T>(name: string, value: T, print: (value: T) => string): string;
 declare function addCustomEqualityTesters(newTesters: Array<Tester>): void;
@@ -135,10 +136,10 @@ interface MatcherState {
 	suppressedErrors: Array<Error>;
 	testPath?: string;
 	utils: ReturnType<typeof getMatcherUtils> & {
-		diff: typeof diff
-		stringify: typeof stringify
-		iterableEquality: Tester
-		subsetEquality: Tester
+		diff: typeof diff;
+		stringify: typeof stringify;
+		iterableEquality: Tester;
+		subsetEquality: Tester;
 	};
 	soft?: boolean;
 	poll?: boolean;
@@ -366,6 +367,13 @@ interface JestAssertion<T = any> extends jest.Matchers<void, T>, CustomMatcher {
 	*/
 	toBeNull: () => void;
 	/**
+	* Used to check that a variable is nullable (null or undefined).
+	*
+	* @example
+	* expect(value).toBeNullable();
+	*/
+	toBeNullable: () => void;
+	/**
 	* Ensure that a variable is not undefined.
 	*
 	* @example
@@ -797,8 +805,8 @@ declare function generateToBeMessage(deepEqualityName: string, expected?: string
 declare function pluralize(word: string, count: number): string;
 declare function getObjectKeys(object: object): Array<string | symbol>;
 declare function getObjectSubset(object: any, subset: any, customTesters: Array<Tester>): {
-	subset: any
-	stripped: number
+	subset: any;
+	stripped: number;
 };
 
 declare function getState<State extends MatcherState = MatcherState>(expect: ExpectStatic): State;

package/dist/index.js

@@ -769,19 +769,33 @@ class ObjectContaining extends AsymmetricMatcher {
 		if (!obj) {
 			return false;
 		}
-		if (Object.prototype.hasOwnProperty.call(obj, property)) {
+		if (Object.hasOwn(obj, property)) {
 			return true;
 		}
 		return this.hasProperty(this.getPrototype(obj), property);
 	}
+	getProperties(obj) {
+		return [...Object.keys(obj), ...Object.getOwnPropertySymbols(obj).filter((s) => {
+			var _Object$getOwnPropert;
+			return (_Object$getOwnPropert = Object.getOwnPropertyDescriptor(obj, s)) === null || _Object$getOwnPropert === void 0 ? void 0 : _Object$getOwnPropert.enumerable;
+		})];
+	}
 	asymmetricMatch(other) {
 		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();
-		for (const property in this.sample) {
-			if (!this.hasProperty(other, property) || !equals(this.sample[property], other[property], matcherContext.customTesters)) {
+		const properties = this.getProperties(this.sample);
+		for (const property of properties) {
+			var _Object$getOwnPropert2, _Object$getOwnPropert3;
+			if (!this.hasProperty(other, property)) {
+				result = false;
+				break;
+			}
+			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)) {
 				result = false;
 				break;
 			}
@@ -1241,6 +1255,10 @@ const JestChaiExpect = (chai, utils) => {
 		const obj = utils.flag(this, "object");
 		this.assert(obj === null, "expected #{this} to be null", "expected #{this} not to be null", null, obj);
 	});
+	def("toBeNullable", function() {
+		const obj = utils.flag(this, "object");
+		this.assert(obj == null, "expected #{this} to be nullish", "expected #{this} not to be nullish", null, obj);
+	});
 	def("toBeDefined", function() {
 		const obj = utils.flag(this, "object");
 		this.assert(typeof obj !== "undefined", "expected #{this} to be defined", "expected #{this} to be undefined", obj);

package/package.json

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