@vitest/expect 4.1.0-beta.4 → 4.1.0-beta.6

package/README.md

@@ -1,5 +1,7 @@
 # @vitest/expect
 
+[![NPM version](https://img.shields.io/npm/v/@vitest/runner?color=a1b858&label=)](https://npmx.dev/package/@vitest/runner)
+
 Jest's expect matchers as a Chai plugin.
 
 ## Usage
@@ -19,3 +21,5 @@ chai.use(JestChaiExpect)
 // adds asymmetric matchers like stringContaining, objectContaining
 chai.use(JestAsymmetricMatchers)
 ```
+
+[GitHub](https://github.com/vitest-dev/vitest/tree/main/packages/expect) | [Documentation](https://vitest.dev/api/expect)

package/dist/index.d.ts

@@ -240,8 +240,6 @@ interface AsymmetricMatchersContaining extends CustomMatcher {
 	/**
 	* Matches if the received number is within a certain precision of the expected number.
 	*
-	* @param precision - Optional decimal precision for comparison. Default is 2.
-	*
 	* @example
 	* expect(10.45).toEqual(expect.closeTo(10.5, 1));
 	* expect(5.11).toEqual(expect.closeTo(5.12)); // with default precision

package/dist/index.js

@@ -1,6 +1,6 @@
 import { printDiffOrStringify, diff } from '@vitest/utils/diff';
 import { stringify } from '@vitest/utils/display';
-import { getType, isObject, noop, assertTypes } from '@vitest/utils/helpers';
+import { getType, isObject, noop, assertTypes, ordinal } from '@vitest/utils/helpers';
 import c from 'tinyrainbow';
 import { isMockFunction } from '@vitest/spy';
 import { processError } from '@vitest/utils/error';
@@ -1503,7 +1503,7 @@ const JestChaiExpect = (chai, utils) => {
 		const nthCall = spy.mock.calls[times - 1];
 		const callCount = spy.mock.calls.length;
 		const isCalled = times <= callCount;
-		this.assert(nthCall && equalsArgumentArray(nthCall, args), `expected ${ordinalOf(times)} "${spyName}" call to have been called with #{exp}${isCalled ? `` : `, but called only ${callCount} times`}`, `expected ${ordinalOf(times)} "${spyName}" call to not have been called with #{exp}`, args, nthCall, isCalled);
+		this.assert(nthCall && equalsArgumentArray(nthCall, args), `expected ${ordinal(times)} "${spyName}" call to have been called with #{exp}${isCalled ? `` : `, but called only ${callCount} times`}`, `expected ${ordinal(times)} "${spyName}" call to not have been called with #{exp}`, args, nthCall, isCalled);
 	});
 	def("toHaveBeenLastCalledWith", function(...args) {
 		const spy = getSpy(this);
@@ -1688,7 +1688,7 @@ const JestChaiExpect = (chai, utils) => {
 			const spyName = spy.getMockName();
 			const results = action === "return" ? spy.mock.results : spy.mock.settledResults;
 			const result = results[nthCall - 1];
-			const ordinalCall = `${ordinalOf(nthCall)} call`;
+			const ordinalCall = `${ordinal(nthCall)} call`;
 			this.assert(condition(spy, nthCall, value), `expected ${ordinalCall} "${spyName}" call to ${action} #{exp}`, `expected ${ordinalCall} "${spyName}" call to not ${action} #{exp}`, value, result?.value);
 		});
 	});
