From 6fc27c23e1ebf54a4f6ba8a7224dd48dfd9faf7c Mon Sep 17 00:00:00 2001
From: yeikos <yeikos@gmail.com>
Date: Sun, 7 Sep 2014 12:14:03 +0200
Subject: [PATCH] v1.2.0

---
 README.md        |   8 ++
 bower.json       |  22 ++++++
 merge.js         | 138 ++++++++++++++++++++++++++------
 merge.min.js     |   4 +-
 package.json     |   3 +-
 tests/index.html |   8 +-
 tests/tests.js   | 200 ++++++++++++++++++++++++++++++++++-------------
 7 files changed, 298 insertions(+), 85 deletions(-)
 create mode 100644 bower.json

diff --git a/README.md b/README.md
index 0533b71..a8d599a 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,10 @@ cloned.x.y++;
 
 console.log(original.x.y, cloned.x.y);
 // -> 1, 2
+
+console.log(merge.recursive(true, original, { x: { z: 2 } }));
+// -> {"x": { "y": 1, "z": 2 } }
+
 ```
 
 ## Browser Usage
@@ -40,6 +44,10 @@ console.log(original.x.y, cloned.x.y);
 
 	console.log(original.x.y, cloned.x.y);
 	// -> 1, 2
+
+	console.log(merge.recursive(true, original, { x: { z: 2 } }));
+	// -> {"x": { "y": 1, "z": 2 } }
+
 </script>
 ```
 
diff --git a/bower.json b/bower.json
new file mode 100644
index 0000000..bd5de03
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,22 @@
+{
+  "name": "merge",
+  "version": "1.2.0",
+  "homepage": "https://github.com/yeikos/js.merge",
+  "authors": [
+    "yeikos <yeikos@gmail.com>"
+  ],
+  "description": "Merge multiple objects into one, optionally creating a new cloned object. Similar to the jQuery.extend but more flexible. Works in Node.js and the browser.",
+  "main": "merge.js",
+  "keywords": [
+    "merge",
+    "recursive",
+    "extend",
+    "clone",
+    "object",
+    "browser"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "tests"
+  ]
+}
diff --git a/merge.js b/merge.js
index 4fef370..d856db6 100644
--- a/merge.js
+++ b/merge.js
@@ -1,5 +1,5 @@
 /*!
- * @name JavaScript/NodeJS Merge v1.1.3
+ * @name JavaScript/NodeJS Merge v1.2.0
  * @author yeikos
  * @repository https://github.com/yeikos/js.merge
 
@@ -9,31 +9,39 @@
 
 ;(function(isNode) {
 
-	function merge() {
+	/**
+	 * Merge one or more objects 
+	 * @param bool? clone
+	 * @param mixed,... arguments
+	 * @return object
+	 */
 
-		var items = Array.prototype.slice.call(arguments),
-			result = items.shift(),
-			deep = (result === true),
-			size = items.length,
-			item, index, key;
+	var Public = function(clone) {
 
-		if (deep || typeOf(result) !== 'object')
+		return merge(clone === true, false, arguments);
 
-			result = {};
-
-		for (index=0;index<size;++index)
+	}, publicName = 'merge';
 
-			if (typeOf(item = items[index]) === 'object')
+	/**
+	 * Merge two or more objects recursively 
+	 * @param bool? clone
+	 * @param mixed,... arguments
+	 * @return object
+	 */
 
-				for (key in item)
+	Public.recursive = function(clone) {
 
-					result[key] = deep ? clone(item[key]) : item[key];
+		return merge(clone === true, true, arguments);
 
-		return result;
+	};
 
-	}
+	/**
+	 * Clone the input removing any reference
+	 * @param mixed input
+	 * @return mixed
+	 */
 
