koatty 3.11.2-6 → 3.11.2-8

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 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.
 
+### [3.11.2-8](https://github.com/thinkkoa/koatty/compare/v3.11.2-7...v3.11.2-8) (2024-01-16)
+
+### [3.11.2-7](https://github.com/thinkkoa/koatty/compare/v3.11.2-6...v3.11.2-7) (2024-01-15)
+
+
+### Refactor
+
+* export router interface ([b6bc181](https://github.com/thinkkoa/koatty/commit/b6bc1819ca97817e5c26376a5b4d12c8992bbe62))
+* output ([286f57a](https://github.com/thinkkoa/koatty/commit/286f57ae7e4133a1bf3c6e3d58c870fb218bd575))
+* output interface ([53cd320](https://github.com/thinkkoa/koatty/commit/53cd3207ba5db6fc9fa6cf3d94543df208576833))
+* remove base class ([cebc6d7](https://github.com/thinkkoa/koatty/commit/cebc6d734bae800fe9be3321acef48760210292b))
+* 调整router、server初始化 ([2af33b8](https://github.com/thinkkoa/koatty/commit/2af33b8df554bfee4bbeac7bcac3d219fd9a7af0))
+
 ### [3.11.2-6](https://github.com/thinkkoa/koatty/compare/v3.11.2-5...v3.11.2-6) (2024-01-14)
 
 ### [3.11.2-5](https://github.com/thinkkoa/koatty/compare/v3.11.2-4...v3.11.2-5) (2024-01-07)

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2024-01-14 23:03:45
+* @Date: 2024-01-16 08:38:27
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -20,7 +20,7 @@ import { Value } from 'koatty_config';
 /**
  * Interface for Api input
  */
-export declare interface ApiInput {
+declare interface ApiInput {
     code?: number;
     message?: string;
     data?: any;
@@ -29,83 +29,12 @@ export declare interface ApiInput {
 /**
  * Interface for Api output
  */
-export declare interface ApiOutput {
+declare interface ApiOutput {
     code: number;
     message: string;
     data: any;
 }
 
-/**
- * Base controller
- *
- * @export
- * @deprecated When the framework version is > 3.10.5, do not need to inherit the Base class.
- * @class BaseController
- * @implements {IController}
- */
-export declare class BaseController implements IController {
-    readonly app: Koatty;
-    readonly ctx: KoattyContext;
-    /**
-     * instance of BaseController.
-     * @param {Koatty} app
-     * @param {KoattyContext} ctx
-     * @memberof BaseController
-     */
-    /**
-     * init
-     *
-     * @memberof BaseController
-     */
-    init(...arg: any[]): void;
-    /**
-     * Response to normalize json format content for success
-     *
-     * @deprecated 使用 Output.ok 代替
-     * @param {(string | ApiInput)} msg   待处理的message消息
-     * @param {*} [data]    待处理的数据
-     * @param {number} [code=200]    错误码，默认0
-     * @returns {*}
-     * @memberof BaseController
-     */
-    ok(msg: string | ApiInput, data?: any, code?: number): Promise<ApiOutput>;
-    /**
-     * Response to normalize json format content for fail
-     *
-     * @deprecated 使用 Output.fail 代替
-     * @param {(string | ApiInput)} msg
-     * @param {*} [data]
-     * @param {number} [code=1]
-     * @returns {*}
-     * @memberof BaseController
-     */
-    fail(msg: Error | string | ApiInput, data?: any, code?: number): void;
-}
-
-/**
- * Base service
- *
- * @export
- * @deprecated When the framework version is > 3.10.5, do not need to inherit the Base class.
- * @class Base
- */
-export declare class BaseService implements IService {
-    readonly app: Koatty;
-    /**
-     * instance of BaseController.
-     * @param {Koatty} app
-     * @param {KoattyContext} ctx
-     * @memberof BaseController
-     */
-    /**
-     * init
-     *
-     * @protected
-     * @memberof BaseController
-     */
-    init(...arg: any[]): void;
-}
-
 /**
  * @description: bind App event hook func
  * example:
@@ -312,6 +241,7 @@ export { Value }
 export * from "koatty_container";
 export * from "koatty_core";
 export * from "koatty_exception";
+export * from "koatty_router";
 export * from "koatty_serve";
 
 export { }

package/dist/index.js

@@ -1,12 +1,13 @@
 /*!
 * @Author: richen
-* @Date: 2024-01-14 23:03:33
+* @Date: 2024-01-16 08:38:15
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
 */
 'use strict';
 
+var koatty_router = require('koatty_router');
 var koatty_container = require('koatty_container');
 var koatty_core = require('koatty_core');
 var koatty_serve = require('koatty_serve');
@@ -60,7 +61,7 @@ function TraceHandler(app) {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2023-12-09 23:01:56
+ * @LastEditTime: 2024-01-16 01:20:17
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -100,36 +101,6 @@ function checkClass(fileName, xpath, target, exSet) {
     exSet.add(fileName);
     return;
 }
-/**
- * Format api interface data format
- *
- * @private
- * @param {Error | string | ApiInput} msg   待处理的接口数据信息｜接口msg
- * @param {*} data    待返回的数据
- * @param {number} defaultCode   默认错误码
- * @returns {ApiOutput}   格式化之后的接口数据
- * @memberof BaseController
- */
-function formatApiData(msg, data, defaultCode) {
-    let obj = {
-        code: defaultCode,
-        message: '',
-        data: null,
-    };
-    if (koatty_lib.Helper.isError(msg)) {
-        const { code, message } = msg;
-        obj.code = code || defaultCode;
-        obj.message = message;
-    }
-    else if (koatty_lib.Helper.isObject(msg)) {
-        obj = { ...obj, ...msg };
-    }
-    else {
-        obj.message = msg;
-        obj.data = data;
-    }
-    return obj;
-}
 
 /*
  * @Description: framework logger
@@ -171,7 +142,7 @@ function SetLogger(app, config) {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2024-01-04 07:43:03
+ * @LastEditTime: 2024-01-16 01:17:46
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -200,7 +171,7 @@ function Controller(path = "") {
     return (target) => {
         const identifier = koatty_container.IOCContainer.getIdentifier(target);
         koatty_container.IOCContainer.saveClass("CONTROLLER", target, identifier);
-        koatty_container.IOCContainer.savePropertyData(koatty_serve.CONTROLLER_ROUTER, path, target, identifier);
+        koatty_container.IOCContainer.savePropertyData(koatty_router.CONTROLLER_ROUTER, path, target, identifier);
     };
 }
 /**
@@ -716,7 +687,7 @@ class Loader {
     }
 }
 
-var version = "3.11.2-6";
+var version = "3.11.2-8";
 var engines = {
 	node: ">12.0.0"
 };
@@ -769,7 +740,7 @@ const checkUTRuntime = () => {
  * @Usage:
  * @Author: richen
  * @Date: 2021-12-09 21:56:32
- * @LastEditTime: 2024-01-06 10:42:42
+ * @LastEditTime: 2024-01-16 01:06:26
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -822,6 +793,12 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         Loader.LoadAppEventHooks(app, target);
         Logger.Log('Koatty', '', 'Emit App Boot ...');
         await asyncEvent(app, "appBoot" /* AppEvent.appBoot */);
+        // Create Server
+        // app.server = newServe(app);
+        koatty_lib.Helper.define(app, "server", koatty_serve.NewServe(app));
+        // Create router
+        // app.router = newRouter(app);
+        koatty_lib.Helper.define(app, "router", koatty_router.NewRouter(app));
         // Load Components
         Logger.Log('Koatty', '', 'Load Components ...');
         await Loader.LoadComponents(app);
@@ -834,18 +811,12 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         // Load Controllers
         Logger.Log('Koatty', '', 'Load Controllers ...');
         const controllers = Loader.LoadControllers(app);
-        // Create Server
-        // app.server = newServe(app);
-        koatty_lib.Helper.define(app, "server", koatty_serve.NewServe(app));
-        // Create router
-        // app.router = newRouter(app);
-        koatty_lib.Helper.define(app, "router", koatty_serve.NewRouter(app));
         // Emit app ready event
         Logger.Log('Koatty', '', 'Emit App Ready ...');
         await asyncEvent(app, "appReady" /* AppEvent.appReady */);
         // Load Routers
         Logger.Log('Koatty', '', 'Load Routers ...');
-        app.router.LoadRouter(controllers);
+        app.router.LoadRouter(app, controllers);
         if (!isUTRuntime) {
             // Start Server
             app.listen(listenCallback);
@@ -978,137 +949,12 @@ function BindEventHook(eventName, eventFunc, target) {
     koatty_container.IOCContainer.attachClassMetadata(koatty_container.TAGGED_CLS, eventName, eventFunc, target);
 }
 
-/*
- * @Description: base service
- * @Usage:
- * @Author: richen
- * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2024-01-03 21:57:26
- * @License: BSD (3-Clause)
- * @Copyright (c): <richenlin(at)gmail.com>
- */
-/**
- * Base service
- *
- * @export
- * @deprecated When the framework version is > 3.10.5, do not need to inherit the Base class.
- * @class Base
- */
-class BaseService {
-    /**
-     * instance of BaseController.
-     * @param {Koatty} app
-     * @param {KoattyContext} ctx
-     * @memberof BaseController
-     */
-    constructor(...arg) {
-        this.init(arg);
-    }
-    /**
-     * init
-     *
-     * @protected
-     * @memberof BaseController
-     */
-    init(...arg) {
-    }
-}
-
-/*
- * @Description: base controller
- * @Usage:
- * @Author: richen
- * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2024-01-03 21:57:20
- * @License: BSD (3-Clause)
- * @Copyright (c): <richenlin(at)gmail.com>
- */
-/**
- * Base controller
- *
- * @export
- * @deprecated When the framework version is > 3.10.5, do not need to inherit the Base class.
- * @class BaseController
- * @implements {IController}
- */
-class BaseController {
-    /**
-     * instance of BaseController.
-     * @param {Koatty} app
-     * @param {KoattyContext} ctx
-     * @memberof BaseController
-     */
-    constructor(ctx, ...arg) {
-        this.ctx = ctx;
-        this.init(arg);
-    }
-    /**
-     * init
-     *
-     * @memberof BaseController
-     */
-    init(...arg) {
-    }
-    /**
-     * Response to normalize json format content for success
-     *
-     * @deprecated 使用 Output.ok 代替
-     * @param {(string | ApiInput)} msg   待处理的message消息
-     * @param {*} [data]    待处理的数据
-     * @param {number} [code=200]    错误码，默认0
-     * @returns {*}
-     * @memberof BaseController
-     */
-    ok(msg, data, code = 0) {
-        const obj = formatApiData(msg, data, code);
-        return Promise.resolve(obj);
-    }
-    /**
-     * Response to normalize json format content for fail
-     *
-     * @deprecated 使用 Output.fail 代替
-     * @param {(string | ApiInput)} msg
-     * @param {*} [data]
-     * @param {number} [code=1]
-     * @returns {*}
-     * @memberof BaseController
-     */
-    fail(msg, data, code = 1) {
-        const obj = formatApiData(msg, data, code);
-        this.ctx.body = obj.data;
-        this.ctx.throw(obj.message, obj.code, 200);
-    }
-}
-// const properties = ["constructor", "init"];
-// export const BaseController = new Proxy(Base, {
-//     set(target, key, value, receiver) {
-//         if (Reflect.get(target, key, receiver) === undefined) {
-//             return Reflect.set(target, key, value, receiver);
-//         } else if (key === "init") {
-//             return Reflect.set(target, key, value, receiver);
-//         } else {
-//             throw Error("Cannot redefine getter-only property");
-//         }
-//     },
-//     deleteProperty(target, key) {
-//         throw Error("Cannot delete getter-only property");
-//     },
-//     construct(target, args, newTarget) {
-//         Reflect.ownKeys(target.prototype).map((n) => {
-//             if (newTarget.prototype.hasOwnProperty(n) && !properties.includes(Helper.toString(n))) {
-//                 throw Error(`Cannot override the final method "${Helper.toString(n)}"`);
-//             }
-//         });
-//         return Reflect.construct(target, args, newTarget);
-//     }
-// });
-
 /*
  * @Description: output data
  * @Usage:
  * @Author: richen
  * @Date: 2024-01-03 22:03:34
- * @LastEditTime: 2024-01-03 22:07:20
+ * @LastEditTime: 2024-01-16 01:20:36
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -1143,6 +989,36 @@ class Output {
         ctx.throw(obj.message, obj.code, 200);
     }
 }
+/**
+ * Format api interface data format
+ *
+ * @private
+ * @param {Error | string | ApiInput} msg   待处理的接口数据信息｜接口msg
+ * @param {*} data    待返回的数据
+ * @param {number} defaultCode   默认错误码
+ * @returns {ApiOutput}   格式化之后的接口数据
+ * @memberof BaseController
+ */
+function formatApiData(msg, data, defaultCode) {
+    let obj = {
+        code: defaultCode,
+        message: '',
+        data: null,
+    };
+    if (koatty_lib.Helper.isError(msg)) {
+        const { code, message } = msg;
+        obj.code = code || defaultCode;
+        obj.message = message;
+    }
+    else if (koatty_lib.Helper.isObject(msg)) {
+        obj = { ...obj, ...msg };
+    }
+    else {
+        obj.message = msg;
+        obj.data = data;
+    }
+    return obj;
+}
 
 Object.defineProperty(exports, 'Config', {
   enumerable: true,
@@ -1156,8 +1032,6 @@ Object.defineProperty(exports, 'Helper', {
   enumerable: true,
   get: function () { return koatty_lib.Helper; }
 });
-exports.BaseController = BaseController;
-exports.BaseService = BaseService;
 exports.BindEventHook = BindEventHook;
 exports.Bootstrap = Bootstrap;
 exports.Component = Component;
@@ -1175,6 +1049,12 @@ exports.implementsControllerInterface = implementsControllerInterface;
 exports.implementsMiddlewareInterface = implementsMiddlewareInterface;
 exports.implementsPluginInterface = implementsPluginInterface;
 exports.implementsServiceInterface = implementsServiceInterface;
+Object.keys(koatty_router).forEach(function (k) {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return koatty_router[k]; }
+  });
+});
 Object.keys(koatty_container).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,

package/dist/index.mjs

@@ -1,15 +1,17 @@
 /*!
 * @Author: richen
-* @Date: 2024-01-14 23:03:33
+* @Date: 2024-01-16 08:38:15
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
 */
+import { CONTROLLER_ROUTER, NewRouter } from 'koatty_router';
+export * from 'koatty_router';
 import { IOCContainer, TAGGED_CLS } from 'koatty_container';
 export * from 'koatty_container';
 import { AppEventArr, Koatty } from 'koatty_core';
 export * from 'koatty_core';
-import { CONTROLLER_ROUTER, NewServe, NewRouter, BindProcessEvent } from 'koatty_serve';
+import { NewServe, BindProcessEvent } from 'koatty_serve';
 export * from 'koatty_serve';
 import * as path from 'path';
 import { Load } from 'koatty_loader';
@@ -45,7 +47,7 @@ function TraceHandler(app) {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2023-12-09 23:01:56
+ * @LastEditTime: 2024-01-16 01:20:17
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -85,36 +87,6 @@ function checkClass(fileName, xpath, target, exSet) {
     exSet.add(fileName);
     return;
 }
-/**
- * Format api interface data format
- *
- * @private
- * @param {Error | string | ApiInput} msg   待处理的接口数据信息｜接口msg
- * @param {*} data    待返回的数据
- * @param {number} defaultCode   默认错误码
- * @returns {ApiOutput}   格式化之后的接口数据
- * @memberof BaseController
- */
-function formatApiData(msg, data, defaultCode) {
-    let obj = {
-        code: defaultCode,
-        message: '',
-        data: null,
-    };
-    if (Helper.isError(msg)) {
-        const { code, message } = msg;
-        obj.code = code || defaultCode;
-        obj.message = message;
-    }
-    else if (Helper.isObject(msg)) {
-        obj = { ...obj, ...msg };
-    }
-    else {
-        obj.message = msg;
-        obj.data = data;
-    }
-    return obj;
-}
 
 /*
  * @Description: framework logger
@@ -156,7 +128,7 @@ function SetLogger(app, config) {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2024-01-04 07:43:03
+ * @LastEditTime: 2024-01-16 01:17:46
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -701,7 +673,7 @@ class Loader {
     }
 }
 
-var version = "3.11.2-6";
+var version = "3.11.2-8";
 var engines = {
 	node: ">12.0.0"
 };
@@ -754,7 +726,7 @@ const checkUTRuntime = () => {
  * @Usage:
  * @Author: richen
  * @Date: 2021-12-09 21:56:32
- * @LastEditTime: 2024-01-06 10:42:42
+ * @LastEditTime: 2024-01-16 01:06:26
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -807,6 +779,12 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         Loader.LoadAppEventHooks(app, target);
         Logger.Log('Koatty', '', 'Emit App Boot ...');
         await asyncEvent(app, "appBoot" /* AppEvent.appBoot */);
+        // Create Server
+        // app.server = newServe(app);
+        Helper.define(app, "server", NewServe(app));
+        // Create router
+        // app.router = newRouter(app);
+        Helper.define(app, "router", NewRouter(app));
         // Load Components
         Logger.Log('Koatty', '', 'Load Components ...');
         await Loader.LoadComponents(app);
@@ -819,18 +797,12 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         // Load Controllers
         Logger.Log('Koatty', '', 'Load Controllers ...');
         const controllers = Loader.LoadControllers(app);
-        // Create Server
-        // app.server = newServe(app);
-        Helper.define(app, "server", NewServe(app));
-        // Create router
-        // app.router = newRouter(app);
-        Helper.define(app, "router", NewRouter(app));
         // Emit app ready event
         Logger.Log('Koatty', '', 'Emit App Ready ...');
         await asyncEvent(app, "appReady" /* AppEvent.appReady */);
         // Load Routers
         Logger.Log('Koatty', '', 'Load Routers ...');
-        app.router.LoadRouter(controllers);
+        app.router.LoadRouter(app, controllers);
         if (!isUTRuntime) {
             // Start Server
             app.listen(listenCallback);
@@ -963,137 +935,12 @@ function BindEventHook(eventName, eventFunc, target) {
     IOCContainer.attachClassMetadata(TAGGED_CLS, eventName, eventFunc, target);
 }
 
-/*
- * @Description: base service
- * @Usage:
- * @Author: richen
- * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2024-01-03 21:57:26
- * @License: BSD (3-Clause)
- * @Copyright (c): <richenlin(at)gmail.com>
- */
-/**
- * Base service
- *
- * @export
- * @deprecated When the framework version is > 3.10.5, do not need to inherit the Base class.
- * @class Base
- */
-class BaseService {
-    /**
-     * instance of BaseController.
-     * @param {Koatty} app
-     * @param {KoattyContext} ctx
-     * @memberof BaseController
-     */
-    constructor(...arg) {
-        this.init(arg);
-    }
-    /**
-     * init
-     *
-     * @protected
-     * @memberof BaseController
-     */
-    init(...arg) {
-    }
-}
-
-/*
- * @Description: base controller
- * @Usage:
- * @Author: richen
- * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2024-01-03 21:57:20
- * @License: BSD (3-Clause)
- * @Copyright (c): <richenlin(at)gmail.com>
- */
-/**
- * Base controller
- *
- * @export
- * @deprecated When the framework version is > 3.10.5, do not need to inherit the Base class.
- * @class BaseController
- * @implements {IController}
- */
-class BaseController {
-    /**
-     * instance of BaseController.
-     * @param {Koatty} app
-     * @param {KoattyContext} ctx
-     * @memberof BaseController
-     */
-    constructor(ctx, ...arg) {
-        this.ctx = ctx;
-        this.init(arg);
-    }
-    /**
-     * init
-     *
-     * @memberof BaseController
-     */
-    init(...arg) {
-    }
-    /**
-     * Response to normalize json format content for success
-     *
-     * @deprecated 使用 Output.ok 代替
-     * @param {(string | ApiInput)} msg   待处理的message消息
-     * @param {*} [data]    待处理的数据
-     * @param {number} [code=200]    错误码，默认0
-     * @returns {*}
-     * @memberof BaseController
-     */
-    ok(msg, data, code = 0) {
-        const obj = formatApiData(msg, data, code);
-        return Promise.resolve(obj);
-    }
-    /**
-     * Response to normalize json format content for fail
-     *
-     * @deprecated 使用 Output.fail 代替
-     * @param {(string | ApiInput)} msg
-     * @param {*} [data]
-     * @param {number} [code=1]
-     * @returns {*}
-     * @memberof BaseController
-     */
-    fail(msg, data, code = 1) {
-        const obj = formatApiData(msg, data, code);
-        this.ctx.body = obj.data;
-        this.ctx.throw(obj.message, obj.code, 200);
-    }
-}
-// const properties = ["constructor", "init"];
-// export const BaseController = new Proxy(Base, {
-//     set(target, key, value, receiver) {
-//         if (Reflect.get(target, key, receiver) === undefined) {
-//             return Reflect.set(target, key, value, receiver);
-//         } else if (key === "init") {
-//             return Reflect.set(target, key, value, receiver);
-//         } else {
-//             throw Error("Cannot redefine getter-only property");
-//         }
-//     },
-//     deleteProperty(target, key) {
-//         throw Error("Cannot delete getter-only property");
-//     },
-//     construct(target, args, newTarget) {
-//         Reflect.ownKeys(target.prototype).map((n) => {
-//             if (newTarget.prototype.hasOwnProperty(n) && !properties.includes(Helper.toString(n))) {
-//                 throw Error(`Cannot override the final method "${Helper.toString(n)}"`);
-//             }
-//         });
-//         return Reflect.construct(target, args, newTarget);
-//     }
-// });
-
 /*
  * @Description: output data
  * @Usage:
  * @Author: richen
  * @Date: 2024-01-03 22:03:34
- * @LastEditTime: 2024-01-03 22:07:20
+ * @LastEditTime: 2024-01-16 01:20:36
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -1128,5 +975,35 @@ class Output {
         ctx.throw(obj.message, obj.code, 200);
     }
 }
+/**
+ * Format api interface data format
+ *
+ * @private
+ * @param {Error | string | ApiInput} msg   待处理的接口数据信息｜接口msg
+ * @param {*} data    待返回的数据
+ * @param {number} defaultCode   默认错误码
+ * @returns {ApiOutput}   格式化之后的接口数据
+ * @memberof BaseController
+ */
+function formatApiData(msg, data, defaultCode) {
+    let obj = {
+        code: defaultCode,
+        message: '',
+        data: null,
+    };
+    if (Helper.isError(msg)) {
+        const { code, message } = msg;
+        obj.code = code || defaultCode;
+        obj.message = message;
+    }
+    else if (Helper.isObject(msg)) {
+        obj = { ...obj, ...msg };
+    }
+    else {
+        obj.message = msg;
+        obj.data = data;
+    }
+    return obj;
+}
 
-export { BaseController, BaseService, BindEventHook, Bootstrap, Component, ComponentScan, ConfigurationScan, Controller, ExecBootStrap, Logger, Middleware, Output, Plugin, Service, implementsAspectInterface, implementsControllerInterface, implementsMiddlewareInterface, implementsPluginInterface, implementsServiceInterface };
+export { BindEventHook, Bootstrap, Component, ComponentScan, ConfigurationScan, Controller, ExecBootStrap, Logger, Middleware, Output, Plugin, Service, implementsAspectInterface, implementsControllerInterface, implementsMiddlewareInterface, implementsPluginInterface, implementsServiceInterface };

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.11.2-6",
+  "version": "3.11.2-8",
   "description": "Koa2 + Typescript = koatty. Use Typescript's decorator implement auto injection.",
   "scripts": {
     "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",
@@ -85,14 +85,15 @@
     "koa": "~2.15.0",
     "koatty_config": "~1.1.6",
     "koatty_container": "~1.8.10",
-    "koatty_core": "~1.8.6",
+    "koatty_core": "~1.9.0",
     "koatty_exception": "~1.2.8",
     "koatty_lib": "~1.3.4",
     "koatty_loader": "~1.1.0",
     "koatty_logger": "~2.1.4",
     "koatty_proto": "~1.1.12",
-    "koatty_serve": "~2.1.2-0",
-    "koatty_trace": "~1.11.1",
+    "koatty_router": "~1.9.0",
+    "koatty_serve": "~2.1.2",
+    "koatty_trace": "~1.11.2",
     "koatty_validation": "~1.3.2"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.11.2-6",
+  "version": "3.11.2-8",
   "description": "Koa2 + Typescript = koatty. Use Typescript's decorator implement auto injection.",
   "scripts": {
     "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",
@@ -85,14 +85,15 @@
     "koa": "~2.15.0",
     "koatty_config": "~1.1.6",
     "koatty_container": "~1.8.10",
-    "koatty_core": "~1.8.6",
+    "koatty_core": "~1.9.0",
     "koatty_exception": "~1.2.8",
     "koatty_lib": "~1.3.4",
     "koatty_loader": "~1.1.0",
     "koatty_logger": "~2.1.4",
     "koatty_proto": "~1.1.12",
-    "koatty_serve": "~2.1.2-0",
-    "koatty_trace": "~1.11.1",
+    "koatty_router": "~1.9.0",
+    "koatty_serve": "~2.1.2",
+    "koatty_trace": "~1.11.2",
     "koatty_validation": "~1.3.2"
   }
 }