graphql 2.3.14 → 2.3.15

data/lib/graphql/schema.rb

@@ -45,8 +45,7 @@ require "graphql/schema/mutation"
 require "graphql/schema/has_single_input_argument"
 require "graphql/schema/relay_classic_mutation"
 require "graphql/schema/subscription"
-require "graphql/schema/subset"
-require "graphql/schema/types_migration"
+require "graphql/schema/visibility"
 
 module GraphQL
   # A GraphQL schema which may be queried with {GraphQL::Query}.
@@ -205,24 +204,19 @@ module GraphQL
         @own_trace_modes ||= {}
       end
 
-      module DefaultTraceClass
-      end
-
-      private_constant :DefaultTraceClass
-
       def build_trace_mode(mode)
         case mode
         when :default
           # Use the superclass's default mode if it has one, or else start an inheritance chain at the built-in base class.
-          base_class = (superclass.respond_to?(:trace_class_for) && superclass.trace_class_for(mode)) || GraphQL::Tracing::Trace
-          Class.new(base_class) do
+          base_class = (superclass.respond_to?(:trace_class_for) && superclass.trace_class_for(mode, build: true)) || GraphQL::Tracing::Trace
+          const_set(:DefaultTrace, Class.new(base_class) do
             include DefaultTraceClass
-          end
+          end)
         when :default_backtrace
           schema_base_class = trace_class_for(:default, build: true)
-          Class.new(schema_base_class) do
+          const_set(:DefaultTraceBacktrace, Class.new(schema_base_class) do
             include(GraphQL::Backtrace::Trace)
-          end
+          end)
         else
           # First, see if the superclass has a custom-defined class for this.
           # Then, if it doesn't, use this class's default trace
@@ -339,8 +333,8 @@ module GraphQL
       # @return [Hash<String => Class>] A dictionary of type classes by their GraphQL name
       # @see get_type Which is more efficient for finding _one type_ by name, because it doesn't merge hashes.
       def types(context = GraphQL::Query::NullContext.instance)
-        if use_schema_subset?
-          return Subset.from_context(context, self).all_types_h
+        if use_schema_visibility?
+          return Visibility::Subset.from_context(context, self).all_types_h
         end
         all_types = non_introspection_types.merge(introspection_system.types)
         visible_types = {}
@@ -369,15 +363,15 @@ module GraphQL
       # @param type_name [String]
       # @return [Module, nil] A type, or nil if there's no type called `type_name`
       def get_type(type_name, context = GraphQL::Query::NullContext.instance)
-        if use_schema_subset?
-          return Subset.from_context(context, self).type(type_name)
+        if use_schema_visibility?
+          return Visibility::Subset.from_context(context, self).type(type_name)
         end
         local_entry = own_types[type_name]
         type_defn = case local_entry
         when nil
           nil
         when Array
-          if context.respond_to?(:types) && context.types.is_a?(GraphQL::Schema::Subset)
+          if context.respond_to?(:types) && context.types.is_a?(GraphQL::Schema::Visibility::Subset)
             local_entry
           else
             visible_t = nil
@@ -435,7 +429,7 @@ module GraphQL
           if @query_object
             dup_defn = new_query_object || yield
             raise GraphQL::Error, "Second definition of `query(...)` (#{dup_defn.inspect}) is invalid, already configured with #{@query_object.inspect}"
-          elsif use_schema_subset?
+          elsif use_schema_visibility?
             @query_object = block_given? ? lazy_load_block : new_query_object
           else
             @query_object = new_query_object || lazy_load_block.call
@@ -454,7 +448,7 @@ module GraphQL
           if @mutation_object
             dup_defn = new_mutation_object || yield
             raise GraphQL::Error, "Second definition of `mutation(...)` (#{dup_defn.inspect}) is invalid, already configured with #{@mutation_object.inspect}"
-          elsif use_schema_subset?
+          elsif use_schema_visibility?
             @mutation_object = block_given? ? lazy_load_block : new_mutation_object
           else
             @mutation_object = new_mutation_object || lazy_load_block.call
