From e47c8296af90d6b68061d880684435bbe6a4ab08 Mon Sep 17 00:00:00 2001
From: Chris Gedrim <chris@gedrim.co.uk>
Date: Tue, 2 Apr 2019 22:59:29 +0100
Subject: [PATCH 1/3] Add busboy to Express.Request interface

---
 types/connect-busboy/connect-busboy-tests.ts | 9 ++++++++-
 types/connect-busboy/index.d.ts              | 9 +++++++++
 types/connect-busboy/tslint.json             | 7 ++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/types/connect-busboy/connect-busboy-tests.ts b/types/connect-busboy/connect-busboy-tests.ts
index 2db8cd45d7..be3a776799 100644
--- a/types/connect-busboy/connect-busboy-tests.ts
+++ b/types/connect-busboy/connect-busboy-tests.ts
@@ -1,6 +1,13 @@
-import connectBusboy = require('connect-busboy');
+import * as connectBusboy from 'connect-busboy';
 
 import * as express from 'express';
 
 const options: connectBusboy.ConnectBusboyOptions = { immediate: true };
 const result: express.RequestHandler = connectBusboy(options);
+
+const app = express();
+
+app.use(connectBusboy());
+app.use((req: express.Request, res: express.Response, next: express.NextFunction) => {
+    req.busboy.on('file', () => {});
+});
diff --git a/types/connect-busboy/index.d.ts b/types/connect-busboy/index.d.ts
index cb6a3e8702..04e22e225e 100644
--- a/types/connect-busboy/index.d.ts
+++ b/types/connect-busboy/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for connect-busboy 0.0
 // Project: https://github.com/mscdex/connect-busboy
 // Definitions by: Pinguet62 <https://github.com/pinguet62>
+//                 Chris Gedrim <https://github.com/chrisgedrim>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -15,4 +16,12 @@ declare namespace connectBusboy {
     }
 }
 
+declare global {
+    namespace Express {
+        export interface Request {
+            busboy: busboy.Busboy;
+        }
+    }
+}
+
 export = connectBusboy;
diff --git a/types/connect-busboy/tslint.json b/types/connect-busboy/tslint.json
index 3db14f85ea..4c4fc86ace 100644
--- a/types/connect-busboy/tslint.json
+++ b/types/connect-busboy/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "strict-export-declare-modifiers": false
+    }
+}

From b0d877aad43abf431a02da1aeaa65a02a9a76c0c Mon Sep 17 00:00:00 2001
From: Chris Gedrim <chris@gedrim.co.uk>
Date: Thu, 4 Apr 2019 22:32:52 +0100
Subject: [PATCH 2/3] Update import

---
 types/connect-busboy/connect-busboy-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/connect-busboy/connect-busboy-tests.ts b/types/connect-busboy/connect-busboy-tests.ts
index be3a776799..69f8a76d49 100644
--- a/types/connect-busboy/connect-busboy-tests.ts
+++ b/types/connect-busboy/connect-busboy-tests.ts
@@ -1,4 +1,4 @@
-import * as connectBusboy from 'connect-busboy';
+import connectBusboy = require('connect-busboy');
 
 import * as express from 'express';
 

From 4fc89524a2ee6a5e59ee6ddc768eb39a39923591 Mon Sep 17 00:00:00 2001
From: Chris Gedrim <chris@gedrim.co.uk>
Date: Fri, 5 Apr 2019 09:57:30 +0100
Subject: [PATCH 3/3] Remove export for Express.Request in connect-busboy

---
 types/connect-busboy/index.d.ts  | 2 +-
 types/connect-busboy/tslint.json | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/types/connect-busboy/index.d.ts b/types/connect-busboy/index.d.ts
index 04e22e225e..4085c8d83b 100644
--- a/types/connect-busboy/index.d.ts
+++ b/types/connect-busboy/index.d.ts
@@ -18,7 +18,7 @@ declare namespace connectBusboy {
 
 declare global {
     namespace Express {
-        export interface Request {
+        interface Request {
             busboy: busboy.Busboy;
         }
     }
diff --git a/types/connect-busboy/tslint.json b/types/connect-busboy/tslint.json
index 4c4fc86ace..f93cf8562a 100644
--- a/types/connect-busboy/tslint.json
+++ b/types/connect-busboy/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "strict-export-declare-modifiers": false
-    }
+    "extends": "dtslint/dt.json"
 }