fix: args path (#578)

midwayjs · Aug 3, 2020 · f0de617 · f0de617
1 parent fe8c29e
commit f0de617
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 29 deletions.
diff --git a/packages/serverless-spec-builder/registerFunction.js b/packages/serverless-spec-builder/registerFunction.js
@@ -8,24 +8,15 @@ const {
 const { join } = require('path');
 const { existsSync } = require('fs');
 
-const registerFunctionToIoc = (container, functionName, func) => {
+const registerFunctionToIoc = (container, functionName, func, argsPath) => {
   class FunctionContainer {
     async handler(event) {
       const bindCtx = {
         ctx: this.ctx,
         event,
       };
 
-      /**
-       * HTTP Case
-       */
-      const args =
-        (this.ctx &&
-          this.ctx.request &&
-          this.ctx.request.body &&
-          this.ctx.request.body.args) ||
-        [];
-
+      const args = getValue(bindCtx, argsPath || 'ctx.request.body.args', []);
       return func.bind(bindCtx)(...args);
     }
   }
@@ -53,7 +44,12 @@ const registerFunctionToIocByConfig = (config, options) => {
   const { baseDir = process.cwd() } = options || {};
 
   config.functionList.forEach(functionInfo => {
-    const { functionName, functionFilePath, functionHandler } = functionInfo;
+    const {
+      functionName,
+      functionFilePath,
+      functionHandler,
+      argsPath,
+    } = functionInfo;
 
     if (!functionFilePath) {
       return;
@@ -84,7 +80,8 @@ const registerFunctionToIocByConfig = (config, options) => {
       registerFunctionToIoc(
         options.context,
         functionHandler || `${functionName || '$default'}.handler`,
-        fun
+        fun,
+        argsPath
       );
     } catch (error) {
       console.error(
@@ -99,6 +96,15 @@ const registerFunctionToIocByConfig = (config, options) => {
   });
 };
 
+// copy from https://github.com/developit/dlv/blob/master/index.js
+const getValue = (obj, key, def, p, undef) => {
+  key = key.split ? key.split('.') : key;
+  for (p = 0; p < key.length; p++) {
+    obj = obj ? obj[key[p]] : undef;
+  }
+  return obj === undef ? def : obj;
+};
+
 module.exports = {
   registerFunctionToIocByConfig,
   registerFunctionToIoc,

diff --git a/packages/serverless-spec-builder/src/wrapper.ts b/packages/serverless-spec-builder/src/wrapper.ts
@@ -129,6 +129,7 @@ const assignToFunctionMap = (functionMap, handlerConf) => {
       functionName: handlerConf.exportFunction,
       functionHandler: handlerConf.handler,
       functionFilePath: handlerConf.sourceFilePath,
+      argsPath: handlerConf.argsPath,
     });
   }
   return functionMap;

diff --git a/packages/serverless-spec-builder/test/fixtures/wrapper/aggre.js b/packages/serverless-spec-builder/test/fixtures/wrapper/aggre.js
@@ -1,9 +1,6 @@
 const { FaaSStarter } = require('@midwayjs/faas');
 const { asyncWrapper, start } = require('testStarter');
 
-const { registerFunctionToIocByConfig } = require('./registerFunction.js');
-const { join } = require('path');
-
 const picomatch = require('picomatch');
 
 
@@ -24,19 +21,6 @@ const initializeMethod = async (initializeContext = {}) => {
 ] });
 
 
-  registerFunctionToIocByConfig({
-  "functionList": [
-    {
-      "functionName": "test",
-      "functionHandler": "index.handler",
-      "functionFilePath": "fun-index.js"
-    }
-  ]
-}, {
-    baseDir: join(__dirname, 'dist'),
-    context: starter.loader.getApplicationContext()
-  });
-
   await starter.start();
    inited = true; 
 

diff --git a/packages/serverless-spec-builder/test/wrapper.test.ts b/packages/serverless-spec-builder/test/wrapper.test.ts
@@ -93,6 +93,7 @@ describe('/test/wrapper.test.ts', () => {
                 {
                   path: '/api/test',
                   handler: 'index.handler',
+                  argsPath: 'ctx.request.data.args',
                   isFunctional: true,
                   exportFunction: 'test',
                   sourceFilePath: 'fun-index.js',