fix(stitching): Directive disappears when enum has resolvers

src/stitching/schemaRecreation.ts

@@ -92,7 +92,6 @@ export function recreateType(
       name: type.name,
       description: type.description,
       astNode: type.astNode,
-
       fields: () =>
         inputFieldMapToFieldConfigMap(type.getFields(), resolveType),
     });

src/test/testDirectives.ts

@@ -94,6 +94,13 @@ describe('@directives', () => {
   it('are included in the schema AST', () => {
     const schema = makeExecutableSchema({
       typeDefs,
+      resolvers: {
+        Gender: {
+          NONBINARY: 'NB',
+          FEMALE: 'F',
+          MALE: 'M'
+        }
+      }
     });
 
     function checkDirectives(
@@ -167,6 +174,35 @@ describe('@directives', () => {
     checkDirectives(schema.getType('WhateverUnion'), ['unionDirective']);
   });
 
+  it('works with enum and its resolvers', () => {
+    const schema = makeExecutableSchema({
+      typeDefs: `
+        enum DateFormat {
+            LOCAL
+            ISO
+        }
+
+        directive @date(format: DateFormat) on FIELD_DEFINITION
+
+        scalar Date
+
+        type Query {
+          today: Date @date(format: LOCAL)
+        }
+      `,
+      resolvers: {
+        DateFormat: {
+          LOCAL: 'local',
+          ISO: 'iso'
+        }
+      }
+    });
+
+    assert.exists(schema.getType('DateFormat'));
+    assert.lengthOf(schema.getDirectives(), 4);
+    assert.exists(schema.getDirective('date'));
+  });
+
   it('can be implemented with SchemaDirectiveVisitor', () => {
     const visited: Set<GraphQLObjectType> = new Set;
     const schema = makeExecutableSchema({ typeDefs });

src/transforms/visitSchema.ts

@@ -11,7 +11,7 @@ import {
   isNamedType,
   getNamedType,
 } from 'graphql';
-import { recreateType, createResolveType } from '../stitching/schemaRecreation';
+import { recreateType, recreateDirective, createResolveType } from '../stitching/schemaRecreation';
 
 export enum VisitSchemaKind {
   TYPE = 'VisitSchemaKind.TYPE',
@@ -40,7 +40,7 @@ export function visitSchema(
   visitor: SchemaVisitor,
   stripResolvers?: boolean,
 ) {
-  const types = {};
+  const types: {[key: string]: GraphQLNamedType} = {};
   const resolveType = createResolveType(name => {
     if (typeof types[name] === 'undefined') {
       throw new Error(`Can't find type ${name}.`);
@@ -73,6 +73,7 @@ export function visitSchema(
       }
     }
   });
+
   return new GraphQLSchema({
     query: queryType ? (types[queryType.name] as GraphQLObjectType) : null,
     mutation: mutationType
@@ -82,6 +83,8 @@ export function visitSchema(
       ? (types[subscriptionType.name] as GraphQLObjectType)
       : null,
     types: Object.keys(types).map(name => types[name]),
+    directives: [...schema.getDirectives().map(d => recreateDirective(d, resolveType))],
+    astNode: schema.astNode,
   });
 }