@@ -1718,14 +1718,18 @@ const JestChaiExpect = (chai, utils) => {
 			}
 			return (...args) => {
 				utils.flag(this, "_name", key);
-				const promise = obj.then((value) => {
+				const promise = Promise.resolve(obj).then((value) => {
 					utils.flag(this, "object", value);
 					return result.call(this, ...args);
 				}, (err) => {
 					const _error = new AssertionError(`promise rejected "${utils.inspect(err)}" instead of resolving`, { showDiff: false });
 					_error.cause = err;
-					_error.stack = error.stack.replace(error.message, _error.message);
 					throw _error;
+				}).catch((err) => {
+					if (isError(err) && error.stack) {
+						err.stack = error.stack.replace(error.message, err.message);
+					}
+					throw err;
 				});
 				return recordAsyncExpect(test, promise, createAssertionMessage(utils, this, !!args.length), error);
 			};
@@ -1752,17 +1756,21 @@ const JestChaiExpect = (chai, utils) => {
 			}
 			return (...args) => {
 				utils.flag(this, "_name", key);
-				const promise = wrapper.then((value) => {
+				const promise = Promise.resolve(wrapper).then((value) => {
 					const _error = new AssertionError(`promise resolved "${utils.inspect(value)}" instead of rejecting`, {
 						showDiff: true,
 						expected: new Error("rejected promise"),
 						actual: value
 					});
-					_error.stack = error.stack.replace(error.message, _error.message);
 					throw _error;
 				}, (err) => {
 					utils.flag(this, "object", err);
 					return result.call(this, ...args);
+				}).catch((err) => {
+					if (isError(err) && error.stack) {
+						err.stack = error.stack.replace(error.message, err.message);
+					}
+					throw err;
 				});
 				return recordAsyncExpect(test, promise, createAssertionMessage(utils, this, !!args.length), error);
 			};
@@ -1770,24 +1778,10 @@ const JestChaiExpect = (chai, utils) => {
 		return proxy;
 	});
 };
-function ordinalOf(i) {
-	const j = i % 10;
-	const k = i % 100;
-	if (j === 1 && k !== 11) {
-		return `${i}st`;
-	}
-	if (j === 2 && k !== 12) {
-		return `${i}nd`;
-	}
-	if (j === 3 && k !== 13) {
-		return `${i}rd`;
-	}
-	return `${i}th`;
-}
 function formatCalls(spy, msg, showActualCall) {
 	if (spy.mock.calls.length) {
-		msg += c.gray(`\n\nReceived: \n\n${spy.mock.calls.map((callArg, i) => {
-			let methodCall = c.bold(`  ${ordinalOf(i + 1)} ${spy.getMockName()} call:\n\n`);
+		msg += c.gray(`\n\nReceived:\n\n${spy.mock.calls.map((callArg, i) => {
+			let methodCall = c.bold(`  ${ordinal(i + 1)} ${spy.getMockName()} call:\n\n`);
 			if (showActualCall) {
 				methodCall += diff(showActualCall, callArg, { omitAnnotationLines: true });
 			} else {
@@ -1802,8 +1796,8 @@ function formatCalls(spy, msg, showActualCall) {
 }
 function formatReturns(spy, results, msg, showActualReturn) {
 	if (results.length) {
-		msg += c.gray(`\n\nReceived: \n\n${results.map((callReturn, i) => {
-			let methodCall = c.bold(`  ${ordinalOf(i + 1)} ${spy.getMockName()} call return:\n\n`);
+		msg += c.gray(`\n\nReceived:\n\n${results.map((callReturn, i) => {
+			let methodCall = c.bold(`  ${ordinal(i + 1)} ${spy.getMockName()} call return:\n\n`);
 			if (showActualReturn) {
 				methodCall += diff(showActualReturn, callReturn.value, { omitAnnotationLines: true });
 			} else {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@vitest/expect",
   "type": "module",
-  "version": "4.1.0-beta.4",
+  "version": "4.1.0-beta.6",
   "description": "Jest's expect matchers as a Chai plugin",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
-  "homepage": "https://github.com/vitest-dev/vitest/tree/main/packages/expect#readme",
+  "homepage": "https://vitest.dev/api/expect",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vitest-dev/vitest.git",
@@ -14,6 +14,12 @@
   "bugs": {
     "url": "https://github.com/vitest-dev/vitest/issues"
   },
+  "keywords": [
+    "vitest",
+    "test",
+    "chai",
+    "assertion"
+  ],
   "sideEffects": false,
   "exports": {
     ".": {
@@ -33,11 +39,11 @@
     "@types/chai": "^5.2.2",
     "chai": "^6.2.2",
     "tinyrainbow": "^3.0.3",
-    "@vitest/spy": "4.1.0-beta.4",
-    "@vitest/utils": "4.1.0-beta.4"
+    "@vitest/spy": "4.1.0-beta.6",
+    "@vitest/utils": "4.1.0-beta.6"
   },
   "devDependencies": {
-    "@vitest/runner": "4.1.0-beta.4"
+    "@vitest/runner": "4.1.0-beta.6"
   },
   "scripts": {
     "build": "premove dist && rollup -c",