@midwayjs/core 3.0.0-beta.1 → 3.0.0-beta.13

package/dist/error/http.js

@@ -1,67 +1,199 @@
 "use strict";
 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 {
-    constructor(response, status) {
-        super();
-        this.message = typeof response === 'string' ? response : response.message;
-        this.status = status;
-        this.name = this.constructor.name;
-    }
-}
-exports.HttpError = HttpError;
-class BadRequestError extends HttpError {
-    constructor(response) {
-        super(response, code_1.HttpStatus.BAD_REQUEST);
+exports.httpError = 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.HttpStatus = void 0;
+const base_1 = require("./base");
+var HttpStatus;
+(function (HttpStatus) {
+    HttpStatus[HttpStatus["CONTINUE"] = 100] = "CONTINUE";
+    HttpStatus[HttpStatus["SWITCHING_PROTOCOLS"] = 101] = "SWITCHING_PROTOCOLS";
+    HttpStatus[HttpStatus["PROCESSING"] = 102] = "PROCESSING";
+    HttpStatus[HttpStatus["EARLYHINTS"] = 103] = "EARLYHINTS";
+    HttpStatus[HttpStatus["OK"] = 200] = "OK";
+    HttpStatus[HttpStatus["CREATED"] = 201] = "CREATED";
+    HttpStatus[HttpStatus["ACCEPTED"] = 202] = "ACCEPTED";
+    HttpStatus[HttpStatus["NON_AUTHORITATIVE_INFORMATION"] = 203] = "NON_AUTHORITATIVE_INFORMATION";
+    HttpStatus[HttpStatus["NO_CONTENT"] = 204] = "NO_CONTENT";
+    HttpStatus[HttpStatus["RESET_CONTENT"] = 205] = "RESET_CONTENT";
+    HttpStatus[HttpStatus["PARTIAL_CONTENT"] = 206] = "PARTIAL_CONTENT";
+    HttpStatus[HttpStatus["AMBIGUOUS"] = 300] = "AMBIGUOUS";
+    HttpStatus[HttpStatus["MOVED_PERMANENTLY"] = 301] = "MOVED_PERMANENTLY";
+    HttpStatus[HttpStatus["FOUND"] = 302] = "FOUND";
+    HttpStatus[HttpStatus["SEE_OTHER"] = 303] = "SEE_OTHER";
+    HttpStatus[HttpStatus["NOT_MODIFIED"] = 304] = "NOT_MODIFIED";
+    HttpStatus[HttpStatus["TEMPORARY_REDIRECT"] = 307] = "TEMPORARY_REDIRECT";
+    HttpStatus[HttpStatus["PERMANENT_REDIRECT"] = 308] = "PERMANENT_REDIRECT";
+    HttpStatus[HttpStatus["BAD_REQUEST"] = 400] = "BAD_REQUEST";
+    HttpStatus[HttpStatus["UNAUTHORIZED"] = 401] = "UNAUTHORIZED";
+    HttpStatus[HttpStatus["PAYMENT_REQUIRED"] = 402] = "PAYMENT_REQUIRED";
+    HttpStatus[HttpStatus["FORBIDDEN"] = 403] = "FORBIDDEN";
+    HttpStatus[HttpStatus["NOT_FOUND"] = 404] = "NOT_FOUND";
+    HttpStatus[HttpStatus["METHOD_NOT_ALLOWED"] = 405] = "METHOD_NOT_ALLOWED";
+    HttpStatus[HttpStatus["NOT_ACCEPTABLE"] = 406] = "NOT_ACCEPTABLE";
+    HttpStatus[HttpStatus["PROXY_AUTHENTICATION_REQUIRED"] = 407] = "PROXY_AUTHENTICATION_REQUIRED";
+    HttpStatus[HttpStatus["REQUEST_TIMEOUT"] = 408] = "REQUEST_TIMEOUT";
+    HttpStatus[HttpStatus["CONFLICT"] = 409] = "CONFLICT";
+    HttpStatus[HttpStatus["GONE"] = 410] = "GONE";
+    HttpStatus[HttpStatus["LENGTH_REQUIRED"] = 411] = "LENGTH_REQUIRED";
+    HttpStatus[HttpStatus["PRECONDITION_FAILED"] = 412] = "PRECONDITION_FAILED";
+    HttpStatus[HttpStatus["PAYLOAD_TOO_LARGE"] = 413] = "PAYLOAD_TOO_LARGE";
+    HttpStatus[HttpStatus["URI_TOO_LONG"] = 414] = "URI_TOO_LONG";
+    HttpStatus[HttpStatus["UNSUPPORTED_MEDIA_TYPE"] = 415] = "UNSUPPORTED_MEDIA_TYPE";
+    HttpStatus[HttpStatus["REQUESTED_RANGE_NOT_SATISFIABLE"] = 416] = "REQUESTED_RANGE_NOT_SATISFIABLE";
+    HttpStatus[HttpStatus["EXPECTATION_FAILED"] = 417] = "EXPECTATION_FAILED";
+    HttpStatus[HttpStatus["I_AM_A_TEAPOT"] = 418] = "I_AM_A_TEAPOT";
+    HttpStatus[HttpStatus["MISDIRECTED"] = 421] = "MISDIRECTED";
+    HttpStatus[HttpStatus["UNPROCESSABLE_ENTITY"] = 422] = "UNPROCESSABLE_ENTITY";
+    HttpStatus[HttpStatus["FAILED_DEPENDENCY"] = 424] = "FAILED_DEPENDENCY";
+    HttpStatus[HttpStatus["PRECONDITION_REQUIRED"] = 428] = "PRECONDITION_REQUIRED";
+    HttpStatus[HttpStatus["TOO_MANY_REQUESTS"] = 429] = "TOO_MANY_REQUESTS";
+    HttpStatus[HttpStatus["INTERNAL_SERVER_ERROR"] = 500] = "INTERNAL_SERVER_ERROR";
+    HttpStatus[HttpStatus["NOT_IMPLEMENTED"] = 501] = "NOT_IMPLEMENTED";
+    HttpStatus[HttpStatus["BAD_GATEWAY"] = 502] = "BAD_GATEWAY";
+    HttpStatus[HttpStatus["SERVICE_UNAVAILABLE"] = 503] = "SERVICE_UNAVAILABLE";
+    HttpStatus[HttpStatus["GATEWAY_TIMEOUT"] = 504] = "GATEWAY_TIMEOUT";
+    HttpStatus[HttpStatus["HTTP_VERSION_NOT_SUPPORTED"] = 505] = "HTTP_VERSION_NOT_SUPPORTED";
+})(HttpStatus = exports.HttpStatus || (exports.HttpStatus = {}));
+/**
+ * 400 http error, Means that the request can be fulfilled because of the bad syntax.
+ */
+class BadRequestError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Bad Request') {
+        super(resOrMessage, HttpStatus.BAD_REQUEST);
     }
 }
 exports.BadRequestError = BadRequestError;
