Skip to content

Commit d5b4079

Browse files
jablkojablko
committed
Better typings for Promise executor, like #31117 
1 parent 2ec4722 commit d5b4079

13 files changed

+49
-25
lines changed

‎src/lib/es2015.promise.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interface PromiseConstructor {
1010
* a resolve callback used to resolve the promise with a value or the result of another promise,
1111
* and a reject callback used to reject the promise with a provided reason or error.
1212
*/
13-
new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
13+
new <T>(executor: (resolve: (value?: T) => void, reject: (reason?: any) => void) => void): Promise<T extends PromiseLike<infer U> ? U : T>;
1414

1515
/**
1616
* Creates a Promise that is resolved with an array of results when all of the provided Promises

‎src/lib/es5.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@ declare type PropertyDecorator = (target: Object, propertyKey: string | symbol)
13781378
declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
13791379
declare type ParameterDecorator = (target: Object, propertyKey: string | symbol, parameterIndex: number) => void;
13801380

1381-
declare type PromiseConstructorLike = new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void) => PromiseLike<T>;
1381+
declare type PromiseConstructorLike = new <T>(executor: (resolve: (value?: T) => void, reject: (reason?: any) => void) => void) => PromiseLike<T extends PromiseLike<infer U> ? U : T>;
13821382

13831383
interface PromiseLike<T> {
13841384
/**

‎tests/baselines/reference/asyncAwaitNestedClasses_es5.types

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ class A {
1414
return new Promise((resolve) => { resolve(null); });
1515
>new Promise((resolve) => { resolve(null); }) : Promise<void>
1616
>Promise : PromiseConstructor
17-
>(resolve) => { resolve(null); } : (resolve: (value?: void | PromiseLike<void>) => void) => void
18-
>resolve : (value?: void | PromiseLike<void>) => void
17+
>(resolve) => { resolve(null); } : (resolve: (value?: void) => void) => void
18+
>resolve : (value?: void) => void
1919
>resolve(null) : void
20-
>resolve : (value?: void | PromiseLike<void>) => void
20+
>resolve : (value?: void) => void
2121
>null : null
2222
}
2323
static C = class C {

‎tests/baselines/reference/asyncFunctionDeclaration15_es5.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration1
55
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.
66
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.
77
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.
8-
Construct signature return types 'Thenable' and 'PromiseLike<T>' are incompatible.
8+
Construct signature return types 'Thenable' and 'PromiseLike<T extends PromiseLike<infer U> ? U : T>' are incompatible.
99
The types returned by 'then(...)' are incompatible between these types.
1010
Type 'void' is not assignable to type 'PromiseLike<TResult1 | TResult2>'.
1111
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
3737
async function fn6(): Thenable { } // error
3838
~~~~~~~~
3939
!!! 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.
40-
!!! error TS1055: Construct signature return types 'Thenable' and 'PromiseLike<T>' are incompatible.
40+
!!! error TS1055: Construct signature return types 'Thenable' and 'PromiseLike<T extends PromiseLike<infer U> ? U : T>' are incompatible.
4141
!!! error TS1055: The types returned by 'then(...)' are incompatible between these types.
4242
!!! error TS1055: Type 'void' is not assignable to type 'PromiseLike<TResult1 | TResult2>'.
4343
async function fn7() { return; } // valid: Promise<void>

‎tests/baselines/reference/asyncImportedPromise_es5.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/conformance/async/es5/task.ts ===
22
export class Task<T> extends Promise<T> { }
33
>Task : Task<T>
4-
>Promise : Promise<T>
4+
>Promise : Promise<T extends PromiseLike<infer U> ? U : T>
55

66
=== tests/cases/conformance/async/es5/test.ts ===
77
import { Task } from "./task";

‎tests/baselines/reference/asyncImportedPromise_es6.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/conformance/async/es6/task.ts ===
22
export class Task<T> extends Promise<T> { }
33
>Task : Task<T>
4-
>Promise : Promise<T>
4+
>Promise : Promise<T extends PromiseLike<infer U> ? U : T>
55

66
=== tests/cases/conformance/async/es6/test.ts ===
77
import { Task } from "./task";

‎tests/baselines/reference/asyncQualifiedReturnType_es5.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace X {
44

55
export class MyPromise<T> extends Promise<T> {
66
>MyPromise : MyPromise<T>
7-
>Promise : Promise<T>
7+
>Promise : Promise<T extends PromiseLike<infer U> ? U : T>
88
}
99
}
1010

‎tests/baselines/reference/asyncQualifiedReturnType_es6.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace X {
44

55
export class MyPromise<T> extends Promise<T> {
66
>MyPromise : MyPromise<T>
7-
>Promise : Promise<T>
7+
>Promise : Promise<T extends PromiseLike<infer U> ? U : T>
88
}
99
}
1010

‎tests/baselines/reference/contextuallyTypeAsyncFunctionAwaitOperand.types

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ async function fn1(): Promise<Obj> {
1717
>await new Promise(resolve => resolve({ key: "value" })) : Obj
1818
>new Promise(resolve => resolve({ key: "value" })) : Promise<Obj>
1919
>Promise : PromiseConstructor
20-
>resolve => resolve({ key: "value" }) : (resolve: (value?: Obj | PromiseLike<Obj>) => void) => void
21-
>resolve : (value?: Obj | PromiseLike<Obj>) => void
20+
>resolve => resolve({ key: "value" }) : (resolve: (value?: Obj) => void) => void
21+
>resolve : (value?: Obj) => void
2222
>resolve({ key: "value" }) : void
23-
>resolve : (value?: Obj | PromiseLike<Obj>) => void
23+
>resolve : (value?: Obj) => void
2424
>{ key: "value" } : { key: "value"; }
2525
>key : "value"
2626
>"value" : "value"

‎tests/baselines/reference/contextuallyTypeAsyncFunctionReturnType.types

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ async function fn2(): Promise<Obj> {
1717
return new Promise(resolve => {
1818
>new Promise(resolve => { resolve({ key: "value" }); }) : Promise<Obj>
1919
>Promise : PromiseConstructor
20-
>resolve => { resolve({ key: "value" }); } : (resolve: (value?: Obj | PromiseLike<Obj>) => void) => void
21-
>resolve : (value?: Obj | PromiseLike<Obj>) => void
20+
>resolve => { resolve({ key: "value" }); } : (resolve: (value?: Obj) => void) => void
21+
>resolve : (value?: Obj) => void
2222

2323
resolve({ key: "value" });
2424
>resolve({ key: "value" }) : void
25-
>resolve : (value?: Obj | PromiseLike<Obj>) => void
25+
>resolve : (value?: Obj) => void
2626
>{ key: "value" } : { key: "value"; }
2727
>key : "value"
2828
>"value" : "value"
@@ -47,12 +47,12 @@ async function fn4(): Promise<Obj> {
4747
>await new Promise(resolve => { resolve({ key: "value" }); }) : Obj
4848
>new Promise(resolve => { resolve({ key: "value" }); }) : Promise<Obj>
4949
>Promise : PromiseConstructor
50-
>resolve => { resolve({ key: "value" }); } : (resolve: (value?: Obj | PromiseLike<Obj>) => void) => void
51-
>resolve : (value?: Obj | PromiseLike<Obj>) => void
50+
>resolve => { resolve({ key: "value" }); } : (resolve: (value?: Obj) => void) => void
51+
>resolve : (value?: Obj) => void
5252

5353
resolve({ key: "value" });
5454
>resolve({ key: "value" }) : void
55-
>resolve : (value?: Obj | PromiseLike<Obj>) => void
55+
>resolve : (value?: Obj) => void
5656
>{ key: "value" } : { key: "value"; }
5757
>key : "value"
5858
>"value" : "value"

‎tests/baselines/reference/inferenceLimit.types

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export class BrokenClass {
1919
>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[]>
2020
>Promise : PromiseConstructor
2121
>MyModule : any
22-
>(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>
23-
>resolve : (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
22+
>(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>
23+
>resolve : (value?: MyModule.MyModel[]) => void
2424
>reject : (reason?: any) => void
2525

2626
let result: Array<MyModule.MyModel> = [];
@@ -93,7 +93,7 @@ export class BrokenClass {
9393

9494
resolve(orders);
9595
>resolve(orders) : void
96-
>resolve : (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
96+
>resolve : (value?: MyModule.MyModel[]) => void
9797
>orders : MyModule.MyModel[]
9898

9999
});

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8331,6 +8331,11 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(85
83318331
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.
83328332
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>'.
83338333
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.
8334+
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>'.
8335+
Type 'T extends PromiseLike<infer U> ? U : T' is not assignable to type 'T'.
8336+
'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 '{}'.
8337+
Type 'unknown' is not assignable to type 'T'.
8338+
'unknown' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '{}'.
83348339
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.
83358340
node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(284,16): error TS2555: Expected at least 2 arguments, but got 1.
83368341
node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(286,43): error TS2555: Expected at least 4 arguments, but got 3.
@@ -9622,6 +9627,11 @@ node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(370,31): err
96229627
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.
96239628
node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(378,39): error TS1110: Type expected.
96249629
node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(379,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
9630+
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>'.
9631+
Type 'T extends PromiseLike<infer U> ? U : T' is not assignable to type 'T'.
9632+
'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 '{}'.
9633+
Type 'unknown' is not assignable to type 'T'.
9634+
'unknown' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '{}'.
96259635
node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(420,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
96269636
node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(422,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
96279637
node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(423,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -10935,6 +10945,8 @@ node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(12,64)
1093510945
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.
1093610946
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'?
1093710947
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'?
10948+
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>'.
10949+
Type 'unknown' is not assignable to type 'undefined'.
1093810950
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'?
1093910951
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'?
1094010952
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.
@@ -12654,8 +12666,8 @@ node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1910,22): error TS
1265412666
node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1911,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
1265512667
node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1912,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
1265612668
node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1913,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
12657-
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>'.
12658-
Property 'then' is missing in type 'HTMLImageElement' but required in type 'PromiseLike<new (width?: number, height?: number) => HTMLImageElement>'.
12669+
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'.
12670+
Type 'HTMLImageElement' provides no match for the signature 'new (width?: number, height?: number): HTMLImageElement'.
1265912671
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.
1266012672
node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1966,23): error TS2339: Property 'type' does not exist on type 'Element'.
1266112673
node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1967,23): error TS2339: Property 'style' does not exist on type 'Element'.

‎tests/baselines/reference/user/fp-ts.log

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Exit Code: 1
2+
Standard output:
3+
src/Task.ts(67,7): error TS2322: Type 'Promise<A extends PromiseLike<infer U> ? U : A>' is not assignable to type 'Promise<A>'.
4+
Type 'A extends PromiseLike<infer U> ? U : A' is not assignable to type 'A'.
5+
Type 'unknown' is not assignable to type 'A'.
6+
src/Task.ts(93,5): error TS2322: Type 'Promise<A extends PromiseLike<infer U> ? U : A>' is not assignable to type 'Promise<A>'.
7+
Type 'A extends PromiseLike<infer U> ? U : A' is not assignable to type 'A'.
8+
Type 'unknown' is not assignable to type 'A'.
9+
10+
11+
12+
Standard error:

0 commit comments

Comments
 (0)