From 98184ee41d3848d537e04d0414323e73cb2dbe47 Mon Sep 17 00:00:00 2001
From: Joe Skeen <joe.skeen@imail.org>
Date: Wed, 7 Oct 2015 10:51:29 -0600
Subject: [PATCH] Added back missing options and fixed promise exposure

---
 request-promise/request-promise.d.ts | 14 ++++++++++++--
 request/request.d.ts                 |  6 +++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/request-promise/request-promise.d.ts b/request-promise/request-promise.d.ts
index 67b82ebd8e..7a94ce5967 100644
--- a/request-promise/request-promise.d.ts
+++ b/request-promise/request-promise.d.ts
@@ -12,9 +12,19 @@ declare module 'request-promise' {
     import request = require('request');
 	import http = require('http');
         
-    interface RequestPromise extends request.Request, Promise<any> {
+    interface RequestPromise extends request.Request {
+        then(onFulfilled: Function, onRejected: Function): Promise<any>;
+        catch(onRejected: Function): Promise<any>;
+        finally(onFinished: Function): Promise<any>;
+        promise(): Promise<any>;
     }
     
-    var requestPromise: request.RequestAPI<RequestPromise>;
+    interface RequestPromiseOptions extends request.Options {
+        simple?: boolean;
+        transform?: (body: any, response: http.IncomingMessage) => any;
+        resolveWithFullResponse?: boolean;
+    }
+    
+    var requestPromise: request.RequestAPI<RequestPromise, RequestPromiseOptions>;
 	export = requestPromise;
 }
diff --git a/request/request.d.ts b/request/request.d.ts
index 711b3d3c16..f0ec40f3bc 100644
--- a/request/request.d.ts
+++ b/request/request.d.ts
@@ -16,8 +16,8 @@ declare module 'request' {
 	import fs = require('fs');
 
 	namespace request {
-		export interface RequestAPI<TRequest extends Request> {
-			defaults(options: Options): RequestAPI<TRequest>;
+		export interface RequestAPI<TRequest extends Request, TOptions extends Options> {
+			defaults(options: Options): RequestAPI<TRequest, TOptions>;
 			(uri: string, options?: Options, callback?: RequestCallback): TRequest;
 			(uri: string, callback?: RequestCallback): TRequest;
 			(options?: Options, callback?: RequestCallback): TRequest;
@@ -214,6 +214,6 @@ declare module 'request' {
 			toString(): string;
 		}
 	}	
-	var request: request.RequestAPI<request.Request>;
+	var request: request.RequestAPI<request.Request, request.Options>;
 	export = request;
 }