graphql 1.11.6 → 1.12.3

data/lib/graphql/dataloader/source.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module GraphQL
+  class Dataloader
+    class Source
+      # @api private
+      attr_reader :results
+
+      # Called by {Dataloader} to prepare the {Source}'s internal state
+      # @api private
+      def setup(dataloader)
+        @pending_keys = []
+        @results = {}
+        @dataloader = dataloader
+      end
+
+      attr_reader :dataloader
+
+      # @return [Dataloader::Request] a pending request for a value from `key`. Call `.load` on that object to wait for the result.
+      def request(key)
+        if !@results.key?(key)
+          @pending_keys << key
+        end
+        Dataloader::Request.new(self, key)
+      end
+
+      # @return [Dataloader::Request] a pending request for a values from `keys`. Call `.load` on that object to wait for the results.
+      def request_all(keys)
+        pending_keys = keys.select { |k| !@results.key?(k) }
+        @pending_keys.concat(pending_keys)
+        Dataloader::RequestAll.new(self, keys)
+      end
+
+      # @param key [Object] A loading key which will be passed to {#fetch} if it isn't already in the internal cache.
+      # @return [Object] The result from {#fetch} for `key`. If `key` hasn't been loaded yet, the Fiber will yield until it's loaded.
+      def load(key)
+        if @results.key?(key)
+          @results[key]
+        else
+          @pending_keys << key
+          sync
+          @results[key]
+        end
+      end
+
+      # @param keys [Array<Object>] Loading keys which will be passed to `#fetch` (or read from the internal cache).
+      # @return [Object] The result from {#fetch} for `keys`. If `keys` haven't been loaded yet, the Fiber will yield until they're loaded.
+      def load_all(keys)
+        if keys.any? { |k| !@results.key?(k) }
+          pending_keys = keys.select { |k| !@results.key?(k) }
+          @pending_keys.concat(pending_keys)
+          sync
+        end
+
+        keys.map { |k| @results[k] }
+      end
+
+      # Subclasses must implement this method to return a value for each of `keys`
+      # @param keys [Array<Object>] keys passed to {#load}, {#load_all}, {#request}, or {#request_all}
+      # @return [Array<Object>] A loaded value for each of `keys`. The array must match one-for-one to the list of `keys`.
+      def fetch(keys)
+        # somehow retrieve these from the backend
+        raise "Implement `#{self.class}#fetch(#{keys.inspect}) to return a record for each of the keys"
+      end
+
+      # Wait for a batch, if there's anything to batch.
+      # Then run the batch and update the cache.
+      # @return [void]
+      def sync
+        @dataloader.yield
+      end
+
+      # @return [Boolean] True if this source has any pending requests for data.
+      def pending?
+        @pending_keys.any?
+      end
+
+      # Called by {GraphQL::Dataloader} to resolve and pending requests to this source.
+      # @api private
+      # @return [void]
+      def run_pending_keys
+        return if @pending_keys.empty?
+        fetch_keys = @pending_keys.uniq
+        @pending_keys = []
+        results = fetch(fetch_keys)
+        fetch_keys.each_with_index do |key, idx|
+          @results[key] = results[idx]
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/graphql/define/assign_global_id_field.rb

@@ -4,7 +4,7 @@ module GraphQL
     module AssignGlobalIdField
       def self.call(type_defn, field_name, **field_kwargs)
         resolve = GraphQL::Relay::GlobalIdResolve.new(type: type_defn)
-        GraphQL::Define::AssignObjectField.call(type_defn, field_name, **field_kwargs, type: GraphQL::ID_TYPE.to_non_null_type, resolve: resolve)
+        GraphQL::Define::AssignObjectField.call(type_defn, field_name, **field_kwargs, type: GraphQL::DEPRECATED_ID_TYPE.to_non_null_type, resolve: resolve)
       end
     end
   end

data/lib/graphql/define/instance_definable.rb

@@ -3,6 +3,23 @@ module GraphQL
   module Define
     # @api deprecated
     module InstanceDefinable
