graphql 1.9.21 → 2.0.16

data/lib/graphql/execution/interpreter/runtime.rb

@@ -8,6 +8,137 @@ module GraphQL
       #
       # @api private
       class Runtime
+
+        module GraphQLResult
+          def initialize(result_name, parent_result)
+            @graphql_parent = parent_result
+            if parent_result && parent_result.graphql_dead
+              @graphql_dead = true
+            end
+            @graphql_result_name = result_name
+            # Jump through some hoops to avoid creating this duplicate storage if at all possible.
+            @graphql_metadata = nil
+          end
+
+          attr_accessor :graphql_dead
+          attr_reader :graphql_parent, :graphql_result_name
+
+          # Although these are used by only one of the Result classes,
+          # it's handy to have the methods implemented on both (even though they just return `nil`)
+          # because it makes it easy to check if anything is assigned.
+          # @return [nil, Array<String>]
+          attr_accessor :graphql_non_null_field_names
+          # @return [nil, true]
+          attr_accessor :graphql_non_null_list_items
+
+          # @return [Hash] Plain-Ruby result data (`@graphql_metadata` contains Result wrapper objects)
+          attr_accessor :graphql_result_data
+        end
+
+        class GraphQLResultHash
+          def initialize(_result_name, _parent_result)
+            super
+            @graphql_result_data = {}
+          end
+
+          include GraphQLResult
+
+          attr_accessor :graphql_merged_into
+
+          def []=(key, value)
+            # This is a hack.
+            # Basically, this object is merged into the root-level result at some point.
+            # But the problem is, some lazies are created whose closures retain reference to _this_
+            # object. When those lazies are resolved, they cause an update to this object.
+            #
+            # In order to return a proper top-level result, we have to update that top-level result object.
+            # In order to return a proper partial result (eg, for a directive), we have to update this object, too.
+            # Yowza.
+            if (t = @graphql_merged_into)
+              t[key] = value
+            end
+
+            if value.respond_to?(:graphql_result_data)
+              @graphql_result_data[key] = value.graphql_result_data
+              # If we encounter some part of this response that requires metadata tracking,
+              # then create the metadata hash if necessary. It will be kept up-to-date after this.
+              (@graphql_metadata ||= @graphql_result_data.dup)[key] = value
+            else
+              @graphql_result_data[key] = value
+              # keep this up-to-date if it's been initialized
+              @graphql_metadata && @graphql_metadata[key] = value
+            end
+
+            value
+          end
+
+          def delete(key)
+            @graphql_metadata && @graphql_metadata.delete(key)
+            @graphql_result_data.delete(key)
+          end
+
+          def each
+            (@graphql_metadata || @graphql_result_data).each { |k, v| yield(k, v) }
+          end
+
+          def values
+            (@graphql_metadata || @graphql_result_data).values
+          end
+
+          def key?(k)
+            @graphql_result_data.key?(k)
+          end
+
+          def [](k)
+            (@graphql_metadata || @graphql_result_data)[k]
+          end
+        end
+
+        class GraphQLResultArray
+          include GraphQLResult
+
+          def initialize(_result_name, _parent_result)
+            super
+            @graphql_result_data = []
+          end
+
+          def graphql_skip_at(index)
+            # Mark this index as dead. It's tricky because some indices may already be storing
+            # `Lazy`s. So the runtime is still holding indexes _before_ skipping,
+            # this object has to coordinate incoming writes to account for any already-skipped indices.
+            @skip_indices ||= []
+            @skip_indices << index
+            offset_by = @skip_indices.count { |skipped_idx| skipped_idx < index}
+            delete_at_index = index - offset_by
+            @graphql_metadata && @graphql_metadata.delete_at(delete_at_index)
+            @graphql_result_data.delete_at(delete_at_index)
+          end
+
+          def []=(idx, value)
+            if @skip_indices
+              offset_by = @skip_indices.count { |skipped_idx| skipped_idx < idx }
+              idx -= offset_by
+            end
+            if value.respond_to?(:graphql_result_data)
+              @graphql_result_data[idx] = value.graphql_result_data
+              (@graphql_metadata ||= @graphql_result_data.dup)[idx] = value
+            else
+              @graphql_result_data[idx] = value
+              @graphql_metadata && @graphql_metadata[idx] = value
+            end
+
+            value
+          end
+
+          def values
+            (@graphql_metadata || @graphql_result_data)
+          end
+        end
+
+        class GraphQLSelectionSet < Hash
+          attr_accessor :graphql_directives
+        end
+
         # @return [GraphQL::Query]
         attr_reader :query
 
@@ -17,61 +148,148 @@ module GraphQL
         # @return [GraphQL::Query::Context]
         attr_reader :context
 
-        def initialize(query:, response:)
+        def thread_info
+          info = Thread.current[:__graphql_runtime_info]
+          if !info
+            new_ti = {}
+            info = Thread.current[:__graphql_runtime_info] = new_ti
+          end
+          info
+        end
+
+        def initialize(query:)
           @query = query
+          @dataloader = query.multiplex.dataloader
           @schema = query.schema
           @context = query.context
-          @interpreter_context = @context.namespace(:interpreter)
-          @response = response
-          @dead_paths = {}
-          @types_at_paths = {}
+          @multiplex_context = query.multiplex.context
+          # Start this off empty:
+          Thread.current[:__graphql_runtime_info] = nil
+          @response = GraphQLResultHash.new(nil, nil)
+          # Identify runtime directives by checking which of this schema's directives have overridden `def self.resolve`
+          @runtime_directive_names = []
+          noop_resolve_owner = GraphQL::Schema::Directive.singleton_class
+          @schema_directives = schema.directives
+          @schema_directives.each do |name, dir_defn|
+            if dir_defn.method(:resolve).owner != noop_resolve_owner
+              @runtime_directive_names << name
+            end
+          end
           # A cache of { Class => { String => Schema::Field } }
           # Which assumes that MyObject.get_field("myField") will return the same field
           # during the lifetime of a query
           @fields_cache = Hash.new { |h, k| h[k] = {} }
+          # { Class => Boolean }
+          @lazy_cache = {}
         end
 
-        def final_value
-          @response.final_value
+        def final_result
+          @response && @response.graphql_result_data
         end
 
         def inspect
           "#<#{self.class.name} response=#{@response.inspect}>"
         end
 
+        def tap_or_each(obj_or_array)
+          if obj_or_array.is_a?(Array)
+            obj_or_array.each do |item|
+              yield(item, true)
+            end
+          else
+            yield(obj_or_array, false)
+          end
+        end
+
         # This _begins_ the execution. Some deferred work
         # might be stored up in lazies.
         # @return [void]
         def run_eager
-
           root_operation = query.selected_operation
           root_op_type = root_operation.operation_type || "query"
