diff --git a/es6-promise/es6-promise.d.ts b/es6-promise/es6-promise.d.ts
index 632276822..202d30d29 100644
--- a/es6-promise/es6-promise.d.ts
+++ b/es6-promise/es6-promise.d.ts
@@ -3,139 +3,133 @@
// Definitions by: François de Campredon
// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
interface Thenable {
- then(onFulfilled: (value: R) => Thenable, onRejected: (error: any) => Thenable): Thenable;
- then(onFulfilled: (value: R) => Thenable, onRejected?: (error: any) => U): Thenable;
- then(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable): Thenable;
- then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): 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) => U, onReject?: (error: any) => U): Thenable;
}
declare class Promise implements Thenable {
- /**
- * If you call resolve in the body of the callback passed to the constructor,
- * your promise is fulfilled with result object passed to resolve.
- * If you call reject your promise is rejected with the object passed to resolve.
- * 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().
- */
+ /**
+ * If you call resolve in the body of the callback passed to the constructor,
+ * your promise is fulfilled with result object passed to resolve.
+ * If you call reject your promise is rejected with the object passed to resolve.
+ * 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);
- /**
- * 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.
- * If you call reject your promise is rejected with the object passed to resolve.
- * 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 : (thenable: Thenable) => 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.
+ * If you call reject your promise is rejected with the object passed to resolve.
+ * 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);
+
+ /**
+ * 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) => 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.
+ * 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) => 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) => 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.
+ * 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) => U): Promise;
-
- /**
- * onFulFill is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
- * Both are optional, if either/both are omitted the next onFulfilled/onRejected 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 onFulfilled/onRejected after being passed through Promise.resolve.
- * If an error is thrown in the callback, the returned promise rejects with that error.
- *
- * @param onFulFill called when/if "promise" resolves
- * @param onReject called when/if "promise" rejects
- */
- then(onFulfill: (value: R) => Thenable, onReject: (error: any) => Thenable): Promise;
- /**
- * onFulFill is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
- * Both are optional, if either/both are omitted the next onFulfilled/onRejected 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 onFulfilled/onRejected after being passed through Promise.resolve.
- * If an error is thrown in the callback, the returned promise rejects with that error.
- *
- * @param onFulFill called when/if "promise" resolves
- * @param onReject called when/if "promise" rejects
- */
- then(onFulfill: (value: R) => Thenable, onReject?: (error: any) => U): Promise;
- /**
- * onFulFill is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
- * Both are optional, if either/both are omitted the next onFulfilled/onRejected 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 onFulfilled/onRejected after being passed through Promise.resolve.
- * If an error is thrown in the callback, the returned promise rejects with that error.
- *
- * @param onFulFill called when/if "promise" resolves
- * @param onReject called when/if "promise" rejects
- */
- then(onFulfill: (value: R) => U, onReject: (error: any) => Thenable): Promise;
- /**
- * onFulFill is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
- * Both are optional, if either/both are omitted the next onFulfilled/onRejected 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 onFulfilled/onRejected after being passed through Promise.resolve.
- * If an error is thrown in the callback, the returned promise rejects with that error.
- *
- * @param onFulFill called when/if "promise" resolves
- * @param onReject called when/if "promise" rejects
- */
- then(onFulfill?: (value: R) => U, onReject?: (error: any) => U): Promise;
-
-
- /**
- * Sugar for promise.then(undefined, onRejected)
- *
- * @param onReject called when/if "promise" rejects
- */
+ /**
+ * Sugar for promise.then(undefined, onReject)
+ *
+ * @param onReject called when/if "promise" rejects
+ */
catch(onReject?: (error: any) => Thenable): Promise;
- /**
- * Sugar for promise.then(undefined, onRejected)
- *
- * @param onReject called when/if "promise" rejects
- */
+ /**
+ * Sugar for promise.then(undefined, onReject)
+ *
+ * @param onReject called when/if "promise" rejects
+ */
catch(onReject?: (error: any) => U): Promise;
}
declare module Promise {
-
/**
* Returns promise (only if promise.constructor == Promise)
*/
function cast(promise: Promise): Promise;
- /**
+ /**
* Make a promise that fulfills to obj.
*/
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.
- */
+
+ /**
+ * 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;
- /**
- * Make a promise that fulfills to obj. Same as Promise.cast(obj) in this situation.
- */
+ /**
+ * Make a promise that fulfills to obj. Same as Promise.cast(obj) in this situation.
+ */
function resolve(object?: R): 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;
- /**
- * Make a promise that fulfills when every item in the array fulfills, and rejects if (and when) any item rejects.
- * the array passed to all can be a mixture of promise-like objects and other objects.
- * The fulfillment value is an array (in order) of fulfillment values. The rejection value is the first rejection value.
- */
+ /**
+ * Make a promise that fulfills when every item in the array fulfills, and rejects if (and when) any item rejects.
+ * the array passed to all can be a mixture of promise-like objects and other objects.
+ * The fulfillment value is an array (in order) of fulfillment values. The rejection value is the first rejection value.
+ */
function all(promises: Promise[]): Promise;
- /**
- * Make a Promise that fulfills when any item fulfills, and rejects if any item rejects.
- */
+ /**
+ * Make a Promise that fulfills when any item fulfills, and rejects if any item rejects.
+ */
function race(promises: Promise[]): Promise;
}
declare module 'es6-promise' {
- var foo: typeof Promise; // Temp variable to reference Promise in local context
- module rsvp {
- export var Promise: typeof foo;
- }
- export = rsvp;
+ var foo: typeof Promise; // Temp variable to reference Promise in local context
+ module rsvp {
+ export var Promise: typeof foo;
+ }
+ export = rsvp;
}