Skip to content

Commit 6aab09a

Browse files
rbucktonrbuckton
committed
Revert change to PromiseConstructor in microsoft#22772 
1 parent 557a34e commit 6aab09a

8 files changed

Lines changed: 21 additions & 21 deletions

‎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 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: [T] extends [void] ? (value?: T | PromiseLike<T>) => void : (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
13+
new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
1414

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

‎tests/baselines/reference/defaultExportInAwaitExpression01.types‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
33
>x : Promise<{}>
44
>new Promise( ( resolve, reject ) => { resolve( {} ); } ) : Promise<{}>
55
>Promise : PromiseConstructor
6-
>( resolve, reject ) => { resolve( {} ); } : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
7-
>resolve : (value: {} | PromiseLike<{}>) => void
6+
>( resolve, reject ) => { resolve( {} ); } : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
7+
>resolve : (value?: {} | PromiseLike<{}>) => void
88
>reject : (reason?: any) => void
99
>resolve( {} ) : void
10-
>resolve : (value: {} | PromiseLike<{}>) => void
10+
>resolve : (value?: {} | PromiseLike<{}>) => void
1111
>{} : {}
1212

1313
export default x;

‎tests/baselines/reference/defaultExportInAwaitExpression02.types‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
33
>x : Promise<{}>
44
>new Promise( ( resolve, reject ) => { resolve( {} ); } ) : Promise<{}>
55
>Promise : PromiseConstructor
6-
>( resolve, reject ) => { resolve( {} ); } : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
7-
>resolve : (value: {} | PromiseLike<{}>) => void
6+
>( resolve, reject ) => { resolve( {} ); } : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
7+
>resolve : (value?: {} | PromiseLike<{}>) => void
88
>reject : (reason?: any) => void
99
>resolve( {} ) : void
10-
>resolve : (value: {} | PromiseLike<{}>) => void
10+
>resolve : (value?: {} | PromiseLike<{}>) => void
1111
>{} : {}
1212

1313
export default x;

‎tests/baselines/reference/inferenceLimit.types‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ export class BrokenClass {
2121
>Array : T[]
2222
>MyModule : any
2323
>MyModel : MyModule.MyModel
24-
>(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>
25-
>resolve : (value: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
24+
>(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>
25+
>resolve : (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
2626
>reject : (reason?: any) => void
2727

2828
let result: Array<MyModule.MyModel> = [];
@@ -40,8 +40,8 @@ export class BrokenClass {
4040
return new Promise((resolve, reject) => {
4141
>new Promise((resolve, reject) => { this.doStuff(order.id) .then((items) => { order.items = items; resolve(order); }); }) : Promise<{}>
4242
>Promise : PromiseConstructor
43-
>(resolve, reject) => { this.doStuff(order.id) .then((items) => { order.items = items; resolve(order); }); } : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
44-
>resolve : (value: {} | PromiseLike<{}>) => void
43+
>(resolve, reject) => { this.doStuff(order.id) .then((items) => { order.items = items; resolve(order); }); } : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
44+
>resolve : (value?: {} | PromiseLike<{}>) => void
4545
>reject : (reason?: any) => void
4646

4747
this.doStuff(order.id)
@@ -69,7 +69,7 @@ export class BrokenClass {
6969

7070
resolve(order);
7171
>resolve(order) : void
72-
>resolve : (value: {} | PromiseLike<{}>) => void
72+
>resolve : (value?: {} | PromiseLike<{}>) => void
7373
>order : any
7474

7575
});
@@ -99,7 +99,7 @@ export class BrokenClass {
9999

100100
resolve(orders);
101101
>resolve(orders) : void
102-
>resolve : (value: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
102+
>resolve : (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
103103
>orders : MyModule.MyModel[]
104104

105105
});

‎tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ async function out() {
138138
return new Promise(function (resolve, reject) {});
139139
>new Promise(function (resolve, reject) {}) : Promise<{}>
140140
>Promise : PromiseConstructor
141-
>function (resolve, reject) {} : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
142-
>resolve : (value: {} | PromiseLike<{}>) => void
141+
>function (resolve, reject) {} : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
142+
>resolve : (value?: {} | PromiseLike<{}>) => void
143143
>reject : (reason?: any) => void
144144
}
145145

‎tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ async function out() {
138138
return new Promise(function (resolve, reject) {});
139139
>new Promise(function (resolve, reject) {}) : Promise<{}>
140140
>Promise : PromiseConstructor
141-
>function (resolve, reject) {} : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
142-
>resolve : (value: {} | PromiseLike<{}>) => void
141+
>function (resolve, reject) {} : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
142+
>resolve : (value?: {} | PromiseLike<{}>) => void
143143
>reject : (reason?: any) => void
144144
}
145145

‎tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ async function out() {
138138
return new Promise(function (resolve, reject) {});
139139
>new Promise(function (resolve, reject) {}) : Promise<{}>
140140
>Promise : PromiseConstructor
141-
>function (resolve, reject) {} : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
142-
>resolve : (value: {} | PromiseLike<{}>) => void
141+
>function (resolve, reject) {} : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
142+
>resolve : (value?: {} | PromiseLike<{}>) => void
143143
>reject : (reason?: any) => void
144144
}
145145

‎tests/baselines/reference/usePromiseFinally.types‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ let promise1 = new Promise(function(resolve, reject) {})
55
>new Promise(function(resolve, reject) {}) .finally : (onfinally?: () => void) => Promise<{}>
66
>new Promise(function(resolve, reject) {}) : Promise<{}>
77
>Promise : PromiseConstructor
8-
>function(resolve, reject) {} : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
9-
>resolve : (value: {} | PromiseLike<{}>) => void
8+
>function(resolve, reject) {} : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
9+
>resolve : (value?: {} | PromiseLike<{}>) => void
1010
>reject : (reason?: any) => void
1111

1212
.finally(function() {});

0 commit comments

Comments
 (0)