typespeed 2.0.23 → 2.1.2

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()]) {
@@ -147,18 +149,21 @@ function reqBody(target, propertyKey, parameterIndex) {
     routerParams[key] = (req, res, next) => req.body;
 }
 exports.reqBody = reqBody;
-function reqParam(paramName) {
-    return (target, propertyKey, parameterIndex) => {
-        const key = [target.constructor.name, propertyKey, parameterIndex].toString();
-        routerParams[key] = (req, res, next) => req.params[paramName];
-    };
+function reqParam(target, propertyKey, parameterIndex) {
+    const key = [target.constructor.name, propertyKey, parameterIndex].toString();
+    const paramName = getParamInFunction(target[propertyKey], parameterIndex);
+    routerParams[key] = (req, res, next) => req.params[paramName];
 }
 exports.reqParam = reqParam;
-function reqQuery(paramName) {
-    return (target, propertyKey, parameterIndex) => {
-        const key = [target.constructor.name, propertyKey, parameterIndex].toString();
-        routerParams[key] = (req, res, next) => req.query[paramName];
-    };
+function getParamInFunction(fn, index) {
+    const code = fn.toString().replace(/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg, '').replace(/=>.*$/mg, '').replace(/=[^,]+/mg, '');
+    const result = code.slice(code.indexOf('(') + 1, code.indexOf(')')).match(/([^\s,]+)/g);
+    return result[index] || null;
+}
+function reqQuery(target, propertyKey, parameterIndex) {
+    const key = [target.constructor.name, propertyKey, parameterIndex].toString();
+    const paramName = getParamInFunction(target[propertyKey], parameterIndex);
+    routerParams[key] = (req, res, next) => req.query[paramName];
 }
 exports.reqQuery = reqQuery;
 function reqForm(paramName) {

package/dist/typespeed.d.ts

@@ -178,9 +178,9 @@ declare function next(target: any, propertyKey: string, parameterIndex: number)
 /** 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;
+declare function reqParam(target: any, propertyKey: string, parameterIndex: number) : void;
 /** request.query 值装饰器，作为路由页面方法参数，获取 request.query 内容 */
-declare function reqQuery(paramName: string) : (target: any, propertyKey: string, parameterIndex: number) => void;
+declare function reqQuery(target: any, propertyKey: string, parameterIndex: number) : void;
 /** request 表单值装饰器，作为路由页面方法参数，获取 request.body 表单内容 */
 declare function reqForm(paramName: string) : (target: any, propertyKey: string, parameterIndex: number) => void;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespeed",
-  "version": "2.0.23",
+  "version": "2.1.2",
   "description": "A new Framework for TypeScript.",
   "author": "speedphp",
   "license": "MIT License",
@@ -34,7 +34,7 @@
     "commander": "^9.4.0",
     "compression": "^1.7.4",
     "connect-redis": "^6.1.3",
-    "consolidate": "^0.16.0",
+    "consolidate": "1.0.1",
     "cookie-parser": "^1.4.6",
     "cron": "^2.3.0",
     "express": "^4.18.1",
@@ -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()]){
@@ -142,18 +143,22 @@ function reqBody(target: any, propertyKey: string, parameterIndex: number) {
   routerParams[key] = (req, res, next) => req.body;
 }
 
-function reqParam(paramName: string) {
-  return (target: any, propertyKey: string, parameterIndex: number) => {
-    const key = [target.constructor.name, propertyKey, parameterIndex].toString();
-    routerParams[key] = (req, res, next) => req.params[paramName];
-  }
+function reqParam(target: any, propertyKey: string, parameterIndex: number) {
+  const key = [target.constructor.name, propertyKey, parameterIndex].toString();
+  const paramName = getParamInFunction(target[propertyKey], parameterIndex);
+  routerParams[key] = (req, res, next) => req.params[paramName];
 }
 
-function reqQuery(paramName: string) {
-  return (target: any, propertyKey: string, parameterIndex: number) => {
-    const key = [target.constructor.name, propertyKey, parameterIndex].toString();
-    routerParams[key] = (req, res, next) => req.query[paramName];
-  }
+function getParamInFunction(fn: Function, index: number) {
+  const code = fn.toString().replace(/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg, '').replace(/=>.*$/mg, '').replace(/=[^,]+/mg, '');
+  const result = code.slice(code.indexOf('(') + 1, code.indexOf(')')).match(/([^\s,]+)/g);
+  return result[index] || null;
+}
+
+function reqQuery(target: any, propertyKey: string, parameterIndex: number) {
+  const key = [target.constructor.name, propertyKey, parameterIndex].toString();
+  const paramName = getParamInFunction(target[propertyKey], parameterIndex);
+  routerParams[key] = (req, res, next) => req.query[paramName];
 }
 
 function reqForm(paramName: string) {

package/src/typespeed.d.ts

@@ -178,9 +178,9 @@ declare function next(target: any, propertyKey: string, parameterIndex: number)
 /** 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;
+declare function reqParam(target: any, propertyKey: string, parameterIndex: number) : void;
 /** request.query 值装饰器，作为路由页面方法参数，获取 request.query 内容 */
-declare function reqQuery(paramName: string) : (target: any, propertyKey: string, parameterIndex: number) => void;
+declare function reqQuery(target: any, propertyKey: string, parameterIndex: number) : void;
 /** request 表单值装饰器，作为路由页面方法参数，获取 request.body 表单内容 */
 declare function reqForm(paramName: string) : (target: any, propertyKey: string, parameterIndex: number) => void;
 

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: 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")
@@ -29,7 +30,7 @@ export default class TestRequest {
     }
 
     @getMapping("/request/param/:id")
-    testParam(@res res, @reqParam("id") id: number) {
+    testParam(@res res, @reqParam id: number) {
         log("id: " + id);
         res.send("test param");
     }