-          legacy_root_type = schema.root_type_for_operation(root_op_type)
-          root_type = legacy_root_type.metadata[:type_class] || raise("Invariant: type must be class-based: #{legacy_root_type}")
+          root_type = schema.root_type_for_operation(root_op_type)
           path = []
-          @interpreter_context[:current_object] = query.root_value
-          @interpreter_context[:current_path] = path
-          object_proxy = root_type.authorized_new(query.root_value, context)
+          set_all_interpreter_context(query.root_value, nil, nil, path)
+          object_proxy = authorized_new(root_type, query.root_value, context)
           object_proxy = schema.sync_lazy(object_proxy)
+
           if object_proxy.nil?
             # Root .authorized? returned false.
-            write_in_response(path, nil)
-            nil
+            @response = nil
           else
-            evaluate_selections(path, context.scoped_context, object_proxy, root_type, root_operation.selections, root_operation_type: root_op_type)
-            nil
+            call_method_on_directives(:resolve, object_proxy, root_operation.directives) do # execute query level directives
+              gathered_selections = gather_selections(object_proxy, root_type, root_operation.selections)
+              # This is kind of a hack -- `gathered_selections` is an Array if any of the selections
+              # require isolation during execution (because of runtime directives). In that case,
+              # make a new, isolated result hash for writing the result into. (That isolated response
+              # is eventually merged back into the main response)
+              #
+              # Otherwise, `gathered_selections` is a hash of selections which can be
+              # directly evaluated and the results can be written right into the main response hash.
+              tap_or_each(gathered_selections) do |selections, is_selection_array|
+                if is_selection_array
+                  selection_response = GraphQLResultHash.new(nil, nil)
+                  final_response = @response
+                else
+                  selection_response = @response
+                  final_response = nil
+                end
+
+                @dataloader.append_job {
+                  set_all_interpreter_context(query.root_value, nil, nil, path)
+                  call_method_on_directives(:resolve, object_proxy, selections.graphql_directives) do
+                    evaluate_selections(
+                      path,
+                      object_proxy,
+                      root_type,
+                      root_op_type == "mutation",
+                      selections,
+                      selection_response,
+                      final_response,
+                      nil,
+                    )
+                  end
+                }
+              end
+            end
           end
+          delete_interpreter_context(:current_path)
+          delete_interpreter_context(:current_field)
+          delete_interpreter_context(:current_object)
+          delete_interpreter_context(:current_arguments)
+          nil
         end
 
-        def gather_selections(owner_object, owner_type, selections, selections_by_name)
+        # @return [void]
+        def deep_merge_selection_result(from_result, into_result)
+          from_result.each do |key, value|
+            if !into_result.key?(key)
+              into_result[key] = value
+            else
+              case value
+              when GraphQLResultHash
+                deep_merge_selection_result(value, into_result[key])
+              else
+                # We have to assume that, since this passed the `fields_will_merge` selection,
+                # that the old and new values are the same.
+                # There's no special handling of arrays because currently, there's no way to split the execution
+                # of a list over several concurrent flows.
+                into_result[key] = value
+              end
+            end
+          end
+          from_result.graphql_merged_into = into_result
+          nil
+        end
+
+        def gather_selections(owner_object, owner_type, selections, selections_to_run = nil, selections_by_name = GraphQLSelectionSet.new)
           selections.each do |node|
             # Skip gathering this if the directive says so
             if !directives_include?(node, owner_object, owner_type)
               next
             end
 
-            case node
-            when GraphQL::Language::Nodes::Field
+            if node.is_a?(GraphQL::Language::Nodes::Field)
               response_key = node.alias || node.name
               selections = selections_by_name[response_key]
               # if there was already a selection of this field,
@@ -87,145 +305,224 @@ module GraphQL
                 # No selection was found for this field yet
                 selections_by_name[response_key] = node
               end
-            when GraphQL::Language::Nodes::InlineFragment
-              if node.type
-                type_defn = schema.types[node.type.name]
-                type_defn = type_defn.metadata[:type_class]
-                # Faster than .map{}.include?()
-                query.warden.possible_types(type_defn).each do |t|
-                  if t.metadata[:type_class] == owner_type
-                    gather_selections(owner_object, owner_type, node.selections, selections_by_name)
-                    break
-                  end
+            else
+              # This is an InlineFragment or a FragmentSpread
+              if @runtime_directive_names.any? && node.directives.any? { |d| @runtime_directive_names.include?(d.name) }
+                next_selections = GraphQLSelectionSet.new
+                next_selections.graphql_directives = node.directives
+                if selections_to_run
+                  selections_to_run << next_selections
+                else
+                  selections_to_run = []
+                  selections_to_run << selections_by_name
+                  selections_to_run << next_selections
                 end
               else
-                # it's an untyped fragment, definitely continue
-                gather_selections(owner_object, owner_type, node.selections, selections_by_name)
+                next_selections = selections_by_name
               end
-            when GraphQL::Language::Nodes::FragmentSpread
-              fragment_def = query.fragments[node.name]
-              type_defn = schema.types[fragment_def.type.name]
-              type_defn = type_defn.metadata[:type_class]
-              schema.possible_types(type_defn).each do |t|
-                if t.metadata[:type_class] == owner_type
-                  gather_selections(owner_object, owner_type, fragment_def.selections, selections_by_name)
-                  break
+
+              case node
+              when GraphQL::Language::Nodes::InlineFragment
+                if node.type
+                  type_defn = schema.get_type(node.type.name, context)
+
+                  # Faster than .map{}.include?()
+                  query.warden.possible_types(type_defn).each do |t|
+                    if t == owner_type
+                      gather_selections(owner_object, owner_type, node.selections, selections_to_run, next_selections)
+                      break
+                    end
+                  end
+                else
+                  # it's an untyped fragment, definitely continue
+                  gather_selections(owner_object, owner_type, node.selections, selections_to_run, next_selections)
                 end
+              when GraphQL::Language::Nodes::FragmentSpread
+                fragment_def = query.fragments[node.name]
+                type_defn = query.get_type(fragment_def.type.name)
+                possible_types = query.warden.possible_types(type_defn)
+                possible_types.each do |t|
+                  if t == owner_type
+                    gather_selections(owner_object, owner_type, fragment_def.selections, selections_to_run, next_selections)
+                    break
+                  end
+                end
+              else
+                raise "Invariant: unexpected selection class: #{node.class}"
               end
-            else
-              raise "Invariant: unexpected selection class: #{node.class}"
             end
           end
+          selections_to_run || selections_by_name
         end
 
