graphql 2.6.14 → 2.6.15

data/lib/graphql/query.rb

@@ -47,7 +47,6 @@ module GraphQL
     autoload :NullContext, "graphql/query/null_context"
     autoload :Partial, "graphql/query/partial"
     autoload :Result, "graphql/query/result"
-    autoload :Variables, "graphql/query/variables"
     autoload :InputValidationResult, "graphql/query/input_validation_result"
     autoload :VariableValidationError, "graphql/query/variable_validation_error"
     autoload :ValidationPipeline, "graphql/query/validation_pipeline"
@@ -236,6 +235,7 @@ module GraphQL
       @root_value = root_value
       @fragments = nil
       @operations = nil
+      @input_values = nil
       @finalizers = @top_level_finalizers = nil
       @validate = validate
       self.static_validator = static_validator if static_validator
@@ -332,6 +332,10 @@ module GraphQL
       end
     end
 
+    def input_values # :nodoc:
+      @input_values ||= Execution::InputValues.new(self)
+    end
+
     def result_values=(result_hash) # :nodoc:
       if @executed
         raise "Invariant: Can't reassign result"
@@ -424,20 +428,12 @@ module GraphQL
     #
     # **Returns**
     #
-    # - `GraphQL::Query::Variables` — Variables to apply to this query
+    # - `GraphQL::Execution::VariableValues` — Variables to apply to this query
     #
     # :call-seq:
-    #   variables() -> GraphQL::Query::Variables
+    #   variables() -> GraphQL::Execution::VariableValues
     def variables
-      @variables ||= begin
-        with_prepared_ast {
-          GraphQL::Query::Variables.new(
-            @context,
-            @ast_variables,
-            @provided_variables,
-          )
-        }
-      end
+      @variables ||= with_prepared_ast { input_values.variable_values }
     end
 
     # A version of the given query string, with:

data/lib/graphql/railtie.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 
 module GraphQL
   # Support [GraphQL::Language::Cache](rdoc-ref:GraphQL::Language::Cache) and [GraphQL.eager_load!](rdoc-ref:GraphQL.eager_load!)

data/lib/graphql/relay.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 
 require 'graphql/relay/range_add'

data/lib/graphql/rubocop.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 
 require "graphql/rubocop/graphql/default_null_true"
 require "graphql/rubocop/graphql/default_required_true"

data/lib/graphql/runtime_error.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   class RuntimeError < Error
     include GraphQL::Execution::Finalizer

data/lib/graphql/runtime_type_error.rb

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

data/lib/graphql/schema/always_visible.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   class Schema
     module AlwaysVisible
+      #: (singleton(GraphQL::Schema) schema, **untyped opts) -> void
       def self.use(schema, **opts)
         schema.use(GraphQL::Schema::Visibility, profiles: { nil => {} })
         schema.extend(self)
       end
 
+      #: (untyped _member, GraphQL::Query::Context _context) -> bool
       def visible?(_member, _context)
         true
       end

data/lib/graphql/schema/base_64_encoder.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 require "base64"
 module GraphQL
   class Schema
     module Base64Encoder # :nodoc:
+      #: (String unencoded_text, ?nonce: bool) -> String
       def self.encode(unencoded_text, nonce: false)
         Base64.urlsafe_encode64(unencoded_text, padding: false)
       end
 
+      #: (String encoded_text, ?nonce: bool) -> String
       def self.decode(encoded_text, nonce: false)
         # urlsafe_decode64 is for forward compatibility
         Base64.urlsafe_decode64(encoded_text)

data/lib/graphql/schema/built_in_types.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   class Schema
     BUILT_IN_TYPES = {
@@ -8,6 +8,6 @@ module GraphQL
       "Float" => GraphQL::Types::Float,
       "Boolean" => GraphQL::Types::Boolean,
       "ID" => GraphQL::Types::ID,
-    }
+    } #: Hash[String, GraphQL::Schema::Member::type_definition]
   end
 end

data/lib/graphql/schema/directive/deprecated.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   class Schema
     class Directive < GraphQL::Schema::Member

data/lib/graphql/schema/directive/include.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   class Schema
     class Directive < GraphQL::Schema::Member
