🤖 Merge PR DefinitelyTyped#46413 fix(es‑abstract): Correct `PromiseRe…

…solve` type definition by @ExE-Boss
EvanHahn · Jul 28, 2020 · 6615068 · 6615068
1 parent 4601622
commit 6615068
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/types/es-abstract/2018/PromiseResolve.d.ts b/types/es-abstract/2018/PromiseResolve.d.ts
@@ -4,9 +4,9 @@ type PromiseConstructorLikeReturnType<C extends PromiseConstructorLike, T> = C e
     ? R
     : PromiseLike<T>;
 
-declare function PromiseResolve<T>(C: PromiseConstructor, x: T): Promise<T>;
+declare function PromiseResolve<T>(C: PromiseConstructor, x: T | PromiseLike<T>): Promise<T>;
 declare function PromiseResolve<C extends PromiseConstructorLike, T>(
     C: C,
-    x: T,
+    x: T | PromiseLike<T>,
 ): PromiseConstructorLikeReturnType<C, T>;
 export = PromiseResolve;
diff --git a/types/es-abstract/test/es2018.test.ts b/types/es-abstract/test/es2018.test.ts
@@ -8,6 +8,11 @@ interface FakePromise<T> extends PromiseLike<T> {
     doStuff(): void;
 }
 
+function testGeneric<T, TReturn>({ done, value }: IteratorResult<T | PromiseLike<T>, TReturn | PromiseLike<TReturn>>) {
+    // $ExpectType Promise<T | TReturn>
+    ES2018.PromiseResolve(Promise, value);
+}
+
 // $ExpectType FakePromise<unknown>
 ES2018.PromiseResolve(FakePromise, any);