koatty 3.5.12-1 → 3.5.14

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.
 
+### [3.5.14](https://github.com/thinkkoa/koatty/compare/v3.5.12...v3.5.14) (2022-01-17)
+
+### [3.5.12](https://github.com/thinkkoa/koatty/compare/v3.5.12-3...v3.5.12) (2021-12-23)
+
+### [3.5.12-3](https://github.com/thinkkoa/koatty/compare/v3.5.12-2...v3.5.12-3) (2021-12-23)
+
+### [3.5.12-2](https://github.com/thinkkoa/koatty/compare/v3.5.12-1...v3.5.12-2) (2021-12-21)
+
 ### [3.5.12-1](https://github.com/thinkkoa/koatty/compare/v3.5.12-0...v3.5.12-1) (2021-12-21)
 
 ### [3.5.12-0](https://github.com/thinkkoa/koatty/compare/v3.5.10...v3.5.12-0) (2021-12-21)

package/dist/index.d.ts

@@ -1,16 +1,15 @@
 /*!
 * @Author: richen
-* @Date: 2021-12-21 12:33:10
+* @Date: 2022-01-17 10:38:50
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
 */
 import { Helper } from 'koatty_lib';
-import Koa from 'koa';
 import { Koatty } from 'koatty_core';
 import { KoattyContext } from 'koatty_core';
+import { KoattyNext } from 'koatty_core';
 import { Logger as Logger_2 } from 'koatty_logger';
