graphql 1.11.7 → 1.12.4

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

@@ -6,17 +6,21 @@ module GraphQL
       class ArgumentsCache
         def initialize(query)
           @query = query
+          @dataloader = query.context.dataloader
           @storage = Hash.new do |h, ast_node|
             h[ast_node] = Hash.new do |h2, arg_owner|
               h2[arg_owner] = Hash.new do |h3, parent_object|
-                # First, normalize all AST or Ruby values to a plain Ruby hash
-                args_hash = prepare_args_hash(ast_node)
-                # Then call into the schema to coerce those incoming values
-                args = arg_owner.coerce_arguments(parent_object, args_hash, query.context)
+                dataload_for(ast_node, arg_owner, parent_object) do |kwarg_arguments|
+                  h3[parent_object] = @query.schema.after_lazy(kwarg_arguments) do |resolved_args|
+                    h3[parent_object] = resolved_args
+                  end
+                end
 
-                h3[parent_object] = @query.schema.after_lazy(args) do |resolved_args|
-                  # when this promise is resolved, update the cache with the resolved value
-                  h3[parent_object] = resolved_args
+                if !h3.key?(parent_object)
+                  # TODO should i bother putting anything here?
+                  h3[parent_object] = NO_ARGUMENTS
+                else
+                  h3[parent_object]
                 end
               end
             end
@@ -25,6 +29,25 @@ module GraphQL
 
         def fetch(ast_node, argument_owner, parent_object)
           @storage[ast_node][argument_owner][parent_object]
+          # If any jobs were enqueued, run them now,
+          # since this might have been called outside of execution.
+          # (The jobs are responsible for updating `result` in-place.)
+          @dataloader.run
+          # Ack, the _hash_ is updated, but the key is eventually
+          # overridden with an immutable arguments instance.
+          # The first call queues up the job,
+          # then this call fetches the result.
+          # TODO this should be better, find a solution
+          # that works with merging the runtime.rb code
+          @storage[ast_node][argument_owner][parent_object]
+        end
+
+        # @yield [Interpreter::Arguments, Lazy<Interpreter::Arguments>] The finally-loaded arguments
+        def dataload_for(ast_node, argument_owner, parent_object, &block)
+          # First, normalize all AST or Ruby values to a plain Ruby hash
+          args_hash = self.class.prepare_args_hash(@query, ast_node)
+          argument_owner.coerce_arguments(parent_object, args_hash, @query.context, &block)
+          nil
         end
 
         private
@@ -33,7 +56,7 @@ module GraphQL
 
         NO_VALUE_GIVEN = Object.new
 
-        def prepare_args_hash(ast_arg_or_hash_or_value)
+        def self.prepare_args_hash(query, ast_arg_or_hash_or_value)
           case ast_arg_or_hash_or_value
           when Hash
             if ast_arg_or_hash_or_value.empty?
@@ -41,27 +64,27 @@ module GraphQL
             end
             args_hash = {}
             ast_arg_or_hash_or_value.each do |k, v|
-              args_hash[k] = prepare_args_hash(v)
+              args_hash[k] = prepare_args_hash(query, v)
             end
             args_hash
           when Array
-            ast_arg_or_hash_or_value.map { |v| prepare_args_hash(v) }
+            ast_arg_or_hash_or_value.map { |v| prepare_args_hash(query, v) }
           when GraphQL::Language::Nodes::Field, GraphQL::Language::Nodes::InputObject, GraphQL::Language::Nodes::Directive
             if ast_arg_or_hash_or_value.arguments.empty?
               return NO_ARGUMENTS
             end
             args_hash = {}
             ast_arg_or_hash_or_value.arguments.each do |arg|
-              v = prepare_args_hash(arg.value)
+              v = prepare_args_hash(query, arg.value)
               if v != NO_VALUE_GIVEN
                 args_hash[arg.name] = v
               end
             end
             args_hash
           when GraphQL::Language::Nodes::VariableIdentifier
-            if @query.variables.key?(ast_arg_or_hash_or_value.name)
-              variable_value = @query.variables[ast_arg_or_hash_or_value.name]
-              prepare_args_hash(variable_value)
+            if query.variables.key?(ast_arg_or_hash_or_value.name)
+              variable_value = query.variables[ast_arg_or_hash_or_value.name]
+              prepare_args_hash(query, variable_value)
             else
               NO_VALUE_GIVEN
             end

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

@@ -13,13 +13,6 @@ module GraphQL
           @object
         end
       end
-
-      # Allows to return "raw" value from the resolver
-      module HandlesRawValue
-        def raw_value(obj)
-          RawValue.new(obj)
-        end
-      end
     end
   end
 end

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

@@ -6,10 +6,9 @@ module GraphQL
       module Resolve
         # Continue field results in `results` until there's nothing else to continue.
         # @return [void]
