@vitest/expect 3.0.5 → 3.0.7

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { MockInstance } from '@vitest/spy';
 import { stringify, Constructable } from '@vitest/utils';
-import * as tinyrainbow from 'tinyrainbow';
 import { Formatter } from 'tinyrainbow';
 import { diff, printDiffOrStringify } from '@vitest/utils/diff';
 export { DiffOptions } from '@vitest/utils/diff';
@@ -14,11 +13,11 @@ 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: tinyrainbow.Formatter;
-    RECEIVED_COLOR: tinyrainbow.Formatter;
-    INVERTED_COLOR: tinyrainbow.Formatter;
-    BOLD_WEIGHT: tinyrainbow.Formatter;
-    DIM_COLOR: tinyrainbow.Formatter;
+    EXPECTED_COLOR: Formatter;
+    RECEIVED_COLOR: Formatter;
+    INVERTED_COLOR: Formatter;
+    BOLD_WEIGHT: Formatter;
+    DIM_COLOR: Formatter;
     diff: typeof diff;
     matcherHint: typeof matcherHint;
     printReceived: typeof printReceived;
@@ -87,7 +86,7 @@ type ExpectationResult = SyncExpectationResult | AsyncExpectationResult;
 interface RawMatcherFn<T extends MatcherState = MatcherState> {
     (this: T, received: any, ...expected: Array<any>): ExpectationResult;
 }
