graphql 2.3.22 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 547c1ab3228597f7ef84159baa8240d238a6007c58ca07ac0211e6808c5c945e
-  data.tar.gz: c6af3b740337acb1b79d24a1d9f69eaa7645519976a8f03003c4e910d35021e9
+  metadata.gz: 26e43b0bc48317698ed17f8a11498c19a7a4a0df9d33fdc9785edc47ae1147b6
+  data.tar.gz: 74402e930ebe03a451bc2bdb82285642aeeba7222ab491dd9329400fc852eb41
 SHA512:
-  metadata.gz: 3bd8fa839c18bb775e16cbc89d41a1bbc2b829e818c13e278751c9eeeee5b1e8cdfb3b103f450d7294ed13d261eba128ad0bf608d04d40d68cf9b8f619a640ad
-  data.tar.gz: 7e3c8c1e2a8bbbb8ff21c7f8cf4fa7d8e79d96227475d06862516b04d56e25050d7549b2863f9bbc082caf2d25065843e6938af809fcb5453a38eab5ed5b09ea
+  metadata.gz: f1d97c4397ca8410f6b62c3ea2de9a0a4b18ca610adcb92de9676c5377b00a071cbff4fbd0396760eea9ab359e4b0b8cdfff1630c9fa83de51cfd31b0b96307f
+  data.tar.gz: d9250a9ad1d57f40e7b0151484f77a66e11a361f8b0f50938f42219eb8322a9b4dc59c59102f4b49f62a28e90f03b8f9e0cf5b2799b5fd5080dbcf443cebac15

data/lib/graphql/analysis/analyzer.rb

@@ -42,7 +42,6 @@ module GraphQL
         raise GraphQL::RequiredImplementationMissingError
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
       class << self
         private
 
@@ -73,7 +72,7 @@ module GraphQL
       build_visitor_hooks :variable_definition
       build_visitor_hooks :variable_identifier
       build_visitor_hooks :abstract_node
-      # rubocop:enable Development/NoEvalCop
+
       protected
 
       # @return [GraphQL::Query, GraphQL::Execution::Multiplex] Whatever this analyzer is analyzing

data/lib/graphql/analysis/visitor.rb

@@ -64,7 +64,6 @@ module GraphQL
         @response_path.dup
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
       # Visitor Hooks
       [
         :operation_definition, :fragment_definition,
@@ -93,7 +92,6 @@ module GraphQL
 
         RUBY
       end
-      # rubocop:enable Development/NoEvalCop
 
       def on_operation_definition(node, parent)
         object_type = @schema.root_type_for_operation(node.operation_type)

data/lib/graphql/language/nodes.rb

@@ -141,8 +141,6 @@ module GraphQL
         end
 
         class << self
-          # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
           # Add a default `#visit_method` and `#children_method_name` using the class name
           def inherited(child_class)
             super
@@ -345,7 +343,6 @@ module GraphQL
               RUBY
             end
           end
-          # rubocop:enable Development/NoEvalCop
         end
       end
 

data/lib/graphql/language/static_visitor.rb

@@ -22,6 +22,39 @@ module GraphQL
         end
       end
 
+      # We don't use `alias` here because it breaks `super`
+      def self.make_visit_methods(ast_node_class)
+        node_method = ast_node_class.visit_method
+        children_of_type = ast_node_class.children_of_type
+        child_visit_method = :"#{node_method}_children"
+
+        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          # The default implementation for visiting an AST node.
+          # It doesn't _do_ anything, but it continues to visiting the node's children.
+          # To customize this hook, override one of its make_visit_methods (or the base method?)
+          # in your subclasses.
+          #
+          # @param node [GraphQL::Language::Nodes::AbstractNode] the node being visited
+          # @param parent [GraphQL::Language::Nodes::AbstractNode, nil] the previously-visited node, or `nil` if this is the root node.
+          # @return [void]
+          def #{node_method}(node, parent)
+            #{
+              if method_defined?(child_visit_method)
+                "#{child_visit_method}(node)"
+              elsif children_of_type
+                children_of_type.map do |child_accessor, child_class|
+                  "node.#{child_accessor}.each do |child_node|
+                    #{child_class.visit_method}(child_node, node)
+                  end"
+                end.join("\n")
+              else
+                ""
+              end
+            }
+          end
+        RUBY
+      end
+
       def on_document_children(document_node)
         document_node.children.each do |child_node|
           visit_method = child_node.visit_method
