Simplified field_ast collection in experimental executor

Author: syrusakbary

graphql/execution/experimental/executor.py

@@ -1,8 +1,7 @@
 from promise import Promise
 
 from ...type import GraphQLSchema
-from ...pyutils.default_ordered_dict import DefaultOrderedDict
-from ..base import ExecutionContext, ExecutionResult, get_operation_root_type, collect_fields
+from ..base import ExecutionContext, ExecutionResult, get_operation_root_type
 from ..executors.sync import SyncExecutor
 from ..middleware import MiddlewareManager
 from .fragment import Fragment
@@ -57,15 +56,7 @@ def execute_operation(exe_context, operation, root_value):
     type = get_operation_root_type(exe_context.schema, operation)
     execute_serially = operation.operation == 'mutation'
 
-    fields = collect_fields(
-        exe_context,
-        type,
-        operation.selection_set,
-        DefaultOrderedDict(list),
-        set()
-    )
-
-    fragment = Fragment(type=type, field_asts=fields, context=exe_context)
+    fragment = Fragment(type=type, field_asts=[operation], context=exe_context)
     if execute_serially:
         return fragment.resolve_serially(root_value)
     return fragment.resolve(root_value)

graphql/execution/experimental/fragment.py

@@ -37,9 +37,9 @@ def get_subfield_asts(context, return_type, field_asts):
 
 def get_resolvers(context, type, field_asts):
     from .resolver import field_resolver
+    subfield_asts = get_subfield_asts(context, type, field_asts)
 
-    resolvers = []
-    for response_name, field_asts in field_asts.items():
+    for response_name, field_asts in subfield_asts.items():
         field_ast = field_asts[0]
         field_name = field_ast.name.value
         field_def = get_field_def(context and context.schema, type, field_name)
@@ -61,7 +61,7 @@ def get_resolvers(context, type, field_asts):
         if isinstance(field_base_type, GraphQLObjectType):
             field_fragment = Fragment(
                 type=field_base_type,
-                field_asts=get_subfield_asts(context, field_base_type, field_asts),
+                field_asts=field_asts,
                 info=info,
                 context=context
             )
@@ -78,8 +78,7 @@ def get_resolvers(context, type, field_asts):
             field_ast.arguments,
             context and context.variable_values
         )
-        resolvers.append((response_name, resolver, args, context and context.context_value, info))
-    return resolvers
+        yield (response_name, resolver, args, context and context.context_value, info)
 
 
 class Fragment(object):
@@ -92,11 +91,11 @@ def __init__(self, type, field_asts, context=None, info=None):
 
     @cached_property
     def partial_resolvers(self):
-        return get_resolvers(
+        return list(get_resolvers(
             self.context,
             self.type,
             self.field_asts
-        )
+        ))
 
     def have_type(self, root):
         return not self.type.is_type_of or self.type.is_type_of(root, self.context.context_value, self.info)
@@ -191,7 +190,7 @@ def get_fragment(self, type):
             ).format(type, self.abstract_type)
             self._fragments[type] = Fragment(
                 type,
-                get_subfield_asts(self.context, type, self.field_asts),
+                self.field_asts,
                 self.context,
                 self.info
             )