typespeed 2.0.22 → 2.1.1

package/dist/route.decorator.js

@@ -15,9 +15,9 @@ const routerMiddleware = {};
 function setRouter(app) {
     ["get", "post", "all"].forEach(method => {
         for (let key in routerMapper[method]) {
-            let rounterFunction = routerMapper[method][key];
+            const rounterFunction = routerMapper[method][key];
             if (routerMiddleware[rounterFunction["name"]]) {
-                let args = [key, ...routerMiddleware[rounterFunction["name"]], rounterFunction["invoker"]];
+                const args = [key, ...routerMiddleware[rounterFunction["name"]], rounterFunction["invoker"]];
                 app[method].apply(app, args);
             }
             else {
@@ -32,6 +32,8 @@ function mapperFunction(method, value) {
         routerMapper[method][value] = {
             "path": value,
             "name": [target.constructor.name, propertyKey].toString(),
+            "target": target.constructor,
+            "propertyKey": propertyKey,
             "invoker": async (req, res, next) => {
                 const routerBean = (0, core_decorator_1.getComponent)(target.constructor);
                 try {
@@ -39,7 +41,7 @@ function mapperFunction(method, value) {
                     if (routerParamsTotal[[target.constructor.name, propertyKey].toString()]) {
                         paramTotal = Math.max(paramTotal, routerParamsTotal[[target.constructor.name, propertyKey].toString()]);
                     }
-                    let args = [req, res, next];
+                    const args = [req, res, next];
                     if (paramTotal > 0) {
                         for (let i = 0; i < paramTotal; i++) {
                             if (routerParams[[target.constructor.name, propertyKey, i].toString()]) {

package/dist/typespeed.d.ts

@@ -169,6 +169,21 @@ declare function after(constructorFunction: any, methodName: string): (target: a
 declare function schedule(cronTime: string | Date): (target: any, propertyKey: string) => void;
 /**RabbitMQ 监听装饰器，参数是监听的队列名称，当接受到消息时将执行被装饰方法 */
 declare function rabbitListener(queue: string): (target: any, propertyKey: string) => void;
+/** request 对象装饰器，作为路由页面方法参数，获取 request 对象 */
+declare function req(target: any, propertyKey: string, parameterIndex: number) : void;
+/** response 对象装饰器，作为路由页面方法参数，获取 response 对象 */
+declare function res(target: any, propertyKey: string, parameterIndex: number) : void;
+/** next 函数装饰器，作为路由页面方法参数，获取  next 函数 */
+declare function next(target: any, propertyKey: string, parameterIndex: number) : void;
+/** request.body 对象装饰器，作为路由页面方法参数，获取 request.body 对象 */
+declare function reqBody(target: any, propertyKey: string, parameterIndex: number) : void;
+/** request.param 值装饰器，作为路由页面方法参数，获取 request.params 内容 */
+declare function reqParam(paramName: string) : (target: any, propertyKey: string, parameterIndex: number) => void;
+/** request.query 值装饰器，作为路由页面方法参数，获取 request.query 内容 */
+declare function reqQuery(paramName: string) : (target: any, propertyKey: string, parameterIndex: number) => void;
+/** request 表单值装饰器，作为路由页面方法参数，获取 request.body 表单内容 */
+declare function reqForm(paramName: string) : (target: any, propertyKey: string, parameterIndex: number) => void;
+
 /**框架 Web 服务工厂类 */
 declare abstract class ServerFactory {
     /**Web 服务实例 */
@@ -344,4 +359,4 @@ declare class ExpressServer extends ServerFactory {
     private setDefaultMiddleware;
 }
 
-export { ExpressServer, LogDefault, NodeCache, RabbitMQ, rabbitListener, ReadWriteDb, Redis, CacheFactory, DataSourceFactory, LogFactory, ServerFactory, AuthenticationFactory, component, bean, resource, log, app, before, after, value, error, config, autoware, getBean, getComponent, schedule, getMapping, postMapping, requestMapping, setRouter, upload, jwt, insert, update, remove, select, param, resultType, cache, Model};
+export { ExpressServer, LogDefault, NodeCache, RabbitMQ, rabbitListener, ReadWriteDb, Redis, CacheFactory, DataSourceFactory, LogFactory, ServerFactory, AuthenticationFactory, next, reqBody, reqQuery, reqForm, reqParam, req, req as request, res, res as response, component, bean, resource, log, app, before, after, value, error, config, autoware, getBean, getComponent, schedule, getMapping, postMapping, requestMapping, setRouter, upload, jwt, insert, update, remove, select, param, resultType, cache, Model};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespeed",
-  "version": "2.0.22",
+  "version": "2.1.1",
   "description": "A new Framework for TypeScript.",
   "author": "speedphp",
   "license": "MIT License",
@@ -52,6 +52,7 @@
     "tracer": "^1.1.6",
     "typescript": "^4.7.4",
     "walk-sync": "^3.0.0",
-    "amqplib": "0.10.3"
+    "amqplib": "0.10.3",
+    "swagger-ui-express": "4.6.3"
   }
 }

package/src/default/express-server.class.ts

@@ -54,12 +54,12 @@ export default class ExpressServer extends ServerFactory {
 
     public start(port: number) {
         this.app.use(this.authentication.afterCompletion);
-        
         this.middlewareList.forEach(middleware => {
             this.app.use(middleware);
         });
 
         this.setDefaultMiddleware();
+ 
         this.app.listen(port, () => {
             log("server start at port: " + port);
         });

package/src/route.decorator.ts

@@ -2,7 +2,6 @@ import * as express from "express";
 import * as multiparty from "multiparty";
 import { expressjwt } from "express-jwt";
 import { getComponent } from "./core.decorator";
-import { param } from "./database.decorator";
 
 const routerMapper = {
   "get": {},
@@ -15,9 +14,9 @@ const routerMiddleware = {};
 function setRouter(app: express.Application) {
   ["get", "post", "all"].forEach(method => {
     for (let key in routerMapper[method]) {
-      let rounterFunction = routerMapper[method][key];
+      const rounterFunction = routerMapper[method][key];
       if (routerMiddleware[rounterFunction["name"]]) {
-        let args: Array<any> = [key, ...routerMiddleware[rounterFunction["name"]], rounterFunction["invoker"]];
+        const args: Array<any> = [key, ...routerMiddleware[rounterFunction["name"]], rounterFunction["invoker"]];
         app[method].apply(app, args);
       } else {
         app[method](key, rounterFunction["invoker"]);
@@ -31,6 +30,8 @@ function mapperFunction(method: string, value: string) {
     routerMapper[method][value] = {
       "path": value,
       "name": [target.constructor.name, propertyKey].toString(),
+      "target": target.constructor,
+      "propertyKey": propertyKey,
       "invoker": async (req, res, next) => {
         const routerBean = getComponent(target.constructor);
         try {
@@ -38,7 +39,7 @@ function mapperFunction(method: string, value: string) {
           if(routerParamsTotal[[target.constructor.name, propertyKey].toString()]){
             paramTotal = Math.max(paramTotal, routerParamsTotal[[target.constructor.name, propertyKey].toString()]);
           }
-          let args = [req, res, next];
+          const args = [req, res, next];
           if(paramTotal > 0) {
             for(let i = 0; i < paramTotal; i++) {
               if(routerParams[[target.constructor.name, propertyKey, i].toString()]){

package/src/typespeed.d.ts

@@ -169,6 +169,21 @@ declare function after(constructorFunction: any, methodName: string): (target: a
 declare function schedule(cronTime: string | Date): (target: any, propertyKey: string) => void;
 /**RabbitMQ 监听装饰器，参数是监听的队列名称，当接受到消息时将执行被装饰方法 */
 declare function rabbitListener(queue: string): (target: any, propertyKey: string) => void;
+/** request 对象装饰器，作为路由页面方法参数，获取 request 对象 */
+declare function req(target: any, propertyKey: string, parameterIndex: number) : void;
+/** response 对象装饰器，作为路由页面方法参数，获取 response 对象 */
+declare function res(target: any, propertyKey: string, parameterIndex: number) : void;
+/** next 函数装饰器，作为路由页面方法参数，获取  next 函数 */
+declare function next(target: any, propertyKey: string, parameterIndex: number) : void;
+/** request.body 对象装饰器，作为路由页面方法参数，获取 request.body 对象 */
+declare function reqBody(target: any, propertyKey: string, parameterIndex: number) : void;
+/** request.param 值装饰器，作为路由页面方法参数，获取 request.params 内容 */
+declare function reqParam(paramName: string) : (target: any, propertyKey: string, parameterIndex: number) => void;
+/** request.query 值装饰器，作为路由页面方法参数，获取 request.query 内容 */
+declare function reqQuery(paramName: string) : (target: any, propertyKey: string, parameterIndex: number) => void;
+/** request 表单值装饰器，作为路由页面方法参数，获取 request.body 表单内容 */
+declare function reqForm(paramName: string) : (target: any, propertyKey: string, parameterIndex: number) => void;
+
 /**框架 Web 服务工厂类 */
 declare abstract class ServerFactory {
     /**Web 服务实例 */
@@ -344,4 +359,4 @@ declare class ExpressServer extends ServerFactory {
     private setDefaultMiddleware;
 }
 
-export { ExpressServer, LogDefault, NodeCache, RabbitMQ, rabbitListener, ReadWriteDb, Redis, CacheFactory, DataSourceFactory, LogFactory, ServerFactory, AuthenticationFactory, component, bean, resource, log, app, before, after, value, error, config, autoware, getBean, getComponent, schedule, getMapping, postMapping, requestMapping, setRouter, upload, jwt, insert, update, remove, select, param, resultType, cache, Model};
+export { ExpressServer, LogDefault, NodeCache, RabbitMQ, rabbitListener, ReadWriteDb, Redis, CacheFactory, DataSourceFactory, LogFactory, ServerFactory, AuthenticationFactory, next, reqBody, reqQuery, reqForm, reqParam, req, req as request, res, res as response, component, bean, resource, log, app, before, after, value, error, config, autoware, getBean, getComponent, schedule, getMapping, postMapping, requestMapping, setRouter, upload, jwt, insert, update, remove, select, param, resultType, cache, Model};

package/test/src/entities/mutil-users.class.ts

@@ -0,0 +1,5 @@
+import UserDto from "./user-dto.class";
+
+export default class MutilUsers {
+    constructor(public group: string, public users: UserDto[]){}
+}

package/test/src/test-request.class.ts

@@ -1,5 +1,6 @@
-import { component, getMapping, postMapping, log } from "../../";
-import { req, res, reqQuery, reqBody, reqForm, reqParam } from "../../src/route.decorator";
+import { component, getMapping, postMapping, log, req, res, reqQuery, reqBody, reqForm, reqParam } from "../../";
+import MutilUsers from "./entities/mutil-users.class";
+import UserDto from "./entities/user-dto.class";
 
 
 @component
@@ -11,15 +12,15 @@ export default class TestRequest {
     }
 
     @getMapping("/request/query")
-    testQuery(req, res, @reqQuery("id") id: number) {
+    async testQuery(req, res, @reqQuery("id") id: number): Promise<MutilUsers> {
         log("id: " + id);
-        res.send("test query");
+        return Promise.resolve(new MutilUsers("group", [new UserDto(1, "name"), new UserDto(2, "name")]));
     }
 
     @postMapping("/request/body")
-    testBody(@res res, @reqBody body: object) {
+    testBody(@res res, @reqBody body: object):MutilUsers {
         log("body: " + JSON.stringify(body));
-        res.send("test body");
+        return new MutilUsers("group", [new UserDto(1, "name"), new UserDto(2, "name")]);
     }
 
     @postMapping("/request/form")