@@ -90,41 +123,6 @@ module GraphQL
         end
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
-      # We don't use `alias` here because it breaks `super`
-      def self.make_visit_methods(ast_node_class)
-        node_method = ast_node_class.visit_method
-        children_of_type = ast_node_class.children_of_type
-        child_visit_method = :"#{node_method}_children"
-
-        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          # The default implementation for visiting an AST node.
-          # It doesn't _do_ anything, but it continues to visiting the node's children.
-          # To customize this hook, override one of its make_visit_methods (or the base method?)
-          # in your subclasses.
-          #
-          # @param node [GraphQL::Language::Nodes::AbstractNode] the node being visited
-          # @param parent [GraphQL::Language::Nodes::AbstractNode, nil] the previously-visited node, or `nil` if this is the root node.
-          # @return [void]
-          def #{node_method}(node, parent)
-            #{
-              if method_defined?(child_visit_method)
-                "#{child_visit_method}(node)"
-              elsif children_of_type
-                children_of_type.map do |child_accessor, child_class|
-                  "node.#{child_accessor}.each do |child_node|
-                    #{child_class.visit_method}(child_node, node)
-                  end"
-                end.join("\n")
-              else
-                ""
-              end
-            }
-          end
-        RUBY
-      end
-
       [
         Language::Nodes::Argument,
         Language::Nodes::Directive,
@@ -164,8 +162,6 @@ module GraphQL
       ].each do |ast_node_class|
         make_visit_methods(ast_node_class)
       end
-
-      # rubocop:disable Development/NoEvalCop
     end
   end
 end

data/lib/graphql/language/visitor.rb

@@ -61,6 +61,61 @@ module GraphQL
         end
       end
 
+      # We don't use `alias` here because it breaks `super`
+      def self.make_visit_methods(ast_node_class)
+        node_method = ast_node_class.visit_method
+        children_of_type = ast_node_class.children_of_type
+        child_visit_method = :"#{node_method}_children"
+
+        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          # The default implementation for visiting an AST node.
+          # It doesn't _do_ anything, but it continues to visiting the node's children.
+          # To customize this hook, override one of its make_visit_methods (or the base method?)
+          # in your subclasses.
+          #
+          # @param node [GraphQL::Language::Nodes::AbstractNode] the node being visited
+          # @param parent [GraphQL::Language::Nodes::AbstractNode, nil] the previously-visited node, or `nil` if this is the root node.
+          # @return [Array, nil] If there were modifications, it returns an array of new nodes, otherwise, it returns `nil`.
+          def #{node_method}(node, parent)
+            if node.equal?(DELETE_NODE)
+              # This might be passed to `super(DELETE_NODE, ...)`
+              # by a user hook, don't want to keep visiting in that case.
+              [node, parent]
+            else
+              new_node = node
+              #{
+                if method_defined?(child_visit_method)
+                  "new_node = #{child_visit_method}(new_node)"
+                elsif children_of_type
+                  children_of_type.map do |child_accessor, child_class|
+                    "node.#{child_accessor}.each do |child_node|
+                      new_child_and_node = #{child_class.visit_method}_with_modifications(child_node, new_node)
+                      # Reassign `node` in case the child hook makes a modification
+                      if new_child_and_node.is_a?(Array)
+                        new_node = new_child_and_node[1]
+                      end
+                    end"
+                  end.join("\n")
+                else
+                  ""
+                end
+              }
+
+              if new_node.equal?(node)
+                [node, parent]
+              else
+                [new_node, parent]
+              end
+            end
+          end
+
+          def #{node_method}_with_modifications(node, parent)
+            new_node_and_new_parent = #{node_method}(node, parent)
+            apply_modifications(node, parent, new_node_and_new_parent)
+          end
+        RUBY
+      end
+
       def on_document_children(document_node)
         new_node = document_node
         document_node.children.each do |child_node|