+      module DeprecatedDefine
+        def define(**kwargs, &block)
+          deprecated_caller = caller(1, 1).first
+          if deprecated_caller.include?("lib/graphql")
+            deprecated_caller = caller(2, 10).find { |c| !c.include?("lib/graphql") }
+          end
+
+          if deprecated_caller
+            GraphQL::Deprecation.warn <<-ERR
+#{self}.define will be removed in GraphQL-Ruby 2.0; use a class-based definition instead. See https://graphql-ruby.org/schema/class_based_api.html.
+  -> called from #{deprecated_caller}
+ERR
+          end
+          deprecated_define(**kwargs, &block)
+        end
+      end
+
       def self.included(base)
         base.extend(ClassMethods)
         base.ensure_defined(:metadata)
@@ -14,7 +31,7 @@ module GraphQL
       end
 
       # @api deprecated
-      def define(**kwargs, &block)
+      def deprecated_define(**kwargs, &block)
         # make sure the previous definition_proc was executed:
         ensure_defined
         stash_dependent_methods
@@ -22,11 +39,16 @@ module GraphQL
         nil
       end
 
+      # @api deprecated
+      def define(**kwargs, &block)
+        deprecated_define(**kwargs, &block)
+      end
+
       # @api deprecated
       def redefine(**kwargs, &block)
         ensure_defined
         new_inst = self.dup
-        new_inst.define(**kwargs, &block)
+        new_inst.deprecated_define(**kwargs, &block)
         new_inst
       end
 
@@ -125,8 +147,16 @@ module GraphQL
       module ClassMethods
         # Create a new instance
         # and prepare a definition using its {.definitions}.
+        # @api deprecated
         # @param kwargs [Hash] Key-value pairs corresponding to defininitions from `accepts_definitions`
         # @param block [Proc] Block which calls helper methods from `accepts_definitions`
+        def deprecated_define(**kwargs, &block)
+          instance = self.new
+          instance.deprecated_define(**kwargs, &block)
+          instance
+        end
+
+        # @api deprecated
         def define(**kwargs, &block)
           instance = self.new
           instance.define(**kwargs, &block)

data/lib/graphql/define/type_definer.rb

@@ -7,11 +7,11 @@ module GraphQL
     class TypeDefiner
       include Singleton
       # rubocop:disable Naming/MethodName
-      def Int;      GraphQL::INT_TYPE;      end
-      def String;   GraphQL::STRING_TYPE;   end
-      def Float;    GraphQL::FLOAT_TYPE;    end
-      def Boolean;  GraphQL::BOOLEAN_TYPE;  end
-      def ID;       GraphQL::ID_TYPE;       end
+      def Int;      GraphQL::DEPRECATED_INT_TYPE;      end
+      def String;   GraphQL::DEPRECATED_STRING_TYPE;   end
+      def Float;    GraphQL::DEPRECATED_FLOAT_TYPE;    end
+      def Boolean;  GraphQL::DEPRECATED_BOOLEAN_TYPE;  end
+      def ID;       GraphQL::DEPRECATED_ID_TYPE;       end
       # rubocop:enable Naming/MethodName
 
       # Make a {ListType} which wraps the input type

data/lib/graphql/deprecated_dsl.rb

@@ -4,13 +4,13 @@ module GraphQL
   #
   # 1. Scoped by file (CRuby only), add to the top of the file:
   #
-  #      using GraphQL::DeprecatedDSL
+  #      using GraphQL::DeprecationDSL
   #
   #   (This is a "refinement", there are also other ways to scope it.)
   #
   # 2. Global application, add before schema definition:
   #
-  #      GraphQL::DeprecatedDSL.activate
+  #      GraphQL::DeprecationDSL.activate
   #
   module DeprecatedDSL
     TYPE_CLASSES = [
@@ -23,12 +23,17 @@ module GraphQL
     ]
 
     def self.activate
