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

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,7 @@ export declare enum FrameworkErrorEnum {
     PARAM_TYPE = 10002,
     DEFINITION_NOT_FOUND = 10003,
     FEATURE_NO_LONGER_SUPPORTED = 10004,
-    NO_FRAMEWORK_FOUND = 10005
+    VALIDATE_FAIL = 10005,
+    MISSING_CONFIG = 10006
 }
 //# sourceMappingURL=code.d.ts.map

package/dist/error/code.js

@@ -59,6 +59,7 @@ 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[FrameworkErrorEnum["MISSING_CONFIG"] = 10006] = "MISSING_CONFIG";
 })(FrameworkErrorEnum = exports.FrameworkErrorEnum || (exports.FrameworkErrorEnum = {}));
 //# sourceMappingURL=code.js.map

package/dist/error/framework.d.ts

@@ -15,7 +15,10 @@ 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);
+}
+export declare class MidwayConfigMissingError extends MidwayError {
+    constructor(configKey: string);
 }
 //# 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.MidwayConfigMissingError = 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,19 @@ 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;
+class MidwayConfigMissingError extends base_1.MidwayError {
+    constructor(configKey) {
+        super(`Can't found config key "${configKey}" in your config, please set it first`, code_1.FrameworkErrorEnum.MISSING_CONFIG);
+    }
+}
+exports.MidwayConfigMissingError = MidwayConfigMissingError;
 //# 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, 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,15 @@ export interface MidwayAppInfo {
     root: string;
     env: string;
 }