-        def self.resolve_all(results)
-          while results.any?
-            results = resolve(results)
-          end
+        def self.resolve_all(results, dataloader)
+          dataloader.append_job { resolve(results, dataloader) }
+          nil
         end
 
         # After getting `results` back from an interpreter evaluation,
@@ -24,33 +23,42 @@ module GraphQL
         # return {Lazy} instances if there's more work to be done,
         # or return {Hash}/{Array} if the query should be continued.
         #
-        # @param results [Array]
-        # @return [Array] Same size, filled with finished values
-        def self.resolve(results)
+        # @return [void]
+        def self.resolve(results, dataloader)
+          # There might be pending jobs here that _will_ write lazies
+          # into the result hash. We should run them out, so we
+          # can be sure that all lazies will be present in the result hashes.
+          # A better implementation would somehow interleave (or unify)
+          # these approaches.
+          dataloader.run
           next_results = []
-
-          # Work through the queue until it's empty
-          while results.size > 0
+          while results.any?
             result_value = results.shift
-
-            if result_value.is_a?(Lazy)
-              result_value = result_value.value
-            end
-
-            if result_value.is_a?(Lazy)
-              # Since this field returned another lazy,
-              # add it to the same queue
-              results << result_value
-            elsif result_value.is_a?(Hash)
-              # This is part of the next level, add it
-              next_results.concat(result_value.values)
+            if result_value.is_a?(Hash)
+              results.concat(result_value.values)
+              next
             elsif result_value.is_a?(Array)
-              # This is part of the next level, add it
-              next_results.concat(result_value)
+              results.concat(result_value)
+              next
+            elsif result_value.is_a?(Lazy)
+              loaded_value = result_value.value
+              if loaded_value.is_a?(Lazy)
+                # Since this field returned another lazy,
+                # add it to the same queue
+                results << loaded_value
+              elsif loaded_value.is_a?(Hash) || loaded_value.is_a?(Array)
+                # Add these values in wholesale --
+                # they might be modified by later work in the dataloader.
+                next_results << loaded_value
+              end
             end
           end
 
-          next_results
+          if next_results.any?
+            dataloader.append_job { resolve(next_results, dataloader) }
+          end
+
+          nil
         end
       end
     end

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

@@ -19,8 +19,10 @@ module GraphQL
 
         def initialize(query:, response:)
           @query = query
+          @dataloader = query.multiplex.dataloader
           @schema = query.schema
           @context = query.context
+          @multiplex_context = query.multiplex.context
           @interpreter_context = @context.namespace(:interpreter)
           @response = response
           @dead_paths = {}
@@ -54,7 +56,18 @@ module GraphQL
             # Root .authorized? returned false.
             write_in_response(path, nil)
           else
-            evaluate_selections(path, context.scoped_context, object_proxy, root_type, root_operation.selections, root_operation_type: root_op_type)
+            gathered_selections = gather_selections(object_proxy, root_type, root_operation.selections)
+            # Make the first fiber which will begin execution
+            @dataloader.append_job {
+              evaluate_selections(
+                path,
+                context.scoped_context,
+                object_proxy,
+                root_type,
+                root_op_type == "mutation",
+                gathered_selections,
+              )
+            }
           end
           delete_interpreter_context(:current_path)
           delete_interpreter_context(:current_field)
@@ -63,7 +76,7 @@ module GraphQL
           nil
         end
 
-        def gather_selections(owner_object, owner_type, selections, selections_by_name)
+        def gather_selections(owner_object, owner_type, selections, selections_by_name = {})
           selections.each do |node|
             # Skip gathering this if the directive says so
             if !directives_include?(node, owner_object, owner_type)
@@ -115,144 +128,172 @@ module GraphQL
               raise "Invariant: unexpected selection class: #{node.class}"
             end
           end
+          selections_by_name
         end
 
         NO_ARGS = {}.freeze
 
