serverless-openapi-documenter 0.0.91 → 0.0.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-openapi-documenter",
-  "version": "0.0.91",
+  "version": "0.0.93",
   "description": "Generate OpenAPI v3 documentation and Postman Collections from your Serverless Config",
   "main": "index.js",
   "keywords": [

package/src/definitionGenerator.js

@@ -154,10 +154,16 @@ class DefinitionGenerator {
       Object.assign(info, { license: licenseObj });
     }
 
-    for (const key of Object.keys(documentation)) {
-      if (/^[x\-]/i.test(key)) {
-        Object.assign(info, { [key]: documentation[key] });
-      }
+    // for (const key of Object.keys(documentation)) {
+    //   if (/^[x\-]/i.test(key)) {
+    //     Object.assign(info, { [key]: documentation[key] });
+    //   }
+    // }
+
+    const extendedSpec = this.extendSpecification(documentation);
+
+    if (Object.keys(extendedSpec).length) {
+      Object.assign(info, extendedSpec);
     }
 
     Object.assign(this.openAPI, { info });
@@ -419,6 +425,12 @@ class DefinitionGenerator {
       obj.servers = servers;
     }
 
+    const extendedSpec = this.extendSpecification(documentation);
+
+    if (Object.keys(extendedSpec).length) {
+      Object.assign(obj, extendedSpec);
+    }
+
     return { [method.toLowerCase()]: obj };
   }
 
@@ -937,6 +949,17 @@ class DefinitionGenerator {
     }
   }
 
+  extendSpecification(spec) {
+    const obj = {};
+    for (const key of Object.keys(spec)) {
+      if (/^[x\-]/i.test(key)) {
+        Object.assign(obj, { [key]: spec[key] });
+      }
+    }
+
+    return obj;
+  }
+
   getHTTPFunctions() {
     const isHttpFunction = (funcType) => {
       const keys = Object.keys(funcType);
@@ -946,6 +969,7 @@ class DefinitionGenerator {
       )
         return true;
     };
+
     const functionNames = this.serverless.service.getAllFunctions();
 
     return functionNames
@@ -957,16 +981,14 @@ class DefinitionGenerator {
       })
       .map((functionType) => {
         const event = functionType.events.filter(isHttpFunction);
-        const name = functionType.name.split(
-          `${this.serverless.service.service}-${this.serverless.service.provider.stage}-`
-        )[1];
+        const operationName = functionType.name.split("-").slice(-1).pop();
 
         Object.assign(this.functionMap, {
-          [name]: [],
+          [operationName]: [],
         });
 
         return {
-          operationName: name,
+          operationName: operationName,
           functionInfo: functionType,
           handler: functionType.handler,
           name: functionType.name,