Add isRequiredArgument and isRequiredInputField predicates

Replicates graphql/graphql-js@36dc149

Author: Cito

graphql/__init__.py

@@ -99,6 +99,8 @@
     is_wrapping_type,
     is_nullable_type,
     is_named_type,
+    is_required_argument,
+    is_required_input_field,
     is_specified_scalar_type,
     is_introspection_type,
     is_specified_directive,
@@ -375,6 +377,7 @@
     'is_list_type', 'is_non_null_type', 'is_input_type', 'is_output_type',
     'is_leaf_type', 'is_composite_type', 'is_abstract_type',
     'is_wrapping_type', 'is_nullable_type', 'is_named_type',
+    'is_required_argument', 'is_required_input_field',
     'is_specified_scalar_type', 'is_introspection_type',
     'is_specified_directive',
     'assert_type', 'assert_scalar_type', 'assert_object_type',

graphql/type/__init__.py

@@ -17,6 +17,7 @@
     is_non_null_type, is_input_type, is_output_type, is_leaf_type,
     is_composite_type, is_abstract_type, is_wrapping_type,
     is_nullable_type, is_named_type,
+    is_required_argument, is_required_input_field,
     # Assertions
     assert_type, assert_scalar_type, assert_object_type,
     assert_interface_type, assert_union_type, assert_enum_type,
@@ -82,6 +83,7 @@
     'is_non_null_type', 'is_input_type', 'is_output_type', 'is_leaf_type',
     'is_composite_type', 'is_abstract_type', 'is_wrapping_type',
     'is_nullable_type', 'is_named_type',
+    'is_required_argument', 'is_required_input_field',
     'assert_type', 'assert_scalar_type', 'assert_object_type',
     'assert_interface_type', 'assert_union_type', 'assert_enum_type',
     'assert_input_object_type', 'assert_list_type', 'assert_non_null_type',

graphql/type/definition.py

@@ -27,6 +27,7 @@
     'is_non_null_type', 'is_input_type', 'is_output_type', 'is_leaf_type',
     'is_composite_type', 'is_abstract_type', 'is_wrapping_type',
     'is_nullable_type', 'is_named_type',
+    'is_required_argument', 'is_required_input_field',
     'assert_type', 'assert_scalar_type', 'assert_object_type',
     'assert_interface_type', 'assert_union_type', 'assert_enum_type',
     'assert_input_object_type', 'assert_list_type', 'assert_non_null_type',
@@ -415,6 +416,10 @@ def __eq__(self, other):
             self.description == other.description))
 
 
+def is_required_argument(arg: GraphQLArgument) -> bool:
+    return is_non_null_type(arg.type) and arg.default_value is INVALID
+
+
 T = TypeVar('T')
 Thunk = Union[Callable[[], T], T]
 
@@ -981,6 +986,10 @@ def __eq__(self, other):
             self.description == other.description))
 
 
+def is_required_input_field(field: GraphQLInputField) -> bool:
+    return is_non_null_type(field.type) and field.default_value is INVALID
+
+
 # Wrapper types
 
 class GraphQLList(Generic[GT], GraphQLWrappingType[GT]):

graphql/validation/rules/provided_required_arguments.py

@@ -1,6 +1,6 @@
-from ...error import GraphQLError, INVALID
+from ...error import GraphQLError
 from ...language import DirectiveNode, FieldNode
-from ...type import is_non_null_type
+from ...type import is_required_argument
 from . import ValidationRule
 
 __all__ = [
@@ -37,8 +37,7 @@ def leave_field(self, node: FieldNode, *_args):
         arg_node_map = {arg.name.value: arg for arg in arg_nodes}
         for arg_name, arg_def in field_def.args.items():
             arg_node = arg_node_map.get(arg_name)
-            if not arg_node and is_non_null_type(
-                    arg_def.type) and arg_def.default_value is INVALID:
+            if not arg_node and is_required_argument(arg_def):
                 self.report_error(GraphQLError(missing_field_arg_message(
                     node.name.value, arg_name, str(arg_def.type)), [node]))
 
@@ -52,7 +51,6 @@ def leave_directive(self, node: DirectiveNode, *_args):
         arg_node_map = {arg.name.value: arg for arg in arg_nodes}
         for arg_name, arg_def in directive_def.args.items():
             arg_node = arg_node_map.get(arg_name)
-            if not arg_node and is_non_null_type(
-                    arg_def.type) and arg_def.default_value is INVALID:
+            if not arg_node and is_required_argument(arg_def):
                 self.report_error(GraphQLError(missing_directive_arg_message(
                     node.name.value, arg_name, str(arg_def.type)), [node]))

graphql/validation/rules/values_of_correct_type.py

@@ -1,6 +1,6 @@
 from typing import Optional, cast
 
-from ...error import GraphQLError, INVALID
+from ...error import GraphQLError
 from ...language import (
     BooleanValueNode, EnumValueNode, FloatValueNode, IntValueNode,
     NullValueNode, ListValueNode, ObjectFieldNode, ObjectValueNode,
@@ -9,7 +9,7 @@
 from ...type import (
     GraphQLEnumType, GraphQLScalarType, GraphQLType,
     get_named_type, get_nullable_type, is_enum_type, is_input_object_type,
-    is_list_type, is_non_null_type, is_scalar_type)
+    is_list_type, is_non_null_type, is_required_input_field, is_scalar_type)
 from . import ValidationRule
 
 __all__ = [
@@ -65,12 +65,11 @@ def enter_object_value(self, node: ObjectValueNode, *_args):
         input_fields = type_.fields
         field_node_map = {field.name.value: field for field in node.fields}
         for field_name, field_def in input_fields.items():
-            field_type = field_def.type
             field_node = field_node_map.get(field_name)
-            if not field_node and is_non_null_type(
-                    field_type) and field_def.default_value is INVALID:
+            if not field_node and is_required_input_field(field_def):
+                field_type = field_def.type
                 self.report_error(GraphQLError(required_field_message(
-                    type_.name, field_name, field_type), node))
+                    type_.name, field_name, str(field_type)), node))
 
     def enter_object_field(self, node: ObjectFieldNode, *_args):
         parent_type = get_named_type(self.context.get_parent_input_type())