allow merging scalars (#1746)

just not specified scalars
ardatan · Jul 8, 2020 · d463d77 · d463d77
1 parent 9e9c0bd
commit d463d77
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/stitch/src/typeCandidates.ts b/packages/stitch/src/typeCandidates.ts
@@ -7,9 +7,9 @@ import {
   GraphQLDirective,
   ASTNode,
   isSchema,
-  isScalarType,
   SchemaDefinitionNode,
   SchemaExtensionNode,
+  isSpecifiedScalarType,
 } from 'graphql';
 
 import { wrapSchema } from '@graphql-tools/wrap';
@@ -204,7 +204,7 @@ export function buildTypeMap({
       typeName === operationTypeNames.query ||
       typeName === operationTypeNames.mutation ||
       typeName === operationTypeNames.subscription ||
-      (mergeTypes === true && !isScalarType(typeCandidates[typeName][0].type)) ||
+      (mergeTypes === true && !typeCandidates[typeName].some(candidate => isSpecifiedScalarType(candidate.type))) ||
       (typeof mergeTypes === 'function' && mergeTypes(typeCandidates[typeName], typeName)) ||
       (Array.isArray(mergeTypes) && mergeTypes.includes(typeName)) ||
       (stitchingInfo != null && typeName in stitchingInfo.mergedTypes)