@vitest/expect 2.0.0-beta.1 → 2.0.0-beta.3

package/dist/index.d.ts

@@ -65,6 +65,7 @@ interface MatcherState {
         subsetEquality: Tester;
     };
     soft?: boolean;
+    poll?: boolean;
 }
 interface SyncExpectationResult {
     pass: boolean;
@@ -80,12 +81,7 @@ interface RawMatcherFn<T extends MatcherState = MatcherState> {
 type MatchersObject<T extends MatcherState = MatcherState> = Record<string, RawMatcherFn<T>>;
 interface ExpectStatic extends Chai.ExpectStatic, AsymmetricMatchersContaining {
     <T>(actual: T, message?: string): Assertion<T>;
-    unreachable: (message?: string) => never;
-    soft: <T>(actual: T, message?: string) => Assertion<T>;
     extend: (expects: MatchersObject) => void;
-    addEqualityTesters: (testers: Array<Tester>) => void;
-    assertions: (expected: number) => void;
-    hasAssertions: () => void;
     anything: () => any;
     any: (constructor: unknown) => any;
     getState: () => MatcherState;
@@ -150,12 +146,13 @@ type VitestAssertion<A, T> = {
 type Promisify<O> = {
     [K in keyof O]: O[K] extends (...args: infer A) => infer R ? O extends R ? Promisify<O[K]> : (...args: A) => Promise<R> : O[K];
 };
+type PromisifyAssertion<T> = Promisify<Assertion<T>>;
 interface Assertion<T = any> extends VitestAssertion<Chai.Assertion, T>, JestAssertion<T> {
     toBeTypeOf: (expected: 'bigint' | 'boolean' | 'function' | 'number' | 'object' | 'string' | 'symbol' | 'undefined') => void;
     toHaveBeenCalledOnce: () => void;
     toSatisfy: <E>(matcher: (value: E) => boolean, message?: string) => void;
-    resolves: Promisify<Assertion<T>>;
-    rejects: Promisify<Assertion<T>>;
+    resolves: PromisifyAssertion<T>;
+    rejects: PromisifyAssertion<T>;
 }
 declare global {
     namespace jest {
@@ -255,4 +252,4 @@ 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 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 };
+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

@@ -254,7 +254,7 @@ function isDomNode(obj) {
 function fnNameFor(func) {
   if (func.name)
     return func.name;
-  const matches = functionToString.call(func).match(/^(?:async)?\s*function\s*\*?\s*([\w$]+)\s*\(/);
+  const matches = functionToString.call(func).match(/^(?:async)?\s*function\s*(?:\*\s*)?([\w$]+)\s*\(/);
   return matches ? matches[1] : "<anonymous>";
 }
 function getPrototype(obj) {
@@ -661,7 +661,7 @@ class Any extends AsymmetricMatcher {
     if (func.name)
       return func.name;
     const functionToString = Function.prototype.toString;
-    const matches = functionToString.call(func).match(/^(?:async)?\s*function\s*\*?\s*([\w$]+)\s*\(/);
+    const matches = functionToString.call(func).match(/^(?:async)?\s*function\s*(?:\*\s*)?([\w$]+)\s*\(/);
     return matches ? matches[1] : "<anonymous>";
   }
   asymmetricMatch(other) {
@@ -817,10 +817,9 @@ function recordAsyncExpect(test, promise) {
 function wrapSoft(utils, fn) {
   return function(...args) {
     var _a;
-    const test = utils.flag(this, "vitest-test");
-    const state = (test == null ? void 0 : test.context._local) ? test.context.expect.getState() : getState(globalThis[GLOBAL_EXPECT]);
-    if (!state.soft)
+    if (!utils.flag(this, "soft"))
       return fn.apply(this, args);
+    const test = utils.flag(this, "vitest-test");
     if (!test)
       throw new Error("expect.soft() can only be used inside a test");
     try {
@@ -1484,12 +1483,19 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
   def("toSatisfy", function(matcher, message) {
     return this.be.satisfy(matcher, message);
   });
+  def("withContext", function(context) {
+    for (const key in context)
+      utils.flag(this, key, context[key]);
+    return this;
+  });
   utils.addProperty(chai.Assertion.prototype, "resolves", function __VITEST_RESOLVES__() {
     const error = new Error("resolves");
     utils.flag(this, "promise", "resolves");
     utils.flag(this, "error", error);
     const test = utils.flag(this, "vitest-test");
     const obj = utils.flag(this, "object");
+    if (utils.flag(this, "poll"))
+      throw new SyntaxError(`expect.poll() is not supported in combination with .resolves`);
     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}'.`);
     const proxy = new Proxy(this, {
@@ -1526,6 +1532,8 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
     const test = utils.flag(this, "vitest-test");
     const obj = utils.flag(this, "object");
     const wrapper = typeof obj === "function" ? obj() : obj;
+    if (utils.flag(this, "poll"))
+      throw new SyntaxError(`expect.poll() is not supported in combination with .rejects`);
     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}'.`);
     const proxy = new Proxy(this, {
@@ -1575,7 +1583,9 @@ function getMatcherState(assertion, expect) {
     promise,
     equals,
     // needed for built-in jest-snapshots, but we don't use it
-    suppressedErrors: []
+    suppressedErrors: [],
+    soft: util.flag(assertion, "soft"),
+    poll: util.flag(assertion, "poll")
   };
   return {
     state: matcherState,

package/package.json

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