graphql 2.5.23 → 2.6.3

data/lib/graphql/schema.rb

@@ -757,6 +757,7 @@ module GraphQL
           # reset this cached value:
           @introspection_system = nil
           introspection_system
+          self.visibility&.introspection_system_configured(introspection_system)
           @introspection
         else
           @introspection || find_inherited_value(:introspection)
@@ -768,7 +769,6 @@ module GraphQL
         if !@introspection_system
           @introspection_system = Schema::IntrospectionSystem.new(self)
           @introspection_system.resolve_late_bindings
-          self.visibility&.introspection_system_configured(@introspection_system)
         end
         @introspection_system
       end
@@ -1150,17 +1150,14 @@ module GraphQL
       attr_accessor :using_backtrace
 
       # @api private
-      def handle_or_reraise(context, err)
+      def handle_or_reraise(context, err, object: context[:current_object], arguments: context[:current_arguments], field: context[:current_field])
         handler = Execution::Errors.find_handler_for(self, err.class)
         if handler
-          obj = context[:current_object]
-          args = context[:current_arguments]
-          args = args && args.respond_to?(:keyword_arguments) ? args.keyword_arguments : nil
-          field = context[:current_field]
-          if obj.is_a?(GraphQL::Schema::Object)
-            obj = obj.object
+          arguments = arguments.respond_to?(:keyword_arguments) ? arguments.keyword_arguments : arguments
+          if object.is_a?(GraphQL::Schema::Object)
+            object = object.object
           end
-          handler[:handler].call(err, obj, args, context, field)
+          handler[:handler].call(err, object, arguments, context, field)
         else
           if (context[:backtrace] || using_backtrace) && !err.is_a?(GraphQL::ExecutionError)
             err = GraphQL::Backtrace::TracedError.new(err, context)
@@ -1362,14 +1359,6 @@ module GraphQL
         lazy_methods.set(lazy_class, value_method)
       end
 
-      def uses_raw_value?
-        !!@uses_raw_value
-      end
-
-      def uses_raw_value(new_val)
-        @uses_raw_value = new_val
-      end
-
       def resolves_lazies?
         lazy_method_count = 0
         lazy_methods.each do |k, v|
@@ -1450,7 +1439,16 @@ module GraphQL
       end
 
       def tracers
-        find_inherited_value(:tracers, EMPTY_ARRAY) + own_tracers
+        inherited = find_inherited_value(:tracers, EMPTY_ARRAY)
+        if inherited.length > 0
+          if own_tracers.length > 0
+            inherited + own_tracers
+          else
+            inherited
+          end
+        else
+          own_tracers
+        end
       end
 
       # Mix `trace_mod` into this schema's `Trace` class so that its methods will be called at runtime.
@@ -1560,7 +1558,8 @@ module GraphQL
       end
 
       def query_analyzers
-        find_inherited_value(:query_analyzers, EMPTY_ARRAY) + own_query_analyzers
+        inherited_qa = find_inherited_value(:query_analyzers, EMPTY_ARRAY)
+        inherited_qa.empty? ? own_query_analyzers : (inherited_qa + own_query_analyzers)
       end
 
       # @param new_analyzer [Class<GraphQL::Analysis::Analyzer>] An analyzer to run on multiplexes to this schema
@@ -1585,6 +1584,14 @@ module GraphQL
       # @see {Query#initialize} for arguments.
       # @return [GraphQL::Query::Result] query result, ready to be serialized as JSON
       def execute(query_str = nil, **kwargs)
+        if default_execution_next
+          execute_next(query_str, **kwargs)
+        else
+          execute_legacy(query_str, **kwargs)
+        end
+      end
+
+      def execute_legacy(query_str = nil, **kwargs)
         if query_str
           kwargs[:query] = query_str
         end
@@ -1626,7 +1633,23 @@ module GraphQL
       # @option kwargs [nil, Integer] :max_complexity (nil)
       # @return [Array<GraphQL::Query::Result>] One result for each query in the input
       def multiplex(queries, **kwargs)
-        GraphQL::Execution::Interpreter.run_all(self, queries, **kwargs)
+        if @default_execution_next
+          multiplex_next(queries, **kwargs)
+        else
+          GraphQL::Execution::Interpreter.run_all(self, queries, **kwargs)
+        end
+      end
+
+      def default_execution_next(new_value = NOT_CONFIGURED)
+        if !NOT_CONFIGURED.equal?(new_value)
+          @default_execution_next = new_value
+        elsif instance_variable_defined?(:@default_execution_next)
+          @default_execution_next
+        elsif superclass.respond_to?(:default_execution_next)
+          superclass.default_execution_next
+        else
+          false
+        end
       end
 
       def instrumenters

