fix object type, fix merge resource & action params

nazieb · May 30, 2017 · 4ab0d25 · 4ab0d25
1 parent ab3bd07
commit 4ab0d25
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "optimusjs",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Transform API Blueprint into any other formats",
   "main": "dist/index.js",
   "bin": {

diff --git a/src/formatters/swagger.js b/src/formatters/swagger.js
@@ -261,23 +261,18 @@ function getActionParams(action) {
 function mergeResourceAndActionParams(resourceParams, actionParams) {
     const result = [];
 
+    if (resourceParams.length > 0) {
+        for (let resourceParam of resourceParams) {
+           result.push(resourceParam);
+        }
+    }
+
     if (actionParams.length > 0) {
         for (let actionParam of actionParams) {
             if (actionParam.hasOwnProperty("in") && (actionParam.in == "body" || actionParam.in == "header")) {
                 result.push(actionParam);
                 continue;
             }
-
-            for (let resourceParam of resourceParams) {
-                if (resourceParam.name == actionParam.name) {
-                    actionParam["in"] = resourceParam["in"];
-                    result.push(actionParam);
-                }
-            }
-        }
-    } else if (resourceParams.length > 0) {
-        for (let resourceParam of resourceParams) {
-            result.push(resourceParam);
         }
     }
 
@@ -382,6 +377,8 @@ function getDefinitions(dataStructures) {
                 } : {
                     "$ref": convertDefinitionPath(itemsType),
                 };
+            } else if (memberType == "object") {
+                property["type"] = memberType;
             }
 
             properties[memberName] = property;