-        def evaluate_selections(path, scoped_context, owner_object, owner_type, selections, root_operation_type: nil)
-          @interpreter_context[:current_object] = owner_object
-          @interpreter_context[:current_path] = path
-          selections_by_name = {}
-          gather_selections(owner_object, owner_type, selections, selections_by_name)
-          selections_by_name.each do |result_name, field_ast_nodes_or_ast_node|
-            # As a performance optimization, the hash key will be a `Node` if
-            # there's only one selection of the field. But if there are multiple
-            # selections of the field, it will be an Array of nodes
-            if field_ast_nodes_or_ast_node.is_a?(Array)
-              field_ast_nodes = field_ast_nodes_or_ast_node
-              ast_node = field_ast_nodes.first
-            else
-              field_ast_nodes = nil
-              ast_node = field_ast_nodes_or_ast_node
-            end
-            field_name = ast_node.name
-            field_defn = @fields_cache[owner_type][field_name] ||= owner_type.get_field(field_name)
-            is_introspection = false
-            if field_defn.nil?
-              field_defn = if owner_type == schema.query.metadata[:type_class] && (entry_point_field = schema.introspection_system.entry_point(name: field_name))
-                is_introspection = true
-                entry_point_field.metadata[:type_class]
-              elsif (dynamic_field = schema.introspection_system.dynamic_field(name: field_name))
-                is_introspection = true
-                dynamic_field.metadata[:type_class]
-              else
-                raise "Invariant: no field for #{owner_type}.#{field_name}"
+        NO_ARGS = {}.freeze
+
+        # @return [void]
+        def evaluate_selections(path, owner_object, owner_type, is_eager_selection, gathered_selections, selections_result, target_result, parent_object) # rubocop:disable Metrics/ParameterLists
+          set_all_interpreter_context(owner_object, nil, nil, path)
+
+          finished_jobs = 0
+          enqueued_jobs = gathered_selections.size
+          gathered_selections.each do |result_name, field_ast_nodes_or_ast_node|
+            @dataloader.append_job {
+              evaluate_selection(
+                path, result_name, field_ast_nodes_or_ast_node, owner_object, owner_type, is_eager_selection, selections_result, parent_object
+              )
+              finished_jobs += 1
+              if target_result && finished_jobs == enqueued_jobs
+                deep_merge_selection_result(selections_result, target_result)
               end
-            end
+            }
+          end
+
+          selections_result
+        end
 
-            return_type = resolve_if_late_bound_type(field_defn.type)
+        attr_reader :progress_path
 
-            next_path = path.dup
-            next_path << result_name
-            next_path.freeze
+        # @return [void]
+        def evaluate_selection(path, result_name, field_ast_nodes_or_ast_node, owner_object, owner_type, is_eager_field, selections_result, parent_object) # rubocop:disable Metrics/ParameterLists
+          return if dead_result?(selections_result)
+          # As a performance optimization, the hash key will be a `Node` if
+          # there's only one selection of the field. But if there are multiple
+          # selections of the field, it will be an Array of nodes
+          if field_ast_nodes_or_ast_node.is_a?(Array)
+            field_ast_nodes = field_ast_nodes_or_ast_node
+            ast_node = field_ast_nodes.first
+          else
+            field_ast_nodes = nil
+            ast_node = field_ast_nodes_or_ast_node
+          end
+          field_name = ast_node.name
+          # This can't use `query.get_field` because it gets confused on introspection below if `field_defn` isn't `nil`,
+          # because of how `is_introspection` is used to call `.authorized_new` later on.
+          field_defn = @fields_cache[owner_type][field_name] ||= owner_type.get_field(field_name, @context)
+          is_introspection = false
+          if field_defn.nil?
+            field_defn = if owner_type == schema.query && (entry_point_field = schema.introspection_system.entry_point(name: field_name))
+              is_introspection = true
+              entry_point_field
+            elsif (dynamic_field = schema.introspection_system.dynamic_field(name: field_name))
+              is_introspection = true
+              dynamic_field
+            else
+              raise "Invariant: no field for #{owner_type}.#{field_name}"
+            end
+          end
+          return_type = field_defn.type
 
-            # This seems janky, but we need to know
-            # the field's return type at this path in order
-            # to propagate `null`
-            set_type_at_path(next_path, return_type)
-            # Set this before calling `run_with_directives`, so that the directive can have the latest path
-            @interpreter_context[:current_path] = next_path
-            @interpreter_context[:current_field] = field_defn
+          next_path = path + [result_name]
+          next_path.freeze
 
-            context.scoped_context = scoped_context
-            object = owner_object
+          # This seems janky, but we need to know
+          # the field's return type at this path in order
+          # to propagate `null`
+          if return_type.non_null?
+            (selections_result.graphql_non_null_field_names ||= []).push(result_name)
+          end
+          # Set this before calling `run_with_directives`, so that the directive can have the latest path
+          set_all_interpreter_context(nil, field_defn, nil, next_path)
+          object = owner_object
 
-            if is_introspection
-              object = field_defn.owner.authorized_new(object, context)
+          if is_introspection
+            object = authorized_new(field_defn.owner, object, context)
+          end
+
+          total_args_count = field_defn.arguments(context).size
+          if total_args_count == 0
+            resolved_arguments = GraphQL::Execution::Interpreter::Arguments::EMPTY
+            evaluate_selection_with_args(resolved_arguments, field_defn, next_path, ast_node, field_ast_nodes, owner_type, object, is_eager_field, result_name, selections_result, parent_object)
+          else
+            # TODO remove all arguments(...) usages?
+            @query.arguments_cache.dataload_for(ast_node, field_defn, object) do |resolved_arguments|
+              evaluate_selection_with_args(resolved_arguments, field_defn, next_path, ast_node, field_ast_nodes, owner_type, object, is_eager_field, result_name, selections_result, parent_object)
             end
+          end
+        end
 
-            begin
-              kwarg_arguments = arguments(object, field_defn, ast_node)
-            rescue GraphQL::ExecutionError => e
-              continue_value(next_path, e, field_defn, return_type.non_null?, ast_node)
+        def evaluate_selection_with_args(arguments, field_defn, next_path, ast_node, field_ast_nodes, owner_type, object, is_eager_field, result_name, selection_result, parent_object)  # rubocop:disable Metrics/ParameterLists
+          return_type = field_defn.type
+          after_lazy(arguments, owner: owner_type, field: field_defn, path: next_path, ast_node: ast_node, owner_object: object, arguments: arguments, result_name: result_name, result: selection_result) do |resolved_arguments|
+            if resolved_arguments.is_a?(GraphQL::ExecutionError) || resolved_arguments.is_a?(GraphQL::UnauthorizedError)
+              continue_value(next_path, resolved_arguments, owner_type, field_defn, return_type.non_null?, ast_node, result_name, selection_result)
               next
             end
 