@@ -17,6 +17,7 @@ module GraphQL
 
         default_directive true
 
+        #: (Hash[Symbol, untyped] args, GraphQL::Query::Context ctx) -> bool
         def self.static_include?(args, ctx)
           !!args[:if]
         end

data/lib/graphql/schema/directive/skip.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   class Schema
     class Directive < GraphQL::Schema::Member
@@ -17,6 +17,7 @@ module GraphQL
 
         default_directive true
 
+        #: (Hash[Symbol, untyped] args, GraphQL::Query::Context ctx) -> bool
         def self.static_include?(args, ctx)
           !args[:if]
         end

data/lib/graphql/schema/directive/specified_by.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   class Schema
     class Directive < GraphQL::Schema::Member

data/lib/graphql/schema/field/scope_extension.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 
 module GraphQL
   class Schema
     class Field
       class ScopeExtension < GraphQL::Schema::FieldExtension
+        #: (object: untyped, arguments: Hash[Symbol, untyped], context: GraphQL::Query::Context, value: untyped, memo: untyped) -> untyped
         def after_resolve(object:, arguments:, context:, value:, memo:)
           if object.is_a?(GraphQL::Schema::Object)
             if value.nil?

data/lib/graphql/schema/field.rb

@@ -987,6 +987,9 @@ module GraphQL
 
           if max_possible_page_size.nil?
             max_possible_page_size = default_page_size || query.schema.default_page_size || max_page_size || query.schema.default_max_page_size
+          elsif max_possible_page_size < 0
+            # Pagination returns no items for a negative `first:` or `last:`, so it mustn't subtract from the total.
+            max_possible_page_size = 0
           end
 
           if max_possible_page_size.nil?

data/lib/graphql/schema/find_inherited_value.rb

@@ -1,20 +1,24 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   class Schema
     #--
     # @requires_ancestor: Module
     module FindInheritedValue
+      #: (Module[untyped] child_cls) -> void
       def self.extended(child_cls)
         child_cls.singleton_class.include(GraphQL::EmptyObjects)
       end
 
+      #: (Module[untyped] child_cls) -> void
       def self.included(child_cls)
         child_cls.include(GraphQL::EmptyObjects)
       end
 
       private
 
+      # Returns whatever the inherited configuration method returns, so the result is `untyped`.
+      #: (Symbol method_name, ?untyped default_value) -> untyped
       def find_inherited_value(method_name, default_value = nil)
         if self.is_a?(Class)
           superclass.respond_to?(method_name, true) ? superclass.send(method_name) : default_value

data/lib/graphql/schema/member/graphql_type_names.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 
 module GraphQL
   class Schema

data/lib/graphql/schema/member/has_directives.rb

@@ -91,32 +91,18 @@ module GraphQL
               else
                 GraphQL::EmptyObjects::EMPTY_ARRAY
               end
-            when Module
-              dirs = nil #: Array[GraphQL::Schema::Directive]?
-              ancestors = schema_member.ancestors #: Array[untyped]
-              ancestors.reverse_each do |ancestor|
-                if ancestor.respond_to?(:own_directives) &&
-                    !(anc_dirs = ancestor.own_directives).empty?
-                  dirs ||= []
-                  merge_directives(dirs, anc_dirs)
-                end
-              end
-              if directives
-                dirs ||= []
-                merge_directives(dirs, directives)
-              end
-              dirs || GraphQL::EmptyObjects::EMPTY_ARRAY
             when HasDirectives
               directives || GraphQL::EmptyObjects::EMPTY_ARRAY
             else
-              raise "Invariant: how could #{schema_member} not be a Class, Module, or instance of HasDirectives?"
+              raise "Invariant: how could #{schema_member} not be a Class or instance of HasDirectives?"
             end
           end
 
           private
 
           # Modify `target` by adding items from `dirs` such that:
-          # - Any name conflict is overridden by the incoming member of `dirs`
+          # - Any name conflict is overridden by the incoming member(s) of `dirs`.
+          #   (Repeatable directives replace _all_ same-named directives in `target`, and all incoming ones are kept.)
           # - Any other member of `dirs` is appended
           #
           # **Parameters**
