Improved Fragment logic and added more tests

Author: syrusakbary

graphql/execution/querybuilder/fragment.py

@@ -1,7 +1,12 @@
+from promise import promise_for_dict
+
 from functools import partial
 from ...pyutils.cached_property import cached_property
 from ..values import get_argument_values, get_variable_values
-from ..base import collect_fields, ResolveInfo
+from ..base import collect_fields, ResolveInfo, Undefined
+from ..executor import is_promise
+
+from ...pyutils.ordereddict import OrderedDict
 from ...pyutils.default_ordered_dict import DefaultOrderedDict
 
 
@@ -81,10 +86,28 @@ def partial_resolvers(self):
         )
 
     def resolve(self, root):
-        return {
-            field_name: field_resolver(root, field_args, context, info)
-            for field_name, field_resolver, field_args, context, info in self.partial_resolvers
-        }
+        contains_promise = False
+
+        final_results = OrderedDict()
+
+        for response_name, field_resolver, field_args, context, info in self.partial_resolvers:
+            result = field_resolver(root, field_args, context, info)
+            if result is Undefined:
+                continue
+
+            if is_promise(result):
+                contains_promise = True
+
+            final_results[response_name] = result
+
+        if not contains_promise:
+            return final_results
+
+        return promise_for_dict(final_results)
+        # return {
+        #     field_name: field_resolver(root, field_args, context, info)
+        #     for field_name, field_resolver, field_args, context, info in self.partial_resolvers
+        # }
 
     def __eq__(self, other):
         return isinstance(other, Fragment) and (

graphql/execution/querybuilder/tests/test_benchmark.py

@@ -95,7 +95,7 @@ def test_querybuilder_big_list_of_objecttypes_with_one_int_field(benchmark):
         )
     ])
     query_fragment = Fragment(type=Query, selection_set=selection_set)
-    resolver = type_resolver(Query, lambda: None, fragment=query_fragment)
+    resolver = type_resolver(Query, lambda: object(), fragment=query_fragment)
     resolved = benchmark(resolver)
     assert resolved == {
         'nodes': [{

graphql/execution/querybuilder/tests/test_executor.py

@@ -139,9 +139,31 @@ def test_fragment_resolver_resolves_all_list():
     assert str(resolved.errors[0]) == 'Cannot return null for non-nullable field Query.persons.'
     # assert str(resolved.errors[0]) == 'could not convert string to float: non'
     assert resolved.data == {
-        'persons': [{
-            'id': 1
-        }, {
-            'id': 1
-        }, None]
+        'persons': None
+    }
+
+
+def test_fragment_resolver_resolves_all_list_null():
+    Person = GraphQLObjectType('Person', fields={
+        'id': GraphQLField(GraphQLInt, resolver=lambda obj, *_, **__: 1),
+    })
+    Query = GraphQLObjectType('Query', fields={
+        'persons': GraphQLField(GraphQLNonNull(GraphQLList(GraphQLNonNull(Person))), resolver=lambda *args: [1, 2, None]),
+    })
+
+    document_ast = parse('''query {
+        persons {
+            id
+        }
+    }''')
+    # node_fragment = Fragment(type=Node, field_asts=node_field_asts)
+    schema = GraphQLSchema(query=Query, types=[Person])
+    # partial_execute = partial(execute, schema, document_ast, context_value="1")
+    # resolved = benchmark(partial_execute)
+    resolved = execute(schema, document_ast)
+    assert len(resolved.errors) == 1
+    assert str(resolved.errors[0]) == 'Cannot return null for non-nullable field Query.persons.'
+    # assert str(resolved.errors[0]) == 'could not convert string to float: non'
+    assert resolved.data == {
+        'persons': None
     }