fix: directive is duplicated when schema already has one (apollograph…

…ql/apollo-ios-dev#235)

Sources/GraphQLCompiler/JavaScript/src/__tests__/deferDirectiveTests.ts

@@ -14,6 +14,8 @@ import { emptyValidationOptions } from "../__testUtils__/validationHelpers";
 
 describe("given schema", () => {
   const schemaSDL: string = `
+  directive @defer(label: String, if: Boolean! = true) on FRAGMENT_SPREAD | INLINE_FRAGMENT
+
   type Query {
     allAnimals: [Animal!]
   }
@@ -31,6 +33,28 @@ describe("given schema", () => {
 
   const schema: GraphQLSchema = loadSchemaFromSources([new Source(schemaSDL, "Test Schema", { line: 1, column: 1 })]);
 
+  // Directive Definition Tests
+
+  describe("does not add a duplicate directive", () => {
+    const documentString: string = `
+    query Test {
+      allAnimals {
+        species
+      }
+    }
+    `;
+
+    const document: DocumentNode = parseOperationDocument(
+      new Source(documentString, "Test Query", { line: 1, column: 1 })
+    );
+
+    it("should pass validation", () => {
+      const validationErrors: readonly GraphQLError[] = validateDocument(schema, document, emptyValidationOptions)
+
+      expect(validationErrors).toHaveLength(0)
+    });
+  })
+
   // Disabling Tests
 
   describe("query has inline fragment with @defer directive", () => {

Sources/GraphQLCompiler/JavaScript/src/index.ts

@@ -10,16 +10,13 @@ import {
   buildASTSchema,
   printSchema,
   extendSchema,
-  Kind,
-  GraphQLDeferDirective,
 } from "graphql";
 import { defaultValidationRules, ValidationOptions } from "./validationRules";
 import { compileToIR, CompilationResult } from "./compiler";
 import { assertValidSchema, assertValidSDL } from "./utilities/graphql";
 import {
   addApolloCodegenSchemaExtensionToDocument,
 } from "./utilities/apolloCodegenSchemaExtension";
-import { definitionNode } from "./utilities";
 
 // We need to export all the classes we want to map to native objects,
 // so we have access to the constructor functions for type checks.
@@ -54,7 +51,6 @@ export function loadSchemaFromSources(sources: Source[]): GraphQLSchema {
   }
 
   var document = addApolloCodegenSchemaExtensionToDocument(concatAST(documents))
-  document = addExperimentalDirectivesToDocument(document)
 
   if (!introspectionJSONResult) { assertValidSDL(document) }
 
@@ -67,24 +63,6 @@ export function loadSchemaFromSources(sources: Source[]): GraphQLSchema {
   return schema
 }
 
-function addExperimentalDirectivesToDocument(document: DocumentNode): DocumentNode {
-  // While @defer is experimental the directive needs to be manually added to the
-  // list of available directives for the schema document.
-  return document.definitions.some(definition => 
-    definition.kind == Kind.DIRECTIVE_DEFINITION && 
-    definition.name.value == GraphQLDeferDirective.name
-  ) ?
-    document :
-    concatAST([document, experimentalDeferDirectiveDocumentNode()])
-}
-
-function experimentalDeferDirectiveDocumentNode(): DocumentNode {
-  return {
-    kind: Kind.DOCUMENT,
-    definitions: [definitionNode(GraphQLDeferDirective)]
-  }
-}
-
 function loadSchemaFromIntrospectionResult(
   introspectionResult: string
 ): GraphQLSchema {