@vitest/expect 2.1.0-beta.6 → 2.1.0

package/dist/index.js

@@ -38,8 +38,11 @@ function getState(expect) {
 function setState(state, expect) {
   const map = globalThis[MATCHERS_OBJECT];
   const current = map.get(expect) || {};
-  Object.assign(current, state);
-  map.set(expect, current);
+  const results = Object.defineProperties(current, {
+    ...Object.getOwnPropertyDescriptors(current),
+    ...Object.getOwnPropertyDescriptors(state)
+  });
+  map.set(expect, results);
 }
 
 const EXPECTED_COLOR = c.green;
@@ -1316,95 +1319,17 @@ const JestChaiExpect = (chai, utils) => {
       false
     );
   });
-  const assertIsMock = (assertion) => {
+  function assertIsMock(assertion) {
     if (!isMockFunction(assertion._obj)) {
       throw new TypeError(
         `${utils.inspect(assertion._obj)} is not a spy or a call to a spy!`
       );
     }
-  };
-  const getSpy = (assertion) => {
+  }
+  function getSpy(assertion) {
     assertIsMock(assertion);
     return assertion._obj;
-  };
-  const 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`;
-  };
-  const formatCalls = (spy, msg, showActualCall) => {
-    if (spy.mock.calls) {
-      msg += c.gray(
-        `
-
-Received: 
-
-${spy.mock.calls.map((callArg, i) => {
-          let methodCall = c.bold(
-            `  ${ordinalOf(i + 1)} ${spy.getMockName()} call:
-
-`
-          );
-          if (showActualCall) {
-            methodCall += diff(showActualCall, callArg, {
-              omitAnnotationLines: true
-            });
-          } else {
-            methodCall += stringify(callArg).split("\n").map((line) => `    ${line}`).join("\n");
-          }
-          methodCall += "\n";
-          return methodCall;
-        }).join("\n")}`
-      );
-    }
-    msg += c.gray(
-      `
-
-Number of calls: ${c.bold(spy.mock.calls.length)}
-`
-    );
-    return msg;
-  };
-  const formatReturns = (spy, results, msg, showActualReturn) => {
-    msg += c.gray(
-      `
-
-Received: 
-
-${results.map((callReturn, i) => {
-        let methodCall = c.bold(
-          `  ${ordinalOf(i + 1)} ${spy.getMockName()} call return:
-
-`
-        );
-        if (showActualReturn) {
-          methodCall += diff(showActualReturn, callReturn.value, {
-            omitAnnotationLines: true
-          });
-        } else {
-          methodCall += stringify(callReturn).split("\n").map((line) => `    ${line}`).join("\n");
-        }
-        methodCall += "\n";
-        return methodCall;
-      }).join("\n")}`
-    );
-    msg += c.gray(
-      `
-
-Number of calls: ${c.bold(spy.mock.calls.length)}
-`
-    );
-    return msg;
-  };
+  }
   def(["toHaveBeenCalledTimes", "toBeCalledTimes"], function(number) {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
@@ -1767,7 +1692,7 @@ Number of calls: ${c.bold(spy.mock.calls.length)}
           if (typeof result !== "function") {
             return result instanceof chai.Assertion ? proxy : result;
           }
-          return async (...args) => {
+          return (...args) => {
             const promise = obj.then(
               (value) => {
                 utils.flag(this, "object", value);
@@ -1821,7 +1746,7 @@ Number of calls: ${c.bold(spy.mock.calls.length)}
           if (typeof result !== "function") {
             return result instanceof chai.Assertion ? proxy : result;
           }
-          return async (...args) => {
+          return (...args) => {
             const promise = wrapper.then(
               (value) => {
                 const _error = new AssertionError(
@@ -1853,6 +1778,84 @@ Number of calls: ${c.bold(spy.mock.calls.length)}
     }
   );
 };
+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) {
+    msg += c.gray(
+      `
+
+Received: 
+
+${spy.mock.calls.map((callArg, i) => {
+        let methodCall = c.bold(
+          `  ${ordinalOf(i + 1)} ${spy.getMockName()} call:
+
+`
+        );
+        if (showActualCall) {
+          methodCall += diff(showActualCall, callArg, {
+            omitAnnotationLines: true
+          });
+        } else {
+          methodCall += stringify(callArg).split("\n").map((line) => `    ${line}`).join("\n");
+        }
+        methodCall += "\n";
+        return methodCall;
+      }).join("\n")}`
+    );
+  }
+  msg += c.gray(
+    `
+
+Number of calls: ${c.bold(spy.mock.calls.length)}
+`
+  );
+  return msg;
+}
+function formatReturns(spy, results, msg, showActualReturn) {
+  msg += c.gray(
+    `
+
+Received: 
+
+${results.map((callReturn, i) => {
+      let methodCall = c.bold(
+        `  ${ordinalOf(i + 1)} ${spy.getMockName()} call return:
+
+`
+      );
+      if (showActualReturn) {
+        methodCall += diff(showActualReturn, callReturn.value, {
+          omitAnnotationLines: true
+        });
+      } else {
+        methodCall += stringify(callReturn).split("\n").map((line) => `    ${line}`).join("\n");
+      }
+      methodCall += "\n";
+      return methodCall;
+    }).join("\n")}`
+  );
+  msg += c.gray(
+    `
+
+Number of calls: ${c.bold(spy.mock.calls.length)}
+`
+  );
+  return msg;
+}
 
 function getMatcherState(assertion, expect) {
   const obj = assertion._obj;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/expect",
   "type": "module",
-  "version": "2.1.0-beta.6",
+  "version": "2.1.0",
   "description": "Jest's expect matchers as a Chai plugin",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -32,13 +32,13 @@
   "dependencies": {
     "chai": "^5.1.1",
     "tinyrainbow": "^1.2.0",
-    "@vitest/utils": "2.1.0-beta.6",
-    "@vitest/spy": "2.1.0-beta.6"
+    "@vitest/spy": "2.1.0",
+    "@vitest/utils": "2.1.0"
   },
   "devDependencies": {
     "@types/chai": "4.3.6",
     "rollup-plugin-copy": "^3.5.0",
-    "@vitest/runner": "2.1.0-beta.6"
+    "@vitest/runner": "2.1.0"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",