-type MatchersObject<T extends MatcherState = MatcherState> = Record<string, RawMatcherFn<T>>;
+type MatchersObject<T extends MatcherState = MatcherState> = Record<string, RawMatcherFn<T>> & ThisType<T>;
 interface ExpectStatic extends Chai.ExpectStatic, AsymmetricMatchersContaining {
     <T>(actual: T, message?: string): Assertion<T>;
     extend: (expects: MatchersObject) => void;
@@ -693,7 +692,7 @@ declare class StringContaining extends AsymmetricMatcher<string> {
     getExpectedType(): string;
 }
 declare class Anything extends AsymmetricMatcher<void> {
-    asymmetricMatch(other: unknown): other is {};
+    asymmetricMatch(other: unknown): boolean;
     toString(): string;
     toAsymmetricMatcher(): string;
 }
@@ -733,7 +732,7 @@ 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 hasAsymmetric(obj: any, seen?: Set<unknown>): boolean;
+declare function hasAsymmetric(obj: any, seen?: Set<any>): boolean;
 declare function isA(typeName: string, value: unknown): boolean;
 declare function fnNameFor(func: Function): string;
 declare function hasProperty(obj: object | null, property: string): boolean;

package/dist/index.js

@@ -1,5 +1,5 @@
 import { getType, stringify, isObject, assertTypes } from '@vitest/utils';
-import { diff, printDiffOrStringify } from '@vitest/utils/diff';
+import { printDiffOrStringify, diff } from '@vitest/utils/diff';
 import c from 'tinyrainbow';
 import { isMockFunction } from '@vitest/spy';
 import { processError } from '@vitest/utils/error';
@@ -186,7 +186,7 @@ function asymmetricMatch(a, b) {
   const asymmetricA = isAsymmetric(a);
   const asymmetricB = isAsymmetric(b);
   if (asymmetricA && asymmetricB) {
-    return undefined;
+    return void 0;
   }
   if (asymmetricA) {
     return a.asymmetricMatch(b);
@@ -198,7 +198,7 @@ function asymmetricMatch(a, b) {
 function eq(a, b, aStack, bStack, customTesters, hasKey2) {
   let result = true;
   const asymmetricResult = asymmetricMatch(a, b);
-  if (asymmetricResult !== undefined) {
+  if (asymmetricResult !== void 0) {
     return asymmetricResult;
   }
   const testerContext = { equals };
@@ -209,7 +209,7 @@ function eq(a, b, aStack, bStack, customTesters, hasKey2) {
       b,
       customTesters
     );
-    if (customTesterResult !== undefined) {
+    if (customTesterResult !== void 0) {
       return customTesterResult;
     }
   }
@@ -315,7 +315,7 @@ function keys(obj, hasKey2) {
   );
 }
 function hasDefinedKey(obj, key) {
-  return hasKey(obj, key) && obj[key] !== undefined;
+  return hasKey(obj, key) && obj[key] !== void 0;
 }
 function hasKey(obj, key) {
   return Object.prototype.hasOwnProperty.call(obj, key);
@@ -387,7 +387,7 @@ function hasIterator(object) {
 }
 function iterableEquality(a, b, customTesters = [], aStack = [], bStack = []) {
   if (typeof a !== "object" || typeof b !== "object" || Array.isArray(a) || Array.isArray(b) || !hasIterator(a) || !hasIterator(b)) {
-    return undefined;
+    return void 0;
   }
   if (a.constructor !== b.constructor) {
     return false;
@@ -407,7 +407,7 @@ function iterableEquality(a, b, customTesters = [], aStack = [], bStack = []) {
   function iterableEqualityWithStack(a2, b2) {
     return iterableEquality(a2, b2, [...customTesters], [...aStack], [...bStack]);
   }
-  if (a.size !== undefined) {
+  if (a.size !== void 0) {
     if (a.size !== b.size) {
       return false;
     } else if (isA("Set", a) || isImmutableUnorderedSet(a)) {
@@ -501,7 +501,7 @@ function subsetEquality(object, subset, customTesters = []) {
   );
   const subsetEqualityWithContext = (seenReferences = /* @__PURE__ */ new WeakMap()) => (object2, subset2) => {
     if (!isObjectWithKeys(subset2)) {
-      return undefined;
+      return void 0;
     }
     return Object.keys(subset2).every((key) => {
       if (subset2[key] != null && typeof subset2[key] === "object") {
@@ -522,7 +522,7 @@ function subsetEquality(object, subset, customTesters = []) {
 }
 function typeEquality(a, b) {
   if (a == null || b == null || a.constructor === b.constructor) {
-    return undefined;
+    return void 0;
   }
   return false;
 }
@@ -531,13 +531,13 @@ function arrayBufferEquality(a, b) {
   let dataViewB = b;
   if (!(a instanceof DataView && b instanceof DataView)) {
     if (!(a instanceof ArrayBuffer) || !(b instanceof ArrayBuffer)) {
-      return undefined;
+      return void 0;
     }
     try {
       dataViewA = new DataView(a);
       dataViewB = new DataView(b);
     } catch {
-      return undefined;
+      return void 0;
     }
   }
   if (dataViewA.byteLength !== dataViewB.byteLength) {
@@ -552,7 +552,7 @@ function arrayBufferEquality(a, b) {
 }
 function sparseArrayEquality(a, b, customTesters = []) {
   if (!Array.isArray(a) || !Array.isArray(b)) {
-    return undefined;
+    return void 0;
   }
   const aKeys = Object.keys(a);
   const bKeys = Object.keys(b);
@@ -583,7 +583,7 @@ function getObjectKeys(object) {
     ...Object.getOwnPropertySymbols(object).filter(
       (s) => {
         var _a;
-        return (_a = Object.getOwnPropertyDescriptor(object, s)) == null ? undefined : _a.enumerable;
+        return (_a = Object.getOwnPropertyDescriptor(object, s)) == null ? void 0 : _a.enumerable;
       }
     )
   ];
@@ -698,16 +698,14 @@ class AsymmetricMatcher {
       }
     };
   }
-  // implement custom chai/loupe inspect for better AssertionError.message formatting
-  // https://github.com/chaijs/loupe/blob/9b8a6deabcd50adc056a64fb705896194710c5c6/src/index.ts#L29
-  [Symbol.for("chai/inspect")](options) {
-    const result = stringify(this, options.depth, { min: true });
-    if (result.length <= options.truncate) {
-      return result;
-    }
-    return `${this.toString()}{\u2026}`;
-  }
 }
+AsymmetricMatcher.prototype[Symbol.for("chai/inspect")] = function(options) {
+  const result = stringify(this, options.depth, { min: true });
+  if (result.length <= options.truncate) {
+    return result;
+  }
+  return `${this.toString()}{\u2026}`;
+};
 class StringContaining extends AsymmetricMatcher {
   constructor(sample, inverse = false) {
     if (!isA("String", sample)) {
@@ -1001,7 +999,7 @@ function recordAsyncExpect(_test, promise, assertion, error) {
     test.onFinished.push(() => {
       var _a;
       if (!resolved) {
-        const processor = ((_a = globalThis.__vitest_worker__) == null ? undefined : _a.onFilterStackTrace) || ((s) => s || "");
+        const processor = ((_a = globalThis.__vitest_worker__) == null ? void 0 : _a.onFilterStackTrace) || ((s) => s || "");
         const stack = processor(error.stack);
         console.warn([
           `Promise returned by \`${assertion}\` was not awaited. `,
@@ -1357,10 +1355,10 @@ const JestChaiExpect = (chai, utils) => {
   def("toBeUndefined", function() {
     const obj = utils.flag(this, "object");
     this.assert(
-      undefined === obj,
+      void 0 === obj,
       "expected #{this} to be undefined",
       "expected #{this} not to be undefined",
-      undefined,
+      void 0,
       obj
     );
   });
@@ -1429,7 +1427,7 @@ const JestChaiExpect = (chai, utils) => {
         `expected #{this} to have property "${propertyName}"${valueString}`,
         `expected #{this} to not have property "${propertyName}"${valueString}`,
         expected,
-        exists ? value : undefined
+        exists ? value : void 0
       );
     }
   );
@@ -1836,7 +1834,7 @@ const JestChaiExpect = (chai, utils) => {
         `expected last "${spyName}" call to ${action} #{exp}`,
         `expected last "${spyName}" call to not ${action} #{exp}`,
         value,
-        result == null ? undefined : result.value
+        result == null ? void 0 : result.value
       );
     });
   });
@@ -1869,7 +1867,7 @@ const JestChaiExpect = (chai, utils) => {
         `expected ${ordinalCall} "${spyName}" call to ${action} #{exp}`,
         `expected ${ordinalCall} "${spyName}" call to not ${action} #{exp}`,
         value,
-        result == null ? undefined : result.value
+        result == null ? void 0 : result.value
       );
     });
   });
@@ -1893,7 +1891,7 @@ const JestChaiExpect = (chai, utils) => {
           `expect.poll() is not supported in combination with .resolves`
         );
       }
-      if (typeof (obj == null ? undefined : obj.then) !== "function") {
+      if (typeof (obj == null ? void 0 : obj.then) !== "function") {
         throw new TypeError(
           `You must provide a Promise to expect() when using .resolves, not '${typeof obj}'.`
         );
@@ -1953,7 +1951,7 @@ const JestChaiExpect = (chai, utils) => {
           `expect.poll() is not supported in combination with .rejects`
         );
       }
-      if (typeof (wrapper == null ? undefined : wrapper.then) !== "function") {
+      if (typeof (wrapper == null ? void 0 : wrapper.then) !== "function") {
         throw new TypeError(
           `You must provide a Promise to expect() when using .rejects, not '${typeof wrapper}'.`
         );

package/package.json

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