koatty_router 1.5.7 → 1.5.12

package/.eslintrc.js

@@ -22,12 +22,13 @@ module.exports = {
   },
   rules: {
     "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-require-imports": "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",
       {

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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.5.12](https://github.com/koatty/koatty_router/compare/v1.5.10...v1.5.12) (2021-11-25)
+
+### [1.5.10](https://github.com/koatty/koatty_router/compare/v1.5.8...v1.5.10) (2021-11-23)
+
+### [1.5.8](https://github.com/koatty/koatty_router/compare/v1.5.6...v1.5.8) (2021-11-19)
+
 ### [1.5.6](https://github.com/koatty/koatty_router/compare/v1.4.2...v1.5.6) (2021-11-18)
 
 ### [1.4.2](https://github.com/koatty/koatty_router/compare/v1.2.4...v1.4.2) (2021-11-12)

package/LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2021, Koatty
+Copyright (c) 2020, Koatty
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

package/babel.config.js

@@ -1,11 +1,6 @@
 /*
  * @Description  : babel配置
  * @usage        : 用于jest执行用例
- * @Date         : 2020-10-19 23:08:40
- * @Author       : fankerwang<fankerwang@tencent.com>
- * @LastEditors  : fankerwang<fankerwang@tencent.com>
- * @LastEditTime : 2021-05-21 20:27:11
- * @FilePath     : /tkoatty/babel.config.js
  */
 
 module.exports = {

package/dist/grpc/protobuf.js

@@ -9,7 +9,7 @@ const tslib_1 = require("tslib");
  * @Date: 2021-11-10 10:19:48
  * @LastEditTime: 2021-11-18 16:17:16
  */
-const Helper = tslib_1.__importStar(require("koatty_lib"));
+const Helper = (0, tslib_1.__importStar)(require("koatty_lib"));
 const grpc_js_1 = require("@grpc/grpc-js");
 const proto_loader_1 = require("@grpc/proto-loader");
 /**
@@ -30,8 +30,8 @@ function LoadProto(protoFile, options = {
         throw new Error("no such file: " + protoFile);
     }
     // Loading file
-    const parsedObj = proto_loader_1.loadSync(protoFile, options);
-    const def = grpc_js_1.loadPackageDefinition(parsedObj);
+    const parsedObj = (0, proto_loader_1.loadSync)(protoFile, options);
+    const def = (0, grpc_js_1.loadPackageDefinition)(parsedObj);
     return ListServices(def);
 }
 exports.LoadProto = LoadProto;

package/dist/grpc/protobuf.js.map

@@ -1 +1 @@
-{"version":3,"file":"protobuf.js","sourceRoot":"","sources":["../../src/grpc/protobuf.ts"],"names":[],"mappings":";;;;AAAA;;;;;;GAMG;AACH,2DAAqC;AACrC,2CAAqF;AACrF,qDAA+E;AAoB/E;;;;;;GAMG;AACH,SAAgB,SAAS,CAAC,SAAiB,EAAE,UAAmB;IAC5D,QAAQ,EAAE,IAAI;IACd,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,IAAI;IACd,MAAM,EAAE,IAAI;CACf;IACG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;KACjD;IACD,eAAe;IACf,MAAM,SAAS,GAAG,uBAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG,+BAAqB,CAAC,SAAS,CAAC,CAAC;IAC7C,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAdD,8BAcC;AAED;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,GAAwC;IACjE,MAAM,OAAO,GAAe,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACjD,IAAI,KAAK,EAAE;YACP,IAAI,OAAO,KAAK,KAAK,UAAU,IAAI,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;gBAChE,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC9B,MAAM,QAAQ,GAAG,EAAE,CAAC;gBACpB,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;oBACvB,IAAI,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;wBAC1C,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;wBAC7B,QAAQ,CAAC,IAAI,CAAC;4BACV,IAAI,EAAE,GAAG;4BACT,IAAI,EAAE,OAAO,CAAC,IAAI;yBACrB,CAAC,CAAA;qBACL;iBACJ;gBACD,OAAO,CAAC,IAAI,CAAC;oBACT,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,OAAO;oBAChB,QAAQ,EAAE,QAAQ;iBACrB,CAAC,CAAC;aACN;iBAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;aACxC;SACJ;KACJ;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AA3BD,oCA2BC"}
+{"version":3,"file":"protobuf.js","sourceRoot":"","sources":["../../src/grpc/protobuf.ts"],"names":[],"mappings":";;;;AAAA;;;;;;GAMG;AACH,gEAAqC;AACrC,2CAAqF;AACrF,qDAA+E;AAoB/E;;;;;;GAMG;AACH,SAAgB,SAAS,CAAC,SAAiB,EAAE,UAAmB;IAC5D,QAAQ,EAAE,IAAI;IACd,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,IAAI;IACd,MAAM,EAAE,IAAI;CACf;IACG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;KACjD;IACD,eAAe;IACf,MAAM,SAAS,GAAG,IAAA,uBAAQ,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG,IAAA,+BAAqB,EAAC,SAAS,CAAC,CAAC;IAC7C,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAdD,8BAcC;AAED;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,GAAwC;IACjE,MAAM,OAAO,GAAe,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACjD,IAAI,KAAK,EAAE;YACP,IAAI,OAAO,KAAK,KAAK,UAAU,IAAI,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;gBAChE,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC9B,MAAM,QAAQ,GAAG,EAAE,CAAC;gBACpB,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;oBACvB,IAAI,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;wBAC1C,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;wBAC7B,QAAQ,CAAC,IAAI,CAAC;4BACV,IAAI,EAAE,GAAG;4BACT,IAAI,EAAE,OAAO,CAAC,IAAI;yBACrB,CAAC,CAAA;qBACL;iBACJ;gBACD,OAAO,CAAC,IAAI,CAAC;oBACT,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,OAAO;oBAChB,QAAQ,EAAE,QAAQ;iBACrB,CAAC,CAAC;aACN;iBAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;aACxC;SACJ;KACJ;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AA3BD,oCA2BC"}

package/dist/grpc/router.d.ts

@@ -1,5 +1,5 @@
-import { Koatty, KoattyRouter, KoattyRouterOptions } from "koatty_core";
 import { ServiceDefinition, UntypedHandleCall, UntypedServiceImplementation } from "@grpc/grpc-js";
+import { Koatty, KoattyRouter, KoattyRouterOptions } from "koatty_core";
 /**
  * GrpcRouter Options
  *

package/dist/grpc/router.js

@@ -7,14 +7,14 @@ const tslib_1 = require("tslib");
  * @Usage:
  * @Author: richen
  * @Date: 2021-06-29 14:10:30
- * @LastEditTime: 2021-11-18 23:36:27
+ * @LastEditTime: 2021-11-19 16:55:55
  */
 const koatty_container_1 = require("koatty_container");
-const Helper = tslib_1.__importStar(require("koatty_lib"));
+const Helper = (0, tslib_1.__importStar)(require("koatty_lib"));
+const protobuf_1 = require("./protobuf");
+const koa_compose_1 = (0, tslib_1.__importDefault)(require("koa-compose"));
 const koatty_logger_1 = require("koatty_logger");
 const inject_1 = require("../inject");
-const protobuf_1 = require("./protobuf");
-const koa_compose_1 = tslib_1.__importDefault(require("koa-compose"));
 class GrpcRouter {
     constructor(app, options) {
         this.app = app;
@@ -62,34 +62,48 @@ class GrpcRouter {
         try {
             const app = this.app;
             // load proto files
-            const services = protobuf_1.LoadProto(this.options.protoFile);
-            // tslint:disable-next-line: forin
+            const services = (0, protobuf_1.LoadProto)(this.options.protoFile);
+            const ctls = {};
             for (const n in list) {
                 const ctl = koatty_container_1.IOCContainer.getClass(n, "CONTROLLER");
+                // inject router
+                const ctlRouters = (0, inject_1.injectRouter)(app, ctl);
                 // inject param
-                const ctlParams = inject_1.injectParam(app, ctl);
-                for (const it of services) {
-                    const serviceName = it.name;
-                    if (n === `${serviceName}Controller`) {
-                        // Verifying
-                        if (!it.service || it.handlers.length === 0) {
-                            koatty_logger_1.DefaultLogger.Warn('Ignore', it.name, 'which is an empty service');
-                            return;
-                        }
-                        const impl = {};
-                        for (const handler of it.handlers) {
-                            const method = handler.name;
-                            koatty_logger_1.DefaultLogger.Debug(`Register request mapping: ["${it.name}" => ${n}.${method}]`);
-                            const params = ctlParams[method];
-                            impl[handler.name] = (call, callback) => {
-                                return this.wrapGrpcHandler(call, callback, (ctx) => {
-                                    return inject_1.Handler(app, ctx, n, method, params);
-                                });
-                            };
-                            this.SetRouter(it.name, it.service, impl);
-                        }
+                const ctlParams = (0, inject_1.injectParam)(app, ctl);
+                for (const it in ctlRouters) {
+                    const router = ctlRouters[it];
+                    const method = router.method;
+                    const path = router.path;
+                    const params = ctlParams[method];
+                    ctls[path] = {
+                        ctl: n,
+                        method,
+                        params,
+                    };
+                }
+            }
+            // 循环匹配服务绑定路由
+            for (const si of services) {
+                const serviceName = si.name;
+                // Verifying
+                if (!si.service || si.handlers.length === 0) {
+                    koatty_logger_1.DefaultLogger.Warn('Ignore', serviceName, 'which is an empty service');
+                    return;
+                }
+                const impl = {};
+                for (const handler of si.handlers) {
+                    const path = handler.path;
+                    if (ctls[path]) {
+                        const ctlIns = ctls[path];
+                        koatty_logger_1.DefaultLogger.Debug(`Register request mapping: ["${path}" => ${ctlIns.ctl}.${ctlIns.method}]`);
+                        impl[handler.name] = (call, callback) => {
+                            return this.wrapGrpcHandler(call, callback, (ctx) => {
+                                return (0, inject_1.Handler)(app, ctx, ctlIns.ctl, ctlIns.method, ctlIns.params);
+                            });
+                        };
                     }
                 }
+                this.SetRouter(serviceName, si.service, impl);
             }
         }
         catch (err) {
@@ -109,7 +123,7 @@ class GrpcRouter {
         const context = this.app.createContext(call, call, "grpc");
         Helper.define(context, "rpcCallback", callback);
         const middlewares = [...this.app.middleware, reqHandler];
-        return koa_compose_1.default(middlewares)(context);
+        return (0, koa_compose_1.default)(middlewares)(context);
     }
 }
 exports.GrpcRouter = GrpcRouter;

package/dist/grpc/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/grpc/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/grpc/router.ts"],"names":[],"mappings":"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"}

package/dist/http/mapping.js

@@ -67,7 +67,7 @@ exports.RequestMapping = RequestMapping;
  * @returns {MethodDecorator}
  */
 const PostMapping = (path = "/", routerOptions = {}) => {
-    return exports.RequestMapping(path, RequestMethod.POST, routerOptions);
+    return (0, exports.RequestMapping)(path, RequestMethod.POST, routerOptions);
 };
 exports.PostMapping = PostMapping;
 /**
@@ -80,7 +80,7 @@ exports.PostMapping = PostMapping;
  * @returns {MethodDecorator}
  */
 const GetMapping = (path = "/", routerOptions = {}) => {
-    return exports.RequestMapping(path, RequestMethod.GET, routerOptions);
+    return (0, exports.RequestMapping)(path, RequestMethod.GET, routerOptions);
 };
 exports.GetMapping = GetMapping;
 /**
@@ -93,7 +93,7 @@ exports.GetMapping = GetMapping;
  * @returns {MethodDecorator}
  */
 const DeleteMapping = (path = "/", routerOptions = {}) => {
-    return exports.RequestMapping(path, RequestMethod.DELETE, routerOptions);
+    return (0, exports.RequestMapping)(path, RequestMethod.DELETE, routerOptions);
 };
 exports.DeleteMapping = DeleteMapping;
 /**
@@ -106,7 +106,7 @@ exports.DeleteMapping = DeleteMapping;
  * @returns {MethodDecorator}
  */
 const PutMapping = (path = "/", routerOptions = {}) => {
-    return exports.RequestMapping(path, RequestMethod.PUT, routerOptions);
+    return (0, exports.RequestMapping)(path, RequestMethod.PUT, routerOptions);
 };
 exports.PutMapping = PutMapping;
 /**
@@ -119,7 +119,7 @@ exports.PutMapping = PutMapping;
  * @returns {MethodDecorator}
  */
 const PatchMapping = (path = "/", routerOptions = {}) => {
-    return exports.RequestMapping(path, RequestMethod.PATCH, routerOptions);
+    return (0, exports.RequestMapping)(path, RequestMethod.PATCH, routerOptions);
 };
 exports.PatchMapping = PatchMapping;
 /**
@@ -132,7 +132,7 @@ exports.PatchMapping = PatchMapping;
  * @returns {MethodDecorator}
  */
 const OptionsMapping = (path = "/", routerOptions = {}) => {
-    return exports.RequestMapping(path, RequestMethod.OPTIONS, routerOptions);
+    return (0, exports.RequestMapping)(path, RequestMethod.OPTIONS, routerOptions);
 };
 exports.OptionsMapping = OptionsMapping;
 /**
@@ -145,7 +145,7 @@ exports.OptionsMapping = OptionsMapping;
  * @returns {MethodDecorator}
  */
 const HeadMapping = (path = "/", routerOptions = {}) => {
-    return exports.RequestMapping(path, RequestMethod.HEAD, routerOptions);
+    return (0, exports.RequestMapping)(path, RequestMethod.HEAD, routerOptions);
 };
 exports.HeadMapping = HeadMapping;
 //# sourceMappingURL=mapping.js.map

package/dist/http/mapping.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapping.js","sourceRoot":"","sources":["../../src/http/mapping.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mapping.js","sourceRoot":"","sources":["../../src/http/mapping.ts"],"names":[],"mappings":"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"}

package/dist/http/request.js

@@ -4,7 +4,7 @@
  * @Usage:
  * @Author: richen
  * @Date: 2021-11-17 17:36:13
- * @LastEditTime: 2021-11-17 17:36:14
+ * @LastEditTime: 2021-11-19 16:50:37
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestParam = exports.RequestBody = exports.File = exports.Post = exports.Get = exports.PathVariable = exports.Header = void 0;
@@ -17,7 +17,7 @@ const inject_1 = require("../inject");
  * @returns
  */
 function Header(name) {
-    return inject_1.Inject((ctx) => {
+    return (0, inject_1.Inject)((ctx) => {
         if (name !== undefined) {
             return ctx.get(name);
         }
@@ -33,13 +33,13 @@ exports.Header = Header;
  * @returns
  */
 function PathVariable(name) {
-    return inject_1.Inject((ctx) => {
+    return (0, inject_1.Inject)((ctx) => {
         var _a;
-        const getParams = (_a = ctx.params) !== null && _a !== void 0 ? _a : {};
+        const pathParams = (_a = ctx.params) !== null && _a !== void 0 ? _a : {};
         if (name === undefined) {
-            return getParams;
+            return pathParams;
         }
-        return getParams[name];
+        return pathParams[name];
     }, "PathVariable");
 }
 exports.PathVariable = PathVariable;
@@ -51,13 +51,13 @@ exports.PathVariable = PathVariable;
  * @returns
  */
 function Get(name) {
-    return inject_1.Inject((ctx) => {
+    return (0, inject_1.Inject)((ctx) => {
         var _a;
-        const getParams = (_a = ctx.query) !== null && _a !== void 0 ? _a : {};
+        const queryParams = (_a = ctx.query) !== null && _a !== void 0 ? _a : {};
         if (name === undefined) {
-            return getParams;
+            return queryParams;
         }
-        return getParams[name];
+        return queryParams[name];
     }, "Get");
 }
 exports.Get = Get;
@@ -69,7 +69,7 @@ exports.Get = Get;
  * @returns
  */
 function Post(name) {
-    return inject_1.Inject((ctx) => {
+    return (0, inject_1.Inject)((ctx) => {
         return ctx.bodyParser().then((body) => {
             const params = body.post ? body.post : body;
             if (name === undefined) {
@@ -88,7 +88,7 @@ exports.Post = Post;
  * @returns
  */
 function File(name) {
-    return inject_1.Inject((ctx) => {
+    return (0, inject_1.Inject)((ctx) => {
         return ctx.bodyParser().then((body) => {
             var _a;
             const params = (_a = body.file) !== null && _a !== void 0 ? _a : {};
@@ -107,7 +107,7 @@ exports.File = File;
  * @returns
  */
 function RequestBody() {
-    return inject_1.Inject((ctx) => {
+    return (0, inject_1.Inject)((ctx) => {
         return ctx.bodyParser();
     }, "RequestBody");
 }
@@ -120,15 +120,15 @@ exports.RequestBody = RequestBody;
  * @returns {ParameterDecorator}
  */
 function RequestParam(name) {
-    return inject_1.Inject((ctx) => {
+    return (0, inject_1.Inject)((ctx) => {
         return ctx.bodyParser().then((body) => {
             var _a, _b;
-            const getParams = (_a = ctx.queryParser()) !== null && _a !== void 0 ? _a : {};
+            const queryParams = (_a = ctx.queryParser()) !== null && _a !== void 0 ? _a : {};
             const postParams = (_b = (body.post ? body.post : body)) !== null && _b !== void 0 ? _b : {};
             if (name !== undefined) {
-                return postParams[name] === undefined ? getParams[name] : postParams[name];
+                return postParams[name] === undefined ? queryParams[name] : postParams[name];
             }
-            return { ...getParams, ...postParams };
+            return { ...queryParams, ...postParams };
         });
     }, "RequestParam");
 }

package/dist/http/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/http/request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/http/request.ts"],"names":[],"mappings":"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"}

package/dist/http/router.js

@@ -7,10 +7,10 @@ const tslib_1 = require("tslib");
  * @Usage:
  * @Author: richen
  * @Date: 2021-06-28 19:02:06
- * @LastEditTime: 2021-11-17 18:25:26
+ * @LastEditTime: 2021-11-19 16:36:58
  */
-const router_1 = tslib_1.__importDefault(require("@koa/router"));
-const Helper = tslib_1.__importStar(require("koatty_lib"));
+const router_1 = (0, tslib_1.__importDefault)(require("@koa/router"));
+const Helper = (0, tslib_1.__importStar)(require("koatty_lib"));
 const koatty_logger_1 = require("koatty_logger");
 const koatty_container_1 = require("koatty_container");
 const inject_1 = require("../inject");
@@ -51,17 +51,19 @@ class HttpRouter {
             for (const n in list) {
                 const ctl = koatty_container_1.IOCContainer.getClass(n, "CONTROLLER");
                 // inject router
-                const ctlRouters = inject_1.injectRouter(app, ctl);
+                const ctlRouters = (0, inject_1.injectRouter)(app, ctl);
                 // inject param
-                const ctlParams = inject_1.injectParam(app, ctl);
+                const ctlParams = (0, inject_1.injectParam)(app, ctl);
                 // tslint:disable-next-line: forin
                 for (const it in ctlRouters) {
                     const router = ctlRouters[it];
                     const method = router.method;
+                    const path = router.path;
+                    const requestMethod = router.requestMethod;
                     const params = ctlParams[method];
-                    koatty_logger_1.DefaultLogger.Debug(`Register request mapping: [${ctlRouters[it].requestMethod}] : ["${ctlRouters[it].path}" => ${n}.${method}]`);
-                    kRouter[ctlRouters[it].requestMethod](ctlRouters[it].path, function (ctx) {
-                        return inject_1.Handler(app, ctx, n, method, params);
+                    koatty_logger_1.DefaultLogger.Debug(`Register request mapping: [${requestMethod}] : ["${path}" => ${n}.${method}]`);
+                    kRouter[requestMethod](path, function (ctx) {
+                        return (0, inject_1.Handler)(app, ctx, n, method, params);
                     });
                 }
             }

package/dist/http/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/http/router.ts"],"names":[],"mappings":";;;;AAAA;;;;;;GAMG;AACH,iEAAoC;AACpC,2DAAqC;AACrC,iDAAwD;AAExD,uDAAgD;AAEhD,sCAA+D;AAG/D;;GAEG;AACH,MAAa,UAAU;IAKnB,YAAY,GAAW,EAAE,OAA6B;QAClD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG;YACX,GAAG,OAAO;SACb,CAAC;QACF,aAAa;QACb,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,IAAY,EAAE,IAAc,EAAE,MAAsB;QAC1D,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACxB,OAAO;SACV;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAO,IAAI,CAAC,CAAC;IACzC,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,IAAW;QAClB,IAAI;YACA,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;YACrB,MAAM,OAAO,GAAQ,IAAI,CAAC,MAAM,CAAC;YACjC,kCAAkC;YAClC,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;gBAClB,MAAM,GAAG,GAAG,+BAAY,CAAC,QAAQ,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;gBACnD,gBAAgB;gBAChB,MAAM,UAAU,GAAG,qBAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBAC1C,eAAe;gBACf,MAAM,SAAS,GAAG,oBAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACxC,kCAAkC;gBAClC,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE;oBACzB,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;oBAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;oBAC7B,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;oBACjC,6BAAM,CAAC,KAAK,CAAC,8BAA8B,UAAU,CAAC,EAAE,CAAC,CAAC,aAAa,SAAS,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC;oBAC3H,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,GAAkB;wBACnF,OAAO,gBAAO,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;oBAChD,CAAC,CAAC,CAAC;iBACN;aACJ;YAED,yEAAyE;YACzE,qBAAqB;YACrB,+EAA+E;YAC/E,GAAG,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;gBACpB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;SACN;QAAC,OAAO,GAAG,EAAE;YACV,6BAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACrB;IACL,CAAC;CAEJ;AAlED,gCAkEC"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/http/router.ts"],"names":[],"mappings":";;;;AAAA;;;;;;GAMG;AACH,sEAAoC;AACpC,gEAAqC;AACrC,iDAAwD;AAExD,uDAAgD;AAEhD,sCAA+D;AAG/D;;GAEG;AACH,MAAa,UAAU;IAKnB,YAAY,GAAW,EAAE,OAA6B;QAClD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG;YACX,GAAG,OAAO;SACb,CAAC;QACF,aAAa;QACb,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,IAAY,EAAE,IAAc,EAAE,MAAsB;QAC1D,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACxB,OAAO;SACV;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAO,IAAI,CAAC,CAAC;IACzC,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,IAAW;QAClB,IAAI;YACA,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;YACrB,MAAM,OAAO,GAAQ,IAAI,CAAC,MAAM,CAAC;YACjC,kCAAkC;YAClC,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;gBAClB,MAAM,GAAG,GAAG,+BAAY,CAAC,QAAQ,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;gBACnD,gBAAgB;gBAChB,MAAM,UAAU,GAAG,IAAA,qBAAY,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBAC1C,eAAe;gBACf,MAAM,SAAS,GAAG,IAAA,oBAAW,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACxC,kCAAkC;gBAClC,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE;oBACzB,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;oBAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;oBAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;oBACzB,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;oBAC3C,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;oBACjC,6BAAM,CAAC,KAAK,CAAC,8BAA8B,aAAa,SAAS,IAAI,QAAQ,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC;oBAC7F,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,UAAU,GAAkB;wBACrD,OAAO,IAAA,gBAAO,EAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;oBAChD,CAAC,CAAC,CAAC;iBACN;aACJ;YAED,yEAAyE;YACzE,qBAAqB;YACrB,+EAA+E;YAC/E,GAAG,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;gBACpB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;SACN;QAAC,OAAO,GAAG,EAAE;YACV,6BAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACrB;IACL,CAAC;CAEJ;AApED,gCAoEC"}

package/dist/index.js

@@ -9,11 +9,11 @@ const router_3 = require("./websocket/router");
 exports.PARAM_KEY = 'PARAM_KEY';
 exports.CONTROLLER_ROUTER = 'CONTROLLER_ROUTER';
 exports.ROUTER_KEY = 'ROUTER_KEY';
-tslib_1.__exportStar(require("./http/mapping"), exports);
-tslib_1.__exportStar(require("./http/request"), exports);
-tslib_1.__exportStar(require("./http/router"), exports);
-tslib_1.__exportStar(require("./grpc/router"), exports);
-tslib_1.__exportStar(require("./websocket/router"), exports);
+(0, tslib_1.__exportStar)(require("./http/mapping"), exports);
+(0, tslib_1.__exportStar)(require("./http/request"), exports);
+(0, tslib_1.__exportStar)(require("./http/router"), exports);
+(0, tslib_1.__exportStar)(require("./grpc/router"), exports);
+(0, tslib_1.__exportStar)(require("./websocket/router"), exports);
 /**
  * get instance of Router
  *

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAQA,0CAA2C;AAC3C,0CAA2C;AAC3C,+CAAqD;AAErD,SAAS;AACI,QAAA,SAAS,GAAG,WAAW,CAAC;AACxB,QAAA,iBAAiB,GAAG,mBAAmB,CAAC;AACxC,QAAA,UAAU,GAAG,YAAY,CAAC;AACvC,yDAA+B;AAC/B,yDAA+B;AAC/B,wDAA8B;AAC9B,wDAA8B;AAC9B,6DAAmC;AAEnC;;;;;;;;GAQG;AACH,SAAgB,SAAS,CAAC,GAAW,EAAE,OAA4B,EAAE,QAAiB;IAClF,IAAI,MAAM,CAAC;IACX,QAAQ,QAAQ,EAAE;QACd,KAAK,MAAM;YACP,MAAM,GAAG,IAAI,mBAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YACtC,MAAM;QACV,KAAK,IAAI,CAAC;QACV,KAAK,KAAK;YACN,MAAM,GAAG,IAAI,wBAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YAC1C,MAAM;QACV,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,OAAO,CAAC;QACb;YACI,MAAM,GAAG,IAAI,mBAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;KAC7C;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAjBD,8BAiBC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAQA,0CAA2C;AAC3C,0CAA2C;AAC3C,+CAAqD;AAErD,SAAS;AACI,QAAA,SAAS,GAAG,WAAW,CAAC;AACxB,QAAA,iBAAiB,GAAG,mBAAmB,CAAC;AACxC,QAAA,UAAU,GAAG,YAAY,CAAC;AACvC,8DAA+B;AAC/B,8DAA+B;AAC/B,6DAA8B;AAC9B,6DAA8B;AAC9B,kEAAmC;AAEnC;;;;;;;;GAQG;AACH,SAAgB,SAAS,CAAC,GAAW,EAAE,OAA4B,EAAE,QAAiB;IAClF,IAAI,MAAM,CAAC;IACX,QAAQ,QAAQ,EAAE;QACd,KAAK,MAAM;YACP,MAAM,GAAG,IAAI,mBAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YACtC,MAAM;QACV,KAAK,IAAI,CAAC;QACV,KAAK,KAAK;YACN,MAAM,GAAG,IAAI,wBAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YAC1C,MAAM;QACV,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,OAAO,CAAC;QACb;YACI,MAAM,GAAG,IAAI,mBAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;KAC7C;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAjBD,8BAiBC"}

package/dist/inject.d.ts

@@ -1,4 +1,9 @@
 import { Koatty, KoattyContext } from "koatty_core";
+/**
+ * Inject ParameterDecorator
+ * @param fn
+ */
+export declare const Inject: (fn: Function, name: string) => ParameterDecorator;
 /**
  * controller handler
  *
@@ -28,8 +33,3 @@ export declare function injectRouter(app: Koatty, target: any, instance?: any):
  * @returns {*}
  */
 export declare function injectParam(app: Koatty, target: any, instance?: any): any;
-/**
- * Inject ParameterDecorator
- * @param fn
- */
-export declare const Inject: (fn: Function, name: string) => ParameterDecorator;