graphql 2.6.14 → 2.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33d067b80170a8be730630eb60106962726899c114a50d397559d5ccbb274dd4
-  data.tar.gz: 5d5d69c98b1461f7e9d50e45b615a6078155c3b15e1af0dfc51d46d49364064d
+  metadata.gz: 8207cb9fb1f93b3364a2866d4ad0113b9fb6711fed18173ab1b63a73c3b7004d
+  data.tar.gz: 170e3f0d0bb725d6d1bc6d21c2d086d3023d169544ea17bfc5d6765df57be66e
 SHA512:
-  metadata.gz: b77a04ebe1d0da2e9edd7e5af4f8218f6c25676893af1985cde457b99696345751c620fd803fedd78910bf9a8978aa34418898014c7393ea2f0e35b36b22594e
-  data.tar.gz: 3d3888e23a431bdbd67075eeacbdb082a461c46573946a8d46b228c2b53a686ccd5ba57f25919290e05240a60371063efa80eb8946459b5549c494e54fe5b407
+  metadata.gz: bb6cdc6648667c5547960a18ffd070cb8c6cb98360adbd47316b792f4c16e594b9a074ff62028c44e3f041d9e7f28860b7f2fd3e4bc42db73d9f43ce0e81ae53
+  data.tar.gz: cb4b25050266be8b405105144a5b52ee82602b6dd8e99d1f9c32d8d29443e96b19a8af283584c3d5e69ae85f6747348421bdc21693673ed2678d896c5375f6ea

data/lib/generators/graphql/templates/graphql_controller.erb

@@ -48,7 +48,13 @@ class GraphqlController < ApplicationController
     logger.error e.message
     logger.error e.backtrace.join("\n")
 
-    render json: { errors: [{ message: e.message, backtrace: e.backtrace }], data: {} }, status: 500
+    error_json = { errors: [{ message: e.message, backtrace: e.backtrace }], data: {} }
+    if response.committed?
+      # A streaming response (eg, with `@defer`) already started, so `render` would fail
+      response.stream.write(error_json.to_json)
+    else
+      render json: error_json, status: 500
+    end
   end
 end
 <% end -%>

data/lib/graphql/analysis/max_query_complexity.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   module Analysis
     # Used under the hood to implement complexity validation,
     # See [Schema.max_complexity](rdoc-ref:GraphQL::Schema.max_complexity) and `Query#max_complexity`.
     class MaxQueryComplexity < QueryComplexity
+      #: -> GraphQL::AnalysisError?
       def result
         return if subject.max_complexity.nil?
 

data/lib/graphql/analysis/max_query_depth.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   module Analysis
     class MaxQueryDepth < QueryDepth
+      #: -> GraphQL::AnalysisError?
       def result
         configured_max_depth = if query
           query.max_depth

data/lib/graphql/analysis/query_complexity.rb

@@ -308,7 +308,8 @@ module GraphQL
             field_complexity(composite_scopes.last, max_complexity: field_cost, child_complexity: child_complexity)
           end
 
-          total + field_cost
+          # Like `merged_max_complexity`, a field never reduces the cost of its siblings.
+          field_cost > 0 ? total + field_cost : total
         end
       end
     end

data/lib/graphql/analysis/query_depth.rb

@@ -30,7 +30,7 @@ module GraphQL
     # ```
     class QueryDepth < Analyzer
       def initialize(query)
-        @max_depth = 0
+        @max_depth = 0 #: Integer
         @current_depth = 0
         @count_introspection_fields = query.schema.count_introspection_fields
         super

data/lib/graphql/analysis/visitor.rb

@@ -25,6 +25,8 @@ module GraphQL
         @types = query.types
         @response_path = []
         @skip_stack = [false]
+        # For each selection set being visited, the fragments already inlined into it.
+        @inlined_fragments_stack = [{}]
         @timeout_time = if timeout
           Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second) + timeout
         else
