Skip to content

Commit 679be84

Browse files
fix(validation): keep argument defaults inside fragments
Replicates graphql/graphql-js@fee3a5a
1 parent 3b7a4f5 commit 679be84

2 files changed

Lines changed: 39 additions & 20 deletions

File tree

‎src/graphql/validation/validation_context.py‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
VisitorAction,
2222
visit,
2323
)
24-
from ..pyutils import Undefined
2524
from ..utilities import TypeInfo, TypeInfoVisitor
2625

2726
if TYPE_CHECKING:
@@ -85,33 +84,24 @@ def enter_variable_definition(self, *_args: Any) -> VisitorAction:
8584
def enter_variable(self, node: VariableNode, *_args: Any) -> VisitorAction:
8685
type_info = self._type_info
8786
fragment_definition = self._fragment_definition
87+
fragment_variable_definition = None
8888
if fragment_definition:
8989
fragment_signature = type_info.get_fragment_signature_by_name()(
9090
fragment_definition.name.value
9191
)
92-
fragment_variable_definition = (
93-
fragment_signature.variable_definitions.get(node.name.value)
94-
if fragment_signature
95-
else None
96-
)
97-
# Fragment variables have a variable default but no location default,
98-
# which is what this default value represents.
99-
usage = VariableUsage(
100-
node,
101-
type_info.get_input_type(),
102-
type_info.get_parent_input_type(),
103-
Undefined,
104-
fragment_variable_definition,
105-
)
106-
else:
107-
usage = VariableUsage(
92+
if fragment_signature:
93+
fragment_variable_definition = (
94+
fragment_signature.variable_definitions.get(node.name.value)
95+
)
96+
self._append_usage(
97+
VariableUsage(
10898
node,
10999
type_info.get_input_type(),
110100
type_info.get_parent_input_type(),
111101
type_info.get_default_value(),
112-
None,
102+
fragment_variable_definition,
113103
)
114-
self._append_usage(usage)
104+
)
115105
return None
116106

117107

‎tests/validation/test_variables_in_allowed_position.py‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,20 @@ def forbids_one_nullable_variable():
374374
)
375375

376376
def describe_fragment_arguments_are_validated():
377+
def int_to_non_null_int_when_field_argument_provides_default_value():
378+
assert_valid(
379+
"""
380+
query Query {
381+
complicatedArgs {
382+
...A
383+
}
384+
}
385+
fragment A($intVar: Int) on ComplicatedArgs {
386+
nonNullFieldWithDefault(arg: $intVar)
387+
}
388+
"""
389+
)
390+
377391
def validates_fragment_variables_defined_before_the_operation():
378392
assert_errors(
379393
"""
@@ -505,7 +519,22 @@ def int_to_non_null_int_when_optional_arg_provides_default_value():
505519
"""
506520
query Query($intVar: Int) {
507521
complicatedArgs {
508-
nonNullFieldWithDefault(nonNullIntArg: $intVar)
522+
nonNullFieldWithDefault(arg: $intVar)
523+
}
524+
}
525+
"""
526+
)
527+
528+
def int_to_non_null_int_when_argument_default_is_inside_fragment():
529+
assert_valid(
530+
"""
531+
fragment defaultArgFrag on ComplicatedArgs {
532+
nonNullFieldWithDefault(arg: $intVar)
533+
}
534+
535+
query Query($intVar: Int) {
536+
complicatedArgs {
537+
...defaultArgFrag
509538
}
510539
}
511540
"""

0 commit comments

Comments
 (0)