Merge branch 'master' into v0.1.0

Author: migueloller

src/build/__tests__/build-test.js

@@ -8,15 +8,26 @@ import {
   GraphQLNonNull,
   GraphQLBoolean,
   GraphQLID,
+  DirectiveLocation,
+  GraphQLDirective,
 } from 'graphql/type';
 import { parse } from 'graphql/language';
 import { expectTypesEqual, expectSchemasEqual } from './comparators';
-import build, { buildTypes } from '../';
+import build, { buildTypes, SCHEMA_CONFIG_KEY } from '../';
 
+const CustomDirective = new GraphQLDirective({
+  name: 'CustomDirective',
+  locations: [DirectiveLocation.FIELD],
+});
 const querySource = `
- type Query {
-   ok: Boolean!
- }
+  type Query {
+    ok: Boolean!
+  }
+`;
+const queryWithDirectiveSource = `
+  type Query {
+    ok: Boolean! @CustomDirective
+  }
 `;
 const generateQuery = (resolve) => new GraphQLObjectType({
   name: 'Query',
@@ -28,6 +39,10 @@ const schemaSource = `
   }
 `;
 const Schema = new GraphQLSchema({ query: generateQuery() });
+const SchemaWithDirective = new GraphQLSchema({
+  directives: [CustomDirective],
+  query: generateQuery(),
+});
 const timestampSource = `
   scalar Timestamp
 `;
@@ -149,4 +164,11 @@ describe('build()', () => {
       Timestamp: { serialize },
     }, undefined, false)).forEach((type, i) => expectTypesEqual(type, [Record, Timestamp][i]));
   });
+
+  it('should allow schema configuration using SCHEMA_CONFIG_KEY', () => {
+    const config = {};
+    config[SCHEMA_CONFIG_KEY] = { directives: [CustomDirective] };
+    const target = build(schemaSource + queryWithDirectiveSource, config);
+    expectSchemasEqual(target, SchemaWithDirective);
+  });
 });

src/build/index.js

@@ -18,6 +18,8 @@ const buildMap = {
   [Kind.INPUT_OBJECT_TYPE_DEFINITION]: buildInputObject,
 };
 
+export const SCHEMA_CONFIG_KEY = '__schema';
+
 export const ensureNoDuplicateTypes = (types) => {
   types.forEach((typeA) => {
     if (types.some((typeB) => typeA !== typeB && typeA.name === typeB.name)) {
@@ -93,7 +95,7 @@ export default function build(source, config = {}, typeDeps = [], infer = true)
     }
     return buildSchema(
       schemaASTs[0],
-      undefined,
+      config[SCHEMA_CONFIG_KEY],
       () => ensureNoDuplicateTypes([...types, ...typeDeps]),
     );
   }