@midwayjs/decorator 3.0.0-alpha.43 → 3.0.0-beta.3

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
+
+**Note:** Version bump only for package @midwayjs/decorator
+
+
+
+
+
+# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16)
+
+
+### Bug Fixes
+
+* middleware decorator missing ([#1366](https://github.com/midwayjs/midway/issues/1366)) ([5f9a8c1](https://github.com/midwayjs/midway/commit/5f9a8c1f7cdd940f785f6c9871fb67b9738de940))
+
+
+
+
+
+# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14)
+
+
+### Features
+
+* merge DTO Helper for [#1250](https://github.com/midwayjs/midway/issues/1250) ([#1288](https://github.com/midwayjs/midway/issues/1288)) ([3f8f937](https://github.com/midwayjs/midway/commit/3f8f93765a66f49940565231d50405a7dbd593c7))
+
+
+
+
+
 ## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09)
 
 

package/dist/constant.d.ts

@@ -1,8 +1,9 @@
 export declare const ALL = "common:all_value_key";
 export declare const SCHEDULE_KEY = "common:schedule";
 export declare const CONFIGURATION_KEY = "common:configuration";
-export declare const RULES_KEY = "common:rules";
+export declare const FRAMEWORK_KEY = "common:framework";
 export declare const ASPECT_KEY = "common:aspect";
+export declare const CATCH_KEY = "common:catch";
 export declare const FUNC_KEY = "faas:func";
 export declare const SERVERLESS_FUNC_KEY = "faas:serverless:function";
 export declare const CONTROLLER_KEY = "web:controller";
@@ -35,10 +36,13 @@ export declare const CONFIG_KEY = "config";
 export declare const PLUGIN_KEY = "plugin";
 export declare const LOGGER_KEY = "logger";
 export declare const APPLICATION_KEY = "__midway_framework_app__";
+export declare const APPLICATION_CONTEXT_KEY = "__midway_application_context__";
 export declare const CLASS_KEY_CONSTRUCTOR = "midway:class_key_constructor";
 export declare const NAMED_TAG = "named";
 export declare const INJECT_TAG = "inject";
-export declare const INJECT_CUSTOM_TAG = "inject_custom_tag";
+export declare const INJECT_CUSTOM_PROPERTY = "inject_custom_property";
+export declare const INJECT_CUSTOM_METHOD = "inject_custom_method";
+export declare const INJECT_CUSTOM_PARAM = "inject_custom_param";
 export declare const TAGGED_CLS = "injection:tagged_class";
 export declare const TAGGED_FUN = "injection:tagged_function";
 export declare const OBJ_DEF_CLS = "injection:object_definition_class";

package/dist/constant.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PRIVATE_META_DATA_KEY = exports.MAIN_MODULE_KEY = exports.LIFECYCLE_IDENTIFIER_PREFIX = exports.PIPELINE_IDENTIFIER = exports.OBJ_DEF_CLS = exports.TAGGED_FUN = exports.TAGGED_CLS = exports.INJECT_CUSTOM_TAG = exports.INJECT_TAG = exports.NAMED_TAG = exports.CLASS_KEY_CONSTRUCTOR = exports.APPLICATION_KEY = exports.LOGGER_KEY = exports.PLUGIN_KEY = exports.CONFIG_KEY = exports.MS_HSF_METHOD_KEY = exports.MS_DUBBO_METHOD_KEY = exports.MS_GRPC_METHOD_KEY = exports.MS_PROVIDER_KEY = exports.MS_PRODUCER_KEY = exports.MS_CONSUMER_KEY = exports.RPC_DUBBO_KEY = exports.RPC_GRPC_KEY = exports.HSF_KEY = exports.WS_EVENT_KEY = exports.WS_CONTROLLER_KEY = exports.MODULE_TASK_QUEUE_OPTIONS = exports.MODULE_TASK_QUEUE_KEY = exports.MODULE_TASK_TASK_LOCAL_OPTIONS = exports.MODULE_TASK_TASK_LOCAL_KEY = exports.MODULE_TASK_METADATA = exports.MODULE_TASK_KEY = exports.WEB_RESPONSE_RENDER = exports.WEB_RESPONSE_CONTENT_TYPE = exports.WEB_RESPONSE_HEADER = exports.WEB_RESPONSE_REDIRECT = exports.WEB_RESPONSE_HTTP_CODE = exports.WEB_RESPONSE_KEY = exports.WEB_ROUTER_PARAM_KEY = exports.WEB_ROUTER_KEY = exports.CONTROLLER_KEY = exports.SERVERLESS_FUNC_KEY = exports.FUNC_KEY = exports.ASPECT_KEY = exports.RULES_KEY = exports.CONFIGURATION_KEY = exports.SCHEDULE_KEY = exports.ALL = void 0;
+exports.LIFECYCLE_IDENTIFIER_PREFIX = exports.PIPELINE_IDENTIFIER = exports.OBJ_DEF_CLS = exports.TAGGED_FUN = exports.TAGGED_CLS = exports.INJECT_CUSTOM_PARAM = exports.INJECT_CUSTOM_METHOD = exports.INJECT_CUSTOM_PROPERTY = exports.INJECT_TAG = exports.NAMED_TAG = exports.CLASS_KEY_CONSTRUCTOR = exports.APPLICATION_CONTEXT_KEY = exports.APPLICATION_KEY = exports.LOGGER_KEY = exports.PLUGIN_KEY = exports.CONFIG_KEY = exports.MS_HSF_METHOD_KEY = exports.MS_DUBBO_METHOD_KEY = exports.MS_GRPC_METHOD_KEY = exports.MS_PROVIDER_KEY = exports.MS_PRODUCER_KEY = exports.MS_CONSUMER_KEY = exports.RPC_DUBBO_KEY = exports.RPC_GRPC_KEY = exports.HSF_KEY = exports.WS_EVENT_KEY = exports.WS_CONTROLLER_KEY = exports.MODULE_TASK_QUEUE_OPTIONS = exports.MODULE_TASK_QUEUE_KEY = exports.MODULE_TASK_TASK_LOCAL_OPTIONS = exports.MODULE_TASK_TASK_LOCAL_KEY = exports.MODULE_TASK_METADATA = exports.MODULE_TASK_KEY = exports.WEB_RESPONSE_RENDER = exports.WEB_RESPONSE_CONTENT_TYPE = exports.WEB_RESPONSE_HEADER = exports.WEB_RESPONSE_REDIRECT = exports.WEB_RESPONSE_HTTP_CODE = exports.WEB_RESPONSE_KEY = exports.WEB_ROUTER_PARAM_KEY = exports.WEB_ROUTER_KEY = exports.CONTROLLER_KEY = exports.SERVERLESS_FUNC_KEY = exports.FUNC_KEY = exports.CATCH_KEY = exports.ASPECT_KEY = exports.FRAMEWORK_KEY = exports.CONFIGURATION_KEY = exports.SCHEDULE_KEY = exports.ALL = void 0;
+exports.PRIVATE_META_DATA_KEY = exports.MAIN_MODULE_KEY = void 0;
 // got all value with no property name
 exports.ALL = 'common:all_value_key';
 // common
 exports.SCHEDULE_KEY = 'common:schedule';
 exports.CONFIGURATION_KEY = 'common:configuration';
-exports.RULES_KEY = 'common:rules';
+exports.FRAMEWORK_KEY = 'common:framework';
 exports.ASPECT_KEY = 'common:aspect';
+exports.CATCH_KEY = 'common:catch';
 // faas
 exports.FUNC_KEY = 'faas:func';
 exports.SERVERLESS_FUNC_KEY = 'faas:serverless:function';
@@ -48,6 +50,7 @@ exports.CONFIG_KEY = 'config';
 exports.PLUGIN_KEY = 'plugin';
 exports.LOGGER_KEY = 'logger';
 exports.APPLICATION_KEY = '__midway_framework_app__';
+exports.APPLICATION_CONTEXT_KEY = '__midway_application_context__';
 ////////////////////////////////////////// inject keys
 // constructor key
 exports.CLASS_KEY_CONSTRUCTOR = 'midway:class_key_constructor';
@@ -55,8 +58,12 @@ exports.CLASS_KEY_CONSTRUCTOR = 'midway:class_key_constructor';
 exports.NAMED_TAG = 'named';
 // The name of the target at design time
 exports.INJECT_TAG = 'inject';
-// The name inject custom decorator with resolver
-exports.INJECT_CUSTOM_TAG = 'inject_custom_tag';
+// The name inject custom property decorator with resolver
+exports.INJECT_CUSTOM_PROPERTY = 'inject_custom_property';
+// The name inject custom param decorator with resolver
+exports.INJECT_CUSTOM_METHOD = 'inject_custom_method';
+// The name inject custom param decorator with resolver
+exports.INJECT_CUSTOM_PARAM = 'inject_custom_param';
 //
 // // used to store constructor arguments tags
 // export const TAGGED = 'injection:tagged';

package/dist/decorator/{aspect.js → common/aspect.js}

@@ -1,20 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Aspect = void 0;
-const __1 = require("..");
+const index_1 = require("../../index");
 const objectDef_1 = require("./objectDef");
 function Aspect(aspectTarget, match, priority) {
     return function (target) {
-        (0, __1.saveModule)(__1.ASPECT_KEY, target);
+        (0, index_1.saveModule)(index_1.ASPECT_KEY, target);
         const aspectTargets = [].concat(aspectTarget);
         for (const aspectTarget of aspectTargets) {
-            (0, __1.attachClassMetadata)(__1.ASPECT_KEY, {
+            (0, index_1.attachClassMetadata)(index_1.ASPECT_KEY, {
                 aspectTarget,
                 match,
                 priority,
             }, target);
         }
-        (0, objectDef_1.Scope)(__1.ScopeEnum.Singleton);
+        (0, objectDef_1.Scope)(index_1.ScopeEnum.Singleton)(target);
+        (0, index_1.Provide)()(target);
     };
 }
 exports.Aspect = Aspect;

package/dist/decorator/{autoload.js → common/autoload.js}

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Autoload = void 0;
-const decoratorManager_1 = require("../decoratorManager");
+const decoratorManager_1 = require("../../decoratorManager");
+const provide_1 = require("./provide");
 function Autoload() {
     return function (target) {
         (0, decoratorManager_1.savePreloadModule)(target);
+        (0, provide_1.Provide)()(target);
     };
 }
 exports.Autoload = Autoload;

package/dist/decorator/common/catch.d.ts

@@ -0,0 +1,2 @@
+export declare function Catch(catchTarget?: any | any[]): (target: any) => void;
+//# sourceMappingURL=catch.d.ts.map

package/dist/decorator/common/catch.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Catch = void 0;
+const decoratorManager_1 = require("../../decoratorManager");
+const constant_1 = require("../../constant");
+const objectDef_1 = require("./objectDef");
+const interface_1 = require("../../interface");
+const provide_1 = require("./provide");
+function Catch(catchTarget) {
+    return function (target) {
+        const catchTargets = [].concat(catchTarget);
+        (0, decoratorManager_1.attachClassMetadata)(constant_1.CATCH_KEY, {
+            catchTargets,
+        }, target);
+        (0, objectDef_1.Scope)(interface_1.ScopeEnum.Singleton)(target);
+        (0, provide_1.Provide)()(target);
+    };
+}
+exports.Catch = Catch;
+//# sourceMappingURL=catch.js.map

package/dist/decorator/{configuration.js → common/configuration.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Configuration = void 0;
-const __1 = require("../");
+const index_1 = require("../../index");
 function Configuration(options = {}) {
     return (target) => {
-        (0, __1.saveClassMetadata)(__1.CONFIGURATION_KEY, options, target);
+        (0, index_1.saveClassMetadata)(index_1.CONFIGURATION_KEY, options, target);
     };
 }
 exports.Configuration = Configuration;

package/dist/decorator/common/framework.d.ts

@@ -0,0 +1,2 @@
+export declare function Framework(): ClassDecorator;
+//# sourceMappingURL=framework.d.ts.map

package/dist/decorator/common/framework.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Framework = void 0;
+const index_1 = require("../../index");
+function Framework() {
+    return (target) => {
+        (0, index_1.saveModule)(index_1.FRAMEWORK_KEY, target);
+        (0, index_1.Scope)(index_1.ScopeEnum.Singleton)(target);
+        (0, index_1.Provide)()(target);
+    };
+}
+exports.Framework = Framework;
+//# sourceMappingURL=framework.js.map

package/dist/decorator/common/index.d.ts

@@ -0,0 +1,11 @@
+export * from './provide';
+export * from './inject';
+export * from './pipeline';
+export * from './aspect';
+export * from './autoload';
+export * from './configuration';
+export * from './objectDef';
+export * from './framework';
+export * from './catch';
+export * from './middleware';
+//# sourceMappingURL=index.d.ts.map

package/dist/decorator/common/index.js

@@ -0,0 +1,23 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./provide"), exports);
+__exportStar(require("./inject"), exports);
+__exportStar(require("./pipeline"), exports);
+__exportStar(require("./aspect"), exports);
+__exportStar(require("./autoload"), exports);
+__exportStar(require("./configuration"), exports);
+__exportStar(require("./objectDef"), exports);
+__exportStar(require("./framework"), exports);
+__exportStar(require("./catch"), exports);
+__exportStar(require("./middleware"), exports);
+//# sourceMappingURL=index.js.map

package/dist/decorator/{inject.d.ts → common/inject.d.ts}

@@ -1,3 +1,3 @@
-import { ObjectIdentifier } from '../interface';
+import { ObjectIdentifier } from '../../interface';
 export declare function Inject(identifier?: ObjectIdentifier): (target: any, targetKey: string) => void;
 //# sourceMappingURL=inject.d.ts.map

package/dist/decorator/{inject.js → common/inject.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Inject = void 0;
-const __1 = require("../");
+const index_1 = require("../../index");
 function Inject(identifier) {
     return function (target, targetKey) {
-        (0, __1.savePropertyInject)({ target, targetKey, identifier });
+        (0, index_1.savePropertyInject)({ target, targetKey, identifier });
     };
 }
 exports.Inject = Inject;

package/dist/decorator/common/middleware.d.ts

@@ -0,0 +1,2 @@
+export declare function Middleware(): ClassDecorator;
+//# sourceMappingURL=middleware.d.ts.map

package/dist/decorator/common/middleware.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Middleware = void 0;
+const index_1 = require("../../index");
+function Middleware() {
+    return (target) => {
+        (0, index_1.Scope)(index_1.ScopeEnum.Singleton)(target);
+        (0, index_1.Provide)()(target);
+    };
+}
+exports.Middleware = Middleware;
+//# sourceMappingURL=middleware.js.map

package/dist/decorator/common/objectDef.d.ts

@@ -0,0 +1,5 @@
+import { ScopeEnum } from '../../index';
+export declare function Init(): MethodDecorator;
+export declare function Destroy(): MethodDecorator;
+export declare function Scope(scope: ScopeEnum): ClassDecorator;
+//# sourceMappingURL=objectDef.d.ts.map

package/dist/decorator/{objectDef.js → common/objectDef.js}

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Scope = exports.Destroy = exports.Init = void 0;
-const __1 = require("../");
+const index_1 = require("../../index");
 function Init() {
     return function (target, propertyKey) {
-        return (0, __1.saveObjectDefinition)(target, { initMethod: propertyKey });
+        (0, index_1.saveObjectDefinition)(target, { initMethod: propertyKey });
     };
 }
 exports.Init = Init;
 function Destroy() {
     return function (target, propertyKey) {
-        return (0, __1.saveObjectDefinition)(target, {
+        (0, index_1.saveObjectDefinition)(target, {
             destroyMethod: propertyKey,
         });
     };
 }
 exports.Destroy = Destroy;
-function Scope(scope = __1.ScopeEnum.Singleton) {
+function Scope(scope) {
     return function (target) {
-        return (0, __1.saveObjectDefinition)(target, { scope });
+        (0, index_1.saveObjectDefinition)(target, { scope });
     };
 }
 exports.Scope = Scope;

package/dist/decorator/common/pipeline.d.ts

@@ -0,0 +1,3 @@
+import { ObjectIdentifier } from '../../interface';
+export declare function Pipeline(valves?: Array<ObjectIdentifier | (new (...args: any[]) => any)>): PropertyDecorator;
+//# sourceMappingURL=pipeline.d.ts.map

package/dist/decorator/common/pipeline.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Pipeline = void 0;
+const index_1 = require("../../index");
+function Pipeline(valves) {
+    return (0, index_1.createCustomPropertyDecorator)(index_1.PIPELINE_IDENTIFIER, {
+        valves,
+    });
+}
+exports.Pipeline = Pipeline;
+//# sourceMappingURL=pipeline.js.map

package/dist/decorator/common/provide.d.ts

@@ -0,0 +1,3 @@
+import { ObjectIdentifier } from '../../interface';
+export declare function Provide(identifier?: ObjectIdentifier): (target: any) => any;
+//# sourceMappingURL=provide.d.ts.map

package/dist/decorator/{provide.js → common/provide.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Provide = void 0;
-const __1 = require("../");
+const index_1 = require("../../index");
 function Provide(identifier) {
     return function (target) {
-        return (0, __1.saveProviderId)(identifier, target);
+        return (0, index_1.saveProviderId)(identifier, target);
     };
 }
 exports.Provide = Provide;

package/dist/decorator/framework/index.d.ts

@@ -0,0 +1,7 @@
+import { FrameworkType } from '../../';
+export declare function Plugin(identifier?: string): PropertyDecorator;
+export declare function Config(identifier?: string): PropertyDecorator;
+export declare function App(type?: FrameworkType): PropertyDecorator;
+export declare function Logger(identifier?: string): PropertyDecorator;
+export declare function ApplicationContext(): PropertyDecorator;
+//# sourceMappingURL=index.d.ts.map

package/dist/decorator/framework/index.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApplicationContext = exports.Logger = exports.App = exports.Config = exports.Plugin = void 0;
+const __1 = require("../../");
+function Plugin(identifier) {
+    return (0, __1.createCustomPropertyDecorator)(__1.PLUGIN_KEY, {
+        identifier,
+    });
+}
+exports.Plugin = Plugin;
+function Config(identifier) {
+    return (0, __1.createCustomPropertyDecorator)(__1.CONFIG_KEY, {
+        identifier,
+    });
+}
+exports.Config = Config;
+function App(type) {
+    return (0, __1.createCustomPropertyDecorator)(__1.APPLICATION_KEY, {
+        type,
+    });
+}
+exports.App = App;
+function Logger(identifier) {
+    return (0, __1.createCustomPropertyDecorator)(__1.LOGGER_KEY, {
+        identifier,
+    });
+}
+exports.Logger = Logger;
+function ApplicationContext() {
+    return (0, __1.createCustomPropertyDecorator)(__1.APPLICATION_CONTEXT_KEY, {});
+}
+exports.ApplicationContext = ApplicationContext;
+//# sourceMappingURL=index.js.map

package/dist/decorator/framework/schedule.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Schedule = void 0;
 const __1 = require("../../");
-const objectDef_1 = require("../objectDef");
+const objectDef_1 = require("../common/objectDef");
 function Schedule(scheduleOpts) {
     return function (target) {
         (0, __1.saveModule)(__1.SCHEDULE_KEY, target);
         (0, __1.saveClassMetadata)(__1.SCHEDULE_KEY, scheduleOpts, target);
         (0, objectDef_1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Provide)()(target);
     };
 }
 exports.Schedule = Schedule;

package/dist/decorator/index.d.ts

@@ -1,15 +1,6 @@
-export * from './provide';
-export * from './inject';
-export * from './pipeline';
-export * from './aspect';
-export * from './autoload';
-export * from './configuration';
-export * from './objectDef';
+export * from './common/index';
 export * from './faas/serverlessTrigger';
-export * from './framework/app';
-export * from './framework/config';
-export * from './framework/logger';
-export * from './framework/plugin';
+export * from './framework/index';
 export * from './framework/schedule';
 export * from './microservice/consumer';
 export * from './microservice/provider';

package/dist/decorator/index.js

@@ -11,22 +11,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // common
-__exportStar(require("./provide"), exports);
-__exportStar(require("./inject"), exports);
-__exportStar(require("./pipeline"), exports);
-__exportStar(require("./aspect"), exports);
-__exportStar(require("./autoload"), exports);
-__exportStar(require("./configuration"), exports);
-__exportStar(require("./objectDef"), exports);
-// export * from './validate';
-// export * from './rule';
+__exportStar(require("./common/index"), exports);
 // faas
 __exportStar(require("./faas/serverlessTrigger"), exports);
 // framework
-__exportStar(require("./framework/app"), exports);
-__exportStar(require("./framework/config"), exports);
-__exportStar(require("./framework/logger"), exports);
-__exportStar(require("./framework/plugin"), exports);
+__exportStar(require("./framework/index"), exports);
 __exportStar(require("./framework/schedule"), exports);
 // microservice
 __exportStar(require("./microservice/consumer"), exports);

package/dist/decorator/microservice/consumer.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Consumer = void 0;
 const __1 = require("../../");
-const objectDef_1 = require("../objectDef");
+const objectDef_1 = require("../common/objectDef");
 function Consumer(type, options = {}) {
     return (target) => {
         (0, __1.saveModule)(__1.MS_CONSUMER_KEY, target);

package/dist/decorator/microservice/provider.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HSFMethod = exports.DubboMethod = exports.GrpcMethod = exports.GrpcStreamTypeEnum = exports.Provider = void 0;
 const __1 = require("../../");
-const objectDef_1 = require("../objectDef");
+const common_1 = require("../common");
 function Provider(type, metadata = {}) {
     return (target) => {
         (0, __1.saveModule)(__1.MS_PROVIDER_KEY, target);
@@ -10,7 +10,8 @@ function Provider(type, metadata = {}) {
             type,
             metadata,
         }, target);
-        (0, objectDef_1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, common_1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Provide)()(target);
     };
 }
 exports.Provider = Provider;

package/dist/decorator/rpc/hsf.js

@@ -12,6 +12,7 @@ function HSF(hsfOption = {}) {
         (0, __1.saveModule)(__1.HSF_KEY, target);
         (0, __1.saveClassMetadata)(__1.HSF_KEY, hsfOption, target);
         (0, __2.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Provide)()(target);
     };
 }
 exports.HSF = HSF;

package/dist/decorator/task/queue.d.ts

@@ -1,2 +1,2 @@
-export declare function Queue(options?: any): (target: any) => void;
+export declare function Queue(options?: any): ClassDecorator;
 //# sourceMappingURL=queue.d.ts.map

package/dist/decorator/task/queue.js

@@ -10,6 +10,7 @@ function Queue(options) {
             options,
             name: target.name,
         }, target);
+        (0, __1.Provide)()(target);
     };
 }
 exports.Queue = Queue;

package/dist/decorator/web/controller.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Controller = void 0;
-const objectDef_1 = require("../objectDef");
+const common_1 = require("../common");
 const __1 = require("../../");
 function Controller(prefix = '/', routerOptions = { middleware: [], sensitive: true }) {
     return (target) => {
@@ -11,7 +11,8 @@ function Controller(prefix = '/', routerOptions = { middleware: [], sensitive: t
                 prefix,
                 routerOptions,
             }, target);
-        (0, objectDef_1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, common_1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Provide)()(target);
     };
 }
 exports.Controller = Controller;

package/dist/decorator/web/paramMapping.d.ts

@@ -33,14 +33,14 @@ export interface RouterParamValue {
     type: RouteParamTypes;
     propertyData?: any;
 }
-export declare const Session: (property?: string) => (target: any, propertyName: any, index: any) => void;
-export declare const Body: (property?: string) => (target: any, propertyName: any, index: any) => void;
-export declare const Query: (property?: string) => (target: any, propertyName: any, index: any) => void;
-export declare const Param: (property?: string) => (target: any, propertyName: any, index: any) => void;
-export declare const Headers: (property?: string) => (target: any, propertyName: any, index: any) => void;
-export declare const File: (property?: GetFileStreamOptions) => (target: any, propertyName: any, index: any) => void;
-export declare const Files: (property?: GetFilesStreamOptions) => (target: any, propertyName: any, index: any) => void;
-export declare const RequestPath: () => (target: any, propertyName: any, index: any) => void;
-export declare const RequestIP: () => (target: any, propertyName: any, index: any) => void;
-export declare const Queries: (property?: string) => (target: any, propertyName: any, index: any) => void;
+export declare const Session: (property?: string) => ParameterDecorator;
+export declare const Body: (property?: string) => ParameterDecorator;
+export declare const Query: (property?: string) => ParameterDecorator;
+export declare const Param: (property?: string) => ParameterDecorator;
+export declare const Headers: (property?: string) => ParameterDecorator;
+export declare const File: (property?: GetFileStreamOptions) => ParameterDecorator;
+export declare const Files: (property?: GetFilesStreamOptions) => ParameterDecorator;
+export declare const RequestPath: () => ParameterDecorator;
+export declare const RequestIP: () => ParameterDecorator;
+export declare const Queries: (property?: string) => ParameterDecorator;
 //# sourceMappingURL=paramMapping.d.ts.map

package/dist/decorator/web/paramMapping.js

@@ -17,15 +17,11 @@ var RouteParamTypes;
     RouteParamTypes[RouteParamTypes["QUERIES"] = 10] = "QUERIES";
 })(RouteParamTypes = exports.RouteParamTypes || (exports.RouteParamTypes = {}));
 const createParamMapping = function (type) {
-    return (propertyData) => (target, propertyName, index) => {
-        if (propertyData === undefined) {
-            propertyData = (0, __1.getParamNames)(target[propertyName])[index];
-        }
-        (0, __1.attachPropertyDataToClass)(__1.WEB_ROUTER_PARAM_KEY, {
-            index,
+    return (propertyData) => {
+        return (0, __1.createCustomParamDecorator)(__1.WEB_ROUTER_PARAM_KEY, {
             type,
             propertyData,
-        }, target, propertyName);
+        });
     };
 };
 const Session = (property) => createParamMapping(RouteParamTypes.SESSION)(property);

package/dist/decorator/ws/webSocketController.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WSController = void 0;
-const decorator_1 = require("../../decorator");
+const common_1 = require("../common");
 const __1 = require("../../");
 function WSController(namespace = '/', routerOptions = { middleware: [] }) {
     return (target) => {
@@ -10,7 +10,8 @@ function WSController(namespace = '/', routerOptions = { middleware: [] }) {
             namespace,
             routerOptions,
         }, target);
-        (0, decorator_1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, common_1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Provide)()(target);
     };
 }
 exports.WSController = WSController;