feat(utils/mergeDeep): concat arrays if respectArrays true

ardatan · Nov 22, 2023 · 22301d1 · 22301d1
1 parent e1fb8bb
commit 22301d1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/packages/merge/src/extensions.ts b/packages/merge/src/extensions.ts
@@ -4,7 +4,7 @@ import { ExtensionsObject, Maybe, mergeDeep, SchemaExtensions } from '@graphql-t
 export { extractExtensionsFromSchema } from '@graphql-tools/utils';
 
 export function mergeExtensions(extensions: SchemaExtensions[]): SchemaExtensions {
-  return mergeDeep(extensions);
+  return mergeDeep(extensions, false, true);
 }
 
 function applyExtensionObject(
@@ -15,7 +15,7 @@ function applyExtensionObject(
     return;
   }
 
-  obj.extensions = mergeDeep([obj.extensions || {}, extensions || {}]);
+  obj.extensions = mergeDeep([obj.extensions || {}, extensions || {}], false, true);
 }
 
 export function applyExtensions(

diff --git a/packages/utils/src/mergeDeep.ts b/packages/utils/src/mergeDeep.ts
@@ -9,6 +9,7 @@ type UnboxIntersection<T> = T extends { 0: infer U } ? U : never;
 export function mergeDeep<S extends any[]>(
   sources: S,
   respectPrototype = false,
+  respectArrays = false,
 ): UnboxIntersection<UnionToIntersection<BoxedTupleTypes<S>>> & any {
   const target = sources[0] || {};
   const output = {};
@@ -35,9 +36,13 @@ export function mergeDeep<S extends any[]>(
           if (!(key in output)) {
             Object.assign(output, { [key]: source[key] });
           } else {
-            output[key] = mergeDeep([output[key], source[key]] as S, respectPrototype);
+            output[key] = mergeDeep(
+              [output[key], source[key]] as S,
+              respectPrototype,
+              respectArrays,
+            );
           }
-        } else if (Array.isArray(output[key])) {
+        } else if (respectArrays && Array.isArray(output[key])) {
           if (Array.isArray(source[key])) {
             output[key].push(...source[key]);
           } else {
@@ -47,13 +52,13 @@ export function mergeDeep<S extends any[]>(
           Object.assign(output, { [key]: source[key] });
         }
       }
-    } else if (Array.isArray(target)) {
+    } else if (respectArrays && Array.isArray(target)) {
       if (Array.isArray(source)) {
         target.push(...source);
       } else {
         target.push(source);
       }
-    } else if (Array.isArray(source)) {
+    } else if (respectArrays && Array.isArray(source)) {
       return [target, ...source];
     }
   }

diff --git a/packages/utils/tests/mergeDeep.test.ts b/packages/utils/tests/mergeDeep.test.ts
@@ -56,6 +56,6 @@ describe('mergeDeep', () => {
   it('merges arrays', () => {
     const x = { a: [1, 2] };
     const y = { a: [3, 4] };
-    expect(mergeDeep([x, y])).toEqual({ a: [1, 2, 3, 4] });
+    expect(mergeDeep([x, y], false, true)).toEqual({ a: [1, 2, 3, 4] });
   });
 });