Added test cases for custom object input containers

Author: syrusakbary

graphql/execution/tests/test_variables.py

@@ -6,7 +6,7 @@
 from graphql.error import GraphQLError, format_error
 from graphql.execution import execute
 from graphql.language.parser import parse
-from graphql.type import (GraphQLArgument, GraphQLField,
+from graphql.type import (GraphQLArgument, GraphQLField, GraphQLBoolean,
                           GraphQLInputObjectField, GraphQLInputObjectType,
                           GraphQLList, GraphQLNonNull, GraphQLObjectType,
                           GraphQLScalarType, GraphQLSchema, GraphQLString)
@@ -18,13 +18,23 @@
     parse_literal=lambda v: 'DeserializedValue' if v.value == 'SerializedValue' else None
 )
 
+
+class my_special_dict(dict):
+    pass
+
+
 TestInputObject = GraphQLInputObjectType('TestInputObject', OrderedDict([
     ('a', GraphQLInputObjectField(GraphQLString)),
     ('b', GraphQLInputObjectField(GraphQLList(GraphQLString))),
     ('c', GraphQLInputObjectField(GraphQLNonNull(GraphQLString))),
     ('d', GraphQLInputObjectField(TestComplexScalar))
 ]))
 
+
+TestCustomInputObject = GraphQLInputObjectType('TestCustomInputObject', OrderedDict([
+    ('a', GraphQLInputObjectField(GraphQLString)),
+]), container_type=my_special_dict)
+
 stringify = lambda obj: json.dumps(obj, sort_keys=True)
 
 
@@ -47,6 +57,10 @@ def input_to_json(obj, args, context, info):
         GraphQLString,
         args={'input': GraphQLArgument(TestInputObject)},
         resolver=input_to_json),
+    'fieldWithCustomObjectInput': GraphQLField(
+        GraphQLBoolean,
+        args={'input': GraphQLArgument(TestCustomInputObject)},
+        resolver=lambda root, args, context, info: isinstance(args.get('input'), my_special_dict)),
     'fieldWithNullableStringInput': GraphQLField(
         GraphQLString,
         args={'input': GraphQLArgument(GraphQLString)},
@@ -420,6 +434,20 @@ def test_passes_along_null_for_non_nullable_inputs_if_explcitly_set_in_the_query
     })
 
 
+def test_uses_objectinput_container():
+    doc = '''
+    {
+        fieldWithCustomObjectInput(input: {a: "b"})
+    }
+    '''
+
+    check(doc, {
+        'data': {
+            'fieldWithCustomObjectInput': True
+        }
+    })
+
+
 def test_allows_lists_to_be_null():
     doc = '''
     query q($input: [String]) {

graphql/type/definition.py

@@ -507,15 +507,18 @@ class GeoPoint(GraphQLInputObjectType):
                     default_value=0)
             }
     """
-    def __init__(self, name, fields, description=None):
+    def __init__(self, name, fields, description=None, container_type=None):
         assert name, 'Type must be named.'
         self.name = name
         self.description = description
-
+        if container_type is None:
+            container_type = dict
+        assert callable(container_type), "container_type must be callable"
+        self.container_type = container_type
         self._fields = fields
 
     def create_container(self, data):
-        return dict(data)
+        return self.container_type(data)
 
     @cached_property
     def fields(self):

graphql/utils/value_from_ast.py

@@ -64,7 +64,7 @@ def value_from_ast(value_ast, type, variables=None):
                 # dict if exists
                 obj[field.out_name or field_name] = field_value
 
-        return  type.create_container(obj)
+        return type.create_container(obj)
 
     assert isinstance(type, (GraphQLScalarType, GraphQLEnumType)), \
         'Must be input type'