From 9cbb16d81e20e670b6b15e157b46fb3ef8a78286 Mon Sep 17 00:00:00 2001
From: d-ph <dominikd100@gmail.com>
Date: Sat, 1 Nov 2014 10:57:08 +0000
Subject: [PATCH] Fix .fail<> generic precedence bug and missing generic on
 .reject()

---
 q/Q-tests.ts | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 q/Q.d.ts     |  4 ++--
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/q/Q-tests.ts b/q/Q-tests.ts
index 48a3224bc1..b5f03a3fd8 100644
--- a/q/Q-tests.ts
+++ b/q/Q-tests.ts
@@ -137,4 +137,50 @@ class Repo {
 }
 
 var kitty = new Repo();
-Q.nbind(kitty.find, kitty)({ cute: true }).done((kitties: any[]) => {});
\ No newline at end of file
+Q.nbind(kitty.find, kitty)({ cute: true }).done((kitties: any[]) => {});
+
+
+/*
+ * Test: Can "rethrow" rejected promises
+ */
+module TestCanRethrowRejectedPromises {
+
+    interface Foo {
+        a: number;
+    }
+
+    function nestedBar(): Q.Promise<Foo> {
+        var deferred = Q.defer<Foo>();
+
+        return deferred.promise;
+    }
+
+    function bar(): Q.Promise<Foo> {
+        return nestedBar()
+            .then((foo:Foo) => {
+                console.log("Lorem ipsum");
+            })
+            .fail((error) => {
+                console.log("Intermediate error handling");
+
+                /*
+                 * Cannot do this, because:
+                 *     error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<Foo>'
+                 */
+                //throw error;
+
+                return Q.reject<Foo>(error);
+            })
+        ;
+    }
+
+    bar()
+        .finally(() => {
+            console.log("Cleanup")
+        })
+        .done()
+    ;
+
+}
+
+
diff --git a/q/Q.d.ts b/q/Q.d.ts
index 3e7371ead2..b43f516f6e 100644
--- a/q/Q.d.ts
+++ b/q/Q.d.ts
@@ -74,8 +74,8 @@ declare module Q {
          */
         spread<U>(onFulfilled: Function, onRejected?: Function): Promise<U>;
 
-        fail<U>(onRejected: (reason: any) => U): Promise<U>;
         fail<U>(onRejected: (reason: any) => IPromise<U>): Promise<U>;
+        fail<U>(onRejected: (reason: any) => U): Promise<U>;
         /**
          * A sugar method, equivalent to promise.then(undefined, onRejected).
          */
@@ -329,7 +329,7 @@ declare module Q {
     /**
      * Returns a promise that is rejected with reason.
      */
-    export function reject(reason?: any): Promise<any>;
+    export function reject<T>(reason?: any): Promise<T>;
 
     export function Promise<T>(resolver: (resolve: (val: IPromise<T>) => void , reject: (reason: any) => void , notify: (progress: any) => void ) => void ): Promise<T>;
     export function Promise<T>(resolver: (resolve: (val: T) => void , reject: (reason: any) => void , notify: (progress: any) => void ) => void ): Promise<T>;