koatty 3.6.8 → 3.6.10-1

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.
 
+### [3.6.10-1](https://github.com/thinkkoa/koatty/compare/v3.6.10-0...v3.6.10-1) (2022-08-19)
+
+### [3.6.10-0](https://github.com/thinkkoa/koatty/compare/v3.6.9...v3.6.10-0) (2022-08-19)
+
+### [3.6.9](https://github.com/thinkkoa/koatty/compare/v3.6.8...v3.6.9) (2022-07-27)
+
 ### [3.6.8](https://github.com/thinkkoa/koatty/compare/v3.6.8-2...v3.6.8) (2022-05-27)
 
 ### [3.6.8-2](https://github.com/thinkkoa/koatty/compare/v3.6.8-1...v3.6.8-2) (2022-03-15)

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-05-27 11:53:36
+* @Date: 2022-08-19 15:42:11
 * @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: 2022-05-27 11:53:16
+* @Date: 2022-08-19 15:41:46
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -491,14 +491,13 @@ class Loader {
      * @memberof Loader
      */
     static initialize(app) {
-        var _a, _b;
-        const env = ((_a = process.execArgv) !== null && _a !== void 0 ? _a : []).join(",");
+        const env = (process.execArgv ?? []).join(",");
         if (env.indexOf('ts-node') > -1 || env.indexOf('--debug') > -1) {
             app.appDebug = true;
         }
         // app.env
         app.env = process.env.KOATTY_ENV || process.env.NODE_ENV;
-        if ((env.indexOf('--production') > -1) || (((_b = app.env) !== null && _b !== void 0 ? _b : '').indexOf('pro') > -1)) {
+        if ((env.indexOf('--production') > -1) || ((app.env ?? '').indexOf('pro') > -1)) {
             app.appDebug = false;
         }
         if (app.appDebug) {
@@ -602,8 +601,7 @@ class Loader {
      * @memberof Loader
      */
     static SetLogger(app) {
-        var _a;
-        const configs = (_a = app.getMetaData("_configs")) !== null && _a !== void 0 ? _a : {};
+        const configs = app.getMetaData("_configs") ?? {};
         //Logger
         if (configs.config) {
             const opt = configs.config;
@@ -679,7 +677,6 @@ class Loader {
      * @memberof Loader
      */
     static async LoadMiddlewares(app, loadPath) {
-        var _a;
         let middlewareConf = app.config(undefined, "middleware");
         if (koatty_lib.Helper.isEmpty(middlewareConf)) {
             middlewareConf = { config: {}, list: [] };
@@ -688,12 +685,11 @@ class Loader {
         koatty_loader.Load(loadPath || ["./middleware"], app.thinkPath);
         //Mount application middleware
         // const middleware: any = {};
-        const appMiddleware = (_a = koatty_container.IOCContainer.listClass("MIDDLEWARE")) !== null && _a !== void 0 ? _a : [];
+        const appMiddleware = koatty_container.IOCContainer.listClass("MIDDLEWARE") ?? [];
         appMiddleware.push({ id: "TraceMiddleware", target: TraceMiddleware });
         appMiddleware.push({ id: "PayloadMiddleware", target: PayloadMiddleware });
         appMiddleware.forEach((item) => {
-            var _a;
-            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("MIDDLEWARE:", "");
+            item.id = (item.id ?? "").replace("MIDDLEWARE:", "");
             if (item.id && koatty_lib.Helper.isClass(item.target)) {
                 koatty_container.IOCContainer.reg(item.id, item.target, { scope: "Prototype", type: "MIDDLEWARE", args: [] });
             }
@@ -751,8 +747,7 @@ class Loader {
         const controllerList = koatty_container.IOCContainer.listClass("CONTROLLER");
         const controllers = [];
         controllerList.forEach((item) => {
-            var _a;
-            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("CONTROLLER:", "");
+            item.id = (item.id ?? "").replace("CONTROLLER:", "");
             if (item.id && koatty_lib.Helper.isClass(item.target)) {
                 Logger.Debug(`Load controller: ${item.id}`);
                 // registering to IOC
@@ -776,8 +771,7 @@ class Loader {
     static LoadServices(app) {
         const serviceList = koatty_container.IOCContainer.listClass("SERVICE");
         serviceList.forEach((item) => {
-            var _a;
-            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("SERVICE:", "");
+            item.id = (item.id ?? "").replace("SERVICE:", "");
             if (item.id && koatty_lib.Helper.isClass(item.target)) {
                 Logger.Debug(`Load service: ${item.id}`);
                 // registering to IOC
@@ -795,8 +789,7 @@ class Loader {
     static LoadComponents(app) {
         const componentList = koatty_container.IOCContainer.listClass("COMPONENT");
         componentList.forEach((item) => {
-            var _a;
-            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("COMPONENT:", "");
+            item.id = (item.id ?? "").replace("COMPONENT:", "");
             if (item.id && !(item.id).endsWith("Plugin") && koatty_lib.Helper.isClass(item.target)) {
                 Logger.Debug(`Load component: ${item.id}`);
                 // registering to IOC
@@ -812,7 +805,6 @@ class Loader {
      * @memberof Loader
      */
     static async LoadPlugins(app) {
-        var _a;
         const componentList = koatty_container.IOCContainer.listClass("COMPONENT");
         let pluginsConf = app.config(undefined, "plugin");
         if (koatty_lib.Helper.isEmpty(pluginsConf)) {
@@ -820,8 +812,7 @@ class Loader {
         }
         const pluginList = [];
         componentList.forEach(async (item) => {
-            var _a;
-            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("COMPONENT:", "");
+            item.id = (item.id ?? "").replace("COMPONENT:", "");
             if (item.id && (item.id).endsWith("Plugin") && koatty_lib.Helper.isClass(item.target)) {
                 // registering to IOC
                 koatty_container.IOCContainer.reg(item.id, item.target, { scope: "Singleton", type: "COMPONENT", args: [] });
@@ -842,12 +833,12 @@ class Loader {
                 continue;
             }
             // sync exec 
-            await handle.run((_a = pluginsConf.config[key]) !== null && _a !== void 0 ? _a : {}, app);
+            await handle.run(pluginsConf.config[key] ?? {}, app);
         }
     }
 }
 
-var version = "3.6.8";
+var version = "3.6.10-1";
 var engines = {
 	node: ">12.0.0"
 };
@@ -998,9 +989,8 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
  * @returns {*}
  */
 const newRouter = function (app) {
-    var _a;
     const protocol = app.config("protocol") || "http";
-    const options = (_a = app.config(undefined, 'router')) !== null && _a !== void 0 ? _a : {};
+    const options = app.config(undefined, 'router') ?? {};
     const router = koatty_router.NewRouter(app, options, protocol);
     return router;
 };
@@ -1037,12 +1027,11 @@ const listenCallback = (app) => {
  * @returns {*}
  */
 const newServe = function (app) {
-    var _a, _b, _c;
     const protocol = app.config("protocol") || "http";
     const port = process.env.PORT || process.env.APP_PORT ||
         app.config('app_port') || 3000;
     const hostname = process.env.IP ||
-        ((_a = process.env.HOSTNAME) === null || _a === void 0 ? void 0 : _a.replace(/-/g, '.')) || app.config('app_host') || '127.0.0.1';
+        process.env.HOSTNAME?.replace(/-/g, '.') || app.config('app_host') || '127.0.0.1';
     const options = {
         hostname,
         port,
@@ -1055,8 +1044,8 @@ const newServe = function (app) {
     };
     const pm = new Set(["https", "http2", "wss"]);
     if (pm.has(options.protocol)) {
-        const keyFile = (_b = app.config("key_file")) !== null && _b !== void 0 ? _b : "";
-        const crtFile = (_c = app.config("crt_file")) !== null && _c !== void 0 ? _c : "";
+        const keyFile = app.config("key_file") ?? "";
+        const crtFile = app.config("crt_file") ?? "";
         options.ext.key = fs__default["default"].readFileSync(keyFile).toString();
         options.ext.cert = fs__default["default"].readFileSync(crtFile).toString();
     }
@@ -1127,7 +1116,7 @@ function ComponentScan(scanPath) {
         if (!(target.prototype instanceof koatty_core.Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
         }
-        scanPath = scanPath !== null && scanPath !== void 0 ? scanPath : '';
+        scanPath = scanPath ?? '';
         koatty_container.IOCContainer.saveClassMetadata(koatty_container.TAGGED_CLS, COMPONENT_SCAN, scanPath, target);
     };
 }
@@ -1143,7 +1132,7 @@ function ConfigurationScan(scanPath) {
         if (!(target.prototype instanceof koatty_core.Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
         }
-        scanPath = scanPath !== null && scanPath !== void 0 ? scanPath : '';
+        scanPath = scanPath ?? '';
         koatty_container.IOCContainer.saveClassMetadata(koatty_container.TAGGED_CLS, CONFIGURATION_SCAN, scanPath, target);
     };
 }

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-05-27 11:53:16
+* @Date: 2022-08-19 15:41:46
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -471,14 +471,13 @@ class Loader {
      * @memberof Loader
      */
     static initialize(app) {
-        var _a, _b;
-        const env = ((_a = process.execArgv) !== null && _a !== void 0 ? _a : []).join(",");
+        const env = (process.execArgv ?? []).join(",");
         if (env.indexOf('ts-node') > -1 || env.indexOf('--debug') > -1) {
             app.appDebug = true;
         }
         // app.env
         app.env = process.env.KOATTY_ENV || process.env.NODE_ENV;
-        if ((env.indexOf('--production') > -1) || (((_b = app.env) !== null && _b !== void 0 ? _b : '').indexOf('pro') > -1)) {
+        if ((env.indexOf('--production') > -1) || ((app.env ?? '').indexOf('pro') > -1)) {
             app.appDebug = false;
         }
         if (app.appDebug) {
@@ -582,8 +581,7 @@ class Loader {
      * @memberof Loader
      */
     static SetLogger(app) {
-        var _a;
-        const configs = (_a = app.getMetaData("_configs")) !== null && _a !== void 0 ? _a : {};
+        const configs = app.getMetaData("_configs") ?? {};
         //Logger
         if (configs.config) {
             const opt = configs.config;
@@ -659,7 +657,6 @@ class Loader {
      * @memberof Loader
      */
     static async LoadMiddlewares(app, loadPath) {
-        var _a;
         let middlewareConf = app.config(undefined, "middleware");
         if (Helper.isEmpty(middlewareConf)) {
             middlewareConf = { config: {}, list: [] };
@@ -668,12 +665,11 @@ class Loader {
         Load(loadPath || ["./middleware"], app.thinkPath);
         //Mount application middleware
         // const middleware: any = {};
-        const appMiddleware = (_a = IOCContainer.listClass("MIDDLEWARE")) !== null && _a !== void 0 ? _a : [];
+        const appMiddleware = IOCContainer.listClass("MIDDLEWARE") ?? [];
         appMiddleware.push({ id: "TraceMiddleware", target: TraceMiddleware });
         appMiddleware.push({ id: "PayloadMiddleware", target: PayloadMiddleware });
         appMiddleware.forEach((item) => {
-            var _a;
-            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("MIDDLEWARE:", "");
+            item.id = (item.id ?? "").replace("MIDDLEWARE:", "");
             if (item.id && Helper.isClass(item.target)) {
                 IOCContainer.reg(item.id, item.target, { scope: "Prototype", type: "MIDDLEWARE", args: [] });
             }
@@ -731,8 +727,7 @@ class Loader {
         const controllerList = IOCContainer.listClass("CONTROLLER");
         const controllers = [];
         controllerList.forEach((item) => {
-            var _a;
-            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("CONTROLLER:", "");
+            item.id = (item.id ?? "").replace("CONTROLLER:", "");
             if (item.id && Helper.isClass(item.target)) {
                 Logger.Debug(`Load controller: ${item.id}`);
                 // registering to IOC
@@ -756,8 +751,7 @@ class Loader {
     static LoadServices(app) {
         const serviceList = IOCContainer.listClass("SERVICE");
         serviceList.forEach((item) => {
-            var _a;
-            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("SERVICE:", "");
+            item.id = (item.id ?? "").replace("SERVICE:", "");
             if (item.id && Helper.isClass(item.target)) {
                 Logger.Debug(`Load service: ${item.id}`);
                 // registering to IOC
@@ -775,8 +769,7 @@ class Loader {
     static LoadComponents(app) {
         const componentList = IOCContainer.listClass("COMPONENT");
         componentList.forEach((item) => {
-            var _a;
-            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("COMPONENT:", "");
+            item.id = (item.id ?? "").replace("COMPONENT:", "");
             if (item.id && !(item.id).endsWith("Plugin") && Helper.isClass(item.target)) {
                 Logger.Debug(`Load component: ${item.id}`);
                 // registering to IOC
@@ -792,7 +785,6 @@ class Loader {
      * @memberof Loader
      */
     static async LoadPlugins(app) {
-        var _a;
         const componentList = IOCContainer.listClass("COMPONENT");
         let pluginsConf = app.config(undefined, "plugin");
         if (Helper.isEmpty(pluginsConf)) {
@@ -800,8 +792,7 @@ class Loader {
         }
         const pluginList = [];
         componentList.forEach(async (item) => {
-            var _a;
-            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("COMPONENT:", "");
+            item.id = (item.id ?? "").replace("COMPONENT:", "");
             if (item.id && (item.id).endsWith("Plugin") && Helper.isClass(item.target)) {
                 // registering to IOC
                 IOCContainer.reg(item.id, item.target, { scope: "Singleton", type: "COMPONENT", args: [] });
@@ -822,12 +813,12 @@ class Loader {
                 continue;
             }
             // sync exec 
-            await handle.run((_a = pluginsConf.config[key]) !== null && _a !== void 0 ? _a : {}, app);
+            await handle.run(pluginsConf.config[key] ?? {}, app);
         }
     }
 }
 
-var version = "3.6.8";
+var version = "3.6.10-1";
 var engines = {
 	node: ">12.0.0"
 };
@@ -978,9 +969,8 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
  * @returns {*}
  */
 const newRouter = function (app) {
-    var _a;
     const protocol = app.config("protocol") || "http";
-    const options = (_a = app.config(undefined, 'router')) !== null && _a !== void 0 ? _a : {};
+    const options = app.config(undefined, 'router') ?? {};
     const router = NewRouter(app, options, protocol);
     return router;
 };
@@ -1017,12 +1007,11 @@ const listenCallback = (app) => {
  * @returns {*}
  */
 const newServe = function (app) {
-    var _a, _b, _c;
     const protocol = app.config("protocol") || "http";
     const port = process.env.PORT || process.env.APP_PORT ||
         app.config('app_port') || 3000;
     const hostname = process.env.IP ||
-        ((_a = process.env.HOSTNAME) === null || _a === void 0 ? void 0 : _a.replace(/-/g, '.')) || app.config('app_host') || '127.0.0.1';
+        process.env.HOSTNAME?.replace(/-/g, '.') || app.config('app_host') || '127.0.0.1';
     const options = {
         hostname,
         port,
@@ -1035,8 +1024,8 @@ const newServe = function (app) {
     };
     const pm = new Set(["https", "http2", "wss"]);
     if (pm.has(options.protocol)) {
-        const keyFile = (_b = app.config("key_file")) !== null && _b !== void 0 ? _b : "";
-        const crtFile = (_c = app.config("crt_file")) !== null && _c !== void 0 ? _c : "";
+        const keyFile = app.config("key_file") ?? "";
+        const crtFile = app.config("crt_file") ?? "";
         options.ext.key = fs.readFileSync(keyFile).toString();
         options.ext.cert = fs.readFileSync(crtFile).toString();
     }
@@ -1107,7 +1096,7 @@ function ComponentScan(scanPath) {
         if (!(target.prototype instanceof Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
         }
-        scanPath = scanPath !== null && scanPath !== void 0 ? scanPath : '';
+        scanPath = scanPath ?? '';
         IOCContainer.saveClassMetadata(TAGGED_CLS, COMPONENT_SCAN, scanPath, target);
     };
 }
@@ -1123,7 +1112,7 @@ function ConfigurationScan(scanPath) {
         if (!(target.prototype instanceof Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
         }
-        scanPath = scanPath !== null && scanPath !== void 0 ? scanPath : '';
+        scanPath = scanPath ?? '';
         IOCContainer.saveClassMetadata(TAGGED_CLS, CONFIGURATION_SCAN, scanPath, target);
     };
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.6.8",
+  "version": "3.6.10-1",
   "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",
@@ -11,6 +11,7 @@
     "eslint": "eslint --ext .ts,.js ./",
     "prepublishOnly": "npm test && npm run build",
     "prerelease": "npm test && npm run build",
+    "pub": "git push --follow-tags origin && npm publish",
     "release": "standard-version",
     "release:pre": "npm run release -- --prerelease",
     "release:major": "npm run release -- --release-as major",
@@ -83,14 +84,14 @@
     "koatty_container": "1.7.10",
     "koatty_core": "1.6.8",
     "koatty_exception": "1.2.7",
-    "koatty_lib": "1.2.11",
+    "koatty_lib": "1.2.12",
     "koatty_loader": "1.0.3",
     "koatty_logger": "1.3.14",
     "koatty_payload": "1.3.18",
     "koatty_proto": "1.1.8",
-    "koatty_router": "1.7.6",
+    "koatty_router": "1.7.9",
     "koatty_serve": "1.4.10",
-    "koatty_trace": "1.6.7",
+    "koatty_trace": "1.6.9",
     "reflect-metadata": "0.1.13",
     "tslib": "2.4.0"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.6.8",
+  "version": "3.6.10-1",
   "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",
@@ -11,6 +11,7 @@
     "eslint": "eslint --ext .ts,.js ./",
     "prepublishOnly": "npm test && npm run build",
     "prerelease": "npm test && npm run build",
+    "pub": "git push --follow-tags origin && npm publish",
     "release": "standard-version",
     "release:pre": "npm run release -- --prerelease",
     "release:major": "npm run release -- --release-as major",
@@ -83,14 +84,14 @@
     "koatty_container": "1.7.10",
     "koatty_core": "1.6.8",
     "koatty_exception": "1.2.7",
-    "koatty_lib": "1.2.11",
+    "koatty_lib": "1.2.12",
     "koatty_loader": "1.0.3",
     "koatty_logger": "1.3.14",
     "koatty_payload": "1.3.18",
     "koatty_proto": "1.1.8",
-    "koatty_router": "1.7.6",
+    "koatty_router": "1.7.9",
     "koatty_serve": "1.4.10",
-    "koatty_trace": "1.6.7",
+    "koatty_trace": "1.6.9",
     "reflect-metadata": "0.1.13",
     "tslib": "2.4.0"
   }