+      deprecated_caller = caller(1, 1).first
+      GraphQL::Deprecation.warn "DeprecatedDSL will be removed from GraphQL-Ruby 2.0, use `.to_non_null_type` instead of `!` and remove `.activate` from #{deprecated_caller}"
       TYPE_CLASSES.each { |c| c.extend(Methods) }
       GraphQL::Schema::List.include(Methods)
       GraphQL::Schema::NonNull.include(Methods)
     end
+
     module Methods
       def !
+        deprecated_caller = caller(1, 1).first
+        GraphQL::Deprecation.warn "DeprecatedDSL will be removed from GraphQL-Ruby 2.0, use `.to_non_null_type` instead of `!` at #{deprecated_caller}"
         to_non_null_type
       end
     end

data/lib/graphql/deprecation.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module GraphQL
+  module Deprecation
+    def self.warn(message)
+      if defined?(ActiveSupport::Deprecation)
+        ActiveSupport::Deprecation.warn(message)
+      else
+        Kernel.warn(message)
+      end
+    end
+  end
+end

data/lib/graphql/enum_type.rb

@@ -2,6 +2,8 @@
 module GraphQL
   # @api deprecated
   class EnumType < GraphQL::BaseType
+    extend Define::InstanceDefinable::DeprecatedDefine
+
     accepts_definitions :values, value: GraphQL::Define::AssignEnumValue
     ensure_defined(:values, :validate_non_null_input, :coerce_non_null_input, :coerce_result)
     attr_accessor :ast_node

data/lib/graphql/execution/errors.rb

@@ -18,6 +18,10 @@ module GraphQL
     #
     class Errors
       def self.use(schema)
+        if schema.plugins.any? { |(plugin, kwargs)| plugin == self }
+          definition_line = caller(2, 1).first
+          GraphQL::Deprecation.warn("GraphQL::Execution::Errors is now installed by default, remove `use GraphQL::Execution::Errors` from #{definition_line}")
+        end
         schema.error_handler = self.new(schema)
       end
 

data/lib/graphql/execution/execute.rb

@@ -18,7 +18,14 @@ module GraphQL
       # @api private
       PROPAGATE_NULL = PropagateNull.new
 
+      def self.use(schema_class)
+        schema_class.query_execution_strategy(self)
+        schema_class.mutation_execution_strategy(self)
+        schema_class.subscription_execution_strategy(self)
+      end
+
       def execute(ast_operation, root_type, query)
+        GraphQL::Deprecation.warn "#{self.class} will be removed in GraphQL-Ruby 2.0, please upgrade to the Interpreter: https://graphql-ruby.org/queries/interpreter.html"
         result = resolve_root_selection(query)
         lazy_resolve_root_selection(result, **{query: query})
         GraphQL::Execution::Flatten.call(query.context)

data/lib/graphql/execution/interpreter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "fiber"
 require "graphql/execution/interpreter/argument_value"
 require "graphql/execution/interpreter/arguments"
 require "graphql/execution/interpreter/arguments_cache"
@@ -22,12 +23,15 @@ module GraphQL
       end
 
       def self.use(schema_class)
-        schema_class.interpreter = true
-        schema_class.query_execution_strategy(GraphQL::Execution::Interpreter)
-        schema_class.mutation_execution_strategy(GraphQL::Execution::Interpreter)
-        schema_class.subscription_execution_strategy(GraphQL::Execution::Interpreter)
-        schema_class.add_subscription_extension_if_necessary
-        GraphQL::Schema::Object.include(HandlesRawValue)
+        if schema_class.interpreter?
+          definition_line = caller(2, 1).first
+          GraphQL::Deprecation.warn("GraphQL::Execution::Interpreter is now the default; remove `use GraphQL::Execution::Interpreter` from the schema definition (#{definition_line})")
+        else
+          schema_class.query_execution_strategy(self)
+          schema_class.mutation_execution_strategy(self)
+          schema_class.subscription_execution_strategy(self)
+          schema_class.add_subscription_extension_if_necessary
+        end
       end
 
       def self.begin_multiplex(multiplex)

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