@@ -131,14 +117,26 @@ module GraphQL
           # :call-seq:
           #   merge_directives(Array[GraphQL::Schema::Directive] target, Array[GraphQL::Schema::Directive] dirs) -> void
           def merge_directives(target, dirs)
-            dirs.each do |dir|
-              if (idx = target.find_index { |d| d.graphql_name == dir.graphql_name })
-                target.slice!(idx)
-                target.insert(idx, dir)
+            incoming = dirs.group_by(&:graphql_name)
+            merged = [] #: Array[GraphQL::Schema::Directive]
+            target.each do |d|
+              name = d.graphql_name
+              if incoming.key?(name)
+                # Put the incoming directive(s) where the first overridden one was
+                if (replacements = incoming[name])
+                  merged.concat(replacements)
+                  incoming[name] = nil
+                end
               else
-                target << dir
+                merged << d
+              end
+            end
+            dirs.each do |dir|
+              if incoming[dir.graphql_name]
+                merged << dir
               end
             end
+            target.replace(merged)
             nil
           end
         end

data/lib/graphql/schema/member/has_path.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 
 module GraphQL
   class Schema
@@ -13,6 +13,7 @@ module GraphQL
         #
         # :call-seq:
         #   path() -> String
+        #: -> String?
         def path
           member = self #: untyped
           path_str = if member.respond_to?(:graphql_name)

data/lib/graphql/schema/member/has_unresolved_type_error.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 
 module GraphQL
   class Schema
@@ -7,6 +7,7 @@ module GraphQL
       # Set up a type-specific error to make debugging & bug tracker integration better
       module HasUnresolvedTypeError
         private
+        #: (Module[untyped] child_class) -> void
         def add_unresolved_type_error(child_class)
           if child_class.name # Don't set this for anonymous classes
             child_class.const_set(:UnresolvedTypeError, Class.new(GraphQL::UnresolvedTypeError))

data/lib/graphql/schema/member.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 require 'graphql/schema/member/base_dsl_methods'
 require 'graphql/schema/member/graphql_type_names'
 require 'graphql/schema/member/has_ast_node'
@@ -23,7 +23,7 @@ module GraphQL
     #
     class Member # :nodoc:
       # A module that defines a GraphQL interface type (it includes `GraphQL::Schema::Interface`).
-      #: type interface_definition = GraphQL::Schema::Interface::DefinitionMethods & Module
+      #: type interface_definition = GraphQL::Schema::Interface::DefinitionMethods & Module[untyped]
 
       # A class or module that defines a GraphQL type:
       # an object, union, enum, scalar or input object class, or an interface module.
@@ -40,6 +40,7 @@ module GraphQL
       extend HasAstNode
       extend HasDirectives
 
+      #: (GraphQL::Query::Context _ctx) -> bool
       def self.authorizes?(_ctx)
         false
       end

data/lib/graphql/schema/mutation.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 
 module GraphQL
   class Schema
@@ -67,6 +67,8 @@ module GraphQL
       extend GraphQL::Schema::Member::HasFields
       extend GraphQL::Schema::Resolver::HasPayloadType
 
+      # Returns the application's resolved value.
+      #: (Hash[Symbol, untyped] _args_hash) -> untyped
       def call_resolve(_args_hash) # :nodoc:
         # Clear any cached values from `loads` or authorization:
         dataloader.clear_cache
@@ -74,17 +76,20 @@ module GraphQL
       end
 
       class << self
+        #: (GraphQL::Query::Context context) -> bool
         def visible?(context)
           true
         end
 
         private
 
+        #: (GraphQL::Schema::Field field_defn) -> String
         def conflict_field_name_warning(field_defn)
           "#{self.graphql_name}'s `field :#{field_defn.name}` conflicts with a built-in method, use `hash_key:` or `method:` to pick a different resolve behavior for this field (for example, `hash_key: :#{field_defn.resolver_method}_value`, and modify the return hash). Or use `method_conflict_warning: false` to suppress this warning."
         end
 
         # Override this to attach self as `mutation`
+        #: () -> singleton(GraphQL::Schema::Object)
         def generate_payload_type
           payload_class = super
           payload_class.mutation(self)

data/lib/graphql/schema/object.rb

