koatty_router 1.9.0 → 1.9.2

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.9.2](https://github.com/koatty/koatty_router/compare/v1.9.1...v1.9.2) (2024-03-15)
+
+
+### Bug Fixes
+
+* controller方法执行结果错误对象拦截 ([1536793](https://github.com/koatty/koatty_router/commit/1536793e89c5af2aa2114c71eef4c155b627da01))
+
+### [1.9.1](https://github.com/koatty/koatty_router/compare/v1.9.0...v1.9.1) (2024-03-15)
+
+
+### Bug Fixes
+
+* injectParamMetaData参数传递错误 ([c2f91c4](https://github.com/koatty/koatty_router/commit/c2f91c4d825c5ba573f56360f3113636d58a3dd3))
+
 ## [1.9.0](https://github.com/koatty/koatty_router/compare/v1.9.0-2...v1.9.0) (2024-01-16)
 
 ## [1.9.0-2](https://github.com/koatty/koatty_router/compare/v1.9.0-1...v1.9.0-2) (2024-01-15)

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2024-01-16 08:30:50
+* @Date: 2024-03-15 11:22:50
 * @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: 2024-01-16 08:30:38
+* @Date: 2024-03-15 11:22:37
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -212,7 +212,7 @@ const HeadMapping = (path = "/", routerOptions = {}) => {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 12:02:29
- * @LastEditTime: 2024-01-16 08:27:06
+ * @LastEditTime: 2024-03-15 11:12:12
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -240,6 +240,9 @@ async function Handler(app, ctx, ctl, method, ctlParams) {
     }
     // method
     const res = await ctl[method](...args);
+    if (Helper.Helper.isError(res)) {
+        throw res;
+    }
     ctx.body = ctx.body || res;
 }
 /**
@@ -282,55 +285,55 @@ function injectRouter(app, target, instance) {
  *
  * @param {Koatty} app
  * @param {*} target
- * @param {*} [instance]
+ * @param {*} [options]
  * @returns {*}
  */
-function injectParamMetaData(app, target, instance, options) {
+function injectParamMetaData(app, target, options) {
     var _a, _b;
-    instance = instance || target.prototype;
+    // const instance = target.prototype;
     const metaDatas = koatty_container.RecursiveGetMetadata(koatty_container.TAGGED_PARAM, target);
     const validMetaDatas = koatty_container.RecursiveGetMetadata(koatty_validation.PARAM_RULE_KEY, target);
     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.Helper.toString(meta)} => value: ${JSON.stringify(metaDatas[meta])}`);
-            // 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 : [];
-            data.forEach((v) => {
-                var _a;
-                validData.forEach((it) => {
-                    if (v.index === it.index && it.name === v.name) {
-                        v.validRule = it.rule;
-                        v.validOpt = it.options;
-                    }
-                });
-                if (v.type) {
-                    v.type = v.isDto ? v.type : (v.type).toLowerCase();
+        // if (instance[meta] && instance[meta].length <= metaDatas[meta].length) {
+        koatty_logger.DefaultLogger.Debug(`Register inject param key ${koatty_container.IOCContainer.getIdentifier(target)}: ${Helper.Helper.toString(meta)} => value: ${JSON.stringify(metaDatas[meta])}`);
+        // 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 : [];
+        data.forEach((v) => {
+            var _a;
+            validData.forEach((it) => {
+                if (v.index === it.index && it.name === v.name) {
+                    v.validRule = it.rule;
+                    v.validOpt = it.options;
                 }
-                v.dtoCheck = !!(((_a = validatedMetaDatas[meta]) === null || _a === void 0 ? void 0 : _a.dtoCheck));
-                if (v.isDto) {
-                    v.clazz = koatty_container.IOCContainer.getClass(v.type, "COMPONENT");
-                    if (!v.clazz) {
-                        throw Error(`Failed to obtain the class ${v.type},
+            });
+            if (v.type) {
+                v.type = v.isDto ? v.type : (v.type).toLowerCase();
+            }
+            v.dtoCheck = !!(((_a = validatedMetaDatas[meta]) === null || _a === void 0 ? void 0 : _a.dtoCheck));
+            if (v.isDto) {
+                v.clazz = koatty_container.IOCContainer.getClass(v.type, "COMPONENT");
+                if (!v.clazz) {
+                    throw Error(`Failed to obtain the class ${v.type},
             because the class is not registered in the container.`);
-                    }
-                    if (v.dtoCheck) {
-                        v.dtoRule = koatty_container.getOriginMetadata(koatty_validation.PARAM_TYPE_KEY, v.clazz);
-                        Reflect.defineProperty(v.clazz.prototype, "_typeDef", {
-                            enumerable: true,
-                            configurable: false,
-                            writable: false,
-                            value: v.dtoRule,
-                        });
-                    }
                 }
-                v.options = options;
-            });
-            argsMetaObj[meta] = data;
-        }
+                if (v.dtoCheck) {
+                    v.dtoRule = koatty_container.getOriginMetadata(koatty_validation.PARAM_TYPE_KEY, v.clazz);
+                    Reflect.defineProperty(v.clazz.prototype, "_typeDef", {
+                        enumerable: true,
+                        configurable: false,
+                        writable: false,
+                        value: v.dtoRule,
+                    });
+                }
+            }
+            v.options = options;
+        });
+        argsMetaObj[meta] = data;
+        // }
     }
     return argsMetaObj;
 }
