UnquietCode · July 25, 2017 15:05 · Dec 2, 2014 · Nov 24, 2014 · Nov 19, 2014 · Nov 19, 2014
diff --git a/JsonMerge.coffee b/JsonMerge.coffee
@@ -28,8 +28,19 @@ mergeObject = (current, next) ->
 		# change a property
 		else if current[k] != v
 
+			# array modifications
+			if current[k] instanceof Array and v instanceof Array
+
+				# check for special array append syntax
+				if v.length == 1 and v[0] instanceof Array and v[0].length == 1 and v[0][0] instanceof Array
+					current[k].push(x) for x in v[0][0]
+
+				# plain old replace
+				else
+					copy()
+
 			# recursive object copy
-			if not (v instanceof Array) and (typeof current[k]).toLowerCase() is 'object' and (typeof v).toLowerCase() is 'object'
+			else if not (v instanceof Array) and (typeof current[k]).toLowerCase() is 'object' and (typeof v).toLowerCase() is 'object'
 				clone = valueOrCopy(current[k])
 				mergeObject(clone, v)
 				current[k] = clone

diff --git a/JsonMerge.coffee b/JsonMerge.coffee
@@ -38,6 +38,9 @@ mergeObject = (current, next) ->
 			else
 				copy()
 
+		# if empty, then remove the key entirely
+		if not current[k] then delete current[k]
+
 
 module.exports = (objects...) ->
 

diff --git a/JsonMerge.coffee b/JsonMerge.coffee
@@ -2,7 +2,12 @@ valueOrCopy = (obj) ->
 	if not obj
 		return undefined
 
-	if (typeof obj).toLowerCase() is 'object'
+	else if obj instanceof Array
+		newObj = []
+		newObj.push(x) for x in obj
+		return newObj
+
+	else if (typeof obj).toLowerCase() is 'object'
 		newObj = {}
 		newObj[k] = v for own k,v of obj
 		return newObj
@@ -12,26 +17,26 @@ valueOrCopy = (obj) ->
 
 
 mergeObject = (current, next) ->
-	for own k,v of next
 
-		# add a property
-		if not current[k]
-			current[k] = valueOrCopy(v)
+	for own k,v of next
+		copy = -> current[k] = valueOrCopy(v)
 
-		# remove a property
-		else if v == null
-			current[k] = undefined
+		# add or remove a property
+		if not current[k] or not v
+			copy()
 
 		# change a property
 		else if current[k] != v
 
-			# recursive copy
-			if (typeof current[k]).toLowerCase() is 'object' and (typeof v).toLowerCase() is 'object'
-				mergeObject(current[k], v)
+			# recursive object copy
+			if not (v instanceof Array) and (typeof current[k]).toLowerCase() is 'object' and (typeof v).toLowerCase() is 'object'
+				clone = valueOrCopy(current[k])
+				mergeObject(clone, v)
+				current[k] = clone
 
 			# plain copy
 			else
-				current[k] = valueOrCopy(v)
+				copy()
 
 
 module.exports = (objects...) ->

diff --git a/JsonMerge.coffee b/JsonMerge.coffee
@@ -1,15 +1,14 @@
-
-valueOrCopy = (v) ->
-	if not v
+valueOrCopy = (obj) ->
+	if not obj
 		return undefined
 
-	else if (typeof v).toLowerCase() is 'object'
-		v2 = {}
-		v2[k] = v for own k,v of v
-		return v2
+	if (typeof obj).toLowerCase() is 'object'
+		newObj = {}
+		newObj[k] = v for own k,v of obj
+		return newObj
 
 	else
-		return v
+		return obj
 
 
 mergeObject = (current, next) ->

diff --git a/JsonMerge.coffee b/JsonMerge.coffee
@@ -1,32 +1,46 @@
-module.exports = (objects...) ->
 
-	mergeObject = (current, next) ->
-		for own k,v of next
+valueOrCopy = (v) ->
+	if not v
+		return undefined
+
+	else if (typeof v).toLowerCase() is 'object'
+		v2 = {}
+		v2[k] = v for own k,v of v
+		return v2
+
+	else
+		return v
 
-			# add a property
-			if not current[k]
-				current[k] = v
 
-			# remove a property
-			else if v == null
-				current[k] = undefined
+mergeObject = (current, next) ->
+	for own k,v of next
 
-			# change a property
-			else if current[k] != v
+		# add a property
+		if not current[k]
+			current[k] = valueOrCopy(v)
 
-				# recursive copy
-				if (typeof current[k]).toLowerCase() == 'object' and (typeof v).toLowerCase() == 'object'
-					mergeObject(current[k], v)
+		# remove a property
+		else if v == null
+			current[k] = undefined
 
-				# plain copy
-				else
-					current[k] = v
+		# change a property
+		else if current[k] != v
 
+			# recursive copy
+			if (typeof current[k]).toLowerCase() is 'object' and (typeof v).toLowerCase() is 'object'
+				mergeObject(current[k], v)
 
+			# plain copy
+			else
+				current[k] = valueOrCopy(v)
+
+
+module.exports = (objects...) ->
 
 	# start a root
 	root = {}
 
+	# perform the merge
 	for obj in objects
 		mergeObject(root, obj)
 

diff --git a/JsonMerge.coffee b/JsonMerge.coffee
@@ -0,0 +1,34 @@
+module.exports = (objects...) ->
+
+	mergeObject = (current, next) ->
+		for own k,v of next
+
+			# add a property
+			if not current[k]
+				current[k] = v
+
+			# remove a property
+			else if v == null
+				current[k] = undefined
+
+			# change a property
+			else if current[k] != v
+
+				# recursive copy
+				if (typeof current[k]).toLowerCase() == 'object' and (typeof v).toLowerCase() == 'object'
+					mergeObject(current[k], v)
+
+				# plain copy
+				else
+					current[k] = v
+
+
+
+	# start a root
+	root = {}
+
+	for obj in objects
+		mergeObject(root, obj)
+
+	root.toJson = -> JSON.stringify(this, null, 2)
+	return root