@midwayjs/decorator 2.12.9 → 2.14.0

package/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.14.0](https://github.com/midwayjs/midway/compare/v2.13.5...v2.14.0) (2021-12-06)
+
+
+### Bug Fixes
+
+* express routing middleware takes effect at the controller level ([#1364](https://github.com/midwayjs/midway/issues/1364)) ([5d5f299](https://github.com/midwayjs/midway/commit/5d5f2992be116ca71b21f01fd782e3a2ac072496))
+* throws http code 422 when validation failed ([#1374](https://github.com/midwayjs/midway/issues/1374)) ([960d259](https://github.com/midwayjs/midway/commit/960d25909191558a4509632333d425be10a04813))
+
+
+
+
+
+## [2.13.2](https://github.com/midwayjs/midway/compare/v2.13.1...v2.13.2) (2021-09-09)
+
+
+### Bug Fixes
+
+* remove testKeyMap in testKeyMap ([901dad1](https://github.com/midwayjs/midway/commit/901dad177e07732748d169868a38a9c5813a82a7))
+
+
+### Features
+
+* dto helper ([9f64ec1](https://github.com/midwayjs/midway/commit/9f64ec110b16371dc2e9492601d04e9fdd95082b))
+* dto helper support extend method ([5f32bd5](https://github.com/midwayjs/midway/commit/5f32bd55c23e76d5edbef6c2f07a900bd304573a))
+
+
+
+
+
+# [2.13.0](https://github.com/midwayjs/midway/compare/v2.12.9...v2.13.0) (2021-09-07)
+
+
+### Bug Fixes
+
+* can't found id in test case ([#1274](https://github.com/midwayjs/midway/issues/1274)) ([9bd1b96](https://github.com/midwayjs/midway/commit/9bd1b96d02ea08f6f1c80f5cef9f68a605cea2ca))
+
+
+
+
+
 ## [2.12.9](https://github.com/midwayjs/midway/compare/v2.12.8...v2.12.9) (2021-09-01)
 
 **Note:** Version bump only for package @midwayjs/decorator

package/README.md

@@ -5,7 +5,7 @@
 
 this is a sub package for midway.
 
-Document: [https://midwayjs.org/midway](https://midwayjs.org/midway)
+Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 

package/dist/annotation/aspect.js

@@ -5,16 +5,16 @@ const __1 = require("..");
 const objectDef_1 = require("./objectDef");
 function Aspect(aspectTarget, match, priority) {
     return function (target) {
-        __1.saveModule(__1.ASPECT_KEY, target);
+        (0, __1.saveModule)(__1.ASPECT_KEY, target);
         const aspectTargets = [].concat(aspectTarget);
         for (const aspectTarget of aspectTargets) {
-            __1.attachClassMetadata(__1.ASPECT_KEY, {
+            (0, __1.attachClassMetadata)(__1.ASPECT_KEY, {
                 aspectTarget,
                 match,
                 priority,
             }, target);
         }
-        objectDef_1.Scope(__1.ScopeEnum.Singleton);
+        (0, objectDef_1.Scope)(__1.ScopeEnum.Singleton);
     };
 }
 exports.Aspect = Aspect;

package/dist/annotation/autoload.js

@@ -4,7 +4,7 @@ exports.Autoload = void 0;
 const decoratorManager_1 = require("../common/decoratorManager");
 function Autoload() {
     return function (target) {
-        decoratorManager_1.savePreloadModule(target);
+        (0, decoratorManager_1.savePreloadModule)(target);
     };
 }
 exports.Autoload = Autoload;

package/dist/annotation/configuration.js

@@ -4,7 +4,7 @@ exports.Configuration = void 0;
 const __1 = require("../");
 function Configuration(options = {}) {
     return (target) => {
-        __1.saveClassMetadata(__1.CONFIGURATION_KEY, options, target);
+        (0, __1.saveClassMetadata)(__1.CONFIGURATION_KEY, options, target);
     };
 }
 exports.Configuration = Configuration;

package/dist/annotation/inject.js

@@ -5,10 +5,10 @@ const __1 = require("../");
 function Inject(identifier) {
     return function (target, targetKey, index) {
         if (typeof index === 'number') {
-            __1.saveConstructorInject({ target, targetKey, identifier, index });
+            (0, __1.saveConstructorInject)({ target, targetKey, identifier, index });
         }
         else {
-            __1.savePropertyInject({ target, targetKey, identifier });
+            (0, __1.savePropertyInject)({ target, targetKey, identifier });
         }
     };
 }

package/dist/annotation/objectDef.js

@@ -6,21 +6,21 @@ const debug = require('util').debuglog('decorator:context:obj_def');
 function Async() {
     return function (target) {
         debug(`set [async] property in [${target.name}]`);
-        return __1.saveObjectDefProps(target, { isAsync: true });
+        return (0, __1.saveObjectDefProps)(target, { isAsync: true });
     };
 }
 exports.Async = Async;
 function Init() {
     return function (target, propertyKey) {
         debug(`set [init] property in [${target.constructor.name}]`);
-        return __1.saveObjectDefProps(target.constructor, { initMethod: propertyKey });
+        return (0, __1.saveObjectDefProps)(target.constructor, { initMethod: propertyKey });
     };
 }
 exports.Init = Init;
 function Destroy() {
     return function (target, propertyKey) {
         debug(`set [destroy] property in [${target.constructor.name}]`);
-        return __1.saveObjectDefProps(target.constructor, {
+        return (0, __1.saveObjectDefProps)(target.constructor, {
             destroyMethod: propertyKey,
         });
     };
@@ -29,14 +29,14 @@ exports.Destroy = Destroy;
 function Scope(scope = __1.ScopeEnum.Singleton) {
     return function (target) {
         debug(`set [scope] property in [${target.name}]`);
-        return __1.saveObjectDefProps(target, { scope });
+        return (0, __1.saveObjectDefProps)(target, { scope });
     };
 }
 exports.Scope = Scope;
 function Autowire(isAutowire = true) {
     return function (target) {
         debug(`set [autowire] property in [${target.name}]`);
-        return __1.saveObjectDefProps(target, { isAutowire });
+        return (0, __1.saveObjectDefProps)(target, { isAutowire });
     };
 }
 exports.Autowire = Autowire;

package/dist/annotation/pipeline.js

@@ -5,7 +5,7 @@ const __1 = require("../");
 function Pipeline(valves) {
     return function (target, targetKey, index) {
         if (typeof index === 'number') {
-            __1.saveConstructorInject({
+            (0, __1.saveConstructorInject)({
                 target,
                 targetKey,
                 identifier: __1.PIPELINE_IDENTIFIER,
@@ -14,7 +14,7 @@ function Pipeline(valves) {
             });
         }
         else {
-            __1.savePropertyInject({
+            (0, __1.savePropertyInject)({
                 target,
                 targetKey,
                 identifier: __1.PIPELINE_IDENTIFIER,

package/dist/annotation/priority.js

@@ -4,7 +4,7 @@ exports.Priority = void 0;
 const __1 = require("../");
 function Priority(priority) {
     return (target) => {
-        __1.saveClassMetadata(__1.PRIORITY_KEY, priority, target);
+        (0, __1.saveClassMetadata)(__1.PRIORITY_KEY, priority, target);
     };
 }
 exports.Priority = Priority;

package/dist/annotation/provide.js

@@ -4,7 +4,7 @@ exports.Provide = void 0;
 const __1 = require("../");
 function Provide(identifier) {
     return function (target) {
-        return __1.saveProviderId(identifier, target);
+        return (0, __1.saveProviderId)(identifier, target);
     };
 }
 exports.Provide = Provide;

package/dist/annotation/queue.js

@@ -5,8 +5,8 @@ const __1 = require("../");
 const constant_1 = require("../constant");
 function Queue(options) {
     return function (target) {
-        __1.saveModule(constant_1.MODULE_TASK_QUEUE_KEY, target);
-        __1.saveClassMetadata(constant_1.MODULE_TASK_QUEUE_OPTIONS, {
+        (0, __1.saveModule)(constant_1.MODULE_TASK_QUEUE_KEY, target);
+        (0, __1.saveClassMetadata)(constant_1.MODULE_TASK_QUEUE_OPTIONS, {
             options,
             name: target.name,
         }, target);

package/dist/annotation/rule.d.ts

@@ -1,6 +1,8 @@
 import * as joi from 'joi';
 export interface RuleOptions {
     required?: boolean;
+    min?: number;
+    max?: number;
 }
 export declare function Rule(rule: any, options?: RuleOptions): (...args: any[]) => void;
 export { joi as RuleType };

package/dist/annotation/rule.js

@@ -10,31 +10,36 @@ function Rule(rule, options = { required: true }) {
             // 函数装饰器
             const [target, propertyKey] = args;
             if (!joi.isSchema(rule)) {
-                rule = __1.getClassMetadata(__1.RULES_KEY, rule);
-                if (__1.getPropertyType(target, propertyKey).name === 'Array') {
+                rule = joi
+                    .object((0, __1.getClassMetadata)(__1.RULES_KEY, rule))
+                    .meta({ id: rule.name });
+                if ((0, __1.getPropertyType)(target, propertyKey).name === 'Array') {
                     rule = joi.array().items(rule);
-                }
-                else {
-                    rule = joi.object(rule);
+                    if (options.min) {
+                        rule = rule.min(options.min);
+                    }
+                    if (options.max) {
+                        rule = rule.max(options.max);
+                    }
                 }
                 if (options.required) {
                     rule = rule.required();
                 }
             }
-            __1.attachClassMetadata(__1.RULES_KEY, rule, target, propertyKey);
+            (0, __1.attachClassMetadata)(__1.RULES_KEY, rule, target, propertyKey);
         }
         else {
             //类的装饰器
-            const rules = __1.getClassMetadata(__1.RULES_KEY, rule);
+            const rules = (0, __1.getClassMetadata)(__1.RULES_KEY, rule);
             if (rules) {
-                let currentRule = __1.getClassMetadata(__1.RULES_KEY, args[0]);
+                let currentRule = (0, __1.getClassMetadata)(__1.RULES_KEY, args[0]);
                 currentRule = currentRule !== null && currentRule !== void 0 ? currentRule : {};
                 Object.keys(rules).map(item => {
                     if (!currentRule[item]) {
                         currentRule[item] = rules[item];
                     }
                 });
-                __1.saveClassMetadata(__1.RULES_KEY, currentRule, args[0]);
+                (0, __1.saveClassMetadata)(__1.RULES_KEY, currentRule, args[0]);
             }
         }
     };

package/dist/annotation/schedule.js

@@ -5,9 +5,9 @@ const __1 = require("../");
 const objectDef_1 = require("./objectDef");
 function Schedule(scheduleOpts) {
     return function (target) {
-        __1.saveModule(__1.SCHEDULE_KEY, target);
-        __1.saveClassMetadata(__1.SCHEDULE_KEY, scheduleOpts, target);
-        objectDef_1.Scope(__1.ScopeEnum.Request)(target);
+        (0, __1.saveModule)(__1.SCHEDULE_KEY, target);
+        (0, __1.saveClassMetadata)(__1.SCHEDULE_KEY, scheduleOpts, target);
+        (0, objectDef_1.Scope)(__1.ScopeEnum.Request)(target);
     };
 }
 exports.Schedule = Schedule;

package/dist/annotation/task.js

@@ -5,8 +5,8 @@ const __1 = require("../");
 const constant_1 = require("../constant");
 function Task(options) {
     return function (target, propertyKey, descriptor) {
-        __1.saveModule(constant_1.MODULE_TASK_KEY, target.constructor);
-        __1.attachClassMetadata(constant_1.MODULE_TASK_METADATA, {
+        (0, __1.saveModule)(constant_1.MODULE_TASK_KEY, target.constructor);
+        (0, __1.attachClassMetadata)(constant_1.MODULE_TASK_METADATA, {
             options,
             propertyKey,
             value: descriptor.value,

package/dist/annotation/taskLocal.js

@@ -5,8 +5,8 @@ const __1 = require("../");
 const constant_1 = require("../constant");
 function TaskLocal(options) {
     return function (target, propertyKey, descriptor) {
-        __1.saveModule(constant_1.MODULE_TASK_TASK_LOCAL_KEY, target.constructor);
-        __1.attachClassMetadata(constant_1.MODULE_TASK_TASK_LOCAL_OPTIONS, {
+        (0, __1.saveModule)(constant_1.MODULE_TASK_TASK_LOCAL_KEY, target.constructor);
+        (0, __1.attachClassMetadata)(constant_1.MODULE_TASK_TASK_LOCAL_OPTIONS, {
             options,
             propertyKey,
             value: descriptor.value,

package/dist/annotation/validate.d.ts

@@ -1,2 +1,8 @@
-export declare function Validate(isTransform?: boolean): (target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) => void;
+interface ValidateOptions {
+    isTransform?: boolean;
+    errorStatus?: number;
+}
+export declare function CustomValidate(opt: ValidateOptions): (customOpt?: ValidateOptions) => (target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) => void;
+export declare function Validate(opt?: boolean | ValidateOptions): (target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) => void;
+export {};
 //# sourceMappingURL=validate.d.ts.map

package/dist/annotation/validate.js

@@ -1,29 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Validate = void 0;
+exports.Validate = exports.CustomValidate = void 0;
 const __1 = require("..");
 const class_transformer_1 = require("class-transformer");
-const Joi = require("joi");
-function Validate(isTransform = true) {
+const joi = require("joi");
+function CustomValidate(opt) {
+    return (customOpt = {}) => Validate({ ...opt, ...customOpt });
+}
+exports.CustomValidate = CustomValidate;
+function Validate(opt = true) {
     return function (target, propertyKey, descriptor) {
         const origin = descriptor.value;
-        const paramTypes = __1.getMethodParamTypes(target, propertyKey);
+        const paramTypes = (0, __1.getMethodParamTypes)(target, propertyKey);
+        const options = typeof opt === 'boolean' ? { isTransform: opt } : opt;
+        if (!('isTransform' in options)) {
+            options.isTransform = true;
+        }
         descriptor.value = function (...args) {
             for (let i = 0; i < paramTypes.length; i++) {
                 const item = paramTypes[i];
-                const rules = __1.getClassMetadata(__1.RULES_KEY, item);
+                const rules = (0, __1.getClassExtendedMetadata)(__1.RULES_KEY, item);
                 if (rules) {
-                    const schema = Joi.object(rules);
+                    const schema = joi.object(rules);
                     const result = schema.validate(args[i]);
                     if (result.error) {
+                        if (options.errorStatus) {
+                            result.error.status =
+                                options.errorStatus;
+                        }
                         throw result.error;
                     }
                     else {
                         args[i] = result.value;
                     }
                     // passed
-                    if (isTransform) {
-                        args[i] = class_transformer_1.plainToClass(item, args[i]);
+                    if (options.isTransform) {
+                        args[i] = (0, class_transformer_1.plainToClass)(item, args[i]);
                     }
                 }
             }

package/dist/common/decoratorManager.d.ts

@@ -21,6 +21,7 @@ export declare class DecoratorManager extends Map {
     static getDecoratorClassKey(decoratorNameKey: DecoratorKey): string;
     static removeDecoratorClassKeySuffix(decoratorNameKey: DecoratorKey): string;
     static getDecoratorMethodKey(decoratorNameKey: DecoratorKey): string;
+    static getDecoratorClsExtendedKey(decoratorNameKey: DecoratorKey): string;
     static getDecoratorClsMethodPrefix(decoratorNameKey: DecoratorKey): string;
     static getDecoratorClsMethodKey(decoratorNameKey: DecoratorKey, methodKey: DecoratorKey): string;
     static getDecoratorMethod(decoratorNameKey: DecoratorKey, methodKey: DecoratorKey): string;
@@ -97,6 +98,12 @@ export declare function saveClassMetadata(decoratorNameKey: DecoratorKey, data:
  * @param groupBy
  */
 export declare function attachClassMetadata(decoratorNameKey: DecoratorKey, data: any, target: any, groupBy?: string): void;
+/**
+ * get data from class assign
+ * @param decoratorNameKey
+ * @param target
+ */
+export declare function getClassExtendedMetadata(decoratorNameKey: DecoratorKey, target: any): any;
 /**
  * get data from class
  * @param decoratorNameKey
@@ -314,5 +321,6 @@ export declare function saveProviderId(identifier: ObjectIdentifier, target: any
  * @param target class
  */
 export declare function isProvide(target: any): boolean;
+export declare function getProviderUUId(module: any): string;
 export {};
 //# sourceMappingURL=decoratorManager.d.ts.map

package/dist/common/decoratorManager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isProvide = exports.saveProviderId = exports.getObjectDefProps = exports.saveObjectDefProps = exports.getPropertyInject = exports.savePropertyInject = exports.getConstructorInject = exports.saveConstructorInject = exports.attachConstructorDataOnClass = exports.getMethodReturnTypes = exports.getPropertyType = exports.getMethodParamTypes = exports.getObjectDefinition = exports.generateProvideId = exports.getProviderId = exports.clearAllModule = exports.resetModule = exports.listModule = exports.saveModule = exports.listPreloadModule = exports.savePreloadModule = exports.getPropertyMetadata = exports.attachPropertyMetadata = exports.savePropertyMetadata = exports.listPropertyDataFromClass = exports.getPropertyDataFromClass = exports.attachPropertyDataToClass = exports.savePropertyDataToClass = exports.getMethodMetadata = exports.attachMethodMetadata = exports.saveMethodMetadata = exports.listMethodDataFromClass = exports.getMethodDataFromClass = exports.attachMethodDataToClass = exports.saveMethodDataToClass = exports.throwErrorForTest = exports.getClassMetadata = exports.attachClassMetadata = exports.saveClassMetadata = exports.DecoratorManager = exports.INJECT_CLASS_KEY_PREFIX = exports.PRELOAD_MODULE_KEY = void 0;
+exports.getProviderUUId = exports.isProvide = exports.saveProviderId = exports.getObjectDefProps = exports.saveObjectDefProps = exports.getPropertyInject = exports.savePropertyInject = exports.getConstructorInject = exports.saveConstructorInject = exports.attachConstructorDataOnClass = exports.getMethodReturnTypes = exports.getPropertyType = exports.getMethodParamTypes = exports.getObjectDefinition = exports.generateProvideId = exports.getProviderId = exports.clearAllModule = exports.resetModule = exports.listModule = exports.saveModule = exports.listPreloadModule = exports.savePreloadModule = exports.getPropertyMetadata = exports.attachPropertyMetadata = exports.savePropertyMetadata = exports.listPropertyDataFromClass = exports.getPropertyDataFromClass = exports.attachPropertyDataToClass = exports.savePropertyDataToClass = exports.getMethodMetadata = exports.attachMethodMetadata = exports.saveMethodMetadata = exports.listMethodDataFromClass = exports.getMethodDataFromClass = exports.attachMethodDataToClass = exports.saveMethodDataToClass = exports.throwErrorForTest = exports.getClassMetadata = exports.getClassExtendedMetadata = exports.attachClassMetadata = exports.saveClassMetadata = exports.DecoratorManager = exports.INJECT_CLASS_KEY_PREFIX = exports.PRELOAD_MODULE_KEY = void 0;
 require("reflect-metadata");
 const constant_1 = require("../constant");
 const errMsg_1 = require("./errMsg");
@@ -43,6 +43,9 @@ class DecoratorManager extends Map {
     static getDecoratorMethodKey(decoratorNameKey) {
         return decoratorNameKey.toString() + '_METHOD';
     }
+    static getDecoratorClsExtendedKey(decoratorNameKey) {
+        return decoratorNameKey.toString() + '_EXT';
+    }
     static getDecoratorClsMethodPrefix(decoratorNameKey) {
         return decoratorNameKey.toString() + '_CLS_METHOD';
     }
@@ -253,6 +256,41 @@ function attachClassMetadata(decoratorNameKey, data, target, groupBy) {
 }
 exports.attachClassMetadata = attachClassMetadata;
 const testKeyMap = new Map();
+/**
+ * get data from class assign
+ * @param decoratorNameKey
+ * @param target
+ */
+function getClassExtendedMetadata(decoratorNameKey, target) {
+    const extKey = DecoratorManager.getDecoratorClsExtendedKey(decoratorNameKey);
+    let metadata = manager.getMetadata(extKey, target);
+    if (metadata !== undefined) {
+        return metadata;
+    }
+    const father = Reflect.getPrototypeOf(target);
+    if (father.constructor !== Object) {
+        metadata = mergeMeta(getClassExtendedMetadata(decoratorNameKey, father), manager.getMetadata(decoratorNameKey, target));
+    }
+    manager.saveMetadata(extKey, metadata || null, target);
+    return metadata;
+}
+exports.getClassExtendedMetadata = getClassExtendedMetadata;
+function mergeMeta(target, src) {
+    if (!target) {
+        target = src;
+        src = null;
+    }
+    if (!target) {
+        return null;
+    }
+    if (Array.isArray(target)) {
+        return target.concat(src || []);
+    }
+    if (typeof target === 'object') {
+        return Object.assign({}, target, src);
+    }
+    throw new Error('can not merge meta that type of ' + typeof target);
+}
 /**
  * get data from class
  * @param decoratorNameKey
@@ -496,7 +534,7 @@ function getProviderId(module) {
         providerId = metaData.id;
     }
     else {
-        providerId = util_1.classNamed(module.name);
+        providerId = (0, util_1.classNamed)(module.name);
     }
     const meta = getClassMetadata(constant_1.PRIVATE_META_DATA_KEY, module);
     if (providerId && meta) {
@@ -535,7 +573,7 @@ function getObjectDefinition(module) {
 }
 exports.getObjectDefinition = getObjectDefinition;
 function transformTypeFromTSDesign(designFn) {
-    if (util_1.isNullOrUndefined(designFn)) {
+    if ((0, util_1.isNullOrUndefined)(designFn)) {
         return { name: 'undefined', isBaseType: true, originDesign: designFn };
     }
     switch (designFn.name) {
@@ -607,7 +645,7 @@ function _tagParameterOrProperty(metadataKey, annotationTarget, propertyName, me
 }
 function attachConstructorDataOnClass(identifier, clz, type, index) {
     if (!identifier) {
-        const args = util_1.getParamNames(clz);
+        const args = (0, util_1.getParamNames)(clz);
         if (clz.length === args.length && index < clz.length) {
             identifier = args[index];
         }
@@ -631,13 +669,13 @@ exports.attachConstructorDataOnClass = attachConstructorDataOnClass;
 function saveConstructorInject(opts) {
     let identifier = opts.identifier;
     if (!identifier) {
-        const args = util_1.getParamNames(opts.target);
+        const args = (0, util_1.getParamNames)(opts.target);
         if (opts.target.length === args.length && opts.index < opts.target.length) {
             identifier = args[opts.index];
         }
     }
     else if (identifier.includes('@') && !identifier.includes(':')) {
-        const args = util_1.getParamNames(opts.target);
+        const args = (0, util_1.getParamNames)(opts.target);
         if (opts.target.length === args.length && opts.index < opts.target.length) {
             identifier = `${identifier}:${args[opts.index]}`;
         }
@@ -656,13 +694,15 @@ exports.getConstructorInject = getConstructorInject;
  * @param opts 参数
  */
 function savePropertyInject(opts) {
+    var _a;
     let identifier = opts.identifier;
     if (!identifier) {
         const type = getPropertyType(opts.target, opts.targetKey);
         if (!type.isBaseType &&
-            util_1.isClass(type.originDesign) &&
+            (0, util_1.isClass)(type.originDesign) &&
             isProvide(type.originDesign)) {
-            identifier = getProviderId(type.originDesign);
+            identifier =
+                (_a = getProviderUUId(type.originDesign)) !== null && _a !== void 0 ? _a : getProviderId(type.originDesign);
         }
         if (!identifier) {
             identifier = opts.targetKey;
@@ -711,11 +751,13 @@ function saveProviderId(identifier, target, override) {
         throw new Error(errMsg_1.DUPLICATED_INJECTABLE_DECORATOR);
     }
     if (!identifier) {
-        identifier = util_1.classNamed(target.name);
+        identifier = (0, util_1.classNamed)(target.name);
     }
+    const uuid = (0, util_1.generateRandomId)();
     Reflect.defineMetadata(constant_1.TAGGED_CLS, {
         id: identifier,
         originName: target.name,
+        uuid,
     }, target);
     if (!Reflect.hasMetadata(constant_1.OBJ_DEF_CLS, target)) {
         Reflect.defineMetadata(constant_1.OBJ_DEF_CLS, {}, target);
@@ -731,4 +773,11 @@ function isProvide(target) {
     return Reflect.hasOwnMetadata(constant_1.TAGGED_CLS, target);
 }
 exports.isProvide = isProvide;
+function getProviderUUId(module) {
+    const metaData = Reflect.getMetadata(constant_1.TAGGED_CLS, module);
+    if (metaData && metaData.uuid) {
+        return metaData.uuid;
+    }
+}
+exports.getProviderUUId = getProviderUUId;
 //# sourceMappingURL=decoratorManager.js.map

package/dist/faas/fun.js

@@ -13,15 +13,15 @@ function Func(funHandler, functionOptions) {
         // If target is function, @Func annotate class
         if (typeof target === 'function') {
             // save target
-            __1.saveModule(__1.FUNC_KEY, target);
-            __1.attachClassMetadata(__1.FUNC_KEY, Object.assign({ funHandler }, functionOptions), target);
+            (0, __1.saveModule)(__1.FUNC_KEY, target);
+            (0, __1.attachClassMetadata)(__1.FUNC_KEY, Object.assign({ funHandler }, functionOptions), target);
             // register data
-            annotation_1.Scope(__1.ScopeEnum.Request)(target);
+            (0, annotation_1.Scope)(__1.ScopeEnum.Request)(target);
         }
         else {
             // If target is instance, @Func annotate class member method
-            __1.saveModule(__1.FUNC_KEY, target.constructor);
-            __1.attachClassMetadata(__1.FUNC_KEY, Object.assign({
+            (0, __1.saveModule)(__1.FUNC_KEY, target.constructor);
+            (0, __1.attachClassMetadata)(__1.FUNC_KEY, Object.assign({
                 funHandler,
                 key,
                 descriptor,
@@ -32,7 +32,7 @@ function Func(funHandler, functionOptions) {
 exports.Func = Func;
 function ServerlessFunction(options) {
     return (target, key, descriptor) => {
-        __1.savePropertyMetadata(__1.SERVERLESS_FUNC_KEY, options, target, key);
+        (0, __1.savePropertyMetadata)(__1.SERVERLESS_FUNC_KEY, options, target, key);
     };
 }
 exports.ServerlessFunction = ServerlessFunction;
@@ -44,13 +44,13 @@ function ServerlessTrigger(type, metadata = {}) {
             metadata['method'] = (_a = metadata['method']) !== null && _a !== void 0 ? _a : 'get';
         }
         metadata['functionName'] =
-            (_b = metadata['functionName']) !== null && _b !== void 0 ? _b : __1.getProviderId(target.constructor).replace(/[:#]/g, '-') +
+            (_b = metadata['functionName']) !== null && _b !== void 0 ? _b : (0, __1.getProviderId)(target.constructor).replace(/[:#]/g, '-') +
                 '-' +
                 functionName;
-        __1.saveModule(__1.FUNC_KEY, target.constructor);
+        (0, __1.saveModule)(__1.FUNC_KEY, target.constructor);
         // new method decorator
         metadata = metadata || {};
-        __1.attachClassMetadata(__1.FUNC_KEY, {
+        (0, __1.attachClassMetadata)(__1.FUNC_KEY, {
             type,
             methodName: functionName,
             functionName: metadata.functionName,

package/dist/faas/handler.js

@@ -9,8 +9,8 @@ function Handler(funHandler, functionOptions) {
     }
     return (target, propertyKey, descriptor) => {
         // If target is instance, @Func annotate class member method
-        __1.saveModule(__1.FUNC_KEY, target.constructor);
-        __1.attachClassMetadata(__1.FUNC_KEY, Object.assign({
+        (0, __1.saveModule)(__1.FUNC_KEY, target.constructor);
+        (0, __1.attachClassMetadata)(__1.FUNC_KEY, Object.assign({
             funHandler,
             key: propertyKey,
             descriptor,

package/dist/framework/app.js

@@ -5,10 +5,10 @@ const __1 = require("../");
 function App(type) {
     return function (target, targetKey, index) {
         if (typeof index === 'number') {
-            __1.attachConstructorDataOnClass(targetKey, target, __1.APPLICATION_KEY, index);
+            (0, __1.attachConstructorDataOnClass)(targetKey, target, __1.APPLICATION_KEY, index);
         }
         else {
-            __1.attachClassMetadata(__1.APPLICATION_KEY, {
+            (0, __1.attachClassMetadata)(__1.APPLICATION_KEY, {
                 key: __1.APPLICATION_KEY,
                 propertyName: targetKey,
                 meta: {

package/dist/framework/config.js

@@ -5,7 +5,7 @@ const __1 = require("../");
 function Config(identifier) {
     return function (target, targetKey, index) {
         if (typeof index === 'number') {
-            __1.attachConstructorDataOnClass(identifier, target, __1.CONFIG_KEY, index);
+            (0, __1.attachConstructorDataOnClass)(identifier, target, __1.CONFIG_KEY, index);
         }
         else {
             if (!identifier) {
@@ -14,7 +14,7 @@ function Config(identifier) {
             if (identifier === __1.ALL) {
                 identifier = '';
             }
-            __1.attachClassMetadata(__1.CONFIG_KEY, {
+            (0, __1.attachClassMetadata)(__1.CONFIG_KEY, {
                 key: identifier,
                 propertyName: targetKey,
             }, target);

package/dist/framework/logger.js

@@ -5,13 +5,13 @@ const __1 = require("../");
 function Logger(identifier) {
     return function (target, targetKey, index) {
         if (typeof index === 'number') {
-            __1.attachConstructorDataOnClass(identifier, target, __1.LOGGER_KEY, index);
+            (0, __1.attachConstructorDataOnClass)(identifier, target, __1.LOGGER_KEY, index);
         }
         else {
             if (!identifier) {
                 identifier = targetKey;
             }
-            __1.attachClassMetadata(__1.LOGGER_KEY, {
+            (0, __1.attachClassMetadata)(__1.LOGGER_KEY, {
                 key: identifier,
                 propertyName: targetKey,
             }, target);

package/dist/framework/plugin.js

@@ -5,13 +5,13 @@ const __1 = require("../");
 function Plugin(identifier) {
     return function (target, targetKey, index) {
         if (typeof index === 'number') {
-            __1.attachConstructorDataOnClass(identifier, target, __1.PLUGIN_KEY, index);
+            (0, __1.attachConstructorDataOnClass)(identifier, target, __1.PLUGIN_KEY, index);
         }
         else {
             if (!identifier) {
                 identifier = targetKey;
             }
-            __1.attachClassMetadata(__1.PLUGIN_KEY, {
+            (0, __1.attachClassMetadata)(__1.PLUGIN_KEY, {
                 key: identifier,
                 propertyName: targetKey,
             }, target);

package/dist/index.d.ts

@@ -22,4 +22,5 @@ export * from './microservice/provider';
 export * from './microservice/consumer';
 export * from './microservice/rabbitmqListener';
 export * from './util/index';
+export * from './util/dtoHelper';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -34,4 +34,5 @@ __exportStar(require("./microservice/provider"), exports);
 __exportStar(require("./microservice/consumer"), exports);
 __exportStar(require("./microservice/rabbitmqListener"), exports);
 __exportStar(require("./util/index"), exports);
+__exportStar(require("./util/dtoHelper"), exports);
 //# sourceMappingURL=index.js.map

package/dist/microservice/consumer.js

@@ -5,12 +5,12 @@ const __1 = require("../");
 const annotation_1 = require("../annotation");
 function Consumer(type, options = {}) {
     return (target) => {
-        __1.saveModule(__1.MS_CONSUMER_KEY, target);
-        __1.saveClassMetadata(__1.MS_CONSUMER_KEY, {
+        (0, __1.saveModule)(__1.MS_CONSUMER_KEY, target);
+        (0, __1.saveClassMetadata)(__1.MS_CONSUMER_KEY, {
             type,
             metadata: options,
         }, target);
-        annotation_1.Scope(__1.ScopeEnum.Request)(target);
+        (0, annotation_1.Scope)(__1.ScopeEnum.Request)(target);
     };
 }
 exports.Consumer = Consumer;

package/dist/microservice/provider.js

@@ -5,12 +5,12 @@ const __1 = require("../");
 const annotation_1 = require("../annotation");
 function Provider(type, metadata = {}) {
     return (target) => {
-        __1.saveModule(__1.MS_PROVIDER_KEY, target);
-        __1.saveClassMetadata(__1.MS_PROVIDER_KEY, {
+        (0, __1.saveModule)(__1.MS_PROVIDER_KEY, target);
+        (0, __1.saveClassMetadata)(__1.MS_PROVIDER_KEY, {
             type,
             metadata,
         }, target);
-        annotation_1.Scope(__1.ScopeEnum.Request)(target);
+        (0, annotation_1.Scope)(__1.ScopeEnum.Request)(target);
     };
 }
 exports.Provider = Provider;
@@ -26,7 +26,7 @@ function GrpcMethod(methodOptions = {}) {
         if (!methodOptions.type) {
             methodOptions.type = GrpcStreamTypeEnum.BASE;
         }
-        __1.savePropertyMetadata(__1.MS_GRPC_METHOD_KEY, {
+        (0, __1.savePropertyMetadata)(__1.MS_GRPC_METHOD_KEY, {
             methodName: methodOptions.methodName || propertyName,
             type: methodOptions.type,
             onEnd: methodOptions.onEnd,
@@ -37,7 +37,7 @@ function GrpcMethod(methodOptions = {}) {
 exports.GrpcMethod = GrpcMethod;
 function DubboMethod(methodName) {
     return (target, propertyName, descriptor) => {
-        __1.attachClassMetadata(__1.MS_DUBBO_METHOD_KEY, {
+        (0, __1.attachClassMetadata)(__1.MS_DUBBO_METHOD_KEY, {
             methodName: methodName || propertyName,
         }, target);
         return descriptor;
@@ -46,7 +46,7 @@ function DubboMethod(methodName) {
 exports.DubboMethod = DubboMethod;
 function HSFMethod(methodName) {
     return (target, propertyName, descriptor) => {
-        __1.attachClassMetadata(__1.MS_HSF_METHOD_KEY, {
+        (0, __1.attachClassMetadata)(__1.MS_HSF_METHOD_KEY, {
             methodName: methodName || propertyName,
         }, target);
         return descriptor;

package/dist/microservice/rabbitmqListener.js

@@ -6,7 +6,7 @@ function RabbitMQListener(queueName, options = {}) {
     return (target, propertyKey) => {
         options.queueName = queueName;
         options.propertyKey = propertyKey;
-        __1.attachPropertyDataToClass(__1.MS_CONSUMER_KEY, options, target, propertyKey);
+        (0, __1.attachPropertyDataToClass)(__1.MS_CONSUMER_KEY, options, target, propertyKey);
     };
 }
 exports.RabbitMQListener = RabbitMQListener;

package/dist/rpc/hsf.js

@@ -9,9 +9,9 @@ const annotation_1 = require("../annotation");
  */
 function HSF(hsfOption = {}) {
     return (target) => {
-        __1.saveModule(__1.HSF_KEY, target);
-        __1.saveClassMetadata(__1.HSF_KEY, hsfOption, target);
-        annotation_1.Scope(__1.ScopeEnum.Request)(target);
+        (0, __1.saveModule)(__1.HSF_KEY, target);
+        (0, __1.saveClassMetadata)(__1.HSF_KEY, hsfOption, target);
+        (0, annotation_1.Scope)(__1.ScopeEnum.Request)(target);
     };
 }
 exports.HSF = HSF;

package/dist/util/dtoHelper.d.ts

@@ -0,0 +1,6 @@
+export interface Dto<T> extends Function {
+    new (): T;
+}
+export declare function PickDto<T, K extends keyof T>(dto: Dto<T>, keys: K[]): Dto<Pick<T, typeof keys[number]>>;
+export declare function OmitDto<T, K extends keyof T>(dto: Dto<T>, keys: K[]): Dto<Omit<T, typeof keys[number]>>;
+//# sourceMappingURL=dtoHelper.d.ts.map

package/dist/util/dtoHelper.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OmitDto = exports.PickDto = void 0;
+const decoratorManager_1 = require("../common/decoratorManager");
+const constant_1 = require("../constant");
+function PickDto(dto, keys) {
+    const pickedDto = function () { };
+    pickedDto.prototype = dto.prototype;
+    const fatherRule = (0, decoratorManager_1.getClassExtendedMetadata)(constant_1.RULES_KEY, dto);
+    const pickedRule = {};
+    for (const key of keys) {
+        if (fatherRule[key]) {
+            pickedRule[key] = fatherRule[key];
+        }
+    }
+    (0, decoratorManager_1.saveClassMetadata)(constant_1.RULES_KEY, pickedRule, pickedDto);
+    return pickedDto;
+}
+exports.PickDto = PickDto;
+function OmitDto(dto, keys) {
+    const pickedDto = function () { };
+    pickedDto.prototype = dto.prototype;
+    const fatherRule = (0, decoratorManager_1.getClassExtendedMetadata)(constant_1.RULES_KEY, dto);
+    const pickedRule = Object.assign({}, fatherRule);
+    for (const key of keys) {
+        delete pickedRule[key];
+    }
+    (0, decoratorManager_1.saveClassMetadata)(constant_1.RULES_KEY, pickedRule, pickedDto);
+    return pickedDto;
+}
+exports.OmitDto = OmitDto;
+//# sourceMappingURL=dtoHelper.js.map

package/dist/util/index.d.ts

@@ -23,4 +23,8 @@ export declare function getParamNames(func: any): string[];
  * @param name 类名称
  */
 export declare function classNamed(name: string): string;
+/**
+ * generate a lightweight random id, enough for ioc container
+ */
+export declare function generateRandomId(): string;
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.classNamed = exports.getParamNames = exports.sleep = exports.isNullOrUndefined = exports.isNull = exports.isUndefined = exports.isRegExp = exports.isSet = exports.isMap = exports.isProxy = exports.isNumber = exports.isObject = exports.isFunction = exports.isPromise = exports.isGeneratorFunction = exports.isAsyncFunction = exports.isClass = void 0;
+exports.generateRandomId = exports.classNamed = exports.getParamNames = exports.sleep = exports.isNullOrUndefined = exports.isNull = exports.isUndefined = exports.isRegExp = exports.isSet = exports.isMap = exports.isProxy = exports.isNumber = exports.isObject = exports.isFunction = exports.isPromise = exports.isGeneratorFunction = exports.isAsyncFunction = exports.isClass = void 0;
 const util = require("util");
 const camelcase = require("camelcase");
+const crypto = require("crypto");
 const ToString = Function.prototype.toString;
 function fnBody(fn) {
     return ToString.call(fn)
@@ -109,4 +110,12 @@ function classNamed(name) {
     return camelcase(name);
 }
 exports.classNamed = classNamed;
+/**
+ * generate a lightweight random id, enough for ioc container
+ */
+function generateRandomId() {
+    // => f9b327e70bbcf42494ccb28b2d98e00e
+    return crypto.randomBytes(16).toString('hex');
+}
+exports.generateRandomId = generateRandomId;
 //# sourceMappingURL=index.js.map

package/dist/web/controller.js

@@ -5,13 +5,13 @@ const annotation_1 = require("../annotation");
 const __1 = require("../");
 function Controller(prefix = '/', routerOptions = { middleware: [], sensitive: true }) {
     return (target) => {
-        __1.saveModule(__1.CONTROLLER_KEY, target);
+        (0, __1.saveModule)(__1.CONTROLLER_KEY, target);
         if (prefix)
-            __1.saveClassMetadata(__1.CONTROLLER_KEY, {
+            (0, __1.saveClassMetadata)(__1.CONTROLLER_KEY, {
                 prefix,
                 routerOptions,
             }, target);
-        annotation_1.Scope(__1.ScopeEnum.Request)(target);
+        (0, annotation_1.Scope)(__1.ScopeEnum.Request)(target);
     };
 }
 exports.Controller = Controller;

package/dist/web/paramMapping.js

@@ -19,9 +19,9 @@ var RouteParamTypes;
 const createParamMapping = function (type) {
     return (propertyData) => (target, propertyName, index) => {
         if (propertyData === undefined) {
-            propertyData = __1.getParamNames(target[propertyName])[index];
+            propertyData = (0, __1.getParamNames)(target[propertyName])[index];
         }
-        __1.attachPropertyDataToClass(__1.WEB_ROUTER_PARAM_KEY, {
+        (0, __1.attachPropertyDataToClass)(__1.WEB_ROUTER_PARAM_KEY, {
             index,
             type,
             propertyData,

package/dist/web/requestMapping.js

@@ -27,7 +27,7 @@ const RequestMapping = (metadata = defaultMetadata) => {
     const routerName = metadata.routerName;
     const middleware = metadata.middleware;
     return (target, key, descriptor) => {
-        __1.attachClassMetadata(__1.WEB_ROUTER_KEY, {
+        (0, __1.attachClassMetadata)(__1.WEB_ROUTER_KEY, {
             path,
             requestMethod,
             routerName,
@@ -41,7 +41,7 @@ const RequestMapping = (metadata = defaultMetadata) => {
 };
 exports.RequestMapping = RequestMapping;
 const createMappingDecorator = (method) => (path, routerOptions = { middleware: [] }) => {
-    return exports.RequestMapping(Object.assign(routerOptions, {
+    return (0, exports.RequestMapping)(Object.assign(routerOptions, {
         requestMethod: method,
         path,
     }));

package/dist/web/response.js

@@ -4,7 +4,7 @@ exports.createRender = exports.ContentType = exports.SetHeader = exports.HttpCod
 const __1 = require("..");
 function Redirect(url, code = 302) {
     return (target, key, descriptor) => {
-        __1.attachPropertyMetadata(__1.WEB_RESPONSE_KEY, {
+        (0, __1.attachPropertyMetadata)(__1.WEB_RESPONSE_KEY, {
             type: __1.WEB_RESPONSE_REDIRECT,
             url,
             code,
@@ -15,7 +15,7 @@ function Redirect(url, code = 302) {
 exports.Redirect = Redirect;
 function HttpCode(code) {
     return (target, key, descriptor) => {
-        __1.attachPropertyMetadata(__1.WEB_RESPONSE_KEY, {
+        (0, __1.attachPropertyMetadata)(__1.WEB_RESPONSE_KEY, {
             type: __1.WEB_RESPONSE_HTTP_CODE,
             code,
         }, target, key);
@@ -32,7 +32,7 @@ function SetHeader(headerKey, value) {
         else {
             headerObject = headerKey;
         }
-        __1.attachPropertyMetadata(__1.WEB_RESPONSE_KEY, {
+        (0, __1.attachPropertyMetadata)(__1.WEB_RESPONSE_KEY, {
             type: __1.WEB_RESPONSE_HEADER,
             setHeaders: headerObject,
         }, target, key);
@@ -42,7 +42,7 @@ function SetHeader(headerKey, value) {
 exports.SetHeader = SetHeader;
 function ContentType(contentType) {
     return (target, key, descriptor) => {
-        __1.attachPropertyMetadata(__1.WEB_RESPONSE_KEY, {
+        (0, __1.attachPropertyMetadata)(__1.WEB_RESPONSE_KEY, {
             type: __1.WEB_RESPONSE_CONTENT_TYPE,
             contentType,
         }, target, key);
@@ -53,7 +53,7 @@ exports.ContentType = ContentType;
 function createRender(RenderEngine) {
     return (templateName) => {
         return (target, key, descriptor) => {
-            __1.attachPropertyMetadata(__1.WEB_RESPONSE_KEY, {
+            (0, __1.attachPropertyMetadata)(__1.WEB_RESPONSE_KEY, {
                 type: __1.WEB_RESPONSE_RENDER,
                 templateName,
             }, target, key);

package/dist/ws/webSocketController.js

@@ -5,12 +5,12 @@ const annotation_1 = require("../annotation");
 const __1 = require("../");
 function WSController(namespace = '/', routerOptions = { middleware: [] }) {
     return (target) => {
-        __1.saveModule(__1.WS_CONTROLLER_KEY, target);
-        __1.saveClassMetadata(__1.WS_CONTROLLER_KEY, {
+        (0, __1.saveModule)(__1.WS_CONTROLLER_KEY, target);
+        (0, __1.saveClassMetadata)(__1.WS_CONTROLLER_KEY, {
             namespace,
             routerOptions,
         }, target);
-        annotation_1.Scope(__1.ScopeEnum.Request)(target);
+        (0, annotation_1.Scope)(__1.ScopeEnum.Request)(target);
     };
 }
 exports.WSController = WSController;

package/dist/ws/webSocketEvent.js

@@ -13,7 +13,7 @@ var WSEventTypeEnum;
 })(WSEventTypeEnum = exports.WSEventTypeEnum || (exports.WSEventTypeEnum = {}));
 function OnWSConnection() {
     return (target, propertyKey, descriptor) => {
-        __1.attachClassMetadata(__1.WS_EVENT_KEY, {
+        (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.ON_CONNECTION,
             propertyName: propertyKey,
             descriptor,
@@ -23,7 +23,7 @@ function OnWSConnection() {
 exports.OnWSConnection = OnWSConnection;
 function OnWSDisConnection() {
     return (target, propertyKey, descriptor) => {
-        __1.attachClassMetadata(__1.WS_EVENT_KEY, {
+        (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.ON_DISCONNECTION,
             propertyName: propertyKey,
             descriptor,
@@ -33,7 +33,7 @@ function OnWSDisConnection() {
 exports.OnWSDisConnection = OnWSDisConnection;
 function OnWSMessage(eventName) {
     return (target, propertyKey, descriptor) => {
-        __1.attachClassMetadata(__1.WS_EVENT_KEY, {
+        (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.ON_MESSAGE,
             messageEventName: eventName,
             propertyName: propertyKey,
@@ -44,7 +44,7 @@ function OnWSMessage(eventName) {
 exports.OnWSMessage = OnWSMessage;
 function WSEmit(messageName, roomName = []) {
     return (target, propertyKey, descriptor) => {
-        __1.attachClassMetadata(__1.WS_EVENT_KEY, {
+        (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.EMIT,
             propertyName: propertyKey,
             messageEventName: messageName,
@@ -56,7 +56,7 @@ function WSEmit(messageName, roomName = []) {
 exports.WSEmit = WSEmit;
 function WSBroadCast(messageName = '', roomName = []) {
     return (target, propertyKey, descriptor) => {
-        __1.attachClassMetadata(__1.WS_EVENT_KEY, {
+        (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.BROADCAST,
             propertyName: propertyKey,
             messageEventName: messageName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/decorator",
-  "version": "2.12.9",
+  "version": "2.14.0",
   "description": "definition decorator for midway project",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f43ea420fd98164a5e06c3fb3f31588203a9897e"
+  "gitHead": "5fd716b0e731162d8e9f0931790fde7402fb83de"
 }