Closes #904

Squashed commit of the following:

commit c4bc312d59215ca09f0b612b559bd240e87361e6
Author: Lee Byron <[email protected]>
Date:   Mon Jun 19 11:45:48 2017 -0700

    Follow-ups, rename method to match others, fix broken test.

commit 84a58a1e3e5df3d1cb9c402f4b12aa24d56ee5a7
Merge: 93c0b25 ab5f5ca
Author: Lee Byron <[email protected]>
Date:   Mon Jun 19 11:35:37 2017 -0700

    Merge branch 'getDirectiveArgsMap' of https://github.com/APIs-guru/graphql-js into APIs-guru-getDirectiveArgsMap

commit ab5f5ca
Author: Ivan Goncharov <[email protected]>
Date:   Mon Jun 12 13:31:10 2017 +0300

    Add 'getDirectiveArgs' function

Author: leebyron

src/execution/execute.js

@@ -11,12 +11,15 @@
 import { forEach, isCollection } from 'iterall';
 
 import { GraphQLError, locatedError } from '../error';
-import find from '../jsutils/find';
 import invariant from '../jsutils/invariant';
 import isNullish from '../jsutils/isNullish';
 import { typeFromAST } from '../utilities/typeFromAST';
 import * as Kind from '../language/kinds';
-import { getVariableValues, getArgumentValues } from './values';
+import {
+  getVariableValues,
+  getArgumentValues,
+  getDirectiveValues,
+} from './values';
 import {
   GraphQLObjectType,
   GraphQLList,
@@ -44,11 +47,11 @@ import {
   GraphQLSkipDirective,
 } from '../type/directives';
 import type {
-  DirectiveNode,
   DocumentNode,
   OperationDefinitionNode,
   SelectionSetNode,
   FieldNode,
+  FragmentSpreadNode,
   InlineFragmentNode,
   FragmentDefinitionNode,
 } from '../language/ast';
@@ -512,7 +515,7 @@ export function collectFields(
     const selection = selectionSet.selections[i];
     switch (selection.kind) {
       case Kind.FIELD:
-        if (!shouldIncludeNode(exeContext, selection.directives)) {
+        if (!shouldIncludeNode(exeContext, selection)) {
           continue;
         }
         const name = getFieldEntryKey(selection);
@@ -522,7 +525,7 @@ export function collectFields(
         fields[name].push(selection);
         break;
       case Kind.INLINE_FRAGMENT:
-        if (!shouldIncludeNode(exeContext, selection.directives) ||
+        if (!shouldIncludeNode(exeContext, selection) ||
             !doesFragmentConditionMatch(exeContext, selection, runtimeType)) {
           continue;
         }
@@ -537,7 +540,7 @@ export function collectFields(
       case Kind.FRAGMENT_SPREAD:
         const fragName = selection.name.value;
         if (visitedFragmentNames[fragName] ||
-            !shouldIncludeNode(exeContext, selection.directives)) {
+            !shouldIncludeNode(exeContext, selection)) {
           continue;
         }
         visitedFragmentNames[fragName] = true;
@@ -565,38 +568,25 @@ export function collectFields(
  */
 function shouldIncludeNode(
   exeContext: ExecutionContext,
-  directives: ?Array<DirectiveNode>
+  node: FragmentSpreadNode | FieldNode | InlineFragmentNode,
 ): boolean {
-  const skipNode = directives && find(
-    directives,
-    directive => directive.name.value === GraphQLSkipDirective.name
+  const skip = getDirectiveValues(
+    GraphQLSkipDirective,
+    node,
+    exeContext.variableValues
   );
-  if (skipNode) {
-    const { if: skipIf } = getArgumentValues(
-      GraphQLSkipDirective,
-      skipNode,
-      exeContext.variableValues
-    );
-    if (skipIf === true) {
-      return false;
-    }
+  if (skip && skip.if === true) {
+    return false;
   }
 
-  const includeNode = directives && find(
-    directives,
-    directive => directive.name.value === GraphQLIncludeDirective.name
+  const include = getDirectiveValues(
+    GraphQLIncludeDirective,
+    node,
+    exeContext.variableValues
   );
-  if (includeNode) {
-    const { if: includeIf } = getArgumentValues(
-      GraphQLIncludeDirective,
-      includeNode,
-      exeContext.variableValues
-    );
-    if (includeIf === false) {
-      return false;
-    }
+  if (include && include.if === false) {
+    return false;
   }
-
   return true;
 }
 

src/execution/index.js

@@ -8,5 +8,6 @@
  */
 
 export { execute, defaultFieldResolver, responsePathAsArray } from './execute';
+export { getDirectiveValues } from './values';
 
 export type { ExecutionResult } from './execute';

src/execution/values.js

@@ -11,6 +11,7 @@
 import { createIterator, isCollection } from 'iterall';
 
 import { GraphQLError } from '../error';
+import find from '../jsutils/find';
 import invariant from '../jsutils/invariant';
 import isNullish from '../jsutils/isNullish';
 import isInvalid from '../jsutils/isInvalid';
@@ -164,6 +165,28 @@ export function getArgumentValues(
   return coercedValues;
 }
 
+/**
+ * Prepares an object map of argument values given a directive definition
+ * and a AST node which may contain directives. Optionally also accepts a map
+ * of variable values.
+ *
+ * If the directive does not exist on the node, returns undefined.
+ */
+export function getDirectiveValues(
+  directiveDef: GraphQLDirective,
+  node: { directives?: ?Array<DirectiveNode> },
+  variableValues?: ?{ [key: string]: mixed }
+): void | { [key: string]: mixed } {
+  const directiveNode = node.directives && find(
+    node.directives,
+    directive => directive.name.value === directiveDef.name
+  );
+
+  if (directiveNode) {
+    return getArgumentValues(directiveDef, directiveNode, variableValues);
+  }
+}
+
 /**
  * Given a type and any value, return a runtime value coerced to match the type.
  */

src/index.js

@@ -237,6 +237,7 @@ export {
   execute,
   defaultFieldResolver,
   responsePathAsArray,
+  getDirectiveValues,
 } from './execution';
 
 export type {

src/utilities/buildASTSchema.js

@@ -8,31 +8,31 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-import find from '../jsutils/find';
 import invariant from '../jsutils/invariant';
 import keyValMap from '../jsutils/keyValMap';
 import { valueFromAST } from './valueFromAST';
 import { TokenKind } from '../language/lexer';
 import { parse } from '../language/parser';
 import type { Source } from '../language/source';
-import { getArgumentValues } from '../execution/values';
+import { getDirectiveValues } from '../execution/values';
 
 import * as Kind from '../language/kinds';
 
 import type {
   Location,
   DocumentNode,
-  DirectiveNode,
   TypeNode,
   NamedTypeNode,
   SchemaDefinitionNode,
   TypeDefinitionNode,
   ScalarTypeDefinitionNode,
   ObjectTypeDefinitionNode,
+  FieldDefinitionNode,
   InputValueDefinitionNode,
   InterfaceTypeDefinitionNode,
   UnionTypeDefinitionNode,
   EnumTypeDefinitionNode,
+  EnumValueDefinitionNode,
   InputObjectTypeDefinitionNode,
   DirectiveDefinitionNode,
 } from '../language/ast';
@@ -372,7 +372,7 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema {
         type: produceOutputType(field.type),
         description: getDescription(field),
         args: makeInputValues(field.arguments),
-        deprecationReason: getDeprecationReason(field.directives)
+        deprecationReason: getDeprecationReason(field)
       })
     );
   }
@@ -416,7 +416,7 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema {
         enumValue => enumValue.name.value,
         enumValue => ({
           description: getDescription(enumValue),
-          deprecationReason: getDeprecationReason(enumValue.directives)
+          deprecationReason: getDeprecationReason(enumValue)
         })
       ),
     });
@@ -457,24 +457,14 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema {
 }
 
 /**
- * Given a collection of directives, returns the string value for the
+ * Given a field or enum value node, returns the string value for the
  * deprecation reason.
  */
 export function getDeprecationReason(
-  directives: ?Array<DirectiveNode>,
+  node: EnumValueDefinitionNode | FieldDefinitionNode
 ): ?string {
-  const deprecatedAST = directives && find(
-    directives,
-    directive => directive.name.value === GraphQLDeprecatedDirective.name
-  );
-  if (!deprecatedAST) {
-    return;
-  }
-  const { reason } = getArgumentValues(
-    GraphQLDeprecatedDirective,
-    deprecatedAST
-  );
-  return (reason: any);
+  const deprecated = getDirectiveValues(GraphQLDeprecatedDirective, node);
+  return deprecated && (deprecated.reason: any);
 }
 
 /**

src/utilities/extendSchema.js

@@ -418,7 +418,7 @@ export function extendSchema(
             description: getDescription(field),
             type: buildOutputFieldType(field.type),
             args: buildInputValues(field.arguments),
-            deprecationReason: getDeprecationReason(field.directives),
+            deprecationReason: getDeprecationReason(field),
           };
         });
       });
@@ -500,7 +500,7 @@ export function extendSchema(
         enumValue => enumValue.name.value,
         enumValue => ({
           description: getDescription(enumValue),
-          deprecationReason: getDeprecationReason(enumValue.directives),
+          deprecationReason: getDeprecationReason(enumValue),
         }),
       ),
     });
@@ -540,7 +540,7 @@ export function extendSchema(
         type: buildOutputFieldType(field.type),
         description: getDescription(field),
         args: buildInputValues(field.arguments),
-        deprecationReason: getDeprecationReason(field.directives),
+        deprecationReason: getDeprecationReason(field),
       })
     );
   }