-            # It might turn out that making arguments for every field is slow.
-            # If we have to cache them, we'll need a more subtle approach here.
-            field_defn.extras.each do |extra|
-              case extra
-              when :ast_node
-                kwarg_arguments[:ast_node] = ast_node
-              when :execution_errors
-                kwarg_arguments[:execution_errors] = ExecutionErrors.new(context, ast_node, next_path)
-              when :path
-                kwarg_arguments[:path] = next_path
-              when :lookahead
-                if !field_ast_nodes
-                  field_ast_nodes = [ast_node]
+            kwarg_arguments = if resolved_arguments.empty? && field_defn.extras.empty?
+              # We can avoid allocating the `{ Symbol => Object }` hash in this case
+              NO_ARGS
+            else
+              # Bundle up the extras, then make a new arguments instance
+              # that includes the extras, too.
+              extra_args = {}
+              field_defn.extras.each do |extra|
+                case extra
+                when :ast_node
+                  extra_args[:ast_node] = ast_node
+                when :execution_errors
+                  extra_args[:execution_errors] = ExecutionErrors.new(context, ast_node, next_path)
+                when :path
+                  extra_args[:path] = next_path
+                when :lookahead
+                  if !field_ast_nodes
+                    field_ast_nodes = [ast_node]
+                  end
+
+                  extra_args[:lookahead] = Execution::Lookahead.new(
+                    query: query,
+                    ast_nodes: field_ast_nodes,
+                    field: field_defn,
+                  )
+                when :argument_details
+                  # Use this flag to tell Interpreter::Arguments to add itself
+                  # to the keyword args hash _before_ freezing everything.
+                  extra_args[:argument_details] = :__arguments_add_self
+                when :parent
+                  extra_args[:parent] = parent_object
+                else
+                  extra_args[extra] = field_defn.fetch_extra(extra, context)
                 end
-                kwarg_arguments[:lookahead] = Execution::Lookahead.new(
-                  query: query,
-                  ast_nodes: field_ast_nodes,
-                  field: field_defn,
-                )
-              else
-                kwarg_arguments[extra] = field_defn.fetch_extra(extra, context)
               end
+              if extra_args.any?
+                resolved_arguments = resolved_arguments.merge_extras(extra_args)
+              end
+              resolved_arguments.keyword_arguments
             end
 
-            @interpreter_context[:current_arguments] = kwarg_arguments
+            set_all_interpreter_context(nil, nil, resolved_arguments, nil)
 
             # Optimize for the case that field is selected only once
             if field_ast_nodes.nil? || field_ast_nodes.size == 1
               next_selections = ast_node.selections
+              directives = ast_node.directives
             else
               next_selections = []
-              field_ast_nodes.each { |f| next_selections.concat(f.selections) }
+              directives = []
+              field_ast_nodes.each { |f|
+                next_selections.concat(f.selections)
+                directives.concat(f.directives)
+              }
             end
 
-            field_result = resolve_with_directives(object, ast_node) do
+            field_result = call_method_on_directives(:resolve, object, directives) do
               # Actually call the field resolver and capture the result
               app_result = begin
-                query.with_error_handling do
-                  query.trace("execute_field", {owner: owner_type, field: field_defn, path: next_path, query: query, object: object, arguments: kwarg_arguments}) do
-                    field_defn.resolve(object, kwarg_arguments, context)
-                  end
+                query.trace("execute_field", {owner: owner_type, field: field_defn, path: next_path, ast_node: ast_node, query: query, object: object, arguments: kwarg_arguments}) do
+                  field_defn.resolve(object, kwarg_arguments, context)
                 end
               rescue GraphQL::ExecutionError => err
                 err
+              rescue StandardError => err
+                begin
+                  query.handle_or_reraise(err)
+                rescue GraphQL::ExecutionError => ex_err
+                  ex_err
+                end
               end
-              after_lazy(app_result, owner: owner_type, field: field_defn, path: next_path, scoped_context: context.scoped_context, owner_object: object, arguments: kwarg_arguments) do |inner_result|
-                continue_value = continue_value(next_path, inner_result, field_defn, return_type.non_null?, ast_node)
+              after_lazy(app_result, owner: owner_type, field: field_defn, path: next_path, ast_node: ast_node, owner_object: object, arguments: resolved_arguments, result_name: result_name, result: selection_result) do |inner_result|
+                continue_value = continue_value(next_path, inner_result, owner_type, field_defn, return_type.non_null?, ast_node, result_name, selection_result)
                 if HALT != continue_value
-                  continue_field(next_path, continue_value, field_defn, return_type, ast_node, next_selections, false, object, kwarg_arguments)
+                  continue_field(next_path, continue_value, owner_type, field_defn, return_type, ast_node, next_selections, false, object, resolved_arguments, result_name, selection_result)
                 end
               end
             end
@@ -233,47 +530,144 @@ module GraphQL
             # If this field is a root mutation field, immediately resolve
             # all of its child fields before moving on to the next root mutation field.
             # (Subselections of this mutation will still be resolved level-by-level.)
-            if root_operation_type == "mutation"
-              Interpreter::Resolve.resolve_all([field_result])
+            if is_eager_field
+              Interpreter::Resolve.resolve_all([field_result], @dataloader)
             else
+              # Return this from `after_lazy` because it might be another lazy that needs to be resolved
               field_result
             end
           end
         end
 
+        def dead_result?(selection_result)
+          selection_result.graphql_dead || ((parent = selection_result.graphql_parent) && parent.graphql_dead)
+        end
+
+        def set_result(selection_result, result_name, value)
+          if !dead_result?(selection_result)
+            if value.nil? &&
+                ( # there are two conditions under which `nil` is not allowed in the response:
+                  (selection_result.graphql_non_null_list_items) || # this value would be written into a list that doesn't allow nils
+                  ((nn = selection_result.graphql_non_null_field_names) && nn.include?(result_name)) # this value would be written into a field that doesn't allow nils
+                )
+              # This is an invalid nil that should be propagated
+              # One caller of this method passes a block,
+              # namely when application code returns a `nil` to GraphQL and it doesn't belong there.
+              # The other possibility for reaching here is when a field returns an ExecutionError, so we write
+              # `nil` to the response, not knowing whether it's an invalid `nil` or not.
+              # (And in that case, we don't have to call the schema's handler, since it's not a bug in the application.)
+              # TODO the code is trying to tell me something.
+              yield if block_given?
+              parent = selection_result.graphql_parent
+              name_in_parent = selection_result.graphql_result_name
+              if parent.nil? # This is a top-level result hash
+                @response = nil
+              else
+                set_result(parent, name_in_parent, nil)
+                set_graphql_dead(selection_result)
+              end
+            else
+              selection_result[result_name] = value
+            end
+          end
+        end
+
+        # Mark this node and any already-registered children as dead,
+        # so that it accepts no more writes.
+        def set_graphql_dead(selection_result)
+          case selection_result
+          when GraphQLResultArray
+            selection_result.graphql_dead = true
+            selection_result.values.each { |v| set_graphql_dead(v) }
+          when GraphQLResultHash
+            selection_result.graphql_dead = true
+            selection_result.each { |k, v| set_graphql_dead(v) }
+          else
+            # It's a scalar, no way to mark it dead.
+          end
+        end
+
         HALT = Object.new
