graphql 2.0.18 → 2.0.20

data/lib/graphql/query/context.rb

@@ -72,18 +72,6 @@ module GraphQL
       # @return [Array<String, Integer>] The current position in the result
       attr_reader :path
 
-      module EmptyScopedContext
-        EMPTY_HASH = {}.freeze
-
-        def self.key?(k)
-          false
-        end
-
-        def self.merged_context
-          EMPTY_HASH
-        end
-      end
-
       # Make a new context which delegates key lookup to `values`
       # @param query [GraphQL::Query] the query who owns this context
       # @param values [Hash] A hash of arbitrary values which will be accessible at query-time
@@ -99,28 +87,35 @@ module GraphQL
         @path = []
         @value = nil
         @context = self # for SharedMethods TODO delete sharedmethods
-        @scoped_context = EmptyScopedContext
+        @scoped_context = ScopedContext.new(self)
       end
 
       class ScopedContext
+        NO_PATH = [].freeze
+        NO_CONTEXT = {}.freeze
+
         def initialize(query_context)
           @query_context = query_context
-          @scoped_contexts = {}
-          @all_keys = Set.new
-          @no_path = [].freeze
+          @scoped_contexts = nil
+          @all_keys = nil
         end
 
         def merged_context
-          merged_ctx = {}
-          each_present_path_ctx do |path_ctx|
-            merged_ctx = path_ctx.merge(merged_ctx)
+          if @scoped_contexts.nil?
+            NO_CONTEXT
+          else
+            merged_ctx = {}
+            each_present_path_ctx do |path_ctx|
+              merged_ctx = path_ctx.merge(merged_ctx)
+            end
+            merged_ctx
           end
-          merged_ctx
         end
 
         def merge!(hash)
+          @all_keys ||= Set.new
           @all_keys.merge(hash.keys)
-          ctx = @scoped_contexts
+          ctx = @scoped_contexts ||= {}
           current_path.each do |path_part|
             ctx = ctx[path_part] ||= { parent: ctx }
           end
@@ -129,7 +124,7 @@ module GraphQL
         end
 
         def key?(key)
-          if @all_keys.include?(key)
+          if @all_keys && @all_keys.include?(key)
             each_present_path_ctx do |path_ctx|
               if path_ctx.key?(key)
                 return true
@@ -149,7 +144,7 @@ module GraphQL
         end
 
         def current_path
-          @query_context.current_path || @no_path
+          @query_context.current_path || NO_PATH
         end
 
         def dig(key, *other_keys)
@@ -172,19 +167,23 @@ module GraphQL
         # but look up the tree for previously-assigned scoped values
         def each_present_path_ctx
           ctx = @scoped_contexts
-          current_path.each do |path_part|
-            if ctx.key?(path_part)
-              ctx = ctx[path_part]
-            else
-              break
+          if ctx.nil?
+            # no-op
+          else
+            current_path.each do |path_part|
+              if ctx.key?(path_part)
+                ctx = ctx[path_part]
+              else
+                break
+              end
             end
-          end
 
-          while ctx
-            if (scoped_ctx = ctx[:scoped_context])
-              yield(scoped_ctx)
+            while ctx
+              if (scoped_ctx = ctx[:scoped_context])
+                yield(scoped_ctx)
+              end
+              ctx = ctx[:parent]
             end
-            ctx = ctx[:parent]
           end
         end
       end
@@ -329,9 +328,6 @@ module GraphQL
       end
 
       def scoped_merge!(hash)
-        if @scoped_context == EmptyScopedContext
-          @scoped_context = ScopedContext.new(self)
-        end
         @scoped_context.merge!(hash)
       end
 

data/lib/graphql/schema/field.rb

@@ -752,6 +752,8 @@ module GraphQL
         end
         # if the line above doesn't raise, re-raise
         raise
+      rescue GraphQL::ExecutionError => err
+        err
       end
 
       # @param ctx [GraphQL::Query::Context]

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

@@ -46,7 +46,7 @@ module GraphQL
           elsif defined?(@description)
             @description
           else
-            nil
+            @description = nil
           end
         end
 
@@ -56,8 +56,12 @@ module GraphQL
           def inherited(child_class)
             child_class.introspection(introspection)
             child_class.description(description)
-            if defined?(@graphql_name) && (self.name.nil? || graphql_name != default_graphql_name)
+            child_class.default_graphql_name = nil
+
+            if defined?(@graphql_name) && @graphql_name && (self.name.nil? || graphql_name != default_graphql_name)
               child_class.graphql_name(graphql_name)