-class UnauthorizedError extends HttpError {
+/**
+ * 401 http error, Means that the request was legal, but the server is rejecting to answer it. For the use when authentication is required and has failed or has not yet been provided.
+ */
+class UnauthorizedError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Unauthorized') {
+        super(resOrMessage, HttpStatus.UNAUTHORIZED);
+    }
 }
 exports.UnauthorizedError = UnauthorizedError;
-class NotFoundError extends HttpError {
+/**
+ * 	4o4 http error, Means that the requested page cannot be found at the moment, but it may be available again in the future.
+ */
+class NotFoundError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Not Found') {
+        super(resOrMessage, HttpStatus.NOT_FOUND);
+    }
 }
 exports.NotFoundError = NotFoundError;
-class ForbiddenError extends HttpError {
+/**
+ * 403 http error, Means that the request is legal, but the server is rejecting to answer it.
+ */
+class ForbiddenError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Forbidden') {
+        super(resOrMessage, HttpStatus.FORBIDDEN);
+    }
 }
 exports.ForbiddenError = ForbiddenError;
-class NotAcceptableError extends HttpError {
+/**
+ * 406 http error, Means that the server can only generate an answer which the client doesn't accept.
+ */
+class NotAcceptableError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Not Acceptable') {
+        super(resOrMessage, HttpStatus.NOT_ACCEPTABLE);
+    }
 }
 exports.NotAcceptableError = NotAcceptableError;
-class RequestTimeoutError extends HttpError {
+/**
+ * 408 http error, Means that the server timed out waiting for the request.
+ */
+class RequestTimeoutError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Request Timeout') {
+        super(resOrMessage, HttpStatus.REQUEST_TIMEOUT);
+    }
 }
 exports.RequestTimeoutError = RequestTimeoutError;
-class ConflictError extends HttpError {
+/**
+ * 409 http error, Means that the request cannot be completed, because of a conflict in the request.
+ */
+class ConflictError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Conflict') {
+        super(resOrMessage, HttpStatus.CONFLICT);
+    }
 }
 exports.ConflictError = ConflictError;
-class GoneError extends HttpError {
+/**
+ * 410 http error, Means that the requested page is not available anymore.
+ */
+class GoneError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Gone') {
+        super(resOrMessage, HttpStatus.GONE);
+    }
 }
 exports.GoneError = GoneError;