-import { ObjectDefinitionOptions } from 'koatty_container';
 
 /**
  * Interface for Api input
@@ -40,7 +39,7 @@ export declare type AppReadyHookFunc = (app: Koatty) => Promise<any>;
  * @implements {IController}
  */
 export declare class BaseController implements IController {
-    app: Koatty;
+    readonly app: Koatty;
     readonly ctx: KoattyContext;
     /**
      * instance of BaseController.
@@ -83,18 +82,18 @@ export declare class BaseController implements IController {
  * @class Base
  */
 export declare class BaseService implements IService {
-    app: Koatty;
+    readonly app: Koatty;
     /**
-     * instance of Base.
-     * @param {...any[]} arg
-     * @memberof Base
+     * instance of BaseController.
+     * @param {Koatty} app
+     * @param {KoattyContext} ctx
+     * @memberof BaseController
      */
     /**
      * init
      *
      * @protected
-     * @param {...any[]} arg
-     * @memberof Base
+     * @memberof BaseController
      */
 }
 
@@ -294,7 +293,7 @@ export declare class HttpController extends BaseController {
  * Interface for Controller
  */
 export declare interface IController {
-    app: Koatty;
+    readonly app: Koatty;
     readonly ctx: KoattyContext;
     __befor?: () => Promise<any>;
     __after?: () => Promise<any>;
@@ -306,7 +305,7 @@ export declare interface IController {
  * Interface for Middleware
  */
 export declare interface IMiddleware {
-    run: (options: any, app: Koatty) => Koa.Middleware;
+    run: (options: any, app: Koatty) => KoattyMiddleware;
 }
 
 /**
@@ -320,9 +319,14 @@ export declare interface IPlugin {
  * Interface for Service
  */
 export declare interface IService {
-    app: Koatty;
+    readonly app: Koatty;
 }
 
+/**
+ * Interface for Middleware
+ */
+export declare type KoattyMiddleware = (ctx: KoattyContext, next: KoattyNext) => Promise<any>;
+
 export declare const Logger: Logger_2;
 
 /**

package/dist/index.js

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2021-12-21 12:32:53
+* @Date: 2022-01-17 10:38:33
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -136,9 +136,9 @@ class BaseController {
      * @param {KoattyContext} ctx
      * @memberof BaseController
      */
-    constructor(ctx) {
+    constructor(ctx, ...arg) {
         this.ctx = ctx;
-        this.init();
+        this.init(arg);
     }
     /**
      * init
@@ -146,10 +146,10 @@ class BaseController {
      * @protected
      * @memberof BaseController
      */
-    init() {
+    init(...arg) {
     }
     // /**
-    //  * Class pre-execution method, executed before each class member methods (except constructor, init, __after) are executed.
+    //  * Class pre-execution method (except constructor, init, __after).
     //  *
     //  * @returns {Promise<any>}
     //  * @memberof BaseController
@@ -158,7 +158,7 @@ class BaseController {
     //     return Promise.resolve();
     // }
     // /**
-    //  * Class after-execution method,after each class member methods (except constructor, init, __before) are executed.
+    //  * Class after-execution method (except constructor, init, __before).
     //  *
     //  * @public
     //  * @returns {*}
@@ -462,34 +462,6 @@ function SetLogger(config) {
     }
 }
 
-/**
- * Base class
- *
- * @export
- * @class Base
- */
-class BaseService {
-    /**
-     * instance of Base.
-     * @param {...any[]} arg
-     * @memberof Base
-     */
-    constructor(...arg) {
-        this.init(arg);
-    }
-    /**
-     * init
-     *
-     * @protected
-     * @param {...any[]} arg
-     * @memberof Base
-     */
-    init(...arg) {
-        // todo
-        // Logger.Debug(arg)
-    }
-}
-
 /**
  * @ author: richen
  * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
@@ -830,10 +802,6 @@ class Loader {
                 Logger.Debug(`Load service: ${item.id}`);
                 // registering to IOC
                 koatty_container.IOCContainer.reg(item.id, item.target, { scope: "Singleton", type: "SERVICE", args: [] });
-                const ctl = koatty_container.IOCContainer.getInsByClass(item.target);
-                if (!(ctl instanceof BaseService)) {
-                    throw new Error(`class ${item.id} does not inherit from BaseService`);
-                }
             }
         });
     }
@@ -851,8 +819,6 @@ class Loader {
             item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("COMPONENT:", "");
             if (item.id && !(item.id).endsWith("Plugin") && koatty_lib.Helper.isClass(item.target)) {
                 Logger.Debug(`Load component: ${item.id}`);
-                // inject schedule
-                // injectSchedule(item.target, item.target.prototype, IOCContainer);
                 // registering to IOC
                 koatty_container.IOCContainer.reg(item.id, item.target, { scope: "Singleton", type: "COMPONENT", args: [] });
             }
@@ -877,7 +843,6 @@ class Loader {
             var _a;
             item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("COMPONENT:", "");
             if (item.id && (item.id).endsWith("Plugin") && koatty_lib.Helper.isClass(item.target)) {
-                // Logger.Debug(`Load plugin: ${item.id}`);
                 // registering to IOC
                 koatty_container.IOCContainer.reg(item.id, item.target, { scope: "Singleton", type: "COMPONENT", args: [] });
                 pluginList.push(item.id);
@@ -896,14 +861,13 @@ class Loader {
             if (pluginsConf.config[key] === false) {
                 continue;
             }
-            // Logger.Debug(`Execute plugin: ${key}`);
             // sync exec 
             await handle.run((_a = pluginsConf.config[key]) !== null && _a !== void 0 ? _a : {}, app);
         }
     }
 }
 
-var version = "3.5.12-1";
+var version = "3.5.14";
 var engines = {
 	node: ">12.0.0"
 };
@@ -1211,6 +1175,32 @@ function Plugin(identifier) {
     };
 }
 
+/**
+ * Base class
+ *
+ * @export
+ * @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) {
+    }
+}
+
 Object.defineProperty(exports, 'Helper', {
     enumerable: true,
     get: function () { return koatty_lib.Helper; }

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2021-12-21 12:32:53
+* @Date: 2022-01-17 10:38:33
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -119,9 +119,9 @@ class BaseController {
      * @param {KoattyContext} ctx
      * @memberof BaseController
      */
-    constructor(ctx) {
+    constructor(ctx, ...arg) {
         this.ctx = ctx;
-        this.init();
+        this.init(arg);
     }
     /**
      * init
@@ -129,10 +129,10 @@ class BaseController {
      * @protected
      * @memberof BaseController
      */
-    init() {
+    init(...arg) {
     }
     // /**
-    //  * Class pre-execution method, executed before each class member methods (except constructor, init, __after) are executed.
+    //  * Class pre-execution method (except constructor, init, __after).
     //  *
     //  * @returns {Promise<any>}
     //  * @memberof BaseController
@@ -141,7 +141,7 @@ class BaseController {
     //     return Promise.resolve();
     // }
     // /**
-    //  * Class after-execution method,after each class member methods (except constructor, init, __before) are executed.
+    //  * Class after-execution method (except constructor, init, __before).
     //  *
     //  * @public
     //  * @returns {*}
@@ -445,34 +445,6 @@ function SetLogger(config) {
     }
 }
 
-/**
- * Base class
- *
- * @export
- * @class Base
- */
-class BaseService {
-    /**
-     * instance of Base.
-     * @param {...any[]} arg
-     * @memberof Base
-     */
-    constructor(...arg) {
-        this.init(arg);
-    }
-    /**
-     * init
-     *
-     * @protected
-     * @param {...any[]} arg
-     * @memberof Base
-     */
-    init(...arg) {
-        // todo
-        // Logger.Debug(arg)
-    }
-}
-
 /**
  * @ author: richen
  * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
@@ -813,10 +785,6 @@ class Loader {
                 Logger.Debug(`Load service: ${item.id}`);
                 // registering to IOC
                 IOCContainer.reg(item.id, item.target, { scope: "Singleton", type: "SERVICE", args: [] });
-                const ctl = IOCContainer.getInsByClass(item.target);
-                if (!(ctl instanceof BaseService)) {
-                    throw new Error(`class ${item.id} does not inherit from BaseService`);
-                }
             }
         });
     }
@@ -834,8 +802,6 @@ class Loader {
             item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("COMPONENT:", "");
             if (item.id && !(item.id).endsWith("Plugin") && Helper.isClass(item.target)) {
                 Logger.Debug(`Load component: ${item.id}`);
-                // inject schedule
-                // injectSchedule(item.target, item.target.prototype, IOCContainer);
                 // registering to IOC
                 IOCContainer.reg(item.id, item.target, { scope: "Singleton", type: "COMPONENT", args: [] });
             }
@@ -860,7 +826,6 @@ class Loader {
             var _a;
             item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("COMPONENT:", "");
             if (item.id && (item.id).endsWith("Plugin") && Helper.isClass(item.target)) {
-                // Logger.Debug(`Load plugin: ${item.id}`);
                 // registering to IOC
                 IOCContainer.reg(item.id, item.target, { scope: "Singleton", type: "COMPONENT", args: [] });
                 pluginList.push(item.id);
@@ -879,14 +844,13 @@ class Loader {
             if (pluginsConf.config[key] === false) {
                 continue;
             }
-            // Logger.Debug(`Execute plugin: ${key}`);
             // sync exec 
             await handle.run((_a = pluginsConf.config[key]) !== null && _a !== void 0 ? _a : {}, app);
         }
     }
 }
 
-var version = "3.5.12-1";
+var version = "3.5.14";
 var engines = {
 	node: ">12.0.0"
 };
@@ -1194,4 +1158,30 @@ function Plugin(identifier) {
     };
 }
 
+/**
+ * Base class
+ *
+ * @export
+ * @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) {
+    }
+}
+
 export { BaseController, BaseService, BindAppReadyHook, Bootstrap, Component, ComponentScan, ConfigurationScan, Controller, HttpController, Logger, Middleware, Plugin, Service };

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koatty",
-    "version": "3.5.12-1",
+    "version": "3.5.14",
     "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",
@@ -22,8 +22,8 @@
     },
     "main": "./dist/index.js",
     "exports": {
-        "require": "./index.js",
-        "import": "./index.mjs"
+        "require": "./dist/index.js",
+        "import": "./dist/index.mjs"
     },
     "directories": {
         "doc": "docs"
@@ -82,16 +82,16 @@
     "dependencies": {
         "koa": "^2.13.4",
         "koatty_config": "^1.0.6",
-        "koatty_container": "^1.6.12",
-        "koatty_core": "^1.4.6",
+        "koatty_container": "^1.6.16",
+        "koatty_core": "^1.4.14",
         "koatty_exception": "^1.0.6",
         "koatty_lib": "^1.2.8",
         "koatty_loader": "^1.0.2",
         "koatty_logger": "^1.3.12",
         "koatty_payload": "^1.3.10",
-        "koatty_router": "^1.6.2",
-        "koatty_serve": "^1.4.2",
-        "koatty_trace": "^1.5.0",
+        "koatty_router": "^1.6.4",
+        "koatty_serve": "^1.4.4",
+        "koatty_trace": "^1.5.2",
         "reflect-metadata": "^0.1.13",
         "tslib": "^2.3.1"
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koatty",
-    "version": "3.5.12-1",
+    "version": "3.5.14",
     "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",
@@ -22,8 +22,8 @@
     },
     "main": "./dist/index.js",
     "exports": {
-        "require": "./index.js",
-        "import": "./index.mjs"
+        "require": "./dist/index.js",
+        "import": "./dist/index.mjs"
     },
     "directories": {
         "doc": "docs"
@@ -82,16 +82,16 @@
     "dependencies": {
         "koa": "^2.13.4",
         "koatty_config": "^1.0.6",
-        "koatty_container": "^1.6.12",
-        "koatty_core": "^1.4.6",
+        "koatty_container": "^1.6.16",
+        "koatty_core": "^1.4.14",
         "koatty_exception": "^1.0.6",
         "koatty_lib": "^1.2.8",
         "koatty_loader": "^1.0.2",
         "koatty_logger": "^1.3.12",
         "koatty_payload": "^1.3.10",
-        "koatty_router": "^1.6.2",
-        "koatty_serve": "^1.4.2",
-        "koatty_trace": "^1.5.0",
+        "koatty_router": "^1.6.4",
+        "koatty_serve": "^1.4.4",
+        "koatty_trace": "^1.5.2",
         "reflect-metadata": "^0.1.13",
         "tslib": "^2.3.1"
     }

package/.commitlintrc.js

@@ -1,3 +0,0 @@
-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",
-        },
-    ],
-};