From 9c38124670c075a482e542dde5f2d7694872b8fe Mon Sep 17 00:00:00 2001
From: Andrew Gaspar <andrew.james.gaspar@gmail.com>
Date: Thu, 20 Jun 2013 00:43:35 -0700
Subject: [PATCH] Added typing to Deferred and defer()

---
 q/Q-tests.ts        | 2 +-
 q/Q.d.ts            | 6 +++---
 q/q.module-tests.ts | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/q/Q-tests.ts b/q/Q-tests.ts
index b04067003..02a409b6b 100644
--- a/q/Q-tests.ts
+++ b/q/Q-tests.ts
@@ -2,7 +2,7 @@
 
 Q(8).then(x => console.log(x.toExponential()));
 
-var delay = function (delay) {
+var delay = function (delay: number) {
     var d = Q.defer();
     setTimeout(d.resolve, delay);
     return d.promise;
diff --git a/q/Q.d.ts b/q/Q.d.ts
index 25ed1b8e8..951f615d0 100644
--- a/q/Q.d.ts
+++ b/q/Q.d.ts
@@ -8,10 +8,10 @@ declare function Q<T>(value: T): Q.Promise<T>;
 declare module Q {
     interface Deferred<T> {
         promise: Promise<T>;
-        resolve(value: any): any;
+        resolve(value: T): any;
         reject(reason: any);
         notify(value: any);
-        makeNodeResolver(): () => void;
+        makeNodeResolver(): (reason, value: T) => void;
     }
 
     interface Promise<T> {
@@ -55,7 +55,7 @@ declare module Q {
     export function isRejected(): bool;
     export function isPending(): bool;
     export function valueOf(): any;
-    export function defer(): Deferred;
+    export function defer<T>(): Deferred<T>;
     export function reject(): Promise<any>;
     export function promise(factory: { resolve: Function; reject: Function; notify: Function; }): Promise<any>;
     export function isPromise(value: any): bool;
diff --git a/q/q.module-tests.ts b/q/q.module-tests.ts
index 037dd028c..a589ca1d6 100644
--- a/q/q.module-tests.ts
+++ b/q/q.module-tests.ts
@@ -67,7 +67,7 @@ q.nfcall(fs.readFile, "foo.txt", "utf-8").then(replaceText);
 
 q.ninvoke(fs, "readFile", "foo.txt", "utf-8").then(replaceText);
 
-var deferred = q.defer();
+var deferred = q.defer<string>();
 fs.readFile("foo.txt", "utf-8", deferred.makeNodeResolver());
 deferred.promise.then(replaceText);