keep directives in their own map (#714)

prevents name-collision with types

Author: tgerk

packages/apollo-tools/src/buildServiceDefinition.ts

@@ -35,13 +35,17 @@ export function buildServiceDefinition(
   const errors: GraphQLError[] = [];
 
   const typeDefinitionsMap: {
-    [name: string]: (TypeDefinitionNode | DirectiveDefinitionNode)[];
+    [name: string]: TypeDefinitionNode[];
   } = Object.create(null);
 
   const typeExtensionsMap: {
     [name: string]: TypeExtensionNode[];
   } = Object.create(null);
 
+  const directivesMap: {
+    [name: string]: DirectiveDefinitionNode[];
+  } = Object.create(null);
+
   const schemaDefinitions: SchemaDefinitionNode[] = [];
   const schemaExtensions: SchemaExtensionNode[] = [];
 
@@ -50,10 +54,7 @@ export function buildServiceDefinition(
       module = { typeDefs: module };
     }
     for (const definition of module.typeDefs.definitions) {
-      if (
-        isTypeDefinitionNode(definition) ||
-        definition.kind === Kind.DIRECTIVE_DEFINITION
-      ) {
+      if (isTypeDefinitionNode(definition)) {
         const typeName = definition.name.value;
 
         if (typeDefinitionsMap[typeName]) {
@@ -69,6 +70,14 @@ export function buildServiceDefinition(
         } else {
           typeExtensionsMap[typeName] = [definition];
         }
+      } else if (definition.kind === Kind.DIRECTIVE_DEFINITION) {
+        const typeName = definition.name.value;
+
+        if (directivesMap[typeName]) {
+          directivesMap[typeName].push(definition);
+        } else {
+          directivesMap[typeName] = [definition];
+        }
       } else if (definition.kind === Kind.SCHEMA_DEFINITION) {
         schemaDefinitions.push(definition);
       } else if (definition.kind === Kind.SCHEMA_EXTENSION) {
@@ -174,6 +183,15 @@ export function buildServiceDefinition(
       });
     }
 
+    const directiveExtensions = Object.values(directivesMap).flat();
+
+    if (directiveExtensions.length > 0) {
+      schema = extendSchema(schema, {
+        kind: Kind.DOCUMENT,
+        definitions: directiveExtensions
+      });
+    }
+
     for (const module of modules) {
       if (!module.resolvers) continue;