-class PayloadTooLargeError extends HttpError {
+/**
+ * 413 http error, Means that the request entity is too large and that's why the server won't accept the request.
+ */
+class PayloadTooLargeError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Request Entity Too Large') {
+        super(resOrMessage, HttpStatus.PAYLOAD_TOO_LARGE);
+    }
 }
 exports.PayloadTooLargeError = PayloadTooLargeError;
-class UnsupportedMediaTypeError extends HttpError {
+/**
+ * 415 http error, Means that the media type is not supported and that's why the server won't accept the request.
+ */
+class UnsupportedMediaTypeError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Unsupported Media Type') {
+        super(resOrMessage, HttpStatus.UNSUPPORTED_MEDIA_TYPE);
+    }
 }
 exports.UnsupportedMediaTypeError = UnsupportedMediaTypeError;
-class UnprocessableError extends HttpError {
+class UnprocessableError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Unprocessable Entity') {
+        super(resOrMessage, HttpStatus.UNPROCESSABLE_ENTITY);
+    }
 }
 exports.UnprocessableError = UnprocessableError;
-class InternalServerErrorError extends HttpError {
+/**
+ * 500 http error, Is a generic error and users receive this error message when there is no more suitable specific message.
+ */
+class InternalServerErrorError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Internal Server Error') {
+        super(resOrMessage, HttpStatus.INTERNAL_SERVER_ERROR);
+    }
 }
 exports.InternalServerErrorError = InternalServerErrorError;
-class NotImplementedError extends HttpError {
+/**
+ * 501 http error, Means that the server doesn't recognize the request method or it lacks the ability to fulfill the request.
+ */
+class NotImplementedError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Not Implemented') {
+        super(resOrMessage, HttpStatus.NOT_IMPLEMENTED);
+    }
 }
-class BadGatewayError extends HttpError {
+/**
+ * 502 http error, Means that the server was acting as a gateway or proxy and it received an invalid answer from the upstream server.
+ */
+class BadGatewayError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Bad Gateway') {
+        super(resOrMessage, HttpStatus.BAD_GATEWAY);
+    }
 }
 exports.BadGatewayError = BadGatewayError;
-class ServiceUnavailableError extends HttpError {
+/**
+ * 503 http error, Means that the server is not available now (It may be overloaded or down).
+ */
+class ServiceUnavailableError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Service Unavailable') {
+        super(resOrMessage, HttpStatus.SERVICE_UNAVAILABLE);
+    }
 }
 exports.ServiceUnavailableError = ServiceUnavailableError;
-class GatewayTimeoutError extends HttpError {
+/**
+ * 504 http error, Means that the server was acting as a gateway or proxy and it didn't get answer on time from the upstream server.
+ */
+class GatewayTimeoutError extends base_1.MidwayHttpError {
+    constructor(resOrMessage = 'Gateway Timeout') {
+        super(resOrMessage, HttpStatus.GATEWAY_TIMEOUT);
+    }
 }
 exports.GatewayTimeoutError = GatewayTimeoutError;
-exports.http = {
+exports.httpError = {
     BadRequestError,
     UnauthorizedError,
     NotFoundError,

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, pathMatching, wrapMiddleware, } 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,13 @@ 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 './common/applicationManager';
 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.wrapMiddleware = exports.pathMatching = 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,14 @@ 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; } });