+            else
+              child_class.graphql_name = nil
             end
             super
           end
@@ -98,7 +102,8 @@ module GraphQL
         def default_graphql_name
           @default_graphql_name ||= begin
             raise GraphQL::RequiredImplementationMissingError, 'Anonymous class should declare a `graphql_name`' if name.nil?
-            -name.split("::").last.sub(/Type\Z/, "")          end
+            -name.split("::").last.sub(/Type\Z/, "")
+          end
         end
 
         def visible?(context)
@@ -109,16 +114,13 @@ module GraphQL
           true
         end
 
-        protected
-
-        attr_writer :default_graphql_name
+        def default_relay
+          false
+        end
 
-        private
+        protected
 
-        def inherited(subclass)
-          super
-          subclass.default_graphql_name = nil
-        end
+        attr_writer :default_graphql_name, :graphql_name
       end
     end
   end

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

@@ -3,6 +3,16 @@ module GraphQL
   class Schema
     class Member
       module HasAstNode
+        def self.extended(child_cls)
+          super
+          child_cls.ast_node = nil
+        end
+
+        def inherited(child_cls)
+          super
+          child_cls.ast_node = nil
+        end
+
         # If this schema was parsed from a `.graphql` file (or other SDL),
         # this is the AST node that defined this part of the schema.
         def ast_node(new_ast_node = nil)
@@ -14,6 +24,8 @@ module GraphQL
             nil
           end
         end
+
+        attr_writer :ast_node
       end
     end
   end

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

@@ -4,6 +4,16 @@ module GraphQL
   class Schema
     class Member
       module HasDirectives
+        def self.extended(child_cls)
+          super
+          child_cls.module_eval { self.own_directives = nil }
+        end
+
+        def inherited(child_cls)
+          super
+          child_cls.own_directives = nil
+        end
+
         # Create an instance of `dir_class` for `self`, using `options`.
         #
         # It removes a previously-attached instance of `dir_class`, if there is one.
@@ -101,12 +111,9 @@ module GraphQL
           end
         end
 
-
         protected
 
-        def own_directives
-          @own_directives
-        end
+        attr_accessor :own_directives
       end
     end
   end

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

@@ -138,6 +138,7 @@ module GraphQL
           super
           subclass.class_eval do
             @own_fields ||= nil
+            @field_class ||= nil
           end
         end
 

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

@@ -6,6 +6,7 @@ module GraphQL
       module RelayShortcuts
         def edge_type_class(new_edge_type_class = nil)
           if new_edge_type_class
+            initialize_relay_metadata
             @edge_type_class = new_edge_type_class
           else
             # Don't call `ancestor.edge_type_class`
@@ -22,6 +23,7 @@ module GraphQL
 
         def connection_type_class(new_connection_type_class = nil)
           if new_connection_type_class
+            initialize_relay_metadata
             @connection_type_class = new_connection_type_class
           else
             # Don't call `ancestor.connection_type_class`
@@ -37,6 +39,7 @@ module GraphQL
         end
 
         def edge_type
+          initialize_relay_metadata
           @edge_type ||= begin
             edge_name = self.graphql_name + "Edge"
             node_type_class = self
@@ -48,6 +51,7 @@ module GraphQL
         end
 
         def connection_type
+          initialize_relay_metadata
           @connection_type ||= begin
             conn_name = self.graphql_name + "Connection"
             edge_type_class = self.edge_type
@@ -67,6 +71,21 @@ module GraphQL
         def configured_edge_type_class
           @edge_type_class
         end
+
+        attr_writer :edge_type, :connection_type, :connection_type_class, :edge_type_class
+
+        private
+
+        # If one of thse values is accessed, initialize all the instance variables to retain
+        # a consistent object shape.
+        def initialize_relay_metadata
+          if !defined?(@connection_type)
+            @connection_type = nil
+            @edge_type = nil
+            @connection_type_class = nil
+            @edge_type_class = nil
+          end
+        end
       end
     end
   end

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

@@ -43,11 +43,11 @@ module GraphQL
         private
 
         def inherited(subclass)
-          super
           subclass.class_eval do
             @to_non_null_type ||= nil
             @to_list_type ||= nil
           end
+          super
         end
       end
     end

data/lib/graphql/schema/timeout.rb

@@ -81,7 +81,7 @@ module GraphQL
 
             error
           else
-            yield
+            super
           end
         end
       end

data/lib/graphql/schema.rb

@@ -147,7 +147,12 @@ module GraphQL
         if new_class
           @trace_class = new_class
         elsif !defined?(@trace_class)
