koatty 3.5.12 → 3.6.0-0

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2021-12-23 15:31:08
+* @Date: 2022-02-21 18:02:12
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -19,11 +19,11 @@ export * from 'koatty_container';
 import * as path from 'path';
 import { Load } from 'koatty_loader';
 import { LoadConfigs } from 'koatty_config';
+export { Config, Value } from 'koatty_config';
 import { DefaultLogger } from 'koatty_logger';
 import { prevent } from 'koatty_exception';
 export * from 'koatty_exception';
 import { Trace } from 'koatty_trace';
-export * from 'koatty_trace';
 import { Payload } from 'koatty_payload';
 
 /**
@@ -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>
@@ -711,7 +683,7 @@ class Loader {
      * @memberof Loader
      */
     static async LoadMiddlewares(app, loadPath) {
-        var _a, _b;
+        var _a;
         let middlewareConf = app.config(undefined, "middleware");
         if (Helper.isEmpty(middlewareConf)) {
             middlewareConf = { config: {}, list: [] };
@@ -728,7 +700,6 @@ class Loader {
             item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("MIDDLEWARE:", "");
             if (item.id && Helper.isClass(item.target)) {
                 IOCContainer.reg(item.id, item.target, { scope: "Prototype", type: "MIDDLEWARE", args: [] });
-                // middleware[item.id] = item.target;
             }
         });
         const middlewareConfList = middlewareConf.list;
@@ -738,9 +709,6 @@ class Loader {
                 defaultList.push(item);
             }
         });
-        // if (defaultList.length > middlewareConfList.length) {
-        //     Logger.Warn("Some middleware is loaded but not allowed to execute.");
-        // }
         //de-duplication
         const appMList = [...new Set(defaultList)];
         //Automatically call middleware
@@ -755,11 +723,17 @@ class Loader {
                 continue;
             }
             if (middlewareConf.config[key] === false) {
-                Logger.Warn(`Middleware ${key} is loaded but not allowed to execute.`);
-                continue;
+                // Default middleware cannot be disabled
+                if (defaultList.includes(key)) {
+                    Logger.Warn(`Middleware ${key} cannot be disabled.`);
+                }
+                else {
+                    Logger.Warn(`Middleware ${key} is loaded but not allowed to execute.`);
+                    continue;
+                }
             }
             Logger.Debug(`Load middleware: ${key}`);
-            const result = await handle.run((_b = middlewareConf.config[key]) !== null && _b !== void 0 ? _b : {}, app);
+            const result = await handle.run(middlewareConf.config[key] || {}, app);
             if (Helper.isFunction(result)) {
                 if (result.length < 3) {
                     app.use(result);
@@ -769,7 +743,6 @@ class Loader {
                 }
             }
         }
-        // app.setMetaData("_middlewares", middleware);
     }
     /**
      * Load controllers
@@ -813,10 +786,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 +803,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 +827,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 +845,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";
+var version = "3.6.0-0";
 var engines = {
 	node: ">12.0.0"
 };
@@ -1071,7 +1036,6 @@ function Bootstrap(bootFunc) {
  * @returns {ClassDecorator}
  */
 function ComponentScan(scanPath) {
-    Logger.Log('think', '', 'ComponentScan');
     return (target) => {
         if (!(target.prototype instanceof Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
@@ -1088,7 +1052,6 @@ function ComponentScan(scanPath) {
  * @returns {ClassDecorator}
  */
 function ConfigurationScan(scanPath) {
-    Logger.Log('think', '', 'ConfigurationScan');
     return (target) => {
         if (!(target.prototype instanceof Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
@@ -1154,7 +1117,7 @@ function Controller(path = "") {
  * Indicates that an decorated class is a "middleware".
  *
  * @export
- * @param {string} [identifier] middleware name
+ * @param {string} [identifier] class name
  * @returns {ClassDecorator}
  */
 function Middleware(identifier) {
@@ -1167,7 +1130,7 @@ function Middleware(identifier) {
  * Indicates that an decorated class is a "service".
  *
  * @export
- * @param {string} [identifier] middleware name
+ * @param {string} [identifier] class name
  * @returns {ClassDecorator}
  */
 function Service(identifier) {
@@ -1180,7 +1143,7 @@ function Service(identifier) {
  * Indicates that an decorated class is a "plugin".
  *
  * @export
- * @param {string} [identifier]
+ * @param {string} [identifier] class name
  * @returns {ClassDecorator}
  */
 function Plugin(identifier) {
@@ -1194,4 +1157,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",
+    "version": "3.6.0-0",
     "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",
@@ -58,18 +58,17 @@
         "@types/koa": "^2.x.x",
         "@types/koa__router": "^8.x.x",
         "@types/node": "^16.x.x",
-        "@types/uuid": "^8.x.x",
         "@types/ws": "^8.x.x",
         "@typescript-eslint/eslint-plugin": "^5.x.x",
         "@typescript-eslint/parser": "^5.x.x",
-        "commitlint": "^15.x.x",
+        "commitlint": "^11.x.x",
         "commitlint-config-gitmoji": "^2.x.x",
         "conventional-changelog-cli": "^2.x.x",
         "copyfiles": "^2.x.x",
         "del-cli": "^4.x.x",
         "eslint": "^8.x.x",
         "eslint-plugin-jest": "^25.x.x",
-        "husky": "^7.x.x",
+        "husky": "^4.x.x",
         "jest": "^27.x.x",
         "jest-html-reporters": "^2.x.x",
         "rollup": "^2.x.x",
@@ -80,19 +79,21 @@
         "typescript": "^4.x.x"
     },
     "dependencies": {
-        "koa": "^2.13.4",
-        "koatty_config": "^1.0.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.4",
-        "koatty_serve": "^1.4.4",
-        "koatty_trace": "^1.5.2",
-        "reflect-metadata": "^0.1.13",
-        "tslib": "^2.3.1"
+        "koa": "2.13.4",
+        "koatty_config": "1.1.2",
+        "koatty_container": "1.7.4",
+        "koatty_core": "1.6.0",
+        "koatty_exception": "1.2.2",
+        "koatty_lib": "1.2.10",
+        "koatty_loader": "1.0.2",
+        "koatty_logger": "1.3.12",
+        "koatty_payload": "1.3.14",
+        "koatty_proto": "1.1.6",
+        "koatty_router": "1.7.0",
+        "koatty_serve": "1.4.6",
+        "koatty_trace": "1.6.0",
+        "koatty_validation": "1.1.0",
+        "reflect-metadata": "0.1.13",
+        "tslib": "2.3.1"
     }
 }