TehShrike#185 change customMerge signature to allow for ignoring null…

… or empty string overwrites + a sweet little util function customMergeIgnoreEmptyValues for cuteness

index.d.ts

@@ -11,6 +11,7 @@ declare namespace deepmerge {
 
 	export function all (objects: object[], options?: Options): object;
 	export function all<T> (objects: Partial<T>[], options?: Options): T;
+	export function customMergeIgnoreEmptyValues (key: any, target: any, source: any): any;
 }
 
 export = deepmerge;

index.js

@@ -19,11 +19,11 @@ function defaultArrayMerge(target, source, options) {
 	})
 }
 
-function getMergeFunction(key, options) {
+function getMergeFunction(key, options, target, source) {
 	if (!options.customMerge) {
 		return deepmerge
 	}
-	var customMerge = options.customMerge(key)
+	var customMerge = options.customMerge(key, target, source);
 	return typeof customMerge === 'function' ? customMerge : deepmerge
 }
 
@@ -69,7 +69,7 @@ function mergeObject(target, source, options) {
 		if (!options.isMergeable(source[key]) || !propertyIsOnObject(target, key)) {
 			destination[key] = cloneUnlessOtherwiseSpecified(source[key], options)
 		} else {
-			destination[key] = getMergeFunction(key, options)(target[key], source[key], options)
+			destination[key] = getMergeFunction(key, options, target[key], source[key])(target[key], source[key], options)
 		}
 	})
 	return destination
@@ -106,4 +106,8 @@ deepmerge.all = function deepmergeAll(array, options) {
 	}, {})
 }
 
+deepmerge.customMergeIgnoreEmptyValues = (key, target, source) => !target || target === ''
+	? () => source
+	: () => target;
+
 module.exports = deepmerge

test/merge.js

@@ -676,3 +676,18 @@ test('Falsey properties should be mergeable', function(t) {
 	t.ok(customMergeWasCalled, 'custom merge function was called')
 	t.end()
 })
+
+test('customMerge without overwriting with null or empty string', function(t) {
+	var src = { someNewVariable: "herp", very: { nested: { thing: "" } } };
+  var target = { very: { nested: { thing: "derp" } } };
+
+  var res = merge(target, src, {
+    customMerge: merge.customMergeIgnoreEmptyValues,
+  });
+
+  t.deepEqual(res, {
+    someNewVariable: "herp",
+    very: { nested: { thing: "derp" } },
+  });
+  t.end();
+})