feat(types): export and use type MiddlewareParamArray

- update types of parameters of MidwayWebLoader.handlerWebMiddleware()
- fix `no-shadow` error relative to variable `middlewares`

packages/midway-decorator/src/web/requestMapping.ts

@@ -5,12 +5,14 @@ import { attachClassMetadata } from 'injection';
 import { WEB_ROUTER_KEY } from '../constant';
 import { KoaMiddleware } from '../interface';
 
+export type MiddlewareParamArray = Array<string | KoaMiddleware>
+
 export interface RouterOption {
   path?: string;
   requestMethod: string;
   routerName?: string;
   method: string;
-  middleware?: Array<string | KoaMiddleware>;
+  middleware?: MiddlewareParamArray;
 }
 
 export const RequestMethod = {
@@ -40,7 +42,7 @@ export interface RequestMappingMetadata {
   [PATH_METADATA]?: string;
   [METHOD_METADATA]: string;
   [ROUTER_NAME_METADATA]?: string;
-  [ROUTER_MIDDLEWARE]?: Array<string | KoaMiddleware>;
+  [ROUTER_MIDDLEWARE]?: MiddlewareParamArray;
 }
 
 export const RequestMapping = (
@@ -68,7 +70,7 @@ const createMappingDecorator = (method: string) => (
   path?: string,
   routerOptions: {
     routerName?: string;
-    middleware?: Array<string | KoaMiddleware>;
+    middleware?: MiddlewareParamArray;
   } = {middleware: []}
 ): MethodDecorator => {
   return RequestMapping({

packages/midway-web/src/interface.ts

@@ -1,8 +1,9 @@
 import {EggLoaderOptions} from 'egg-core';
 import {IApplicationContext} from 'injection';
+import {KoaMiddleware} from '@midwayjs/decorator';
 
 export interface WebMiddleware {
-  resolve(): (context: any, next: () => Promise<any>) => any;
+  resolve(): KoaMiddleware;
 }
 
 export interface MidwayLoaderOptions extends EggLoaderOptions {

packages/midway-web/src/loader/webLoader.ts

@@ -3,6 +3,7 @@ import {
   CONTROLLER_KEY,
   ControllerOption,
   KoaMiddleware,
+  MiddlewareParamArray,
   PRIORITY_KEY,
   RouterOption,
   WEB_ROUTER_KEY,
@@ -194,7 +195,7 @@ export class MidwayWebLoader extends EggLoader {
 
     if (newRouter) {
       // implement middleware in controller
-      const middlewares = controllerOption.routerOptions.middleware;
+      const middlewares: MiddlewareParamArray | void = controllerOption.routerOptions.middleware;
       await this.handlerWebMiddleware(middlewares, (middlewareImpl: KoaMiddleware) => {
         newRouter.use(middlewareImpl);
       });
@@ -205,10 +206,10 @@ export class MidwayWebLoader extends EggLoader {
       if (webRouterInfo && typeof webRouterInfo[Symbol.iterator] === 'function') {
         for (const webRouter of webRouterInfo) {
           // get middleware
-          const middlewares = webRouter.middleware;
+          const middlewares2: MiddlewareParamArray | void = webRouter.middleware;
           const methodMiddlwares = [];
 
-          await this.handlerWebMiddleware(middlewares, (middlewareImpl: KoaMiddleware) => {
+          await this.handlerWebMiddleware(middlewares2, (middlewareImpl: KoaMiddleware) => {
             methodMiddlwares.push(middlewareImpl);
           });
 
@@ -241,9 +242,9 @@ export class MidwayWebLoader extends EggLoader {
   }
 
 
-  private async handlerWebMiddleware<T extends any = any>(
-    middlewares: T[],
-    handlerCallback: (ps: T | ReturnType<WebMiddleware['resolve']>) => any,
+  private async handlerWebMiddleware(
+    middlewares: MiddlewareParamArray | void,
+    handlerCallback: (middlewareImpl: KoaMiddleware) => void,
   ): Promise<void> {
 
     if (middlewares && middlewares.length) {
@@ -252,8 +253,8 @@ export class MidwayWebLoader extends EggLoader {
           // web function middleware
           handlerCallback(middleware);
         } else {
-          const middlewareImpl: WebMiddleware = await this.applicationContext.getAsync(middleware);
-          if (middlewareImpl && middlewareImpl.resolve) {
+          const middlewareImpl: WebMiddleware | void = await this.applicationContext.getAsync(middleware);
+          if (middlewareImpl && typeof middlewareImpl.resolve === 'function') {
             handlerCallback(middlewareImpl.resolve());
           }
         }