npm - koatty - Versions diffs - 3.6.6 → 3.6.8-2 - Mend

koatty 3.6.6 → 3.6.8-2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/.vscode/launch.json +17 -1
package/CHANGELOG.md +10 -0
package/README.md +10 -6
package/dist/README.md +10 -6
package/dist/index.d.ts +3 -3
package/dist/index.js +96 -83
package/dist/index.mjs +57 -44
package/dist/package.json +100 -95
package/jest-html-reporters-attach/result.js +1 -1
package/package.json +100 -95
package/tsconfig.test.json +15 -0
package/.vscode/settings.json +0 -3

package/.vscode/launch.json CHANGED Viewed

@@ -14,12 +14,28 @@
                 "ts-node/register"
             ],
             "env": {
-                "NODE_ENV": "development",
+                "NODE_ENV": "development"
             },
             "sourceMaps": true,
             "cwd": "${workspaceRoot}",
             "protocol": "inspector",
             "internalConsoleOptions": "neverOpen"
+        },
+        {
+            "type": "node",
+            "name": "vscode-jest-tests",
+            "request": "launch",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "disableOptimisticBPs": true,
+            "program": "${workspaceFolder}/node_modules/.bin/jest",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "--config",
+                "jest.config.js",
+                "--runInBand",
+                "--watchAll=false"
+            ]
         }
     ]
 }

