fix(apollo-graphql): Preserve directive usages on SchemaDefinition nodes (#2457)

Author: lennyburdette

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - `apollo-graphql`
   - Export useful operation sanitization transforms [PR #2057](https://github.com/apollographql/apollo-tooling/pull/2057)
+  - Preserve directive usages on SchemaDefinition nodes in `buildSchemaFromSDL` [PR #2457](https://github.com/apollographql/apollo-tooling/pull/2457)
 
 ## `apollo@2.33.7`
 

package-lock.json

@@ -351,6 +351,29 @@ type MutationRoot {
         `"Unknown directive \\"@something\\"."`
       );
     });
+
+    it(`should preserve directive usages from the schema definition node`, () => {
+      const schema = buildSchemaFromSDL(
+        gql`
+          directive @contact(
+            name: String!
+            url: String!
+            description: String
+          ) on SCHEMA
+
+          schema
+            @contact(
+              name: "Contact"
+              url: "http://example.com/contact"
+              description: "Testing"
+            ) {
+            query: Query
+          }
+        `
+      );
+      expect(schema.astNode!.directives).toHaveLength(1);
+      expect(schema.astNode!.directives![0].name.value).toEqual("contact");
+    });
   });
 
   describe(`resolvers`, () => {

packages/apollo-graphql/src/schema/__tests__/buildSchemaFromSDL.test.ts

@@ -18,7 +18,8 @@ import {
   isAbstractType,
   isScalarType,
   isEnumType,
-  GraphQLEnumValueConfig
+  GraphQLEnumValueConfig,
+  DirectiveNode
 } from "graphql";
 import { validateSDL } from "graphql/validation/validate";
 import { isDocumentNode, isNode } from "../utilities/graphql";
@@ -108,6 +109,7 @@ export function buildSchemaFromSDL(
 
   const schemaDefinitions: SchemaDefinitionNode[] = [];
   const schemaExtensions: SchemaExtensionNode[] = [];
+  const schemaDirectives: DirectiveNode[] = [];
 
   for (const definition of documentAST.definitions) {
     if (isTypeDefinitionNode(definition)) {
@@ -130,6 +132,9 @@ export function buildSchemaFromSDL(
       directiveDefinitions.push(definition);
     } else if (definition.kind === Kind.SCHEMA_DEFINITION) {
       schemaDefinitions.push(definition);
+      schemaDirectives.push(
+        ...(definition.directives ? definition.directives : [])
+      );
     } else if (definition.kind === Kind.SCHEMA_EXTENSION) {
       schemaExtensions.push(definition);
     }
@@ -211,7 +216,12 @@ export function buildSchemaFromSDL(
       typeName
         ? (schema.getType(typeName) as GraphQLObjectType<any, any>)
         : undefined
-    )
+    ),
+    astNode: {
+      kind: Kind.SCHEMA_DEFINITION,
+      directives: schemaDirectives,
+      operationTypes: [] // satisfies typescript, will be ignored
+    }
   });
 
   for (const module of modules) {