-	function clone(input) {
+	Public.clone = function(input) {
 
 		var output = input,
 			type = typeOf(input),
@@ -46,7 +54,7 @@
 
 			for (index=0;index<size;++index)
 
-				output[index] = clone(input[index]);
+				output[index] = Public.clone(input[index]);
 
 		} else if (type === 'object') {
 
@@ -54,27 +62,113 @@
 
 			for (index in input)
 
-				output[index] = clone(input[index]);
+				output[index] = Public.clone(input[index]);
 
 		}
 
 		return output;
 
+	};
+
+	/**
+	 * Merge two objects recursively
+	 * @param mixed input
+	 * @param mixed extend
+	 * @return mixed
+	 */
+
+	function merge_recursive(base, extend) {
+
+		if (typeOf(base) !== 'object')
+
+			return extend;
+
+		for (var key in extend) {
+
+			if (typeOf(base[key]) === 'object' && typeOf(extend[key]) === 'object') {
+
+				base[key] = merge_recursive(base[key], extend[key]);
+
+			} else {
+
+				base[key] = extend[key];
+
+			}
+
+		}
+
+		return base;
+
 	}
 
+	/**
+	 * Merge two or more objects
+	 * @param bool clone
+	 * @param bool recursive
+	 * @param array argv
+	 * @return object
+	 */
+
+	function merge(clone, recursive, argv) {
+
+		var result = argv[0],
+			size = argv.length;
+
+		if (clone || typeOf(result) !== 'object')
+
+			result = {};
+
+		for (var index=0;index<size;++index) {
+
+			var item = argv[index],
+
+				type = typeOf(item);
+
+			if (type !== 'object') continue;
+
+			for (var key in item) {
+
+				var sitem = clone ? Public.clone(item[key]) : item[key];
+
+				if (recursive) {
+
+					result[key] = merge_recursive(result[key], sitem);
+
+				} else {
+
+					result[key] = sitem;
+
+				}
+
+			}
+
+		}
+
+		return result;
+
+	}
+
+	/**
+	 * Get type of variable
+	 * @param mixed input
+	 * @return string
+	 *
+	 * @see http://jsperf.com/typeofvar
+	 */
+
 	function typeOf(input) {
 
-		return ({}).toString.call(input).match(/\s([\w]+)/)[1].toLowerCase();
+		return ({}).toString.call(input).slice(8, -1).toLowerCase();
 
 	}
 
 	if (isNode) {
 
-		module.exports = merge;
+		module.exports = Public;
 
 	} else {
 
-		window.merge = merge;
+		window[publicName] = Public;
 
 	}
 
diff --git a/merge.min.js b/merge.min.js
index 29a62e5..9f8b578 100644
--- a/merge.min.js
+++ b/merge.min.js
@@ -1,3 +1,3 @@
-/*! JavaScript/NodeJS Merge v1.1.3 | Copyright 2014 yeikos - MIT license | https://github.com/yeikos/js.merge */
+/*! JavaScript/NodeJS Merge v1.2.0 | Copyright 2014 yeikos - MIT license | https://github.com/yeikos/js.merge */
 
