@midwayjs/decorator 2.13.2 → 2.14.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 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)
 
 

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/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,28 +1,40 @@
 "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 = (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 = (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) {
+                    if (options.isTransform) {
                         args[i] = (0, class_transformer_1.plainToClass)(item, args[i]);
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/decorator",
-  "version": "2.13.2",
+  "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": "30cec549e5e393fb6ace1cecfb9c122d8ca647d0"
+  "gitHead": "5fd716b0e731162d8e9f0931790fde7402fb83de"
 }