-        def evaluate_selections(path, scoped_context, owner_object, owner_type, selections, root_operation_type: nil)
+        # @return [void]
+        def evaluate_selections(path, scoped_context, owner_object, owner_type, is_eager_selection, gathered_selections)
           set_all_interpreter_context(owner_object, nil, nil, 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
+
+          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, scoped_context, owner_object, owner_type, is_eager_selection
+              )
+            }
+          end
+
+          nil
+        end
+
+        attr_reader :progress_path
+
+        # @return [void]
+        def evaluate_selection(path, result_name, field_ast_nodes_or_ast_node, scoped_context, owner_object, owner_type, is_eager_field)
+          # 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 && (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
-              field_ast_nodes = nil
-              ast_node = field_ast_nodes_or_ast_node
+              raise "Invariant: no field for #{owner_type}.#{field_name}"
             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 && (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
+          end
+          return_type = field_defn.type
 
-            next_path = path.dup
-            next_path << result_name
-            next_path.freeze
+          next_path = path.dup
+          next_path << result_name
+          next_path.freeze
 
-            # 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
-            set_all_interpreter_context(nil, field_defn, nil, next_path)
+          # 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
+          set_all_interpreter_context(nil, field_defn, nil, next_path)
 
-            context.scoped_context = scoped_context
-            object = owner_object
+          context.scoped_context = scoped_context
+          object = owner_object
 
-            if is_introspection
-              object = authorized_new(field_defn.owner, object, context, next_path)
+          if is_introspection
+            object = authorized_new(field_defn.owner, object, context, next_path)
+          end
+
+          total_args_count = field_defn.arguments.size
+          if total_args_count == 0
+            kwarg_arguments = GraphQL::Execution::Interpreter::Arguments::EMPTY
+            evaluate_selection_with_args(kwarg_arguments, field_defn, next_path, ast_node, field_ast_nodes, scoped_context, owner_type, object, is_eager_field)
+          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, scoped_context, owner_type, object, is_eager_field)
             end
+          end
+        end
 
-            begin
-              kwarg_arguments = arguments(object, field_defn, ast_node)
-            rescue GraphQL::ExecutionError, GraphQL::UnauthorizedError => e
-              continue_value(next_path, e, owner_type, field_defn, return_type.non_null?, ast_node)
+        def evaluate_selection_with_args(kwarg_arguments, field_defn, next_path, ast_node, field_ast_nodes, scoped_context, owner_type, object, is_eager_field)  # rubocop:disable Metrics/ParameterLists
+          context.scoped_context = scoped_context
+          return_type = field_defn.type
+          after_lazy(kwarg_arguments, owner: owner_type, field: field_defn, path: next_path, ast_node: ast_node, scoped_context: context.scoped_context, owner_object: object, arguments: kwarg_arguments) 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)
               next
             end
 
-            after_lazy(kwarg_arguments, owner: owner_type, field: field_defn, path: next_path, scoped_context: context.scoped_context, owner_object: object, arguments: kwarg_arguments) do |resolved_arguments|
-              case resolved_arguments
-              when GraphQL::ExecutionError, GraphQL::UnauthorizedError
-                continue_value(next_path, resolved_arguments, owner_type, field_defn, return_type.non_null?, ast_node)
-                next
-              end
-
-              if resolved_arguments.empty? && field_defn.extras.empty?
-                # We can avoid allocating the `{ Symbol => Object }` hash in this case
-                kwarg_arguments = NO_ARGS
-              else
-                kwarg_arguments = resolved_arguments.keyword_arguments
-
-                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]
-                    end
-                    kwarg_arguments[:lookahead] = Execution::Lookahead.new(
-                      query: query,
-                      ast_nodes: field_ast_nodes,
-                      field: field_defn,
-                    )
-                  when :argument_details
-                    kwarg_arguments[:argument_details] = resolved_arguments
-                  else
-                    kwarg_arguments[extra] = field_defn.fetch_extra(extra, context)
+            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
+                else
+                  extra_args[extra] = field_defn.fetch_extra(extra, context)
                 end
               end
+              resolved_arguments = resolved_arguments.merge_extras(extra_args)
+              resolved_arguments.keyword_arguments
+            end
 
-              set_all_interpreter_context(nil, nil, kwarg_arguments, nil)
+            set_all_interpreter_context(nil, nil, kwarg_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
-              else
-                next_selections = []
-                field_ast_nodes.each { |f| next_selections.concat(f.selections) }
-              end
+            # 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
+            else
+              next_selections = []
+              field_ast_nodes.each { |f| next_selections.concat(f.selections) }
+            end
 
-              field_result = resolve_with_directives(object, ast_node) 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
+            field_result = resolve_with_directives(object, ast_node) 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, 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
                 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, owner_type, field_defn, return_type.non_null?, ast_node)
-                  if RawValue === continue_value
-                    # Write raw value directly to the response without resolving nested objects
-                    write_in_response(next_path, continue_value.resolve)
-                  elsif HALT != continue_value
-                    continue_field(next_path, continue_value, owner_type, field_defn, return_type, ast_node, next_selections, false, object, kwarg_arguments)
-                  end
+              rescue GraphQL::ExecutionError => err
+                err
+              end
+              after_lazy(app_result, owner: owner_type, field: field_defn, path: next_path, ast_node: ast_node, scoped_context: context.scoped_context, owner_object: object, arguments: kwarg_arguments) do |inner_result|
+                continue_value = continue_value(next_path, inner_result, owner_type, field_defn, return_type.non_null?, ast_node)
+                if RawValue === continue_value
+                  # Write raw value directly to the response without resolving nested objects
+                  write_in_response(next_path, continue_value.resolve)
+                elsif HALT != continue_value
+                  continue_field(next_path, continue_value, owner_type, field_defn, return_type, ast_node, next_selections, false, object, kwarg_arguments)
                 end
               end
