typespeed 2.1.1 → 2.1.3

package/dist/route.decorator.js

@@ -149,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/scaffold/templates/package.json.tpl

@@ -8,8 +8,9 @@
         "build": "tsc -p ."
     },
     "dependencies": {
-        "@types/node": "^18.0.6",
-        "tracer": "^1.1.6",
         "typespeed": "latest"
+    },
+    "devDependencies": {
+        "@types/node": "^18.0.6"
     }
 }

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.1.1",
+  "version": "2.1.3",
   "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",

package/src/route.decorator.ts

@@ -143,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/scaffold/templates/package.json.tpl

@@ -8,8 +8,9 @@
         "build": "tsc -p ."
     },
     "dependencies": {
-        "@types/node": "^18.0.6",
-        "tracer": "^1.1.6",
         "typespeed": "latest"
+    },
+    "devDependencies": {
+        "@types/node": "^18.0.6"
     }
 }

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/test-request.class.ts

@@ -12,7 +12,7 @@ export default class TestRequest {
     }
 
     @getMapping("/request/query")
-    async testQuery(req, res, @reqQuery("id") id: number): Promise<MutilUsers> {
+    async testQuery(req, res, @reqQuery id: number): Promise<MutilUsers> {
         log("id: " + id);
         return Promise.resolve(new MutilUsers("group", [new UserDto(1, "name"), new UserDto(2, "name")]));
     }
@@ -30,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");
     }