+Object.defineProperty(exports, "pathMatching", { enumerable: true, get: function () { return util_1.pathMatching; } });
+Object.defineProperty(exports, "wrapMiddleware", { enumerable: true, get: function () { return util_1.wrapMiddleware; } });
 __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 +55,13 @@ 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("./common/applicationManager"), 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: (app?: IMidwayApplication) => 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 {
@@ -384,9 +400,9 @@ export interface IMidwayBootstrapOptions {
     moduleDetector?: 'file' | IFileDetector | false;
     logger?: boolean | ILogger;
     ignore?: string[];
-    globalConfig?: {
+    globalConfig?: Array<{
         [environmentName: string]: Record<string, any>;
-    };
+    }> | Record<string, any>;
 }
 export interface IConfigurationOptions {
     logger?: ILogger;
@@ -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,10 @@ 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(): ContextMiddlewareManager<CTX, ResOrNext, Next>;
+    applyMiddleware(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 +446,16 @@ export interface MidwayAppInfo {
     root: string;
     env: string;
 }
+/**
+ * midway global config definition
+ */
+export interface MidwayConfig extends FileConfigOption<typeof _default> {
+    [customConfigKey: string]: unknown;
+}
+export interface TranslateOptions {
+    lang?: string;
+    group?: string;
+    args?: any;
+}
+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'];
         }

package/dist/service/decoratorService.js

@@ -24,7 +24,30 @@ let MidwayDecoratorService = class MidwayDecoratorService {
     }
     async init() {
         // add custom method decorator listener
-        this.applicationContext.onBeforeBind((Clzz, options) => {
+        this.applicationContext.onBeforeBind(Clzz => {
+            // find custom method decorator metadata, include method decorator information array
+            const methodDecoratorMetadataList = (0, decorator_1.getClassMetadata)(decorator_1.INJECT_CUSTOM_METHOD, Clzz);
+            if (methodDecoratorMetadataList) {
+                // loop it, save this order for decorator run
+                for (const meta of methodDecoratorMetadataList) {
+                    const { propertyName, key, metadata, impl } = meta;
+                    if (!impl) {
+                        continue;
+                    }
+                    // add aspect implementation first
+                    this.aspectService.interceptPrototypeMethod(Clzz, propertyName, () => {
+                        const methodDecoratorHandler = this.methodDecoratorMap.get(key);
+                        if (!methodDecoratorHandler) {
+                            throw new error_1.MidwayCommonError(`Method Decorator "${key}" handler not found, please register first.`);
+                        }
+                        return this.methodDecoratorMap.get(key)({
+                            target: Clzz,
+                            propertyName,
+                            metadata,
+                        });
+                    });
+                }
+            }
             // find custom param decorator metadata
             const parameterDecoratorMetadata = (0, decorator_1.getClassMetadata)(decorator_1.INJECT_CUSTOM_PARAM, Clzz);
             if (parameterDecoratorMetadata) {
@@ -37,17 +60,22 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                                 // joinPoint.args
                                 const newArgs = [...joinPoint.args];
                                 for (const meta of parameterDecoratorMetadata[methodName]) {
-                                    const { propertyName, key, metadata, parameterIndex } = meta;
+                                    const { propertyName, key, metadata, parameterIndex, impl } = meta;
+                                    if (!impl) {
+                                        continue;
+                                    }
                                     const parameterDecoratorHandler = this.parameterDecoratorMap.get(key);
                                     if (!parameterDecoratorHandler) {
                                         throw new error_1.MidwayCommonError(`Parameter Decorator "${key}" handler not found, please register first.`);
                                     }
+                                    const paramTypes = (0, decorator_1.getMethodParamTypes)(Clzz, propertyName);
                                     newArgs[parameterIndex] = await parameterDecoratorHandler({
                                         metadata,
                                         propertyName,
                                         parameterIndex,
                                         target: Clzz,
                                         originArgs: joinPoint.args,
+                                        originParamType: paramTypes[parameterIndex],
                                     });
                                 }
                                 joinPoint.args = newArgs;
@@ -56,26 +84,6 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                     });
                 }
             }
-            // find custom method decorator metadata, include method decorator information array
-            const methodDecoratorMetadataList = (0, decorator_1.getClassMetadata)(decorator_1.INJECT_CUSTOM_METHOD, Clzz);
-            if (methodDecoratorMetadataList) {
-                // loop it, save this order for decorator run
-                for (const meta of methodDecoratorMetadataList) {
-                    const { propertyName, key, metadata } = meta;
-                    // add aspect implementation first
-                    this.aspectService.interceptPrototypeMethod(Clzz, propertyName, () => {
-                        const methodDecoratorHandler = this.methodDecoratorMap.get(key);
-                        if (!methodDecoratorHandler) {
-                            throw new error_1.MidwayCommonError(`Method Decorator "${key}" handler not found, please register first.`);
-                        }
-                        return this.methodDecoratorMap.get(key)({
-                            target: Clzz,
-                            propertyName,
-                            metadata,
-                        });
-                    });
-                }
-            }
         });
         // add custom property decorator listener
         this.applicationContext.onObjectCreated((instance, options) => {
@@ -93,15 +101,15 @@ let MidwayDecoratorService = class MidwayDecoratorService {
         });
     }
     registerPropertyHandler(decoratorKey, fn) {
-        debug(`[core:decorator]: Register property decorator key="${decoratorKey}"`);
+        debug(`[core]: Register property decorator key="${decoratorKey}"`);
         this.propertyHandlerMap.set(decoratorKey, fn);
     }
     registerMethodHandler(decoratorKey, fn) {
-        debug(`[core:decorator]: Register method decorator key="${decoratorKey}"`);
+        debug(`[core]: Register method decorator key="${decoratorKey}"`);
         this.methodDecoratorMap.set(decoratorKey, fn);
     }
     registerParameterHandler(decoratorKey, fn) {
-        debug(`[core:decorator]: Register parameter decorator key="${decoratorKey}"`);
+        debug(`[core]: Register parameter decorator key="${decoratorKey}"`);
         this.parameterDecoratorMap.set(decoratorKey, fn);
     }
     /**