@@ -5,6 +5,9 @@ module GraphQL
     class Interpreter
       # A wrapper for argument hashes in GraphQL queries.
       #
+      # This object is immutable so that the runtime code can be sure that
+      # modifications don't leak from one use to another
+      #
       # @see GraphQL::Query#arguments_for to get access to these objects.
       class Arguments
         extend Forwardable
@@ -16,20 +19,69 @@ module GraphQL
         # @return [Hash<Symbol, Object>]
         attr_reader :keyword_arguments
 
-        def initialize(keyword_arguments:, argument_values:)
-          @keyword_arguments = keyword_arguments
-          @argument_values = argument_values
+        # @param argument_values [nil, Hash{Symbol => ArgumentValue}]
+        # @param keyword_arguments [nil, Hash{Symbol => Object}]
+        def initialize(keyword_arguments: nil, argument_values:)
+          @empty = argument_values.nil? || argument_values.empty?
+          # This is only present when `extras` have been merged in:
+          if keyword_arguments
+            # This is a little crazy. We expect the `:argument_details` extra to _include extras_,
+            # but the object isn't created until _after_ extras are put together.
+            # So, we have to use a special flag here to say, "at the last minute, add yourself to the keyword args."
+            #
+            # Otherwise:
+            # - We can't access the final Arguments instance _while_ we're preparing extras
+            # - After we _can_ access it, it's frozen, so we can't add anything.
+            #
+            # So, this flag gives us a chance to sneak it in before freezing, _and_ while we have access
+            # to the new Arguments instance itself.
+            if keyword_arguments[:argument_details] == :__arguments_add_self
+              keyword_arguments[:argument_details] = self
+            end
+            @keyword_arguments = keyword_arguments.freeze
+          elsif !@empty
+            @keyword_arguments = {}
+            argument_values.each do |name, arg_val|
+              @keyword_arguments[name] = arg_val.value
+            end
+            @keyword_arguments.freeze
+          else
+            @keyword_arguments = NO_ARGS
+          end
+          @argument_values = argument_values ? argument_values.freeze : NO_ARGS
+          freeze
         end
 
         # @return [Hash{Symbol => ArgumentValue}]
         attr_reader :argument_values
 
-        def_delegators :@keyword_arguments, :key?, :[], :fetch, :keys, :each, :values
-        def_delegators :@argument_values, :each_value
+        def empty?
+          @empty
+        end
+
+        def_delegators :keyword_arguments, :key?, :[], :fetch, :keys, :each, :values
+        def_delegators :argument_values, :each_value
 
         def inspect
           "#<#{self.class} @keyword_arguments=#{keyword_arguments.inspect}>"
         end
+
+        # Create a new arguments instance which includes these extras.
+        #
+        # This is called by the runtime to implement field `extras: [...]`
+        #
+        # @param extra_args [Hash<Symbol => Object>]
+        # @return [Interpreter::Arguments]
+        # @api private
+        def merge_extras(extra_args)
+          self.class.new(
+            argument_values: argument_values,
+            keyword_arguments: keyword_arguments.merge(extra_args)
+          )
+        end
+
+        NO_ARGS = {}.freeze
+        EMPTY = self.new(argument_values: nil, keyword_arguments: NO_ARGS).freeze
       end
     end
   end

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

@@ -29,11 +29,16 @@ module GraphQL
 
         private
 
+        NO_ARGUMENTS = {}.freeze
+
         NO_VALUE_GIVEN = Object.new
 
         def prepare_args_hash(ast_arg_or_hash_or_value)
           case ast_arg_or_hash_or_value
           when Hash
+            if ast_arg_or_hash_or_value.empty?
+              return NO_ARGUMENTS
+            end
             args_hash = {}
             ast_arg_or_hash_or_value.each do |k, v|
               args_hash[k] = prepare_args_hash(v)
