@midwayjs/core 3.0.0-beta.2 → 3.0.0-beta.6

package/dist/{util → common}/webRouterCollector.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebRouterCollector = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const index_1 = require("./index");
+const util_1 = require("../util");
 const container_1 = require("../context/container");
 const fileDetector_1 = require("./fileDetector");
 const util = require("util");
@@ -11,7 +11,6 @@ class WebRouterCollector {
     constructor(baseDir = '', options = {}) {
         this.isReady = false;
         this.routes = new Map();
-        this.routerModules = new Set();
         this.routesPriority = [];
         this.baseDir = baseDir;
         this.options = options;
@@ -34,6 +33,17 @@ class WebRouterCollector {
                 this.collectFunctionRoute(module);
             }
         }
+        // filter empty prefix
+        this.routesPriority = this.routesPriority.filter(item => {
+            const prefixList = this.routes.get(item.prefix);
+            if (prefixList.length > 0) {
+                return true;
+            }
+            else {
+                this.routes.delete(item.prefix);
+                return false;
+            }
+        });
         // sort router
         for (const prefix of this.routes.keys()) {
             const routerInfo = this.routes.get(prefix);
@@ -41,10 +51,11 @@ class WebRouterCollector {
         }
         // sort prefix
         this.routesPriority = this.routesPriority.sort((routeA, routeB) => {
-            return routeB.priority - routeA.priority;
+            return routeB.prefix.length - routeA.prefix.length;
         });
     }
     collectRoute(module, functionMeta = false) {
+        var _a;
         const controllerId = (0, decorator_1.getProviderName)(module);
         debug(`[core:webCollector]: Found Controller ${controllerId}.`);
         const id = (0, decorator_1.getProviderUUId)(module);
@@ -52,21 +63,36 @@ class WebRouterCollector {
         let priority;
         // implement middleware in controller
         const middleware = controllerOption.routerOptions.middleware;
-        const prefix = controllerOption.prefix || '/';
-        if (prefix === '/' && priority === undefined) {
-            priority = -999;
+        const controllerIgnoreGlobalPrefix = !!((_a = controllerOption.routerOptions) === null || _a === void 0 ? void 0 : _a.ignoreGlobalPrefix);
+        let prefix = (0, util_1.joinURLPath)(this.options.globalPrefix, controllerOption.prefix || '/');
+        const ignorePrefix = controllerOption.prefix || '/';
+        // if controller set ignore global prefix, all router will be ignore too.
+        if (controllerIgnoreGlobalPrefix) {
+            prefix = ignorePrefix;
         }
+        // set prefix
         if (!this.routes.has(prefix)) {
             this.routes.set(prefix, []);
             this.routesPriority.push({
                 prefix,
-                priority: priority || 0,
+                priority: prefix === '/' && priority === undefined ? -999 : 0,
+                middleware,
+                routerOptions: controllerOption.routerOptions,
+                controllerId,
+                routerModule: module,
+            });
+        }
+        // set ignorePrefix
+        if (!this.routes.has(ignorePrefix)) {
+            this.routes.set(ignorePrefix, []);
+            this.routesPriority.push({
+                prefix: ignorePrefix,
+                priority: ignorePrefix === '/' && priority === undefined ? -999 : 0,
                 middleware,
                 routerOptions: controllerOption.routerOptions,
                 controllerId,
                 routerModule: module,
             });
-            this.routerModules.add(module);
         }
         const webRouterInfo = (0, decorator_1.getClassMetadata)(decorator_1.WEB_ROUTER_KEY, module);
         if (webRouterInfo && typeof webRouterInfo[Symbol.iterator] === 'function') {
@@ -75,7 +101,7 @@ class WebRouterCollector {
                 const routerResponseData = (0, decorator_1.getPropertyMetadata)(decorator_1.WEB_RESPONSE_KEY, module, webRouter.method) || [];
                 const data = {
                     id,
-                    prefix,
+                    prefix: webRouter.ignoreGlobalPrefix ? ignorePrefix : prefix,
                     routerName: webRouter.routerName || '',
                     url: webRouter.path,
                     requestMethod: webRouter.requestMethod,
@@ -95,14 +121,14 @@ class WebRouterCollector {
                     data.functionName = controllerId + '-' + webRouter.method;
                     data.functionTriggerName = decorator_1.ServerlessTriggerType.HTTP;
                     data.functionTriggerMetadata = {
-                        path: (0, index_1.joinURLPath)(prefix, webRouter.path.toString()),
+                        path: (0, util_1.joinURLPath)(prefix, webRouter.path.toString()),
                         method: webRouter.requestMethod,
                     };
                     data.functionMetadata = {
                         functionName: data.functionName,
                     };
                 }
-                this.checkDuplicateAndPush(prefix, data);
+                this.checkDuplicateAndPush(data.prefix, data);
             }
         }
     }
@@ -123,7 +149,6 @@ class WebRouterCollector {
                 controllerId,
                 routerModule: module,
             });
-            this.routerModules.add(module);
         }
         for (const webRouter of webRouterInfo) {
             // 新的 @ServerlessTrigger 写法
@@ -204,12 +229,14 @@ class WebRouterCollector {
             .map(item => {
             const urlString = item.url.toString();
             const weightArr = (0, decorator_1.isRegExp)(item.url)
-                ? urlString.split('/')
+                ? urlString.split('\\/')
                 : urlString.split('/');
             let weight = 0;
             // 权重，比如通配的不加权，非通配加权，防止通配出现在最前面
             for (const fragment of weightArr) {
-                if (fragment.includes(':') || fragment.includes('*')) {
+                if (fragment === '' ||
+                    fragment.includes(':') ||
+                    fragment.includes('*')) {
                     weight += 0;
                 }
                 else {
@@ -240,12 +267,12 @@ class WebRouterCollector {
             if (handlerA._category !== handlerB._category) {
                 return handlerB._category - handlerA._category;
             }
+            // 不同权重
+            if (handlerA._weight !== handlerB._weight) {
+                return handlerB._weight - handlerA._weight;
+            }
             // 不同长度
             if (handlerA._level === handlerB._level) {
-                // 不同权重
-                if (handlerA._weight !== handlerB._weight) {
-                    return handlerB._weight - handlerA._weight;
-                }
                 if (handlerB._pureRouter === handlerA._pureRouter) {
                     return (handlerA.url.toString().length - handlerB.url.toString().length);
                 }
@@ -274,18 +301,11 @@ class WebRouterCollector {
             this.isReady = true;
         }
         let routeArr = [];
-        for (const routerInfo of this.routes.values()) {
-            routeArr = routeArr.concat(routerInfo);
+        for (const routerPriority of this.routesPriority) {
+            routeArr = routeArr.concat(this.routes.get(routerPriority.prefix));
         }
         return routeArr;
     }
-    async getRouterModules() {
-        if (!this.isReady) {
-            await this.analyze();
-            this.isReady = true;
-        }
-        return Array.from(this.routerModules);
-    }
     checkDuplicateAndPush(prefix, routerInfo) {
         const prefixList = this.routes.get(prefix);
         const matched = prefixList.filter(item => {

package/dist/config/config.default.d.ts

@@ -1,21 +1,7 @@
-import { MidwayAppInfo } from '../interface';
+import { MidwayAppInfo, ServiceFactoryConfigOption } from '../interface';
+import type { LoggerOptions } from '@midwayjs/logger';
 declare const _default: (appInfo: MidwayAppInfo) => {
-    midwayLogger: {
-        default: {
-            dir: string;
-            level: string;
-            consoleLevel: string;
-        };
-        clients: {
-            coreLogger: {
-                fileLogName: string;
-            };
-            appLogger: {
-                fileLogName: string;
-                aliasName: string;
-            };
-        };
-    };
+    midwayLogger?: ServiceFactoryConfigOption<LoggerOptions>;
 };
 export default _default;
 //# sourceMappingURL=config.default.d.ts.map

package/dist/error/base.d.ts

@@ -1,8 +1,10 @@
 interface ErrorOption {
-    cause: Error;
+    cause?: Error;
+    status?: number;
 }
 export declare class MidwayError extends Error {
     code: number;
+    status: number;
     cause: Error;
     constructor(message: string, options?: ErrorOption);
     constructor(message: string, code: number, options?: ErrorOption);

package/dist/error/base.js

@@ -12,6 +12,7 @@ class MidwayError extends Error {
         this.name = this.constructor.name;
         this.code = code;
         this.cause = options === null || options === void 0 ? void 0 : options.cause;
+        this.status = options === null || options === void 0 ? void 0 : options.status;
     }
 }
 exports.MidwayError = MidwayError;

package/dist/error/code.d.ts

@@ -54,6 +54,6 @@ export declare enum FrameworkErrorEnum {
     PARAM_TYPE = 10002,
     DEFINITION_NOT_FOUND = 10003,
     FEATURE_NO_LONGER_SUPPORTED = 10004,
-    NO_FRAMEWORK_FOUND = 10005
+    VALIDATE_FAIL = 10005
 }
 //# sourceMappingURL=code.d.ts.map

package/dist/error/code.js

@@ -59,6 +59,6 @@ var FrameworkErrorEnum;
     FrameworkErrorEnum[FrameworkErrorEnum["PARAM_TYPE"] = 10002] = "PARAM_TYPE";
     FrameworkErrorEnum[FrameworkErrorEnum["DEFINITION_NOT_FOUND"] = 10003] = "DEFINITION_NOT_FOUND";
     FrameworkErrorEnum[FrameworkErrorEnum["FEATURE_NO_LONGER_SUPPORTED"] = 10004] = "FEATURE_NO_LONGER_SUPPORTED";
-    FrameworkErrorEnum[FrameworkErrorEnum["NO_FRAMEWORK_FOUND"] = 10005] = "NO_FRAMEWORK_FOUND";
+    FrameworkErrorEnum[FrameworkErrorEnum["VALIDATE_FAIL"] = 10005] = "VALIDATE_FAIL";
 })(FrameworkErrorEnum = exports.FrameworkErrorEnum || (exports.FrameworkErrorEnum = {}));
 //# sourceMappingURL=code.js.map

package/dist/error/framework.d.ts

@@ -15,7 +15,7 @@ export declare class MidwayDefinitionNotFoundError extends MidwayError {
 export declare class MidwayFeatureNoLongerSupportedError extends MidwayError {
     constructor(message?: string);
 }
-export declare class MidwayNoFrameworkFoundError extends MidwayError {
-    constructor();
+export declare class MidwayValidationError extends MidwayError {
+    constructor(message: any, status: any, cause: any);
 }
 //# sourceMappingURL=framework.d.ts.map

package/dist/error/framework.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayNoFrameworkFoundError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = void 0;
+exports.MidwayValidationError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = void 0;
 const base_1 = require("./base");
 const code_1 = require("./code");
 class MidwayCommonError extends base_1.MidwayError {
@@ -40,10 +40,13 @@ class MidwayFeatureNoLongerSupportedError extends base_1.MidwayError {
     }
 }
 exports.MidwayFeatureNoLongerSupportedError = MidwayFeatureNoLongerSupportedError;
-class MidwayNoFrameworkFoundError extends base_1.MidwayError {
-    constructor() {
-        super('You must add a component that contains @Framework at least, such as @midwayjs/web, @midwayjs/koa, etc.', code_1.FrameworkErrorEnum.NO_FRAMEWORK_FOUND);
+class MidwayValidationError extends base_1.MidwayError {
+    constructor(message, status, cause) {
+        super(message, code_1.FrameworkErrorEnum.VALIDATE_FAIL, {
+            status,
+            cause,
+        });
     }
 }
-exports.MidwayNoFrameworkFoundError = MidwayNoFrameworkFoundError;
+exports.MidwayValidationError = MidwayValidationError;
 //# sourceMappingURL=framework.js.map

package/dist/error/http.d.ts

@@ -1,4 +1,5 @@
-export declare class HttpError extends Error {
+import { MidwayError } from './base';
+export declare class HttpError extends MidwayError {
     status: number;
     constructor(response: any, status: any);
 }

package/dist/error/http.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.http = exports.GatewayTimeoutError = exports.ServiceUnavailableError = exports.BadGatewayError = exports.InternalServerErrorError = exports.UnprocessableError = exports.UnsupportedMediaTypeError = exports.PayloadTooLargeError = exports.GoneError = exports.ConflictError = exports.RequestTimeoutError = exports.NotAcceptableError = exports.ForbiddenError = exports.NotFoundError = exports.UnauthorizedError = exports.BadRequestError = exports.HttpError = void 0;
 const code_1 = require("./code");
-class HttpError extends Error {
+const base_1 = require("./base");
+class HttpError extends base_1.MidwayError {
     constructor(response, status) {
-        super();
-        this.message = typeof response === 'string' ? response : response.message;
+        super(typeof response === 'string' ? response : response.message);
         this.status = status;
         this.name = this.constructor.name;
     }

package/dist/error/index.d.ts

@@ -1,3 +1,4 @@
+export * from './base';
 export * from './http';
 export * from './framework';
 //# sourceMappingURL=index.d.ts.map

package/dist/error/index.js

@@ -10,6 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./base"), exports);
 __exportStar(require("./http"), exports);
 __exportStar(require("./framework"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.d.ts

@@ -4,12 +4,11 @@ export { MidwayRequestContainer } from './context/requestContainer';
 export { BaseFramework } from './baseFramework';
 export * from './context/providerWrapper';
 export * from './common/constants';
-export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, } from './util/';
+export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, deprecatedOutput, transformRequestObjectByType, } from './util/';
 export * from './util/pathFileUtil';
 export * from './util/webRouterParam';
-export * from './util/webRouterCollector';
-export * from './util/triggerCollector';
-export { plainToClass, classToPlain } from 'class-transformer';
+export * from './common/webRouterCollector';
+export * from './common/triggerCollector';
 export { createConfiguration } from './functional/configuration';
 export { MidwayConfigService } from './service/configService';
 export { MidwayEnvironmentService } from './service/environmentService';
@@ -22,12 +21,12 @@ export { MidwayMiddlewareService } from './service/middlewareService';
 export { MidwayDecoratorService } from './service/decoratorService';
 export * from './service/pipelineService';
 export * from './util/contextUtil';
-export * from './util/serviceFactory';
-export * from './util/fileDetector';
-export * from './util/webGenerator';
-export * from './util/middlewareManager';
+export * from './common/serviceFactory';
+export * from './common/fileDetector';
+export * from './common/webGenerator';
+export * from './common/middlewareManager';
 export * from './util/pathToRegexp';
-export * from './util/exceptionFilterManager';
+export * from './common/filterManager';
 export * from './setup';
 export * from './error';
 /**

package/dist/index.js

@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayFrameworkType = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.classToPlain = exports.plainToClass = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
+exports.MidwayFrameworkType = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
 __exportStar(require("./interface"), exports);
 __exportStar(require("./context/container"), exports);
 var requestContainer_1 = require("./context/requestContainer");
@@ -25,13 +25,12 @@ Object.defineProperty(exports, "safeRequire", { enumerable: true, get: function
 Object.defineProperty(exports, "delegateTargetPrototypeMethod", { enumerable: true, get: function () { return util_1.delegateTargetPrototypeMethod; } });
 Object.defineProperty(exports, "delegateTargetMethod", { enumerable: true, get: function () { return util_1.delegateTargetMethod; } });
 Object.defineProperty(exports, "delegateTargetProperties", { enumerable: true, get: function () { return util_1.delegateTargetProperties; } });
+Object.defineProperty(exports, "deprecatedOutput", { enumerable: true, get: function () { return util_1.deprecatedOutput; } });
+Object.defineProperty(exports, "transformRequestObjectByType", { enumerable: true, get: function () { return util_1.transformRequestObjectByType; } });
 __exportStar(require("./util/pathFileUtil"), exports);
 __exportStar(require("./util/webRouterParam"), exports);
-__exportStar(require("./util/webRouterCollector"), exports);
-__exportStar(require("./util/triggerCollector"), exports);
-var class_transformer_1 = require("class-transformer");
-Object.defineProperty(exports, "plainToClass", { enumerable: true, get: function () { return class_transformer_1.plainToClass; } });
-Object.defineProperty(exports, "classToPlain", { enumerable: true, get: function () { return class_transformer_1.classToPlain; } });
+__exportStar(require("./common/webRouterCollector"), exports);
+__exportStar(require("./common/triggerCollector"), exports);
 var configuration_1 = require("./functional/configuration");
 Object.defineProperty(exports, "createConfiguration", { enumerable: true, get: function () { return configuration_1.createConfiguration; } });
 var configService_1 = require("./service/configService");
@@ -54,12 +53,12 @@ var decoratorService_1 = require("./service/decoratorService");
 Object.defineProperty(exports, "MidwayDecoratorService", { enumerable: true, get: function () { return decoratorService_1.MidwayDecoratorService; } });
 __exportStar(require("./service/pipelineService"), exports);
 __exportStar(require("./util/contextUtil"), exports);
-__exportStar(require("./util/serviceFactory"), exports);
-__exportStar(require("./util/fileDetector"), exports);
-__exportStar(require("./util/webGenerator"), exports);
-__exportStar(require("./util/middlewareManager"), exports);
+__exportStar(require("./common/serviceFactory"), exports);
+__exportStar(require("./common/fileDetector"), exports);
+__exportStar(require("./common/webGenerator"), exports);
+__exportStar(require("./common/middlewareManager"), exports);
 __exportStar(require("./util/pathToRegexp"), exports);
-__exportStar(require("./util/exceptionFilterManager"), exports);
+__exportStar(require("./common/filterManager"), exports);
 __exportStar(require("./setup"), exports);
 __exportStar(require("./error"), exports);
 /**

package/dist/interface.d.ts

@@ -2,15 +2,28 @@
 import { ObjectIdentifier, IManagedInstance, IMethodAspect, ScopeEnum, FrameworkType } from '@midwayjs/decorator';
 import { ILogger, LoggerOptions } from '@midwayjs/logger';
 import * as EventEmitter from 'events';
-import { ContextMiddlewareManager } from './util/middlewareManager';
+import { ContextMiddlewareManager } from './common/middlewareManager';
+import _default from './config/config.default';
+export declare type PowerPartial<T> = {
+    [U in keyof T]?: T[U] extends {} ? PowerPartial<T[U]> : T[U];
+};
+export declare type ServiceFactoryConfigOption<OPTIONS> = {
+    default?: PowerPartial<OPTIONS>;
+    client?: PowerPartial<OPTIONS>;
+    clients?: {
+        [key: string]: PowerPartial<OPTIONS>;
+    };
+};
+declare type ConfigType<T> = T extends (...args: any[]) => any ? PowerPartial<ReturnType<T>> : PowerPartial<T>;
+export declare type FileConfigOption<T, K = unknown> = K extends keyof ConfigType<T> ? Pick<ConfigType<T>, K> : ConfigType<T>;
 /**
  * 生命周期定义
  */
 export interface ILifeCycle extends Partial<IObjectLifeCycle> {
-    onConfigLoad?(container: IMidwayContainer, app?: IMidwayApplication): Promise<any>;
-    onReady?(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
-    onServerReady?(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
-    onStop?(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
+    onConfigLoad?(container: IMidwayContainer, mainApp?: IMidwayApplication): Promise<any>;
+    onReady?(container: IMidwayContainer, mainApp?: IMidwayApplication): Promise<void>;
+    onServerReady?(container: IMidwayContainer, mainApp?: IMidwayApplication): Promise<void>;
+    onStop?(container: IMidwayContainer, mainApp?: IMidwayApplication): Promise<void>;
 }
 export declare type ObjectContext = {
     originName?: string;
@@ -172,6 +185,7 @@ export declare type ParameterHandlerFunction = (options: {
     propertyName: string;
     metadata: any;
     originArgs: Array<any>;
+    originParamType: any;
     parameterIndex: number;
 }) => IMethodAspect;
 export interface IIdentifierRelationShip {
@@ -260,30 +274,32 @@ export interface Context {
     getAttr<T>(key: string): T;
 }
 export declare type IMidwayContext<FrameworkContext = unknown> = Context & FrameworkContext;
+export declare type NextFunction = () => Promise<any>;
 /**
  * Common middleware definition
  */
-export interface IMiddleware<T, R = any, N = any> {
-    resolve: () => FunctionMiddleware<T, R, N>;
-    match?: () => boolean;
-    ignore?: () => boolean;
+export interface IMiddleware<CTX, R, N = unknown> {
+    resolve: () => FunctionMiddleware<CTX, R, N>;
+    match?: (ctx?: CTX) => boolean;
+    ignore?: (ctx?: CTX) => boolean;
 }
-export declare type FunctionMiddleware<T, R = any, N = any> = ((context: T, next: () => Promise<any>, options?: any) => any) | ((req: T, res: R, next: N) => any);
-export declare type ClassMiddleware<T, R = any, N = any> = new (...args: any[]) => IMiddleware<T, R, N>;
-export declare type CommonMiddleware<T, R = any, N = any> = ClassMiddleware<T, R, N> | FunctionMiddleware<T, R, N>;
-export declare type CommonMiddlewareUnion<T, R = any, N = any> = CommonMiddleware<T, R, N> | Array<CommonMiddleware<T, R, N>>;
-export declare type MiddlewareRespond<T, R = any, N = any> = (context: T, nextOrRes?: () => Promise<any> | R, next?: N) => Promise<{
+export declare type FunctionMiddleware<CTX, R, N = unknown> = N extends true ? (req: CTX, res: R, next: N) => any : (context: CTX, next: R, options?: any) => any;
+export declare type ClassMiddleware<CTX, R, N> = new (...args: any[]) => IMiddleware<CTX, R, N>;
+export declare type CommonMiddleware<CTX, R, N> = ClassMiddleware<CTX, R, N> | FunctionMiddleware<CTX, R, N>;
+export declare type CommonMiddlewareUnion<CTX, R, N> = CommonMiddleware<CTX, R, N> | Array<CommonMiddleware<CTX, R, N>>;
+export declare type MiddlewareRespond<CTX, R, N> = (context: CTX, nextOrRes?: N extends true ? R : NextFunction, next?: N) => Promise<{
     result: any;
     error: Error | undefined;
 }>;
 /**
  * Common Exception Filter definition
  */
-export interface IExceptionFilter<T, R = any, N = any> {
-    catch(err: Error, ctx: T, res?: R, next?: N): any;
+export interface IFilter<CTX, R, N> {
+    catch?(err: Error, ctx: CTX, res?: R, next?: N): any;
+    match?(result: any, ctx: CTX, res?: R, next?: N): any;
 }
-export declare type CommonExceptionFilterUnion<T, R = any, N = any> = (new (...args: any[]) => IExceptionFilter<T, R, N>) | Array<new (...args: any[]) => IExceptionFilter<T, R, N>>;
-export interface IMidwayBaseApplication<T extends IMidwayContext = IMidwayContext> {
+export declare type CommonFilterUnion<CTX, R, N> = (new (...args: any[]) => IFilter<CTX, R, N>) | Array<new (...args: any[]) => IFilter<CTX, R, N>>;
+export interface IMidwayBaseApplication<CTX extends IMidwayContext> {
     /**
      * Get a base directory for project, with src or dist
      */
@@ -336,7 +352,7 @@ export interface IMidwayBaseApplication<T extends IMidwayContext = IMidwayContex
      * create a context with RequestContainer
      * @param args
      */
-    createAnonymousContext(...args: any[]): T;
+    createAnonymousContext(...args: any[]): CTX;
     /**
      * Set a context logger class to change default context logger format
      * @param BaseContextLoggerClass
@@ -362,16 +378,16 @@ export interface IMidwayBaseApplication<T extends IMidwayContext = IMidwayContex
      * add global filter to app
      * @param Middleware
      */
-    useMiddleware<R = any, N = any>(Middleware: CommonMiddlewareUnion<T, R, N>): void;
+    useMiddleware<R, N>(Middleware: CommonMiddlewareUnion<CTX, R, N>): void;
     /**
      * get global middleware
      */
-    getMiddleware<R = any, N = any>(): ContextMiddlewareManager<T, R, N>;
+    getMiddleware<R, N>(): ContextMiddlewareManager<CTX, R, N>;
     /**
      * add exception filter
      * @param Filter
      */
-    useFilter(Filter: CommonExceptionFilterUnion<T>): void;
+    useFilter<R, N>(Filter: CommonFilterUnion<CTX, R, N>): void;
 }
 export declare type IMidwayApplication<T extends IMidwayContext = IMidwayContext, FrameworkApplication = unknown> = IMidwayBaseApplication<T> & FrameworkApplication;
 export interface IMidwayBootstrapOptions {
@@ -394,10 +410,10 @@ export interface IConfigurationOptions {
     ContextLoggerClass?: any;
     ContextLoggerApplyLogger?: string;
 }
-export interface IMidwayFramework<APP extends IMidwayApplication, T extends IConfigurationOptions> {
+export interface IMidwayFramework<APP extends IMidwayApplication<CTX>, CTX extends IMidwayContext, CONFIG extends IConfigurationOptions, ResOrNext = unknown, Next = unknown> {
     app: APP;
-    configurationOptions: T;
-    configure(options?: T): any;
+    configurationOptions: CONFIG;
+    configure(options?: CONFIG): any;
     isEnable(): boolean;
     initialize(options: Partial<IMidwayBootstrapOptions>): Promise<void>;
     run(): Promise<void>;
@@ -415,9 +431,9 @@ export interface IMidwayFramework<APP extends IMidwayApplication, T extends ICon
     createLogger(name: string, options: LoggerOptions): ILogger;
     getProjectName(): string;
     getDefaultContextLoggerClass(): any;
-    useMiddleware(Middleware: CommonMiddlewareUnion<ReturnType<APP['createAnonymousContext']>>): any;
-    getMiddleware<R, N>(lastMiddleware?: CommonMiddleware<ReturnType<APP['createAnonymousContext']>>): Promise<MiddlewareRespond<ReturnType<APP['createAnonymousContext']>, R, N>>;
-    useFilter(Filter: CommonExceptionFilterUnion<ReturnType<APP['createAnonymousContext']>>): any;
+    useMiddleware(Middleware: CommonMiddlewareUnion<CTX, ResOrNext, Next>): void;
+    getMiddleware(lastMiddleware?: CommonMiddleware<CTX, ResOrNext, Next>): Promise<MiddlewareRespond<CTX, ResOrNext, Next>>;
+    useFilter(Filter: CommonFilterUnion<CTX, ResOrNext, Next>): any;
 }
 export declare const MIDWAY_LOGGER_WRITEABLE_DIR = "MIDWAY_LOGGER_WRITEABLE_DIR";
 export interface MidwayAppInfo {
@@ -429,4 +445,10 @@ export interface MidwayAppInfo {
     root: string;
     env: string;
 }
+/**
+ * midway global config definition
+ */
+export interface MidwayConfig extends FileConfigOption<typeof _default> {
+}
+export {};
 //# sourceMappingURL=interface.d.ts.map

package/dist/service/configService.js

@@ -95,10 +95,7 @@ let MidwayConfigService = class MidwayConfigService {
         // merge set
         const target = {};
         for (const filename of [...defaultSet, ...currentEnvSet]) {
-            let config = filename;
-            if (typeof filename === 'string') {
-                config = await this.loadConfig(filename);
-            }
+            let config = await this.loadConfig(filename);
             if ((0, decorator_1.isFunction)(config)) {
                 // eslint-disable-next-line prefer-spread
                 config = config.apply(null, [
@@ -143,7 +140,9 @@ let MidwayConfigService = class MidwayConfigService {
         return this.configuration;
     }
     async loadConfig(configFilename) {
-        let exports = require(configFilename);
+        let exports = typeof configFilename === 'string'
+            ? require(configFilename)
+            : configFilename;
         if (exports && exports['default'] && Object.keys(exports).length === 1) {
             exports = exports['default'];
         }