From fa415059a02ad216d8d433f1eb55cb2ac05db2ff Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Fri, 17 Jan 2025 18:52:08 +0900
Subject: [PATCH] fix(expect): fix `expect().resolves/rejects` chain typings
 (#7273)

---
 packages/expect/src/types.ts       |  4 +---
 test/core/test/jest-expect.test.ts | 13 +++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/expect/src/types.ts b/packages/expect/src/types.ts
index 963273382..792a8b84a 100644
--- a/packages/expect/src/types.ts
+++ b/packages/expect/src/types.ts
@@ -622,9 +622,7 @@ 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>
+    ? Promisify<O[K]> & ((...args: A) => Promise<R>)
     : O[K];
 }
 
diff --git a/test/core/test/jest-expect.test.ts b/test/core/test/jest-expect.test.ts
index d1f2a635d..93566aec3 100644
--- a/test/core/test/jest-expect.test.ts
+++ b/test/core/test/jest-expect.test.ts
@@ -1172,6 +1172,19 @@ describe('async expect', () => {
       expect(error).toMatchObject({ message: 'promise rejected "+0" instead of resolving' })
     }
   })
+
+  it('chainable types', async () => {
+    /* eslint-disable prefer-promise-reject-errors */
+    await expect(Promise.resolve(1)).resolves.toBeOneOf([1])
+    await expect(Promise.resolve(1)).resolves.not.toBeOneOf([2])
+    await expect(Promise.reject(1)).rejects.toBeOneOf([1])
+    await expect(Promise.reject(1)).rejects.not.toBeOneOf([2])
+    await expect(Promise.resolve(1)).resolves.toSatisfy(v => v === 1)
+    await expect(Promise.reject(2)).rejects.toSatisfy(v => v === 2)
+    await (expect(Promise.resolve(1)).resolves.to.equal(1) satisfies Promise<any>)
+    await (expect(Promise.resolve(1)).resolves.not.to.equal(2) satisfies Promise<any>)
+    /* eslint-enable prefer-promise-reject-errors */
+  })
 })
 
 it('compatible with jest', () => {
-- 
2.51.2