-          @trace_class = Class.new(GraphQL::Tracing::Trace)
+          parent_trace_class = if superclass.respond_to?(:trace_class)
+            superclass.trace_class
+          else
+            GraphQL::Tracing::Trace
+          end
+          @trace_class = Class.new(parent_trace_class)
         end
         @trace_class
       end
@@ -794,11 +799,7 @@ module GraphQL
             end
 
             if resolved_type.nil? || (resolved_type.is_a?(Module) && resolved_type.respond_to?(:kind))
-              if resolved_value
-                [resolved_type, resolved_value]
-              else
-                resolved_type
-              end
+              [resolved_type, resolved_value]
             else
               raise ".resolve_type should return a type definition, but got #{resolved_type.inspect} (#{resolved_type.class}) from `resolve_type(#{type}, #{obj}, #{ctx})`"
             end
@@ -955,14 +956,17 @@ module GraphQL
       # @param options [Hash] Keywords that will be passed to the tracing class during `#initialize`
       # @return [void]
       def trace_with(trace_mod, **options)
-        @trace_options ||= {}
-        @trace_options.merge!(options)
+        trace_options.merge!(options)
         trace_class.include(trace_mod)
       end
 
+      def trace_options
+        @trace_options ||= superclass.respond_to?(:trace_options) ? superclass.trace_options.dup : {}
+      end
+
       def new_trace(**options)
         if defined?(@trace_options)
-          options = @trace_options.merge(options)
+          options = trace_options.merge(options)
         end
         trace_class.new(**options)
       end

data/lib/graphql/tracing/appsignal_trace.rb

@@ -5,7 +5,6 @@ module GraphQL
     module AppsignalTrace
       include PlatformTrace
 
-
       # @param set_action_name [Boolean] If true, the GraphQL operation name will be used as the transaction name.
       #   This is not advised if you run more than one query per HTTP request, for example, with `graphql-client` or multiplexing.
       #   It can also be specified per-query with `context[:set_appsignal_action_name]`.
@@ -46,7 +45,13 @@ module GraphQL
 
       def platform_execute_field(platform_key)
         Appsignal.instrument(platform_key) do
-          super
+          yield
+        end
+      end
+
+      def platform_authorized(platform_key)
+        Appsignal.instrument(platform_key) do
+          yield
         end
       end
 

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

@@ -35,7 +35,7 @@ module GraphQL
       #     # Alternatively, you can call the class methods followed by your edge type
       #     # edges_nullable true
       #     # edge_nullable true
-      #     # nodes_nullable true
+      #     # node_nullable true
       #     # has_nodes_field true
       #     # edge_type Types::PostEdge
       #   end

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

@@ -9,16 +9,34 @@ module GraphQL
 
         def self.included(child_class)
           child_class.extend(ClassMethods)
-          child_class.extend(Relay::DefaultRelay)
-          child_class.default_relay(true)
           child_class.has_nodes_field(true)
           child_class.node_nullable(true)
           child_class.edges_nullable(true)
           child_class.edge_nullable(true)
+          child_class.module_eval {
+            self.edge_type = nil
+            self.node_type = nil
+            self.edge_class = nil
+          }
           add_page_info_field(child_class)
         end
 
         module ClassMethods
+          def inherited(child_class)
+            super
+            child_class.has_nodes_field(has_nodes_field)
+            child_class.node_nullable(node_nullable)
+            child_class.edges_nullable(edges_nullable)
+            child_class.edge_nullable(edge_nullable)
+            child_class.edge_type = nil
+            child_class.node_type = nil
+            child_class.edge_class = nil
+          end
+
+          def default_relay?
+            true
+          end
+
           # @return [Class]
           attr_reader :node_type
 
@@ -124,6 +142,10 @@ module GraphQL
             end
           end
 
+          protected
+
+          attr_writer :edge_type, :node_type,  :edge_class
+
           private
 
           def define_nodes_field(nullable, field_options: nil)

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

@@ -8,11 +8,21 @@ 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.extend(GraphQL::Types::Relay::DefaultRelay)
+          child_class.class_eval { self.node_type = nil }
           child_class.node_nullable(true)
         end
 
         module ClassMethods
+          def inherited(child_class)
+            super
+            child_class.node_type = nil
+            child_class.node_nullable = nil
+          end
+
+          def default_relay?
+            true
+          end
+
           # Get or set the Object type that this edge wraps.
           #
           # @param node_type [Class] A `Schema::Object` subclass
@@ -49,11 +59,15 @@ module GraphQL
           # Use `node_nullable(false)` in your base class to make non-null `node` field.
           def node_nullable(new_value = nil)
             if new_value.nil?
