feat(koa): Move custom properties into DefaultContext (DefinitelyTyped#39008)

* Move custom properties into DefaultContext

This allows having a strict `Koa<{}, {}>`.

* Fix tests

Author: mrcljx

types/koa-bouncer/koa-bouncer-tests.ts

@@ -1,43 +1,35 @@
 import Koa = require("koa");
-import Router = require("koa-router");
 import bouncer = require("koa-bouncer");
 
 const app = new Koa();
 
 app.use(bouncer.middleware());
-const router = new Router()
 
-router.post('/users', async (ctx) => {
+app.use(async ctx => {
     ctx.validateBody('uname')
         .required('Username required')
         .isString()
-        .trim()
+        .trim();
 
     ctx.validateBody('email')
         .optional()
         .isString()
         .trim()
-        .isEmail('Invalid email format')
+        .isEmail('Invalid email format');
 
     ctx.validateBody('password1')
         .required('Password required')
         .isString()
-        .isLength(6, 100, 'Password must be 6-100 chars')
+        .isLength(6, 100, 'Password must be 6-100 chars');
 
     ctx.validateBody('password2')
         .required('Password confirmation required')
         .isString()
-        .eq(ctx.vals.password1, 'Passwords must match')
-
-    ctx.validateBody('age')
-        .gte(18, 'Must be 18 or older')
+        .eq(ctx.vals.password1, 'Passwords must match');
 
-    console.log(ctx.vals)
-})
+    ctx.validateBody('age').gte(18, 'Must be 18 or older');
 
-app
-    .use(router.routes())
-    .use(router.allowedMethods());
-    
+    ctx.body = ctx.vals;
+});
 
 app.listen(80);

types/koa-log/index.d.ts

@@ -24,7 +24,7 @@ declare namespace koaLog {
 
         function status(ctx: Koa.BaseContext): number;
 
-        function token(name: string, fn: (ctx: Koa.BaseContext) => string): void;
+        function token(name: string, fn: (ctx: Koa.ParameterizedContext) => string): void;
 
         function url(ctx: Koa.BaseContext): string;
     }

types/koa-log/koa-log-tests.ts

@@ -1,10 +1,8 @@
 import Koa = require('koa');
 import koaLogger = require('koa-log');
 
-koaLogger.morgan.token('request-body', (ctx: Koa.BaseContext) => JSON.stringify(ctx.request.body));
-koaLogger.morgan.token('response-body', (ctx: Koa.BaseContext) => JSON.stringify(ctx.body));
+koaLogger.morgan.token('request-ip', ctx => JSON.stringify(ctx.request.ip));
+koaLogger.morgan.token('response-body', ctx => JSON.stringify(ctx.body));
 
 const app = new Koa();
-app.use(
-    koaLogger(':status :method :url took :response-time ms :request-body :response-body')
-);
+app.use(koaLogger(':status :method :url took :response-time ms :request-ip :response-body'));

types/koa-router/koa-router-tests.ts

@@ -78,7 +78,7 @@ app.use(async (ctx: Koa.ParameterizedContext<MyState, MyContext>, next) => {
 
 const router3 = new Router();
 router3.get('/', (ctx) => {
-    ctx.foo = "bar";
+    ctx.state.foo = 'bar';
     console.log(ctx.router.params);
     ctx.body = "Hello World!";
 });

types/koa/index.d.ts

@@ -540,7 +540,12 @@ declare namespace Application {
     /**
      * This interface can be augmented by users to add types to Koa's default context
      */
-    interface DefaultContext extends DefaultContextExtends {}
+    interface DefaultContext extends DefaultContextExtends {
+        /**
+         * Custom properties.
+         */
+        [key: string]: any;
+    }
 
     type Middleware<
         StateT = DefaultState,
@@ -680,10 +685,6 @@ declare namespace Application {
          * Default error handling.
          */
         onerror(err: Error): void;
-        /**
-         * Custom properties.
-         */
-        [key: string]: any;
     }
 
     interface Request extends BaseRequest {

types/koa__router/koa__router-tests.ts

@@ -75,7 +75,7 @@ app.use(async (ctx: Koa.ParameterizedContext<MyState, MyContext>, next) => {
 
 const router3 = new Router();
 router3.get('/', (ctx) => {
-    ctx.foo = "bar";
+    ctx.state.foo = 'bar';
     console.log(ctx.router.params);
     ctx.body = "Hello World!";
 });