data/lib/graphql/subscriptions/default_subscription_resolve_extension.rb

@@ -2,41 +2,41 @@
 module GraphQL
   class Subscriptions
     class DefaultSubscriptionResolveExtension < GraphQL::Schema::FieldExtension
-      def resolve(context:, object:, arguments:)
-        has_override_implementation = @field.resolver ||
-          object.respond_to?(@field.resolver_method)
+      def resolve(context:, object: nil, objects: nil,  arguments:)
+        if objects
+          has_override_implementation = @field.execution_mode != :direct_send
 
-        if !has_override_implementation
-          if context.query.subscription_update?
-            object.object
+          if !has_override_implementation
+            if context.query.subscription_update?
+              objects
+            else
+              objects.map { |o| context.skip }
+            end
           else
-            context.skip
+            yield(objects, arguments)
           end
         else
-          yield(object, arguments)
-        end
-      end
+          has_override_implementation = @field.resolver ||
+            object.respond_to?(@field.resolver_method)
 
-      def resolve_next(context:, objects:, arguments:)
-        has_override_implementation = @field.execution_next_mode != :direct_send
-
-        if !has_override_implementation
-          if context.query.subscription_update?
-            objects
+          if !has_override_implementation
+            if context.query.subscription_update?
+              object.object
+            else
+              context.skip
+            end
           else
-            objects.map { |o| context.skip }
+            yield(object, arguments)
           end
-        else
-          yield(objects, arguments)
         end
       end
 
-      def after_resolve(value:, context:, object:, arguments:, **rest)
-        self.class.write_subscription(@field, value, arguments, context)
-      end
-
-      def after_resolve_next(values:, context:, objects:, arguments:, **rest)
-        values.map do |value|
+      def after_resolve(values: nil, value: nil, context:, objects: nil, object: nil, arguments:, **rest)
+        if values
+          values.map do |value|
+            self.class.write_subscription(@field, value, arguments, context)
+          end
+        else
           self.class.write_subscription(@field, value, arguments, context)
         end
       end
@@ -54,6 +54,12 @@ module GraphQL
             events << subscription_instance.event
           end
           value
+        elsif (exec_next_update_event = context.namespace(:subscriptions)[:update_event])
+          if context.query.subscription_topic == exec_next_update_event.topic
+            value
+          else
+            context.skip
+          end
         elsif (events = context.namespace(:subscriptions)[:events])
           # This is the first execution, so gather an Event
           # for the backend to register:

data/lib/graphql/subscriptions/event.rb

@@ -104,7 +104,6 @@ module GraphQL
 
         def stringify_args(arg_owner, args, context)
           arg_owner = arg_owner.respond_to?(:unwrap) ? arg_owner.unwrap : arg_owner # remove list and non-null wrappers
-
           case args
           when Hash
             next_args = {}

data/lib/graphql/subscriptions.rb

@@ -259,6 +259,21 @@ module GraphQL
       nil
     end
 
+    def finalizer
+      Finalizer.new(self)
+    end
+
+    class Finalizer
+      include Execution::Finalizer
+      def initialize(subscriptions)
+        @subscriptions = subscriptions
+      end
+
+      def finalize_graphql_result(query, result_data, result_key)
+        @subscriptions.finish_subscriptions(query)
+      end
+    end
+
     private
 
     # Recursively normalize `args` as belonging to `arg_owner`:

data/lib/graphql/tracing/perfetto_trace.rb

@@ -67,6 +67,8 @@ module GraphQL
         DA_FETCH_KEYS_IID => "fetch keys",
       }
 
+      ANON_CLASS_NAME = "(anonymous)"
+
       DEBUG_INSPECT_CATEGORY_IIDS = [15]
       DA_DEBUG_INSPECT_CLASS_IID = 16
       DEBUG_INSPECT_EVENT_NAME_IID = 17
@@ -118,7 +120,7 @@ module GraphQL
         }
 
         @source_name_iids = Hash.new do |h, source_class|
-          h[source_class] = @interned_event_name_iids[source_class.name]
+          h[source_class] = @interned_event_name_iids[source_class.name || ANON_CLASS_NAME]
         end.compare_by_identity
 
         @auth_name_iids = Hash.new do |h, graphql_type|
@@ -144,7 +146,7 @@ module GraphQL
         end
 
         @class_name_iids = Hash.new do |h, k|