-              defined?(@node_nullable) ? @node_nullable : superclass.node_nullable
+              @node_nullable != nil ? @node_nullable : superclass.node_nullable
             else
               @node_nullable = new_value
             end
           end
+
+          protected
+
+          attr_writer :node_type, :node_nullable
         end
       end
     end

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

@@ -5,7 +5,7 @@ module GraphQL
     module Relay
       module NodeBehaviors
         def self.included(child_module)
-          child_module.extend(DefaultRelay)
+          child_module.extend(ClassMethods)
           child_module.description("An object with an ID.")
           child_module.field(:id, ID, null: false, description: "ID of the object.", resolver_method: :default_global_id)
         end
@@ -13,6 +13,12 @@ module GraphQL
         def default_global_id
           context.schema.id_from_object(object, self.class, context)
         end
+
+        module ClassMethods
+          def default_relay?
+            true
+          end
+        end
       end
     end
   end

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

@@ -4,8 +4,7 @@ module GraphQL
     module Relay
       module PageInfoBehaviors
         def self.included(child_class)
-          child_class.extend GraphQL::Types::Relay::DefaultRelay
-
+          child_class.extend ClassMethods
           child_class.description "Information about pagination in a connection."
           child_class.field :has_next_page, Boolean, null: false,
             description: "When paginating forwards, are there more items?"
@@ -20,6 +19,12 @@ module GraphQL
             description: "When paginating forwards, the cursor to continue."
         end
       end
+
+      module ClassMethods
+        def default_relay?
+          true
+        end
+      end
     end
   end
 end

data/lib/graphql/types/relay.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 # behavior modules:
-require "graphql/types/relay/default_relay"
 require "graphql/types/relay/connection_behaviors"
 require "graphql/types/relay/edge_behaviors"
 require "graphql/types/relay/node_behaviors"

data/lib/graphql/version.rb

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

data/lib/graphql.rb

@@ -43,7 +43,7 @@ This is probably a bug in GraphQL-Ruby, please report this error on GitHub: http
   # @param graphql_string [String] a GraphQL query string or schema definition
   # @return [GraphQL::Language::Nodes::Document]
   def self.parse(graphql_string, trace: GraphQL::Tracing::NullTrace)
-    parse_with_racc(graphql_string, trace: trace)
+    default_parser.parse(graphql_string, trace: trace)
   end
 
   # Read the contents of `filename` and parse them as GraphQL
@@ -51,15 +51,19 @@ This is probably a bug in GraphQL-Ruby, please report this error on GitHub: http
   # @return [GraphQL::Language::Nodes::Document]
   def self.parse_file(filename)
     content = File.read(filename)
-    parse_with_racc(content, filename: filename)
+    default_parser.parse(content, filename: filename)
+  end
+
+  # @return [Array<Array>]
+  def self.scan(graphql_string)
+    default_parser.scan(graphql_string)
   end
 
   def self.parse_with_racc(string, filename: nil, trace: GraphQL::Tracing::NullTrace)
     GraphQL::Language::Parser.parse(string, filename: filename, trace: trace)
   end
 
-  # @return [Array<GraphQL::Language::Token>]
-  def self.scan(graphql_string)
+  def self.scan_with_ruby(graphql_string)
     GraphQL::Language::Lexer.tokenize(graphql_string)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.20
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -112,16 +112,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -317,7 +331,6 @@ files:
 - lib/graphql/execution/multiplex.rb
 - lib/graphql/execution_error.rb
 - lib/graphql/filter.rb
-- lib/graphql/graphql_ext.bundle
 - lib/graphql/integer_decoding_error.rb
 - lib/graphql/integer_encoding_error.rb
 - lib/graphql/introspection.rb
@@ -342,7 +355,6 @@ files:
 - lib/graphql/language/document_from_schema_definition.rb
 - lib/graphql/language/generation.rb
 - lib/graphql/language/lexer.rb
-- lib/graphql/language/lexer.ri
 - lib/graphql/language/nodes.rb
 - lib/graphql/language/parser.rb
 - lib/graphql/language/parser.y
@@ -570,7 +582,6 @@ files:
 - lib/graphql/types/relay/base_connection.rb
 - lib/graphql/types/relay/base_edge.rb
 - lib/graphql/types/relay/connection_behaviors.rb
-- lib/graphql/types/relay/default_relay.rb
 - lib/graphql/types/relay/edge_behaviors.rb
 - lib/graphql/types/relay/has_node_field.rb
 - lib/graphql/types/relay/has_nodes_field.rb