kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-05-13 12:37:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17548 from DefinitelyTyped/fix-q-2.4-types

Browse Source 
Q: use PromiseLike and fix Q.all type inference
This commit is contained in:
Nathan Shively-Sanders
2017-06-29 10:33:14 -07:00
committed by GitHub
parent 5f83c2747d 019645c0d1
commit 25db86a857
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
types/q/index.d.ts vendored
View File

@@ -11,7 +11,7 @@ export as namespace Q;
* If value is a Q promise, returns the promise.
* If value is a promise from another library it is coerced into a Q promise (where possible).
*/
declare function Q<T>(promise: Q.IPromise<T>): Q.Promise<T>;
declare function Q<T>(promise: PromiseLike<T>): Q.Promise<T>;
/**
* If value is not a promise, returns a promise that is fulfilled with value.
*/
@@ -22,10 +22,9 @@ declare function Q<T>(value: T): Q.Promise<T>;
declare function Q(): Q.Promise<void>;
declare namespace Q {
export type IWhenable<T> = IPromise<T> | T;
export interface IPromise<T> {
then<U>(onFulfill?: (value: T) => IWhenable<U>, onReject?: (error: any) => IWhenable<U>): IPromise<U>;
}
export type IWhenable<T> = PromiseLike<T> | T;
export type IPromise<T> = PromiseLike<T>;
export interface Deferred<T> {
promise: Promise<T>;
@@ -224,7 +223,10 @@ declare namespace Q {
/**
* Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
*/
export function all<A, B>(promises: IWhenable<[IWhenable<A>, IWhenable<B>]>): Promise<[A, B]>;
export function all<A, B>(promises: IWhenable<[IPromise<A>, IPromise<B>]>): Promise<[A, B]>;
export function all<A, B>(promises: IWhenable<[A, IPromise<B>]>): Promise<[A, B]>;
export function all<A, B>(promises: IWhenable<[IPromise<A>, B]>): Promise<[A, B]>;
export function all<A, B>(promises: IWhenable<[A, B]>): Promise<[A, B]>;
/**
* Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
*/