koatty_router 1.6.2 → 1.6.6

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.6.6](https://github.com/koatty/koatty_router/compare/v1.6.4...v1.6.6) (2022-02-16)
+
+### [1.6.4](https://github.com/koatty/koatty_router/compare/v1.6.4-1...v1.6.4) (2021-12-23)
+
+### [1.6.4-1](https://github.com/koatty/koatty_router/compare/v1.6.4-0...v1.6.4-1) (2021-12-22)
+
+### [1.6.4-0](https://github.com/koatty/koatty_router/compare/v1.6.2...v1.6.4-0) (2021-12-21)
+
 ### [1.6.2](https://github.com/koatty/koatty_router/compare/v1.6.0...v1.6.2) (2021-12-20)
 
 ## [1.6.0](https://github.com/koatty/koatty_router/compare/v1.5.16...v1.6.0) (2021-12-19)

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2021-12-21 00:00:59
+* @Date: 2022-02-16 15:29:32
 * @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: 2021-12-21 00:00:46
+* @Date: 2022-02-16 15:29:10
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -47,7 +47,7 @@ var KoaRouter__default = /*#__PURE__*/_interopDefaultLegacy(KoaRouter);
  * @Usage:
  * @Author: richen
  * @Date: 2021-11-24 23:21:26
- * @LastEditTime: 2021-12-20 23:54:10
+ * @LastEditTime: 2021-12-22 01:03:57
  */
 /**
  * Parameter binding assignment.
@@ -57,12 +57,9 @@ var KoaRouter__default = /*#__PURE__*/_interopDefaultLegacy(KoaRouter);
  * @param {any[]} params
  * @returns
  */
-async function getParamter(app, ctx, ctlParams = {}) {
-    var _a, _b;
+async function getParamter(app, ctx, params) {
     //convert type
-    const params = (_a = ctlParams.data) !== null && _a !== void 0 ? _a : [];
-    const validRules = (_b = ctlParams.valids) !== null && _b !== void 0 ? _b : {};
-    const dtoCheck = ctlParams.dtoCheck || false;
+    params = params || [];
     const props = params.map(async (v, k) => {
         let value = null;
         if (v.fn && Helper__namespace.isFunction(v.fn)) {
@@ -73,8 +70,10 @@ async function getParamter(app, ctx, ctlParams = {}) {
             index: k,
             isDto: v.isDto,
             type: v.type,
-            validRules,
-            dtoCheck,
+            validRules: v.rule,
+            dtoCheck: v.dtoCheck,
+            dtoRule: v.dtoRule,
+            clazz: v.clazz,
         });
     });
     return Promise.all(props);
@@ -92,14 +91,14 @@ async function getParamter(app, ctx, ctlParams = {}) {
 async function checkParams(app, value, opt) {
     if (opt.isDto) {
         // DTO class
-        const clazz = koatty_container.IOCContainer.getClass(opt.type, "COMPONENT");
-        if (clazz) {
-            if (opt.dtoCheck) {
-                value = await koatty_validation.ClassValidator.valid(clazz, value, true);
-            }
-            else {
-                value = koatty_validation.plainToClass(clazz, value, true);
-            }
+        if (!opt.clazz) {
+            opt.clazz = koatty_container.IOCContainer.getClass(opt.type, "COMPONENT");
+        }
+        if (opt.dtoCheck) {
+            value = await koatty_validation.ClassValidator.valid(opt.clazz, value, true);
+        }
+        else {
+            value = koatty_validation.plainToClass(opt.clazz, value, true);
         }
     }
     else {
@@ -120,7 +119,7 @@ async function checkParams(app, value, opt) {
  * @Usage:
  * @Author: richen
  * @Date: 2021-11-10 16:58:57
- * @LastEditTime: 2021-12-17 16:39:29
+ * @LastEditTime: 2021-12-23 00:43:51
  */
 /**
  * Inject ParameterDecorator
@@ -173,7 +172,9 @@ async function Handler(app, ctx, ctl, method, ctlParams) {
     if (!ctx || !ctl) {
         return ctx.throw(404, `Controller not found.`);
     }
-    ctl.ctx = ctx;
+    if (!ctl.ctx) {
+        ctl.ctx = ctx;
+    }
     // inject param
     let args = [];
     if (ctlParams) {
@@ -237,22 +238,30 @@ function injectParam(app, target, instance) {
             // cover to obj
             const data = ((_a = metaDatas[meta]) !== null && _a !== void 0 ? _a : []).sort((a, b) => a.index - b.index);
             const validData = (_b = validMetaDatas[meta]) !== null && _b !== void 0 ? _b : [];
-            const validMetaObj = {};
             data.forEach((v) => {
+                v.rule = {};
                 validData.forEach((it) => {
                     if (v.index === it.index) {
-                        validMetaObj[v.index] = it;
+                        v.rule = it;
                     }
                 });
                 if (v.type) {
                     v.type = v.isDto ? v.type : (v.type).toLowerCase();
                 }
+                v.dtoCheck = (validatedMetaDatas[meta] && validatedMetaDatas[meta].dtoCheck) ? true : false;
+                if (v.isDto) {
+                    v.clazz = koatty_container.IOCContainer.getClass(v.type, "COMPONENT");
+                    if (v.dtoCheck) {
+                        v.dtoRule = {};
+                        const originMap = koatty_container.getOriginMetadata(koatty_validation.PARAM_TYPE_KEY, v.clazz);
+                        for (const [key, type] of originMap) {
+                            v.dtoRule[key] = type;
+                        }
+                        v.clazz.prototype["_typeDef"] = v.dtoRule;
+                    }
+                }
             });
-            argsMetaObj[meta] = {
-                valids: validMetaObj,
-                data,
-                dtoCheck: (validatedMetaDatas[meta] && validatedMetaDatas[meta].dtoCheck) ? true : false
-            };
+            argsMetaObj[meta] = data;
         }
     }
     return argsMetaObj;

package/dist/index.mjs

@@ -1,16 +1,16 @@
 /*!
 * @Author: richen
-* @Date: 2021-12-21 00:00:46
+* @Date: 2022-02-16 15:29:10
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
 */
 import koaCompose from 'koa-compose';
 import * as Helper from 'koatty_lib';
-import { IOCContainer, RecursiveGetMetadata } from 'koatty_container';
+import { IOCContainer, RecursiveGetMetadata, getOriginMetadata } from 'koatty_container';
 import { LoadProto, ListServices } from 'koatty_proto';
 import { DefaultLogger } from 'koatty_logger';
-import { ClassValidator, plainToClass, convertParamsType, ValidatorFuncs, paramterTypes, PARAM_RULE_KEY, PARAM_CHECK_KEY } from 'koatty_validation';
+import { ClassValidator, plainToClass, convertParamsType, ValidatorFuncs, paramterTypes, PARAM_RULE_KEY, PARAM_CHECK_KEY, PARAM_TYPE_KEY } from 'koatty_validation';
 import KoaRouter from '@koa/router';
 import 'reflect-metadata';
 
@@ -19,7 +19,7 @@ import 'reflect-metadata';
  * @Usage:
  * @Author: richen
  * @Date: 2021-11-24 23:21:26
- * @LastEditTime: 2021-12-20 23:54:10
+ * @LastEditTime: 2021-12-22 01:03:57
  */
 /**
  * Parameter binding assignment.
@@ -29,12 +29,9 @@ import 'reflect-metadata';
  * @param {any[]} params
  * @returns
  */
-async function getParamter(app, ctx, ctlParams = {}) {
-    var _a, _b;
+async function getParamter(app, ctx, params) {
     //convert type
-    const params = (_a = ctlParams.data) !== null && _a !== void 0 ? _a : [];
-    const validRules = (_b = ctlParams.valids) !== null && _b !== void 0 ? _b : {};
-    const dtoCheck = ctlParams.dtoCheck || false;
+    params = params || [];
     const props = params.map(async (v, k) => {
         let value = null;
         if (v.fn && Helper.isFunction(v.fn)) {
@@ -45,8 +42,10 @@ async function getParamter(app, ctx, ctlParams = {}) {
             index: k,
             isDto: v.isDto,
             type: v.type,
-            validRules,
-            dtoCheck,
+            validRules: v.rule,
+            dtoCheck: v.dtoCheck,
+            dtoRule: v.dtoRule,
+            clazz: v.clazz,
         });
     });
     return Promise.all(props);
@@ -64,14 +63,14 @@ async function getParamter(app, ctx, ctlParams = {}) {
 async function checkParams(app, value, opt) {
     if (opt.isDto) {
         // DTO class
-        const clazz = IOCContainer.getClass(opt.type, "COMPONENT");
-        if (clazz) {
-            if (opt.dtoCheck) {
-                value = await ClassValidator.valid(clazz, value, true);
-            }
-            else {
-                value = plainToClass(clazz, value, true);
-            }
+        if (!opt.clazz) {
+            opt.clazz = IOCContainer.getClass(opt.type, "COMPONENT");
+        }
+        if (opt.dtoCheck) {
+            value = await ClassValidator.valid(opt.clazz, value, true);
+        }
+        else {
+            value = plainToClass(opt.clazz, value, true);
         }
     }
     else {
@@ -92,7 +91,7 @@ async function checkParams(app, value, opt) {
  * @Usage:
  * @Author: richen
  * @Date: 2021-11-10 16:58:57
- * @LastEditTime: 2021-12-17 16:39:29
+ * @LastEditTime: 2021-12-23 00:43:51
  */
 /**
  * Inject ParameterDecorator
@@ -145,7 +144,9 @@ async function Handler(app, ctx, ctl, method, ctlParams) {
     if (!ctx || !ctl) {
         return ctx.throw(404, `Controller not found.`);
     }
-    ctl.ctx = ctx;
+    if (!ctl.ctx) {
+        ctl.ctx = ctx;
+    }
     // inject param
     let args = [];
     if (ctlParams) {
@@ -209,22 +210,30 @@ function injectParam(app, target, instance) {
             // cover to obj
             const data = ((_a = metaDatas[meta]) !== null && _a !== void 0 ? _a : []).sort((a, b) => a.index - b.index);
             const validData = (_b = validMetaDatas[meta]) !== null && _b !== void 0 ? _b : [];
-            const validMetaObj = {};
             data.forEach((v) => {
+                v.rule = {};
                 validData.forEach((it) => {
                     if (v.index === it.index) {
-                        validMetaObj[v.index] = it;
+                        v.rule = it;
                     }
                 });
                 if (v.type) {
                     v.type = v.isDto ? v.type : (v.type).toLowerCase();
                 }
+                v.dtoCheck = (validatedMetaDatas[meta] && validatedMetaDatas[meta].dtoCheck) ? true : false;
+                if (v.isDto) {
+                    v.clazz = IOCContainer.getClass(v.type, "COMPONENT");
+                    if (v.dtoCheck) {
+                        v.dtoRule = {};
+                        const originMap = getOriginMetadata(PARAM_TYPE_KEY, v.clazz);
+                        for (const [key, type] of originMap) {
+                            v.dtoRule[key] = type;
+                        }
+                        v.clazz.prototype["_typeDef"] = v.dtoRule;
+                    }
+                }
             });
-            argsMetaObj[meta] = {
-                valids: validMetaObj,
-                data,
-                dtoCheck: (validatedMetaDatas[meta] && validatedMetaDatas[meta].dtoCheck) ? true : false
-            };
+            argsMetaObj[meta] = data;
         }
     }
     return argsMetaObj;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty_router",
-  "version": "1.6.2",
+  "version": "1.6.6",
   "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",
@@ -21,6 +21,10 @@
     "version": "conventional-changelog -p angular -i CHANGELOG.md -s"
   },
   "main": "./dist/index.js",
+  "exports": {
+    "require": "./dist/index.js",
+    "import": "./dist/index.mjs"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/koatty/koatty_router.git"
@@ -60,7 +64,7 @@
     "typescript": "^4.x.x"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.4.4",
+    "@grpc/grpc-js": "^1.5.5",
     "@koa/router": "^10.1.1",
     "koa-compose": "^4.1.0",
     "koatty_container": "^1.x.x",
@@ -71,9 +75,12 @@
     "koatty_validation": "^1.x.x",
     "tslib": "^2.3.1"
   },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
-    }
+  "peerDependencies": {
+    "koatty_container": "^1.x.x",
+    "koatty_core": "^1.x.x",
+    "koatty_lib": "^1.x.x",
+    "koatty_logger": "^1.x.x",
+    "koatty_proto": "^1.x.x",
+    "koatty_validation": "^1.x.x"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty_router",
-  "version": "1.6.2",
+  "version": "1.6.6",
   "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",
@@ -21,6 +21,10 @@
     "version": "conventional-changelog -p angular -i CHANGELOG.md -s"
   },
   "main": "./dist/index.js",
+  "exports": {
+    "require": "./dist/index.js",
+    "import": "./dist/index.mjs"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/koatty/koatty_router.git"
@@ -60,7 +64,7 @@
     "typescript": "^4.x.x"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.4.4",
+    "@grpc/grpc-js": "^1.5.5",
     "@koa/router": "^10.1.1",
     "koa-compose": "^4.1.0",
     "koatty_container": "^1.x.x",
@@ -71,9 +75,12 @@
     "koatty_validation": "^1.x.x",
     "tslib": "^2.3.1"
   },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
-    }
+  "peerDependencies": {
+    "koatty_container": "^1.x.x",
+    "koatty_core": "^1.x.x",
+    "koatty_lib": "^1.x.x",
+    "koatty_logger": "^1.x.x",
+    "koatty_proto": "^1.x.x",
+    "koatty_validation": "^1.x.x"
   }
 }

package/.commitlintrc.js

@@ -1,10 +0,0 @@
-/*
- * @Description: 
- * @Usage: 
- * @Author: richen
- * @Date: 2021-12-18 20:53:46
- * @LastEditTime: 2021-12-18 20:53:47
- */
-module.exports = {
-  extends: ["gitmoji"],
-};

package/.eslintignore

@@ -1,11 +0,0 @@
-node_modules
-.eslintrc.js
-**/package-lock.json
-**/yarn.lock
-**/*.config.js
-dist
-temp
-scripts
-coverage
-test
-demo

package/.eslintrc.js

@@ -1,43 +0,0 @@
-/**
- * 
- */
-module.exports = {
-  root: true,
-  parser: '@typescript-eslint/parser',
-  extends: [
-    'plugin:@typescript-eslint/recommended', // 使用@typescript-eslint/eslint-plugin的推荐规则
-    'plugin:jest/recommended',
-  ],
-  plugins: [
-    '@typescript-eslint',
-    'jest',
-  ],
-  parserOptions: {
-    project: './tsconfig.json',
-  },
-  env: {
-    node: true,
-    mongo: true,
-    jest: true,
-  },
-  rules: {
-    "@typescript-eslint/no-explicit-any": "off",
-    // "@typescript-eslint/no-require-imports": "off",
-    "@typescript-eslint/no-var-requires": "off",
-    "@typescript-eslint/member-ordering": "off",
-    "@typescript-eslint/consistent-type-assertions": "off",
-    "@typescript-eslint/no-param-reassign": "off",
-    "@typescript-eslint/no-empty-function": "off",
-    "@typescript-eslint/no-empty-interface": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/ban-types": ["error",
-      {
-        "types": {
-          "Object": false,
-          "Function": false,
-        },
-        "extendDefaults": true
-      }
-    ],
-  },
-};

package/.huskyrc

@@ -1,5 +0,0 @@
-{
-  "hooks": {
-    "commit-msg": "commitlint -e $HUSKY_GIT_PARAMS"
-  }
-}

package/.versionrc.js

@@ -1,16 +0,0 @@
-module.exports = {
-    // skip: {
-    //     tag: true,
-    // },
-    //server-version自动commit的模板
-    releaseCommitMessageFormat:
-        "🔧 build: v{{currentTag}}",
-    //需要server-version更新版本号的文件
-    bumpFiles: [
-        {
-            filename: "package.json",
-            // The `json` updater assumes the version is available under a `version` key in the provided JSON document.
-            type: "json",
-        },
-    ],
-};