Use context instead

graphql · Feb 26, 2025 · 2ffbde6 · 2ffbde6
1 parent 6b658cf
commit 2ffbde6
Showing 1 changed file with 6 additions and 17 deletions.
diff --git a/src/execution/collectFields.ts b/src/execution/collectFields.ts
@@ -59,6 +59,7 @@ interface CollectFieldsContext {
   visitedFragmentNames: Set<string>;
   hideSuggestions: boolean;
   forbiddenDirectiveInstances: Array<DirectiveNode>;
+  forbidSkipAndInclude: boolean;
 }
 
 /**
@@ -78,7 +79,7 @@ export function collectFields(
   runtimeType: GraphQLObjectType,
   selectionSet: SelectionSetNode,
   hideSuggestions: boolean,
-  forbidSkipInclude = false,
+  forbidSkipAndInclude = false,
 ): {
   groupedFieldSet: GroupedFieldSet;
   newDeferUsages: ReadonlyArray<DeferUsage>;
@@ -94,17 +95,10 @@ export function collectFields(
     visitedFragmentNames: new Set(),
     hideSuggestions,
     forbiddenDirectiveInstances: [],
+    forbidSkipAndInclude,
   };
 
-  collectFieldsImpl(
-    context,
-    selectionSet,
-    groupedFieldSet,
-    newDeferUsages,
-    undefined,
-    undefined,
-    forbidSkipInclude,
-  );
+  collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsages);
   return {
     groupedFieldSet,
     newDeferUsages,
@@ -177,7 +171,6 @@ function collectFieldsImpl(
   newDeferUsages: Array<DeferUsage>,
   deferUsage?: DeferUsage,
   fragmentVariableValues?: VariableValues,
-  forbidSkipInclude = false,
 ): void {
   const {
     schema,
@@ -198,7 +191,6 @@ function collectFieldsImpl(
             variableValues,
             fragmentVariableValues,
             hideSuggestions,
-            forbidSkipInclude,
           )
         ) {
           continue;
@@ -218,7 +210,6 @@ function collectFieldsImpl(
             variableValues,
             fragmentVariableValues,
             hideSuggestions,
-            forbidSkipInclude,
           ) ||
           !doesFragmentConditionMatch(schema, selection, runtimeType)
         ) {
@@ -266,7 +257,6 @@ function collectFieldsImpl(
             variableValues,
             fragmentVariableValues,
             hideSuggestions,
-            forbidSkipInclude,
           )
         ) {
           continue;
@@ -368,12 +358,11 @@ function shouldIncludeNode(
   variableValues: VariableValues,
   fragmentVariableValues: VariableValues | undefined,
   hideSuggestions: Maybe<boolean>,
-  forbidSkipInclude: boolean,
 ): boolean {
   const skipDirectiveNode = node.directives?.find(
     (directive) => directive.name.value === GraphQLSkipDirective.name,
   );
-  if (skipDirectiveNode && forbidSkipInclude) {
+  if (skipDirectiveNode && context.forbidSkipAndInclude) {
     context.forbiddenDirectiveInstances.push(skipDirectiveNode);
     return false;
   }
@@ -393,7 +382,7 @@ function shouldIncludeNode(
   const includeDirectiveNode = node.directives?.find(
     (directive) => directive.name.value === GraphQLIncludeDirective.name,
   );
-  if (includeDirectiveNode && forbidSkipInclude) {
+  if (includeDirectiveNode && context.forbidSkipAndInclude) {
     context.forbiddenDirectiveInstances.push(includeDirectiveNode);
     return false;
   }