Added out_name to input types (Argument and InputField)

Author: syrusakbary

graphql/execution/tests/test_resolve.py

@@ -3,7 +3,9 @@
 
 from graphql import graphql
 from graphql.type import (GraphQLArgument, GraphQLField, GraphQLInt,
-                          GraphQLObjectType, GraphQLSchema, GraphQLString)
+                          GraphQLObjectType, GraphQLSchema, GraphQLString,
+                          GraphQLInputObjectType, GraphQLInputObjectField,
+                          GraphQLNonNull, GraphQLList)
 
 
 def _test_schema(test_field):
@@ -69,3 +71,68 @@ def resolver(source, args, *_):
         {'test': '["Source!",{"aStr":"String!","aInt":-123}]'},
         {'test': '["Source!",{"aInt":-123,"aStr":"String!"}]'}
     ]
+
+
+def test_maps_argument_out_names_well():
+    def resolver(source, args, *_):
+        return json.dumps([source, args], separators=(',', ':'))
+
+    schema = _test_schema(GraphQLField(
+        GraphQLString,
+        args=OrderedDict([
+            ('aStr', GraphQLArgument(GraphQLString, out_name="a_str")),
+            ('aInt', GraphQLArgument(GraphQLInt, out_name="a_int")),
+        ]),
+        resolver=resolver
+    ))
+
+    result = graphql(schema, '{ test }', None)
+    assert not result.errors
+    assert result.data == {'test': '[null,{}]'}
+
+    result = graphql(schema, '{ test(aStr: "String!") }', 'Source!')
+    assert not result.errors
+    assert result.data == {'test': '["Source!",{"a_str":"String!"}]'}
+
+    result = graphql(schema, '{ test(aInt: -123, aStr: "String!",) }', 'Source!')
+    assert not result.errors
+    assert result.data in [
+        {'test': '["Source!",{"a_str":"String!","a_int":-123}]'},
+        {'test': '["Source!",{"a_int":-123,"a_str":"String!"}]'}
+    ]
+
+
+def test_maps_argument_out_names_well_with_input():
+    def resolver(source, args, *_):
+        return json.dumps([source, args], separators=(',', ':'))
+
+
+    TestInputObject = GraphQLInputObjectType('TestInputObject', lambda: OrderedDict([
+        ('inputOne', GraphQLInputObjectField(GraphQLString, out_name="input_one")),
+        ('inputRecursive', GraphQLInputObjectField(TestInputObject, out_name="input_recursive")),
+    ]))
+
+    schema = _test_schema(GraphQLField(
+        GraphQLString,
+        args=OrderedDict([
+            ('aStr', GraphQLArgument(GraphQLString, out_name="a_str")),
+            ('aInt', GraphQLArgument(GraphQLInt, out_name="a_int")),
+            ('aInput', GraphQLArgument(TestInputObject, out_name="a_input"))
+        ]),
+        resolver=resolver
+    ))
+
+    result = graphql(schema, '{ test }', None)
+    assert not result.errors
+    assert result.data == {'test': '[null,{}]'}
+
+    result = graphql(schema, '{ test(aInput: {inputOne: "String!"} ) }', 'Source!')
+    assert not result.errors
+    assert result.data == {'test': '["Source!",{"a_input":{"input_one":"String!"}}]'}
+
+    result = graphql(schema, '{ test(aInput: {inputOne: "String!", inputRecursive:{inputOne: "SourceRecursive!"}} ) }', 'Source!')
+    assert not result.errors
+    assert result.data in [
+        {'test': '["Source!",{"a_input":{"input_one":"String!","input_recursive":{"input_one":"SourceRecursive!"}}}]'},
+        {'test': '["Source!",{"a_input":{"input_recursive":{"input_one":"SourceRecursive!"}},"input_one":"String!"}]'}
+    ]

graphql/execution/values.py

@@ -56,7 +56,9 @@ def get_argument_values(arg_defs, arg_asts, variables):
             value = arg_def.default_value
 
         if value is not None:
-            result[name] = value
+            # We use out_name as the output name for the
+            # dict if exists
+            result[arg_def.out_name or name] = value
 
     return result
 
@@ -133,7 +135,9 @@ def coerce_value(type, value):
                 field_value = field.default_value
 
             if field_value is not None:
-                obj[field_name] = field_value
+                # We use out_name as the output name for the
+                # dict if exists
+                obj[field.out_name or field_name] = field_value
 
         return obj
 

graphql/type/definition.py

@@ -264,20 +264,22 @@ def __hash__(self):
 
 
 class GraphQLArgument(object):
-    __slots__ = 'type', 'default_value', 'description'
+    __slots__ = 'type', 'default_value', 'description', 'out_name'
 
-    def __init__(self, type, default_value=None, description=None):
+    def __init__(self, type, default_value=None, description=None, out_name=None):
         self.type = type
         self.default_value = default_value
         self.description = description
+        self.out_name = out_name
 
     def __eq__(self, other):
         return (
             self is other or (
                 isinstance(other, GraphQLArgument) and
                 self.type == other.type and
                 self.default_value == other.default_value and
-                self.description == other.description
+                self.description == other.description and
+                self.out_name == other.out_name
             )
         )
 
@@ -536,19 +538,21 @@ def _define_field_map(self):
 
 
 class GraphQLInputObjectField(object):
-    __slots__ = 'type', 'default_value', 'description'
+    __slots__ = 'type', 'default_value', 'description', 'out_name'
 
-    def __init__(self, type, default_value=None, description=None):
+    def __init__(self, type, default_value=None, description=None, out_name=None):
         self.type = type
         self.default_value = default_value
         self.description = description
+        self.out_name = out_name
 
     def __eq__(self, other):
         return (
             self is other or (
                 isinstance(other, GraphQLInputObjectField) and
                 self.type == other.type and
-                self.description == other.description
+                self.description == other.description and
+                self.out_name == other.out_name
             )
         )
 

graphql/utils/value_from_ast.py

@@ -57,7 +57,9 @@ def value_from_ast(value_ast, type, variables=None):
                 field_value = field.default_value
 
             if field_value is not None:
-                obj[field_name] = field_value
+                # We use out_name as the output name for the
+                # dict if exists
+                obj[field.out_name or field_name] = field_value
 
         return obj