feat: Support @func class method (#100)

* feat: Support @func class method * feat: update test cases * test: add new case
midwayjs · Mar 31, 2020 · cce042a · cce042a
1 parent f3cc94f
commit cce042a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 33 deletions.
diff --git a/packages/faas/package.json b/packages/faas/package.json
@@ -5,7 +5,7 @@
   "typings": "dist/index.d.ts",
   "dependencies": {
     "@midwayjs/core": "^2.0.0",
-    "@midwayjs/decorator": "^2.0.0",
+    "@midwayjs/decorator": "^2.0.8",
     "@midwayjs/simple-lock": "^0.2.59",
     "debug": "^4.1.1",
     "deep-eql": "^4.0.0",

diff --git a/packages/faas/src/starter.ts b/packages/faas/src/starter.ts
@@ -4,7 +4,6 @@ import { existsSync } from 'fs';
 import {
   ContainerLoader,
   getClassMetadata,
-  getPropertyDataFromClass,
   IMiddleware,
   listModule,
   listPreloadModule,
@@ -13,7 +12,7 @@ import {
   MidwayRequestContainer,
   REQUEST_OBJ_CTX_KEY,
 } from '@midwayjs/core';
-import { FUNC_KEY, HANDLER_KEY } from '@midwayjs/decorator';
+import { FUNC_KEY } from '@midwayjs/decorator';
 import SimpleLock from '@midwayjs/simple-lock';
 import * as compose from 'koa-compose';
 
@@ -110,6 +109,7 @@ export class FaaSStarter implements IFaaSStarter {
       mod: any;
       middleware: Array<IMiddleware<FaaSContext>>;
       method: string;
+      descriptor: any;
     } = this.funMappingStore.get(handlerMapping);
 
     return async (...args) => {
@@ -212,37 +212,27 @@ export class FaaSStarter implements IFaaSStarter {
       // store all function entry
       const funModules = listModule(FUNC_KEY);
       for (const funModule of funModules) {
-        const funOptions: {
+        const funOptions: Array<{
           funHandler;
+          key;
+          descriptor;
           middleware: string[];
-        } = getClassMetadata(FUNC_KEY, funModule);
-        // @fun(key), only if key is set
-        if (funOptions.funHandler) {
-          this.funMappingStore.set(funOptions.funHandler, {
-            middleware: funOptions.middleware,
-            mod: funModule,
-          });
-        }
-        const methods = Object.getOwnPropertyNames(
-          (funModule as () => void).prototype
-        );
-        for (const method of methods) {
-          const meta = getPropertyDataFromClass(HANDLER_KEY, funModule, method);
-          if (!meta) {
-            continue;
-          }
+        }> = getClassMetadata(FUNC_KEY, funModule);
+        funOptions.map((opts) => {
           // { method: 'handler', data: 'index.handler' }
-          const handlerName = meta.data
-            ? // @handler(key), if key is set
-              meta.data
+          const handlerName = opts.funHandler
+            ? // @Func(key), if key is set
+              // or @Func({ handler })
+              opts.funHandler
             : // else use ClassName.mehtod as handler key
-              (funModule as () => {}).name + '.' + method;
+            covertId(funModule.name, opts.key);
           this.funMappingStore.set(handlerName, {
-            middleware: funOptions.middleware,
+            middleware: opts.middleware || [],
             mod: funModule,
-            method,
+            method: opts.key,
+            descriptor: opts.descriptor
           });
-        }
+        });
       }
 
       const modules = listPreloadModule();
@@ -290,3 +280,7 @@ export class FaaSStarter implements IFaaSStarter {
     return mwArr;
   }
 }
+
+function covertId(cls, method) {
+  return cls.replace(/^[A-Z]/, (c) => c.toLowerCase()) + '.' + method;
+}
diff --git a/packages/faas/test/fixtures/base-app-handler/src/index.ts b/packages/faas/test/fixtures/base-app-handler/src/index.ts
@@ -1,18 +1,17 @@
-import { Inject, Provide, Func, Handler } from '@midwayjs/decorator';
+import { Inject, Provide, Func } from '@midwayjs/decorator';
 import { FunctionHandler } from '../../../../src';
 
 @Provide()
-@Func('')
 export class IndexService implements FunctionHandler {
   @Inject()
   ctx; // context
 
-  @Handler('index.entry')
+  @Func('index.entry')
   handler(event) {
     return event.text + this.ctx.text;
   }
 
-  @Handler('index.list')
+  @Func('index.list', { event: 'HTTP', path: '/list' })
   getList(event) {
     return event.text + this.ctx.text;
   }

diff --git a/packages/faas/test/fixtures/base-app-handler2/src/index.ts b/packages/faas/test/fixtures/base-app-handler2/src/index.ts
@@ -1,4 +1,4 @@
-import { Inject, Provide, Func, Handler } from '@midwayjs/decorator';
+import { Inject, Provide, Func } from '@midwayjs/decorator';
 import { FunctionHandler } from '../../../../src';
 
 @Provide()
@@ -12,8 +12,13 @@ export class IndexService implements FunctionHandler {
     return 'default' + event.text + this.ctx.text;
   }
 
-  @Handler('index.list')
+  @Func('index.list', {})
   getList(event) {
     return event.text + this.ctx.text;
   }
+
+  @Func({ path: '/' })
+  get(event) {
+    return 'hello';
+  }
 }
diff --git a/packages/faas/test/index.test.ts b/packages/faas/test/index.test.ts
@@ -68,6 +68,7 @@ describe('test/index.test.ts', () => {
         { text: 'ab' }
       )) === 'abhello'
     );
+    assert((await starter.handleInvokeWrapper('indexService.get')({}, {})) === 'hello');
   });
 
   it('invoke handler by default name', async () => {