-        def continue_value(path, value, field, is_non_null, ast_node)
-          if value.nil?
+        def continue_value(path, value, parent_type, field, is_non_null, ast_node, result_name, selection_result) # rubocop:disable Metrics/ParameterLists
+          case value
+          when nil
             if is_non_null
-              err = GraphQL::InvalidNullError.new(field.owner, field, value)
-              write_invalid_null_in_response(path, err)
+              set_result(selection_result, result_name, nil) do
+                # This block is called if `result_name` is not dead. (Maybe a previous invalid nil caused it be marked dead.)
+                err = parent_type::InvalidNullError.new(parent_type, field, value)
+                schema.type_error(err, context)
+              end
             else
-              write_in_response(path, nil)
+              set_result(selection_result, result_name, nil)
             end
             HALT
-          elsif value.is_a?(GraphQL::ExecutionError)
-            value.path ||= path
-            value.ast_node ||= ast_node
-            write_execution_errors_in_response(path, [value])
-            HALT
-          elsif value.is_a?(Array) && value.any? && value.all? { |v| v.is_a?(GraphQL::ExecutionError) }
-            value.each_with_index do |error, index|
-              error.ast_node ||= ast_node
-              error.path ||= path + (field.type.list? ? [index] : [])
+          when GraphQL::Error
+            # Handle these cases inside a single `when`
+            # to avoid the overhead of checking three different classes
+            # every time.
+            if value.is_a?(GraphQL::ExecutionError)
+              if selection_result.nil? || !dead_result?(selection_result)
+                value.path ||= path
+                value.ast_node ||= ast_node
+                context.errors << value
+                if selection_result
+                  set_result(selection_result, result_name, nil)
+                end
+              end
+              HALT
+            elsif value.is_a?(GraphQL::UnauthorizedError)
+              # this hook might raise & crash, or it might return
+              # a replacement value
+              next_value = begin
+                schema.unauthorized_object(value)
+              rescue GraphQL::ExecutionError => err
+                err
+              end
+              continue_value(path, next_value, parent_type, field, is_non_null, ast_node, result_name, selection_result)
+            elsif GraphQL::Execution::SKIP == value
+              # It's possible a lazy was already written here
+              case selection_result
+              when GraphQLResultHash
+                selection_result.delete(result_name)
+              when GraphQLResultArray
+                selection_result.graphql_skip_at(result_name)
+              when nil
+                # this can happen with directives
+              else
+                raise "Invariant: unexpected result class #{selection_result.class} (#{selection_result.inspect})"
+              end
+              HALT
+            else
+              # What could this actually _be_? Anyhow,
+              # preserve the default behavior of doing nothing with it.
+              value
             end
-            write_execution_errors_in_response(path, value)
-            HALT
-          elsif value.is_a?(GraphQL::UnauthorizedError)
-            # this hook might raise & crash, or it might return
-            # a replacement value
-            next_value = begin
-              schema.unauthorized_object(value)
-            rescue GraphQL::ExecutionError => err
-              err
+          when Array
+            # It's an array full of execution errors; add them all.
+            if value.any? && value.all? { |v| v.is_a?(GraphQL::ExecutionError) }
+              list_type_at_all = (field && (field.type.list?))
+              if selection_result.nil? || !dead_result?(selection_result)
+                value.each_with_index do |error, index|
+                  error.ast_node ||= ast_node
+                  error.path ||= path + (list_type_at_all ? [index] : [])
+                  context.errors << error
+                end
+                if selection_result
+                  if list_type_at_all
+                    result_without_errors = value.map { |v| v.is_a?(GraphQL::ExecutionError) ? nil : v }
+                    set_result(selection_result, result_name, result_without_errors)
+                  else
+                    set_result(selection_result, result_name, nil)
+                  end
+                end
+              end
+              HALT
+            else
+              value
             end
-
-            continue_value(path, next_value, field, is_non_null, ast_node)
-          elsif GraphQL::Execution::Execute::SKIP == value
+          when GraphQL::Execution::Interpreter::RawValue
+            # Write raw value directly to the response without resolving nested objects
+            set_result(selection_result, result_name, value.resolve)
             HALT
           else
             value
@@ -288,93 +682,191 @@ module GraphQL
         # Location information from `path` and `ast_node`.
         #
         # @return [Lazy, Array, Hash, Object] Lazy, Array, and Hash are all traversed to resolve lazy values later
-        def continue_field(path, value, field, type, ast_node, next_selections, is_non_null, owner_object, arguments) # rubocop:disable Metrics/ParameterLists
-          case type.kind.name
+        def continue_field(path, value, owner_type, field, current_type, ast_node, next_selections, is_non_null, owner_object, arguments, result_name, selection_result) # rubocop:disable Metrics/ParameterLists
+          if current_type.non_null?
+            current_type = current_type.of_type
+            is_non_null = true
+          end
+
+          case current_type.kind.name
           when "SCALAR", "ENUM"
-            r = type.coerce_result(value, context)
-            write_in_response(path, r)
+            r = begin
+              current_type.coerce_result(value, context)
+            rescue StandardError => err
+              schema.handle_or_reraise(context, err)
+            end
+            set_result(selection_result, result_name, r)
             r
           when "UNION", "INTERFACE"
-            resolved_type_or_lazy = query.resolve_type(type, value)
-            after_lazy(resolved_type_or_lazy, owner: type, path: path, scoped_context: context.scoped_context, field: field, owner_object: owner_object, arguments: arguments) do |resolved_type|
-              possible_types = query.possible_types(type)
+            resolved_type_or_lazy = resolve_type(current_type, value, path)
+            after_lazy(resolved_type_or_lazy, owner: current_type, path: path, ast_node: ast_node, field: field, owner_object: owner_object, arguments: arguments, trace: false, result_name: result_name, result: selection_result) do |resolved_type_result|
+              if resolved_type_result.is_a?(Array) && resolved_type_result.length == 2
+                resolved_type, resolved_value = resolved_type_result
+              else
+                resolved_type = resolved_type_result
+                resolved_value = value
+              end
 
+              possible_types = query.possible_types(current_type)
               if !possible_types.include?(resolved_type)
-                parent_type = field.owner
-                type_error = GraphQL::UnresolvedTypeError.new(value, field, parent_type, resolved_type, possible_types)
+                parent_type = field.owner_type
+                err_class = current_type::UnresolvedTypeError
+                type_error = err_class.new(resolved_value, field, parent_type, resolved_type, possible_types)
                 schema.type_error(type_error, context)
-                write_in_response(path, nil)
+                set_result(selection_result, result_name, nil)
                 nil
               else
-                resolved_type = resolved_type.metadata[:type_class]
-                continue_field(path, value, field, resolved_type, ast_node, next_selections, is_non_null, owner_object, arguments)
+                continue_field(path, resolved_value, owner_type, field, resolved_type, ast_node, next_selections, is_non_null, owner_object, arguments, result_name, selection_result)
               end
             end
           when "OBJECT"
             object_proxy = begin