@@ -473,7 +467,7 @@ module GraphQL
           if @subscription_object
             dup_defn = new_subscription_object || yield
             raise GraphQL::Error, "Second definition of `subscription(...)` (#{dup_defn.inspect}) is invalid, already configured with #{@subscription_object.inspect}"
-          elsif use_schema_subset?
+          elsif use_schema_visibility?
             @subscription_object = block_given? ? lazy_load_block : new_subscription_object
             add_subscription_extension_if_necessary
           else
@@ -507,7 +501,7 @@ module GraphQL
       end
 
       def root_types
-        if use_schema_subset?
+        if use_schema_visibility?
           [query, mutation, subscription].compact
         else
           @root_types
@@ -532,17 +526,17 @@ module GraphQL
         elsif superclass.respond_to?(:subset_class)
           superclass.subset_class
         else
-          GraphQL::Schema::Subset
+          GraphQL::Schema::Visibility::Subset
         end
       end
 
-      attr_writer :subset_class, :use_schema_subset
+      attr_writer :subset_class, :use_schema_visibility, :visibility
 
-      def use_schema_subset?
-        if defined?(@use_schema_subset)
-          @use_schema_subset
-        elsif superclass.respond_to?(:use_schema_subset?)
-          superclass.use_schema_subset?
+      def use_schema_visibility?
+        if defined?(@use_schema_visibility)
+          @use_schema_visibility
+        elsif superclass.respond_to?(:use_schema_visibility?)
+          superclass.use_schema_visibility?
         else
           false
         end
@@ -552,11 +546,11 @@ module GraphQL
       # @return [Hash<String, Module>] All possible types, if no `type` is given.
       # @return [Array<Module>] Possible types for `type`, if it's given.
       def possible_types(type = nil, context = GraphQL::Query::NullContext.instance)
-        if use_schema_subset?
+        if use_schema_visibility?
           if type
-            return Subset.from_context(context, self).possible_types(type)
+            return Visibility::Subset.from_context(context, self).possible_types(type)
           else
-            raise "Schema.possible_types is not implemented for `use_schema_subset?`"
+            raise "Schema.possible_types is not implemented for `use_schema_visibility?`"
           end
         end
         if type
@@ -789,13 +783,11 @@ module GraphQL
 
       attr_writer :validate_max_errors
 
-      def validate_max_errors(new_validate_max_errors = nil)
-        if new_validate_max_errors
-          @validate_max_errors = new_validate_max_errors
-        elsif defined?(@validate_max_errors)
-          @validate_max_errors
+      def validate_max_errors(new_validate_max_errors = NOT_CONFIGURED)
+        if NOT_CONFIGURED.equal?(new_validate_max_errors)
+          defined?(@validate_max_errors) ? @validate_max_errors : find_inherited_value(:validate_max_errors)
         else
-          find_inherited_value(:validate_max_errors)
+          @validate_max_errors = new_validate_max_errors
         end
       end
 
@@ -934,7 +926,7 @@ module GraphQL
               To add other types to your schema, you might want `extra_types`: https://graphql-ruby.org/schema/definition.html#extra-types
             ERR
           end
-          add_type_and_traverse(new_orphan_types, root: false) unless use_schema_subset?
+          add_type_and_traverse(new_orphan_types, root: false) unless use_schema_visibility?
           own_orphan_types.concat(new_orphan_types.flatten)
         end
 
@@ -1193,7 +1185,7 @@ module GraphQL
       # @param new_directive [Class]
       # @return void
       def directive(new_directive)
-        if use_schema_subset?
+        if use_schema_visibility?
           own_directives[new_directive.graphql_name] = new_directive
         else
           add_type_and_traverse(new_directive, root: false)
@@ -1463,8 +1455,17 @@ module GraphQL
       private
 
       def add_trace_options_for(mode, new_options)
-        t_opts = trace_options_for(mode)
-        t_opts.merge!(new_options)
+        if mode == :default
+          own_trace_modes.each do |mode_name, t_class|
+            if t_class <= DefaultTraceClass
+              t_opts = trace_options_for(mode_name)
+              t_opts.merge!(new_options)
+            end
+          end
+        else
+          t_opts = trace_options_for(mode)
+          t_opts.merge!(new_options)
+        end
         nil
       end
 
