Updating signature of merge()

avoidwork · Jul 27, 2015 · 3dce2c1 · 3dce2c1
1 parent 5f65f6a
commit 3dce2c1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/lib/haro.es6.js b/lib/haro.es6.js
@@ -5,7 +5,7 @@
  * @copyright 2015
  * @license BSD-3-Clause
  * @link http://haro.rocks
- * @version 1.4.12
+ * @version 1.4.13
  */
 "use strict";
 
@@ -84,8 +84,8 @@ function iterate (obj, fn) {
 }
 
 function merge (a, b) {
-	let c = clone(a),
-		d = clone(b);
+	let c = a !== undefined ? clone(a) : a,
+		d = b !== undefined ? clone(b) : b;
 
 	if ((c instanceof Object) && (d instanceof Object)) {
 		Object.keys(d).forEach(function (i) {
@@ -885,7 +885,7 @@ function factory (data = null, config = {}, indexes = []) {
 	return new Haro(data, config, indexes);
 }
 
-factory.version = "1.4.12";
+factory.version = "1.4.13";
 
 // Node, AMD & window supported
 if (typeof exports !== "undefined") {

diff --git a/lib/haro.js b/lib/haro.js
@@ -5,7 +5,7 @@
  * @copyright 2015
  * @license BSD-3-Clause
  * @link http://haro.rocks
- * @version 1.4.12
+ * @version 1.4.13
  */
 "use strict";
 
@@ -90,8 +90,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 	}
 
 	function merge(a, b) {
-		var c = clone(a),
-		    d = clone(b);
+		var c = a !== undefined ? clone(a) : a,
+		    d = b !== undefined ? clone(b) : b;
 
 		if (c instanceof Object && d instanceof Object) {
 			Object.keys(d).forEach(function (i) {
@@ -1002,7 +1002,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 		return new Haro(data, config, indexes);
 	}
 
-	factory.version = "1.4.12";
+	factory.version = "1.4.13";
 
 	// Node, AMD & window supported
 	if (typeof exports !== "undefined") {

diff --git a/lib/haro.min.js b/lib/haro.min.js
diff --git a/lib/haro.min.js.map b/lib/haro.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "haro",
-  "version": "1.4.12",
+  "version": "1.4.13",
   "description": "Harō is a modern immutable DataStore using Maps, Sets, Promises, & Tuples",
   "main": "lib/haro.js",
   "scripts": {

diff --git a/src/utility.js b/src/utility.js
@@ -60,8 +60,8 @@ function iterate (obj, fn) {
 }
 
 function merge (a, b) {
-	let c = clone(a),
-		d = clone(b);
+	let c = a !== undefined ? clone(a) : a,
+		d = b !== undefined ? clone(b) : b;
 
 	if ((c instanceof Object) && (d instanceof Object)) {
 		Object.keys(d).forEach(function (i) {