-              type.authorized_new(value, context)
+              authorized_new(current_type, value, context)
             rescue GraphQL::ExecutionError => err
               err
             end
-            after_lazy(object_proxy, owner: type, path: path, scoped_context: context.scoped_context, field: field, owner_object: owner_object, arguments: arguments) do |inner_object|
-              continue_value = continue_value(path, inner_object, field, is_non_null, ast_node)
+            after_lazy(object_proxy, owner: current_type, path: path, ast_node: ast_node, field: field, owner_object: owner_object, arguments: arguments, trace: false, result_name: result_name, result: selection_result) do |inner_object|
+              continue_value = continue_value(path, inner_object, owner_type, field, is_non_null, ast_node, result_name, selection_result)
               if HALT != continue_value
-                response_hash = {}
-                write_in_response(path, response_hash)
-                evaluate_selections(path, context.scoped_context, continue_value, type, next_selections)
-                response_hash
+                response_hash = GraphQLResultHash.new(result_name, selection_result)
+                set_result(selection_result, result_name, response_hash)
+                gathered_selections = gather_selections(continue_value, current_type, next_selections)
+                # There are two possibilities for `gathered_selections`:
+                # 1. All selections of this object should be evaluated together (there are no runtime directives modifying execution).
+                #    This case is handled below, and the result can be written right into the main `response_hash` above.
+                #    In this case, `gathered_selections` is a hash of selections.
+                # 2. Some selections of this object have runtime directives that may or may not modify execution.
+                #    That part of the selection is evaluated in an isolated way, writing into a sub-response object which is
+                #    eventually merged into the final response. In this case, `gathered_selections` is an array of things to run in isolation.
+                #    (Technically, it's possible that one of those entries _doesn't_ require isolation.)
+                tap_or_each(gathered_selections) do |selections, is_selection_array|
+                  if is_selection_array
+                    this_result = GraphQLResultHash.new(result_name, selection_result)
+                    final_result = response_hash
+                  else
+                    this_result = response_hash
+                    final_result = nil
+                  end
+                  set_all_interpreter_context(continue_value, nil, nil, path) # reset this mutable state
+                  call_method_on_directives(:resolve, continue_value, selections.graphql_directives) do
+                    evaluate_selections(
+                      path,
+                      continue_value,
+                      current_type,
+                      false,
+                      selections,
+                      this_result,
+                      final_result,
+                      owner_object.object,
+                    )
+                    this_result
+                  end
+                end
               end
             end
           when "LIST"
-            response_list = []
-            write_in_response(path, response_list)
-            inner_type = type.of_type
+            inner_type = current_type.of_type
+            # This is true for objects, unions, and interfaces
+            use_dataloader_job = !inner_type.unwrap.kind.input?
+            response_list = GraphQLResultArray.new(result_name, selection_result)
+            response_list.graphql_non_null_list_items = inner_type.non_null?
+            set_result(selection_result, result_name, response_list)
+            result_was_set = false
             idx = 0
-            scoped_context = context.scoped_context
-            value.each do |inner_value|
-              next_path = path.dup
-              next_path << idx
-              next_path.freeze
-              idx += 1
-              set_type_at_path(next_path, inner_type)
-              # This will update `response_list` with the lazy
-              after_lazy(inner_value, owner: inner_type, path: next_path, scoped_context: scoped_context, field: field, owner_object: owner_object, arguments: arguments) do |inner_inner_value|
-                # reset `is_non_null` here and below, because the inner type will have its own nullability constraint
-                continue_value = continue_value(next_path, inner_inner_value, field, false, ast_node)
-                if HALT != continue_value
-                  continue_field(next_path, continue_value, field, inner_type, ast_node, next_selections, false, owner_object, arguments)
+            list_value = begin
+              value.each do |inner_value|
+                break if dead_result?(response_list)
+                if !result_was_set
+                  # Don't set the result unless `.each` is successful
+                  set_result(selection_result, result_name, response_list)
+                  result_was_set = true
                 end
+                next_path = path + [idx]
+                this_idx = idx
+                next_path.freeze
+                idx += 1
+                if use_dataloader_job
+                  @dataloader.append_job do
+                    resolve_list_item(inner_value, inner_type, next_path, ast_node, field, owner_object, arguments, this_idx, response_list, next_selections, owner_type)
+                  end
+                else
+                  resolve_list_item(inner_value, inner_type, next_path, ast_node, field, owner_object, arguments, this_idx, response_list, next_selections, owner_type)
+                end
+              end
+              # Maybe the list was empty and the block was never called.
+              if !result_was_set
+                set_result(selection_result, result_name, response_list)
+                result_was_set = true
+              end
+
+              response_list
+            rescue NoMethodError => err
+              # Ruby 2.2 doesn't have NoMethodError#receiver, can't check that one in this case. (It's been EOL since 2017.)
+              if err.name == :each && (err.respond_to?(:receiver) ? err.receiver == value : true)
+                # This happens when the GraphQL schema doesn't match the implementation. Help the dev debug.
+                raise ListResultFailedError.new(value: value, field: field, path: path)
+              else
+                # This was some other NoMethodError -- let it bubble to reveal the real error.
+                raise
+              end
+            rescue GraphQL::ExecutionError, GraphQL::UnauthorizedError => ex_err
+              ex_err
+            rescue StandardError => err
+              begin
+                query.handle_or_reraise(err)
+              rescue GraphQL::ExecutionError => ex_err
+                ex_err
               end
             end
-            response_list
-          when "NON_NULL"
-            inner_type = type.of_type
-            # For fields like `__schema: __Schema!`
-            inner_type = resolve_if_late_bound_type(inner_type)
-            # Don't `set_type_at_path` because we want the static type,
-            # we're going to use that to determine whether a `nil` should be propagated or not.
-            continue_field(path, value, field, inner_type, ast_node, next_selections, true, owner_object, arguments)
+
+            continue_value(path, list_value, owner_type, field, inner_type.non_null?, ast_node, result_name, selection_result)
           else
-            raise "Invariant: Unhandled type kind #{type.kind} (#{type})"
+            raise "Invariant: Unhandled type kind #{current_type.kind} (#{current_type})"
           end
         end
 