-;(function(e){function t(){var e=Array.prototype.slice.call(arguments),t=e.shift(),i=t===true,s=e.length,o,u,a;if(i||r(t)!=="object")t={};for(u=0;u<s;++u)if(r(o=e[u])==="object")for(a in o)t[a]=i?n(o[a]):o[a];return t}function n(e){var t=e,i=r(e),s,o;if(i==="array"){t=[];o=e.length;for(s=0;s<o;++s)t[s]=n(e[s])}else if(i==="object"){t={};for(s in e)t[s]=n(e[s])}return t}function r(e){return{}.toString.call(e).match(/\s([\w]+)/)[1].toLowerCase()}if(e){module.exports=t}else{window.merge=t}})(typeof module==="object"&&module&&typeof module.exports==="object"&&module.exports);
\ No newline at end of file
+;(function(e){function r(e,t){if(s(e)!=="object")return t;for(var n in t){if(s(e[n])==="object"&&s(t[n])==="object"){e[n]=r(e[n],t[n])}else{e[n]=t[n]}}return e}function i(e,n,i){var o=i[0],u=i.length;if(e||s(o)!=="object")o={};for(var a=0;a<u;++a){var f=i[a],l=s(f);if(l!=="object")continue;for(var c in f){var h=e?t.clone(f[c]):f[c];if(n){o[c]=r(o[c],h)}else{o[c]=h}}}return o}function s(e){return{}.toString.call(e).slice(8,-1).toLowerCase()}var t=function(e){return i(e===true,false,arguments)},n="merge";t.recursive=function(e){return i(e===true,true,arguments)};t.clone=function(e){var n=e,r=s(e),i,o;if(r==="array"){n=[];o=e.length;for(i=0;i<o;++i)n[i]=t.clone(e[i])}else if(r==="object"){n={};for(i in e)n[i]=t.clone(e[i])}return n};if(e){module.exports=t}else{window[n]=t}})(typeof module==="object"&&module&&typeof module.exports==="object"&&module.exports);
\ No newline at end of file
diff --git a/package.json b/package.json
index cf772ed..1db8020 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "merge",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "author": "yeikos (http://www.yeikos.com)",
   "description": "Merge multiple objects into one, optionally creating a new cloned object. Similar to the jQuery.extend but more flexible. Works in Node.js and the browser.",
   "main": "merge.js",
