From a685b7db7a80a10d3ffb7575be2e6881d55c0f15 Mon Sep 17 00:00:00 2001 From: tarh Date: Sat, 5 Jul 2014 14:25:56 +0100 Subject: [PATCH] Works with more use cases --- es6-promise/es6-promise.d.ts | 54 ++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/es6-promise/es6-promise.d.ts b/es6-promise/es6-promise.d.ts index 202d30d29..4e8d27d4d 100644 --- a/es6-promise/es6-promise.d.ts +++ b/es6-promise/es6-promise.d.ts @@ -4,10 +4,12 @@ // Definitions: https://github.com/borisyankov/DefinitelyTyped interface Thenable { - then(onResolve: (value: R) => Thenable, onReject: (error: any) => Thenable): Thenable; - then(onResolve: (value: R) => Thenable, onReject?: (error: any) => U): Thenable; - then(onResolve: (value: R) => U, onReject: (error: any) => Thenable): Thenable; + then(onResolve?: (value: R) => Thenable, onReject?: (error: any) => Thenable): Thenable; + then(onResolve?: (value: R) => Thenable, onReject?: (error: any) => U): Thenable; + then(onResolve?: (value: R) => Thenable, onReject?: (error: any) => void): Thenable; + then(onResolve?: (value: R) => U, onReject?: (error: any) => Thenable): Thenable; then(onResolve?: (value: R) => U, onReject?: (error: any) => U): Thenable; + then(onResolve?: (value: R) => U, onReject?: (error: any) => void): Thenable; } declare class Promise implements Thenable { @@ -18,7 +20,7 @@ declare class Promise implements Thenable { * For consistency and debugging (eg stack traces), obj should be an instanceof Error. * Any errors thrown in the constructor callback will be implicitly passed to reject(). */ - constructor(callback: (resolve : (result: R) => void, reject: (error: any) => void) => void); + constructor(callback: (resolve : (result?: R) => void, reject: (error: any) => void) => void); /** * If you call resolve in the body of the callback passed to the constructor, * your promise will be fulfilled/rejected with the outcome of thenable passed to resolve. @@ -26,7 +28,7 @@ declare class Promise implements Thenable { * For consistency and debugging (eg stack traces), obj should be an instanceof Error. * Any errors thrown in the constructor callback will be implicitly passed to reject(). */ - constructor(callback: (resolve : (result: Thenable) => void, reject: (error: any) => void) => void); + constructor(callback: (resolve : (result?: Thenable) => void, reject: (error: any) => void) => void); /** * onResolve is called when/if "promise" resolves. onReject is called when/if "promise" rejects. @@ -38,7 +40,7 @@ declare class Promise implements Thenable { * @param onResolve called when/if "promise" resolves * @param onReject called when/if "promise" rejects */ - then(onResolve: (value: R) => Thenable, onReject: (error: any) => Thenable): Promise; + then(onResolve?: (value: R) => Thenable, onReject?: (error: any) => Thenable): Promise; /** * onResolve is called when/if "promise" resolves. onReject is called when/if "promise" rejects. * Both are optional, if either/both are omitted the next onResolve/onReject in the chain is called. @@ -49,7 +51,18 @@ declare class Promise implements Thenable { * @param onResolve called when/if "promise" resolves * @param onReject called when/if "promise" rejects */ - then(onResolve: (value: R) => Thenable, onReject?: (error: any) => U): Promise; + then(onResolve?: (value: R) => Thenable, onReject?: (error: any) => U): Promise; + /** + * onResolve is called when/if "promise" resolves. onReject is called when/if "promise" rejects. + * Both are optional, if either/both are omitted the next onResolve/onReject in the chain is called. + * Both callbacks have a single parameter , the fulfillment value or rejection reason. + * "then" returns a new promise equivalent to the value you return from onResolve/onReject after being passed through Promise.resolve. + * If an error is thrown in the callback, the returned promise rejects with that error. + * + * @param onResolve called when/if "promise" resolves + * @param onReject called when/if "promise" rejects + */ + then(onResolve?: (value: R) => Thenable, onReject?: (error: any) => void): Promise; /** * onResolve is called when/if "promise" resolves. onReject is called when/if "promise" rejects. * Both are optional, if either/both are omitted the next onResolve/onReject in the chain is called. @@ -60,7 +73,7 @@ declare class Promise implements Thenable { * @param onResolve called when/if "promise" resolves * @param onReject called when/if "promise" rejects */ - then(onResolve: (value: R) => U, onReject: (error: any) => Thenable): Promise; + then(onResolve?: (value: R) => U, onReject?: (error: any) => Thenable): Promise; /** * onResolve is called when/if "promise" resolves. onReject is called when/if "promise" rejects. * Both are optional, if either/both are omitted the next onResolve/onReject in the chain is called. @@ -72,7 +85,18 @@ declare class Promise implements Thenable { * @param onReject called when/if "promise" rejects */ then(onResolve?: (value: R) => U, onReject?: (error: any) => U): Promise; - + /** + * onResolve is called when/if "promise" resolves. onReject is called when/if "promise" rejects. + * Both are optional, if either/both are omitted the next onResolve/onReject in the chain is called. + * Both callbacks have a single parameter , the fulfillment value or rejection reason. + * "then" returns a new promise equivalent to the value you return from onResolve/onReject after being passed through Promise.resolve. + * If an error is thrown in the callback, the returned promise rejects with that error. + * + * @param onResolve called when/if "promise" resolves + * @param onReject called when/if "promise" rejects + */ + then(onResolve?: (value: R) => U, onReject?: (error: any) => void): Promise; + /** * Sugar for promise.then(undefined, onReject) * @@ -85,6 +109,12 @@ declare class Promise implements Thenable { * @param onReject called when/if "promise" rejects */ catch(onReject?: (error: any) => U): Promise; + /** + * Sugar for promise.then(undefined, onReject) + * + * @param onReject called when/if "promise" rejects + */ + catch(onReject?: (error: any) => void): Promise; } declare module Promise { @@ -95,14 +125,14 @@ declare module Promise { /** * Make a promise that fulfills to obj. */ - function cast(object?: R): Promise; + function cast(object: R): Promise; /** * Make a new promise from the thenable. * A thenable is promise-like in as far as it has a "then" method. * This also creates a new promise if you pass it a genuine JavaScript promise, making it less efficient for casting than Promise.cast. */ - function resolve(thenable: Thenable): Promise; + function resolve(thenable?: Thenable): Promise; /** * Make a promise that fulfills to obj. Same as Promise.cast(obj) in this situation. */ @@ -111,7 +141,7 @@ declare module Promise { /** * Make a promise that rejects to obj. For consistency and debugging (eg stack traces), obj should be an instanceof Error */ - function reject(error?: any): Promise; + function reject(error: any): Promise; /** * Make a promise that fulfills when every item in the array fulfills, and rejects if (and when) any item rejects.