From 9d4364560ec6422b18c9b86735413ad04bf5b93c Mon Sep 17 00:00:00 2001
From: Maxime LUCE <somatic@live.fr>
Date: Thu, 22 Oct 2015 01:08:06 +0200
Subject: [PATCH] Fix typings issues

---
 connect/connect-tests.ts |  6 +++---
 connect/connect.d.ts     | 15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/connect/connect-tests.ts b/connect/connect-tests.ts
index c368a3b93..e8665f8f9 100644
--- a/connect/connect-tests.ts
+++ b/connect/connect-tests.ts
@@ -6,13 +6,13 @@ import * as connect from "connect";
 const app = connect();
 
 // log all requests
-app.use((req, res, next) => {
+app.use((req: http.IncomingMessage, res: http.ServerResponse, next: Function) => {
     console.log(req, res);
     next();
 });
 
 // Stop on errors
-app.use((err, req, res, next) => {
+app.use((err: Error, req: http.IncomingMessage, res: http.ServerResponse, next: Function) => {
     if (err) {
         return res.end(`Error: ${err}`);
     }
@@ -21,7 +21,7 @@ app.use((err, req, res, next) => {
 });
 
 // respond to all requests
-app.use((req, res) => {
+app.use((req: http.IncomingMessage, res: http.ServerResponse) => {
     res.end("Hello from Connect!\n");
 });
 
diff --git a/connect/connect.d.ts b/connect/connect.d.ts
index a61cd9281..575a341b6 100644
--- a/connect/connect.d.ts
+++ b/connect/connect.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for connect v3.4.0.
+// Type definitions for connect v3.4.0
 // Project: https://github.com/senchalabs/connect
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -16,12 +16,11 @@ declare module "connect" {
     
     module createServer {
     	export type ServerHandle = HandleFunction | http.Server;
-
-        export interface HandleFunction {
-            (req: http.IncomingMessage, res: http.ServerResponse): void;
-            (req: http.IncomingMessage, res: http.ServerResponse, next: Function): void;
-            (err: Error, req: http.IncomingMessage, res: http.ServerResponse, next: Function): void;
-        }
+        
+        export type SimpleHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse) => void;
+        export type NextHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
+        export type ErrorHandleFunction = (err: Error, req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
+        export type HandleFunction = SimpleHandleFunction | NextHandleFunction | ErrorHandleFunction;
 
     	export interface ServerStackItem {
             route: string;
@@ -29,7 +28,7 @@ declare module "connect" {
     	}
     	
         export interface Server extends NodeJS.EventEmitter {
-            (req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
+            (req: http.IncomingMessage, res: http.ServerResponse, next?: Function): void;
 
             route: string;
             stack: ServerStackItem[];