package/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,16 @@
 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.8-2](https://github.com/thinkkoa/koatty/compare/v3.6.8-1...v3.6.8-2) (2022-03-15)
+### [3.6.8-1](https://github.com/thinkkoa/koatty/compare/v3.6.8-0...v3.6.8-1) (2022-03-15)
+### [3.6.8-0](https://github.com/thinkkoa/koatty/compare/v3.6.7...v3.6.8-0) (2022-03-14)
+### [3.6.8-0](https://github.com/thinkkoa/koatty/compare/v3.6.7...v3.6.8-0) (2022-03-14)
+### [3.6.7](https://github.com/thinkkoa/koatty/compare/v3.6.6...v3.6.7) (2022-03-09)
 ### [3.6.6](https://github.com/thinkkoa/koatty/compare/v3.6.5...v3.6.6) (2022-03-02)
 ### [3.6.5](https://github.com/thinkkoa/koatty/compare/v3.6.4...v3.6.5) (2022-03-02)

package/README.md CHANGED Viewed

@@ -103,22 +103,26 @@ export class IndexController extends BaseController {
 ```javascript
 import request from 'supertest';
 import { ExecBootStrap } from 'koatty';
 import { App } from '../src/App';
 describe('UT example', () => {
-  let server;
+  let server: any;
   beforeAll(async () => {
+    jest.useFakeTimers();
     const appInstance = await ExecBootStrap()(App);
-    server = appInstance.callback();
+    server = await appInstance.listen();
   });
-  it('request', async (done) => {
-    const rsp = await request(server).get('/path/to/server');
-    expect(rsp.status).toBe(200);
+  afterAll(done => {
+    server.close();
     done();
   });
+  it('request', async () => {
+    const rsp = await request(server).get('/');
+    expect(rsp.status).toBe(200);
+  });
 });
 ```

package/dist/README.md CHANGED Viewed

@@ -103,22 +103,26 @@ export class IndexController extends BaseController {
 ```javascript
 import request from 'supertest';
 import { ExecBootStrap } from 'koatty';
 import { App } from '../src/App';
 describe('UT example', () => {
-  let server;
+  let server: any;
   beforeAll(async () => {
+    jest.useFakeTimers();
     const appInstance = await ExecBootStrap()(App);
-    server = appInstance.callback();
+    server = await appInstance.listen();
   });
-  it('request', async (done) => {
-    const rsp = await request(server).get('/path/to/server');
-    expect(rsp.status).toBe(200);
+  afterAll(done => {
+    server.close();
     done();
   });
+  it('request', async () => {
+    const rsp = await request(server).get('/');
+    expect(rsp.status).toBe(200);
+  });
 });
 ```

package/dist/index.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-03-02 19:03:06
+* @Date: 2022-03-15 14:27:44
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -171,7 +171,7 @@ export declare function Controller(path?: string): ClassDecorator;
  * @param {Function} [bootFunc] callback function
  * @returns
  */
-export declare function ExecBootStrap(bootFunc?: Function): (target: any) => Promise<void>;
+export declare function ExecBootStrap(bootFunc?: Function): (target: any) => Promise<Koatty>;
 export { Helper }
@@ -225,7 +225,7 @@ export declare class HttpController extends BaseController {
      * @returns
      * @memberof HttpController
      */
-    param(name?: string): any;
+    param(name?: string): Promise<any>;
     /**
      * Set response content-type
      *

package/dist/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-03-02 19:02:51
+* @Date: 2022-03-15 14:27:23
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -27,21 +27,21 @@ var koatty_payload = require('koatty_payload');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 function _interopNamespace(e) {
-    if (e && e.__esModule) return e;
-    var n = Object.create(null);
-    if (e) {
-        Object.keys(e).forEach(function (k) {
-            if (k !== 'default') {
-                var d = Object.getOwnPropertyDescriptor(e, k);
-                Object.defineProperty(n, k, d.get ? d : {
-                    enumerable: true,
-                    get: function () { return e[k]; }
-                });
-            }
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
         });
-    }
-    n["default"] = e;
-    return Object.freeze(n);
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
 }
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
@@ -491,13 +491,14 @@ class Loader {
      * @memberof Loader
      */
     static initialize(app) {
-        const env = (process.execArgv ?? []).join(",");
+        var _a, _b;
+        const env = ((_a = process.execArgv) !== null && _a !== void 0 ? _a : []).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) || ((app.env ?? '').indexOf('pro') > -1)) {
+        if ((env.indexOf('--production') > -1) || (((_b = app.env) !== null && _b !== void 0 ? _b : '').indexOf('pro') > -1)) {
             app.appDebug = false;
         }
         if (app.appDebug) {
@@ -601,7 +602,8 @@ class Loader {
      * @memberof Loader
      */
     static SetLogger(app) {
-        const configs = app.getMetaData("_configs") ?? {};
+        var _a;
+        const configs = (_a = app.getMetaData("_configs")) !== null && _a !== void 0 ? _a : {};
         //Logger
         if (configs.config) {
             const opt = configs.config;
@@ -677,6 +679,7 @@ 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: [] };
@@ -685,11 +688,12 @@ class Loader {
         koatty_loader.Load(loadPath || ["./middleware"], app.thinkPath);
         //Mount application middleware
         // const middleware: any = {};
-        const appMiddleware = koatty_container.IOCContainer.listClass("MIDDLEWARE") ?? [];
+        const appMiddleware = (_a = koatty_container.IOCContainer.listClass("MIDDLEWARE")) !== null && _a !== void 0 ? _a : [];
         appMiddleware.push({ id: "TraceMiddleware", target: TraceMiddleware });
         appMiddleware.push({ id: "PayloadMiddleware", target: PayloadMiddleware });
         appMiddleware.forEach((item) => {
-            item.id = (item.id ?? "").replace("MIDDLEWARE:", "");
+            var _a;
+            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("MIDDLEWARE:", "");
             if (item.id && koatty_lib.Helper.isClass(item.target)) {
                 koatty_container.IOCContainer.reg(item.id, item.target, { scope: "Prototype", type: "MIDDLEWARE", args: [] });
             }
@@ -745,9 +749,10 @@ class Loader {
      */
     static LoadControllers(app) {
         const controllerList = koatty_container.IOCContainer.listClass("CONTROLLER");
-        const controllers = {};
+        const controllers = [];
         controllerList.forEach((item) => {
-            item.id = (item.id ?? "").replace("CONTROLLER:", "");
+            var _a;
+            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("CONTROLLER:", "");
             if (item.id && koatty_lib.Helper.isClass(item.target)) {
                 Logger.Debug(`Load controller: ${item.id}`);
                 // registering to IOC
@@ -756,10 +761,10 @@ class Loader {
                 if (!(ctl instanceof BaseController)) {
                     throw new Error(`class ${item.id} does not inherit from BaseController`);
                 }
-                controllers[item.id] = 1;
+                controllers.push(item.id);
             }
         });
-        app.setMetaData("_controllers", controllers);
+        return controllers;
     }
     /**
      * Load services
@@ -771,7 +776,8 @@ class Loader {
     static LoadServices(app) {
         const serviceList = koatty_container.IOCContainer.listClass("SERVICE");
         serviceList.forEach((item) => {
-            item.id = (item.id ?? "").replace("SERVICE:", "");
+            var _a;
+            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("SERVICE:", "");
             if (item.id && koatty_lib.Helper.isClass(item.target)) {
                 Logger.Debug(`Load service: ${item.id}`);
                 // registering to IOC
@@ -789,7 +795,8 @@ class Loader {
     static LoadComponents(app) {
         const componentList = koatty_container.IOCContainer.listClass("COMPONENT");
         componentList.forEach((item) => {
-            item.id = (item.id ?? "").replace("COMPONENT:", "");
+            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 component: ${item.id}`);
                 // registering to IOC
@@ -805,6 +812,7 @@ 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)) {
@@ -812,7 +820,8 @@ class Loader {
         }
         const pluginList = [];
         componentList.forEach(async (item) => {
-            item.id = (item.id ?? "").replace("COMPONENT:", "");
+            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)) {
                 // registering to IOC
                 koatty_container.IOCContainer.reg(item.id, item.target, { scope: "Singleton", type: "COMPONENT", args: [] });
@@ -833,12 +842,12 @@ class Loader {
                 continue;
             }
             // sync exec
-            await handle.run(pluginsConf.config[key] ?? {}, app);
+            await handle.run((_a = pluginsConf.config[key]) !== null && _a !== void 0 ? _a : {}, app);
         }
     }
 }
-var version = "3.6.6";
+var version = "3.6.8-2";
 var engines = {
 	node: ">12.0.0"
 };
@@ -848,7 +857,7 @@ var engines = {
 * @Usage:
 * @Author: richen
 * @Date: 2021-12-17 11:54:06
- * @LastEditTime: 2022-02-23 16:12:34
+ * @LastEditTime: 2022-03-15 14:22:45
 */
 const KOATTY_VERSION = version;
 const ENGINES_VERSION = engines.node.slice(1) || '12.0.0';
@@ -949,6 +958,10 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         Loader.LoadAppReadyHooks(app, target);
         // New router
         const KoattyRouter = newRouter(app);
+        koatty_lib.Helper.define(app, "router", KoattyRouter);
+        // Create Server
+        app.server = newServe(app);
+        koatty_lib.Helper.define(app, "listenCallback", listenCallback(app));
         // Load Middleware
         Logger.Log('think', '', 'Load Middlewares ...');
         await Loader.LoadMiddlewares(app);
@@ -960,24 +973,17 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         Loader.LoadServices(app);
         // Load Controllers
         Logger.Log('think', '', 'Load Controllers ...');
-        Loader.LoadControllers(app);
+        const controllers = Loader.LoadControllers(app);
+        // Load Routers
+        Logger.Log('think', '', 'Load Routers ...');
+        KoattyRouter.LoadRouter(controllers);
         // Emit app ready event
         Logger.Log('think', '', 'Emit App Ready ...');
-        // app.emit("appReady");
         await asyncEvent(app, 'appReady');
-        // Load Routers
-        Logger.Log('think', '', 'Load Routers ...');
-        KoattyRouter.LoadRouter(app.getMetaData("_controllers"));
-        Logger.Log('think', '', '====================================');
-        // Start server
-        const server = newServe(app);
-        app.listen(server, listenCallback(app, server.options));
-        // app.emit("appStart");
-        // Emit app started event
-        Logger.Log('think', '', 'Emit App Start ...');
-        asyncEvent(app, 'appStart');
-        // binding event "appStop"
-        koatty_serve.BindProcessEvent(app, 'appStop');
+        if (!isUTRuntime) {
+            app.listen();
+        }
+        return app;
     }
     catch (err) {
         Logger.Error(err);
@@ -992,26 +998,34 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
  * @returns {*}
  */
 const newRouter = function (app) {
+    var _a;
     const protocol = app.config("protocol") || "http";
-    const options = app.config(undefined, 'router') ?? {};
+    const options = (_a = app.config(undefined, 'router')) !== null && _a !== void 0 ? _a : {};
     const router = koatty_router.NewRouter(app, options, protocol);
-    koatty_lib.Helper.define(app, "router", router);
     return router;
 };
 /**
  * Listening callback function
  *
  * @param {Koatty} app
- * @param {ListeningOptions} options
  * @returns {*}
  */
-const listenCallback = (app, options) => {
+const listenCallback = (app) => {
+    const options = app.server.options;
     return function () {
+        // Emit app started event
+        Logger.Log('think', '', 'Emit App Start ...');
+        asyncEvent(app, 'appStart');
+        Logger.Log('think', '', '====================================');
         Logger.Log("think", "", `Nodejs Version: ${process.version}`);
         Logger.Log("think", "", `Koatty Version: v${app.version}`);
         Logger.Log("think", "", `App Environment: ${app.env}`);
+        Logger.Log('think', '', `Server Protocol: ${(options.protocol).toUpperCase()}`);
         Logger.Log("think", "", `Server running at ${options.protocol === "http2" ? "https" : options.protocol}://${options.hostname || '127.0.0.1'}:${options.port}/`);
         Logger.Log("think", "", "====================================");
+        // binding event "appStop"
+        Logger.Log('think', '', 'Bind App Stop event ...');
+        koatty_serve.BindProcessEvent(app, 'appStop');
         // tslint:disable-next-line: no-unused-expression
         app.appDebug && Logger.Warn(`Running in debug mode.`);
     };
@@ -1023,11 +1037,12 @@ const listenCallback = (app, options) => {
  * @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 ||
-        process.env.HOSTNAME?.replace(/-/g, '.') || app.config('app_host') || '127.0.0.1';
+        ((_a = process.env.HOSTNAME) === null || _a === void 0 ? void 0 : _a.replace(/-/g, '.')) || app.config('app_host') || '127.0.0.1';
     const options = {
         hostname,
         port,
@@ -1040,8 +1055,8 @@ const newServe = function (app) {
     };
     const pm = new Set(["https", "http2", "wss"]);
     if (pm.has(options.protocol)) {
-        const keyFile = app.config("key_file") ?? "";
-        const crtFile = app.config("crt_file") ?? "";
+        const keyFile = (_b = app.config("key_file")) !== null && _b !== void 0 ? _b : "";
+        const crtFile = (_c = app.config("crt_file")) !== null && _c !== void 0 ? _c : "";
         options.ext.key = fs__default["default"].readFileSync(keyFile).toString();
         options.ext.cert = fs__default["default"].readFileSync(crtFile).toString();
     }
@@ -1052,9 +1067,7 @@ const newServe = function (app) {
         const proto = app.config("protoFile", "router");
         options.ext.protoFile = proto;
     }
-    const server = koatty_serve.Serve(app, options);
-    koatty_lib.Helper.define(app, "server", server);
-    return server;
+    return koatty_serve.Serve(app, options);
 };
 /**
  * Execute event as async
@@ -1114,7 +1127,7 @@ function ComponentScan(scanPath) {
         if (!(target.prototype instanceof koatty_core.Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
         }
-        scanPath = scanPath ?? '';
+        scanPath = scanPath !== null && scanPath !== void 0 ? scanPath : '';
         koatty_container.IOCContainer.saveClassMetadata(koatty_container.TAGGED_CLS, COMPONENT_SCAN, scanPath, target);
     };
 }
@@ -1130,7 +1143,7 @@ function ConfigurationScan(scanPath) {
         if (!(target.prototype instanceof koatty_core.Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
         }
-        scanPath = scanPath ?? '';
+        scanPath = scanPath !== null && scanPath !== void 0 ? scanPath : '';
         koatty_container.IOCContainer.saveClassMetadata(koatty_container.TAGGED_CLS, CONFIGURATION_SCAN, scanPath, target);
     };
 }
@@ -1258,16 +1271,16 @@ class BaseService {
 }
 Object.defineProperty(exports, 'Helper', {
-    enumerable: true,
-    get: function () { return koatty_lib.Helper; }
+  enumerable: true,
+  get: function () { return koatty_lib.Helper; }
 });
 Object.defineProperty(exports, 'Config', {
-    enumerable: true,
-    get: function () { return koatty_config.Config; }
+  enumerable: true,
+  get: function () { return koatty_config.Config; }
 });
 Object.defineProperty(exports, 'Value', {
-    enumerable: true,
-    get: function () { return koatty_config.Value; }
+  enumerable: true,
+  get: function () { return koatty_config.Value; }
 });
 exports.BaseController = BaseController;
 exports.BaseService = BaseService;
@@ -1284,32 +1297,32 @@ exports.Middleware = Middleware;
 exports.Plugin = Plugin;
 exports.Service = Service;
 Object.keys(koatty_core).forEach(function (k) {
-    if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
-        enumerable: true,
-        get: function () { return koatty_core[k]; }
-    });
+  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return koatty_core[k]; }
+  });
 });
 Object.keys(koatty_router).forEach(function (k) {
-    if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
-        enumerable: true,
-        get: function () { return koatty_router[k]; }
-    });
+  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return koatty_router[k]; }
+  });
 });
 Object.keys(koatty_container).forEach(function (k) {
-    if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
-        enumerable: true,
-        get: function () { return koatty_container[k]; }
-    });
+  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return koatty_container[k]; }
+  });
 });
 Object.keys(koatty_serve).forEach(function (k) {
-    if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
-        enumerable: true,
-        get: function () { return koatty_serve[k]; }
-    });
+  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return koatty_serve[k]; }
+  });
 });
 Object.keys(koatty_exception).forEach(function (k) {
-    if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
-        enumerable: true,
-        get: function () { return koatty_exception[k]; }
-    });
+  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return koatty_exception[k]; }
+  });
 });

package/dist/index.mjs CHANGED Viewed

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-03-02 19:02:51
+* @Date: 2022-03-15 14:27:23
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -15,7 +15,7 @@ import { NewRouter, CONTROLLER_ROUTER } from 'koatty_router';
 export * from 'koatty_router';
 import { IOCContainer, TAGGED_CLS } from 'koatty_container';
 export * from 'koatty_container';
-import { BindProcessEvent, Serve } from 'koatty_serve';
+import { Serve, BindProcessEvent } from 'koatty_serve';
 export * from 'koatty_serve';
 import * as path from 'path';
 import { Load } from 'koatty_loader';
@@ -471,13 +471,14 @@ class Loader {
      * @memberof Loader
      */
     static initialize(app) {
-        const env = (process.execArgv ?? []).join(",");
+        var _a, _b;
+        const env = ((_a = process.execArgv) !== null && _a !== void 0 ? _a : []).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) || ((app.env ?? '').indexOf('pro') > -1)) {
+        if ((env.indexOf('--production') > -1) || (((_b = app.env) !== null && _b !== void 0 ? _b : '').indexOf('pro') > -1)) {
             app.appDebug = false;
         }
         if (app.appDebug) {
@@ -581,7 +582,8 @@ class Loader {
      * @memberof Loader
      */
     static SetLogger(app) {
-        const configs = app.getMetaData("_configs") ?? {};
+        var _a;
+        const configs = (_a = app.getMetaData("_configs")) !== null && _a !== void 0 ? _a : {};
         //Logger
         if (configs.config) {
             const opt = configs.config;
@@ -657,6 +659,7 @@ class Loader {
      * @memberof Loader
      */
     static async LoadMiddlewares(app, loadPath) {
+        var _a;
         let middlewareConf = app.config(undefined, "middleware");
         if (Helper.isEmpty(middlewareConf)) {
             middlewareConf = { config: {}, list: [] };
@@ -665,11 +668,12 @@ class Loader {
         Load(loadPath || ["./middleware"], app.thinkPath);
         //Mount application middleware
         // const middleware: any = {};
-        const appMiddleware = IOCContainer.listClass("MIDDLEWARE") ?? [];
+        const appMiddleware = (_a = IOCContainer.listClass("MIDDLEWARE")) !== null && _a !== void 0 ? _a : [];
         appMiddleware.push({ id: "TraceMiddleware", target: TraceMiddleware });
         appMiddleware.push({ id: "PayloadMiddleware", target: PayloadMiddleware });
         appMiddleware.forEach((item) => {
-            item.id = (item.id ?? "").replace("MIDDLEWARE:", "");
+            var _a;
+            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: [] });
             }
@@ -725,9 +729,10 @@ class Loader {
      */
     static LoadControllers(app) {
         const controllerList = IOCContainer.listClass("CONTROLLER");
-        const controllers = {};
+        const controllers = [];
         controllerList.forEach((item) => {
-            item.id = (item.id ?? "").replace("CONTROLLER:", "");
+            var _a;
+            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("CONTROLLER:", "");
             if (item.id && Helper.isClass(item.target)) {
                 Logger.Debug(`Load controller: ${item.id}`);
                 // registering to IOC
@@ -736,10 +741,10 @@ class Loader {
                 if (!(ctl instanceof BaseController)) {
                     throw new Error(`class ${item.id} does not inherit from BaseController`);
                 }
-                controllers[item.id] = 1;
+                controllers.push(item.id);
             }
         });
-        app.setMetaData("_controllers", controllers);
+        return controllers;
     }
     /**
      * Load services
@@ -751,7 +756,8 @@ class Loader {
     static LoadServices(app) {
         const serviceList = IOCContainer.listClass("SERVICE");
         serviceList.forEach((item) => {
-            item.id = (item.id ?? "").replace("SERVICE:", "");
+            var _a;
+            item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("SERVICE:", "");
             if (item.id && Helper.isClass(item.target)) {
                 Logger.Debug(`Load service: ${item.id}`);
                 // registering to IOC
@@ -769,7 +775,8 @@ class Loader {
     static LoadComponents(app) {
         const componentList = IOCContainer.listClass("COMPONENT");
         componentList.forEach((item) => {
-            item.id = (item.id ?? "").replace("COMPONENT:", "");
+            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 component: ${item.id}`);
                 // registering to IOC
@@ -785,6 +792,7 @@ 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)) {
@@ -792,7 +800,8 @@ class Loader {
         }
         const pluginList = [];
         componentList.forEach(async (item) => {
-            item.id = (item.id ?? "").replace("COMPONENT:", "");
+            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)) {
                 // registering to IOC
                 IOCContainer.reg(item.id, item.target, { scope: "Singleton", type: "COMPONENT", args: [] });
@@ -813,12 +822,12 @@ class Loader {
                 continue;
             }
             // sync exec
-            await handle.run(pluginsConf.config[key] ?? {}, app);
+            await handle.run((_a = pluginsConf.config[key]) !== null && _a !== void 0 ? _a : {}, app);
         }
     }
 }
-var version = "3.6.6";
+var version = "3.6.8-2";
 var engines = {
 	node: ">12.0.0"
 };
@@ -828,7 +837,7 @@ var engines = {
 * @Usage:
 * @Author: richen
 * @Date: 2021-12-17 11:54:06
- * @LastEditTime: 2022-02-23 16:12:34
+ * @LastEditTime: 2022-03-15 14:22:45
 */
 const KOATTY_VERSION = version;
 const ENGINES_VERSION = engines.node.slice(1) || '12.0.0';
@@ -929,6 +938,10 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         Loader.LoadAppReadyHooks(app, target);
         // New router
         const KoattyRouter = newRouter(app);
+        Helper.define(app, "router", KoattyRouter);
+        // Create Server
+        app.server = newServe(app);
+        Helper.define(app, "listenCallback", listenCallback(app));
         // Load Middleware
         Logger.Log('think', '', 'Load Middlewares ...');
         await Loader.LoadMiddlewares(app);
@@ -940,24 +953,17 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         Loader.LoadServices(app);
         // Load Controllers
         Logger.Log('think', '', 'Load Controllers ...');
-        Loader.LoadControllers(app);
+        const controllers = Loader.LoadControllers(app);
+        // Load Routers
+        Logger.Log('think', '', 'Load Routers ...');
+        KoattyRouter.LoadRouter(controllers);
         // Emit app ready event
         Logger.Log('think', '', 'Emit App Ready ...');
-        // app.emit("appReady");
         await asyncEvent(app, 'appReady');
-        // Load Routers
-        Logger.Log('think', '', 'Load Routers ...');
-        KoattyRouter.LoadRouter(app.getMetaData("_controllers"));
-        Logger.Log('think', '', '====================================');
-        // Start server
-        const server = newServe(app);
-        app.listen(server, listenCallback(app, server.options));
-        // app.emit("appStart");
-        // Emit app started event
-        Logger.Log('think', '', 'Emit App Start ...');
-        asyncEvent(app, 'appStart');
-        // binding event "appStop"
-        BindProcessEvent(app, 'appStop');
+        if (!isUTRuntime) {
+            app.listen();
+        }
+        return app;
     }
     catch (err) {
         Logger.Error(err);
@@ -972,26 +978,34 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
  * @returns {*}
  */
 const newRouter = function (app) {
+    var _a;
     const protocol = app.config("protocol") || "http";
-    const options = app.config(undefined, 'router') ?? {};
+    const options = (_a = app.config(undefined, 'router')) !== null && _a !== void 0 ? _a : {};
     const router = NewRouter(app, options, protocol);
-    Helper.define(app, "router", router);
     return router;
 };
 /**
  * Listening callback function
  *
  * @param {Koatty} app
- * @param {ListeningOptions} options
  * @returns {*}
  */
-const listenCallback = (app, options) => {
+const listenCallback = (app) => {
+    const options = app.server.options;
     return function () {
+        // Emit app started event
+        Logger.Log('think', '', 'Emit App Start ...');
+        asyncEvent(app, 'appStart');
+        Logger.Log('think', '', '====================================');
         Logger.Log("think", "", `Nodejs Version: ${process.version}`);
         Logger.Log("think", "", `Koatty Version: v${app.version}`);
         Logger.Log("think", "", `App Environment: ${app.env}`);
+        Logger.Log('think', '', `Server Protocol: ${(options.protocol).toUpperCase()}`);
         Logger.Log("think", "", `Server running at ${options.protocol === "http2" ? "https" : options.protocol}://${options.hostname || '127.0.0.1'}:${options.port}/`);
         Logger.Log("think", "", "====================================");
+        // binding event "appStop"
+        Logger.Log('think', '', 'Bind App Stop event ...');
+        BindProcessEvent(app, 'appStop');
         // tslint:disable-next-line: no-unused-expression
         app.appDebug && Logger.Warn(`Running in debug mode.`);
     };
@@ -1003,11 +1017,12 @@ const listenCallback = (app, options) => {
  * @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 ||
-        process.env.HOSTNAME?.replace(/-/g, '.') || app.config('app_host') || '127.0.0.1';
+        ((_a = process.env.HOSTNAME) === null || _a === void 0 ? void 0 : _a.replace(/-/g, '.')) || app.config('app_host') || '127.0.0.1';
     const options = {
         hostname,
         port,
@@ -1020,8 +1035,8 @@ const newServe = function (app) {
     };
     const pm = new Set(["https", "http2", "wss"]);
     if (pm.has(options.protocol)) {
-        const keyFile = app.config("key_file") ?? "";
-        const crtFile = app.config("crt_file") ?? "";
+        const keyFile = (_b = app.config("key_file")) !== null && _b !== void 0 ? _b : "";
+        const crtFile = (_c = app.config("crt_file")) !== null && _c !== void 0 ? _c : "";
         options.ext.key = fs.readFileSync(keyFile).toString();
         options.ext.cert = fs.readFileSync(crtFile).toString();
     }
@@ -1032,9 +1047,7 @@ const newServe = function (app) {
         const proto = app.config("protoFile", "router");
         options.ext.protoFile = proto;
     }
-    const server = Serve(app, options);
-    Helper.define(app, "server", server);
-    return server;
+    return Serve(app, options);
 };
 /**
  * Execute event as async
@@ -1094,7 +1107,7 @@ function ComponentScan(scanPath) {
         if (!(target.prototype instanceof Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
         }
-        scanPath = scanPath ?? '';
+        scanPath = scanPath !== null && scanPath !== void 0 ? scanPath : '';
         IOCContainer.saveClassMetadata(TAGGED_CLS, COMPONENT_SCAN, scanPath, target);
     };
 }
@@ -1110,7 +1123,7 @@ function ConfigurationScan(scanPath) {
         if (!(target.prototype instanceof Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
         }
-        scanPath = scanPath ?? '';
+        scanPath = scanPath !== null && scanPath !== void 0 ? scanPath : '';
         IOCContainer.saveClassMetadata(TAGGED_CLS, CONFIGURATION_SCAN, scanPath, target);
     };
 }

package/dist/package.json CHANGED Viewed

@@ -1,98 +1,103 @@
 {
-    "name": "koatty",
-    "version": "3.6.6",
-    "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",
-        "build:cp": "node scripts/postBuild && copyfiles package.json LICENSE README.md dist/",
-        "build:js": "del-cli --force dist && npx rollup -c",
-        "build:doc": "del-cli --force docs/api && npx api-documenter markdown --input temp --output docs/api",
-        "build:dts": "del-cli --force temp && npx tsc && npx api-extractor run --local --verbose",
-        "eslint": "eslint --ext .ts,.js ./",
-        "prepublishOnly": "npm test && npm run build",
-        "prerelease": "npm test && npm run build",
-        "release": "standard-version",
-        "release:pre": "npm run release -- --prerelease",
-        "release:major": "npm run release -- --release-as major",
-        "release:minor": "npm run release -- --release-as minor",
-        "test": "npm run eslint && jest --passWithNoTests",
-        "test:cov": "jest --collectCoverage --detectOpenHandles",
-        "version": "conventional-changelog -p angular -i CHANGELOG.md -s"
-    },
-    "main": "./dist/index.js",
-    "exports": {
-        "require": "./dist/index.js",
-        "import": "./dist/index.mjs"
-    },
-    "directories": {
-        "doc": "docs"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/thinkkoa/koatty.git"
-    },
-    "engines": {
-        "node": ">12.0.0"
-    },
-    "author": {
-        "name": "richenlin",
-        "email": "richenlin@gmail.com"
-    },
-    "license": "BSD-3-Clause",
-    "bugs": {
-        "url": "https://github.com/thinkkoa/koatty/issues"
-    },
-    "homepage": "https://github.com/thinkkoa/koatty",
-    "maintainers": [
-        {
-            "name": "richenlin",
-            "email": "richenlin@gmail.com"
-        }
-    ],
-    "devDependencies": {
-        "@microsoft/api-documenter": "^7.x.x",
-        "@microsoft/api-extractor": "^7.x.x",
-        "@rollup/plugin-json": "^4.x.x",
-        "@types/jest": "^27.x.x",
-        "@types/koa": "^2.x.x",
-        "@types/koa__router": "^8.x.x",
-        "@types/node": "^16.x.x",
-        "@types/ws": "^8.x.x",
-        "@typescript-eslint/eslint-plugin": "^5.x.x",
-        "@typescript-eslint/parser": "^5.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": "^4.x.x",
-        "jest": "^27.x.x",
-        "jest-html-reporters": "^2.x.x",
-        "rollup": "^2.x.x",
-        "rollup-plugin-typescript2": "^0.x.x",
-        "standard-version": "^9.x.x",
-        "ts-jest": "^27.x.x",
-        "ts-node": "^10.x.x",
-        "typescript": "^4.x.x"
-    },
-    "dependencies": {
-        "koa": "2.13.4",
-        "koatty_config": "1.1.2",
-        "koatty_container": "1.7.7",
-        "koatty_core": "1.6.1",
-        "koatty_exception": "1.2.6",
-        "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.2",
-        "koatty_serve": "1.4.8",
-        "koatty_trace": "1.6.6",
-        "koatty_validation": "1.2.2",
-        "reflect-metadata": "0.1.13",
-        "tslib": "2.3.1"
+  "name": "koatty",
+  "version": "3.6.8-2",
+  "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",
+    "build:cp": "node scripts/postBuild && copyfiles package.json LICENSE README.md dist/",
+    "build:js": "del-cli --force dist && npx rollup -c",
+    "build:doc": "del-cli --force docs/api && npx api-documenter markdown --input temp --output docs/api",
+    "build:dts": "del-cli --force temp && npx tsc && npx api-extractor run --local --verbose",
+    "eslint": "eslint --ext .ts,.js ./",
+    "prepublishOnly": "npm test && npm run build",
+    "prerelease": "npm test && npm run build",
+    "release": "standard-version",
+    "release:pre": "npm run release -- --prerelease",
+    "release:major": "npm run release -- --release-as major",
+    "release:minor": "npm run release -- --release-as minor",
+    "test": "npm run eslint && jest --passWithNoTests",
+    "test:cov": "jest --collectCoverage --detectOpenHandles",
+    "version": "conventional-changelog -p angular -i CHANGELOG.md -s"
+  },
+  "main": "./dist/index.js",
+  "exports": {
+    "require": "./dist/index.js",
+    "import": "./dist/index.mjs"
+  },
+  "directories": {
+    "doc": "docs"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/thinkkoa/koatty.git"
+  },
+  "engines": {
+    "node": ">12.0.0"
+  },
+  "author": {
+    "name": "richenlin",
+    "email": "richenlin@gmail.com"
+  },
+  "license": "BSD-3-Clause",
+  "bugs": {
+    "url": "https://github.com/thinkkoa/koatty/issues"
+  },
+  "homepage": "https://github.com/thinkkoa/koatty",
+  "maintainers": [
+    {
+      "name": "richenlin",
+      "email": "richenlin@gmail.com"
     }
+  ],
+  "devDependencies": {
+    "@commitlint/cli": "^12.x.x",
+    "@commitlint/config-conventional": "^15.x.x",
+    "@microsoft/api-documenter": "^7.x.x",
+    "@microsoft/api-extractor": "^7.x.x",
+    "@rollup/plugin-json": "^4.x.x",
+    "@types/jest": "^27.x.x",
+    "@types/koa": "^2.x.x",
+    "@types/koa__router": "^8.x.x",
+    "@types/node": "^16.x.x",
+    "@types/supertest": "^2.x.x",
+    "@types/ws": "^8.x.x",
+    "@typescript-eslint/eslint-plugin": "^5.x.x",
+    "@typescript-eslint/parser": "^5.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": "^4.x.x",
+    "jest": "^27.x.x",
+    "jest-html-reporters": "^2.x.x",
+    "koatty_cacheable": "^1.x.x",
+    "koatty_schedule": "^1.x.x",
+    "koatty_store": "^1.x.x",
+    "koatty_validation": "^1.x.x",
+    "rollup": "^2.x.x",
+    "rollup-plugin-typescript2": "^0.x.x",
+    "standard-version": "^9.x.x",
+    "supertest": "^6.x.x",
+    "ts-jest": "^27.x.x",
+    "ts-node": "^10.x.x",
+    "typescript": "^4.x.x"
+  },
+  "dependencies": {
+    "koa": "2.13.4",
+    "koatty_config": "1.1.2",
+    "koatty_container": "1.7.7",
+    "koatty_core": "1.6.5",
+    "koatty_exception": "1.2.6",
+    "koatty_lib": "1.2.10",
+    "koatty_loader": "1.0.2",
+    "koatty_logger": "1.3.12",
+    "koatty_payload": "1.3.16",
+    "koatty_proto": "1.1.6",
+    "koatty_router": "1.7.5",
+    "koatty_serve": "1.4.9",
+    "koatty_trace": "1.6.6",
+    "reflect-metadata": "0.1.13",
+    "tslib": "2.3.1"
+  }
 }

package/jest-html-reporters-attach/result.js CHANGED Viewed

	@@ -1 +1 @@
1	- window.jest_html_reporters_callback__({"numFailedTestSuites":0,"numFailedTests":0,"numPassedTestSuites":0,"numPassedTests":0,"numPendingTestSuites":0,"numPendingTests":0,"numRuntimeErrorTestSuites":0,"numTodoTests":0,"numTotalTestSuites":0,"numTotalTests":0,"startTime":~~1646218969089~~,"success":false,"testResults":[],"wasInterrupted":false,"config":{"bail":0,"changedFilesWithAncestor":false,"collectCoverage":true,"collectCoverageFrom":[],"coverageDirectory":"coverage","coverageProvider":"babel","coverageReporters":["html","lcov","json","text","clover","text-summary"],"detectLeaks":false,"detectOpenHandles":false,"errorOnDeprecated":false,"expand":false,"findRelatedTests":false,"forceExit":false,"json":false,"lastCommit":false,"listTests":false,"logHeapUsage":false,"maxConcurrency":5,"maxWorkers":7,"noStackTrace":false,"nonFlagArgs":[],"notify":false,"notifyMode":"failure-change","onlyChanged":false,"onlyFailures":false,"passWithNoTests":true,"projects":[],"reporters":[["default",{}],["/Users/richen/Workspace/nodejs/koatty/node_modules/jest-html-reporters/index.js",{}]],"rootDir":"/Users/richen/Workspace/nodejs/koatty","runTestsByPath":false,"skipFilter":false,"testFailureExitCode":1,"testPathPattern":"","testSequencer":"/Users/richen/Workspace/nodejs/koatty/node_modules/@jest/test-sequencer/build/index.js","updateSnapshot":"new","useStderr":false,"watch":false,"watchAll":false,"watchman":true},"endTime":~~1646218969142~~,"_reporterOptions":{"publicPath":"/Users/richen/Workspace/nodejs/koatty","filename":"jest_html_reporters.html","expand":false,"pageTitle":"","hideIcon":false,"testCommand":"npx jest","openReport":false,"failureMessageOnly":false,"enableMergeData":false,"dataMergeLevel":1},"attachInfos":{}})
1	+ window.jest_html_reporters_callback__({"numFailedTestSuites":0,"numFailedTests":0,"numPassedTestSuites":0,"numPassedTests":0,"numPendingTestSuites":0,"numPendingTests":0,"numRuntimeErrorTestSuites":0,"numTodoTests":0,"numTotalTestSuites":0,"numTotalTests":0,"startTime":1647325639576,"success":false,"testResults":[],"wasInterrupted":false,"config":{"bail":0,"changedFilesWithAncestor":false,"collectCoverage":true,"collectCoverageFrom":[],"coverageDirectory":"coverage","coverageProvider":"babel","coverageReporters":["html","lcov","json","text","clover","text-summary"],"detectLeaks":false,"detectOpenHandles":false,"errorOnDeprecated":false,"expand":false,"findRelatedTests":false,"forceExit":false,"json":false,"lastCommit":false,"listTests":false,"logHeapUsage":false,"maxConcurrency":5,"maxWorkers":7,"noStackTrace":false,"nonFlagArgs":[],"notify":false,"notifyMode":"failure-change","onlyChanged":false,"onlyFailures":false,"passWithNoTests":true,"projects":[],"reporters":[["default",{}],["/Users/richen/Workspace/nodejs/koatty/node_modules/jest-html-reporters/index.js",{}]],"rootDir":"/Users/richen/Workspace/nodejs/koatty","runTestsByPath":false,"skipFilter":false,"testFailureExitCode":1,"testPathPattern":"","testSequencer":"/Users/richen/Workspace/nodejs/koatty/node_modules/@jest/test-sequencer/build/index.js","updateSnapshot":"new","useStderr":false,"watch":false,"watchAll":false,"watchman":true},"endTime":1647325639968,"_reporterOptions":{"publicPath":"/Users/richen/Workspace/nodejs/koatty","filename":"jest_html_reporters.html","expand":false,"pageTitle":"","hideIcon":false,"testCommand":"npx jest","openReport":false,"failureMessageOnly":false,"enableMergeData":false,"dataMergeLevel":1},"attachInfos":{}})

package/package.json CHANGED Viewed

@@ -1,98 +1,103 @@
 {
-    "name": "koatty",
-    "version": "3.6.6",
-    "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",
-        "build:cp": "node scripts/postBuild && copyfiles package.json LICENSE README.md dist/",
-        "build:js": "del-cli --force dist && npx rollup -c",
-        "build:doc": "del-cli --force docs/api && npx api-documenter markdown --input temp --output docs/api",
-        "build:dts": "del-cli --force temp && npx tsc && npx api-extractor run --local --verbose",
-        "eslint": "eslint --ext .ts,.js ./",
-        "prepublishOnly": "npm test && npm run build",
-        "prerelease": "npm test && npm run build",
-        "release": "standard-version",
-        "release:pre": "npm run release -- --prerelease",
-        "release:major": "npm run release -- --release-as major",
-        "release:minor": "npm run release -- --release-as minor",
-        "test": "npm run eslint && jest --passWithNoTests",
-        "test:cov": "jest --collectCoverage --detectOpenHandles",
-        "version": "conventional-changelog -p angular -i CHANGELOG.md -s"
-    },
-    "main": "./dist/index.js",
-    "exports": {
-        "require": "./dist/index.js",
-        "import": "./dist/index.mjs"
-    },
-    "directories": {
-        "doc": "docs"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/thinkkoa/koatty.git"
-    },
-    "engines": {
-        "node": ">12.0.0"
-    },
-    "author": {
-        "name": "richenlin",
-        "email": "richenlin@gmail.com"
-    },
-    "license": "BSD-3-Clause",
-    "bugs": {
-        "url": "https://github.com/thinkkoa/koatty/issues"
-    },
-    "homepage": "https://github.com/thinkkoa/koatty",
-    "maintainers": [
-        {
-            "name": "richenlin",
-            "email": "richenlin@gmail.com"
-        }
-    ],
-    "devDependencies": {
-        "@microsoft/api-documenter": "^7.x.x",
-        "@microsoft/api-extractor": "^7.x.x",
-        "@rollup/plugin-json": "^4.x.x",
-        "@types/jest": "^27.x.x",
-        "@types/koa": "^2.x.x",
-        "@types/koa__router": "^8.x.x",
-        "@types/node": "^16.x.x",
-        "@types/ws": "^8.x.x",
-        "@typescript-eslint/eslint-plugin": "^5.x.x",
-        "@typescript-eslint/parser": "^5.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": "^4.x.x",
-        "jest": "^27.x.x",
-        "jest-html-reporters": "^2.x.x",
-        "rollup": "^2.x.x",
-        "rollup-plugin-typescript2": "^0.x.x",
-        "standard-version": "^9.x.x",
-        "ts-jest": "^27.x.x",
-        "ts-node": "^10.x.x",
-        "typescript": "^4.x.x"
-    },
-    "dependencies": {
-        "koa": "2.13.4",
-        "koatty_config": "1.1.2",
-        "koatty_container": "1.7.7",
-        "koatty_core": "1.6.1",
-        "koatty_exception": "1.2.6",
-        "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.2",
-        "koatty_serve": "1.4.8",
-        "koatty_trace": "1.6.6",
-        "koatty_validation": "1.2.2",
-        "reflect-metadata": "0.1.13",
-        "tslib": "2.3.1"
+  "name": "koatty",
+  "version": "3.6.8-2",
+  "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",
+    "build:cp": "node scripts/postBuild && copyfiles package.json LICENSE README.md dist/",
+    "build:js": "del-cli --force dist && npx rollup -c",
+    "build:doc": "del-cli --force docs/api && npx api-documenter markdown --input temp --output docs/api",
+    "build:dts": "del-cli --force temp && npx tsc && npx api-extractor run --local --verbose",
+    "eslint": "eslint --ext .ts,.js ./",
+    "prepublishOnly": "npm test && npm run build",
+    "prerelease": "npm test && npm run build",
+    "release": "standard-version",
+    "release:pre": "npm run release -- --prerelease",
+    "release:major": "npm run release -- --release-as major",
+    "release:minor": "npm run release -- --release-as minor",
+    "test": "npm run eslint && jest --passWithNoTests",
+    "test:cov": "jest --collectCoverage --detectOpenHandles",
+    "version": "conventional-changelog -p angular -i CHANGELOG.md -s"
+  },
+  "main": "./dist/index.js",
+  "exports": {
+    "require": "./dist/index.js",
+    "import": "./dist/index.mjs"
+  },
+  "directories": {
+    "doc": "docs"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/thinkkoa/koatty.git"
+  },
+  "engines": {
+    "node": ">12.0.0"
+  },
+  "author": {
+    "name": "richenlin",
+    "email": "richenlin@gmail.com"
+  },
+  "license": "BSD-3-Clause",
+  "bugs": {
+    "url": "https://github.com/thinkkoa/koatty/issues"
+  },
+  "homepage": "https://github.com/thinkkoa/koatty",
+  "maintainers": [
+    {
+      "name": "richenlin",
+      "email": "richenlin@gmail.com"
     }
+  ],
+  "devDependencies": {
+    "@commitlint/cli": "^12.x.x",
+    "@commitlint/config-conventional": "^15.x.x",
+    "@microsoft/api-documenter": "^7.x.x",
+    "@microsoft/api-extractor": "^7.x.x",
+    "@rollup/plugin-json": "^4.x.x",
+    "@types/jest": "^27.x.x",
+    "@types/koa": "^2.x.x",
+    "@types/koa__router": "^8.x.x",
+    "@types/node": "^16.x.x",
+    "@types/supertest": "^2.x.x",
+    "@types/ws": "^8.x.x",
+    "@typescript-eslint/eslint-plugin": "^5.x.x",
+    "@typescript-eslint/parser": "^5.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": "^4.x.x",
+    "jest": "^27.x.x",
+    "jest-html-reporters": "^2.x.x",
+    "koatty_cacheable": "^1.x.x",
+    "koatty_schedule": "^1.x.x",
+    "koatty_store": "^1.x.x",
+    "koatty_validation": "^1.x.x",
+    "rollup": "^2.x.x",
+    "rollup-plugin-typescript2": "^0.x.x",
+    "standard-version": "^9.x.x",
+    "supertest": "^6.x.x",
+    "ts-jest": "^27.x.x",
+    "ts-node": "^10.x.x",
+    "typescript": "^4.x.x"
+  },
+  "dependencies": {
+    "koa": "2.13.4",
+    "koatty_config": "1.1.2",
+    "koatty_container": "1.7.7",
+    "koatty_core": "1.6.5",
+    "koatty_exception": "1.2.6",
+    "koatty_lib": "1.2.10",
+    "koatty_loader": "1.0.2",
+    "koatty_logger": "1.3.12",
+    "koatty_payload": "1.3.16",
+    "koatty_proto": "1.1.6",
+    "koatty_router": "1.7.5",
+    "koatty_serve": "1.4.9",
+    "koatty_trace": "1.6.6",
+    "reflect-metadata": "0.1.13",
+    "tslib": "2.3.1"
+  }
 }

package/tsconfig.test.json ADDED Viewed

@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "exclude": [
+    "node_modules"
+  ],
+  "include": [
+    "test/*.test.ts"
+  ]
+}

package/.vscode/settings.json DELETED Viewed

@@ -1,3 +0,0 @@
-{
-    "debug.javascript.unmapMissingSources": true
-}