@@ -12,6 +12,7 @@
   },
   "keywords": [
     "merge",
+    "recursive",
     "extend",
     "clone",
     "object",
diff --git a/tests/index.html b/tests/index.html
index b3fb5b1..939cc80 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -3,13 +3,13 @@
     <head>
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>JavaScript/NodeJS Merge v1.1.3</title>
+        <title>JavaScript/NodeJS Merge v1.2.0</title>
 
         <link rel="stylesheet" href="qunit/qunit.css" />
 
-        <script src="qunit/qunit.js" data-qunit></script>
-        <script src="../merge.js" data-qunit></script>
-        <script src="tests.js" data-qunit></script>
+        <script src="qunit/qunit.js"></script>
+        <script src="../merge.js"></script>
+        <script src="tests.js"></script>
         
     </head>
 
diff --git a/tests/tests.js b/tests/tests.js
index 7611793..22959aa 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -1,108 +1,196 @@
 test('merge', function() {
 
-    deepEqual(
+	deepEqual(
 
-        merge({ a: 1 }, { b: 2 }),
+		merge({ a: 1 }, { b: 2 }),
 
-        { a: 1, b: 2 }
+		{ a: 1, b: 2 }
 
-    );
+	);
 
-    deepEqual(
+	deepEqual(
 
-        merge({ a: 1 }, { b: { c: { d: 2 } } }),
+		merge({ a: 1 }, { b: { c: { d: 2 } } }),
 
-        { a: 1, b: { c: { d: 2 } } }
+		{ a: 1, b: { c: { d: 2 } } }
 
-    );
+	);
 
-    deepEqual(
+	deepEqual(
 
-        merge(), {}
+		merge(), {}
 
-    );
+	);
 
-    deepEqual(
+	deepEqual(
 
-        merge(undefined), {}
+		merge(undefined), {}
 
-    );
+	);
 
-    deepEqual(
+	deepEqual(
 
-        merge([]), {}
+		merge([]), {}
 
-    );
+	);
 
-    deepEqual(
+	deepEqual(
 
-        merge(true), {}
+		merge(true), {}
 
-    );
+	);
 
-    deepEqual(
+	deepEqual(
 
-        merge(null, true, [0, 1, 2], 3, { a: 1 }, function() {}, undefined, { b: 2 }),
+		merge(null, true, [0, 1, 2], 3, { a: 1 }, function() {}, undefined, { b: 2 }),
 
-        { a: 1, b: 2 }
+		{ a: 1, b: 2 }
 
-    );
+	);
 
 });
 
-test('merge (deep)', function() {
+test('merge (clone)', function() {
 
-    var input = {
+	var input = {
 
-        a: 1,
-        b: {
+		a: 1,
+		b: {
 
-            c: {
+			c: {
 
-                d: 2,
+				d: 2,
 
-                e: ['x', 'y', { z: { w: ['k'] }}]
+				e: ['x', 'y', { z: { w: ['k'] }}]
 
-            }
+			}
 
-        },
+		},
 
-        f: null,
-        g: undefined,
-        h: true
+		f: null,
+		g: undefined,
+		h: true
 
-    }, original = {
+	}, original = {
 
-        a: 1,
-        b: {
+		a: 1,
+		b: {
 
-            c: {
+			c: {
 
-                d: 2,
+				d: 2,
 
-                e: ['x', 'y', { z: { w: ['k'] }}]
+				e: ['x', 'y', { z: { w: ['k'] }}]
 
-            }
+			}
 
-        },
+		},
 
-        f: null,
-        g: undefined,
-        h: true
+		f: null,
+		g: undefined,
+		h: true
 
-    }, output = merge(true, input);
+	}, output = merge(true, input);
 
-    input.b.c.d++;
-    input.b.c.e[2].z.w = null;
-    input.h = null;
+	input.b.c.d++;
+	input.b.c.e[2].z.w = null;
+	input.h = null;
 
-    deepEqual(original, output);
+	deepEqual(original, output);
 
-    input = original;
+	input = original;
 
-    output = merge(true, input, { a: 2 });
+	output = merge(true, input, { a: 2 });
 
-    deepEqual(output.a, 2);
-    deepEqual(input.a, 1);
+	deepEqual(output.a, 2);
+	deepEqual(input.a, 1);
+
+});
+
+test('merge.recursive', function() {
+
+	deepEqual(
+
+		merge.recursive({ a: { b: 1 } }, { a : { c: 1 }}),
+
+		{ a: { b: 1, c: 1 } }
+
+	);
+
+	deepEqual(
+
+		merge.recursive({ a: { b: 1, c: 1 } }, { a : { b: 2 }}),
+
+		{ a: { b: 2, c: 1 } }
+
+	);
+
+	deepEqual(
+
+		merge.recursive({ a: { b: [1, 2, 3], c: 1 } }, { a : { b: ['a'] }}),
+
+		{ a: { b: ['a'], c: 1 } }
+
+	);
+
+	deepEqual(
+
+		merge.recursive({ a: { b: { b: 2 }, c: 1 } }, { a : { b: 2 }}),
+
+		{ a: { b: 2, c: 1 } }
+
+	);
+
+});
+
+test('merge.recursive (clone)', function() {
+
+	var input = { a: { b: 1 } };
+
+	deepEqual(
+
+		merge.recursive(true, input, { a : { c: 1 }}),
+
+		{ a: { b: 1, c: 1 } }
+
+	);
+
+	deepEqual({ a: { b: 1 } }, input);
+
+	input = { a: { b: 1, c: 1 } };
+
+	deepEqual(
+
+		merge.recursive(true, input, { a : { b: 2 }}),
+
+		{ a: { b: 2, c: 1 } }
+
+	);
+
+	deepEqual({ a: { b: 1, c: 1 } }, input);
+
+	input = { a: { b: [1, 2, 3], c: 1 } };
+
+	deepEqual(
+
+		merge.recursive(true, input, { a : { b: ['a'] }}),
+
+		{ a: { b: ['a'], c: 1 } }
+
+	);
+
+	deepEqual({ a: { b: [1, 2, 3], c: 1 } }, input);
+
+	input = { a: { b: { b: 2 }, c: 1 } };
+
+	deepEqual(
+
+		merge.recursive(true, input, { a : { b: 2 }}),
+
+		{ a: { b: 2, c: 1 } }
+
+	);
+
+	deepEqual({ a: { b: { b: 2 }, c: 1 } }, input);
 
 });
\ No newline at end of file