From de654d7cbabe27315c7e5be11db7e6be7ca7d446 Mon Sep 17 00:00:00 2001 From: lellansin Date: Mon, 30 Mar 2020 20:16:29 +0800 Subject: [PATCH 1/2] fix: @Func return type --- packages/midway-decorator/src/faas/fun.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/midway-decorator/src/faas/fun.ts b/packages/midway-decorator/src/faas/fun.ts index 0610880e96a3..1e9ca609d960 100644 --- a/packages/midway-decorator/src/faas/fun.ts +++ b/packages/midway-decorator/src/faas/fun.ts @@ -11,8 +11,8 @@ export interface FuncParams { export function Func( funHandler: string | FuncParams, - functionOptions: FuncParams | undefined -): ClassDecorator { + functionOptions?: FuncParams +): ClassDecorator | PropertyDecorator { if (typeof funHandler !== 'string' && functionOptions === undefined) { functionOptions = funHandler; funHandler = ''; From ece8f3335cf33bb7877643faabd4b6ca1dadaa59 Mon Sep 17 00:00:00 2001 From: lellansin Date: Mon, 30 Mar 2020 20:26:24 +0800 Subject: [PATCH 2/2] fix: type --- packages/midway-decorator/src/faas/fun.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/midway-decorator/src/faas/fun.ts b/packages/midway-decorator/src/faas/fun.ts index 1e9ca609d960..c8b8829e2879 100644 --- a/packages/midway-decorator/src/faas/fun.ts +++ b/packages/midway-decorator/src/faas/fun.ts @@ -12,7 +12,7 @@ export interface FuncParams { export function Func( funHandler: string | FuncParams, functionOptions?: FuncParams -): ClassDecorator | PropertyDecorator { +) { if (typeof funHandler !== 'string' && functionOptions === undefined) { functionOptions = funHandler; funHandler = '';