@@ -129,9 +131,11 @@ module GraphQL
         object_type = @schema.root_type_for_operation(node.operation_type)
         @object_types.push(object_type)
         @path.push("#{node.operation_type}#{node.name ? " #{node.name}" : ""}")
+        @inlined_fragments_stack.push({})
         call_on_enter_operation_definition(node, parent)
         super
         call_on_leave_operation_definition(node, parent)
+        @inlined_fragments_stack.pop
         @object_types.pop
         @path.pop
       end
@@ -173,10 +177,12 @@ module GraphQL
         @skipping = @skip_stack.last || skip?(node)
         @skip_stack << @skipping
 
+        @inlined_fragments_stack.push({})
         call_on_enter_field(node, parent)
         super
         @skipping = @skip_stack.pop
         call_on_leave_field(node, parent)
+        @inlined_fragments_stack.pop
         @response_path.pop
         @field_definitions.pop
         @object_types.pop
@@ -226,10 +232,16 @@ module GraphQL
         @skip_stack << @skipping
 
         call_on_enter_fragment_spread(node, parent)
-        enter_fragment_spread_inline(node)
+        # Spreading the same fragment again into this selection set adds no new selections, so don't visit it again.
+        inlined_fragments = @inlined_fragments_stack.last
+        inlined_key = [node.name, @object_types.last, @skipping]
+        if (inline_fragment = !inlined_fragments.key?(inlined_key))
+          inlined_fragments[inlined_key] = true
+        end
+        enter_fragment_spread_inline(node) if inline_fragment
         super
         @skipping = @skip_stack.pop
-        leave_fragment_spread_inline(node)
+        leave_fragment_spread_inline(node) if inline_fragment
         call_on_leave_fragment_spread(node, parent)
         @path.pop
       end

data/lib/graphql/analysis.rb

@@ -97,17 +97,16 @@ module GraphQL
           EmptyObjects::EMPTY_ARRAY
         end
       end
-    rescue TimeoutError => err
+    rescue GraphQL::ExecutionError => err
       [err]
-    rescue GraphQL::UnauthorizedError, GraphQL::ExecutionError
-      # This error was raised during analysis and will be returned the client before execution
-      EmptyObjects::EMPTY_ARRAY
+    rescue GraphQL::UnauthorizedError => err
+      [GraphQL::AnalysisError.new(err.message)]
     end
 
     def analysis_errors(parent_errors, results)
       if !results.empty?
         results = results.flatten
-        results.select! { |r| r.is_a?(GraphQL::AnalysisError) }
+        results.select! { |r| r.is_a?(GraphQL::ExecutionError) }
       end
 
       if parent_errors.empty?

data/lib/graphql/analysis_error.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   class AnalysisError < GraphQL::ExecutionError
   end

data/lib/graphql/coercion_error.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   class CoercionError < GraphQL::ExecutionError
   end

data/lib/graphql/current.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 
 module GraphQL
   # This module exposes Fiber-level runtime information.
@@ -32,6 +32,7 @@ module GraphQL
     #
     # :call-seq:
     #   operation_name() -> String | nil
+    #: () -> String?
     def self.operation_name
       if (m = Fiber[:__graphql_current_multiplex])
         m.context[:__graphql_current_operation_name] ||= begin
@@ -55,6 +56,7 @@ module GraphQL
     #
     # :call-seq:
     #   field() -> GraphQL::Field | nil
+    #: () -> GraphQL::Schema::Field?
     def self.field
       if (interpreter_info = Fiber[:__graphql_runtime_info])
         interpreter_info.values&.first&.current_field
@@ -71,6 +73,7 @@ module GraphQL
     #
     # :call-seq:
     #   dataloader_source_class() -> Class | nil
+    #: () -> singleton(GraphQL::Dataloader::Source)?
     def self.dataloader_source_class
       Fiber[:__graphql_current_dataloader_source]&.class
     end
@@ -81,6 +84,7 @@ module GraphQL
     #
     # :call-seq:
     #   dataloader_source() -> GraphQL::Dataloader::Source | nil
+    #: () -> GraphQL::Dataloader::Source?
     def self.dataloader_source
       Fiber[:__graphql_current_dataloader_source]
     end

data/lib/graphql/dashboard.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 require 'rails/engine'
 require 'action_controller'
 module Graphql

data/lib/graphql/date_encoding_error.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   # This error is raised when `Types::ISO8601Date` is asked to return a value
   # that cannot be parsed to a Ruby Date.
@@ -7,8 +7,10 @@ module GraphQL
   # See [GraphQL::Types::ISO8601Date](rdoc-ref:GraphQL::Types::ISO8601Date) which raises this error
   class DateEncodingError < GraphQL::RuntimeTypeError
     # The value which couldn't be encoded
+    #: untyped
     attr_reader :date_value
 
+    #: (untyped value) -> void
     def initialize(value)
       @date_value = value
       super("Date cannot be parsed: #{value}. \nDate must be able to be parsed as a Ruby Date object.")

data/lib/graphql/duration_encoding_error.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   # This error is raised when `Types::ISO8601Duration` is asked to return a value
   # that cannot be parsed as an ISO8601-formatted duration by ActiveSupport::Duration.
@@ -7,8 +7,10 @@ module GraphQL
   # See [GraphQL::Types::ISO8601Duration](rdoc-ref:GraphQL::Types::ISO8601Duration) which raises this error
   class DurationEncodingError < GraphQL::RuntimeTypeError
     # The value which couldn't be encoded
+    #: untyped
     attr_reader :duration_value
 
+    #: (untyped value) -> void
     def initialize(value)
       @duration_value = value
       super("Duration cannot be parsed: #{value}. \nDuration must be an ISO8601-formatted duration.")

data/lib/graphql/execution/directive_checks.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   module Execution
     # Boolean checks for how an AST node's directives should
@@ -16,6 +16,7 @@ module GraphQL
       #
       # :call-seq:
       #   include?(directive_ast_nodes, query) -> bool
+      #: (Array[GraphQL::Language::Nodes::Directive] directive_ast_nodes, GraphQL::Query query) -> bool
       def include?(directive_ast_nodes, query)
         directive_ast_nodes.each do |directive_ast_node|
           name = directive_ast_node.name

data/lib/graphql/execution/errors.rb

@@ -1,9 +1,14 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 
 module GraphQL
   module Execution
     class Errors
+      # One level of a schema's `rescue_from` index: the handler registered for `class` (if any),
+      # plus handlers for its subclasses, keyed by error class.
+      # (Sorbet doesn't support recursive type aliases, so the nested entries are `untyped`.)
+      #: type handler_entry = { class: singleton(Exception)?, handler: Proc?, subclass_handlers: Hash[singleton(Exception), untyped] }
+
       # Register this handler, updating the
       # internal handler index to maintain least-to-most specific.
       #
@@ -19,9 +24,10 @@ module GraphQL
       #
       # :call-seq:
       #   register_rescue_from(Class[Exception] error_class, Hash error_handlers, Proc error_handler) -> void
+      #: (singleton(Exception) error_class, Hash[singleton(Exception), handler_entry] error_handlers, Proc error_handler) -> void
       def self.register_rescue_from(error_class, error_handlers, error_handler)
-        subclasses_handlers = {}
-        this_level_subclasses = []
+        subclasses_handlers = {} #: Hash[singleton(Exception), handler_entry]
+        this_level_subclasses = [] #: Array[singleton(Exception)]
         # During this traversal, do two things:
         # - Identify any already-registered subclasses of this error class
         #   and gather them up to be inserted _under_ this class
@@ -46,7 +52,7 @@ module GraphQL
           # See if any keys in this hash are superclasses of this new class:
           next_index_point = error_handlers.find { |err_class, handler| error_class < err_class }
           if next_index_point
-            error_handlers = next_index_point[1][:subclass_handlers]
+            error_handlers = next_index_point[1][:subclass_handlers] #: as Hash[singleton(Exception), handler_entry]
           else
             # this new handler doesn't belong to any sub-handlers,
             # so insert it in the current set of `handlers`
@@ -55,7 +61,8 @@ module GraphQL
         end
         # Having found the point at which to insert this handler,
         # register it and merge any subclass handlers back in at this point.
-        this_class_handlers = error_handlers[error_class]
+        # `error_handlers` has a default proc, so this is never `nil`:
+        this_class_handlers = error_handlers[error_class] #: as !nil
         this_class_handlers[:handler] = error_handler
         this_class_handlers[:subclass_handlers].merge!(subclasses_handlers)
         nil
@@ -67,9 +74,10 @@ module GraphQL
       #
       # :call-seq:
       #   find_handler_for(schema, error_class) -> Proc | nil
+      #: (singleton(GraphQL::Schema) schema, singleton(Exception) error_class) -> handler_entry?
       def self.find_handler_for(schema, error_class)
         handlers = schema.error_handlers[:subclass_handlers]
-        handler = nil #: untyped
+        handler = nil #: handler_entry?
         while (handlers) do
           _err_class, next_handler = handlers.find { |err_class, handler| error_class <= err_class }
           if next_handler
@@ -84,7 +92,10 @@ module GraphQL
 
         # check for a handler from a parent class:
         if schema.superclass.respond_to?(:error_handlers)
-          parent_handler = find_handler_for(schema.superclass, error_class)
+          parent_handler = find_handler_for(
+            schema.superclass, #: as singleton(GraphQL::Schema)
+            error_class,
+          )
         end
 
         # If the inherited handler is more specific than the one defined here,

data/lib/graphql/execution/field_resolve_step.rb

@@ -184,7 +184,7 @@ module GraphQL
         field_name = @ast_node.name
         @field_definition = query.types.field(@parent_type, field_name) || raise(GraphQL::Error, "No field definition found for #{@parent_type.to_type_signature}.#{ast_node.name} (at #{@ast_node.position})")
         set_current_field
-        @arguments, errors = @runner.input_values[query].argument_values(@field_definition, @ast_node.arguments, self) # rubocop:disable Development/ContextIsPassedCop
+        @arguments, errors = query.input_values.argument_values(@field_definition, @ast_node.arguments, self) # rubocop:disable Development/ContextIsPassedCop
         if errors
           build_errors_result(errors, nil)
           return
@@ -201,7 +201,7 @@ module GraphQL
       # Used for compatibility in Schema::Subscription
       def arguments_without_loads
         if @arguments_without_loads.nil?
-          @arguments_without_loads, _errors = @runner.input_values[@selections_step.query].argument_values(@field_definition, ast_node.arguments, nil)
+          @arguments_without_loads, _errors = @selections_step.query.input_values.argument_values(@field_definition, ast_node.arguments, nil)
         end
         @arguments_without_loads
       end
@@ -550,7 +550,7 @@ module GraphQL
           if directives
             directives.each do |dir_node|
               if (dir_defn = @runner.runtime_directives[dir_node.name])
-                dir_args, errors = @runner.input_values[query].argument_values(dir_defn, dir_node.arguments, self)  # rubocop:disable Development/ContextIsPassedCop
+                dir_args, errors = query.input_values.argument_values(dir_defn, dir_node.arguments, self)  # rubocop:disable Development/ContextIsPassedCop
                 if errors
                   @results.each { |r| r.delete(@key) }
                   errors.each { |e| e.ast_node = dir_node }