+            end
 
-              # 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])
-              else
-                field_result
-              end
+            # 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 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
@@ -314,7 +355,7 @@ module GraphQL
             resolved_type_or_lazy, resolved_value = resolve_type(current_type, value, path)
             resolved_value ||= value
 
-            after_lazy(resolved_type_or_lazy, owner: current_type, path: path, scoped_context: context.scoped_context, field: field, owner_object: owner_object, arguments: arguments, trace: false) do |resolved_type|
+            after_lazy(resolved_type_or_lazy, owner: current_type, path: path, ast_node: ast_node, scoped_context: context.scoped_context, field: field, owner_object: owner_object, arguments: arguments, trace: false) do |resolved_type|
               possible_types = query.possible_types(current_type)
 
               if !possible_types.include?(resolved_type)
@@ -334,12 +375,13 @@ module GraphQL
             rescue GraphQL::ExecutionError => err
               err
             end
-            after_lazy(object_proxy, owner: current_type, path: path, scoped_context: context.scoped_context, field: field, owner_object: owner_object, arguments: arguments, trace: false) do |inner_object|
+            after_lazy(object_proxy, owner: current_type, path: path, ast_node: ast_node, scoped_context: context.scoped_context, field: field, owner_object: owner_object, arguments: arguments, trace: false) do |inner_object|
               continue_value = continue_value(path, inner_object, owner_type, field, is_non_null, ast_node)
               if HALT != continue_value
                 response_hash = {}
                 write_in_response(path, response_hash)
-                evaluate_selections(path, context.scoped_context, continue_value, current_type, next_selections)
+                gathered_selections = gather_selections(continue_value, current_type, next_selections)
+                evaluate_selections(path, context.scoped_context, continue_value, current_type, false, gathered_selections)
                 response_hash
               end
             end
@@ -357,7 +399,7 @@ module GraphQL
                 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|
+                after_lazy(inner_value, owner: inner_type, path: next_path, ast_node: ast_node, scoped_context: scoped_context, field: field, owner_object: owner_object, arguments: arguments) do |inner_inner_value|
                   continue_value = continue_value(next_path, inner_inner_value, owner_type, field, inner_type.non_null?, ast_node)
                   if HALT != continue_value
                     continue_field(next_path, continue_value, owner_type, field, inner_type, ast_node, next_selections, false, owner_object, arguments)
@@ -440,7 +482,7 @@ module GraphQL
         # @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, trace: true, &block)
+        def after_lazy(lazy_obj, owner:, field:, path:, scoped_context:, owner_object:, arguments:, ast_node:, eager: false, trace: true, &block)
           set_all_interpreter_context(owner_object, field, arguments, path)
           if schema.lazy?(lazy_obj)
             lazy = GraphQL::Execution::Lazy.new(path: path, field: field) do
@@ -451,7 +493,7 @@ module GraphQL
               inner_obj = begin
                 query.with_error_handling do
                   if trace
-                    query.trace("execute_field_lazy", {owner: owner, field: field, path: path, query: query, object: owner_object, arguments: arguments}) do
+                    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
@@ -461,7 +503,7 @@ module GraphQL
                 rescue GraphQL::ExecutionError, GraphQL::UnauthorizedError => err
                   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, trace: trace, &block)
+              after_lazy(inner_obj, owner: owner, field: field, path: path, ast_node: ast_node, scoped_context: context.scoped_context, owner_object: owner_object, arguments: arguments, eager: eager, trace: trace, &block)
             end
 
             if eager
@@ -476,9 +518,7 @@ module GraphQL
         end
 
         def arguments(graphql_object, arg_owner, ast_node)
-          # Don't cache arguments if field extras or extensions are requested since they can mutate the argument data structure
-          if arg_owner.arguments_statically_coercible? &&
-              (!arg_owner.is_a?(GraphQL::Schema::Field) || (arg_owner.extras.empty? && arg_owner.extensions.empty?))
+          if arg_owner.arguments_statically_coercible?
             query.arguments_for(ast_node, arg_owner)
           else
             # The arguments must be prepared in the context of the given object
@@ -519,6 +559,16 @@ module GraphQL
           end
         end
 
+        def value_at(path)
+          i = 0
+          value = @response.final_value
+          while value && (part = path[i])
+            value = value[part]
+            i += 1
+          end
+          value
+        end
+
         # To propagate nulls, we have to know what the field type was
         # at previous parts of the response.
         # This hash matches the response