@vitest/expect 1.0.0-beta.3 → 1.0.0-beta.5

package/dist/index.d.ts

@@ -58,6 +58,7 @@ interface MatcherHintOptions {
     secondArgumentColor?: Formatter;
 }
 interface MatcherState {
+    customTesters: Array<Tester>;
     assertionCalls: number;
     currentTestName?: string;
     dontThrow?: () => void;
@@ -254,6 +255,7 @@ declare function pluralize(word: string, count: number): string;
 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;
@@ -262,4 +264,4 @@ declare const JestChaiExpect: ChaiPlugin;
 
 declare const JestExtend: ChaiPlugin;
 
-export { 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 RawMatcherFn, StringContaining, StringMatching, type SyncExpectationResult, type Tester, arrayBufferEquality, equals, fnNameFor, generateToBeMessage, getState, hasAsymmetric, hasProperty, isA, isAsymmetric, isImmutableUnorderedKeyed, isImmutableUnorderedSet, iterableEquality, pluralize, setState, sparseArrayEquality, subsetEquality, typeEquality };
+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 RawMatcherFn, StringContaining, StringMatching, type SyncExpectationResult, type Tester, arrayBufferEquality, equals, fnNameFor, generateToBeMessage, getState, hasAsymmetric, hasProperty, isA, isAsymmetric, isImmutableUnorderedKeyed, isImmutableUnorderedSet, iterableEquality, pluralize, setState, sparseArrayEquality, subsetEquality, typeEquality };

package/dist/index.js

@@ -8,10 +8,12 @@ import { util } from 'chai';
 const MATCHERS_OBJECT = Symbol.for("matchers-object");
 const JEST_MATCHERS_OBJECT = Symbol.for("$$jest-matchers-object");
 const GLOBAL_EXPECT = Symbol.for("expect-global");
+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 assymetricMatchers = /* @__PURE__ */ Object.create(null);
   Object.defineProperty(globalThis, MATCHERS_OBJECT, {
     get: () => globalState
   });
@@ -22,6 +24,9 @@ if (!Object.prototype.hasOwnProperty.call(globalThis, MATCHERS_OBJECT)) {
       matchers
     })
   });
+  Object.defineProperty(globalThis, ASYMMETRIC_MATCHERS_OBJECT, {
+    get: () => assymetricMatchers
+  });
 }
 function getState(expect) {
   return globalThis[MATCHERS_OBJECT].get(expect);
@@ -425,6 +430,7 @@ class AsymmetricMatcher {
       ...getState(expect || globalThis[GLOBAL_EXPECT]),
       equals,
       isNot: this.inverse,
+      customTesters: [],
       utils: {
         ...getMatcherUtils(),
         diff,
@@ -843,6 +849,32 @@ const JestChaiExpect = (chai, utils) => {
       return this.match(expected);
   });
   def("toContain", function(item) {
+    const actual = this._obj;
+    if (typeof Node !== "undefined" && actual instanceof Node) {
+      if (!(item instanceof Node))
+        throw new TypeError(`toContain() expected a DOM node as the argument, but got ${typeof item}`);
+      return this.assert(
+        actual.contains(item),
+        "expected #{this} to contain element #{exp}",
+        "expected #{this} not to contain element #{exp}",
+        item,
+        actual
+      );
+    }
+    if (typeof DOMTokenList !== "undefined" && actual instanceof DOMTokenList) {
+      assertTypes(item, "class name", ["string"]);
+      const isNot = utils.flag(this, "negate");
+      const expectedClassList = isNot ? actual.value.replace(item, "").trim() : `${actual.value} ${item}`;
+      return this.assert(
+        actual.contains(item),
+        `expected "${actual.value}" to contain "${item}"`,
+        `expected "${actual.value}" not to contain "${item}"`,
+        expectedClassList,
+        actual.value
+      );
+    }
+    if (actual != null && typeof actual !== "string")
+      utils.flag(this, "object", Array.from(actual));
     return this.contain(item);
   });
   def("toContainEqual", function(expected) {
@@ -1327,6 +1359,7 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
                 `promise rejected "${utils.inspect(err)}" instead of resolving`,
                 { showDiff: false }
               );
+              _error.cause = err;
               _error.stack = error.stack.replace(error.message, _error.message);
               throw _error;
             }
@@ -1356,7 +1389,7 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
             (value) => {
               const _error = new AssertionError(
                 `promise resolved "${utils.inspect(value)}" instead of rejecting`,
-                { showDiff: false }
+                { showDiff: true, expected: new Error("rejected promise"), actual: value }
               );
               _error.stack = error.stack.replace(error.message, _error.message);
               throw _error;
@@ -1387,6 +1420,8 @@ function getMatcherState(assertion, expect) {
   };
   const matcherState = {
     ...getState(expect),
+    // TODO: implement via expect.addEqualityTesters
+    customTesters: [],
     isNot,
     utils: jestUtils,
     promise,
@@ -1448,10 +1483,11 @@ function JestExtendPlugin(expect, matchers) {
           return `${this.toString()}<${this.sample.map(String).join(", ")}>`;
         }
       }
+      const customMatcher = (...sample) => new CustomMatcher(false, ...sample);
       Object.defineProperty(expect, expectAssertionName, {
         configurable: true,
         enumerable: true,
-        value: (...sample) => new CustomMatcher(false, ...sample),
+        value: customMatcher,
         writable: true
       });
       Object.defineProperty(expect.not, expectAssertionName, {
@@ -1460,6 +1496,12 @@ function JestExtendPlugin(expect, matchers) {
         value: (...sample) => new CustomMatcher(true, ...sample),
         writable: true
       });
+      Object.defineProperty(globalThis[ASYMMETRIC_MATCHERS_OBJECT], expectAssertionName, {
+        configurable: true,
+        enumerable: true,
+        value: customMatcher,
+        writable: true
+      });
     });
   };
 }