-          h[k] = @interned_da_string_values[k.name]
+          h[k] = @interned_da_string_values[k.name || ANON_CLASS_NAME]
         end.compare_by_identity
 
         @starting_objects = GC.stat(:total_allocated_objects)
@@ -682,7 +684,7 @@ module GraphQL
         when GraphQL::Schema::InputObject
           payload_to_debug(k, v.to_h, iid: iid, intern_value: intern_value)
         else
-          class_name_iid = @interned_da_string_values[(v.class.name || "(anonymous)")]
+          class_name_iid = @interned_da_string_values[(v.class.name || ANON_CLASS_NAME)]
           da = [
             debug_annotation(DA_DEBUG_INSPECT_CLASS_IID, :string_value_iid, class_name_iid),
           ]

data/lib/graphql/tracing/trace.rb

@@ -98,6 +98,12 @@ module GraphQL
         yield
       end
 
+      def objects(type, object, context)
+      end
+
+      def object_loaded(argument_definition, object, context)
+      end
+
       # A call to `.authorized?` is starting
       # @param type [Class<GraphQL::Schema::Object>]
       # @param object [Object]

data/lib/graphql/unauthorized_error.rb

@@ -30,7 +30,7 @@ module GraphQL
 
     attr_accessor :path, :ast_nodes
 
-    def assign_graphql_result(query, result_data, key)
+    def finalize_graphql_result(query, result_data, key)
       result_data[key] = nil
     end
   end

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "2.5.23"
+  VERSION = "2.6.3"
 end

data/lib/graphql.rb

@@ -21,9 +21,6 @@ module GraphQL
   class Error < StandardError
   end
 
-  class RuntimeError < Error
-  end
-
   # This error is raised when GraphQL-Ruby encounters a situation
   # that it *thought* would never happen. Please report this bug!
   class InvariantError < Error
@@ -122,6 +119,7 @@ This is probably a bug in GraphQL-Ruby, please report this error on GitHub: http
   autoload :ParseError, "graphql/parse_error"
   autoload :Backtrace, "graphql/backtrace"
 
+  autoload :RuntimeError, "graphql/runtime_error"
   autoload :UnauthorizedError, "graphql/unauthorized_error"
   autoload :UnauthorizedEnumValueError, "graphql/unauthorized_enum_value_error"
   autoload :UnauthorizedFieldError, "graphql/unauthorized_field_error"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.5.23
+  version: 2.6.3
 platform: ruby
 authors:
 - Robert Mosolgo
 bindir: bin
 cert_chain: []
-date: 2026-04-03 00:00:00.000000000 Z
+date: 2026-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -493,6 +493,9 @@ files:
 - lib/graphql/execution.rb
 - lib/graphql/execution/directive_checks.rb
 - lib/graphql/execution/errors.rb
+- lib/graphql/execution/field_resolve_step.rb
+- lib/graphql/execution/finalize.rb
+- lib/graphql/execution/input_values.rb
 - lib/graphql/execution/interpreter.rb
 - lib/graphql/execution/interpreter/argument_value.rb
 - lib/graphql/execution/interpreter/arguments.rb
@@ -504,14 +507,14 @@ files:
 - lib/graphql/execution/interpreter/runtime/graphql_result.rb
 - lib/graphql/execution/lazy.rb
 - lib/graphql/execution/lazy/lazy_method_map.rb
+- lib/graphql/execution/load_argument_step.rb
 - lib/graphql/execution/lookahead.rb
 - lib/graphql/execution/multiplex.rb
 - lib/graphql/execution/next.rb
-- lib/graphql/execution/next/field_resolve_step.rb
-- lib/graphql/execution/next/load_argument_step.rb
-- lib/graphql/execution/next/prepare_object_step.rb
-- lib/graphql/execution/next/runner.rb
-- lib/graphql/execution/next/selections_step.rb
+- lib/graphql/execution/prepare_object_step.rb
+- lib/graphql/execution/resolve_type_step.rb
+- lib/graphql/execution/runner.rb
+- lib/graphql/execution/selections_step.rb
 - lib/graphql/execution_error.rb
 - lib/graphql/integer_decoding_error.rb
 - lib/graphql/integer_encoding_error.rb
@@ -577,6 +580,7 @@ files:
 - lib/graphql/rubocop/graphql/default_required_true.rb
 - lib/graphql/rubocop/graphql/field_type_in_block.rb
 - lib/graphql/rubocop/graphql/root_types_in_block.rb
+- lib/graphql/runtime_error.rb
 - lib/graphql/runtime_type_error.rb
 - lib/graphql/schema.rb
 - lib/graphql/schema/addition.rb