fix(stitchSchemas): subschemas with object inputs and mergeTypes as t…

…rue (#1631)
ardatan · Jun 11, 2020 · 6059c40 · 6059c40
1 parent fa07fd1
commit 6059c40
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/packages/stitch/src/typeCandidates.ts b/packages/stitch/src/typeCandidates.ts
@@ -16,9 +16,12 @@ import {
   isInterfaceType,
   isUnionType,
   isEnumType,
+  isInputObjectType,
   SchemaDefinitionNode,
   SchemaExtensionNode,
   GraphQLFieldConfigMap,
+  GraphQLInputObjectType,
+  GraphQLInputFieldConfigMap,
 } from 'graphql';
 
 import { wrapSchema } from '@graphql-tools/wrap';
@@ -277,6 +280,22 @@ function merge(typeName: string, candidates: Array<MergeTypeCandidate>): GraphQL
       extensionASTNodes: initialCandidateType.extensionASTNodes,
     };
     return new GraphQLObjectType(config);
+  } else if (isInputObjectType(initialCandidateType)) {
+    const config = {
+      name: typeName,
+      fields: candidates.reduce<GraphQLInputFieldConfigMap>(
+        (acc, candidate) => ({
+          ...acc,
+          ...(candidate.type as GraphQLInputObjectType).toConfig().fields,
+        }),
+        {}
+      ),
+      description: initialCandidateType.description,
+      extensions: initialCandidateType.extensions,
+      astNode: initialCandidateType.astNode,
+      extensionASTNodes: initialCandidateType.extensionASTNodes,
+    };
+    return new GraphQLInputObjectType(config);
   } else if (isInterfaceType(initialCandidateType)) {
     const config = {
       name: typeName,

diff --git a/packages/stitch/tests/alternateStitchSchemas.test.ts b/packages/stitch/tests/alternateStitchSchemas.test.ts
@@ -1853,6 +1853,10 @@ describe('mergeTypes', () => {
 
   beforeEach(() => {
     const typeDefs1 = `
+      input ObjectInput {
+        val: String!
+      }
+
       type Query {
         rootField1: Wrapper
         getTest(id: ID): Test
@@ -1981,6 +1985,18 @@ describe('mergeTypes', () => {
         },
       },
     });
+
+    const stitchedSchemaWithMerge = stitchSchemas({
+      subschemas: [subschemaConfig1, subschemaConfig2],
+      mergeTypes: true,
+    })
+
+    const result2 = await graphql(
+      stitchedSchemaWithMerge,
+      `{ rootField1 { test { id } } }`
+    );
+
+    expect(result2).toEqual({ data: { rootField1: { test: { id: '1' } } } })
   });
 });