-        def resolve_with_directives(object, ast_node)
-          run_directive(object, ast_node, 0) { yield }
+        def resolve_list_item(inner_value, inner_type, next_path, ast_node, field, owner_object, arguments, this_idx, response_list, next_selections, owner_type) # rubocop:disable Metrics/ParameterLists
+          set_all_interpreter_context(nil, nil, nil, next_path)
+          call_method_on_directives(:resolve_each, owner_object, ast_node.directives) do
+            # This will update `response_list` with the lazy
+            after_lazy(inner_value, owner: inner_type, path: next_path, ast_node: ast_node, field: field, owner_object: owner_object, arguments: arguments, result_name: this_idx, result: response_list) do |inner_inner_value|
+              continue_value = continue_value(next_path, inner_inner_value, owner_type, field, inner_type.non_null?, ast_node, this_idx, response_list)
+              if HALT != continue_value
+                continue_field(next_path, continue_value, owner_type, field, inner_type, ast_node, next_selections, false, owner_object, arguments, this_idx, response_list)
+              end
+            end
+          end
+        end
+
+        def call_method_on_directives(method_name, object, directives, &block)
+          return yield if directives.nil? || directives.empty?
+          run_directive(method_name, object, directives, 0, &block)
         end
 
-        def run_directive(object, ast_node, idx)
-          dir_node = ast_node.directives[idx]
+        def run_directive(method_name, object, directives, idx, &block)
+          dir_node = directives[idx]
           if !dir_node
             yield
           else
-            dir_defn = schema.directives.fetch(dir_node.name)
-            if !dir_defn.is_a?(Class)
-              dir_defn = dir_defn.metadata[:type_class] || raise("Only class-based directives are supported (not `@#{dir_node.name}`)")
-            end
-            dir_args = arguments(nil, dir_defn, dir_node)
-            dir_defn.resolve(object, dir_args, context) do
-              run_directive(object, ast_node, idx + 1) { yield }
+            dir_defn = @schema_directives.fetch(dir_node.name)
+            raw_dir_args = arguments(nil, dir_defn, dir_node)
+            dir_args = continue_value(
+              @context[:current_path], # path
+              raw_dir_args, # value
+              dir_defn, # parent_type
+              nil, # field
+              false, # is_non_null
+              dir_node, # ast_node
+              nil, # result_name
+              nil, # selection_result
+            )
+
+            if dir_args == HALT
+              nil
+            else
+              dir_defn.public_send(method_name, object, dir_args, context) do
+                run_directive(method_name, object, directives, idx + 1, &block)
+              end
             end
           end
         end
@@ -382,7 +874,7 @@ module GraphQL
         # Check {Schema::Directive.include?} for each directive that's present
         def directives_include?(node, graphql_object, parent_type)
           node.directives.each do |dir_node|
-            dir_defn = schema.directives.fetch(dir_node.name).metadata[:type_class] || raise("Only class-based directives are supported (not #{dir_node.name.inspect})")
+            dir_defn = @schema_directives.fetch(dir_node.name)
             args = arguments(graphql_object, dir_defn, dir_node)
             if !dir_defn.include?(graphql_object, args, context)
               return false
@@ -391,11 +883,19 @@ module GraphQL
           true
         end
 
-        def resolve_if_late_bound_type(type)
-          if type.is_a?(GraphQL::Schema::LateBoundType)
-            query.warden.get_type(type.name).metadata[:type_class]
-          else
-            type
+        def set_all_interpreter_context(object, field, arguments, path)
+          ti = thread_info
+          if object
+            ti[:current_object] = object
+          end
+          if field
+            ti[:current_field] = field
+          end
+          if arguments
+            ti[:current_arguments] = arguments
+          end
+          if path
+            ti[:current_path] = path
           end
         end
 
@@ -403,230 +903,90 @@ module GraphQL
         # @param path [Array<String>]
         # @param field [GraphQL::Schema::Field]
         # @param eager [Boolean] Set to `true` for mutation root fields only
+        # @param trace [Boolean] If `false`, don't wrap this with field tracing
         # @return [GraphQL::Execution::Lazy, Object] If loading `object` will be deferred, it's a wrapper over it.
-        def after_lazy(lazy_obj, owner:, field:, path:, scoped_context:, owner_object:, arguments:, eager: false)
-          @interpreter_context[:current_object] = owner_object
-          @interpreter_context[:current_arguments] = arguments
-          @interpreter_context[:current_path] = path
-          @interpreter_context[:current_field] = field
-          if schema.lazy?(lazy_obj)
+        def after_lazy(lazy_obj, owner:, field:, path:, owner_object:, arguments:, ast_node:, result:, result_name:, eager: false, trace: true, &block)
+          if lazy?(lazy_obj)
             lazy = GraphQL::Execution::Lazy.new(path: path, field: field) do
-              @interpreter_context[:current_path] = path
-              @interpreter_context[:current_field] = field
-              @interpreter_context[:current_object] = owner_object
-              @interpreter_context[:current_arguments] = arguments
-              context.scoped_context = scoped_context
+              set_all_interpreter_context(owner_object, field, arguments, path)
               # Wrap the execution of _this_ method with tracing,
               # but don't wrap the continuation below
               inner_obj = begin
-                query.with_error_handling do
-                  query.trace("execute_field_lazy", {owner: owner, field: field, path: path, query: query, object: owner_object, arguments: arguments}) do
+                if trace
+                  query.trace("execute_field_lazy", {owner: owner, field: field, path: path, query: query, object: owner_object, arguments: arguments, ast_node: ast_node}) do
                     schema.sync_lazy(lazy_obj)
                   end
+                else
+                  schema.sync_lazy(lazy_obj)
+                end
+              rescue GraphQL::ExecutionError, GraphQL::UnauthorizedError => ex_err
+                ex_err
+              rescue StandardError => err
+                begin
+                  query.handle_or_reraise(err)
+                rescue GraphQL::ExecutionError => ex_err
+                  ex_err
                 end
-                rescue GraphQL::ExecutionError, GraphQL::UnauthorizedError => err
-                  yield(err)
-              end
-              after_lazy(inner_obj, owner: owner, field: field, path: path, scoped_context: context.scoped_context, owner_object: owner_object, arguments: arguments, eager: eager) do |really_inner_obj|
-                yield(really_inner_obj)
               end
+              yield(inner_obj)
             end
 
             if eager
               lazy.value
             else
-              write_in_response(path, lazy)
+              set_result(result, result_name, lazy)
               lazy
             end
           else
+            set_all_interpreter_context(owner_object, field, arguments, path)
             yield(lazy_obj)
           end
         end
 
-        def each_argument_pair(ast_args_or_hash)
-          case ast_args_or_hash
-          when GraphQL::Language::Nodes::Field, GraphQL::Language::Nodes::InputObject, GraphQL::Language::Nodes::Directive
-            ast_args_or_hash.arguments.each do |arg|
-              yield(arg.name, arg.value)
-            end
-          when Hash
-            ast_args_or_hash.each do |key, value|
-              normalized_name = GraphQL::Schema::Member::BuildType.camelize(key.to_s)
-              yield(normalized_name, value)
-            end
+        def arguments(graphql_object, arg_owner, ast_node)
+          if arg_owner.arguments_statically_coercible?
+            query.arguments_for(ast_node, arg_owner)
           else
