From 1d7d9e514e1978b74979cdfbc29a0b2ea8337cfc Mon Sep 17 00:00:00 2001
From: Jacob Eggers <eggers@brandeis.edu>
Date: Wed, 28 Oct 2015 00:05:07 -0700
Subject: [PATCH] Fixes #6489

---
 request-promise/request-promise.d.ts |  3 ++-
 request/request.d.ts                 | 14 +++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/request-promise/request-promise.d.ts b/request-promise/request-promise.d.ts
index 246f1e5d9d..1bc357dd13 100644
--- a/request-promise/request-promise.d.ts
+++ b/request-promise/request-promise.d.ts
@@ -22,10 +22,11 @@ declare module 'request-promise' {
     function RequestPromiseAPI(uri: string): Promise<request.Request>;
 
     module RequestPromiseAPI {
-        export interface Options extends request.Options {
+        interface AdditionalOptions {
             simple?: boolean;
             transform?: (body: any, response: http.IncomingMessage) => any;
             resolveWithFullResponse?: boolean;
         }
+        export type Options = AdditionalOptions & request.Options; 
     }
 }
diff --git a/request/request.d.ts b/request/request.d.ts
index d3bbd57047..49c41f8fc0 100644
--- a/request/request.d.ts
+++ b/request/request.d.ts
@@ -57,9 +57,15 @@ declare module 'request' {
 
 		export var initParams: any;
 
-		export interface Options {
-			url?: string;
-			uri?: string;
+    interface UriOptions {
+      uri: string;
+    }
+
+    interface UrlOptions {
+      url: string;
+    }
+
+		interface OptionalOptions {
 			callback?: (error: any, response: http.IncomingMessage, body: any) => void;
 			jar?: any; // CookieJar
 			formData?: any; // Object
@@ -90,6 +96,8 @@ declare module 'request' {
 			gzip?: boolean;
 		}
 
+    export type Options = (UriOptions|UrlOptions)&OptionalOptions;
+
 		export interface RequestPart {
 			headers?: Headers;
 			body: any;