koatty 3.10.3 → 3.10.4-0

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.10.4-0](https://github.com/thinkkoa/koatty/compare/v3.10.3...v3.10.4-0) (2023-12-09)
+
+
+### Bug Fixes
+
+* 合并payload ([6d98ffb](https://github.com/thinkkoa/koatty/commit/6d98ffb94ba313b16ac4438bace3eb84680c42f2))
+
 ### [3.10.3](https://github.com/thinkkoa/koatty/compare/v3.10.3-0...v3.10.3) (2023-12-06)
 
 ### [3.10.3-0](https://github.com/thinkkoa/koatty/compare/v3.10.2...v3.10.3-0) (2023-12-06)

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2023-12-07 00:36:06
+* @Date: 2023-12-09 23:43:01
 * @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: 2023-12-07 00:35:50
+* @Date: 2023-12-09 23:42:54
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -17,7 +17,6 @@ var koatty_logger = require('koatty_logger');
 var koatty_exception = require('koatty_exception');
 var koatty_container = require('koatty_container');
 var koatty_trace = require('koatty_trace');
-var koatty_payload = require('koatty_payload');
 var koatty_serve = require('koatty_serve');
 
 function _interopNamespaceDefault(e) {
@@ -39,11 +38,14 @@ function _interopNamespaceDefault(e) {
 
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
+/*
+ * @Description: framework logger
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:02:27
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 // Logger
 const Logger = koatty_logger.DefaultLogger;
@@ -71,11 +73,14 @@ function SetLogger(app, config) {
     }
 }
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
+/*
+ * @Description: framework helper
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:01:56
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 /**
  * Check class file
@@ -144,11 +149,14 @@ function formatApiData(msg, data, defaultCode) {
     return obj;
 }
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
+/*
+ * @Description: framework constants
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:00:13
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 const COMPONENT_SCAN = 'COMPONENT_SCAN';
 const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
@@ -162,6 +170,15 @@ const LOGO = `
 https://github.com/koatty
 `;
 
+/*
+ * @Description: base controller
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:03:09
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
+ */
 /**
  * Base controller
  *
@@ -239,23 +256,29 @@ class BaseController {
 //     }
 // });
 
+/*
+ * @Description: trace & catcher middleware
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 22:55:54
+ * @LastEditTime: 2023-12-09 23:00:44
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
+ */
 class TraceMiddleware {
     run(options, app) {
         return koatty_trace.Trace(options, app);
     }
 }
 
-class PayloadMiddleware {
-    run(options, app) {
-        return koatty_payload.Payload(options, app);
-    }
-}
-
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-07-06 11:18:01
+/*
+ * @Description: framework loader
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 22:55:49
+ * @LastEditTime: 2023-12-09 23:00:37
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 /**
  *
@@ -493,7 +516,6 @@ class Loader {
         // const middleware: any = {};
         const appMiddleware = koatty_container.IOCContainer.listClass("MIDDLEWARE") ?? [];
         appMiddleware.push({ id: "TraceMiddleware", target: TraceMiddleware });
-        appMiddleware.push({ id: "PayloadMiddleware", target: PayloadMiddleware });
         appMiddleware.forEach((item) => {
             item.id = (item.id ?? "").replace("MIDDLEWARE:", "");
             if (item.id && koatty_lib.Helper.isClass(item.target)) {
@@ -501,13 +523,11 @@ class Loader {
             }
         });
         const middlewareConfList = middlewareConf.list;
-        const defaultList = ["TraceMiddleware", "PayloadMiddleware"];
+        const defaultList = ["TraceMiddleware"];
         //de-duplication
         const appMList = new Set(defaultList);
         middlewareConfList.forEach((item) => {
-            if (!defaultList.includes(item)) {
-                appMList.add(item);
-            }
+            appMList.add(item);
         });
         //Automatically call middleware
         for (const key of appMList) {
@@ -650,16 +670,19 @@ class Loader {
     }
 }
 
-var version = "3.10.3";
+var version = "3.10.4-0";
 var engines = {
 	node: ">12.0.0"
 };
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
+/*
+ * @Description: framework runtime checker
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:01:22
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 const KOATTY_VERSION = version;
 const ENGINES_VERSION = engines.node.slice(1) || '12.0.0';
@@ -695,11 +718,14 @@ const checkUTRuntime = () => {
     return isUTRuntime;
 };
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-07-06 11:22:58
+/*
+ * @Description: framework bootstrap
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 22:59:19
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 /**
  * execute bootstrap
@@ -906,11 +932,14 @@ function BindEventHook(eventName, eventFunc, target) {
     koatty_container.IOCContainer.attachClassMetadata(koatty_container.TAGGED_CLS, eventName, eventFunc, target);
 }
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:32:45
+/*
+ * @Description: component interface
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:03:33
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 /**
  * Indicates that an decorated class is a "component".
@@ -983,6 +1012,15 @@ function Plugin(identifier) {
     };
 }
 
+/*
+ * @Description: base service
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:03:23
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
+ */
 /**
  * Base service
  *

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2023-12-07 00:35:50
+* @Date: 2023-12-09 23:42:54
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -21,15 +21,17 @@ import { IOCContainer, TAGGED_CLS } from 'koatty_container';
 export * from 'koatty_container';
 import { Trace } from 'koatty_trace';
 export * from 'koatty_trace';
-import { Payload } from 'koatty_payload';
 import { NewServe, NewRouter, BindProcessEvent, CONTROLLER_ROUTER } from 'koatty_serve';
 export * from 'koatty_serve';
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
+/*
+ * @Description: framework logger
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:02:27
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 // Logger
 const Logger = DefaultLogger;
@@ -57,11 +59,14 @@ function SetLogger(app, config) {
     }
 }
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
+/*
+ * @Description: framework helper
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:01:56
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 /**
  * Check class file
@@ -130,11 +135,14 @@ function formatApiData(msg, data, defaultCode) {
     return obj;
 }
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
+/*
+ * @Description: framework constants
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:00:13
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 const COMPONENT_SCAN = 'COMPONENT_SCAN';
 const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
@@ -148,6 +156,15 @@ const LOGO = `
 https://github.com/koatty
 `;
 
+/*
+ * @Description: base controller
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:03:09
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
+ */
 /**
  * Base controller
  *
@@ -225,23 +242,29 @@ class BaseController {
 //     }
 // });
 
+/*
+ * @Description: trace & catcher middleware
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 22:55:54
+ * @LastEditTime: 2023-12-09 23:00:44
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
+ */
 class TraceMiddleware {
     run(options, app) {
         return Trace(options, app);
     }
 }
 
-class PayloadMiddleware {
-    run(options, app) {
-        return Payload(options, app);
-    }
-}
-
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-07-06 11:18:01
+/*
+ * @Description: framework loader
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 22:55:49
+ * @LastEditTime: 2023-12-09 23:00:37
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 /**
  *
@@ -479,7 +502,6 @@ class Loader {
         // const middleware: any = {};
         const appMiddleware = IOCContainer.listClass("MIDDLEWARE") ?? [];
         appMiddleware.push({ id: "TraceMiddleware", target: TraceMiddleware });
-        appMiddleware.push({ id: "PayloadMiddleware", target: PayloadMiddleware });
         appMiddleware.forEach((item) => {
             item.id = (item.id ?? "").replace("MIDDLEWARE:", "");
             if (item.id && Helper.isClass(item.target)) {
@@ -487,13 +509,11 @@ class Loader {
             }
         });
         const middlewareConfList = middlewareConf.list;
-        const defaultList = ["TraceMiddleware", "PayloadMiddleware"];
+        const defaultList = ["TraceMiddleware"];
         //de-duplication
         const appMList = new Set(defaultList);
         middlewareConfList.forEach((item) => {
-            if (!defaultList.includes(item)) {
-                appMList.add(item);
-            }
+            appMList.add(item);
         });
         //Automatically call middleware
         for (const key of appMList) {
@@ -636,16 +656,19 @@ class Loader {
     }
 }
 
-var version = "3.10.3";
+var version = "3.10.4-0";
 var engines = {
 	node: ">12.0.0"
 };
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
+/*
+ * @Description: framework runtime checker
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:01:22
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 const KOATTY_VERSION = version;
 const ENGINES_VERSION = engines.node.slice(1) || '12.0.0';
@@ -681,11 +704,14 @@ const checkUTRuntime = () => {
     return isUTRuntime;
 };
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-07-06 11:22:58
+/*
+ * @Description: framework bootstrap
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 22:59:19
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 /**
  * execute bootstrap
@@ -892,11 +918,14 @@ function BindEventHook(eventName, eventFunc, target) {
     IOCContainer.attachClassMetadata(TAGGED_CLS, eventName, eventFunc, target);
 }
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:32:45
+/*
+ * @Description: component interface
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:03:33
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
  */
 /**
  * Indicates that an decorated class is a "component".
@@ -969,6 +998,15 @@ function Plugin(identifier) {
     };
 }
 
+/*
+ * @Description: base service
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:03:23
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
+ */
 /**
  * Base service
  *

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.10.3",
+  "version": "3.10.4-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",
@@ -55,6 +55,7 @@
     "@microsoft/api-documenter": "^7.x.x",
     "@microsoft/api-extractor": "^7.x.x",
     "@rollup/plugin-json": "^6.x.x",
+    "@types/formidable": "^3.x.x",
     "@types/jest": "^29.x.x",
     "@types/koa": "^2.x.x",
     "@types/koa__router": "^12.x.x",
@@ -86,9 +87,8 @@
     "koatty_lib": "^1.3.4",
     "koatty_loader": "^1.1.0",
     "koatty_logger": "^2.1.2",
-    "koatty_payload": "^1.4.6",
     "koatty_proto": "^1.1.12",
-    "koatty_serve": "^2.0.4",
+    "koatty_serve": "^2.1.0-0",
     "koatty_trace": "^1.10.2"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.10.3",
+  "version": "3.10.4-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",
@@ -55,6 +55,7 @@
     "@microsoft/api-documenter": "^7.x.x",
     "@microsoft/api-extractor": "^7.x.x",
     "@rollup/plugin-json": "^6.x.x",
+    "@types/formidable": "^3.x.x",
     "@types/jest": "^29.x.x",
     "@types/koa": "^2.x.x",
     "@types/koa__router": "^12.x.x",
@@ -86,9 +87,8 @@
     "koatty_lib": "^1.3.4",
     "koatty_loader": "^1.1.0",
     "koatty_logger": "^2.1.2",
-    "koatty_payload": "^1.4.6",
     "koatty_proto": "^1.1.12",
-    "koatty_serve": "^2.0.4",
+    "koatty_serve": "^2.1.0-0",
     "koatty_trace": "^1.10.2"
   }
 }

package/.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-  "DevChat.DevChatPath": "/Users/richen/.chat/mamba/envs/devchat/bin/devchat",
-  "devchat.defaultModel": "gpt-4",
-  "editor.inlineSuggest.showToolbar": "onHover"
-}