fix(types): use koa['Context'] instead of egg['Context'] as typeof Ko…

…aMiddleware
midwayjs · Jul 9, 2019 · c438f0d · c438f0d
1 parent 8fbf356
commit c438f0d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/packages/midway-decorator/src/interface.ts b/packages/midway-decorator/src/interface.ts
@@ -1,3 +1,4 @@
-import {Context} from 'egg';
+import {Context} from 'koa';
 
-export type KoaMiddleware = (context: Context, next: () => Promise<any>) => void;
+export type KoaMiddleware <T extends any = Context> = (context: T, next: () => Promise<any>) => void;
+export type MiddlewareParamArray <T extends any = Context> = Array<string | KoaMiddleware<T>>
diff --git a/packages/midway-decorator/src/web/controller.ts b/packages/midway-decorator/src/web/controller.ts
@@ -1,18 +1,18 @@
 import { saveClassMetadata, saveModule, scope, ScopeEnum } from 'injection';
 import { CONTROLLER_KEY } from '../constant';
-import { KoaMiddleware } from '../interface';
+import { MiddlewareParamArray } from '../interface';
 
 export interface ControllerOption {
   prefix: string;
   routerOptions: {
     sensitive?: boolean;
-    middleware?: Array<string | KoaMiddleware>
+    middleware?: MiddlewareParamArray
   };
 }
 
 export function controller(prefix: string, routerOptions: {
   sensitive?: boolean,
-  middleware?: Array<string | KoaMiddleware>
+  middleware?: MiddlewareParamArray
  } = {middleware: [], sensitive: true}
   ): ClassDecorator {
   return (target: any) => {

diff --git a/packages/midway-decorator/src/web/requestMapping.ts b/packages/midway-decorator/src/web/requestMapping.ts
@@ -3,9 +3,8 @@
  */
 import { attachClassMetadata } from 'injection';
 import { WEB_ROUTER_KEY } from '../constant';
-import { KoaMiddleware } from '../interface';
+import { MiddlewareParamArray } from '../interface';
 
-export type MiddlewareParamArray = Array<string | KoaMiddleware>
 
 export interface RouterOption {
   path?: string;

diff --git a/packages/midway-web/src/interface.ts b/packages/midway-web/src/interface.ts
@@ -2,6 +2,7 @@ import {EggLoaderOptions} from 'egg-core';
 import {IApplicationContext} from 'injection';
 import {KoaMiddleware} from '@midwayjs/decorator';
 
+
 export interface WebMiddleware {
   resolve(): KoaMiddleware;
 }

diff --git a/packages/midway-web/src/loader/webLoader.ts b/packages/midway-web/src/loader/webLoader.ts
@@ -207,7 +207,7 @@ export class MidwayWebLoader extends EggLoader {
         for (const webRouter of webRouterInfo) {
           // get middleware
           const middlewares2: MiddlewareParamArray | void = webRouter.middleware;
-          const methodMiddlwares = [];
+          const methodMiddlwares: KoaMiddleware[] = [];
 
           await this.handlerWebMiddleware(middlewares2, (middlewareImpl: KoaMiddleware) => {
             methodMiddlwares.push(middlewareImpl);