koatty_router 1.7.2 → 1.7.3

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.7.3](https://github.com/koatty/koatty_router/compare/v1.7.2...v1.7.3) (2022-03-09)
+
 ### [1.7.2](https://github.com/koatty/koatty_router/compare/v1.7.1...v1.7.2) (2022-02-25)
 
 ### [1.7.1](https://github.com/koatty/koatty_router/compare/v1.7.0...v1.7.1) (2022-02-23)

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-02-25 11:29:27
+* @Date: 2022-03-09 18:48:02
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/

package/dist/index.js

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-02-25 11:29:11
+* @Date: 2022-03-09 18:47:35
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -46,7 +46,7 @@ var KoaRouter__default = /*#__PURE__*/_interopDefaultLegacy(KoaRouter);
  * @Usage:
  * @Author: richen
  * @Date: 2021-11-24 23:21:26
- * @LastEditTime: 2022-02-25 11:24:12
+ * @LastEditTime: 2022-03-09 18:14:25
  */
 /**
  * Parameter binding assignment.
@@ -69,7 +69,8 @@ async function getParamter(app, ctx, params) {
             index: k,
             isDto: v.isDto,
             type: v.type,
-            validRules: v.rule,
+            validRule: v.rule,
+            validOpt: v.options,
             dtoCheck: v.dtoCheck,
             dtoRule: v.dtoRule,
             clazz: v.clazz,
@@ -104,10 +105,10 @@ async function checkParams(app, value, opt) {
         else {
             value = koatty_validation.convertParamsType(value, opt.type);
             //@Valid()
-            if (opt.validRules[opt.index]) {
-                const { type, rule, options } = opt.validRules[opt.index];
-                if (type && rule) {
-                    validatorFuncs(`${opt.index}`, value, type, rule, options, false);
+            if (opt) {
+                const { type, validRule, validOpt } = opt;
+                if (type && validRule) {
+                    validatorFuncs(`${opt.index}`, value, type, validRule, validOpt, false);
                 }
             }
         }
@@ -298,7 +299,7 @@ const HeadMapping = (path = "/", routerOptions = {}) => {
  * @Usage:
  * @Author: richen
  * @Date: 2021-11-10 16:58:57
- * @LastEditTime: 2022-02-22 14:35:08
+ * @LastEditTime: 2022-03-09 18:14:12
  */
 /**
  * controller handler
@@ -375,6 +376,7 @@ function injectParam(app, target, instance) {
     const validatedMetaDatas = koatty_container.RecursiveGetMetadata(koatty_validation.PARAM_CHECK_KEY, target);
     const argsMetaObj = {};
     for (const meta in metaDatas) {
+        // 实例方法带规则形参必须小于等于原型形参(如果不存在验证规则，则小于)
         if (instance[meta] && instance[meta].length <= metaDatas[meta].length) {
             koatty_logger.DefaultLogger.Debug(`Register inject param key ${koatty_container.IOCContainer.getIdentifier(target)}: ${Helper__namespace.toString(meta)} => value: ${JSON.stringify(metaDatas[meta])}`);
             // cover to obj
@@ -382,10 +384,10 @@ function injectParam(app, target, instance) {
             const validData = (_b = validMetaDatas[meta]) !== null && _b !== void 0 ? _b : [];
             data.forEach((v) => {
                 var _a;
-                v.rule = {};
                 validData.forEach((it) => {
-                    if (v.index === it.index) {
-                        v.rule = it;
+                    if (v.index === it.index && it.name === v.name) {
+                        v.rule = it.rule;
+                        v.options = it.options;
                     }
                 });
                 if (v.type) {

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-02-25 11:29:11
+* @Date: 2022-03-09 18:47:35
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -19,7 +19,7 @@ import KoaRouter from '@koa/router';
  * @Usage:
  * @Author: richen
  * @Date: 2021-11-24 23:21:26
- * @LastEditTime: 2022-02-25 11:24:12
+ * @LastEditTime: 2022-03-09 18:14:25
  */
 /**
  * Parameter binding assignment.
@@ -42,7 +42,8 @@ async function getParamter(app, ctx, params) {
             index: k,
             isDto: v.isDto,
             type: v.type,
-            validRules: v.rule,
+            validRule: v.rule,
+            validOpt: v.options,
             dtoCheck: v.dtoCheck,
             dtoRule: v.dtoRule,
             clazz: v.clazz,
@@ -77,10 +78,10 @@ async function checkParams(app, value, opt) {
         else {
             value = convertParamsType(value, opt.type);
             //@Valid()
-            if (opt.validRules[opt.index]) {
-                const { type, rule, options } = opt.validRules[opt.index];
-                if (type && rule) {
-                    validatorFuncs(`${opt.index}`, value, type, rule, options, false);
+            if (opt) {
+                const { type, validRule, validOpt } = opt;
+                if (type && validRule) {
+                    validatorFuncs(`${opt.index}`, value, type, validRule, validOpt, false);
                 }
             }
         }
@@ -271,7 +272,7 @@ const HeadMapping = (path = "/", routerOptions = {}) => {
  * @Usage:
  * @Author: richen
  * @Date: 2021-11-10 16:58:57
- * @LastEditTime: 2022-02-22 14:35:08
+ * @LastEditTime: 2022-03-09 18:14:12
  */
 /**
  * controller handler
@@ -348,6 +349,7 @@ function injectParam(app, target, instance) {
     const validatedMetaDatas = RecursiveGetMetadata(PARAM_CHECK_KEY, target);
     const argsMetaObj = {};
     for (const meta in metaDatas) {
+        // 实例方法带规则形参必须小于等于原型形参(如果不存在验证规则，则小于)
         if (instance[meta] && instance[meta].length <= metaDatas[meta].length) {
             DefaultLogger.Debug(`Register inject param key ${IOCContainer.getIdentifier(target)}: ${Helper.toString(meta)} => value: ${JSON.stringify(metaDatas[meta])}`);
             // cover to obj
@@ -355,10 +357,10 @@ function injectParam(app, target, instance) {
             const validData = (_b = validMetaDatas[meta]) !== null && _b !== void 0 ? _b : [];
             data.forEach((v) => {
                 var _a;
-                v.rule = {};
                 validData.forEach((it) => {
-                    if (v.index === it.index) {
-                        v.rule = it;
+                    if (v.index === it.index && it.name === v.name) {
+                        v.rule = it.rule;
+                        v.options = it.options;
                     }
                 });
                 if (v.type) {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty_router",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "Koatty routing component, adapt to http1/2, websocket, gRPC.",
   "scripts": {
     "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty_router",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "Koatty routing component, adapt to http1/2, websocket, gRPC.",
   "scripts": {
     "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",