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

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) => {

package/dist/service/frameworkService.d.ts

@@ -15,10 +15,11 @@ export declare class MidwayFrameworkService {
     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(type: MidwayFrameworkType): IMidwayFramework<any, any, any, unknown, unknown>;
+    runFramework(): Promise<void>;
     stopFramework(): Promise<void>;
 }
 //# sourceMappingURL=frameworkService.d.ts.map

package/dist/service/frameworkService.js

@@ -110,6 +110,16 @@ let MidwayFrameworkService = class MidwayFrameworkService {
     getFramework(type) {
         return this.globalFrameworkMap.get(type);
     }
+    async runFramework() {
+        for (const frameworkInstance of this.globalFrameworkList) {
+            // if enable, just init framework
+            if (frameworkInstance.isEnable()) {
+                // app init
+                await frameworkInstance.run();
+                debug(`[core:framework]: Found Framework "${frameworkInstance.getFrameworkName()}" and run.`);
+            }
+        }
+    }
     async stopFramework() {
         await Promise.all(Array.from(this.globalFrameworkList).map(frameworkInstance => {
             return frameworkInstance.stop();

package/dist/service/lifeCycleService.js

@@ -54,6 +54,8 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
         });
         // exec onReady()
         await this.runContainerLifeCycle(lifecycleInstanceList, 'onReady');
+        // exec framework.run()
+        await this.frameworkService.runFramework();
         // exec onServerReady()
         await this.runContainerLifeCycle(lifecycleInstanceList, 'onServerReady');
     }

package/dist/service/loggerService.d.ts

@@ -1,5 +1,5 @@
 import { MidwayConfigService } from './configService';
-import { ServiceFactory } from '../util/serviceFactory';
+import { ServiceFactory } from '../common/serviceFactory';
 import { ILogger } from '@midwayjs/logger';
 import { IMidwayContainer } from '../interface';
 export declare class MidwayLoggerService extends ServiceFactory<ILogger> {
@@ -15,7 +15,6 @@ export declare class MidwayLoggerService extends ServiceFactory<ILogger> {
     };
     protected createClient(config: any, name?: string): Promise<void>;
     getName(): string;
-    destroy(): Promise<void>;
     createLogger(name: any, config: any): ILogger;
     getLogger(name: string): ILogger;
     transformEggLogger(options: any): {

package/dist/service/loggerService.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayLoggerService = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const configService_1 = require("./configService");
-const serviceFactory_1 = require("../util/serviceFactory");
+const serviceFactory_1 = require("../common/serviceFactory");
 const logger_1 = require("@midwayjs/logger");
 const levelTransform = level => {
     if (!level) {
@@ -73,9 +73,6 @@ let MidwayLoggerService = class MidwayLoggerService extends serviceFactory_1.Ser
     getName() {
         return 'logger';
     }
-    async destroy() {
-        logger_1.loggers.close();
-    }
     createLogger(name, config) {
         return logger_1.loggers.createLogger(name, config);
     }
@@ -119,12 +116,6 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], MidwayLoggerService.prototype, "init", null);
-__decorate([
-    (0, decorator_1.Destroy)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], MidwayLoggerService.prototype, "destroy", null);
 MidwayLoggerService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),

package/dist/service/middlewareService.d.ts

@@ -1,8 +1,8 @@
 import { CommonMiddleware, IMidwayContainer } from '../interface';
-export declare class MidwayMiddlewareService<T> {
+export declare class MidwayMiddlewareService<T, R, N = unknown> {
     readonly applicationContext: IMidwayContainer;
     constructor(applicationContext: IMidwayContainer);
-    compose(middleware: Array<CommonMiddleware<T> | string>, name?: string): Promise<{
+    compose(middleware: Array<CommonMiddleware<T, R, N> | string>, name?: string): Promise<{
         (context: any, next?: any): Promise<any>;
         _name: string;
     }>;

package/dist/service/middlewareService.js

@@ -11,8 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pathMatching = exports.MidwayMiddlewareService = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const pathToRegexp_1 = require("../util/pathToRegexp");
 const error_1 = require("../error");
+const util_1 = require("../util");
 let MidwayMiddlewareService = class MidwayMiddlewareService {
     constructor(applicationContext) {
         this.applicationContext = applicationContext;
@@ -108,34 +108,12 @@ function pathMatching(options) {
     if (!options.match && !options.ignore)
         return () => true;
     const matchFn = options.match
-        ? toPathMatch(options.match)
-        : toPathMatch(options.ignore);
+        ? (0, util_1.toPathMatch)(options.match)
+        : (0, util_1.toPathMatch)(options.ignore);
     return function pathMatch(ctx) {
         const matched = matchFn(ctx);
         return options.match ? matched : !matched;
     };
 }
 exports.pathMatching = pathMatching;
-function toPathMatch(pattern) {
-    if (typeof pattern === 'string') {
-        const reg = (0, pathToRegexp_1.pathToRegexp)(pattern, [], { end: false });
-        if (reg.global)
-            reg.lastIndex = 0;
-        return ctx => reg.test(ctx.path);
-    }
-    if (pattern instanceof RegExp) {
-        return ctx => {
-            if (pattern.global)
-                pattern.lastIndex = 0;
-            return pattern.test(ctx.path);
-        };
-    }
-    if (typeof pattern === 'function')
-        return pattern;
-    if (Array.isArray(pattern)) {
-        const matchs = pattern.map(item => toPathMatch(item));
-        return ctx => matchs.some(match => match(ctx));
-    }
-    throw new error_1.MidwayCommonError('match/ignore pattern must be RegExp, Array or String, but got ' + pattern);
-}
 //# sourceMappingURL=middlewareService.js.map

package/dist/setup.js

@@ -6,6 +6,7 @@ const config_default_1 = require("./config/config.default");
 const decorator_1 = require("@midwayjs/decorator");
 const util = require("util");
 const path_1 = require("path");
+const logger_1 = require("@midwayjs/logger");
 const debug = util.debuglog('midway:debug');
 async function initializeGlobalApplicationContext(globalOptions) {
     var _a, _b, _c, _d;
@@ -104,6 +105,7 @@ async function destroyGlobalApplicationContext(applicationContext) {
     // stop container
     await applicationContext.stop();
     (0, decorator_1.clearBindContainer)();
+    logger_1.loggers.close();
     global['MIDWAY_APPLICATION_CONTEXT'] = undefined;
     global['MIDWAY_MAIN_FRAMEWORK'] = undefined;
 }

package/dist/util/contextUtil.d.ts

@@ -1,5 +1,5 @@
 import { IConfigurationOptions, IMidwayContainer, IMidwayFramework } from '../interface';
 export declare const getCurrentApplicationContext: () => IMidwayContainer;
-export declare const getCurrentMainFramework: <APP extends import("../interface").IMidwayBaseApplication<import("../interface").Context>, T extends IConfigurationOptions>() => IMidwayFramework<APP, T>;
+export declare const getCurrentMainFramework: <APP extends import("../interface").IMidwayBaseApplication<CTX>, CTX extends import("../interface").Context, CONFIG extends IConfigurationOptions>() => IMidwayFramework<APP, CTX, CONFIG, unknown, unknown>;
 export declare const getCurrentMainApp: <APP extends import("../interface").IMidwayBaseApplication<import("../interface").Context>>() => APP;
 //# sourceMappingURL=contextUtil.d.ts.map

package/dist/util/index.d.ts

@@ -1,5 +1,17 @@
+/**
+ * @since 2.0.0
+ * @param env
+ */
 export declare const isDevelopmentEnvironment: (env: any) => boolean;
+/**
+ * @since 2.0.0
+ */
 export declare const getCurrentEnvironment: () => string;
+/**
+ * @param p
+ * @param enabledCache
+ * @since 2.0.0
+ */
 export declare const safeRequire: (p: any, enabledCache?: boolean) => any;
 /**
  *  safelyGet(['a','b'],{a: {b: 2}})  // => 2
@@ -8,11 +20,13 @@ export declare const safeRequire: (p: any, enabledCache?: boolean) => any;
  *  safelyGet(['a','1'],{a: {b: 2}})  // => undefined
  *  safelyGet('a.b',{a: {b: 2}})  // => 2
  *  safelyGet('a.b',{c: {b: 2}})  // => undefined
+ *  @since 2.0.0
  */
 export declare function safelyGet(list: string | string[], obj?: Record<string, unknown>): any;
 /**
  * 剔除 @ 符号
  * @param provideId provideId
+ * @since 2.0.0
  */
 export declare function parsePrefix(provideId: string): string;
 export declare function getUserHome(): string;
@@ -21,19 +35,42 @@ export declare function joinURLPath(...strArray: any[]): string;
  * 代理目标所有的原型方法，不包括构造器和内部隐藏方法
  * @param derivedCtor
  * @param constructors
+ * @since 2.0.0
  */
 export declare function delegateTargetPrototypeMethod(derivedCtor: any, constructors: any[]): void;
 /**
  * 代理目标原型上的特定方法
  * @param derivedCtor
  * @param methods
+ * @since 2.0.0
  */
 export declare function delegateTargetMethod(derivedCtor: any, methods: string[]): void;
 /**
  * 代理目标原型属性
  * @param derivedCtor
  * @param properties
+ * @since 2.0.0
  */
 export declare function delegateTargetProperties(derivedCtor: any, properties: string[]): void;
+/**
+ * 代理目标原型属性
+ * @since 2.0.0
+ * @param timestamp
+ */
 export declare const getCurrentDateString: (timestamp?: number) => string;
+/**
+ *
+ * @param message
+ * @since 3.0.0
+ */
+export declare const deprecatedOutput: (message: string) => void;
+/**
+ * transform request object to definition type
+ *
+ * @param originValue
+ * @param targetType
+ * @since 3.0.0
+ */
+export declare const transformRequestObjectByType: (originValue: any, targetType?: any) => any;
+export declare function toPathMatch(pattern: any): any;
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,18 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
+const transformer = require("class-transformer");
+const pathToRegexp_1 = require("./pathToRegexp");
+const error_1 = require("../error");
 const debug = (0, util_1.debuglog)('midway:container:util');
+/**
+ * @since 2.0.0
+ * @param env
+ */
 const isDevelopmentEnvironment = env => {
     return ['local', 'test', 'unittest'].includes(env);
 };
 exports.isDevelopmentEnvironment = isDevelopmentEnvironment;
+/**
+ * @since 2.0.0
+ */
 const getCurrentEnvironment = () => {
     return process.env['MIDWAY_SERVER_ENV'] || process.env['NODE_ENV'] || 'prod';
 };
 exports.getCurrentEnvironment = getCurrentEnvironment;
+/**
+ * @param p
+ * @param enabledCache
+ * @since 2.0.0
+ */
 const safeRequire = (p, enabledCache = true) => {
     if (p.startsWith(`.${path_1.sep}`) || p.startsWith(`..${path_1.sep}`)) {
         p = (0, path_1.resolve)((0, path_1.dirname)(module.parent.filename), p);
@@ -41,6 +56,7 @@ exports.safeRequire = safeRequire;
  *  safelyGet(['a','1'],{a: {b: 2}})  // => undefined
  *  safelyGet('a.b',{a: {b: 2}})  // => 2
  *  safelyGet('a.b',{c: {b: 2}})  // => undefined
+ *  @since 2.0.0
  */
 function safelyGet(list, obj) {
     if (arguments.length === 1) {
@@ -66,6 +82,7 @@ exports.safelyGet = safelyGet;
 /**
  * 剔除 @ 符号
  * @param provideId provideId
+ * @since 2.0.0
  */
 function parsePrefix(provideId) {
     if (provideId.includes('@')) {
@@ -79,6 +96,7 @@ function getUserHome() {
 }
 exports.getUserHome = getUserHome;
 function joinURLPath(...strArray) {
+    strArray = strArray.filter(item => !!item);
     if (strArray.length === 0) {
         return '';
     }
@@ -94,6 +112,7 @@ exports.joinURLPath = joinURLPath;
  * 代理目标所有的原型方法，不包括构造器和内部隐藏方法
  * @param derivedCtor
  * @param constructors
+ * @since 2.0.0
  */
 function delegateTargetPrototypeMethod(derivedCtor, constructors) {
     constructors.forEach(baseCtor => {
@@ -111,6 +130,7 @@ exports.delegateTargetPrototypeMethod = delegateTargetPrototypeMethod;
  * 代理目标原型上的特定方法
  * @param derivedCtor
  * @param methods
+ * @since 2.0.0
  */
 function delegateTargetMethod(derivedCtor, methods) {
     methods.forEach(name => {
@@ -124,6 +144,7 @@ exports.delegateTargetMethod = delegateTargetMethod;
  * 代理目标原型属性
  * @param derivedCtor
  * @param properties
+ * @since 2.0.0
  */
 function delegateTargetProperties(derivedCtor, properties) {
     properties.forEach(name => {
@@ -135,6 +156,11 @@ function delegateTargetProperties(derivedCtor, properties) {
     });
 }
 exports.delegateTargetProperties = delegateTargetProperties;
+/**
+ * 代理目标原型属性
+ * @since 2.0.0
+ * @param timestamp
+ */
 const getCurrentDateString = (timestamp = Date.now()) => {
     const d = new Date(timestamp);
     return `${d.getFullYear()}-${(d.getMonth() + 1)
@@ -142,4 +168,73 @@ const getCurrentDateString = (timestamp = Date.now()) => {
         .padStart(2, '0')}-${d.getDate().toString().padStart(2, '0')}`;
 };
 exports.getCurrentDateString = getCurrentDateString;
+/**
+ *
+ * @param message
+ * @since 3.0.0
+ */
+const deprecatedOutput = (message) => {
+    console.warn('DeprecationWarning: ' + message);
+};
+exports.deprecatedOutput = deprecatedOutput;
+/**
+ * transform request object to definition type
+ *
+ * @param originValue
+ * @param targetType
+ * @since 3.0.0
+ */
+const transformRequestObjectByType = (originValue, targetType) => {
+    if (targetType === undefined ||
+        targetType === null ||
+        targetType === Object) {
+        return originValue;
+    }
+    switch (targetType) {
+        case Number:
+            return Number(originValue);
+        case String:
+            return String(originValue);
+        case Boolean:
+            if (originValue === '0' || originValue === 'false') {
+                return false;
+            }
+            return Boolean(originValue);
+        default:
+            if (originValue instanceof targetType) {
+                return originValue;
+            }
+            else {
+                const transformToInstance = transformer['plainToClass'] || transformer['plainToInstance'];
+                return transformToInstance(targetType, originValue);
+            }
+    }
+};
+exports.transformRequestObjectByType = transformRequestObjectByType;
+function toPathMatch(pattern) {
+    if (typeof pattern === 'boolean') {
+        return ctx => pattern;
+    }
+    if (typeof pattern === 'string') {
+        const reg = (0, pathToRegexp_1.pathToRegexp)(pattern, [], { end: false });
+        if (reg.global)
+            reg.lastIndex = 0;
+        return ctx => reg.test(ctx.path);
+    }
+    if (pattern instanceof RegExp) {
+        return ctx => {
+            if (pattern.global)
+                pattern.lastIndex = 0;
+            return pattern.test(ctx.path);
+        };
+    }
+    if (typeof pattern === 'function')
+        return pattern;
+    if (Array.isArray(pattern)) {
+        const matchs = pattern.map(item => toPathMatch(item));
+        return ctx => matchs.some(match => match(ctx));
+    }
+    throw new error_1.MidwayCommonError('match/ignore pattern must be RegExp, Array or String, but got ' + pattern);
+}
+exports.toPathMatch = toPathMatch;
 //# sourceMappingURL=index.js.map

package/dist/util/webRouterParam.d.ts

@@ -1,3 +1,3 @@
-export declare const extractKoaLikeValue: (key: any, data: any) => (ctx: any, next: any) => any;
-export declare const extractExpressLikeValue: (key: any, data: any) => (req: any, res: any, next: any) => any;
+export declare const extractKoaLikeValue: (key: any, data: any, paramType?: any) => (ctx: any, next: any) => any;
+export declare const extractExpressLikeValue: (key: any, data: any, paramType?: any) => (req: any, res: any, next: any) => any;
 //# sourceMappingURL=webRouterParam.d.ts.map

package/dist/util/webRouterParam.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractExpressLikeValue = exports.extractKoaLikeValue = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const extractKoaLikeValue = (key, data) => {
+const index_1 = require("./index");
+const extractKoaLikeValue = (key, data, paramType) => {
     if (decorator_1.ALL === data) {
         data = undefined;
     }
@@ -11,17 +12,15 @@ const extractKoaLikeValue = (key, data) => {
             case decorator_1.RouteParamTypes.NEXT:
                 return next;
             case decorator_1.RouteParamTypes.BODY:
-                return data && ctx.request.body
-                    ? ctx.request.body[data]
-                    : ctx.request.body;
+                return (0, index_1.transformRequestObjectByType)(data && ctx.request.body ? ctx.request.body[data] : ctx.request.body, paramType);
             case decorator_1.RouteParamTypes.PARAM:
-                return data ? ctx.params[data] : ctx.params;
+                return (0, index_1.transformRequestObjectByType)(data ? ctx.params[data] : ctx.params, paramType);
             case decorator_1.RouteParamTypes.QUERY:
-                return data ? ctx.query[data] : ctx.query;
+                return (0, index_1.transformRequestObjectByType)(data ? ctx.query[data] : ctx.query, paramType);
             case decorator_1.RouteParamTypes.HEADERS:
-                return data ? ctx.get(data) : ctx.headers;
+                return (0, index_1.transformRequestObjectByType)(data ? ctx.get(data) : ctx.headers, paramType);
             case decorator_1.RouteParamTypes.SESSION:
-                return data ? ctx.session[data] : ctx.session;
+                return (0, index_1.transformRequestObjectByType)(data ? ctx.session[data] : ctx.session, paramType);
             case decorator_1.RouteParamTypes.FILESTREAM:
                 return ctx.getFileStream && ctx.getFileStream(data);
             case decorator_1.RouteParamTypes.FILESSTREAM:
@@ -32,10 +31,10 @@ const extractKoaLikeValue = (key, data) => {
                 return ctx['ip'];
             case decorator_1.RouteParamTypes.QUERIES:
                 if (ctx.queries) {
-                    return data ? ctx.queries[data] : ctx.queries;
+                    return (0, index_1.transformRequestObjectByType)(data ? ctx.queries[data] : ctx.queries, paramType);
                 }
                 else {
-                    return data ? ctx.query[data] : ctx.query;
+                    return (0, index_1.transformRequestObjectByType)(data ? ctx.query[data] : ctx.query, paramType);
                 }
             default:
                 return null;
@@ -43,7 +42,7 @@ const extractKoaLikeValue = (key, data) => {
     };
 };
 exports.extractKoaLikeValue = extractKoaLikeValue;
-const extractExpressLikeValue = (key, data) => {
+const extractExpressLikeValue = (key, data, paramType) => {
     if (decorator_1.ALL === data) {
         data = undefined;
     }
@@ -52,15 +51,15 @@ const extractExpressLikeValue = (key, data) => {
             case decorator_1.RouteParamTypes.NEXT:
                 return next;
             case decorator_1.RouteParamTypes.BODY:
-                return data && req.body ? req.body[data] : req.body;
+                return (0, index_1.transformRequestObjectByType)(data && req.body ? req.body[data] : req.body, paramType);
             case decorator_1.RouteParamTypes.PARAM:
-                return data ? req.params[data] : req.params;
+                return (0, index_1.transformRequestObjectByType)(data ? req.params[data] : req.params, paramType);
             case decorator_1.RouteParamTypes.QUERY:
-                return data ? req.query[data] : req.query;
+                return (0, index_1.transformRequestObjectByType)(data ? req.query[data] : req.query, paramType);
             case decorator_1.RouteParamTypes.HEADERS:
-                return data ? req.get(data) : req.headers;
+                return (0, index_1.transformRequestObjectByType)(data ? req.get(data) : req.headers, paramType);
             case decorator_1.RouteParamTypes.SESSION:
-                return data ? req.session[data] : req.session;
+                return (0, index_1.transformRequestObjectByType)(data ? req.session[data] : req.session, paramType);
             case decorator_1.RouteParamTypes.FILESTREAM:
                 return req.getFileStream && req.getFileStream(data);
             case decorator_1.RouteParamTypes.FILESSTREAM:
@@ -71,10 +70,10 @@ const extractExpressLikeValue = (key, data) => {
                 return req['ip'];
             case decorator_1.RouteParamTypes.QUERIES:
                 if (req.queries) {
-                    return data ? req.queries[data] : req.queries;
+                    return (0, index_1.transformRequestObjectByType)(data ? req.queries[data] : req.queries, paramType);
                 }
                 else {
-                    return data ? req.query[data] : req.query;
+                    return (0, index_1.transformRequestObjectByType)(data ? req.query[data] : req.query, paramType);
                 }
             default:
                 return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.6",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.2",
+    "@midwayjs/decorator": "^3.0.0-beta.6",
     "midway-test-component": "*",
     "mm": "3",
     "sinon": "^7.2.2"
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
-    "@midwayjs/logger": "^3.0.0-beta.2",
-    "class-transformer": "^0.3.1",
+    "@midwayjs/logger": "^3.0.0-beta.6",
+    "class-transformer": "^0.5.1",
     "extend2": "^1.0.0",
     "picomatch": "^2.2.2",
     "reflect-metadata": "^0.1.13"
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "7f07de960da1155a9f7df554e1789c7a97bdd3fe"
+  "gitHead": "e4595d30b369e36bef21b36f2b3737d8bc2f802d"
 }

package/dist/util/exceptionFilterManager.d.ts

@@ -1,13 +0,0 @@
-import { CommonExceptionFilterUnion, IMidwayContainer, IMidwayContext } from '../interface';
-export declare class ExceptionFilterManager<T extends IMidwayContext = IMidwayContext, R = any, N = any> {
-    private filterList;
-    private exceptionMap;
-    private defaultFilter;
-    useFilter(Filter: CommonExceptionFilterUnion<T, R, N>): void;
-    init(applicationContext: IMidwayContainer): Promise<void>;
-    run(err: Error, ctx: T, res?: R, next?: N): Promise<{
-        result: any;
-        error: any;
-    }>;
-}
-//# sourceMappingURL=exceptionFilterManager.d.ts.map