mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-02-05 08:11:30 -06:00
Update promise definition overloads for then/catch
This commit is contained in:
Ron Buckton
parent
90b1c4ab48
commit
cd14ca2ea8
22
src/lib/es2015.promise.d.ts
vendored
22
src/lib/es2015.promise.d.ts
vendored
@ -8,7 +8,7 @@ interface Promise<T> {
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of which ever callback is executed.
|
||||
*/
|
||||
then(onfulfilled?: ((value: T) => T | PromiseLike<T>) | undefined | null, onrejected?: ((reason: any) => T | PromiseLike<T>) | undefined | null): Promise<T>;
|
||||
then(onfulfilled?: undefined | null, onrejected?: undefined | null): Promise<T>;
|
||||
|
||||
/**
|
||||
* Attaches callbacks for the resolution and/or rejection of the Promise.
|
||||
@ -16,7 +16,7 @@ interface Promise<T> {
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of which ever callback is executed.
|
||||
*/
|
||||
then<TResult>(onfulfilled: ((value: T) => T | PromiseLike<T>) | undefined | null, onrejected: (reason: any) => TResult | PromiseLike<TResult>): Promise<T | TResult>;
|
||||
then<TResult>(onfulfilled: undefined | null, onrejected: (reason: any) => TResult | PromiseLike<TResult>): Promise<T | TResult>;
|
||||
|
||||
/**
|
||||
* Attaches callbacks for the resolution and/or rejection of the Promise.
|
||||
@ -24,8 +24,22 @@ interface Promise<T> {
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of which ever callback is executed.
|
||||
*/
|
||||
then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>, onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): Promise<TResult>;
|
||||
then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>, onrejected: undefined | null): Promise<TResult>;
|
||||
/**
|
||||
* Attaches callbacks for the resolution and/or rejection of the Promise.
|
||||
* @param onfulfilled The callback to execute when the Promise is resolved.
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of which ever callback is executed.
|
||||
*/
|
||||
then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>): Promise<TResult>;
|
||||
|
||||
/**
|
||||
* Attaches callbacks for the resolution and/or rejection of the Promise.
|
||||
* @param onfulfilled The callback to execute when the Promise is resolved.
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of which ever callback is executed.
|
||||
*/
|
||||
then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>, onrejected: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
|
||||
/**
|
||||
* Attaches callbacks for the resolution and/or rejection of the Promise.
|
||||
* @param onfulfilled The callback to execute when the Promise is resolved.
|
||||
@ -39,7 +53,7 @@ interface Promise<T> {
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of the callback.
|
||||
*/
|
||||
catch(onrejected?: ((reason: any) => T | PromiseLike<T>) | undefined | null): Promise<T>;
|
||||
catch(onrejected?: undefined | null): Promise<T>;
|
||||
|
||||
/**
|
||||
* Attaches a callback for only the rejection of the Promise.
|
||||
|
||||
32
src/lib/es5.d.ts
vendored
32
src/lib/es5.d.ts
vendored
@ -1316,9 +1316,7 @@ interface PromiseLike<T> {
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of which ever callback is executed.
|
||||
*/
|
||||
then(
|
||||
onfulfilled?: ((value: T) => T | PromiseLike<T>) | undefined | null,
|
||||
onrejected?: ((reason: any) => T | PromiseLike<T>) | undefined | null): PromiseLike<T>;
|
||||
then(onfulfilled?: undefined | null, onrejected?: undefined | null): PromiseLike<T>;
|
||||
|
||||
/**
|
||||
* Attaches callbacks for the resolution and/or rejection of the Promise.
|
||||
@ -1326,9 +1324,7 @@ interface PromiseLike<T> {
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of which ever callback is executed.
|
||||
*/
|
||||
then<TResult>(
|
||||
onfulfilled: ((value: T) => T | PromiseLike<T>) | undefined | null,
|
||||
onrejected: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<T | TResult>;
|
||||
then<TResult>(onfulfilled: undefined | null, onrejected: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<T | TResult>;
|
||||
|
||||
/**
|
||||
* Attaches callbacks for the resolution and/or rejection of the Promise.
|
||||
@ -1336,9 +1332,7 @@ interface PromiseLike<T> {
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of which ever callback is executed.
|
||||
*/
|
||||
then<TResult>(
|
||||
onfulfilled: (value: T) => TResult | PromiseLike<TResult>,
|
||||
onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): PromiseLike<TResult>;
|
||||
then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>, onrejected: undefined | null): PromiseLike<TResult>;
|
||||
|
||||
/**
|
||||
* Attaches callbacks for the resolution and/or rejection of the Promise.
|
||||
@ -1346,9 +1340,23 @@ interface PromiseLike<T> {
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of which ever callback is executed.
|
||||
*/
|
||||
then<TResult1, TResult2>(
|
||||
onfulfilled: (value: T) => TResult1 | PromiseLike<TResult1>,
|
||||
onrejected: (reason: any) => TResult2 | PromiseLike<TResult2>): PromiseLike<TResult1 | TResult2>;
|
||||
then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
|
||||
|
||||
/**
|
||||
* Attaches callbacks for the resolution and/or rejection of the Promise.
|
||||
* @param onfulfilled The callback to execute when the Promise is resolved.
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of which ever callback is executed.
|
||||
*/
|
||||
then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>, onrejected: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
|
||||
|
||||
/**
|
||||
* Attaches callbacks for the resolution and/or rejection of the Promise.
|
||||
* @param onfulfilled The callback to execute when the Promise is resolved.
|
||||
* @param onrejected The callback to execute when the Promise is rejected.
|
||||
* @returns A Promise for the completion of which ever callback is executed.
|
||||
*/
|
||||
then<TResult1, TResult2>(onfulfilled: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected: (reason: any) => TResult2 | PromiseLike<TResult2>): PromiseLike<TResult1 | TResult2>;
|
||||
}
|
||||
|
||||
interface ArrayLike<T> {
|
||||
|
||||
@ -1,16 +1,6 @@
|
||||
//// [promiseType.ts]
|
||||
declare var p: Promise<boolean>;
|
||||
|
||||
const a = p.then();
|
||||
const b = p.then(b => 1);
|
||||
const c = p.then(b => 1, e => 'error');
|
||||
const d = p.then(b => 1, e => { });
|
||||
const e = p.then(b => 1, e => { throw Error(); });
|
||||
const f = p.then(b => 1, e => Promise.reject(Error()));
|
||||
const g = p.catch(e => 'error');
|
||||
const h = p.catch(e => { });
|
||||
const i = p.catch(e => { throw Error(); });
|
||||
const j = p.catch(e => Promise.reject(Error()));
|
||||
declare var x: any;
|
||||
|
||||
async function A() {
|
||||
const a = await p;
|
||||
@ -22,17 +12,15 @@ async function B() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
// NOTE: This reports a "No best comment type exists among return expressions." error, and is
|
||||
// ignored to get the types result for the test.
|
||||
// async function C() {
|
||||
// try {
|
||||
// const a = await p;
|
||||
// return 1;
|
||||
// }
|
||||
// catch (e) {
|
||||
// return 'error';
|
||||
// }
|
||||
// }
|
||||
async function C() {
|
||||
try {
|
||||
const a = await p;
|
||||
return 1;
|
||||
}
|
||||
catch (e) {
|
||||
return 'error';
|
||||
}
|
||||
}
|
||||
|
||||
async function D() {
|
||||
try {
|
||||
@ -96,64 +84,140 @@ async function I() {
|
||||
// addresses github issue #4903:
|
||||
|
||||
const p00 = p.catch();
|
||||
const p01 = p.catch(undefined);
|
||||
const p07 = p.catch(null);
|
||||
const p02 = p.catch(() => 1);
|
||||
const p03 = p.catch(() => {});
|
||||
const p04 = p.catch(() => {throw 1});
|
||||
const p05 = p.catch(() => Promise.reject(1));
|
||||
const p06 = p.catch(() => Promise.resolve(1));
|
||||
const p01 = p.then();
|
||||
|
||||
const p10 = p.then();
|
||||
const p10 = p.catch(undefined);
|
||||
const p11 = p.catch(null);
|
||||
const p12 = p.catch(() => 1);
|
||||
const p13 = p.catch(() => x);
|
||||
const p14 = p.catch(() => undefined);
|
||||
const p15 = p.catch(() => null);
|
||||
const p16 = p.catch(() => {});
|
||||
const p17 = p.catch(() => {throw 1});
|
||||
const p18 = p.catch(() => Promise.reject(1));
|
||||
const p19 = p.catch(() => Promise.resolve(1));
|
||||
|
||||
const p20 = p.then(undefined);
|
||||
const p21 = p.then(() => 1);
|
||||
const p22 = p.then(() => {});
|
||||
const p23 = p.then(() => {throw 1});
|
||||
const p24 = p.then(() => Promise.resolve(1));
|
||||
const p25 = p.then(() => Promise.reject(1));
|
||||
const p21 = p.then(null);
|
||||
const p22 = p.then(() => 1);
|
||||
const p23 = p.then(() => x);
|
||||
const p24 = p.then(() => undefined);
|
||||
const p25 = p.then(() => null);
|
||||
const p26 = p.then(() => {});
|
||||
const p27 = p.then(() => {throw 1});
|
||||
const p28 = p.then(() => Promise.resolve(1));
|
||||
const p29 = p.then(() => Promise.reject(1));
|
||||
|
||||
const p30 = p.then(undefined, undefined);
|
||||
const p31 = p.then(undefined, () => 1);
|
||||
const p32 = p.then(undefined, () => {});
|
||||
const p33 = p.then(undefined, () => {throw 1});
|
||||
const p34 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p35 = p.then(undefined, () => Promise.reject(1));
|
||||
const p31 = p.then(undefined, null);
|
||||
const p32 = p.then(undefined, () => 1);
|
||||
const p33 = p.then(undefined, () => x);
|
||||
const p34 = p.then(undefined, () => undefined);
|
||||
const p35 = p.then(undefined, () => null);
|
||||
const p36 = p.then(undefined, () => {});
|
||||
const p37 = p.then(undefined, () => {throw 1});
|
||||
const p38 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p39 = p.then(undefined, () => Promise.reject(1));
|
||||
|
||||
const p40 = p.then(() => "1", undefined);
|
||||
const p41 = p.then(() => "1", () => 1);
|
||||
const p42 = p.then(() => "1", () => {});
|
||||
const p43 = p.then(() => "1", () => {throw 1});
|
||||
const p44 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p45 = p.then(() => "1", () => Promise.reject(1));
|
||||
const p40 = p.then(null, undefined);
|
||||
const p41 = p.then(null, null);
|
||||
const p42 = p.then(null, () => 1);
|
||||
const p43 = p.then(null, () => x);
|
||||
const p44 = p.then(null, () => undefined);
|
||||
const p45 = p.then(null, () => null);
|
||||
const p46 = p.then(null, () => {});
|
||||
const p47 = p.then(null, () => {throw 1});
|
||||
const p48 = p.then(null, () => Promise.resolve(1));
|
||||
const p49 = p.then(null, () => Promise.reject(1));
|
||||
|
||||
const p50 = p.then(() => {}, undefined);
|
||||
const p51 = p.then(() => {}, () => 1);
|
||||
const p52 = p.then(() => {}, () => {});
|
||||
const p53 = p.then(() => {}, () => {throw 1});
|
||||
const p54 = p.then(() => {}, () => Promise.resolve(1));
|
||||
const p55 = p.then(() => {}, () => Promise.reject(1));
|
||||
const p50 = p.then(() => "1", undefined);
|
||||
const p51 = p.then(() => "1", null);
|
||||
const p52 = p.then(() => "1", () => 1);
|
||||
const p53 = p.then(() => "1", () => x);
|
||||
const p54 = p.then(() => "1", () => undefined);
|
||||
const p55 = p.then(() => "1", () => null);
|
||||
const p56 = p.then(() => "1", () => {});
|
||||
const p57 = p.then(() => "1", () => {throw 1});
|
||||
const p58 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p59 = p.then(() => "1", () => Promise.reject(1));
|
||||
|
||||
const p60 = p.then(() => {throw 1}, undefined);
|
||||
const p61 = p.then(() => {throw 1}, () => 1);
|
||||
const p62 = p.then(() => {throw 1}, () => {});
|
||||
const p63 = p.then(() => {throw 1}, () => {throw 1});
|
||||
const p64 = p.then(() => {throw 1}, () => Promise.resolve(1));
|
||||
const p65 = p.then(() => {throw 1}, () => Promise.reject(1));
|
||||
const p60 = p.then(() => x, undefined);
|
||||
const p61 = p.then(() => x, null);
|
||||
const p62 = p.then(() => x, () => 1);
|
||||
const p63 = p.then(() => x, () => x);
|
||||
const p64 = p.then(() => x, () => undefined);
|
||||
const p65 = p.then(() => x, () => null);
|
||||
const p66 = p.then(() => x, () => {});
|
||||
const p67 = p.then(() => x, () => {throw 1});
|
||||
const p68 = p.then(() => x, () => Promise.resolve(1));
|
||||
const p69 = p.then(() => x, () => Promise.reject(1));
|
||||
|
||||
const p70 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const p71 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const p72 = p.then(() => Promise.resolve("1"), () => {});
|
||||
const p73 = p.then(() => Promise.resolve("1"), () => {throw 1});
|
||||
const p74 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const p75 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
const p70 = p.then(() => undefined, undefined);
|
||||
const p71 = p.then(() => undefined, null);
|
||||
const p72 = p.then(() => undefined, () => 1);
|
||||
const p73 = p.then(() => undefined, () => x);
|
||||
const p74 = p.then(() => undefined, () => undefined);
|
||||
const p75 = p.then(() => undefined, () => null);
|
||||
const p76 = p.then(() => undefined, () => {});
|
||||
const p77 = p.then(() => undefined, () => {throw 1});
|
||||
const p78 = p.then(() => undefined, () => Promise.resolve(1));
|
||||
const p79 = p.then(() => undefined, () => Promise.reject(1));
|
||||
|
||||
const p80 = p.then(() => Promise.reject(1), undefined);
|
||||
const p81 = p.then(() => Promise.reject(1), () => 1);
|
||||
const p82 = p.then(() => Promise.reject(1), () => {});
|
||||
const p83 = p.then(() => Promise.reject(1), () => {throw 1});
|
||||
const p84 = p.then(() => Promise.reject(1), () => Promise.resolve(1));
|
||||
const p85 = p.then(() => Promise.reject(1), () => Promise.reject(1));
|
||||
const p80 = p.then(() => null, undefined);
|
||||
const p81 = p.then(() => null, null);
|
||||
const p82 = p.then(() => null, () => 1);
|
||||
const p83 = p.then(() => null, () => x);
|
||||
const p84 = p.then(() => null, () => undefined);
|
||||
const p85 = p.then(() => null, () => null);
|
||||
const p86 = p.then(() => null, () => {});
|
||||
const p87 = p.then(() => null, () => {throw 1});
|
||||
const p88 = p.then(() => null, () => Promise.resolve(1));
|
||||
const p89 = p.then(() => null, () => Promise.reject(1));
|
||||
|
||||
const p90 = p.then(() => {}, undefined);
|
||||
const p91 = p.then(() => {}, null);
|
||||
const p92 = p.then(() => {}, () => 1);
|
||||
const p93 = p.then(() => {}, () => x);
|
||||
const p94 = p.then(() => {}, () => undefined);
|
||||
const p95 = p.then(() => {}, () => null);
|
||||
const p96 = p.then(() => {}, () => {});
|
||||
const p97 = p.then(() => {}, () => {throw 1});
|
||||
const p98 = p.then(() => {}, () => Promise.resolve(1));
|
||||
const p99 = p.then(() => {}, () => Promise.reject(1));
|
||||
|
||||
const pa0 = p.then(() => {throw 1}, undefined);
|
||||
const pa1 = p.then(() => {throw 1}, null);
|
||||
const pa2 = p.then(() => {throw 1}, () => 1);
|
||||
const pa3 = p.then(() => {throw 1}, () => x);
|
||||
const pa4 = p.then(() => {throw 1}, () => undefined);
|
||||
const pa5 = p.then(() => {throw 1}, () => null);
|
||||
const pa6 = p.then(() => {throw 1}, () => {});
|
||||
const pa7 = p.then(() => {throw 1}, () => {throw 1});
|
||||
const pa8 = p.then(() => {throw 1}, () => Promise.resolve(1));
|
||||
const pa9 = p.then(() => {throw 1}, () => Promise.reject(1));
|
||||
|
||||
const pb0 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const pb1 = p.then(() => Promise.resolve("1"), null);
|
||||
const pb2 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const pb3 = p.then(() => Promise.resolve("1"), () => x);
|
||||
const pb4 = p.then(() => Promise.resolve("1"), () => undefined);
|
||||
const pb5 = p.then(() => Promise.resolve("1"), () => null);
|
||||
const pb6 = p.then(() => Promise.resolve("1"), () => {});
|
||||
const pb7 = p.then(() => Promise.resolve("1"), () => {throw 1});
|
||||
const pb8 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
|
||||
const pc0 = p.then(() => Promise.reject("1"), undefined);
|
||||
const pc1 = p.then(() => Promise.reject("1"), null);
|
||||
const pc2 = p.then(() => Promise.reject("1"), () => 1);
|
||||
const pc3 = p.then(() => Promise.reject("1"), () => x);
|
||||
const pc4 = p.then(() => Promise.reject("1"), () => undefined);
|
||||
const pc5 = p.then(() => Promise.reject("1"), () => null);
|
||||
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));
|
||||
|
||||
|
||||
//// [promiseType.js]
|
||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||
@ -164,16 +228,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
||||
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
||||
});
|
||||
};
|
||||
const a = p.then();
|
||||
const b = p.then(b => 1);
|
||||
const c = p.then(b => 1, e => 'error');
|
||||
const d = p.then(b => 1, e => { });
|
||||
const e = p.then(b => 1, e => { throw Error(); });
|
||||
const f = p.then(b => 1, e => Promise.reject(Error()));
|
||||
const g = p.catch(e => 'error');
|
||||
const h = p.catch(e => { });
|
||||
const i = p.catch(e => { throw Error(); });
|
||||
const j = p.catch(e => Promise.reject(Error()));
|
||||
function A() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const a = yield p;
|
||||
@ -186,17 +240,17 @@ function B() {
|
||||
return 1;
|
||||
});
|
||||
}
|
||||
// NOTE: This reports a "No best comment type exists among return expressions." error, and is
|
||||
// ignored to get the types result for the test.
|
||||
// async function C() {
|
||||
// try {
|
||||
// const a = await p;
|
||||
// return 1;
|
||||
// }
|
||||
// catch (e) {
|
||||
// return 'error';
|
||||
// }
|
||||
// }
|
||||
function C() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
try {
|
||||
const a = yield p;
|
||||
return 1;
|
||||
}
|
||||
catch (e) {
|
||||
return 'error';
|
||||
}
|
||||
});
|
||||
}
|
||||
function D() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
try {
|
||||
@ -264,53 +318,124 @@ function I() {
|
||||
}
|
||||
// addresses github issue #4903:
|
||||
const p00 = p.catch();
|
||||
const p01 = p.catch(undefined);
|
||||
const p07 = p.catch(null);
|
||||
const p02 = p.catch(() => 1);
|
||||
const p03 = p.catch(() => { });
|
||||
const p04 = p.catch(() => { throw 1; });
|
||||
const p05 = p.catch(() => Promise.reject(1));
|
||||
const p06 = p.catch(() => Promise.resolve(1));
|
||||
const p10 = p.then();
|
||||
const p01 = p.then();
|
||||
const p10 = p.catch(undefined);
|
||||
const p11 = p.catch(null);
|
||||
const p12 = p.catch(() => 1);
|
||||
const p13 = p.catch(() => x);
|
||||
const p14 = p.catch(() => undefined);
|
||||
const p15 = p.catch(() => null);
|
||||
const p16 = p.catch(() => { });
|
||||
const p17 = p.catch(() => { throw 1; });
|
||||
const p18 = p.catch(() => Promise.reject(1));
|
||||
const p19 = p.catch(() => Promise.resolve(1));
|
||||
const p20 = p.then(undefined);
|
||||
const p21 = p.then(() => 1);
|
||||
const p22 = p.then(() => { });
|
||||
const p23 = p.then(() => { throw 1; });
|
||||
const p24 = p.then(() => Promise.resolve(1));
|
||||
const p25 = p.then(() => Promise.reject(1));
|
||||
const p21 = p.then(null);
|
||||
const p22 = p.then(() => 1);
|
||||
const p23 = p.then(() => x);
|
||||
const p24 = p.then(() => undefined);
|
||||
const p25 = p.then(() => null);
|
||||
const p26 = p.then(() => { });
|
||||
const p27 = p.then(() => { throw 1; });
|
||||
const p28 = p.then(() => Promise.resolve(1));
|
||||
const p29 = p.then(() => Promise.reject(1));
|
||||
const p30 = p.then(undefined, undefined);
|
||||
const p31 = p.then(undefined, () => 1);
|
||||
const p32 = p.then(undefined, () => { });
|
||||
const p33 = p.then(undefined, () => { throw 1; });
|
||||
const p34 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p35 = p.then(undefined, () => Promise.reject(1));
|
||||
const p40 = p.then(() => "1", undefined);
|
||||
const p41 = p.then(() => "1", () => 1);
|
||||
const p42 = p.then(() => "1", () => { });
|
||||
const p43 = p.then(() => "1", () => { throw 1; });
|
||||
const p44 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p45 = p.then(() => "1", () => Promise.reject(1));
|
||||
const p50 = p.then(() => { }, undefined);
|
||||
const p51 = p.then(() => { }, () => 1);
|
||||
const p52 = p.then(() => { }, () => { });
|
||||
const p53 = p.then(() => { }, () => { throw 1; });
|
||||
const p54 = p.then(() => { }, () => Promise.resolve(1));
|
||||
const p55 = p.then(() => { }, () => Promise.reject(1));
|
||||
const p60 = p.then(() => { throw 1; }, undefined);
|
||||
const p61 = p.then(() => { throw 1; }, () => 1);
|
||||
const p62 = p.then(() => { throw 1; }, () => { });
|
||||
const p63 = p.then(() => { throw 1; }, () => { throw 1; });
|
||||
const p64 = p.then(() => { throw 1; }, () => Promise.resolve(1));
|
||||
const p65 = p.then(() => { throw 1; }, () => Promise.reject(1));
|
||||
const p70 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const p71 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const p72 = p.then(() => Promise.resolve("1"), () => { });
|
||||
const p73 = p.then(() => Promise.resolve("1"), () => { throw 1; });
|
||||
const p74 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const p75 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
const p80 = p.then(() => Promise.reject(1), undefined);
|
||||
const p81 = p.then(() => Promise.reject(1), () => 1);
|
||||
const p82 = p.then(() => Promise.reject(1), () => { });
|
||||
const p83 = p.then(() => Promise.reject(1), () => { throw 1; });
|
||||
const p84 = p.then(() => Promise.reject(1), () => Promise.resolve(1));
|
||||
const p85 = p.then(() => Promise.reject(1), () => Promise.reject(1));
|
||||
const p31 = p.then(undefined, null);
|
||||
const p32 = p.then(undefined, () => 1);
|
||||
const p33 = p.then(undefined, () => x);
|
||||
const p34 = p.then(undefined, () => undefined);
|
||||
const p35 = p.then(undefined, () => null);
|
||||
const p36 = p.then(undefined, () => { });
|
||||
const p37 = p.then(undefined, () => { throw 1; });
|
||||
const p38 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p39 = p.then(undefined, () => Promise.reject(1));
|
||||
const p40 = p.then(null, undefined);
|
||||
const p41 = p.then(null, null);
|
||||
const p42 = p.then(null, () => 1);
|
||||
const p43 = p.then(null, () => x);
|
||||
const p44 = p.then(null, () => undefined);
|
||||
const p45 = p.then(null, () => null);
|
||||
const p46 = p.then(null, () => { });
|
||||
const p47 = p.then(null, () => { throw 1; });
|
||||
const p48 = p.then(null, () => Promise.resolve(1));
|
||||
const p49 = p.then(null, () => Promise.reject(1));
|
||||
const p50 = p.then(() => "1", undefined);
|
||||
const p51 = p.then(() => "1", null);
|
||||
const p52 = p.then(() => "1", () => 1);
|
||||
const p53 = p.then(() => "1", () => x);
|
||||
const p54 = p.then(() => "1", () => undefined);
|
||||
const p55 = p.then(() => "1", () => null);
|
||||
const p56 = p.then(() => "1", () => { });
|
||||
const p57 = p.then(() => "1", () => { throw 1; });
|
||||
const p58 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p59 = p.then(() => "1", () => Promise.reject(1));
|
||||
const p60 = p.then(() => x, undefined);
|
||||
const p61 = p.then(() => x, null);
|
||||
const p62 = p.then(() => x, () => 1);
|
||||
const p63 = p.then(() => x, () => x);
|
||||
const p64 = p.then(() => x, () => undefined);
|
||||
const p65 = p.then(() => x, () => null);
|
||||
const p66 = p.then(() => x, () => { });
|
||||
const p67 = p.then(() => x, () => { throw 1; });
|
||||
const p68 = p.then(() => x, () => Promise.resolve(1));
|
||||
const p69 = p.then(() => x, () => Promise.reject(1));
|
||||
const p70 = p.then(() => undefined, undefined);
|
||||
const p71 = p.then(() => undefined, null);
|
||||
const p72 = p.then(() => undefined, () => 1);
|
||||
const p73 = p.then(() => undefined, () => x);
|
||||
const p74 = p.then(() => undefined, () => undefined);
|
||||
const p75 = p.then(() => undefined, () => null);
|
||||
const p76 = p.then(() => undefined, () => { });
|
||||
const p77 = p.then(() => undefined, () => { throw 1; });
|
||||
const p78 = p.then(() => undefined, () => Promise.resolve(1));
|
||||
const p79 = p.then(() => undefined, () => Promise.reject(1));
|
||||
const p80 = p.then(() => null, undefined);
|
||||
const p81 = p.then(() => null, null);
|
||||
const p82 = p.then(() => null, () => 1);
|
||||
const p83 = p.then(() => null, () => x);
|
||||
const p84 = p.then(() => null, () => undefined);
|
||||
const p85 = p.then(() => null, () => null);
|
||||
const p86 = p.then(() => null, () => { });
|
||||
const p87 = p.then(() => null, () => { throw 1; });
|
||||
const p88 = p.then(() => null, () => Promise.resolve(1));
|
||||
const p89 = p.then(() => null, () => Promise.reject(1));
|
||||
const p90 = p.then(() => { }, undefined);
|
||||
const p91 = p.then(() => { }, null);
|
||||
const p92 = p.then(() => { }, () => 1);
|
||||
const p93 = p.then(() => { }, () => x);
|
||||
const p94 = p.then(() => { }, () => undefined);
|
||||
const p95 = p.then(() => { }, () => null);
|
||||
const p96 = p.then(() => { }, () => { });
|
||||
const p97 = p.then(() => { }, () => { throw 1; });
|
||||
const p98 = p.then(() => { }, () => Promise.resolve(1));
|
||||
const p99 = p.then(() => { }, () => Promise.reject(1));
|
||||
const pa0 = p.then(() => { throw 1; }, undefined);
|
||||
const pa1 = p.then(() => { throw 1; }, null);
|
||||
const pa2 = p.then(() => { throw 1; }, () => 1);
|
||||
const pa3 = p.then(() => { throw 1; }, () => x);
|
||||
const pa4 = p.then(() => { throw 1; }, () => undefined);
|
||||
const pa5 = p.then(() => { throw 1; }, () => null);
|
||||
const pa6 = p.then(() => { throw 1; }, () => { });
|
||||
const pa7 = p.then(() => { throw 1; }, () => { throw 1; });
|
||||
const pa8 = p.then(() => { throw 1; }, () => Promise.resolve(1));
|
||||
const pa9 = p.then(() => { throw 1; }, () => Promise.reject(1));
|
||||
const pb0 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const pb1 = p.then(() => Promise.resolve("1"), null);
|
||||
const pb2 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const pb3 = p.then(() => Promise.resolve("1"), () => x);
|
||||
const pb4 = p.then(() => Promise.resolve("1"), () => undefined);
|
||||
const pb5 = p.then(() => Promise.resolve("1"), () => null);
|
||||
const pb6 = p.then(() => Promise.resolve("1"), () => { });
|
||||
const pb7 = p.then(() => Promise.resolve("1"), () => { throw 1; });
|
||||
const pb8 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
const pc0 = p.then(() => Promise.reject("1"), undefined);
|
||||
const pc1 = p.then(() => Promise.reject("1"), null);
|
||||
const pc2 = p.then(() => Promise.reject("1"), () => 1);
|
||||
const pc3 = p.then(() => Promise.reject("1"), () => x);
|
||||
const pc4 = p.then(() => Promise.reject("1"), () => undefined);
|
||||
const pc5 = p.then(() => Promise.reject("1"), () => null);
|
||||
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));
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,16 @@
|
||||
tests/cases/compiler/promiseTypeAssignability.ts(6,1): error TS2322: Type 'Promise<string>' is not assignable to type 'PromiseLike<number>'.
|
||||
Types of property 'then' are incompatible.
|
||||
Type '{ (onfulfilled?: null, onrejected?: null): Promise<string>; <TResult>(onfulfilled: null, onrejected: (reason: any) => TResult | PromiseLike<TResult>): Promise<string | TResult>; <TResult>(onfulfilled: (value: string) => TResult | PromiseLike<TResult>, onrejected: null): Promise<TResult>; <TResult>(onfulfilled: (value: string) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled: (value: string) => TResult | PromiseLike<TResult>, onrejected: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult1, TResult2>(onfulfilled: (value: string) => TResult1 | PromiseLike<TResult1>, onrejected: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; }' is not assignable to type '{ (onfulfilled?: null, onrejected?: null): PromiseLike<number>; <TResult>(onfulfilled: null, onrejected: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<number | TResult>; <TResult>(onfulfilled: (value: number) => TResult | PromiseLike<TResult>, onrejected: null): PromiseLike<TResult>; <TResult>(onfulfilled: (value: number) => TResult | PromiseLike<TResult>): PromiseLike<TResult>; <TResult>(onfulfilled: (value: number) => TResult | PromiseLike<TResult>, onrejected: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>; <TResult1, TResult2>(onfulfilled: (value: number) => TResult1 | PromiseLike<TResult1>, onrejected: (reason: any) => TResult2 | PromiseLike<TResult2>): PromiseLike<TResult1 | TResult2>; }'.
|
||||
|
||||
|
||||
==== tests/cases/compiler/promiseTypeAssignability.ts (1 errors) ====
|
||||
var x: Promise<string>;
|
||||
var y: PromiseLike<string>;
|
||||
var z: PromiseLike<number>;
|
||||
|
||||
y = x; // ok
|
||||
z = x; // error
|
||||
~
|
||||
!!! error TS2322: Type 'Promise<string>' is not assignable to type 'PromiseLike<number>'.
|
||||
!!! error TS2322: Types of property 'then' are incompatible.
|
||||
!!! error TS2322: Type '{ (onfulfilled?: null, onrejected?: null): Promise<string>; <TResult>(onfulfilled: null, onrejected: (reason: any) => TResult | PromiseLike<TResult>): Promise<string | TResult>; <TResult>(onfulfilled: (value: string) => TResult | PromiseLike<TResult>, onrejected: null): Promise<TResult>; <TResult>(onfulfilled: (value: string) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled: (value: string) => TResult | PromiseLike<TResult>, onrejected: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult1, TResult2>(onfulfilled: (value: string) => TResult1 | PromiseLike<TResult1>, onrejected: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; }' is not assignable to type '{ (onfulfilled?: null, onrejected?: null): PromiseLike<number>; <TResult>(onfulfilled: null, onrejected: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<number | TResult>; <TResult>(onfulfilled: (value: number) => TResult | PromiseLike<TResult>, onrejected: null): PromiseLike<TResult>; <TResult>(onfulfilled: (value: number) => TResult | PromiseLike<TResult>): PromiseLike<TResult>; <TResult>(onfulfilled: (value: number) => TResult | PromiseLike<TResult>, onrejected: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>; <TResult1, TResult2>(onfulfilled: (value: number) => TResult1 | PromiseLike<TResult1>, onrejected: (reason: any) => TResult2 | PromiseLike<TResult2>): PromiseLike<TResult1 | TResult2>; }'.
|
||||
14
tests/baselines/reference/promiseTypeAssignability.js
Normal file
14
tests/baselines/reference/promiseTypeAssignability.js
Normal file
@ -0,0 +1,14 @@
|
||||
//// [promiseTypeAssignability.ts]
|
||||
var x: Promise<string>;
|
||||
var y: PromiseLike<string>;
|
||||
var z: PromiseLike<number>;
|
||||
|
||||
y = x; // ok
|
||||
z = x; // error
|
||||
|
||||
//// [promiseTypeAssignability.js]
|
||||
var x;
|
||||
var y;
|
||||
var z;
|
||||
y = x; // ok
|
||||
z = x; // error
|
||||
@ -1,16 +1,6 @@
|
||||
//// [promiseTypeStrictNull.ts]
|
||||
declare var p: Promise<boolean>;
|
||||
|
||||
const a = p.then();
|
||||
const b = p.then(b => 1);
|
||||
const c = p.then(b => 1, e => 'error');
|
||||
const d = p.then(b => 1, e => { });
|
||||
const e = p.then(b => 1, e => { throw Error(); });
|
||||
const f = p.then(b => 1, e => Promise.reject(Error()));
|
||||
const g = p.catch(e => 'error');
|
||||
const h = p.catch(e => { });
|
||||
const i = p.catch(e => { throw Error(); });
|
||||
const j = p.catch(e => Promise.reject(Error()));
|
||||
declare var x: any;
|
||||
|
||||
async function A() {
|
||||
const a = await p;
|
||||
@ -22,17 +12,15 @@ async function B() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
// NOTE: This reports a "No best comment type exists among return expressions." error, and is
|
||||
// ignored to get the types result for the test.
|
||||
// async function C() {
|
||||
// try {
|
||||
// const a = await p;
|
||||
// return 1;
|
||||
// }
|
||||
// catch (e) {
|
||||
// return 'error';
|
||||
// }
|
||||
// }
|
||||
async function C() {
|
||||
try {
|
||||
const a = await p;
|
||||
return 1;
|
||||
}
|
||||
catch (e) {
|
||||
return 'error';
|
||||
}
|
||||
}
|
||||
|
||||
async function D() {
|
||||
try {
|
||||
@ -96,64 +84,140 @@ async function I() {
|
||||
// addresses github issue #4903:
|
||||
|
||||
const p00 = p.catch();
|
||||
const p01 = p.catch(undefined);
|
||||
const p07 = p.catch(null);
|
||||
const p02 = p.catch(() => 1);
|
||||
const p03 = p.catch(() => {});
|
||||
const p04 = p.catch(() => {throw 1});
|
||||
const p05 = p.catch(() => Promise.reject(1));
|
||||
const p06 = p.catch(() => Promise.resolve(1));
|
||||
const p01 = p.then();
|
||||
|
||||
const p10 = p.then();
|
||||
const p10 = p.catch(undefined);
|
||||
const p11 = p.catch(null);
|
||||
const p12 = p.catch(() => 1);
|
||||
const p13 = p.catch(() => x);
|
||||
const p14 = p.catch(() => undefined);
|
||||
const p15 = p.catch(() => null);
|
||||
const p16 = p.catch(() => {});
|
||||
const p17 = p.catch(() => {throw 1});
|
||||
const p18 = p.catch(() => Promise.reject(1));
|
||||
const p19 = p.catch(() => Promise.resolve(1));
|
||||
|
||||
const p20 = p.then(undefined);
|
||||
const p21 = p.then(() => 1);
|
||||
const p22 = p.then(() => {});
|
||||
const p23 = p.then(() => {throw 1});
|
||||
const p24 = p.then(() => Promise.resolve(1));
|
||||
const p25 = p.then(() => Promise.reject(1));
|
||||
const p21 = p.then(null);
|
||||
const p22 = p.then(() => 1);
|
||||
const p23 = p.then(() => x);
|
||||
const p24 = p.then(() => undefined);
|
||||
const p25 = p.then(() => null);
|
||||
const p26 = p.then(() => {});
|
||||
const p27 = p.then(() => {throw 1});
|
||||
const p28 = p.then(() => Promise.resolve(1));
|
||||
const p29 = p.then(() => Promise.reject(1));
|
||||
|
||||
const p30 = p.then(undefined, undefined);
|
||||
const p31 = p.then(undefined, () => 1);
|
||||
const p32 = p.then(undefined, () => {});
|
||||
const p33 = p.then(undefined, () => {throw 1});
|
||||
const p34 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p35 = p.then(undefined, () => Promise.reject(1));
|
||||
const p31 = p.then(undefined, null);
|
||||
const p32 = p.then(undefined, () => 1);
|
||||
const p33 = p.then(undefined, () => x);
|
||||
const p34 = p.then(undefined, () => undefined);
|
||||
const p35 = p.then(undefined, () => null);
|
||||
const p36 = p.then(undefined, () => {});
|
||||
const p37 = p.then(undefined, () => {throw 1});
|
||||
const p38 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p39 = p.then(undefined, () => Promise.reject(1));
|
||||
|
||||
const p40 = p.then(() => "1", undefined);
|
||||
const p41 = p.then(() => "1", () => 1);
|
||||
const p42 = p.then(() => "1", () => {});
|
||||
const p43 = p.then(() => "1", () => {throw 1});
|
||||
const p44 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p45 = p.then(() => "1", () => Promise.reject(1));
|
||||
const p40 = p.then(null, undefined);
|
||||
const p41 = p.then(null, null);
|
||||
const p42 = p.then(null, () => 1);
|
||||
const p43 = p.then(null, () => x);
|
||||
const p44 = p.then(null, () => undefined);
|
||||
const p45 = p.then(null, () => null);
|
||||
const p46 = p.then(null, () => {});
|
||||
const p47 = p.then(null, () => {throw 1});
|
||||
const p48 = p.then(null, () => Promise.resolve(1));
|
||||
const p49 = p.then(null, () => Promise.reject(1));
|
||||
|
||||
const p50 = p.then(() => {}, undefined);
|
||||
const p51 = p.then(() => {}, () => 1);
|
||||
const p52 = p.then(() => {}, () => {});
|
||||
const p53 = p.then(() => {}, () => {throw 1});
|
||||
const p54 = p.then(() => {}, () => Promise.resolve(1));
|
||||
const p55 = p.then(() => {}, () => Promise.reject(1));
|
||||
const p50 = p.then(() => "1", undefined);
|
||||
const p51 = p.then(() => "1", null);
|
||||
const p52 = p.then(() => "1", () => 1);
|
||||
const p53 = p.then(() => "1", () => x);
|
||||
const p54 = p.then(() => "1", () => undefined);
|
||||
const p55 = p.then(() => "1", () => null);
|
||||
const p56 = p.then(() => "1", () => {});
|
||||
const p57 = p.then(() => "1", () => {throw 1});
|
||||
const p58 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p59 = p.then(() => "1", () => Promise.reject(1));
|
||||
|
||||
const p60 = p.then(() => {throw 1}, undefined);
|
||||
const p61 = p.then(() => {throw 1}, () => 1);
|
||||
const p62 = p.then(() => {throw 1}, () => {});
|
||||
const p63 = p.then(() => {throw 1}, () => {throw 1});
|
||||
const p64 = p.then(() => {throw 1}, () => Promise.resolve(1));
|
||||
const p65 = p.then(() => {throw 1}, () => Promise.reject(1));
|
||||
const p60 = p.then(() => x, undefined);
|
||||
const p61 = p.then(() => x, null);
|
||||
const p62 = p.then(() => x, () => 1);
|
||||
const p63 = p.then(() => x, () => x);
|
||||
const p64 = p.then(() => x, () => undefined);
|
||||
const p65 = p.then(() => x, () => null);
|
||||
const p66 = p.then(() => x, () => {});
|
||||
const p67 = p.then(() => x, () => {throw 1});
|
||||
const p68 = p.then(() => x, () => Promise.resolve(1));
|
||||
const p69 = p.then(() => x, () => Promise.reject(1));
|
||||
|
||||
const p70 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const p71 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const p72 = p.then(() => Promise.resolve("1"), () => {});
|
||||
const p73 = p.then(() => Promise.resolve("1"), () => {throw 1});
|
||||
const p74 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const p75 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
const p70 = p.then(() => undefined, undefined);
|
||||
const p71 = p.then(() => undefined, null);
|
||||
const p72 = p.then(() => undefined, () => 1);
|
||||
const p73 = p.then(() => undefined, () => x);
|
||||
const p74 = p.then(() => undefined, () => undefined);
|
||||
const p75 = p.then(() => undefined, () => null);
|
||||
const p76 = p.then(() => undefined, () => {});
|
||||
const p77 = p.then(() => undefined, () => {throw 1});
|
||||
const p78 = p.then(() => undefined, () => Promise.resolve(1));
|
||||
const p79 = p.then(() => undefined, () => Promise.reject(1));
|
||||
|
||||
const p80 = p.then(() => Promise.reject(1), undefined);
|
||||
const p81 = p.then(() => Promise.reject(1), () => 1);
|
||||
const p82 = p.then(() => Promise.reject(1), () => {});
|
||||
const p83 = p.then(() => Promise.reject(1), () => {throw 1});
|
||||
const p84 = p.then(() => Promise.reject(1), () => Promise.resolve(1));
|
||||
const p85 = p.then(() => Promise.reject(1), () => Promise.reject(1));
|
||||
const p80 = p.then(() => null, undefined);
|
||||
const p81 = p.then(() => null, null);
|
||||
const p82 = p.then(() => null, () => 1);
|
||||
const p83 = p.then(() => null, () => x);
|
||||
const p84 = p.then(() => null, () => undefined);
|
||||
const p85 = p.then(() => null, () => null);
|
||||
const p86 = p.then(() => null, () => {});
|
||||
const p87 = p.then(() => null, () => {throw 1});
|
||||
const p88 = p.then(() => null, () => Promise.resolve(1));
|
||||
const p89 = p.then(() => null, () => Promise.reject(1));
|
||||
|
||||
const p90 = p.then(() => {}, undefined);
|
||||
const p91 = p.then(() => {}, null);
|
||||
const p92 = p.then(() => {}, () => 1);
|
||||
const p93 = p.then(() => {}, () => x);
|
||||
const p94 = p.then(() => {}, () => undefined);
|
||||
const p95 = p.then(() => {}, () => null);
|
||||
const p96 = p.then(() => {}, () => {});
|
||||
const p97 = p.then(() => {}, () => {throw 1});
|
||||
const p98 = p.then(() => {}, () => Promise.resolve(1));
|
||||
const p99 = p.then(() => {}, () => Promise.reject(1));
|
||||
|
||||
const pa0 = p.then(() => {throw 1}, undefined);
|
||||
const pa1 = p.then(() => {throw 1}, null);
|
||||
const pa2 = p.then(() => {throw 1}, () => 1);
|
||||
const pa3 = p.then(() => {throw 1}, () => x);
|
||||
const pa4 = p.then(() => {throw 1}, () => undefined);
|
||||
const pa5 = p.then(() => {throw 1}, () => null);
|
||||
const pa6 = p.then(() => {throw 1}, () => {});
|
||||
const pa7 = p.then(() => {throw 1}, () => {throw 1});
|
||||
const pa8 = p.then(() => {throw 1}, () => Promise.resolve(1));
|
||||
const pa9 = p.then(() => {throw 1}, () => Promise.reject(1));
|
||||
|
||||
const pb0 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const pb1 = p.then(() => Promise.resolve("1"), null);
|
||||
const pb2 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const pb3 = p.then(() => Promise.resolve("1"), () => x);
|
||||
const pb4 = p.then(() => Promise.resolve("1"), () => undefined);
|
||||
const pb5 = p.then(() => Promise.resolve("1"), () => null);
|
||||
const pb6 = p.then(() => Promise.resolve("1"), () => {});
|
||||
const pb7 = p.then(() => Promise.resolve("1"), () => {throw 1});
|
||||
const pb8 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
|
||||
const pc0 = p.then(() => Promise.reject("1"), undefined);
|
||||
const pc1 = p.then(() => Promise.reject("1"), null);
|
||||
const pc2 = p.then(() => Promise.reject("1"), () => 1);
|
||||
const pc3 = p.then(() => Promise.reject("1"), () => x);
|
||||
const pc4 = p.then(() => Promise.reject("1"), () => undefined);
|
||||
const pc5 = p.then(() => Promise.reject("1"), () => null);
|
||||
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));
|
||||
|
||||
|
||||
//// [promiseTypeStrictNull.js]
|
||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||
@ -164,16 +228,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
||||
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
||||
});
|
||||
};
|
||||
const a = p.then();
|
||||
const b = p.then(b => 1);
|
||||
const c = p.then(b => 1, e => 'error');
|
||||
const d = p.then(b => 1, e => { });
|
||||
const e = p.then(b => 1, e => { throw Error(); });
|
||||
const f = p.then(b => 1, e => Promise.reject(Error()));
|
||||
const g = p.catch(e => 'error');
|
||||
const h = p.catch(e => { });
|
||||
const i = p.catch(e => { throw Error(); });
|
||||
const j = p.catch(e => Promise.reject(Error()));
|
||||
function A() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const a = yield p;
|
||||
@ -186,17 +240,17 @@ function B() {
|
||||
return 1;
|
||||
});
|
||||
}
|
||||
// NOTE: This reports a "No best comment type exists among return expressions." error, and is
|
||||
// ignored to get the types result for the test.
|
||||
// async function C() {
|
||||
// try {
|
||||
// const a = await p;
|
||||
// return 1;
|
||||
// }
|
||||
// catch (e) {
|
||||
// return 'error';
|
||||
// }
|
||||
// }
|
||||
function C() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
try {
|
||||
const a = yield p;
|
||||
return 1;
|
||||
}
|
||||
catch (e) {
|
||||
return 'error';
|
||||
}
|
||||
});
|
||||
}
|
||||
function D() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
try {
|
||||
@ -264,53 +318,124 @@ function I() {
|
||||
}
|
||||
// addresses github issue #4903:
|
||||
const p00 = p.catch();
|
||||
const p01 = p.catch(undefined);
|
||||
const p07 = p.catch(null);
|
||||
const p02 = p.catch(() => 1);
|
||||
const p03 = p.catch(() => { });
|
||||
const p04 = p.catch(() => { throw 1; });
|
||||
const p05 = p.catch(() => Promise.reject(1));
|
||||
const p06 = p.catch(() => Promise.resolve(1));
|
||||
const p10 = p.then();
|
||||
const p01 = p.then();
|
||||
const p10 = p.catch(undefined);
|
||||
const p11 = p.catch(null);
|
||||
const p12 = p.catch(() => 1);
|
||||
const p13 = p.catch(() => x);
|
||||
const p14 = p.catch(() => undefined);
|
||||
const p15 = p.catch(() => null);
|
||||
const p16 = p.catch(() => { });
|
||||
const p17 = p.catch(() => { throw 1; });
|
||||
const p18 = p.catch(() => Promise.reject(1));
|
||||
const p19 = p.catch(() => Promise.resolve(1));
|
||||
const p20 = p.then(undefined);
|
||||
const p21 = p.then(() => 1);
|
||||
const p22 = p.then(() => { });
|
||||
const p23 = p.then(() => { throw 1; });
|
||||
const p24 = p.then(() => Promise.resolve(1));
|
||||
const p25 = p.then(() => Promise.reject(1));
|
||||
const p21 = p.then(null);
|
||||
const p22 = p.then(() => 1);
|
||||
const p23 = p.then(() => x);
|
||||
const p24 = p.then(() => undefined);
|
||||
const p25 = p.then(() => null);
|
||||
const p26 = p.then(() => { });
|
||||
const p27 = p.then(() => { throw 1; });
|
||||
const p28 = p.then(() => Promise.resolve(1));
|
||||
const p29 = p.then(() => Promise.reject(1));
|
||||
const p30 = p.then(undefined, undefined);
|
||||
const p31 = p.then(undefined, () => 1);
|
||||
const p32 = p.then(undefined, () => { });
|
||||
const p33 = p.then(undefined, () => { throw 1; });
|
||||
const p34 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p35 = p.then(undefined, () => Promise.reject(1));
|
||||
const p40 = p.then(() => "1", undefined);
|
||||
const p41 = p.then(() => "1", () => 1);
|
||||
const p42 = p.then(() => "1", () => { });
|
||||
const p43 = p.then(() => "1", () => { throw 1; });
|
||||
const p44 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p45 = p.then(() => "1", () => Promise.reject(1));
|
||||
const p50 = p.then(() => { }, undefined);
|
||||
const p51 = p.then(() => { }, () => 1);
|
||||
const p52 = p.then(() => { }, () => { });
|
||||
const p53 = p.then(() => { }, () => { throw 1; });
|
||||
const p54 = p.then(() => { }, () => Promise.resolve(1));
|
||||
const p55 = p.then(() => { }, () => Promise.reject(1));
|
||||
const p60 = p.then(() => { throw 1; }, undefined);
|
||||
const p61 = p.then(() => { throw 1; }, () => 1);
|
||||
const p62 = p.then(() => { throw 1; }, () => { });
|
||||
const p63 = p.then(() => { throw 1; }, () => { throw 1; });
|
||||
const p64 = p.then(() => { throw 1; }, () => Promise.resolve(1));
|
||||
const p65 = p.then(() => { throw 1; }, () => Promise.reject(1));
|
||||
const p70 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const p71 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const p72 = p.then(() => Promise.resolve("1"), () => { });
|
||||
const p73 = p.then(() => Promise.resolve("1"), () => { throw 1; });
|
||||
const p74 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const p75 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
const p80 = p.then(() => Promise.reject(1), undefined);
|
||||
const p81 = p.then(() => Promise.reject(1), () => 1);
|
||||
const p82 = p.then(() => Promise.reject(1), () => { });
|
||||
const p83 = p.then(() => Promise.reject(1), () => { throw 1; });
|
||||
const p84 = p.then(() => Promise.reject(1), () => Promise.resolve(1));
|
||||
const p85 = p.then(() => Promise.reject(1), () => Promise.reject(1));
|
||||
const p31 = p.then(undefined, null);
|
||||
const p32 = p.then(undefined, () => 1);
|
||||
const p33 = p.then(undefined, () => x);
|
||||
const p34 = p.then(undefined, () => undefined);
|
||||
const p35 = p.then(undefined, () => null);
|
||||
const p36 = p.then(undefined, () => { });
|
||||
const p37 = p.then(undefined, () => { throw 1; });
|
||||
const p38 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p39 = p.then(undefined, () => Promise.reject(1));
|
||||
const p40 = p.then(null, undefined);
|
||||
const p41 = p.then(null, null);
|
||||
const p42 = p.then(null, () => 1);
|
||||
const p43 = p.then(null, () => x);
|
||||
const p44 = p.then(null, () => undefined);
|
||||
const p45 = p.then(null, () => null);
|
||||
const p46 = p.then(null, () => { });
|
||||
const p47 = p.then(null, () => { throw 1; });
|
||||
const p48 = p.then(null, () => Promise.resolve(1));
|
||||
const p49 = p.then(null, () => Promise.reject(1));
|
||||
const p50 = p.then(() => "1", undefined);
|
||||
const p51 = p.then(() => "1", null);
|
||||
const p52 = p.then(() => "1", () => 1);
|
||||
const p53 = p.then(() => "1", () => x);
|
||||
const p54 = p.then(() => "1", () => undefined);
|
||||
const p55 = p.then(() => "1", () => null);
|
||||
const p56 = p.then(() => "1", () => { });
|
||||
const p57 = p.then(() => "1", () => { throw 1; });
|
||||
const p58 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p59 = p.then(() => "1", () => Promise.reject(1));
|
||||
const p60 = p.then(() => x, undefined);
|
||||
const p61 = p.then(() => x, null);
|
||||
const p62 = p.then(() => x, () => 1);
|
||||
const p63 = p.then(() => x, () => x);
|
||||
const p64 = p.then(() => x, () => undefined);
|
||||
const p65 = p.then(() => x, () => null);
|
||||
const p66 = p.then(() => x, () => { });
|
||||
const p67 = p.then(() => x, () => { throw 1; });
|
||||
const p68 = p.then(() => x, () => Promise.resolve(1));
|
||||
const p69 = p.then(() => x, () => Promise.reject(1));
|
||||
const p70 = p.then(() => undefined, undefined);
|
||||
const p71 = p.then(() => undefined, null);
|
||||
const p72 = p.then(() => undefined, () => 1);
|
||||
const p73 = p.then(() => undefined, () => x);
|
||||
const p74 = p.then(() => undefined, () => undefined);
|
||||
const p75 = p.then(() => undefined, () => null);
|
||||
const p76 = p.then(() => undefined, () => { });
|
||||
const p77 = p.then(() => undefined, () => { throw 1; });
|
||||
const p78 = p.then(() => undefined, () => Promise.resolve(1));
|
||||
const p79 = p.then(() => undefined, () => Promise.reject(1));
|
||||
const p80 = p.then(() => null, undefined);
|
||||
const p81 = p.then(() => null, null);
|
||||
const p82 = p.then(() => null, () => 1);
|
||||
const p83 = p.then(() => null, () => x);
|
||||
const p84 = p.then(() => null, () => undefined);
|
||||
const p85 = p.then(() => null, () => null);
|
||||
const p86 = p.then(() => null, () => { });
|
||||
const p87 = p.then(() => null, () => { throw 1; });
|
||||
const p88 = p.then(() => null, () => Promise.resolve(1));
|
||||
const p89 = p.then(() => null, () => Promise.reject(1));
|
||||
const p90 = p.then(() => { }, undefined);
|
||||
const p91 = p.then(() => { }, null);
|
||||
const p92 = p.then(() => { }, () => 1);
|
||||
const p93 = p.then(() => { }, () => x);
|
||||
const p94 = p.then(() => { }, () => undefined);
|
||||
const p95 = p.then(() => { }, () => null);
|
||||
const p96 = p.then(() => { }, () => { });
|
||||
const p97 = p.then(() => { }, () => { throw 1; });
|
||||
const p98 = p.then(() => { }, () => Promise.resolve(1));
|
||||
const p99 = p.then(() => { }, () => Promise.reject(1));
|
||||
const pa0 = p.then(() => { throw 1; }, undefined);
|
||||
const pa1 = p.then(() => { throw 1; }, null);
|
||||
const pa2 = p.then(() => { throw 1; }, () => 1);
|
||||
const pa3 = p.then(() => { throw 1; }, () => x);
|
||||
const pa4 = p.then(() => { throw 1; }, () => undefined);
|
||||
const pa5 = p.then(() => { throw 1; }, () => null);
|
||||
const pa6 = p.then(() => { throw 1; }, () => { });
|
||||
const pa7 = p.then(() => { throw 1; }, () => { throw 1; });
|
||||
const pa8 = p.then(() => { throw 1; }, () => Promise.resolve(1));
|
||||
const pa9 = p.then(() => { throw 1; }, () => Promise.reject(1));
|
||||
const pb0 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const pb1 = p.then(() => Promise.resolve("1"), null);
|
||||
const pb2 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const pb3 = p.then(() => Promise.resolve("1"), () => x);
|
||||
const pb4 = p.then(() => Promise.resolve("1"), () => undefined);
|
||||
const pb5 = p.then(() => Promise.resolve("1"), () => null);
|
||||
const pb6 = p.then(() => Promise.resolve("1"), () => { });
|
||||
const pb7 = p.then(() => Promise.resolve("1"), () => { throw 1; });
|
||||
const pb8 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
const pc0 = p.then(() => Promise.reject("1"), undefined);
|
||||
const pc1 = p.then(() => Promise.reject("1"), null);
|
||||
const pc2 = p.then(() => Promise.reject("1"), () => 1);
|
||||
const pc3 = p.then(() => Promise.reject("1"), () => x);
|
||||
const pc4 = p.then(() => Promise.reject("1"), () => undefined);
|
||||
const pc5 = p.then(() => Promise.reject("1"), () => null);
|
||||
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));
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,16 +1,6 @@
|
||||
// @target: es6
|
||||
declare var p: Promise<boolean>;
|
||||
|
||||
const a = p.then();
|
||||
const b = p.then(b => 1);
|
||||
const c = p.then(b => 1, e => 'error');
|
||||
const d = p.then(b => 1, e => { });
|
||||
const e = p.then(b => 1, e => { throw Error(); });
|
||||
const f = p.then(b => 1, e => Promise.reject(Error()));
|
||||
const g = p.catch(e => 'error');
|
||||
const h = p.catch(e => { });
|
||||
const i = p.catch(e => { throw Error(); });
|
||||
const j = p.catch(e => Promise.reject(Error()));
|
||||
declare var x: any;
|
||||
|
||||
async function A() {
|
||||
const a = await p;
|
||||
@ -22,17 +12,15 @@ async function B() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
// NOTE: This reports a "No best comment type exists among return expressions." error, and is
|
||||
// ignored to get the types result for the test.
|
||||
// async function C() {
|
||||
// try {
|
||||
// const a = await p;
|
||||
// return 1;
|
||||
// }
|
||||
// catch (e) {
|
||||
// return 'error';
|
||||
// }
|
||||
// }
|
||||
async function C() {
|
||||
try {
|
||||
const a = await p;
|
||||
return 1;
|
||||
}
|
||||
catch (e) {
|
||||
return 'error';
|
||||
}
|
||||
}
|
||||
|
||||
async function D() {
|
||||
try {
|
||||
@ -96,61 +84,136 @@ async function I() {
|
||||
// addresses github issue #4903:
|
||||
|
||||
const p00 = p.catch();
|
||||
const p01 = p.catch(undefined);
|
||||
const p07 = p.catch(null);
|
||||
const p02 = p.catch(() => 1);
|
||||
const p03 = p.catch(() => {});
|
||||
const p04 = p.catch(() => {throw 1});
|
||||
const p05 = p.catch(() => Promise.reject(1));
|
||||
const p06 = p.catch(() => Promise.resolve(1));
|
||||
const p01 = p.then();
|
||||
|
||||
const p10 = p.then();
|
||||
const p10 = p.catch(undefined);
|
||||
const p11 = p.catch(null);
|
||||
const p12 = p.catch(() => 1);
|
||||
const p13 = p.catch(() => x);
|
||||
const p14 = p.catch(() => undefined);
|
||||
const p15 = p.catch(() => null);
|
||||
const p16 = p.catch(() => {});
|
||||
const p17 = p.catch(() => {throw 1});
|
||||
const p18 = p.catch(() => Promise.reject(1));
|
||||
const p19 = p.catch(() => Promise.resolve(1));
|
||||
|
||||
const p20 = p.then(undefined);
|
||||
const p21 = p.then(() => 1);
|
||||
const p22 = p.then(() => {});
|
||||
const p23 = p.then(() => {throw 1});
|
||||
const p24 = p.then(() => Promise.resolve(1));
|
||||
const p25 = p.then(() => Promise.reject(1));
|
||||
const p21 = p.then(null);
|
||||
const p22 = p.then(() => 1);
|
||||
const p23 = p.then(() => x);
|
||||
const p24 = p.then(() => undefined);
|
||||
const p25 = p.then(() => null);
|
||||
const p26 = p.then(() => {});
|
||||
const p27 = p.then(() => {throw 1});
|
||||
const p28 = p.then(() => Promise.resolve(1));
|
||||
const p29 = p.then(() => Promise.reject(1));
|
||||
|
||||
const p30 = p.then(undefined, undefined);
|
||||
const p31 = p.then(undefined, () => 1);
|
||||
const p32 = p.then(undefined, () => {});
|
||||
const p33 = p.then(undefined, () => {throw 1});
|
||||
const p34 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p35 = p.then(undefined, () => Promise.reject(1));
|
||||
const p31 = p.then(undefined, null);
|
||||
const p32 = p.then(undefined, () => 1);
|
||||
const p33 = p.then(undefined, () => x);
|
||||
const p34 = p.then(undefined, () => undefined);
|
||||
const p35 = p.then(undefined, () => null);
|
||||
const p36 = p.then(undefined, () => {});
|
||||
const p37 = p.then(undefined, () => {throw 1});
|
||||
const p38 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p39 = p.then(undefined, () => Promise.reject(1));
|
||||
|
||||
const p40 = p.then(() => "1", undefined);
|
||||
const p41 = p.then(() => "1", () => 1);
|
||||
const p42 = p.then(() => "1", () => {});
|
||||
const p43 = p.then(() => "1", () => {throw 1});
|
||||
const p44 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p45 = p.then(() => "1", () => Promise.reject(1));
|
||||
const p40 = p.then(null, undefined);
|
||||
const p41 = p.then(null, null);
|
||||
const p42 = p.then(null, () => 1);
|
||||
const p43 = p.then(null, () => x);
|
||||
const p44 = p.then(null, () => undefined);
|
||||
const p45 = p.then(null, () => null);
|
||||
const p46 = p.then(null, () => {});
|
||||
const p47 = p.then(null, () => {throw 1});
|
||||
const p48 = p.then(null, () => Promise.resolve(1));
|
||||
const p49 = p.then(null, () => Promise.reject(1));
|
||||
|
||||
const p50 = p.then(() => {}, undefined);
|
||||
const p51 = p.then(() => {}, () => 1);
|
||||
const p52 = p.then(() => {}, () => {});
|
||||
const p53 = p.then(() => {}, () => {throw 1});
|
||||
const p54 = p.then(() => {}, () => Promise.resolve(1));
|
||||
const p55 = p.then(() => {}, () => Promise.reject(1));
|
||||
const p50 = p.then(() => "1", undefined);
|
||||
const p51 = p.then(() => "1", null);
|
||||
const p52 = p.then(() => "1", () => 1);
|
||||
const p53 = p.then(() => "1", () => x);
|
||||
const p54 = p.then(() => "1", () => undefined);
|
||||
const p55 = p.then(() => "1", () => null);
|
||||
const p56 = p.then(() => "1", () => {});
|
||||
const p57 = p.then(() => "1", () => {throw 1});
|
||||
const p58 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p59 = p.then(() => "1", () => Promise.reject(1));
|
||||
|
||||
const p60 = p.then(() => {throw 1}, undefined);
|
||||
const p61 = p.then(() => {throw 1}, () => 1);
|
||||
const p62 = p.then(() => {throw 1}, () => {});
|
||||
const p63 = p.then(() => {throw 1}, () => {throw 1});
|
||||
const p64 = p.then(() => {throw 1}, () => Promise.resolve(1));
|
||||
const p65 = p.then(() => {throw 1}, () => Promise.reject(1));
|
||||
const p60 = p.then(() => x, undefined);
|
||||
const p61 = p.then(() => x, null);
|
||||
const p62 = p.then(() => x, () => 1);
|
||||
const p63 = p.then(() => x, () => x);
|
||||
const p64 = p.then(() => x, () => undefined);
|
||||
const p65 = p.then(() => x, () => null);
|
||||
const p66 = p.then(() => x, () => {});
|
||||
const p67 = p.then(() => x, () => {throw 1});
|
||||
const p68 = p.then(() => x, () => Promise.resolve(1));
|
||||
const p69 = p.then(() => x, () => Promise.reject(1));
|
||||
|
||||
const p70 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const p71 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const p72 = p.then(() => Promise.resolve("1"), () => {});
|
||||
const p73 = p.then(() => Promise.resolve("1"), () => {throw 1});
|
||||
const p74 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const p75 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
const p70 = p.then(() => undefined, undefined);
|
||||
const p71 = p.then(() => undefined, null);
|
||||
const p72 = p.then(() => undefined, () => 1);
|
||||
const p73 = p.then(() => undefined, () => x);
|
||||
const p74 = p.then(() => undefined, () => undefined);
|
||||
const p75 = p.then(() => undefined, () => null);
|
||||
const p76 = p.then(() => undefined, () => {});
|
||||
const p77 = p.then(() => undefined, () => {throw 1});
|
||||
const p78 = p.then(() => undefined, () => Promise.resolve(1));
|
||||
const p79 = p.then(() => undefined, () => Promise.reject(1));
|
||||
|
||||
const p80 = p.then(() => Promise.reject(1), undefined);
|
||||
const p81 = p.then(() => Promise.reject(1), () => 1);
|
||||
const p82 = p.then(() => Promise.reject(1), () => {});
|
||||
const p83 = p.then(() => Promise.reject(1), () => {throw 1});
|
||||
const p84 = p.then(() => Promise.reject(1), () => Promise.resolve(1));
|
||||
const p85 = p.then(() => Promise.reject(1), () => Promise.reject(1));
|
||||
const p80 = p.then(() => null, undefined);
|
||||
const p81 = p.then(() => null, null);
|
||||
const p82 = p.then(() => null, () => 1);
|
||||
const p83 = p.then(() => null, () => x);
|
||||
const p84 = p.then(() => null, () => undefined);
|
||||
const p85 = p.then(() => null, () => null);
|
||||
const p86 = p.then(() => null, () => {});
|
||||
const p87 = p.then(() => null, () => {throw 1});
|
||||
const p88 = p.then(() => null, () => Promise.resolve(1));
|
||||
const p89 = p.then(() => null, () => Promise.reject(1));
|
||||
|
||||
const p90 = p.then(() => {}, undefined);
|
||||
const p91 = p.then(() => {}, null);
|
||||
const p92 = p.then(() => {}, () => 1);
|
||||
const p93 = p.then(() => {}, () => x);
|
||||
const p94 = p.then(() => {}, () => undefined);
|
||||
const p95 = p.then(() => {}, () => null);
|
||||
const p96 = p.then(() => {}, () => {});
|
||||
const p97 = p.then(() => {}, () => {throw 1});
|
||||
const p98 = p.then(() => {}, () => Promise.resolve(1));
|
||||
const p99 = p.then(() => {}, () => Promise.reject(1));
|
||||
|
||||
const pa0 = p.then(() => {throw 1}, undefined);
|
||||
const pa1 = p.then(() => {throw 1}, null);
|
||||
const pa2 = p.then(() => {throw 1}, () => 1);
|
||||
const pa3 = p.then(() => {throw 1}, () => x);
|
||||
const pa4 = p.then(() => {throw 1}, () => undefined);
|
||||
const pa5 = p.then(() => {throw 1}, () => null);
|
||||
const pa6 = p.then(() => {throw 1}, () => {});
|
||||
const pa7 = p.then(() => {throw 1}, () => {throw 1});
|
||||
const pa8 = p.then(() => {throw 1}, () => Promise.resolve(1));
|
||||
const pa9 = p.then(() => {throw 1}, () => Promise.reject(1));
|
||||
|
||||
const pb0 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const pb1 = p.then(() => Promise.resolve("1"), null);
|
||||
const pb2 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const pb3 = p.then(() => Promise.resolve("1"), () => x);
|
||||
const pb4 = p.then(() => Promise.resolve("1"), () => undefined);
|
||||
const pb5 = p.then(() => Promise.resolve("1"), () => null);
|
||||
const pb6 = p.then(() => Promise.resolve("1"), () => {});
|
||||
const pb7 = p.then(() => Promise.resolve("1"), () => {throw 1});
|
||||
const pb8 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
|
||||
const pc0 = p.then(() => Promise.reject("1"), undefined);
|
||||
const pc1 = p.then(() => Promise.reject("1"), null);
|
||||
const pc2 = p.then(() => Promise.reject("1"), () => 1);
|
||||
const pc3 = p.then(() => Promise.reject("1"), () => x);
|
||||
const pc4 = p.then(() => Promise.reject("1"), () => undefined);
|
||||
const pc5 = p.then(() => Promise.reject("1"), () => null);
|
||||
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));
|
||||
|
||||
7
tests/cases/compiler/promiseTypeAssignability.ts
Normal file
7
tests/cases/compiler/promiseTypeAssignability.ts
Normal file
@ -0,0 +1,7 @@
|
||||
// @target: es6
|
||||
var x: Promise<string>;
|
||||
var y: PromiseLike<string>;
|
||||
var z: PromiseLike<number>;
|
||||
|
||||
y = x; // ok
|
||||
z = x; // error
|
||||
@ -1,17 +1,7 @@
|
||||
// @target: es6
|
||||
// @strictNullChecks: true
|
||||
declare var p: Promise<boolean>;
|
||||
|
||||
const a = p.then();
|
||||
const b = p.then(b => 1);
|
||||
const c = p.then(b => 1, e => 'error');
|
||||
const d = p.then(b => 1, e => { });
|
||||
const e = p.then(b => 1, e => { throw Error(); });
|
||||
const f = p.then(b => 1, e => Promise.reject(Error()));
|
||||
const g = p.catch(e => 'error');
|
||||
const h = p.catch(e => { });
|
||||
const i = p.catch(e => { throw Error(); });
|
||||
const j = p.catch(e => Promise.reject(Error()));
|
||||
declare var x: any;
|
||||
|
||||
async function A() {
|
||||
const a = await p;
|
||||
@ -23,17 +13,15 @@ async function B() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
// NOTE: This reports a "No best comment type exists among return expressions." error, and is
|
||||
// ignored to get the types result for the test.
|
||||
// async function C() {
|
||||
// try {
|
||||
// const a = await p;
|
||||
// return 1;
|
||||
// }
|
||||
// catch (e) {
|
||||
// return 'error';
|
||||
// }
|
||||
// }
|
||||
async function C() {
|
||||
try {
|
||||
const a = await p;
|
||||
return 1;
|
||||
}
|
||||
catch (e) {
|
||||
return 'error';
|
||||
}
|
||||
}
|
||||
|
||||
async function D() {
|
||||
try {
|
||||
@ -97,61 +85,136 @@ async function I() {
|
||||
// addresses github issue #4903:
|
||||
|
||||
const p00 = p.catch();
|
||||
const p01 = p.catch(undefined);
|
||||
const p07 = p.catch(null);
|
||||
const p02 = p.catch(() => 1);
|
||||
const p03 = p.catch(() => {});
|
||||
const p04 = p.catch(() => {throw 1});
|
||||
const p05 = p.catch(() => Promise.reject(1));
|
||||
const p06 = p.catch(() => Promise.resolve(1));
|
||||
const p01 = p.then();
|
||||
|
||||
const p10 = p.then();
|
||||
const p10 = p.catch(undefined);
|
||||
const p11 = p.catch(null);
|
||||
const p12 = p.catch(() => 1);
|
||||
const p13 = p.catch(() => x);
|
||||
const p14 = p.catch(() => undefined);
|
||||
const p15 = p.catch(() => null);
|
||||
const p16 = p.catch(() => {});
|
||||
const p17 = p.catch(() => {throw 1});
|
||||
const p18 = p.catch(() => Promise.reject(1));
|
||||
const p19 = p.catch(() => Promise.resolve(1));
|
||||
|
||||
const p20 = p.then(undefined);
|
||||
const p21 = p.then(() => 1);
|
||||
const p22 = p.then(() => {});
|
||||
const p23 = p.then(() => {throw 1});
|
||||
const p24 = p.then(() => Promise.resolve(1));
|
||||
const p25 = p.then(() => Promise.reject(1));
|
||||
const p21 = p.then(null);
|
||||
const p22 = p.then(() => 1);
|
||||
const p23 = p.then(() => x);
|
||||
const p24 = p.then(() => undefined);
|
||||
const p25 = p.then(() => null);
|
||||
const p26 = p.then(() => {});
|
||||
const p27 = p.then(() => {throw 1});
|
||||
const p28 = p.then(() => Promise.resolve(1));
|
||||
const p29 = p.then(() => Promise.reject(1));
|
||||
|
||||
const p30 = p.then(undefined, undefined);
|
||||
const p31 = p.then(undefined, () => 1);
|
||||
const p32 = p.then(undefined, () => {});
|
||||
const p33 = p.then(undefined, () => {throw 1});
|
||||
const p34 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p35 = p.then(undefined, () => Promise.reject(1));
|
||||
const p31 = p.then(undefined, null);
|
||||
const p32 = p.then(undefined, () => 1);
|
||||
const p33 = p.then(undefined, () => x);
|
||||
const p34 = p.then(undefined, () => undefined);
|
||||
const p35 = p.then(undefined, () => null);
|
||||
const p36 = p.then(undefined, () => {});
|
||||
const p37 = p.then(undefined, () => {throw 1});
|
||||
const p38 = p.then(undefined, () => Promise.resolve(1));
|
||||
const p39 = p.then(undefined, () => Promise.reject(1));
|
||||
|
||||
const p40 = p.then(() => "1", undefined);
|
||||
const p41 = p.then(() => "1", () => 1);
|
||||
const p42 = p.then(() => "1", () => {});
|
||||
const p43 = p.then(() => "1", () => {throw 1});
|
||||
const p44 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p45 = p.then(() => "1", () => Promise.reject(1));
|
||||
const p40 = p.then(null, undefined);
|
||||
const p41 = p.then(null, null);
|
||||
const p42 = p.then(null, () => 1);
|
||||
const p43 = p.then(null, () => x);
|
||||
const p44 = p.then(null, () => undefined);
|
||||
const p45 = p.then(null, () => null);
|
||||
const p46 = p.then(null, () => {});
|
||||
const p47 = p.then(null, () => {throw 1});
|
||||
const p48 = p.then(null, () => Promise.resolve(1));
|
||||
const p49 = p.then(null, () => Promise.reject(1));
|
||||
|
||||
const p50 = p.then(() => {}, undefined);
|
||||
const p51 = p.then(() => {}, () => 1);
|
||||
const p52 = p.then(() => {}, () => {});
|
||||
const p53 = p.then(() => {}, () => {throw 1});
|
||||
const p54 = p.then(() => {}, () => Promise.resolve(1));
|
||||
const p55 = p.then(() => {}, () => Promise.reject(1));
|
||||
const p50 = p.then(() => "1", undefined);
|
||||
const p51 = p.then(() => "1", null);
|
||||
const p52 = p.then(() => "1", () => 1);
|
||||
const p53 = p.then(() => "1", () => x);
|
||||
const p54 = p.then(() => "1", () => undefined);
|
||||
const p55 = p.then(() => "1", () => null);
|
||||
const p56 = p.then(() => "1", () => {});
|
||||
const p57 = p.then(() => "1", () => {throw 1});
|
||||
const p58 = p.then(() => "1", () => Promise.resolve(1));
|
||||
const p59 = p.then(() => "1", () => Promise.reject(1));
|
||||
|
||||
const p60 = p.then(() => {throw 1}, undefined);
|
||||
const p61 = p.then(() => {throw 1}, () => 1);
|
||||
const p62 = p.then(() => {throw 1}, () => {});
|
||||
const p63 = p.then(() => {throw 1}, () => {throw 1});
|
||||
const p64 = p.then(() => {throw 1}, () => Promise.resolve(1));
|
||||
const p65 = p.then(() => {throw 1}, () => Promise.reject(1));
|
||||
const p60 = p.then(() => x, undefined);
|
||||
const p61 = p.then(() => x, null);
|
||||
const p62 = p.then(() => x, () => 1);
|
||||
const p63 = p.then(() => x, () => x);
|
||||
const p64 = p.then(() => x, () => undefined);
|
||||
const p65 = p.then(() => x, () => null);
|
||||
const p66 = p.then(() => x, () => {});
|
||||
const p67 = p.then(() => x, () => {throw 1});
|
||||
const p68 = p.then(() => x, () => Promise.resolve(1));
|
||||
const p69 = p.then(() => x, () => Promise.reject(1));
|
||||
|
||||
const p70 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const p71 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const p72 = p.then(() => Promise.resolve("1"), () => {});
|
||||
const p73 = p.then(() => Promise.resolve("1"), () => {throw 1});
|
||||
const p74 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const p75 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
const p70 = p.then(() => undefined, undefined);
|
||||
const p71 = p.then(() => undefined, null);
|
||||
const p72 = p.then(() => undefined, () => 1);
|
||||
const p73 = p.then(() => undefined, () => x);
|
||||
const p74 = p.then(() => undefined, () => undefined);
|
||||
const p75 = p.then(() => undefined, () => null);
|
||||
const p76 = p.then(() => undefined, () => {});
|
||||
const p77 = p.then(() => undefined, () => {throw 1});
|
||||
const p78 = p.then(() => undefined, () => Promise.resolve(1));
|
||||
const p79 = p.then(() => undefined, () => Promise.reject(1));
|
||||
|
||||
const p80 = p.then(() => Promise.reject(1), undefined);
|
||||
const p81 = p.then(() => Promise.reject(1), () => 1);
|
||||
const p82 = p.then(() => Promise.reject(1), () => {});
|
||||
const p83 = p.then(() => Promise.reject(1), () => {throw 1});
|
||||
const p84 = p.then(() => Promise.reject(1), () => Promise.resolve(1));
|
||||
const p85 = p.then(() => Promise.reject(1), () => Promise.reject(1));
|
||||
const p80 = p.then(() => null, undefined);
|
||||
const p81 = p.then(() => null, null);
|
||||
const p82 = p.then(() => null, () => 1);
|
||||
const p83 = p.then(() => null, () => x);
|
||||
const p84 = p.then(() => null, () => undefined);
|
||||
const p85 = p.then(() => null, () => null);
|
||||
const p86 = p.then(() => null, () => {});
|
||||
const p87 = p.then(() => null, () => {throw 1});
|
||||
const p88 = p.then(() => null, () => Promise.resolve(1));
|
||||
const p89 = p.then(() => null, () => Promise.reject(1));
|
||||
|
||||
const p90 = p.then(() => {}, undefined);
|
||||
const p91 = p.then(() => {}, null);
|
||||
const p92 = p.then(() => {}, () => 1);
|
||||
const p93 = p.then(() => {}, () => x);
|
||||
const p94 = p.then(() => {}, () => undefined);
|
||||
const p95 = p.then(() => {}, () => null);
|
||||
const p96 = p.then(() => {}, () => {});
|
||||
const p97 = p.then(() => {}, () => {throw 1});
|
||||
const p98 = p.then(() => {}, () => Promise.resolve(1));
|
||||
const p99 = p.then(() => {}, () => Promise.reject(1));
|
||||
|
||||
const pa0 = p.then(() => {throw 1}, undefined);
|
||||
const pa1 = p.then(() => {throw 1}, null);
|
||||
const pa2 = p.then(() => {throw 1}, () => 1);
|
||||
const pa3 = p.then(() => {throw 1}, () => x);
|
||||
const pa4 = p.then(() => {throw 1}, () => undefined);
|
||||
const pa5 = p.then(() => {throw 1}, () => null);
|
||||
const pa6 = p.then(() => {throw 1}, () => {});
|
||||
const pa7 = p.then(() => {throw 1}, () => {throw 1});
|
||||
const pa8 = p.then(() => {throw 1}, () => Promise.resolve(1));
|
||||
const pa9 = p.then(() => {throw 1}, () => Promise.reject(1));
|
||||
|
||||
const pb0 = p.then(() => Promise.resolve("1"), undefined);
|
||||
const pb1 = p.then(() => Promise.resolve("1"), null);
|
||||
const pb2 = p.then(() => Promise.resolve("1"), () => 1);
|
||||
const pb3 = p.then(() => Promise.resolve("1"), () => x);
|
||||
const pb4 = p.then(() => Promise.resolve("1"), () => undefined);
|
||||
const pb5 = p.then(() => Promise.resolve("1"), () => null);
|
||||
const pb6 = p.then(() => Promise.resolve("1"), () => {});
|
||||
const pb7 = p.then(() => Promise.resolve("1"), () => {throw 1});
|
||||
const pb8 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1));
|
||||
const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
|
||||
|
||||
const pc0 = p.then(() => Promise.reject("1"), undefined);
|
||||
const pc1 = p.then(() => Promise.reject("1"), null);
|
||||
const pc2 = p.then(() => Promise.reject("1"), () => 1);
|
||||
const pc3 = p.then(() => Promise.reject("1"), () => x);
|
||||
const pc4 = p.then(() => Promise.reject("1"), () => undefined);
|
||||
const pc5 = p.then(() => Promise.reject("1"), () => null);
|
||||
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));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user