Better typings for Promise executor, like #31117

src/lib/es2015.promise.d.ts

@@ -10,7 +10,7 @@ interface PromiseConstructor {
      * a resolve callback used to resolve the promise with a value or the result of another promise,
      * and a reject callback used to reject the promise with a provided reason or error.
      */
-    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+    new <T>(executor: (resolve: (value?: T) => void, reject: (reason?: any) => void) => void): Promise<T extends PromiseLike<infer U> ? U : T>;
 
     /**
      * Creates a Promise that is resolved with an array of results when all of the provided Promises

src/lib/es5.d.ts

@@ -1378,7 +1378,7 @@ declare type PropertyDecorator = (target: Object, propertyKey: string | symbol)
 declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
 declare type ParameterDecorator = (target: Object, propertyKey: string | symbol, parameterIndex: number) => void;
 
-declare type PromiseConstructorLike = new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void) => PromiseLike<T>;
+declare type PromiseConstructorLike = new <T>(executor: (resolve: (value?: T) => void, reject: (reason?: any) => void) => void) => PromiseLike<T extends PromiseLike<infer U> ? U : T>;
 
 interface PromiseLike<T> {
     /**

tests/baselines/reference/asyncAwaitNestedClasses_es5.types

@@ -14,10 +14,10 @@ class A {
             return new Promise((resolve) => { resolve(null); });
 >new Promise((resolve) => { resolve(null); }) : Promise<void>
 >Promise : PromiseConstructor
->(resolve) => { resolve(null); } : (resolve: (value?: void | PromiseLike<void>) => void) => void
->resolve : (value?: void | PromiseLike<void>) => void
+>(resolve) => { resolve(null); } : (resolve: (value?: void) => void) => void
+>resolve : (value?: void) => void
 >resolve(null) : void
->resolve : (value?: void | PromiseLike<void>) => void
+>resolve : (value?: void) => void
 >null : null
         }
         static C = class C {

tests/baselines/reference/asyncFunctionDeclaration15_es5.errors.txt

@@ -5,7 +5,7 @@ tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration1
 tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(8,23): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(9,23): error TS1055: Type 'PromiseLike' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(10,23): error TS1055: Type 'typeof Thenable' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-  Construct signature return types 'Thenable' and 'PromiseLike<T>' are incompatible.
+  Construct signature return types 'Thenable' and 'PromiseLike<T extends PromiseLike<infer U> ? U : T>' are incompatible.
     The types returned by 'then(...)' are incompatible between these types.
       Type 'void' is not assignable to type 'PromiseLike<TResult1 | TResult2>'.
 tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(17,16): error TS1058: The return type of an async function must either be a valid promise or must not contain a callable 'then' member.
@@ -37,7 +37,7 @@ tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration1
     async function fn6(): Thenable { } // error
                           ~~~~~~~~
 !!! error TS1055: Type 'typeof Thenable' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-!!! error TS1055:   Construct signature return types 'Thenable' and 'PromiseLike<T>' are incompatible.
+!!! error TS1055:   Construct signature return types 'Thenable' and 'PromiseLike<T extends PromiseLike<infer U> ? U : T>' are incompatible.
 !!! error TS1055:     The types returned by 'then(...)' are incompatible between these types.
 !!! error TS1055:       Type 'void' is not assignable to type 'PromiseLike<TResult1 | TResult2>'.
     async function fn7() { return; } // valid: Promise<void>

tests/baselines/reference/asyncImportedPromise_es5.types

@@ -1,7 +1,7 @@
 === tests/cases/conformance/async/es5/task.ts ===
 export class Task<T> extends Promise<T> { }
 >Task : Task<T>
->Promise : Promise<T>
+>Promise : Promise<T extends PromiseLike<infer U> ? U : T>
 
 === tests/cases/conformance/async/es5/test.ts ===
 import { Task } from "./task";

tests/baselines/reference/asyncImportedPromise_es6.types

@@ -1,7 +1,7 @@
 === tests/cases/conformance/async/es6/task.ts ===
 export class Task<T> extends Promise<T> { }
 >Task : Task<T>
->Promise : Promise<T>
+>Promise : Promise<T extends PromiseLike<infer U> ? U : T>
 
 === tests/cases/conformance/async/es6/test.ts ===
 import { Task } from "./task";

tests/baselines/reference/asyncQualifiedReturnType_es5.types

@@ -4,7 +4,7 @@ namespace X {
 
     export class MyPromise<T> extends Promise<T> {
 >MyPromise : MyPromise<T>
->Promise : Promise<T>
+>Promise : Promise<T extends PromiseLike<infer U> ? U : T>
     }
 }
 

tests/baselines/reference/asyncQualifiedReturnType_es6.types

@@ -4,7 +4,7 @@ namespace X {
 
     export class MyPromise<T> extends Promise<T> {
 >MyPromise : MyPromise<T>
->Promise : Promise<T>
+>Promise : Promise<T extends PromiseLike<infer U> ? U : T>
     }
 }
 

tests/baselines/reference/contextuallyTypeAsyncFunctionAwaitOperand.types

@@ -17,10 +17,10 @@ async function fn1(): Promise<Obj> {
 >await new Promise(resolve => resolve({ key: "value" })) : Obj
 >new Promise(resolve => resolve({ key: "value" })) : Promise<Obj>
 >Promise : PromiseConstructor
->resolve => resolve({ key: "value" }) : (resolve: (value?: Obj | PromiseLike<Obj>) => void) => void
->resolve : (value?: Obj | PromiseLike<Obj>) => void
+>resolve => resolve({ key: "value" }) : (resolve: (value?: Obj) => void) => void
+>resolve : (value?: Obj) => void
 >resolve({ key: "value" }) : void
->resolve : (value?: Obj | PromiseLike<Obj>) => void
+>resolve : (value?: Obj) => void
 >{ key: "value" } : { key: "value"; }
 >key : "value"
 >"value" : "value"

tests/baselines/reference/contextuallyTypeAsyncFunctionReturnType.types

@@ -17,12 +17,12 @@ async function fn2(): Promise<Obj> {
     return new Promise(resolve => {
 >new Promise(resolve => {        resolve({ key: "value" });    }) : Promise<Obj>
 >Promise : PromiseConstructor
->resolve => {        resolve({ key: "value" });    } : (resolve: (value?: Obj | PromiseLike<Obj>) => void) => void
->resolve : (value?: Obj | PromiseLike<Obj>) => void
+>resolve => {        resolve({ key: "value" });    } : (resolve: (value?: Obj) => void) => void
+>resolve : (value?: Obj) => void
 
         resolve({ key: "value" });
 >resolve({ key: "value" }) : void
->resolve : (value?: Obj | PromiseLike<Obj>) => void
+>resolve : (value?: Obj) => void
 >{ key: "value" } : { key: "value"; }
 >key : "value"
 >"value" : "value"
@@ -47,12 +47,12 @@ async function fn4(): Promise<Obj> {
 >await new Promise(resolve => {        resolve({ key: "value" });    }) : Obj
 >new Promise(resolve => {        resolve({ key: "value" });    }) : Promise<Obj>
 >Promise : PromiseConstructor
->resolve => {        resolve({ key: "value" });    } : (resolve: (value?: Obj | PromiseLike<Obj>) => void) => void
->resolve : (value?: Obj | PromiseLike<Obj>) => void
+>resolve => {        resolve({ key: "value" });    } : (resolve: (value?: Obj) => void) => void
+>resolve : (value?: Obj) => void
 
         resolve({ key: "value" });
 >resolve({ key: "value" }) : void
->resolve : (value?: Obj | PromiseLike<Obj>) => void
+>resolve : (value?: Obj) => void
 >{ key: "value" } : { key: "value"; }
 >key : "value"
 >"value" : "value"

tests/baselines/reference/inferenceLimit.types

@@ -19,8 +19,8 @@ export class BrokenClass {
 >new Promise<Array<MyModule.MyModel>>((resolve, reject) => {    let result: Array<MyModule.MyModel> = [];    let populateItems = (order) => {      return new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      });    };    return Promise.all(result.map(populateItems))      .then((orders: Array<MyModule.MyModel>) => {        resolve(orders);      });    }) : Promise<MyModule.MyModel[]>
 >Promise : PromiseConstructor
 >MyModule : any
->(resolve, reject) => {    let result: Array<MyModule.MyModel> = [];    let populateItems = (order) => {      return new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      });    };    return Promise.all(result.map(populateItems))      .then((orders: Array<MyModule.MyModel>) => {        resolve(orders);      });    } : (resolve: (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void, reject: (reason?: any) => void) => Promise<void>
->resolve : (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
+>(resolve, reject) => {    let result: Array<MyModule.MyModel> = [];    let populateItems = (order) => {      return new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      });    };    return Promise.all(result.map(populateItems))      .then((orders: Array<MyModule.MyModel>) => {        resolve(orders);      });    } : (resolve: (value?: MyModule.MyModel[]) => void, reject: (reason?: any) => void) => Promise<void>
+>resolve : (value?: MyModule.MyModel[]) => void
 >reject : (reason?: any) => void
 
     let result: Array<MyModule.MyModel> = [];
@@ -93,7 +93,7 @@ export class BrokenClass {
 
         resolve(orders);
 >resolve(orders) : void
->resolve : (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
+>resolve : (value?: MyModule.MyModel[]) => void
 >orders : MyModule.MyModel[]
 
       });

tests/baselines/reference/promiseType.js

@@ -217,6 +217,12 @@ const pc6 = p.then(() => Promise.reject("1"), () => {});
 const pc7 = p.then(() => Promise.reject("1"), () => {throw 1});
 const pc8 = p.then(() => Promise.reject("1"), () => Promise.resolve(1));
 const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
+
+// #27711
+
+const expected: Promise<string> = new Promise<Promise<string>>(() => {});
+
+new Promise(undefined as (resolve: (value: Promise<string> | number) => void) => void);
 
 
 //// [promiseType.js]
@@ -440,3 +446,6 @@ const pc6 = p.then(() => Promise.reject("1"), () => { });
 const pc7 = p.then(() => Promise.reject("1"), () => { throw 1; });
 const pc8 = p.then(() => Promise.reject("1"), () => Promise.resolve(1));
 const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
+// #27711
+const expected = new Promise(() => { });
+new Promise(undefined);

tests/baselines/reference/promiseType.symbols

@@ -1089,3 +1089,18 @@ const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
+// #27711
+
+const expected: Promise<string> = new Promise<Promise<string>>(() => {});
+>expected : Symbol(expected, Decl(promiseType.ts, 221, 5))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+
+new Promise(undefined as (resolve: (value: Promise<string> | number) => void) => void);
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>undefined : Symbol(undefined)
+>resolve : Symbol(resolve, Decl(promiseType.ts, 223, 26))
+>value : Symbol(value, Decl(promiseType.ts, 223, 36))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+

tests/baselines/reference/promiseType.types

@@ -1583,3 +1583,19 @@ const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
 >reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
+// #27711
+
+const expected: Promise<string> = new Promise<Promise<string>>(() => {});
+>expected : Promise<string>
+>new Promise<Promise<string>>(() => {}) : Promise<string>
+>Promise : PromiseConstructor
+>() => {} : () => void
+
+new Promise(undefined as (resolve: (value: Promise<string> | number) => void) => void);
+>new Promise(undefined as (resolve: (value: Promise<string> | number) => void) => void) : Promise<string | number>
+>Promise : PromiseConstructor
+>undefined as (resolve: (value: Promise<string> | number) => void) => void : (resolve: (value: number | Promise<string>) => void) => void
+>undefined : undefined
+>resolve : (value: number | Promise<string>) => void
+>value : number | Promise<string>
+

tests/baselines/reference/user/chrome-devtools-frontend.log

@@ -8326,6 +8326,11 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(85
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(129,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(161,40): error TS2339: Property 'keysArray' does not exist on type 'Map<number, (arg0: any) => any>'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(231,15): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(250,5): error TS2322: Type 'Promise<T extends PromiseLike<infer U> ? U : T>' is not assignable to type 'Promise<T>'.
+  Type 'T extends PromiseLike<infer U> ? U : T' is not assignable to type 'T'.
+    'T extends PromiseLike<infer U> ? U : T' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '{}'.
+      Type 'unknown' is not assignable to type 'T'.
+        'unknown' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(263,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(284,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(286,43): error TS2555: Expected at least 4 arguments, but got 3.
@@ -9617,6 +9622,11 @@ node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(370,31): err
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(371,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(378,39): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(379,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(384,5): error TS2322: Type 'Promise<T extends PromiseLike<infer U> ? U : T>' is not assignable to type 'Promise<T>'.
+  Type 'T extends PromiseLike<infer U> ? U : T' is not assignable to type 'T'.
+    'T extends PromiseLike<infer U> ? U : T' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '{}'.
+      Type 'unknown' is not assignable to type 'T'.
+        'unknown' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(420,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(422,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(423,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -10930,6 +10940,8 @@ node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(12,64)
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(12,94): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(13,6): error TS2551: Property 'testRunner' does not exist on type 'Window & typeof globalThis'. Did you mean 'TestRunner'?
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(24,8): error TS2551: Property 'testRunner' does not exist on type 'Window & typeof globalThis'. Did you mean 'TestRunner'?
+node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(25,3): error TS2322: Type 'Promise<unknown>' is not assignable to type 'Promise<undefined>'.
+  Type 'unknown' is not assignable to type 'undefined'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(42,21): error TS2551: Property 'testRunner' does not exist on type 'Window & typeof globalThis'. Did you mean 'TestRunner'?
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(76,8): error TS2551: Property 'testRunner' does not exist on type 'Window & typeof globalThis'. Did you mean 'TestRunner'?
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(117,19): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -12649,8 +12661,8 @@ node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1910,22): error TS
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1911,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1912,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1913,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1943,50): error TS2345: Argument of type 'HTMLImageElement' is not assignable to parameter of type '(new (width?: number, height?: number) => HTMLImageElement) | PromiseLike<new (width?: number, height?: number) => HTMLImageElement>'.
-  Property 'then' is missing in type 'HTMLImageElement' but required in type 'PromiseLike<new (width?: number, height?: number) => HTMLImageElement>'.
+node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1943,50): error TS2345: Argument of type 'HTMLImageElement' is not assignable to parameter of type 'new (width?: number, height?: number) => HTMLImageElement'.
+  Type 'HTMLImageElement' provides no match for the signature 'new (width?: number, height?: number): HTMLImageElement'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1961,12): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1966,23): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1967,23): error TS2339: Property 'style' does not exist on type 'Element'.