@vitest/expect 2.1.3 → 2.1.4

package/README.md

@@ -5,12 +5,12 @@ Jest's expect matchers as a Chai plugin.
 ## Usage
 
 ```js
-import * as chai from 'chai'
 import {
   JestAsymmetricMatchers,
   JestChaiExpect,
   JestExtend,
 } from '@vitest/expect'
+import * as chai from 'chai'
 
 // allows using expect.extend instead of chai.use to extend plugins
 chai.use(JestExtend)

package/dist/index.d.ts

@@ -1,9 +1,14 @@
+import { stringify, Constructable } from '@vitest/utils';
 import * as tinyrainbow from 'tinyrainbow';
 import { Formatter } from 'tinyrainbow';
-import { stringify, Constructable } from '@vitest/utils';
 import { diff, printDiffOrStringify } from '@vitest/utils/diff';
 export { DiffOptions } from '@vitest/utils/diff';
 
+declare const MATCHERS_OBJECT: unique symbol;
+declare const JEST_MATCHERS_OBJECT: unique symbol;
+declare const GLOBAL_EXPECT: unique symbol;
+declare const ASYMMETRIC_MATCHERS_OBJECT: unique symbol;
+
 declare function matcherHint(matcherName: string, received?: string, expected?: string, options?: MatcherHintOptions): string;
 declare function printReceived(object: unknown): string;
 declare function printExpected(value: unknown): string;
@@ -227,6 +232,10 @@ declare class StringMatching extends AsymmetricMatcher<RegExp> {
 }
 declare const JestAsymmetricMatchers: ChaiPlugin;
 
+declare const JestChaiExpect: ChaiPlugin;
+
+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;
@@ -248,16 +257,7 @@ declare function getObjectSubset(object: any, subset: any, customTesters: Array<
     stripped: number;
 };
 
-declare const MATCHERS_OBJECT: unique symbol;
-declare const JEST_MATCHERS_OBJECT: unique symbol;
-declare const GLOBAL_EXPECT: unique symbol;
-declare const ASYMMETRIC_MATCHERS_OBJECT: unique symbol;
-
 declare function getState<State extends MatcherState = MatcherState>(expect: ExpectStatic): State;
 declare function setState<State extends MatcherState = MatcherState>(state: Partial<State>, expect: ExpectStatic): void;
 
-declare const JestChaiExpect: ChaiPlugin;
-
-declare const JestExtend: ChaiPlugin;
-
 export { ASYMMETRIC_MATCHERS_OBJECT, Any, Anything, ArrayContaining, type Assertion, AsymmetricMatcher, type AsymmetricMatcherInterface, type AsymmetricMatchersContaining, type AsyncExpectationResult, type ChaiPlugin, type ExpectStatic, type ExpectationResult, GLOBAL_EXPECT, JEST_MATCHERS_OBJECT, type JestAssertion, JestAsymmetricMatchers, JestChaiExpect, JestExtend, MATCHERS_OBJECT, type MatcherHintOptions, type MatcherState, type MatchersObject, ObjectContaining, type PromisifyAssertion, type RawMatcherFn, StringContaining, StringMatching, type SyncExpectationResult, type Tester, type TesterContext, addCustomEqualityTesters, arrayBufferEquality, equals, fnNameFor, generateToBeMessage, getObjectKeys, getObjectSubset, getState, hasAsymmetric, hasProperty, isA, isAsymmetric, isImmutableUnorderedKeyed, isImmutableUnorderedSet, iterableEquality, pluralize, setState, sparseArrayEquality, subsetEquality, typeEquality };

package/dist/index.js

@@ -1,6 +1,6 @@
 import { getType, stringify, isObject, assertTypes } from '@vitest/utils';
-import c from 'tinyrainbow';
 import { diff, printDiffOrStringify } from '@vitest/utils/diff';
+import c from 'tinyrainbow';
 import { isMockFunction } from '@vitest/spy';
 import { processError } from '@vitest/utils/error';
 import { use, util } from 'chai';
@@ -12,39 +12,6 @@ const ASYMMETRIC_MATCHERS_OBJECT = Symbol.for(
   "asymmetric-matchers-object"
 );
 
-if (!Object.prototype.hasOwnProperty.call(globalThis, MATCHERS_OBJECT)) {
-  const globalState = /* @__PURE__ */ new WeakMap();
-  const matchers = /* @__PURE__ */ Object.create(null);
-  const customEqualityTesters = [];
-  const assymetricMatchers = /* @__PURE__ */ Object.create(null);
-  Object.defineProperty(globalThis, MATCHERS_OBJECT, {
-    get: () => globalState
-  });
-  Object.defineProperty(globalThis, JEST_MATCHERS_OBJECT, {
-    configurable: true,
-    get: () => ({
-      state: globalState.get(globalThis[GLOBAL_EXPECT]),
-      matchers,
-      customEqualityTesters
-    })
-  });
-  Object.defineProperty(globalThis, ASYMMETRIC_MATCHERS_OBJECT, {
-    get: () => assymetricMatchers
-  });
-}
-function getState(expect) {
-  return globalThis[MATCHERS_OBJECT].get(expect);
-}
-function setState(state, expect) {
-  const map = globalThis[MATCHERS_OBJECT];
-  const current = map.get(expect) || {};
-  const results = Object.defineProperties(current, {
-    ...Object.getOwnPropertyDescriptors(current),
-    ...Object.getOwnPropertyDescriptors(state)
-  });
-  map.set(expect, results);
-}
-
 const EXPECTED_COLOR = c.green;
 const RECEIVED_COLOR = c.red;
 const INVERTED_COLOR = c.inverse;
@@ -229,6 +196,7 @@ function eq(a, b, aStack, bStack, customTesters, hasKey2) {
       const numB = +b;
       return numA === numB || Number.isNaN(numA) && Number.isNaN(numB);
     }
+    // RegExps are compared by their source patterns and flags.
     case "[object RegExp]":
       return a.source === b.source && a.flags === b.flags;
   }
@@ -610,6 +578,39 @@ function getObjectSubset(object, subset, customTesters) {
   return { subset: getObjectSubsetWithContext()(object, subset), stripped };
 }
 
+if (!Object.prototype.hasOwnProperty.call(globalThis, MATCHERS_OBJECT)) {
+  const globalState = /* @__PURE__ */ new WeakMap();
+  const matchers = /* @__PURE__ */ Object.create(null);
+  const customEqualityTesters = [];
+  const assymetricMatchers = /* @__PURE__ */ Object.create(null);
+  Object.defineProperty(globalThis, MATCHERS_OBJECT, {
+    get: () => globalState
+  });
+  Object.defineProperty(globalThis, JEST_MATCHERS_OBJECT, {
+    configurable: true,
+    get: () => ({
+      state: globalState.get(globalThis[GLOBAL_EXPECT]),
+      matchers,
+      customEqualityTesters
+    })
+  });
+  Object.defineProperty(globalThis, ASYMMETRIC_MATCHERS_OBJECT, {
+    get: () => assymetricMatchers
+  });
+}
+function getState(expect) {
+  return globalThis[MATCHERS_OBJECT].get(expect);
+}
+function setState(state, expect) {
+  const map = globalThis[MATCHERS_OBJECT];
+  const current = map.get(expect) || {};
+  const results = Object.defineProperties(current, {
+    ...Object.getOwnPropertyDescriptors(current),
+    ...Object.getOwnPropertyDescriptors(state)
+  });
+  map.set(expect, results);
+}
+
 class AsymmetricMatcher {
   constructor(sample, inverse = false) {
     this.sample = sample;
@@ -1464,7 +1465,7 @@ const JestChaiExpect = (chai, utils) => {
     ["toThrow", "toThrowError"],
     function(expected) {
       if (typeof expected === "string" || typeof expected === "undefined" || expected instanceof RegExp) {
-        return this.throws(expected);
+        return this.throws(expected === "" ? /^$/ : expected);
       }
       const obj = this._obj;
       const promise = utils.flag(this, "promise");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/expect",
   "type": "module",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "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.1",
+    "chai": "^5.1.2",
     "tinyrainbow": "^1.2.0",
-    "@vitest/spy": "2.1.3",
-    "@vitest/utils": "2.1.3"
+    "@vitest/spy": "2.1.4",
+    "@vitest/utils": "2.1.4"
   },
   "devDependencies": {
     "@types/chai": "4.3.6",
     "rollup-plugin-copy": "^3.5.0",
-    "@vitest/runner": "2.1.3"
+    "@vitest/runner": "2.1.4"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",