Merge pull request #5 from Geta/develop

Fix issue with concatting arrays inside objects.
Geta · Dec 21, 2017 · db154e0 · db154e0
2 parents d0b20a8 + 3e144cf
commit db154e0
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 14 deletions.
diff --git a/lib/nestedObjectAssign.js b/lib/nestedObjectAssign.js
diff --git a/package.json b/package.json
@@ -1,9 +1,10 @@
 {
   "name": "nested-object-assign",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Package to support nested merging of objects & properties, using Object.Assign",
   "main": "./index.js",
   "scripts": {
+    "start": "npm run-script build-dev",
     "prepublish": "npm run build-all",
     "preversion": "npm run build-all && npm run unit",
     "version": "git add .",

diff --git a/src/isArray.js b/src/isArray.js
@@ -0,0 +1,3 @@
+export function isArray(item){
+    return (item && Array.isArray(item));
+}
diff --git a/src/nestedObjectAssign.js b/src/nestedObjectAssign.js
@@ -1,4 +1,5 @@
-import {isObject} from './isObject';
+import { isObject } from './isObject';
+import { isArray } from './isArray';
 
 export default function nestedObjectAssign(target, ...sources){
     if (!sources.length)
@@ -9,12 +10,18 @@ export default function nestedObjectAssign(target, ...sources){
     if (isObject(target) && isObject(source)){
         for (const key in source){
             if (isObject(source[key])){
-                if (!target[key])
+                if (!target[key]) {
                     Object.assign(target, {[key]: {}});
+                }
 
                 nestedObjectAssign(target[key], source[key]);
-            }
-            else {
+            } else if (isArray(source[key])) {
+                if (!target[key]) {
+                    Object.assign(target, {[key]: []});
+                }
+
+                target[key] = target[key].concat(source[key]);
+            } else {
                 Object.assign(target, {[key]: source[key]});
             }
         }

diff --git a/test/nestedObjectAssign.spec.js b/test/nestedObjectAssign.spec.js
@@ -1,41 +1,70 @@
 import { expect } from 'chai';
 import nestedObjectAssign from '../index.js';
 
-var mockData = {
+const mockData = {
     default: {
         heading: 'title',
         body: {
             paragraph: 'p',
             heading: 'h1'
-        }
+        },
+        products: [
+            {
+                paragraph: 'p',
+                heading: 'h1'
+            }
+        ]
     },
     first: {
         body: {
             span: 'span',
             header: 'header'
-        }
+        },
+        products: [
+            {
+                span: 'span',
+                header: 'header'
+            }
+        ]
     },
     second: {
         body: {
             heading2: 'h2'
-        }
+        },
+        products: [
+            {
+                heading2: 'h2'
+            }
+        ]
     }
-
 };
 
-var expectedData = {
+const expectedData = {
     heading: 'title',
     body: {
         paragraph: 'p',
         heading: 'h1',
         span: 'span',
         header: 'header',
         heading2: 'h2'
-    }
+    },
+    products: [
+        {
+            paragraph: 'p',
+            heading: 'h1'
+        },
+        {
+            span: 'span',
+            header: 'header'
+        },
+        {
+            heading2: 'h2'
+        }
+    ]
 };
 
 describe('Given an instance of nestedObjectAssign', function() {
-    describe('when i merge the mockData', function() {
+    describe('when I merge the mockData', function() {
         it('it should be equal to expectedData', () => {
             expect(JSON.stringify(nestedObjectAssign({}, mockData.default, mockData.first, mockData.second))).to.be.equal(JSON.stringify(expectedData));
         });