@@ -89,7 +89,7 @@ module GraphQL
         #   authorized_new(Object object, GraphQL::Query::Context context) -> GraphQL::Schema::Object | GraphQL::Execution::Lazy | GraphQL::UnauthorizedError
         def authorized_new(object, context)
           context.query.current_trace.begin_authorized(self, object, context)
-          raised_auth_err = nil
+          raised_auth_err = nil #: GraphQL::UnauthorizedError?
           begin
             maybe_lazy_auth_val = context.query.current_trace.authorized(query: context.query, type: self, object: object) do
               begin

data/lib/graphql/schema/resolver.rb

@@ -125,7 +125,7 @@ module GraphQL
         exec_result[exec_index] = err
       rescue StandardError => stderr
         exec_result[exec_index] = begin
-          context.query.handle_or_reraise(stderr)
+          context.query.handle_or_reraise(stderr, field: @field, arguments: @prepared_arguments, object: object)
         rescue GraphQL::ExecutionError => ex_err
           ex_err
         end
@@ -265,7 +265,7 @@ module GraphQL
       end
 
       def self.authorizes?(context)
-        self.instance_method(:authorized?).owner != GraphQL::Schema::Resolver
+        self.instance_method(:authorized?).owner != GraphQL::Schema::Resolver || super
       end
 
       # Called when an object loaded by `loads:` fails the `.authorized?` check for its resolved GraphQL object type.

data/lib/graphql/schema/type_expression.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   class Schema
     module TypeExpression # :nodoc:
@@ -17,6 +17,7 @@ module GraphQL
       #
       # :call-seq:
       #   build_type(#type type_owner, GraphQL::Language::Nodes::AbstractNode ast_node) -> Class | GraphQL::Schema::NonNull | GraphQL::Schema:List
+      #: (GraphQL::Schema::Visibility::Profile | GraphQL::Schema::Warden::VisibilityProfile type_owner, GraphQL::Language::Nodes::AbstractNode ast_node) -> (GraphQL::Schema::Member::type_definition | GraphQL::Schema::NonNull | GraphQL::Schema::List | nil)
       def self.build_type(type_owner, ast_node)
         case ast_node
         when GraphQL::Language::Nodes::TypeName
@@ -37,6 +38,7 @@ module GraphQL
       class << self
         private
 
+        #: (GraphQL::Schema::Member::type_definition | GraphQL::Schema::NonNull | GraphQL::Schema::List | nil type, Symbol wrapper_method) -> (GraphQL::Schema::NonNull | GraphQL::Schema::List | nil)
         def wrap_type(type, wrapper_method)
           if type.nil?
             nil

data/lib/graphql/schema/validator/all_validator.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 
 module GraphQL
   class Schema
@@ -29,16 +29,19 @@ module GraphQL
       #   validates: { all: { inclusion: { in: 1..12 } } }
       # ```
       class AllValidator < Validator
+        # `validators` is configuration for other validators, for example `{ format: { with: /.../ } }`.
+        #: (validated: GraphQL::Schema::Argument | GraphQL::Schema::Field | singleton(GraphQL::Schema::Resolver) | singleton(GraphQL::Schema::InputObject), ?allow_blank: bool, ?allow_null: bool, **untyped validators) -> void
         def initialize(validated:, allow_blank: false, allow_null: false, **validators)
           super(validated: validated, allow_blank: allow_blank, allow_null: allow_null)
 
-          @validators = Validator.from_config(validated, validators)
+          @validators = Validator.from_config(validated, validators) #: Array[GraphQL::Schema::Validator]
         end
 
+        #: (untyped object, GraphQL::Query::Context context, untyped value) -> Array[String]
         def validate(object, context, value)
           return EMPTY_ARRAY if permitted_empty_value?(value)
 
-          all_errors = EMPTY_ARRAY
+          all_errors = EMPTY_ARRAY #: Array[String]
 
           value.each do |subvalue|
             @validators.each do |validator|

data/lib/graphql/static_validation/all_rules.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: true
+# typed: strict
 module GraphQL
   module StaticValidation
     # Default rules for [GraphQL::StaticValidation::Validator](rdoc-ref:GraphQL::StaticValidation::Validator)