+/**
+ * midway global config definition
+ */
+export interface MidwayConfig extends FileConfigOption<typeof _default> {
+}
+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,27 @@ 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 } = 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,
+                        });
+                    });
+                }
+            }
             // find custom param decorator metadata
             const parameterDecoratorMetadata = (0, decorator_1.getClassMetadata)(decorator_1.INJECT_CUSTOM_PARAM, Clzz);
             if (parameterDecoratorMetadata) {
@@ -42,12 +62,14 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                                     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 +78,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 +95,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);
     }
     /**

package/dist/service/frameworkService.d.ts

@@ -4,6 +4,7 @@ import { MidwayConfigService } from './configService';
 import { MidwayLoggerService } from './loggerService';
 import { MidwayDecoratorService } from './decoratorService';
 import { MidwayAspectService } from './aspectService';
+import { MidwayApplicationManager } from '../common/applicationManager';
 export declare class MidwayFrameworkService {
     readonly applicationContext: IMidwayContainer;
     readonly globalOptions: any;
@@ -11,14 +12,15 @@ export declare class MidwayFrameworkService {
     loggerService: MidwayLoggerService;
     aspectService: MidwayAspectService;
     decoratorService: MidwayDecoratorService;
+    applicationManager: MidwayApplicationManager;
     constructor(applicationContext: IMidwayContainer, globalOptions: any);
     private mainFramework;
-    private globalFrameworkMap;
     private globalFrameworkList;
-    init(): Promise<void>;
+    protected init(): Promise<void>;
     getMainApp(): any;
-    getMainFramework(): IMidwayFramework<any, any>;
-    getFramework(type: MidwayFrameworkType): IMidwayFramework<any, any>;
+    getMainFramework(): IMidwayFramework<any, any, any, unknown, unknown>;
+    getFramework(namespaceOrFrameworkType: string | MidwayFrameworkType): IMidwayFramework<any, any, any, unknown, unknown>;
+    runFramework(): Promise<void>;
     stopFramework(): Promise<void>;
 }
 //# sourceMappingURL=frameworkService.d.ts.map

package/dist/service/frameworkService.js

@@ -18,6 +18,7 @@ const baseFramework_1 = require("../baseFramework");
 const pipelineService_1 = require("./pipelineService");
 const decoratorService_1 = require("./decoratorService");
 const aspectService_1 = require("./aspectService");
+const applicationManager_1 = require("../common/applicationManager");
 const util = require("util");
 const error_1 = require("../error");
 const debug = util.debuglog('midway:debug');
@@ -25,10 +26,10 @@ let MidwayFrameworkService = class MidwayFrameworkService {
     constructor(applicationContext, globalOptions) {
         this.applicationContext = applicationContext;
         this.globalOptions = globalOptions;
-        this.globalFrameworkMap = new WeakMap();
         this.globalFrameworkList = [];
     }
     async init() {
+        var _a;
         // register base config hook
         this.decoratorService.registerPropertyHandler(decorator_1.CONFIG_KEY, (propertyName, meta) => {
             var _a;
@@ -51,7 +52,7 @@ let MidwayFrameworkService = class MidwayFrameworkService {
         let frameworks = (0, decorator_1.listModule)(decorator_1.FRAMEWORK_KEY);
         // filter proto
         frameworks = filterProtoFramework(frameworks);
-        debug(`[core:framework]: Found Framework length = ${frameworks.length}`);
+        debug(`[core]: Found Framework length = ${frameworks.length}`);
         if (frameworks.length) {
             for (const frameworkClz of frameworks) {
                 const frameworkInstance = await this.applicationContext.getAsync(frameworkClz, [this.applicationContext]);
@@ -62,24 +63,24 @@ let MidwayFrameworkService = class MidwayFrameworkService {
                         applicationContext: this.applicationContext,
                         ...this.globalOptions,
                     });
-                    debug(`[core:framework]: Found Framework "${frameworkInstance.getFrameworkName()}" and initialize.`);
+                    debug(`[core]: Found Framework "${frameworkInstance.getFrameworkName()}" and initialize.`);
                 }
                 else {
-                    debug(`[core:framework]: Found Framework "${frameworkInstance.getFrameworkName()}" and delay initialize.`);
+                    debug(`[core]: Found Framework "${frameworkInstance.getFrameworkName()}" and delay initialize.`);
                 }
                 // app init
-                this.globalFrameworkMap.set(frameworkInstance.getFrameworkType(), frameworkInstance);
+                const definition = this.applicationContext.registry.getDefinition((0, decorator_1.getProviderUUId)(frameworkClz));
+                this.applicationManager.addFramework((_a = definition === null || definition === void 0 ? void 0 : definition.namespace) !== null && _a !== void 0 ? _a : frameworkInstance.getFrameworkName(), frameworkInstance);
                 this.globalFrameworkList.push(frameworkInstance);
             }
             // register @App decorator handler
             this.decoratorService.registerPropertyHandler(decorator_1.APPLICATION_KEY, (propertyName, mete) => {
                 if (mete.type) {
-                    if (this.globalFrameworkMap.has(mete.type)) {
-                        return this.globalFrameworkMap.get(mete.type).getApplication();
-                    }
-                    else {
+                    const framework = this.applicationManager.getApplication(mete.type);
+                    if (!framework) {
                         throw new error_1.MidwayCommonError(`Framework ${mete.type} not Found`);
                     }
+                    return framework;
                 }
                 else {
                     return this.getMainApp();
@@ -107,8 +108,18 @@ let MidwayFrameworkService = class MidwayFrameworkService {
     getMainFramework() {
         return this.mainFramework;
     }
-    getFramework(type) {
-        return this.globalFrameworkMap.get(type);
+    getFramework(namespaceOrFrameworkType) {
+        return this.applicationManager.getFramework(namespaceOrFrameworkType);
+    }
+    async runFramework() {
+        for (const frameworkInstance of this.globalFrameworkList) {
+            // if enable, just init framework
+            if (frameworkInstance.isEnable()) {
+                // app init
+                await frameworkInstance.run();
+                debug(`[core]: Found Framework "${frameworkInstance.getFrameworkName()}" and run.`);
+            }
+        }
     }
     async stopFramework() {
         await Promise.all(Array.from(this.globalFrameworkList).map(frameworkInstance => {
@@ -132,6 +143,10 @@ __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", decoratorService_1.MidwayDecoratorService)
 ], MidwayFrameworkService.prototype, "decoratorService", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", applicationManager_1.MidwayApplicationManager)
+], MidwayFrameworkService.prototype, "applicationManager", void 0);
 __decorate([
     (0, decorator_1.Init)(),
     __metadata("design:type", Function),