From cc67fbb7cd0f258d740a3a31cacc07c78733df62 Mon Sep 17 00:00:00 2001 From: Tim Hudson Date: Wed, 8 May 2019 10:46:34 -0400 Subject: [PATCH] Simplify merge conditional --- src/index.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/index.js b/src/index.js index 216373323..6b28cfeff 100644 --- a/src/index.js +++ b/src/index.js @@ -42,12 +42,10 @@ export const merge = (a, b) => { result[key] = a[key] } for (const key in b) { - if (!a[key]) { + if (!a[key] || typeof a[key] !== 'object') { result[key] = b[key] - } else if (typeof a[key] === 'object') { - result[key] = merge(a[key], b[key]) } else { - result[key] = b[key] + result[key] = merge(a[key], b[key]) } } return result