Correct test and lint stuff

JoviDeCroock · Aug 25, 2024 · 47ff0fb · 47ff0fb
1 parent 1d120d0
commit 47ff0fb
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 24 deletions.
diff --git a/src/execution/__tests__/variables-test.ts b/src/execution/__tests__/variables-test.ts
@@ -7,6 +7,7 @@ import { inspect } from '../../jsutils/inspect.js';
 
 import { GraphQLError } from '../../error/GraphQLError.js';
 
+import { DirectiveLocation } from '../../language/directiveLocation.js';
 import { Kind } from '../../language/kinds.js';
 import { parse } from '../../language/parser.js';
 
@@ -22,15 +23,15 @@ import {
   GraphQLObjectType,
   GraphQLScalarType,
 } from '../../type/definition.js';
+import {
+  GraphQLDirective,
+  GraphQLIncludeDirective,
+} from '../../type/directives.js';
 import { GraphQLBoolean, GraphQLString } from '../../type/scalars.js';
 import { GraphQLSchema } from '../../type/schema.js';
 
-import { executeSync } from '../execute.js';
+import { executeSync, experimentalExecuteIncrementally } from '../execute.js';
 import { getVariableValues } from '../values.js';
-import { GraphQLSkipDirective } from '../../type/directives.js';
-import { GraphQLIncludeDirective } from '../../type/directives.js';
-import { GraphQLDirective } from '../../type/directives.js';
-import { DirectiveLocation } from '../../language/directiveLocation.js';
 
 const TestFaultyScalarGraphQLError = new GraphQLError(
   'FaultyScalarErrorMessage',
@@ -1498,17 +1499,22 @@ describe('Execute: Handles inputs', () => {
     });
 
     it('when a nullable argument to a directive with a field default is not provided and shadowed by an operation variable', () => {
-      const result = executeQueryWithFragmentArguments(`
-        query($value: Boolean) {
-          ...a
-        }
-        fragment a($value: Boolean) on TestType {
-          fieldWithNonNullableStringInput @skip(if: $value)
-        }
-      `);
-      expect(result).to.deep.equal({
-        data: {},
-      });
+      // this test uses the @defer directive and incremental delivery because the `if` argument for skip/include have no field defaults
+      const document = parse(
+        `
+          query($shouldDefer: Boolean = false) {
+            ...a
+          }
+          fragment a($shouldDefer: Boolean) on TestType {
+            ... @defer(if: $shouldDefer) {
+              fieldWithDefaultArgumentValue
+            }
+          }
+        `,
+        { experimentalFragmentArguments: true },
+      );
+      const result = experimentalExecuteIncrementally({ schema, document });
+      expect(result).to.include.keys('initialResult', 'subsequentResults');
     });
   });
 });
diff --git a/src/execution/collectFields.ts b/src/execution/collectFields.ts
@@ -164,8 +164,13 @@ function collectFieldsImpl(
   for (const selection of selectionSet.selections) {
     switch (selection.kind) {
       case Kind.FIELD: {
-        const vars = localVariableValues ?? variableValues;
-        if (!shouldIncludeNode(vars, selection)) {
+        if (
+          !shouldIncludeNode(
+            variableValues,
+            selection,
+            context.localVariableValues,
+          )
+        ) {
           continue;
         }
         groupedFieldSet.add(getFieldEntryKey(selection), {
@@ -177,7 +182,11 @@ function collectFieldsImpl(
       }
       case Kind.INLINE_FRAGMENT: {
         if (
-          !shouldIncludeNode(variableValues, selection) ||
+          !shouldIncludeNode(
+            variableValues,
+            selection,
+            context.localVariableValues,
+          ) ||
           !doesFragmentConditionMatch(schema, selection, runtimeType)
         ) {
           continue;
@@ -188,6 +197,7 @@ function collectFieldsImpl(
           variableValues,
           selection,
           deferUsage,
+          context.localVariableValues,
         );
 
         if (!newDeferUsage) {
@@ -219,12 +229,17 @@ function collectFieldsImpl(
           variableValues,
           selection,
           deferUsage,
+          context.localVariableValues,
         );
 
         if (
           !newDeferUsage &&
           (visitedFragmentNames.has(fragmentName) ||
-            !shouldIncludeNode(variableValues, selection))
+            !shouldIncludeNode(
+              variableValues,
+              selection,
+              context.localVariableValues,
+            ))
         ) {
           continue;
         }
@@ -291,8 +306,14 @@ function getDeferUsage(
   variableValues: { [variable: string]: unknown },
   node: FragmentSpreadNode | InlineFragmentNode,
   parentDeferUsage: DeferUsage | undefined,
+  fragmentVariableValues: { [variable: string]: unknown } | undefined,
 ): DeferUsage | undefined {
-  const defer = getDirectiveValues(GraphQLDeferDirective, node, variableValues);
+  const defer = getDirectiveValues(
+    GraphQLDeferDirective,
+    node,
+    variableValues,
+    fragmentVariableValues,
+  );
 
   if (!defer) {
     return;
@@ -320,8 +341,14 @@ function getDeferUsage(
 function shouldIncludeNode(
   variableValues: { [variable: string]: unknown },
   node: FragmentSpreadNode | FieldNode | InlineFragmentNode,
+  fragmentVariableValues: { [variable: string]: unknown } | undefined,
 ): boolean {
-  const skip = getDirectiveValues(GraphQLSkipDirective, node, variableValues);
+  const skip = getDirectiveValues(
+    GraphQLSkipDirective,
+    node,
+    variableValues,
+    fragmentVariableValues,
+  );
   if (skip?.if === true) {
     return false;
   }
@@ -330,6 +357,7 @@ function shouldIncludeNode(
     GraphQLIncludeDirective,
     node,
     variableValues,
+    fragmentVariableValues,
   );
   if (include?.if === false) {
     return false;

diff --git a/src/execution/execute.ts b/src/execution/execute.ts
@@ -1029,7 +1029,8 @@ function getStreamUsage(
   const stream = getDirectiveValues(
     GraphQLStreamDirective,
     fieldGroup[0].node,
-    fieldGroup[0].fragmentVariableValues ?? exeContext.variableValues,
+    exeContext.variableValues,
+    fieldGroup[0].fragmentVariableValues,
   );
 
   if (!stream) {

diff --git a/src/execution/values.ts b/src/execution/values.ts
@@ -336,12 +336,18 @@ export function getDirectiveValues(
   directiveDef: GraphQLDirective,
   node: { readonly directives?: ReadonlyArray<DirectiveNode> | undefined },
   variableValues?: Maybe<ObjMap<unknown>>,
+  fragmentVariables?: Maybe<ObjMap<unknown>>,
 ): undefined | { [argument: string]: unknown } {
   const directiveNode = node.directives?.find(
     (directive) => directive.name.value === directiveDef.name,
   );
 
   if (directiveNode) {
-    return getArgumentValues(directiveNode, directiveDef.args, variableValues);
+    return getArgumentValues(
+      directiveNode,
+      directiveDef.args,
+      variableValues,
+      fragmentVariables,
+    );
   }
 }