-            raise "Invariant, unexpected #{ast_args_or_hash.inspect}"
-          end
-        end
-
-        def arguments(graphql_object, arg_owner, ast_node_or_hash)
-          kwarg_arguments = {}
-          arg_defns = arg_owner.arguments
-          each_argument_pair(ast_node_or_hash) do |arg_name, arg_value|
-            arg_defn = arg_defns[arg_name]
-            # Need to distinguish between client-provided `nil`
-            # and nothing-at-all
-            is_present, value = arg_to_value(graphql_object, arg_defn.type, arg_value)
-            if is_present
-              # This doesn't apply to directives, which are legacy
-              # Can remove this when Skip and Include use classes or something.
-              if graphql_object
-                value = arg_defn.prepare_value(graphql_object, value)
-              end
-              kwarg_arguments[arg_defn.keyword] = value
-            end
-          end
-          arg_defns.each do |name, arg_defn|
-            if arg_defn.default_value? && !kwarg_arguments.key?(arg_defn.keyword)
-              _is_present, value = arg_to_value(graphql_object, arg_defn.type, arg_defn.default_value)
-              kwarg_arguments[arg_defn.keyword] = value
-            end
+            # The arguments must be prepared in the context of the given object
+            query.arguments_for(ast_node, arg_owner, parent_object: graphql_object)
           end
-          kwarg_arguments
         end
 
-        # Get a Ruby-ready value from a client query.
-        # @param graphql_object [Object] The owner of the field whose argument this is
-        # @param arg_type [Class, GraphQL::Schema::NonNull, GraphQL::Schema::List]
-        # @param ast_value [GraphQL::Language::Nodes::VariableIdentifier, String, Integer, Float, Boolean]
-        # @return [Array(is_present, value)]
-        def arg_to_value(graphql_object, arg_type, ast_value)
-          if ast_value.is_a?(GraphQL::Language::Nodes::VariableIdentifier)
-            # If it's not here, it will get added later
-            if query.variables.key?(ast_value.name)
-              return true, query.variables[ast_value.name]
-            else
-              return false, nil
-            end
-          elsif ast_value.is_a?(GraphQL::Language::Nodes::NullValue)
-            return true, nil
-          elsif arg_type.is_a?(GraphQL::Schema::NonNull)
-            arg_to_value(graphql_object, arg_type.of_type, ast_value)
-          elsif arg_type.is_a?(GraphQL::Schema::List)
-            # Treat a single value like a list
-            arg_value = Array(ast_value)
-            list = []
-            arg_value.map do |inner_v|
-              _present, value = arg_to_value(graphql_object, arg_type.of_type, inner_v)
-              list << value
-            end
-            return true, list
-          elsif arg_type.is_a?(Class) && arg_type < GraphQL::Schema::InputObject
-            # For these, `prepare` is applied during `#initialize`.
-            # Pass `nil` so it will be skipped in `#arguments`.
-            # What a mess.
-            args = arguments(nil, arg_type, ast_value)
-            # We're not tracking defaults_used, but for our purposes
-            # we compare the value to the default value.
-
-            input_obj = query.with_error_handling do
-              arg_type.new(ruby_kwargs: args, context: context, defaults_used: nil)
-            end
-            return true, input_obj
-          else
-            flat_value = flatten_ast_value(ast_value)
-            return true, arg_type.coerce_input(flat_value, context)
-          end
+        # Set this pair in the Query context, but also in the interpeter namespace,
+        # for compatibility.
+        def set_interpreter_context(key, value)
+          thread_info[key] = value
         end
 
-        def flatten_ast_value(v)
-          case v
-          when GraphQL::Language::Nodes::Enum
-            v.name
-          when GraphQL::Language::Nodes::InputObject
-            h = {}
-            v.arguments.each do |arg|
-              h[arg.name] = flatten_ast_value(arg.value)
-            end
-            h
-          when Array
-            v.map { |v2| flatten_ast_value(v2) }
-          when GraphQL::Language::Nodes::VariableIdentifier
-            flatten_ast_value(query.variables[v.name])
-          else
-            v
-          end
+        def delete_interpreter_context(key)
+          (ti = thread_info) && ti.delete(key)
         end
 
-        def write_invalid_null_in_response(path, invalid_null_error)
-          if !dead_path?(path)
-            schema.type_error(invalid_null_error, context)
-            write_in_response(path, nil)
-            add_dead_path(path)
+        def resolve_type(type, value, path)
+          trace_payload = { context: context, type: type, object: value, path: path }
+          resolved_type, resolved_value = query.trace("resolve_type", trace_payload) do
+            query.resolve_type(type, value)
           end
-        end
 
-        def write_execution_errors_in_response(path, errors)
-          if !dead_path?(path)
-            errors.each do |v|
-              context.errors << v
+          if lazy?(resolved_type)
+            GraphQL::Execution::Lazy.new do
+              query.trace("resolve_type_lazy", trace_payload) do
+                schema.sync_lazy(resolved_type)
+              end
             end
-            write_in_response(path, nil)
-            add_dead_path(path)
-          end
-        end
-
-        def write_in_response(path, value)
-          if dead_path?(path)
-            return
           else
-            if value.nil? && path.any? && type_at(path).non_null?
-              # This nil is invalid, try writing it at the previous spot
-              propagate_path = path[0..-2]
-              write_in_response(propagate_path, value)
-              add_dead_path(propagate_path)
-            else
-              @response.write(path, value)
-            end
+            [resolved_type, resolved_value]
           end
         end
 
-        # To propagate nulls, we have to know what the field type was
-        # at previous parts of the response.
-        # This hash matches the response
-        def type_at(path)
-          t = @types_at_paths
-          path.each do |part|
-            t = t[part] || (raise("Invariant: #{part.inspect} not found in #{t}"))
-          end
-          t = t[:__type]
-          t
+        def authorized_new(type, value, context)
+          type.authorized_new(value, context)
         end
 
-        def set_type_at_path(path, type)
-          types = @types_at_paths
-          path.each do |part|
-            types = types[part] ||= {}
-          end
-          # Use this magic key so that the hash contains:
-          # - string keys for nested fields
-          # - :__type for the object type of a selection
-          types[:__type] ||= type
-          nil
-        end
-
-        # Mark `path` as having been permanently nulled out.
-        # No values will be added beyond that path.
-        def add_dead_path(path)
-          dead = @dead_paths
-          path.each do |part|
-            dead = dead[part] ||= {}
-          end
-          dead[:__dead] = true
-        end
-
-        def dead_path?(path)
-          res = @dead_paths
-          path.each do |part|
-            if res
-              if res[:__dead]
-                break
-              else
-                res = res[part]
-              end
-            end
-          end
-          res && res[:__dead]
+        def lazy?(object)
+          @lazy_cache.fetch(object.class) {
+            @lazy_cache[object.class] = @schema.lazy?(object)
+          }
         end
       end
     end