@@ -1469,4 +1511,4 @@ const JestExtend = (chai, utils) => {
   });
 };
 
-export { Any, Anything, ArrayContaining, AsymmetricMatcher, GLOBAL_EXPECT, JEST_MATCHERS_OBJECT, JestAsymmetricMatchers, JestChaiExpect, JestExtend, MATCHERS_OBJECT, ObjectContaining, StringContaining, StringMatching, arrayBufferEquality, equals, fnNameFor, generateToBeMessage, getState, hasAsymmetric, hasProperty, isA, isAsymmetric, isImmutableUnorderedKeyed, isImmutableUnorderedSet, iterableEquality, pluralize, setState, sparseArrayEquality, subsetEquality, typeEquality };
+export { ASYMMETRIC_MATCHERS_OBJECT, Any, Anything, ArrayContaining, AsymmetricMatcher, GLOBAL_EXPECT, JEST_MATCHERS_OBJECT, JestAsymmetricMatchers, JestChaiExpect, JestExtend, MATCHERS_OBJECT, ObjectContaining, StringContaining, StringMatching, arrayBufferEquality, equals, fnNameFor, generateToBeMessage, getState, hasAsymmetric, hasProperty, isA, isAsymmetric, isImmutableUnorderedKeyed, isImmutableUnorderedSet, iterableEquality, pluralize, setState, sparseArrayEquality, subsetEquality, typeEquality };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/expect",
   "type": "module",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.5",
   "description": "Jest's expect matchers as a Chai plugin",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -18,7 +18,7 @@
   "exports": {
     ".": {
       "types": "./index.d.ts",
-      "import": "./dist/index.js"
+      "default": "./dist/index.js"
     },
     "./*": "./*"
   },
@@ -26,19 +26,19 @@
   "module": "./dist/index.js",
   "types": "./index.d.ts",
   "files": [
-    "dist",
-    "*.d.ts"
+    "*.d.ts",
+    "dist"
   ],
   "dependencies": {
     "chai": "^4.3.10",
-    "@vitest/utils": "1.0.0-beta.3",
-    "@vitest/spy": "1.0.0-beta.3"
+    "@vitest/spy": "1.0.0-beta.5",
+    "@vitest/utils": "1.0.0-beta.5"
   },
   "devDependencies": {
     "@types/chai": "4.3.6",
     "picocolors": "^1.0.0",
     "rollup-plugin-copy": "^3.5.0",
-    "@vitest/runner": "1.0.0-beta.3"
+    "@vitest/runner": "1.0.0-beta.5"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",