@@ -42,6 +47,9 @@ module GraphQL
           when Array
             ast_arg_or_hash_or_value.map { |v| prepare_args_hash(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)

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/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 = {}
@@ -47,15 +49,24 @@ module GraphQL
           root_op_type = root_operation.operation_type || "query"
           root_type = schema.root_type_for_operation(root_op_type)
           path = []
-          set_interpreter_context(:current_object, query.root_value)
-          set_interpreter_context(:current_path, path)
+          set_all_interpreter_context(query.root_value, nil, nil, path)
           object_proxy = authorized_new(root_type, query.root_value, context, path)
           object_proxy = schema.sync_lazy(object_proxy)
           if object_proxy.nil?
             # 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)
+            # Prepare this runtime state to be encapsulated in a Fiber
+            @progress_path = path
+            @progress_scoped_context = context.scoped_context
+            @progress_object = object_proxy
+            @progress_object_type = root_type
+            @progress_index = nil
+            @progress_is_eager_selection = root_op_type == "mutation"
+            @progress_selections = gather_selections(object_proxy, root_type, root_operation.selections)
+
+            # Make the first fiber which will begin execution
+            enqueue_selections_fiber
           end
           delete_interpreter_context(:current_path)
           delete_interpreter_context(:current_field)
@@ -64,7 +75,33 @@ module GraphQL
           nil
         end
 
-        def gather_selections(owner_object, owner_type, selections, selections_by_name)
+        # Use `@dataloader` to enqueue a fiber that will pick up from the current point.
+        # @return [void]
+        def enqueue_selections_fiber
+          # Read these into local variables so that later assignments don't affect the block below.
+          path = @progress_path
+          scoped_context = @progress_scoped_context
+          owner_object = @progress_object
+          owner_type = @progress_object_type
+          idx = @progress_index
+          is_eager_selection = @progress_is_eager_selection
+          gathered_selections = @progress_selections
+
+          @dataloader.enqueue {
+            evaluate_selections(
+              path,
+              scoped_context,
+              owner_object,
+              owner_type,
+              is_eager_selection: is_eager_selection,
+              after: idx,
+              gathered_selections: gathered_selections,
+            )
+          }
+          nil
+        end
+
+        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)
@@ -116,139 +153,186 @@ module GraphQL
               raise "Invariant: unexpected selection class: #{node.class}"
             end
           end
+          selections_by_name
         end
 
-        def evaluate_selections(path, scoped_context, owner_object, owner_type, selections, root_operation_type: nil)
-          set_interpreter_context(:current_object, owner_object)
-          set_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
+        NO_ARGS = {}.freeze
+
+        # @return [void]
+        def evaluate_selections(path, scoped_context, owner_object, owner_type, is_eager_selection:, gathered_selections:, after:)
+          set_all_interpreter_context(owner_object, nil, nil, path)
+
+          @progress_path = path
+          @progress_scoped_context = scoped_context
+          @progress_object = owner_object
+          @progress_object_type = owner_type
+          @progress_index = nil
+          @progress_is_eager_selection = is_eager_selection
+          @progress_selections = gathered_selections
+
+          # Track `idx` manually to avoid an allocation on this hot path
+          idx = 0
+          gathered_selections.each do |result_name, field_ast_nodes_or_ast_node|
+            prev_idx = idx
+            idx += 1
+            # TODO: this is how a `progress` resumes where this left off.
+            # Is there a better way to seek in the hash?
+            # I think we could also use the array of keys; it supports seeking just fine.
+            if after && prev_idx <= after
+              next
             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
+            @progress_index = prev_idx
+            # This is how the current runtime gives itself to `dataloader`
+            # so that the dataloader can enqueue another fiber to resume if needed.
+            @dataloader.current_runtime = self
+            evaluate_selection(path, result_name, field_ast_nodes_or_ast_node, scoped_context, owner_object, owner_type, is_eager_selection)
+            # The dataloader knows if ^^ that selection halted and later selections were executed in another fiber.
+            # If that's the case, then don't continue execution here.
+            if @dataloader.yielded?(path)
+              break
             end
-            return_type = field_defn.type
+          end
+          nil
+        end
 