@@ -161,63 +216,6 @@ module GraphQL
         new_node
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
-      # We don't use `alias` here because it breaks `super`
-      def self.make_visit_methods(ast_node_class)
-        node_method = ast_node_class.visit_method
-        children_of_type = ast_node_class.children_of_type
-        child_visit_method = :"#{node_method}_children"
-
-        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          # The default implementation for visiting an AST node.
-          # It doesn't _do_ anything, but it continues to visiting the node's children.
-          # To customize this hook, override one of its make_visit_methods (or the base method?)
-          # in your subclasses.
-          #
-          # @param node [GraphQL::Language::Nodes::AbstractNode] the node being visited
-          # @param parent [GraphQL::Language::Nodes::AbstractNode, nil] the previously-visited node, or `nil` if this is the root node.
-          # @return [Array, nil] If there were modifications, it returns an array of new nodes, otherwise, it returns `nil`.
-          def #{node_method}(node, parent)
-            if node.equal?(DELETE_NODE)
-              # This might be passed to `super(DELETE_NODE, ...)`
-              # by a user hook, don't want to keep visiting in that case.
-              [node, parent]
-            else
-              new_node = node
-              #{
-                if method_defined?(child_visit_method)
-                  "new_node = #{child_visit_method}(new_node)"
-                elsif children_of_type
-                  children_of_type.map do |child_accessor, child_class|
-                    "node.#{child_accessor}.each do |child_node|
-                      new_child_and_node = #{child_class.visit_method}_with_modifications(child_node, new_node)
-                      # Reassign `node` in case the child hook makes a modification
-                      if new_child_and_node.is_a?(Array)
-                        new_node = new_child_and_node[1]
-                      end
-                    end"
-                  end.join("\n")
-                else
-                  ""
-                end
-              }
-
-              if new_node.equal?(node)
-                [node, parent]
-              else
-                [new_node, parent]
-              end
-            end
-          end
-
-          def #{node_method}_with_modifications(node, parent)
-            new_node_and_new_parent = #{node_method}(node, parent)
-            apply_modifications(node, parent, new_node_and_new_parent)
-          end
-        RUBY
-      end
-
       [
         Language::Nodes::Argument,
         Language::Nodes::Directive,
@@ -258,8 +256,6 @@ module GraphQL
         make_visit_methods(ast_node_class)
       end
 
-      # rubocop:enable Development/NoEvalCop
-
       private
 
       def apply_modifications(node, parent, new_node_and_new_parent)

data/lib/graphql/schema/argument.rb

@@ -53,7 +53,6 @@ module GraphQL
       def initialize(arg_name = nil, type_expr = nil, desc = nil, required: true, type: nil, name: nil, loads: nil, description: nil, comment: nil, ast_node: nil, default_value: NOT_CONFIGURED, as: nil, from_resolver: false, camelize: true, prepare: nil, owner:, validates: nil, directives: nil, deprecation_reason: nil, replace_null_with_default: false, &definition_block)
         arg_name ||= name
         @name = -(camelize ? Member::BuildType.camelize(arg_name.to_s) : arg_name.to_s)
-        NameValidator.validate!(@name)
         @type_expr = type_expr || type
         @description = desc || description
         @comment = comment
@@ -90,8 +89,11 @@ module GraphQL
         end
 
         if definition_block
-          # `self` will still be self, it will also be the first argument to the block:
-          instance_exec(self, &definition_block)
+          if definition_block.arity == 1
+            instance_exec(self, &definition_block)
+          else
+            instance_eval(&definition_block)
+          end
         end
       end
 

data/lib/graphql/schema/build_from_definition.rb

@@ -467,18 +467,17 @@ module GraphQL
 
             # Don't do this for interfaces
             if default_resolve
-              define_field_resolve_method(owner, resolve_method_name, field_definition.name)
+              owner.class_eval <<-RUBY, __FILE__, __LINE__
+                # frozen_string_literal: true
+                def #{resolve_method_name}(**args)
+                  field_instance = self.class.get_field("#{field_definition.name}")
+                  context.schema.definition_default_resolve.call(self.class, field_instance, object, args, context)
+                end
+              RUBY
             end
           end
         end
 
-        def define_field_resolve_method(owner, method_name, field_name)
-          owner.define_method(method_name) { |**args|
-            field_instance = self.class.get_field(field_name)
-            context.schema.definition_default_resolve.call(self.class, field_instance, object, args, context)
-          }
-        end
-
         def build_resolve_type(lookup_hash, directives, missing_type_handler)
           resolve_type_proc = nil
           resolve_type_proc = ->(ast_node) {

data/lib/graphql/schema/directive.rb

@@ -99,7 +99,7 @@ module GraphQL
 
         def inherited(subclass)
           super
-          subclass.class_exec do
+          subclass.class_eval do
             @default_graphql_name ||= nil
           end
         end

data/lib/graphql/schema/enum_value.rb

@@ -48,7 +48,7 @@ module GraphQL
         end
 
         if block_given?
-          instance_exec(self, &block)
+          instance_eval(&block)
         end
       end
 

data/lib/graphql/schema/field.rb

@@ -255,7 +255,7 @@ module GraphQL
 
         @underscored_name = -Member::BuildType.underscore(name_s)
         @name = -(camelize ? Member::BuildType.camelize(name_s) : name_s)
-        NameValidator.validate!(@name)
+
         @description = description
         @comment = comment
         @type = @owner_type = @own_validators = @own_directives = @own_arguments = @arguments_statically_coercible = nil # these will be prepared later if necessary
@@ -369,7 +369,7 @@ module GraphQL
           if @definition_block.arity == 1
             @definition_block.call(self)
           else
-            instance_exec(self, &@definition_block)
+            instance_eval(&@definition_block)
           end
           self.extensions.each(&:after_define_apply)
           @call_after_define = true

data/lib/graphql/schema/input_object.rb

@@ -132,8 +132,14 @@ module GraphQL
             end
           end
           # Add a method access
+          method_name = argument_defn.keyword
           suppress_redefinition_warning do
-            define_accessor_method(argument_defn.keyword)
+            class_eval <<-RUBY, __FILE__, __LINE__
+              def #{method_name}
+                self[#{method_name.inspect}]
+              end
+              alias_method :#{method_name}, :#{method_name}
+            RUBY
           end
           argument_defn
         end
@@ -250,11 +256,6 @@ module GraphQL
         ensure
           $VERBOSE = verbose
         end
-
-        def define_accessor_method(method_name)
-          define_method(method_name) { self[method_name] }
-          alias_method(method_name, method_name)
-        end
       end
 
       private

data/lib/graphql/schema/interface.rb

@@ -29,7 +29,7 @@ module GraphQL
             const_set(:DefinitionMethods, defn_methods_module)
             extend(self::DefinitionMethods)
           end
-          self::DefinitionMethods.module_exec(&block)
+          self::DefinitionMethods.module_eval(&block)
         end
 
         # @see {Schema::Warden} hides interfaces without visible implementations

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

@@ -6,7 +6,7 @@ module GraphQL
       module HasDirectives
         def self.extended(child_cls)
           super
-          child_cls.module_exec { self.own_directives = nil }
+          child_cls.module_eval { self.own_directives = nil }
         end
 
         def inherited(child_cls)

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

@@ -185,7 +185,7 @@ module GraphQL
 
         def inherited(subclass)
           super
-          subclass.class_exec do
+          subclass.class_eval do
             @own_fields ||= nil
             @field_class ||= nil
           end

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

@@ -133,7 +133,7 @@ module GraphQL
 
         def inherited(subclass)
           super
-          subclass.class_exec do
+          subclass.class_eval do
             @own_interface_type_memberships ||= nil
           end
         end

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

@@ -30,7 +30,7 @@ module GraphQL
 
         def inherited(subclass)
           super
-          subclass.class_exec do
+          subclass.class_eval do
             @reauthorize_scoped_objects = nil
           end
         end

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

@@ -42,7 +42,7 @@ module GraphQL
         private
 
         def inherited(subclass)
-          subclass.class_exec do
+          subclass.class_eval do
             @to_non_null_type ||= nil
             @to_list_type ||= nil
           end

data/lib/graphql/schema/printer.rb

@@ -58,6 +58,7 @@ module GraphQL
           end
         end
         schema = Class.new(GraphQL::Schema) {
+          use GraphQL::Schema::Visibility
           query(query_root)
           def self.visible?(member, _ctx)
             member.graphql_name != "Root"

data/lib/graphql/schema/visibility/migration.rb

@@ -96,6 +96,7 @@ module GraphQL
             end
             warden_ctx = GraphQL::Query::Context.new(query: context.query, values: warden_ctx_vals)
             warden_ctx.warden = GraphQL::Schema::Warden.new(schema: warden_schema, context: warden_ctx)
+            warden_ctx.warden.skip_warning = true
             warden_ctx.types = @warden_types = warden_ctx.warden.visibility_profile
           end
         end

data/lib/graphql/schema/warden.rb

@@ -19,6 +19,10 @@ module GraphQL
         PassThruWarden
       end
 
+      def self.use(schema)
+        # no-op
+      end
+
       # @param visibility_method [Symbol] a Warden method to call for this entry
       # @param entry [Object, Array<Object>] One or more definitions for a given name in a GraphQL Schema
       # @param context [GraphQL::Query::Context]
@@ -73,6 +77,9 @@ module GraphQL
           @visibility_profile = Warden::VisibilityProfile.new(self)
         end
 
+        # No-op, but for compatibility:
+        attr_writer :skip_warning
+
         # @api private
         module NullVisibilityProfile
           def self.new(context:, schema:)
@@ -187,7 +194,7 @@ module GraphQL
         @mutation = @schema.mutation
         @subscription = @schema.subscription
         @context = context
-        @visibility_cache = read_through { |m| schema.visible?(m, context) }
+        @visibility_cache = read_through { |m| check_visible(schema, m) }
         # Initialize all ivars to improve object shape consistency:
         @types = @visible_types = @reachable_types = @visible_parent_fields =
           @visible_possible_types = @visible_fields = @visible_arguments = @visible_enum_arrays =
@@ -195,8 +202,11 @@ module GraphQL
           @visible_and_reachable_type = @unions = @unfiltered_interfaces =
           @reachable_type_set = @visibility_profile =
             nil
+        @skip_warning = schema.plugins.any? { |(plugin, _opts)| plugin == GraphQL::Schema::Warden }
       end
 
+      attr_writer :skip_warning
+
       # @return [Hash<String, GraphQL::BaseType>] Visible types in the schema
       def types
         @types ||= begin
@@ -465,6 +475,58 @@ module GraphQL
         Hash.new { |h, k| h[k] = yield(k) }.compare_by_identity
       end
 
+      def check_visible(schema, member)
+        if schema.visible?(member, @context)
+          true
+        elsif @skip_warning
+          false
+        else
+          member_s = member.respond_to?(:path) ? member.path : member.inspect
+          member_type = case member
+          when Module
+            if member.respond_to?(:kind)
+              member.kind.name.downcase
+            else
+              ""
+            end
+          when GraphQL::Schema::Field
+            "field"
+          when GraphQL::Schema::EnumValue
+            "enum value"
+          when GraphQL::Schema::Argument
+            "argument"
+          else
+            ""
+          end
+
+          schema_s = schema.name ? "#{schema.name}'s" : ""
+          schema_name = schema.name ? "#{schema.name}" : "your schema"
+          warn(ADD_WARDEN_WARNING % { schema_s: schema_s, schema_name: schema_name, member: member_s, member_type: member_type })
+          @skip_warning = true # only warn once per query
+          # If there's no schema name, add the backtrace for additional context:
+          if schema_s == ""
+            puts caller.map { |l| "    #{l}"}
+          end
+          false
+        end
+      end
+
+      ADD_WARDEN_WARNING = <<~WARNING
+DEPRECATION: %{schema_s} "%{member}" %{member_type} returned `false` for `.visible?` but `GraphQL::Schema::Visibility` isn't configured yet.
+
+  Address this warning by adding:
+
+      use GraphQL::Schema::Visibility
+
+  to the definition for %{schema_name}. (Future GraphQL-Ruby versions won't check `.visible?` methods by default.)
+
+  Alternatively, for legacy behavior, add:
+
+      use GraphQL::Schema::Warden # legacy visibility behavior
+
+  For more information see: https://graphql-ruby.org/authorization/visibility.html
+      WARNING
+
       def reachable_type_set
         return @reachable_type_set if @reachable_type_set
 

data/lib/graphql/schema.rb

@@ -1162,7 +1162,7 @@ module GraphQL
       # @return [Object, nil] The application which `object_id` references, or `nil` if there is no object or the current operation shouldn't have access to the object
       # @see id_from_object which produces these IDs
       def object_from_id(object_id, context)
-        raise GraphQL::RequiredImplementationMissingError, "#{self.name}.object_from_id(object_id, context) must be implemented to load by ID (tried to load from id `#{node_id}`)"
+        raise GraphQL::RequiredImplementationMissingError, "#{self.name}.object_from_id(object_id, context) must be implemented to load by ID (tried to load from id `#{object_id}`)"
       end
 
       # Return a stable ID string for `object` so that it can be refetched later, using {.object_from_id}.
@@ -1575,6 +1575,20 @@ module GraphQL
         end
       end
 
+      # Returns `DidYouMean` if it's defined.
+      # Override this to return `nil` if you don't want to use `DidYouMean`
+      def did_you_mean(new_dym = NOT_CONFIGURED)
+        if NOT_CONFIGURED.equal?(new_dym)
+          if defined?(@did_you_mean)
+            @did_you_mean
+          else
+            find_inherited_value(:did_you_mean, defined?(DidYouMean) ? DidYouMean : nil)
+          end
+        else
+          @did_you_mean = new_dym
+        end
+      end
+
       private
 
       def add_trace_options_for(mode, new_options)

data/lib/graphql/static_validation/rules/arguments_are_defined.rb

@@ -10,8 +10,9 @@ module GraphQL
         elsif parent_defn
           kind_of_node = node_type(parent)
           error_arg_name = parent_name(parent, parent_defn)
+          arg_names = context.types.arguments(parent_defn).map(&:graphql_name)
           add_error(GraphQL::StaticValidation::ArgumentsAreDefinedError.new(
-            "#{kind_of_node} '#{error_arg_name}' doesn't accept argument '#{node.name}'",
+            "#{kind_of_node} '#{error_arg_name}' doesn't accept argument '#{node.name}'#{context.did_you_mean_suggestion(node.name, arg_names)}",
             nodes: node,
             name: error_arg_name,
             type: kind_of_node,

data/lib/graphql/static_validation/rules/directives_are_defined.rb

@@ -10,8 +10,9 @@ module GraphQL
         if !@types.directive_exists?(node.name)
           @directives_are_defined_errors_by_name ||= {}
           error = @directives_are_defined_errors_by_name[node.name] ||= begin
+            @directive_names ||= @types.directives.map(&:graphql_name)
             err = GraphQL::StaticValidation::DirectivesAreDefinedError.new(
-              "Directive @#{node.name} is not defined",
+              "Directive @#{node.name} is not defined#{context.did_you_mean_suggestion(node.name, @directive_names)}",
               nodes: [],
               directive: node.name
             )

data/lib/graphql/static_validation/rules/fields_are_defined_on_type.rb

@@ -14,8 +14,9 @@ module GraphQL
               node_name: parent_type.graphql_name
             ))
           else
+            message = "Field '#{node.name}' doesn't exist on type '#{parent_type.graphql_name}'#{context.did_you_mean_suggestion(node.name, context.types.fields(parent_type).map(&:graphql_name))}"
             add_error(GraphQL::StaticValidation::FieldsAreDefinedOnTypeError.new(
-              "Field '#{node.name}' doesn't exist on type '#{parent_type.graphql_name}'",
+              message,
               nodes: node,
               field: node.name,
               type: parent_type.graphql_name

data/lib/graphql/static_validation/rules/fields_will_merge.rb

@@ -345,7 +345,7 @@ module GraphQL
             fields << Field.new(node, definition, owner_type, parents)
           when GraphQL::Language::Nodes::InlineFragment
             fragment_type = node.type ? @types.type(node.type.name) : owner_type
-            find_fields_and_fragments(node.selections, parents: [*parents, fragment_type], owner_type: fragment_type, fields: fields, fragment_spreads: fragment_spreads) if fragment_type
+            find_fields_and_fragments(node.selections, parents: [*parents, fragment_type], owner_type: owner_type, fields: fields, fragment_spreads: fragment_spreads) if fragment_type
           when GraphQL::Language::Nodes::FragmentSpread
             fragment_spreads << FragmentSpread.new(node.name, parents)
           end

data/lib/graphql/static_validation/rules/fragment_types_exist.rb

@@ -23,8 +23,18 @@ module GraphQL
           type_name = fragment_node.type.name
           type = @types.type(type_name)
           if type.nil?
+            @all_possible_fragment_type_names ||= begin
+              names = []
+              context.types.all_types.each do |type|
+                if type.kind.fields?
+                  names << type.graphql_name
+                end
+              end
+              names
+            end
+
             add_error(GraphQL::StaticValidation::FragmentTypesExistError.new(
-              "No such type #{type_name}, so it can't be a fragment condition",
+              "No such type #{type_name}, so it can't be a fragment condition#{context.did_you_mean_suggestion(type_name, @all_possible_fragment_type_names)}",
               nodes: fragment_node,
               type: type_name
             ))

data/lib/graphql/static_validation/rules/variables_are_input_types.rb

@@ -7,8 +7,17 @@ module GraphQL
         type = context.query.types.type(type_name)
 
         if type.nil?
+          @all_possible_input_type_names ||= begin
+            names = []
+            context.types.all_types.each { |(t)|
+              if t.kind.input?
+                names << t.graphql_name
+              end
+            }
+            names
+          end
           add_error(GraphQL::StaticValidation::VariablesAreInputTypesError.new(
-            "#{type_name} isn't a defined input type (on $#{node.name})",
+            "#{type_name} isn't a defined input type (on $#{node.name})#{context.did_you_mean_suggestion(type_name, @all_possible_input_type_names)}",
             nodes: node,
             name: node.name,
             type: type_name

data/lib/graphql/static_validation/validation_context.rb

@@ -48,6 +48,21 @@ module GraphQL
       def schema_directives
         @schema_directives ||= schema.directives
       end
+
+      def did_you_mean_suggestion(name, options)
+        if did_you_mean = schema.did_you_mean
+          suggestions = did_you_mean::SpellChecker.new(dictionary: options).correct(name)
+          case suggestions.size
+          when 0
+            ""
+          when 1
+            " (Did you mean `#{suggestions.first}`?)"
+          else
+            last_sugg = suggestions.pop
+            " (Did you mean #{suggestions.map {|s| "`#{s}`"}.join(", ")} or `#{last_sugg}`?)"
+          end
+        end
+      end
     end
   end
 end

data/lib/graphql/tracing/appoptics_trace.rb

@@ -28,8 +28,6 @@ module GraphQL
         Gem::Version.new('1.0.0')
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
       [
         'lex',
         'parse',
@@ -57,8 +55,6 @@ module GraphQL
         RUBY
       end
 
-      # rubocop:enable Development/NoEvalCop
-
       def execute_field(query:, field:, ast_node:, arguments:, object:)
         return_type = field.type.unwrap
         trace_field = if return_type.kind.scalar? || return_type.kind.enum?

data/lib/graphql/tracing/appsignal_trace.rb

@@ -13,8 +13,6 @@ module GraphQL
         super
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
       {
         "lex" => "lex.graphql",
         "parse" => "parse.graphql",
@@ -45,8 +43,6 @@ module GraphQL
         RUBY
       end
 
-      # rubocop:enable Development/NoEvalCop
-
       def platform_execute_field(platform_key)
         Appsignal.instrument(platform_key) do
           yield

data/lib/graphql/tracing/data_dog_trace.rb

@@ -20,8 +20,6 @@ module GraphQL
         super
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
       {
         'lex' => 'lex.graphql',
         'parse' => 'parse.graphql',
@@ -71,8 +69,6 @@ module GraphQL
         RUBY
       end
 
-      # rubocop:enable Development/NoEvalCop
-
       def execute_field_span(span_key, query, field, ast_node, arguments, object)
         return_type = field.type.unwrap
         trace_field = if return_type.kind.scalar? || return_type.kind.enum?

data/lib/graphql/tracing/notifications_trace.rb

@@ -16,8 +16,6 @@ module GraphQL
         super
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
       {
         "lex" => "lex.graphql",
         "parse" => "parse.graphql",
@@ -41,8 +39,6 @@ module GraphQL
         RUBY
       end
 
-      # rubocop:enable Development/NoEvalCop
-
       include PlatformTrace
     end
   end

data/lib/graphql/tracing/platform_trace.rb

@@ -39,9 +39,6 @@ module GraphQL
           include(BaseKeyCache)
         }
         child_class.const_set(:KeyCache, key_methods_class)
-
-        # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
         [:execute_field, :execute_field_lazy].each do |field_trace_method|
           if !child_class.method_defined?(field_trace_method)
             child_class.module_eval <<-RUBY, __FILE__, __LINE__
@@ -94,8 +91,6 @@ module GraphQL
               end
             RUBY
           end
-
-          # rubocop:enable Development/NoEvalCop
         end
       end
 

data/lib/graphql/tracing/prometheus_trace.rb

@@ -13,8 +13,6 @@ module GraphQL
         super(**rest)
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
       {
         'lex' => "graphql.lex",
         'parse' => "graphql.parse",
@@ -32,8 +30,6 @@ module GraphQL
         RUBY
       end
 
-      # rubocop:enable Development/NoEvalCop
-
       def platform_execute_field(platform_key, &block)
         instrument_prometheus_execution(platform_key, "execute_field", &block)
       end

data/lib/graphql/tracing/scout_trace.rb

@@ -16,8 +16,6 @@ module GraphQL
         super
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
       {
         "lex" => "lex.graphql",
         "parse" => "parse.graphql",
@@ -47,7 +45,6 @@ module GraphQL
         end
         RUBY
       end
-      # rubocop:enable Development/NoEvalCop
 
       def platform_execute_field(platform_key, &block)
         self.class.instrument("GraphQL", platform_key, INSTRUMENT_OPTS, &block)

data/lib/graphql/tracing/sentry_trace.rb

@@ -23,8 +23,6 @@ module GraphQL
         instrument_sentry_execution("graphql.execute", "execute_query", data) { super }
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
       {
         "lex" => "graphql.lex",
         "parse" => "graphql.parse",
@@ -41,8 +39,6 @@ module GraphQL
         RUBY
       end
 
-      # rubocop:enable Development/NoEvalCop
-
       def platform_execute_field(platform_key, &block)
         instrument_sentry_execution(platform_key, "execute_field", &block)
       end

data/lib/graphql/tracing/statsd_trace.rb

@@ -11,8 +11,6 @@ module GraphQL
         super(**rest)
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
       {
         'lex' => "graphql.lex",
         'parse' => "graphql.parse",
@@ -32,8 +30,6 @@ module GraphQL
         RUBY
       end
 
-      # rubocop:enable Development/NoEvalCop
-
       def platform_execute_field(platform_key, &block)
         @statsd.time(platform_key, &block)
       end

data/lib/graphql/types/relay/connection_behaviors.rb

@@ -13,7 +13,7 @@ module GraphQL
           child_class.node_nullable(true)
           child_class.edges_nullable(true)
           child_class.edge_nullable(true)
-          child_class.module_exec {
+          child_class.module_eval {
             self.edge_type = nil
             self.node_type = nil
             self.edge_class = nil

data/lib/graphql/types/relay/edge_behaviors.rb

@@ -8,7 +8,7 @@ module GraphQL
           child_class.description("An edge in a connection.")
           child_class.field(:cursor, String, null: false, description: "A cursor for use in pagination.")
           child_class.extend(ClassMethods)
-          child_class.class_exec { self.node_type = nil }
+          child_class.class_eval { self.node_type = nil }
           child_class.node_nullable(true)
           child_class.default_broadcastable(nil)
         end

data/lib/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.3.22
+  version: 2.4.0
 platform: ruby
 authors:
 - Robert Mosolgo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-13 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -650,7 +650,7 @@ metadata:
   bug_tracker_uri: https://github.com/rmosolgo/graphql-ruby/issues
   mailing_list_uri: https://buttondown.email/graphql-ruby
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -665,8 +665,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.12
+signing_key:
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby
 test_files: []