@@ -1608,5 +1609,9 @@ module GraphQL
 
     # Install these here so that subclasses will also install it.
     self.connections = GraphQL::Pagination::Connections.new(schema: self)
+
+    # @api private
+    module DefaultTraceClass
+    end
   end
 end

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

@@ -19,6 +19,7 @@ module GraphQL
         GraphQL::Schema::Directive::FRAGMENT_DEFINITION => "fragment definitions",
         GraphQL::Schema::Directive::FRAGMENT_SPREAD =>     "fragment spreads",
         GraphQL::Schema::Directive::INLINE_FRAGMENT =>     "inline fragments",
+        GraphQL::Schema::Directive::VARIABLE_DEFINITION => "variable definitions",
       }
 
       SIMPLE_LOCATIONS = {
@@ -26,6 +27,7 @@ module GraphQL
         Nodes::InlineFragment =>      GraphQL::Schema::Directive::INLINE_FRAGMENT,
         Nodes::FragmentSpread =>      GraphQL::Schema::Directive::FRAGMENT_SPREAD,
         Nodes::FragmentDefinition =>  GraphQL::Schema::Directive::FRAGMENT_DEFINITION,
+        Nodes::VariableDefinition =>  GraphQL::Schema::Directive::VARIABLE_DEFINITION,
       }
 
       SIMPLE_LOCATION_NODES = SIMPLE_LOCATIONS.keys

data/lib/graphql/testing/helpers.rb

@@ -91,7 +91,7 @@ module GraphQL
           end
           graphql_result
         else
-          unfiltered_type = Schema::Subset.pass_thru(schema: schema, context: context).type(type_name)
+          unfiltered_type = Schema::Visibility::Subset.pass_thru(schema: schema, context: context).type(type_name)
           if unfiltered_type
             raise TypeNotVisibleError.new(type_name: type_name)
           else

data/lib/graphql/tracing/notifications_trace.rb

@@ -33,8 +33,8 @@ module GraphQL
         "resolve_type_lazy" => "resolve_type.graphql",
       }.each do |trace_method, platform_key|
         module_eval <<-RUBY, __FILE__, __LINE__
-          def #{trace_method}(**metadata, &blk)
-            @notifications_engine.instrument("#{platform_key}", metadata, &blk)
+          def #{trace_method}(**metadata, &block)
+            @notifications_engine.instrument("#{platform_key}", metadata) { super(**metadata, &block) }
           end
         RUBY
       end

data/lib/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.3.14
+  version: 2.3.15
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -382,6 +382,7 @@ files:
 - lib/graphql/language.rb
 - lib/graphql/language/block_string.rb
 - lib/graphql/language/cache.rb
+- lib/graphql/language/comment.rb
 - lib/graphql/language/definition_slice.rb
 - lib/graphql/language/document_from_schema_definition.rb
 - lib/graphql/language/generation.rb
@@ -485,11 +486,9 @@ files:
 - lib/graphql/schema/resolver/has_payload_type.rb
 - lib/graphql/schema/scalar.rb
 - lib/graphql/schema/subscription.rb
-- lib/graphql/schema/subset.rb
 - lib/graphql/schema/timeout.rb
 - lib/graphql/schema/type_expression.rb
 - lib/graphql/schema/type_membership.rb
-- lib/graphql/schema/types_migration.rb
 - lib/graphql/schema/union.rb
 - lib/graphql/schema/unique_within_type.rb
 - lib/graphql/schema/validator.rb
@@ -502,6 +501,9 @@ files:
 - lib/graphql/schema/validator/length_validator.rb
 - lib/graphql/schema/validator/numericality_validator.rb
 - lib/graphql/schema/validator/required_validator.rb
+- lib/graphql/schema/visibility.rb
+- lib/graphql/schema/visibility/migration.rb
+- lib/graphql/schema/visibility/subset.rb
 - lib/graphql/schema/warden.rb
 - lib/graphql/schema/wrapper.rb
 - lib/graphql/static_validation.rb