Merge pull request #135 from amarzavery/wf2

fixed #134

Author: amarzavery

ChangeLog.md

@@ -0,0 +1,6 @@
+### 07/03/2017 0.4.6
+- Fixed issue #134
+
+### 06/26/2017 0.4.5
+- Added support to generate wireformat as a YAML doc
+- Improved the format to specify request body for a in a request using curl.

lib/util/utils.js

@@ -303,7 +303,35 @@ exports.parseJsonWithPathFragments = function parseJsonWithPathFragments() {
  */
 exports.mergeObjects = function mergeObjects(source, target) {
   Object.keys(source).forEach(function (key) {
-    target[key] = source[key];
+    if (Array.isArray(source[key])) {
+      if (target[key] && !Array.isArray(target[key])) {
+        throw new Error(`Cannot merge ${key} from source object into target object because the same property in target object is not (of the same type) an Array.`);
+      }
+      if (!target[key]) {
+        target[key] = [];
+      }
+      target[key] = exports.mergeArrays(source[key], target[key]);
+    } else {
+      target[key] = source[key];
+    }
+  });
+  return target;
+}
+
+/*
+ * Merges source array into the target array
+ * @param {array} source The array that needs to be merged
+ * 
+ * @param {array} target The array to be merged into
+ * 
+ * @returns {array} target - Returns the merged target array.
+ */
+exports.mergeArrays = function mergeArrays(source, target) {
+  if (!Array.isArray(target) || (!Array.isArray(source))) {
+    return target;
+  }
+  source.forEach((item) => {
+    target.push(item);
   });
   return target;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oav",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "author": {
     "name": "Microsoft Corporation",
     "email": "[email protected]",