From e37fc19ad42a8f945696ea2e1b76a981a492ea2e Mon Sep 17 00:00:00 2001
From: Magnus Hiie <magnus.hiie@gmail.com>
Date: Wed, 22 Mar 2017 19:43:32 +0200
Subject: [PATCH] Fix koa-compose typings

This changes ComposedMiddleware take next as a parameterless async function.

Also, add tslint.json and fix lint errors.
---
 koa-compose/index.d.ts           |  2 +-
 koa-compose/koa-compose-tests.ts | 10 ++++------
 koa-compose/tslint.json          |  1 +
 3 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 koa-compose/tslint.json

diff --git a/koa-compose/index.d.ts b/koa-compose/index.d.ts
index 6e466b9d28..a1037f187c 100644
--- a/koa-compose/index.d.ts
+++ b/koa-compose/index.d.ts
@@ -8,7 +8,7 @@ declare function compose<T>(middleware: Array<compose.Middleware<T>>): compose.C
 
 declare namespace compose {
     type Middleware<T> = (context: T, next: () => Promise<any>) => any;
-    type ComposedMiddleware<T> = (context: T, next?: Middleware<T>) => Promise<void>;
+    type ComposedMiddleware<T> = (context: T, next?: () => Promise<any>) => Promise<void>;
 }
 
 export = compose;
diff --git a/koa-compose/koa-compose-tests.ts b/koa-compose/koa-compose-tests.ts
index 2b2a65038e..cb7b78b397 100644
--- a/koa-compose/koa-compose-tests.ts
+++ b/koa-compose/koa-compose-tests.ts
@@ -1,17 +1,15 @@
 
 import compose = require('koa-compose');
 
-var fn1: compose.Middleware<any> = function(context: any, next: () => Promise<void>): Promise<any> {
-    return Promise
+var fn1: compose.Middleware<any> = (context: any, next: () => Promise<void>): Promise<any> =>
+    Promise
         .resolve(console.log('in fn1'))
         .then(() => next());
-};
 
-var fn2: compose.Middleware<any> = function(context: any, next: () => Promise<void>): Promise<any> {
-    return Promise
+var fn2: compose.Middleware<any> = (context: any, next: () => Promise<void>): Promise<any> =>
+    Promise
         .resolve(console.log('in fn2'))
         .then(() => next());
-};
 
 
 var fn = compose([fn1, fn2]);
\ No newline at end of file
diff --git a/koa-compose/tslint.json b/koa-compose/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/koa-compose/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file