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

package/CHANGELOG.md

@@ -3,6 +3,49 @@
 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.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+
+### Bug Fixes
+
+* class transformer method missing ([#1387](https://github.com/midwayjs/midway/issues/1387)) ([074e839](https://github.com/midwayjs/midway/commit/074e8393598dc95e2742f735df75a2191c5fe25d))
+
+
+
+
+
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+
+### Bug Fixes
+
+* [@match](https://github.com/match) empty args ([#1384](https://github.com/midwayjs/midway/issues/1384)) ([6f90fc9](https://github.com/midwayjs/midway/commit/6f90fc993ff01e078288ff664833c61c02dede51))
+
+
+
+
+
+# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
+
+
+### Features
+
+* add i18n ([#1375](https://github.com/midwayjs/midway/issues/1375)) ([bffefe0](https://github.com/midwayjs/midway/commit/bffefe07afe45777d49b5a76b9ab17fc2b9d9a55))
+* auto transform args to type ([#1372](https://github.com/midwayjs/midway/issues/1372)) ([bb3f7d2](https://github.com/midwayjs/midway/commit/bb3f7d2028a034e1926d9df554849332354c3762))
+* support global prefix url ([#1371](https://github.com/midwayjs/midway/issues/1371)) ([cc5fe44](https://github.com/midwayjs/midway/commit/cc5fe44e1d221590562dc71e1f33ae96093e0da7))
+
+
+
+
+
+# [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)
 
 

package/dist/constant.d.ts

@@ -4,6 +4,7 @@ export declare const CONFIGURATION_KEY = "common:configuration";
 export declare const FRAMEWORK_KEY = "common:framework";
 export declare const ASPECT_KEY = "common:aspect";
 export declare const CATCH_KEY = "common:catch";
+export declare const MATCH_KEY = "common:match";
 export declare const FUNC_KEY = "faas:func";
 export declare const SERVERLESS_FUNC_KEY = "faas:serverless:function";
 export declare const CONTROLLER_KEY = "web:controller";

package/dist/constant.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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.MATCH_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 = exports.LIFECYCLE_IDENTIFIER_PREFIX = void 0;
 // got all value with no property name
 exports.ALL = 'common:all_value_key';
 // common
@@ -10,6 +10,7 @@ exports.CONFIGURATION_KEY = 'common:configuration';
 exports.FRAMEWORK_KEY = 'common:framework';
 exports.ASPECT_KEY = 'common:aspect';
 exports.CATCH_KEY = 'common:catch';
+exports.MATCH_KEY = 'common:match';
 // faas
 exports.FUNC_KEY = 'faas:func';
 exports.SERVERLESS_FUNC_KEY = 'faas:serverless:function';

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

@@ -0,0 +1,4 @@
+export declare function Catch(catchTarget?: any | any[]): (target: any) => void;
+export declare type MatchPattern<CtxOrReq = any, Res = any> = ((ctxOrReq: CtxOrReq, res: Res) => boolean) | string | string[] | boolean;
+export declare function Match(matchPattern?: MatchPattern): (target: any) => void;
+//# sourceMappingURL=filter.d.ts.map

package/dist/decorator/common/{catch.js → filter.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Catch = void 0;
+exports.Match = exports.Catch = void 0;
 const decoratorManager_1 = require("../../decoratorManager");
 const constant_1 = require("../../constant");
 const objectDef_1 = require("./objectDef");
@@ -8,8 +8,8 @@ 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, {
+        const catchTargets = catchTarget ? [].concat(catchTarget) : undefined;
+        (0, decoratorManager_1.saveClassMetadata)(constant_1.CATCH_KEY, {
             catchTargets,
         }, target);
         (0, objectDef_1.Scope)(interface_1.ScopeEnum.Singleton)(target);
@@ -17,4 +17,14 @@ function Catch(catchTarget) {
     };
 }
 exports.Catch = Catch;
-//# sourceMappingURL=catch.js.map
+function Match(matchPattern = true) {
+    return function (target) {
+        (0, decoratorManager_1.saveClassMetadata)(constant_1.MATCH_KEY, {
+            matchPattern,
+        }, target);
+        (0, objectDef_1.Scope)(interface_1.ScopeEnum.Singleton)(target);
+        (0, provide_1.Provide)()(target);
+    };
+}
+exports.Match = Match;
+//# sourceMappingURL=filter.js.map

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

@@ -6,6 +6,6 @@ export * from './autoload';
 export * from './configuration';
 export * from './objectDef';
 export * from './framework';
-export * from './catch';
+export * from './filter';
 export * from './middleware';
 //# sourceMappingURL=index.d.ts.map

package/dist/decorator/common/index.js

@@ -18,6 +18,6 @@ __exportStar(require("./autoload"), exports);
 __exportStar(require("./configuration"), exports);
 __exportStar(require("./objectDef"), exports);
 __exportStar(require("./framework"), exports);
-__exportStar(require("./catch"), exports);
+__exportStar(require("./filter"), exports);
 __exportStar(require("./middleware"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -7,6 +7,7 @@ export interface ControllerOption {
         alias?: string[];
         description?: string;
         tagName?: string;
+        ignoreGlobalPrefix?: boolean;
     };
 }
 export declare function Controller(prefix?: string, routerOptions?: {
@@ -14,5 +15,6 @@ export declare function Controller(prefix?: string, routerOptions?: {
     middleware?: MiddlewareParamArray;
     description?: string;
     tagName?: string;
+    ignoreGlobalPrefix?: boolean;
 }): ClassDecorator;
 //# sourceMappingURL=controller.d.ts.map

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

@@ -1,12 +1,37 @@
 import { MiddlewareParamArray } from '../../interface';
 export interface RouterOption {
+    /**
+     * router path, like "/api"
+     */
     path?: string | RegExp;
+    /**
+     * http method, like "get", "post"
+     */
     requestMethod: string;
+    /**
+     * router alias name
+     */
     routerName?: string;
+    /**
+     * which method decorator attached
+     */
     method?: string;
+    /**
+     * middleware array in router
+     */
     middleware?: MiddlewareParamArray;
+    /**
+     * router summary, for swagger
+     */
     summary?: string;
+    /**
+     * router description, for swagger
+     */
     description?: string;
+    /**
+     * ignore global prefix
+     */
+    ignoreGlobalPrefix?: boolean;
 }
 export declare const RequestMethod: {
     GET: string;
@@ -27,6 +52,7 @@ export declare const Post: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP GET requests to the specified path.
@@ -36,6 +62,7 @@ export declare const Get: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP DELETE requests to the specified path.
@@ -45,6 +72,7 @@ export declare const Del: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP PUT requests to the specified path.
@@ -54,6 +82,7 @@ export declare const Put: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP PATCH requests to the specified path.
@@ -63,6 +92,7 @@ export declare const Patch: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP OPTIONS requests to the specified path.
@@ -72,6 +102,7 @@ export declare const Options: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP HEAD requests to the specified path.
@@ -81,6 +112,7 @@ export declare const Head: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes all HTTP requests to the specified path.
@@ -90,5 +122,6 @@ export declare const All: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 //# sourceMappingURL=requestMapping.d.ts.map

package/dist/decorator/web/requestMapping.js

@@ -27,6 +27,7 @@ const RequestMapping = (metadata = defaultMetadata) => {
     const routerName = metadata.routerName;
     const middleware = metadata.middleware;
     return (target, key, descriptor) => {
+        var _a;
         (0, __1.attachClassMetadata)(__1.WEB_ROUTER_KEY, {
             path,
             requestMethod,
@@ -35,6 +36,7 @@ const RequestMapping = (metadata = defaultMetadata) => {
             middleware,
             summary: (metadata === null || metadata === void 0 ? void 0 : metadata.summary) || '',
             description: (metadata === null || metadata === void 0 ? void 0 : metadata.description) || '',
+            ignoreGlobalPrefix: (_a = metadata === null || metadata === void 0 ? void 0 : metadata.ignoreGlobalPrefix) !== null && _a !== void 0 ? _a : false,
         }, target);
         return descriptor;
     };

package/dist/decoratorManager.d.ts

@@ -256,6 +256,11 @@ export declare function getProviderUUId(module: any): string;
  * @param target class
  */
 export declare function isProvide(target: any): boolean;
+export declare enum BaseType {
+    Boolean = "boolean",
+    Number = "number",
+    String = "string"
+}
 /**
  * get parameters type by reflect-metadata
  */

package/dist/decoratorManager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCustomParamDecorator = exports.createCustomMethodDecorator = exports.createCustomPropertyDecorator = exports.getMethodReturnTypes = exports.getPropertyType = exports.getMethodParamTypes = exports.isProvide = exports.getProviderUUId = exports.getProviderName = exports.getProviderId = exports.saveProviderId = exports.getObjectDefinition = exports.saveObjectDefinition = exports.getPropertyInject = exports.savePropertyInject = exports.clearAllModule = exports.resetModule = exports.listModule = exports.clearBindContainer = exports.bindContainer = exports.saveModule = exports.listPreloadModule = exports.savePreloadModule = exports.getPropertyMetadata = exports.attachPropertyMetadata = exports.savePropertyMetadata = exports.listPropertyDataFromClass = exports.getPropertyDataFromClass = exports.attachPropertyDataToClass = exports.savePropertyDataToClass = exports.getClassMetadata = exports.getClassExtendedMetadata = exports.attachClassMetadata = exports.saveClassMetadata = exports.DecoratorManager = exports.INJECT_CLASS_KEY_PREFIX = exports.PRELOAD_MODULE_KEY = void 0;
+exports.createCustomParamDecorator = exports.createCustomMethodDecorator = exports.createCustomPropertyDecorator = exports.getMethodReturnTypes = exports.getPropertyType = exports.getMethodParamTypes = exports.BaseType = exports.isProvide = exports.getProviderUUId = exports.getProviderName = exports.getProviderId = exports.saveProviderId = exports.getObjectDefinition = exports.saveObjectDefinition = exports.getPropertyInject = exports.savePropertyInject = exports.clearAllModule = exports.resetModule = exports.listModule = exports.clearBindContainer = exports.bindContainer = exports.saveModule = exports.listPreloadModule = exports.savePreloadModule = exports.getPropertyMetadata = exports.attachPropertyMetadata = exports.savePropertyMetadata = exports.listPropertyDataFromClass = exports.getPropertyDataFromClass = exports.attachPropertyDataToClass = exports.savePropertyDataToClass = 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 util_1 = require("./util");
@@ -243,12 +243,14 @@ class DecoratorManager extends Map {
 }
 exports.DecoratorManager = DecoratorManager;
 let manager = new DecoratorManager();
-if (global['MIDWAY_GLOBAL_DECORATOR_MANAGER']) {
-    console.warn('DecoratorManager not singleton and please check @midwayjs/decorator version by "npm ls @midwayjs/decorator"');
-    manager = global['MIDWAY_GLOBAL_DECORATOR_MANAGER'];
-}
-else {
-    global['MIDWAY_GLOBAL_DECORATOR_MANAGER'] = manager;
+if (typeof global === 'object') {
+    if (global['MIDWAY_GLOBAL_DECORATOR_MANAGER']) {
+        console.warn('DecoratorManager not singleton and please check @midwayjs/decorator version by "npm ls @midwayjs/decorator"');
+        manager = global['MIDWAY_GLOBAL_DECORATOR_MANAGER'];
+    }
+    else {
+        global['MIDWAY_GLOBAL_DECORATOR_MANAGER'] = manager;
+    }
 }
 /**
  * save data to class
@@ -607,6 +609,12 @@ function isProvide(target) {
     return !!getClassMetadata(constant_1.TAGGED_CLS, target);
 }
 exports.isProvide = isProvide;
+var BaseType;
+(function (BaseType) {
+    BaseType["Boolean"] = "boolean";
+    BaseType["Number"] = "number";
+    BaseType["String"] = "string";
+})(BaseType = exports.BaseType || (exports.BaseType = {}));
 /**
  * get parameters type by reflect-metadata
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/decorator",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.6",
   "description": "definition decorator for midway project",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7f07de960da1155a9f7df554e1789c7a97bdd3fe"
+  "gitHead": "e4595d30b369e36bef21b36f2b3737d8bc2f802d"
 }

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

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