feat: add property for web params

midwayjs · Sep 15, 2020 · 5c19644 · 5c19644
1 parent b90c020
commit 5c19644
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/packages/core/src/util/webRouterParam.ts b/packages/core/src/util/webRouterParam.ts
@@ -1,6 +1,9 @@
-import { RouteParamTypes } from "@midwayjs/decorator";
+import { RouteParamTypes, ALL_VALUE } from "@midwayjs/decorator";
 
 export const extractKoaLikeValue = (key, data) => {
+  if(ALL_VALUE === data) {
+    data = undefined;
+  }
   return async function (ctx, next) {
     switch (key) {
       case RouteParamTypes.NEXT:
@@ -14,7 +17,7 @@ export const extractKoaLikeValue = (key, data) => {
       case RouteParamTypes.HEADERS:
         return data ? ctx.headers[data] : ctx.headers;
       case RouteParamTypes.SESSION:
-        return ctx.session;
+        return data ? ctx.session[data] : ctx.session;
       case RouteParamTypes.FILESTREAM:
         return ctx.getFileStream && ctx.getFileStream(data);
       case RouteParamTypes.FILESSTREAM:
@@ -26,6 +29,9 @@ export const extractKoaLikeValue = (key, data) => {
 };
 
 export const extractExpressLikeValue = (key, data) => {
+  if(ALL_VALUE === data) {
+    data = undefined;
+  }
   return async function (req, res, next) {
     switch (key) {
       case RouteParamTypes.NEXT:
@@ -39,7 +45,7 @@ export const extractExpressLikeValue = (key, data) => {
       case RouteParamTypes.HEADERS:
         return data ? req.headers[data] : req.headers;
       case RouteParamTypes.SESSION:
-        return req.session;
+        return data ? req.session[data] : req.session;
       case RouteParamTypes.FILESTREAM:
         return req.getFileStream && req.getFileStream(data);
       case RouteParamTypes.FILESSTREAM:

diff --git a/packages/decorator/src/web/paramMapping.ts b/packages/decorator/src/web/paramMapping.ts
@@ -12,6 +12,7 @@ export interface GetFileStreamOptions {
     parts?: number;
     headerPairs?: number;
   };
+
   checkFile?(
     fieldname: string,
     file: any,
@@ -44,6 +45,9 @@ export interface RouterParamValue {
 
 const createParamMapping = function (type: RouteParamTypes) {
   return (propertyData?: any) => (target, propertyName, index) => {
+    if (propertyData === undefined) {
+      propertyData = propertyName;
+    }
     attachPropertyDataToClass(WEB_ROUTER_PARAM_KEY, {
       index,
       type,
@@ -52,10 +56,10 @@ const createParamMapping = function (type: RouteParamTypes) {
   };
 };
 
-export const Session = () => createParamMapping(RouteParamTypes.SESSION)();
+export const Session = (property?: string) => createParamMapping(RouteParamTypes.SESSION)(property);
 export const Body = (property?: string) => createParamMapping(RouteParamTypes.BODY)(property);
 export const Query = (property?: string) => createParamMapping(RouteParamTypes.QUERY)(property);
 export const Param = (property?: string) => createParamMapping(RouteParamTypes.PARAM)(property);
 export const Headers = (property?: string) => createParamMapping(RouteParamTypes.HEADERS)(property);
-export const File = (property?: GetFileStreamOptions) => createParamMapping(RouteParamTypes.FILESTREAM)(property);
-export const Files = (property?: GetFilesStreamOptions) => createParamMapping(RouteParamTypes.FILESSTREAM)(property);
+export const File = (property: GetFileStreamOptions) => createParamMapping(RouteParamTypes.FILESTREAM)(property);
+export const Files = (property: GetFilesStreamOptions) => createParamMapping(RouteParamTypes.FILESSTREAM)(property);