-            next_path = path.dup
-            next_path << result_name
-            next_path.freeze
+        attr_reader :progress_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_interpreter_context(:current_path, next_path)
-            set_interpreter_context(:current_field, field_defn)
+        # @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
+              raise "Invariant: no field for #{owner_type}.#{field_name}"
+            end
+          end
+          return_type = field_defn.type
 
-            context.scoped_context = scoped_context
-            object = owner_object
+          next_path = path.dup
+          next_path << result_name
+          next_path.freeze
 
-            if is_introspection
-              object = authorized_new(field_defn.owner, object, context, next_path)
-            end
+          # 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)
 
-            begin
-              kwarg_arguments = arguments(object, field_defn, ast_node)
-            rescue GraphQL::ExecutionError => e
-              continue_value(next_path, e, owner_type, field_defn, return_type.non_null?, ast_node)
-              next
-            end
+          context.scoped_context = scoped_context
+          object = owner_object
 
-            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|
-              if resolved_arguments.is_a? GraphQL::ExecutionError
-                continue_value(next_path, resolved_arguments, owner_type, field_defn, return_type.non_null?, ast_node)
-                next
-              end
+          if is_introspection
+            object = authorized_new(field_defn.owner, object, context, next_path)
+          end
 
-              kwarg_arguments = resolved_arguments.keyword_arguments
+          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)
+            return
+          end
 
+          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
+
+            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
-                  kwarg_arguments[:ast_node] = ast_node
+                  extra_args[:ast_node] = ast_node
                 when :execution_errors
-                  kwarg_arguments[:execution_errors] = ExecutionErrors.new(context, ast_node, next_path)
+                  extra_args[:execution_errors] = ExecutionErrors.new(context, ast_node, next_path)
                 when :path
-                  kwarg_arguments[:path] = next_path
+                  extra_args[:path] = next_path
                 when :lookahead
                   if !field_ast_nodes
                     field_ast_nodes = [ast_node]
                   end
-                  kwarg_arguments[:lookahead] = Execution::Lookahead.new(
+
+                  extra_args[:lookahead] = Execution::Lookahead.new(
                     query: query,
                     ast_nodes: field_ast_nodes,
                     field: field_defn,
                   )
                 when :argument_details
-                  kwarg_arguments[:argument_details] = resolved_arguments
+                  # 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
-                  kwarg_arguments[extra] = field_defn.fetch_extra(extra, context)
+                  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_interpreter_context(:current_arguments, kwarg_arguments)
+            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])
             end
+
+            nil
           end
         end
 
@@ -309,7 +393,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)
@@ -329,12 +413,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, is_eager_selection: false, gathered_selections: gathered_selections, after: nil)
                 response_hash
               end
             end
@@ -352,7 +437,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)
@@ -414,30 +499,39 @@ module GraphQL
           true
         end
 
+        def set_all_interpreter_context(object, field, arguments, path)
+          if object
+            @context[:current_object] = @interpreter_context[:current_object] = object
+          end
+          if field
+            @context[:current_field] = @interpreter_context[:current_field] = field
+          end
+          if arguments
+            @context[:current_arguments] = @interpreter_context[:current_arguments] = arguments
+          end
+          if path
+            @context[:current_path] = @interpreter_context[:current_path] = path
+          end
+        end
+
         # @param obj [Object] Some user-returned value that may want to be batched
         # @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, trace: true, &block)
-          set_interpreter_context(:current_object, owner_object)
-          set_interpreter_context(:current_arguments, arguments)
-          set_interpreter_context(:current_path, path)
-          set_interpreter_context(:current_field, field)
+        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
-              set_interpreter_context(:current_path, path)
-              set_interpreter_context(:current_field, field)
-              set_interpreter_context(:current_object, owner_object)
-              set_interpreter_context(:current_arguments, arguments)
+              set_all_interpreter_context(owner_object, field, arguments, path)
               context.scoped_context = scoped_context
               # Wrap the execution of _this_ method with tracing,
               # but don't wrap the continuation below
               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
@@ -447,7 +541,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
@@ -462,9 +556,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
@@ -505,6 +597,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