fix: pass merge array deeply

sifrr · May 30, 2019 · d1296a6 · d1296a6
1 parent 3ea094a
commit d1296a6
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/dist/sifrr.dev.js b/dist/sifrr.dev.js
diff --git a/dist/sifrr.dev.js.map b/dist/sifrr.dev.js.map
diff --git a/dist/sifrr.dev.module.js b/dist/sifrr.dev.module.js
diff --git a/dist/sifrr.dev.module.js.map b/dist/sifrr.dev.module.js.map
diff --git a/src/deepmerge.js b/src/deepmerge.js
@@ -12,7 +12,7 @@ function deepMerge(target, merger, mergeArray = false) {
     return mergeArray ? [...target, ...merger] : [...merger];
   case 'object':
     Object.keys(merger).forEach(k => {
-      target[k] = deepMerge(target[k], merger[k]);
+      target[k] = deepMerge(target[k], merger[k], mergeArray);
     });
     return target;
   default:

diff --git a/src/eslintrc.js b/src/eslintrc.js
@@ -62,7 +62,7 @@ module.exports = {
     ],
     'max-lines': [
       'error',
-      220 // Change to 200 after refactoring API.Model
+      220
     ],
     'mocha/no-exclusive-tests': 'error'
   },

diff --git a/test/unit/deepmerge.test.js b/test/unit/deepmerge.test.js
@@ -37,7 +37,8 @@ describe('deepMerge', () => {
     });
   });
 
-  it('merges arrays', () => {
-    expect(deepMerge({ a: ['b'] }, { a: ['ok', 'haha'] })).to.deep.equal({ a: ['b', 'ok', 'haha'] });
+  it('merges arrays when asked', () => {
+    expect(deepMerge({ a: ['b'] }, { a: ['ok', 'haha'] })).to.deep.equal({ a: ['ok', 'haha'] });
+    expect(deepMerge({ a: ['b'] }, { a: ['ok', 'haha'] }, true)).to.deep.equal({ a: ['b', 'ok', 'haha'] });
   });
 });
diff --git a/test/unit/dev.test.js b/test/unit/dev.test.js
@@ -1 +1 @@
-const dev = require('../../src/dev');
+const dev = require('../../src/sifrr.dev');