[Fix] utils.merge: functions should not be stringified into keys

ljharb · Aug 22, 2024 · aa1f0a8 · aa1f0a8
1 parent 2a548a9
commit aa1f0a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -50,7 +50,7 @@ var merge = function merge(target, source, options) {
         return target;
     }
 
-    if (typeof source !== 'object') {
+    if (typeof source !== 'object' && typeof source !== 'function') {
         if (isArray(target)) {
             target.push(source);
         } else if (target && typeof target === 'object') {

diff --git a/test/utils.js b/test/utils.js
@@ -38,8 +38,8 @@ test('merge()', function (t) {
     func.bar = 'baz';
     t.deepEqual(
         utils.merge({ foo: 'bar' }, func),
-        { foo: 'bar', 'function f() {}': true },
-        'functions can not be merge sources'
+        { foo: 'bar', bar: 'baz' },
+        'functions can be merge sources'
     );
 
     t.test(