Simplifying 'this.merge()'

avoidwork · Jun 16, 2024 · b210aa2 · b210aa2
1 parent 37d834d
commit b210aa2
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 48 deletions.
diff --git a/dist/haro.cjs b/dist/haro.cjs
@@ -3,7 +3,7 @@
  *
  * @copyright 2024 Jason Mulligan <jason.mulligan@avoidwork.com>
  * @license BSD-3-Clause
- * @version 15.2.1
+ * @version 15.2.2
  */
 'use strict';
 
@@ -265,15 +265,7 @@ class Haro {
 		if (Array.isArray(a) && Array.isArray(b)) {
 			a = override ? b : a.concat(b);
 		} else if (a instanceof Object && b instanceof Object) {
-			this.each(Object.keys(b), i => {
-				if (Array.isArray(a[i]) && Array.isArray(b[i])) {
-					a[i] = override ? b[i] : a[i].concat(b[i]);
-				} else if (a[i] instanceof Object && b[i] instanceof Object) {
-					a[i] = this.merge(a[i], b[i], override);
-				} else {
-					a[i] = b[i];
-				}
-			});
+			this.each(Object.keys(b), i => (a[i] = this.merge(a[i], b[i], override)));
 		} else {
 			a = b;
 		}

diff --git a/dist/haro.js b/dist/haro.js
@@ -3,7 +3,7 @@
  *
  * @copyright 2024 Jason Mulligan <jason.mulligan@avoidwork.com>
  * @license BSD-3-Clause
- * @version 15.2.1
+ * @version 15.2.2
  */
 const STRING_COMMA = ",";
 const STRING_EMPTY = "";
@@ -259,15 +259,7 @@ const uuid = typeof crypto === STRING_OBJECT ? crypto.randomUUID.bind(crypto) :
 		if (Array.isArray(a) && Array.isArray(b)) {
 			a = override ? b : a.concat(b);
 		} else if (a instanceof Object && b instanceof Object) {
-			this.each(Object.keys(b), i => {
-				if (Array.isArray(a[i]) && Array.isArray(b[i])) {
-					a[i] = override ? b[i] : a[i].concat(b[i]);
-				} else if (a[i] instanceof Object && b[i] instanceof Object) {
-					a[i] = this.merge(a[i], b[i], override);
-				} else {
-					a[i] = b[i];
-				}
-			});
+			this.each(Object.keys(b), i => (a[i] = this.merge(a[i], b[i], override)));
 		} else {
 			a = b;
 		}

diff --git a/dist/haro.min.js b/dist/haro.min.js
diff --git a/dist/haro.min.js.map b/dist/haro.min.js.map
diff --git a/dist/haro.umd.js b/dist/haro.umd.js
@@ -3,7 +3,7 @@
  *
  * @copyright 2024 Jason Mulligan <jason.mulligan@avoidwork.com>
  * @license BSD-3-Clause
- * @version 15.2.1
+ * @version 15.2.2
  */
 (function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports):typeof define==='function'&&define.amd?define(['exports'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.lru={}));})(this,(function(exports){'use strict';const STRING_COMMA = ",";
 const STRING_EMPTY = "";
@@ -259,15 +259,7 @@ const uuid = typeof crypto === STRING_OBJECT ? crypto.randomUUID.bind(crypto) :
 		if (Array.isArray(a) && Array.isArray(b)) {
 			a = override ? b : a.concat(b);
 		} else if (a instanceof Object && b instanceof Object) {
-			this.each(Object.keys(b), i => {
-				if (Array.isArray(a[i]) && Array.isArray(b[i])) {
-					a[i] = override ? b[i] : a[i].concat(b[i]);
-				} else if (a[i] instanceof Object && b[i] instanceof Object) {
-					a[i] = this.merge(a[i], b[i], override);
-				} else {
-					a[i] = b[i];
-				}
-			});
+			this.each(Object.keys(b), i => (a[i] = this.merge(a[i], b[i], override)));
 		} else {
 			a = b;
 		}