Add 'getAppliedDirectives' function

Author: IvanGoncharov

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,
+  getAppliedDirectives,
+} 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,19 @@ 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 directives = getAppliedDirectives(
+    [ GraphQLSkipDirective, GraphQLIncludeDirective ],
+    node,
+    exeContext.variableValues
   );
-  if (skipNode) {
-    const { if: skipIf } = getArgumentValues(
-      GraphQLSkipDirective,
-      skipNode,
-      exeContext.variableValues
-    );
-    if (skipIf === true) {
-      return false;
-    }
+  if (directives.skip && directives.skip.if === true) {
+    return false;
   }
-
-  const includeNode = directives && find(
-    directives,
-    directive => directive.name.value === GraphQLIncludeDirective.name
-  );
-  if (includeNode) {
-    const { if: includeIf } = getArgumentValues(
-      GraphQLIncludeDirective,
-      includeNode,
-      exeContext.variableValues
-    );
-    if (includeIf === false) {
-      return false;
-    }
+  if (directives.include && directives.include.if === false) {
+    return false;
   }
-
   return true;
 }
 

src/execution/index.js

@@ -7,6 +7,8 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
+export { getAppliedDirectives } from './values';
 export { execute, defaultFieldResolver, responsePathAsArray } from './execute';
 
 export type { ExecutionResult } from './execute';
+

src/execution/values.js

@@ -164,6 +164,31 @@ export function getArgumentValues(
   return coercedValues;
 }
 
+/**
+ * Prepares an object map of directive name to argument values given a list of
+ * directive definitions and AST node.
+ */
+export function getAppliedDirectives(
+  directiveDefs: Array<GraphQLDirective>,
+  node: { directives?: ?Array<DirectiveNode> },
+  variableValues?: ?{ [key: string]: mixed }
+): { [key: string]: { [key: string]: mixed } } {
+  if (!node.directives) {
+    return {};
+  }
+
+  const result = {};
+  node.directives.forEach(directive => {
+    directiveDefs.forEach(def => {
+      const name = directive.name.value;
+      if (name === def.name) {
+        result[name] = getArgumentValues(def, directive, variableValues);
+      }
+    });
+  });
+  return result;
+}
+
 /**
  * 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,
+  getAppliedDirectives,
 } from './execution';
 
 export type {

src/utilities/buildASTSchema.js

@@ -8,14 +8,13 @@
  *  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 { getAppliedDirectives } from '../execution/values';
 
 import {
   LIST_TYPE,
@@ -34,17 +33,18 @@ import {
 import type {
   Location,
   DocumentNode,
-  DirectiveNode,
   TypeNode,
   NamedTypeNode,
   SchemaDefinitionNode,
   TypeDefinitionNode,
   ScalarTypeDefinitionNode,
   ObjectTypeDefinitionNode,
+  FieldDefinitionNode,
   InputValueDefinitionNode,
   InterfaceTypeDefinitionNode,
   UnionTypeDefinitionNode,
   EnumTypeDefinitionNode,
+  EnumValueDefinitionNode,
   InputObjectTypeDefinitionNode,
   DirectiveDefinitionNode,
 } from '../language/ast';
@@ -381,7 +381,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)
       })
     );
   }
@@ -425,7 +425,7 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema {
         enumValue => enumValue.name.value,
         enumValue => ({
           description: getDescription(enumValue),
-          deprecationReason: getDeprecationReason(enumValue.directives)
+          deprecationReason: getDeprecationReason(enumValue)
         })
       ),
     });
@@ -466,24 +466,17 @@ 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 = getAppliedDirectives(
+    [ GraphQLDeprecatedDirective ],
+    node
+  )[GraphQLDeprecatedDirective.name];
+  return deprecated && (deprecated.reason: any);
 }
 
 /**

src/utilities/extendSchema.js

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