fix: fun typing (#467)

midwayjs · Apr 20, 2020 · fdf2814 · fdf2814
1 parent d0cb546
commit fdf2814
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/midway-decorator/src/faas/fun.ts b/packages/midway-decorator/src/faas/fun.ts
@@ -3,6 +3,7 @@ import { ScopeEnum, saveModule, FUNC_KEY, attachClassMetadata } from '../common'
 import { KoaMiddlewareParamArray } from '..';
 
 export interface FuncParams {
+  funHandler?: string;
   event?: string;
   method?: string;
   path?: string;
@@ -15,7 +16,7 @@ export function Func(
 ) {
   if (typeof funHandler !== 'string' && functionOptions === undefined) {
     functionOptions = funHandler;
-    funHandler = '';
+    funHandler = functionOptions.funHandler;
   }
   return (...args) => {
     const [target, key, descriptor] = args as any;

diff --git a/packages/midway-decorator/src/faas/handler.ts b/packages/midway-decorator/src/faas/handler.ts
@@ -5,6 +5,10 @@ export function Handler(
   funHandler: string | FuncParams,
   functionOptions?: FuncParams
 ): MethodDecorator {
+  if (typeof funHandler !== 'string' && functionOptions === undefined) {
+    functionOptions = funHandler;
+    funHandler = functionOptions.funHandler;
+  }
   return (target: object, propertykey: string, descriptor: PropertyDescriptor) => {
     // If target is instance, @Func annotate class member method
     saveModule(FUNC_KEY, (target as object).constructor);