@@ -711,7 +714,7 @@ async function parseXml(ctx, opts) {
  * @Usage:
  * @Author: richen
  * @Date: 2021-06-29 14:10:30
- * @LastEditTime: 2024-01-16 00:30:29
+ * @LastEditTime: 2024-01-16 22:49:46
  */
 class GrpcRouter {
     constructor(app, options) {

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2024-01-16 08:30:38
+* @Date: 2024-03-15 11:22:37
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -192,7 +192,7 @@ const HeadMapping = (path = "/", routerOptions = {}) => {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 12:02:29
- * @LastEditTime: 2024-01-16 08:27:06
+ * @LastEditTime: 2024-03-15 11:12:12
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -220,6 +220,9 @@ async function Handler(app, ctx, ctl, method, ctlParams) {
     }
     // method
     const res = await ctl[method](...args);
+    if (Helper$1.isError(res)) {
+        throw res;
+    }
     ctx.body = ctx.body || res;
 }
 /**
@@ -262,55 +265,55 @@ function injectRouter(app, target, instance) {
  *
  * @param {Koatty} app
  * @param {*} target
- * @param {*} [instance]
+ * @param {*} [options]
  * @returns {*}
  */
-function injectParamMetaData(app, target, instance, options) {
+function injectParamMetaData(app, target, options) {
     var _a, _b;
-    instance = instance || target.prototype;
+    // const instance = target.prototype;
     const metaDatas = RecursiveGetMetadata(TAGGED_PARAM, target);
     const validMetaDatas = RecursiveGetMetadata(PARAM_RULE_KEY, target);
     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$1.toString(meta)} => value: ${JSON.stringify(metaDatas[meta])}`);
-            // 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 : [];
-            data.forEach((v) => {
-                var _a;
-                validData.forEach((it) => {
-                    if (v.index === it.index && it.name === v.name) {
-                        v.validRule = it.rule;
-                        v.validOpt = it.options;
-                    }
-                });
-                if (v.type) {
-                    v.type = v.isDto ? v.type : (v.type).toLowerCase();
+        // if (instance[meta] && instance[meta].length <= metaDatas[meta].length) {
+        DefaultLogger.Debug(`Register inject param key ${IOCContainer.getIdentifier(target)}: ${Helper$1.toString(meta)} => value: ${JSON.stringify(metaDatas[meta])}`);
+        // 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 : [];
+        data.forEach((v) => {
+            var _a;
+            validData.forEach((it) => {
+                if (v.index === it.index && it.name === v.name) {
+                    v.validRule = it.rule;
+                    v.validOpt = it.options;
                 }
-                v.dtoCheck = !!(((_a = validatedMetaDatas[meta]) === null || _a === void 0 ? void 0 : _a.dtoCheck));
-                if (v.isDto) {
-                    v.clazz = IOCContainer.getClass(v.type, "COMPONENT");
-                    if (!v.clazz) {
-                        throw Error(`Failed to obtain the class ${v.type},
+            });
+            if (v.type) {
+                v.type = v.isDto ? v.type : (v.type).toLowerCase();
+            }
+            v.dtoCheck = !!(((_a = validatedMetaDatas[meta]) === null || _a === void 0 ? void 0 : _a.dtoCheck));
+            if (v.isDto) {
+                v.clazz = IOCContainer.getClass(v.type, "COMPONENT");
+                if (!v.clazz) {
+                    throw Error(`Failed to obtain the class ${v.type},
             because the class is not registered in the container.`);
-                    }
-                    if (v.dtoCheck) {
-                        v.dtoRule = getOriginMetadata(PARAM_TYPE_KEY, v.clazz);
-                        Reflect.defineProperty(v.clazz.prototype, "_typeDef", {
-                            enumerable: true,
-                            configurable: false,
-                            writable: false,
-                            value: v.dtoRule,
-                        });
-                    }
                 }
-                v.options = options;
-            });
-            argsMetaObj[meta] = data;
-        }
+                if (v.dtoCheck) {
+                    v.dtoRule = getOriginMetadata(PARAM_TYPE_KEY, v.clazz);
+                    Reflect.defineProperty(v.clazz.prototype, "_typeDef", {
+                        enumerable: true,
+                        configurable: false,
+                        writable: false,
+                        value: v.dtoRule,
+                    });
+                }
+            }
+            v.options = options;
+        });
+        argsMetaObj[meta] = data;
+        // }
     }
     return argsMetaObj;
 }
@@ -691,7 +694,7 @@ async function parseXml(ctx, opts) {
  * @Usage:
  * @Author: richen
  * @Date: 2021-06-29 14:10:30
- * @LastEditTime: 2024-01-16 00:30:29
+ * @LastEditTime: 2024-01-16 22:49:46
  */
 class GrpcRouter {
     constructor(app, options) {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty_router",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "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.9.0",
+  "version": "1.9.2",
   "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",