graphql 2.0.19 → 2.0.21

data/lib/graphql/language/parser.y

@@ -284,7 +284,11 @@ rule
    | directive_definition
 
   schema_definition:
-      SCHEMA directives_list_opt LCURLY operation_type_definition_list RCURLY { result = make_node(:SchemaDefinition, position_source: val[0], definition_line: val[0][1], directives: val[1], **val[3]) }
+      SCHEMA directives_list_opt operation_type_definition_list_opt { result = make_node(:SchemaDefinition, position_source: val[0], definition_line: val[0][1], directives: val[1], **val[2]) }
+
+  operation_type_definition_list_opt:
+      /* none */ { result = {} }
+    | LCURLY operation_type_definition_list RCURLY { result = val[1] }
 
   operation_type_definition_list:
       operation_type_definition
@@ -460,7 +464,7 @@ def parse_document
   @document ||= begin
     # Break the string into tokens
     @trace.lex(query_string: @query_string) do
-      @tokens ||= GraphQL.scan(@query_string)
+      @tokens ||= GraphQL::Language::Lexer.tokenize(@query_string)
     end
     # From the tokens, build an AST
     @trace.parse(query_string: @query_string) do

data/lib/graphql/pagination/connection.rb

@@ -58,7 +58,7 @@ module GraphQL
       # @param arguments [Hash] The arguments to the field that returned the collection wrapped by this connection
       # @param max_page_size [Integer, nil] A configured value to cap the result size. Applied as `first` if neither first or last are given and no `default_page_size` is set.
       # @param default_page_size [Integer, nil] A configured value to determine the result size when neither first or last are given.
-      def initialize(items, parent: nil, field: nil, context: nil, first: nil, after: nil, max_page_size: :not_given, default_page_size: :not_given, last: nil, before: nil, edge_class: nil, arguments: nil)
+      def initialize(items, parent: nil, field: nil, context: nil, first: nil, after: nil, max_page_size: NOT_CONFIGURED, default_page_size: NOT_CONFIGURED, last: nil, before: nil, edge_class: nil, arguments: nil)
         @items = items
         @parent = parent
         @context = context
@@ -71,14 +71,14 @@ module GraphQL
         @edge_class = edge_class || self.class::Edge
         # This is only true if the object was _initialized_ with an override
         # or if one is assigned later.
-        @has_max_page_size_override = max_page_size != :not_given
-        @max_page_size = if max_page_size == :not_given
+        @has_max_page_size_override = max_page_size != NOT_CONFIGURED
+        @max_page_size = if max_page_size == NOT_CONFIGURED
           nil
         else
           max_page_size
         end
-        @has_default_page_size_override = default_page_size != :not_given
-        @default_page_size = if default_page_size == :not_given
+        @has_default_page_size_override = default_page_size != NOT_CONFIGURED
+        @default_page_size = if default_page_size == NOT_CONFIGURED
           nil
         else
           default_page_size

data/lib/graphql/query/context.rb

@@ -91,8 +91,8 @@ module GraphQL
       end
 
       class ScopedContext
-        NO_PATH = [].freeze
-        NO_CONTEXT = {}.freeze
+        NO_PATH = GraphQL::EmptyObjects::EMPTY_ARRAY
+        NO_CONTEXT = GraphQL::EmptyObjects::EMPTY_HASH
 
         def initialize(query_context)
           @query_context = query_context
@@ -226,8 +226,8 @@ module GraphQL
           if key == :current_path
             current_path
           else
-            thread_info = Thread.current[:__graphql_runtime_info]
-            thread_info && thread_info[key]
+            (current_runtime_state = Thread.current[:__graphql_runtime_info]) &&
+              (current_runtime_state.public_send(key))
           end
         else
           # not found
@@ -236,11 +236,11 @@ module GraphQL
       end
 
       def current_path
-        thread_info = Thread.current[:__graphql_runtime_info]
-        path = thread_info &&
-          (result = thread_info[:current_result]) &&
+        current_runtime_state = Thread.current[:__graphql_runtime_info]
+        path = current_runtime_state &&
+          (result = current_runtime_state.current_result) &&
           (result.path)
-        if path && (rn = thread_info[:current_result_name])
+        if path && (rn = current_runtime_state.current_result_name)
           path = path.dup
           path.push(rn)
         end
@@ -259,8 +259,8 @@ module GraphQL
 
       def fetch(key, default = UNSPECIFIED_FETCH_DEFAULT)
         if RUNTIME_METADATA_KEYS.include?(key)
-          (thread_info = Thread.current[:__graphql_runtime_info]) &&
-            thread_info[key]
+          (runtime = Thread.current[:__graphql_runtime_info]) &&
+            (runtime.public_send(key))
         elsif @scoped_context.key?(key)
           scoped_context[key]
         elsif @provided_values.key?(key)
@@ -276,8 +276,9 @@ module GraphQL
 
       def dig(key, *other_keys)
         if RUNTIME_METADATA_KEYS.include?(key)
-          (thread_info = Thread.current[:__graphql_runtime_info]).key?(key) &&
-            thread_info.dig(key, *other_keys)
+          (current_runtime_state = Thread.current[:__graphql_runtime_info]) &&
+            (obj = current_runtime_state.public_send(key)) &&
+            obj.dig(*other_keys)
         elsif @scoped_context.key?(key)
           @scoped_context.dig(key, *other_keys)
         else

data/lib/graphql/query/null_context.rb

@@ -24,7 +24,7 @@ module GraphQL
         @dataloader = GraphQL::Dataloader::NullDataloader.new
         @schema = NullSchema
         @warden = NullWarden.new(
-          GraphQL::Filter.new,
+          GraphQL::Filter.new(silence_deprecation_warning: true),
           context: self,
           schema: @schema,
         )

data/lib/graphql/query.rb

@@ -100,12 +100,16 @@ module GraphQL
 
       # Support `ctx[:backtrace] = true` for wrapping backtraces
       if context && context[:backtrace] && !@tracers.include?(GraphQL::Backtrace::Tracer)
-        context_tracers += [GraphQL::Backtrace::Tracer]
-        @tracers << GraphQL::Backtrace::Tracer
+        if schema.trace_class <= GraphQL::Tracing::LegacyTrace
+          context_tracers += [GraphQL::Backtrace::Tracer]
+          @tracers << GraphQL::Backtrace::Tracer
+        elsif !(current_trace.class <= GraphQL::Backtrace::Trace)
+          raise "Invariant: `backtrace: true` should have provided a trace class with Backtrace mixed in, but it didnt. (Found: #{current_trace.class.ancestors}). This is a bug in GraphQL-Ruby, please report it on GitHub."
+        end
       end
 
       if context_tracers.any? && !(schema.trace_class <= GraphQL::Tracing::LegacyTrace)
-        raise ArgumentError, "context[:tracers] and context[:backtrace] are not supported without `tracer_class(GraphQL::Tracing::LegacyTrace)` in the schema configuration, please add it."
+        raise ArgumentError, "context[:tracers] are not supported without `trace_class(GraphQL::Tracing::LegacyTrace)` in the schema configuration, please add it."
       end
 
 
@@ -318,8 +322,8 @@ module GraphQL
     # @param value [Object] Any runtime value
     # @return [GraphQL::ObjectType, nil] The runtime type of `value` from {Schema#resolve_type}
     # @see {#possible_types} to apply filtering from `only` / `except`
-    def resolve_type(abstract_type, value = :__undefined__)
-      if value.is_a?(Symbol) && value == :__undefined__
+    def resolve_type(abstract_type, value = NOT_CONFIGURED)
+      if value.is_a?(Symbol) && value == NOT_CONFIGURED
         # Old method signature
         value = abstract_type
         abstract_type = nil

data/lib/graphql/schema/argument.rb

@@ -7,9 +7,7 @@ module GraphQL
       include GraphQL::Schema::Member::HasDirectives
       include GraphQL::Schema::Member::HasDeprecationReason
       include GraphQL::Schema::Member::HasValidators
-      include GraphQL::Schema::FindInheritedValue::EmptyObjects
-
-      NO_DEFAULT = :__no_default__
+      include GraphQL::EmptyObjects
 
       # @return [String] the GraphQL name for this argument, camelized unless `camelize: false` is provided
       attr_reader :name
@@ -20,8 +18,8 @@ module GraphQL
 
       # @param new_prepare [Method, Proc]
       # @return [Symbol] A method or proc to call to transform this value before sending it to field resolution method
-      def prepare(new_prepare = NO_DEFAULT)
-        if new_prepare != NO_DEFAULT
+      def prepare(new_prepare = NOT_CONFIGURED)
+        if new_prepare != NOT_CONFIGURED
           @prepare = new_prepare
         end
         @prepare
@@ -52,7 +50,7 @@ module GraphQL
       # @param deprecation_reason [String]
       # @param validates [Hash, nil] Options for building validators, if any should be applied
       # @param replace_null_with_default [Boolean] if `true`, incoming values of `null` will be replaced with the configured `default_value`
-      def initialize(arg_name = nil, type_expr = nil, desc = nil, required: true, type: nil, name: nil, loads: nil, description: nil, ast_node: nil, default_value: NO_DEFAULT, as: nil, from_resolver: false, camelize: true, prepare: nil, owner:, validates: nil, directives: nil, deprecation_reason: nil, replace_null_with_default: false, &definition_block)
+      def initialize(arg_name = nil, type_expr = nil, desc = nil, required: true, type: nil, name: nil, loads: nil, description: 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)
         @type_expr = type_expr || type
@@ -104,8 +102,8 @@ module GraphQL
 
       # @param default_value [Object] The value to use when the client doesn't provide one
       # @return [Object] the value used when the client doesn't provide a value for this argument
-      def default_value(new_default_value = NO_DEFAULT)
-        if new_default_value != NO_DEFAULT
+      def default_value(new_default_value = NOT_CONFIGURED)
+        if new_default_value != NOT_CONFIGURED
           @default_value = new_default_value
         end
         @default_value
@@ -113,7 +111,7 @@ module GraphQL
 
       # @return [Boolean] True if this argument has a default value
       def default_value?
-        @default_value != NO_DEFAULT
+        @default_value != NOT_CONFIGURED
       end
 
       def replace_null_with_default?

data/lib/graphql/schema/build_from_definition.rb

@@ -21,6 +21,7 @@ module GraphQL
 
       # @api private
       module Builder
+        include GraphQL::EmptyObjects
         extend self
 
         def build(schema_superclass, document, default_resolve:, using: {}, relay:)
@@ -99,6 +100,16 @@ module GraphQL
               raise InvalidDocumentError.new("Specified subscription type \"#{schema_definition.subscription}\" not found in document.") unless types[schema_definition.subscription]
               subscription_root_type = types[schema_definition.subscription]
             end
+
+            if schema_definition.query.nil? &&
+                schema_definition.mutation.nil? &&
+                schema_definition.subscription.nil?
+              # This schema may have been given with directives only,
+              # check for defaults:
+              query_root_type = types['Query']
+              mutation_root_type = types['Mutation']
+              subscription_root_type = types['Subscription']
+            end
           else
             query_root_type = types['Query']
             mutation_root_type = types['Mutation']
@@ -107,6 +118,8 @@ module GraphQL
 
           raise InvalidDocumentError.new('Must provide schema definition with query type or a type named Query.') unless query_root_type
 
+          builder = self
+
           schema_class = Class.new(schema_superclass) do
             begin
               # Add these first so that there's some chance of resolving late-bound types
@@ -134,6 +147,7 @@ module GraphQL
 
             if schema_definition
               ast_node(schema_definition)
+              builder.build_directives(self, schema_definition, type_resolver)
             end
 
             using.each do |plugin, options|
@@ -361,8 +375,6 @@ module GraphQL
           end
         end
 
-        NO_DEFAULT_VALUE = {}.freeze
-
         def build_arguments(type_class, arguments, type_resolver)
           builder = self
 
@@ -370,7 +382,7 @@ module GraphQL
             default_value_kwargs = if !argument_defn.default_value.nil?
               { default_value: builder.build_default_value(argument_defn.default_value) }
             else
-              NO_DEFAULT_VALUE
+              EMPTY_HASH
             end
 
             type_class.argument(

data/lib/graphql/schema/enum_value.rb

@@ -25,19 +25,16 @@ module GraphQL
       include GraphQL::Schema::Member::HasDirectives
       include GraphQL::Schema::Member::HasDeprecationReason
 
-      UNDEFINED_VALUE = Object.new.freeze
-      private_constant :UNDEFINED_VALUE
-
       attr_reader :graphql_name
 
       # @return [Class] The enum type that owns this value
       attr_reader :owner
 
-      def initialize(graphql_name, desc = nil, owner:, ast_node: nil, directives: nil, description: nil, value: UNDEFINED_VALUE, deprecation_reason: nil, &block)
+      def initialize(graphql_name, desc = nil, owner:, ast_node: nil, directives: nil, description: nil, value: NOT_CONFIGURED, deprecation_reason: nil, &block)
         @graphql_name = graphql_name.to_s
         GraphQL::NameValidator.validate!(@graphql_name)
         @description = desc || description
-        @value = value === UNDEFINED_VALUE ? @graphql_name : value
+        @value = value === NOT_CONFIGURED ? @graphql_name : value
         if deprecation_reason
           self.deprecation_reason = deprecation_reason
         end

data/lib/graphql/schema/field.rb

@@ -11,7 +11,7 @@ module GraphQL
       include GraphQL::Schema::Member::HasPath
       include GraphQL::Schema::Member::HasValidators
       extend GraphQL::Schema::FindInheritedValue
-      include GraphQL::Schema::FindInheritedValue::EmptyObjects
+      include GraphQL::EmptyObjects
       include GraphQL::Schema::Member::HasDirectives
       include GraphQL::Schema::Member::HasDeprecationReason
 
@@ -219,7 +219,7 @@ module GraphQL
       # @param method_conflict_warning [Boolean] If false, skip the warning if this field's method conflicts with a built-in method
       # @param validates [Array<Hash>] Configurations for validating this field
       # @fallback_value [Object] A fallback value if the method is not defined
-      def initialize(type: nil, name: nil, owner: nil, null: nil, description: NOT_CONFIGURED, deprecation_reason: nil, method: nil, hash_key: nil, dig: nil, resolver_method: nil, connection: nil, max_page_size: NOT_CONFIGURED, default_page_size: NOT_CONFIGURED, scope: nil, introspection: false, camelize: true, trace: nil, complexity: nil, ast_node: nil, extras: EMPTY_ARRAY, extensions: EMPTY_ARRAY, connection_extension: self.class.connection_extension, resolver_class: nil, subscription_scope: nil, relay_node_field: false, relay_nodes_field: false, method_conflict_warning: true, broadcastable: NOT_CONFIGURED, arguments: EMPTY_HASH, directives: EMPTY_HASH, validates: EMPTY_ARRAY, fallback_value: :not_given, &definition_block)
+      def initialize(type: nil, name: nil, owner: nil, null: nil, description: NOT_CONFIGURED, deprecation_reason: nil, method: nil, hash_key: nil, dig: nil, resolver_method: nil, connection: nil, max_page_size: NOT_CONFIGURED, default_page_size: NOT_CONFIGURED, scope: nil, introspection: false, camelize: true, trace: nil, complexity: nil, ast_node: nil, extras: EMPTY_ARRAY, extensions: EMPTY_ARRAY, connection_extension: self.class.connection_extension, resolver_class: nil, subscription_scope: nil, relay_node_field: false, relay_nodes_field: false, method_conflict_warning: true, broadcastable: NOT_CONFIGURED, arguments: EMPTY_HASH, directives: EMPTY_HASH, validates: EMPTY_ARRAY, fallback_value: NOT_CONFIGURED, &definition_block)
         if name.nil?
           raise ArgumentError, "missing first `name` argument or keyword `name:`"
         end
@@ -608,15 +608,16 @@ module GraphQL
           # The resolver _instance_ will check itself during `resolve()`
           @resolver_class.authorized?(object, context)
         else
-          if (arg_values = context[:current_arguments])
-            # ^^ that's provided by the interpreter at runtime, and includes info about whether the default value was used or not.
-            using_arg_values = true
-            arg_values = arg_values.argument_values
-          else
-            arg_values = args
-            using_arg_values = false
-          end
           if args.size > 0
+            if (arg_values = context[:current_arguments])
+              # ^^ that's provided by the interpreter at runtime, and includes info about whether the default value was used or not.
+              using_arg_values = true
+              arg_values = arg_values.argument_values
+            else
+              arg_values = args
+              using_arg_values = false
+            end
+
             args = context.warden.arguments(self)
             args.each do |arg|
               arg_key = arg.keyword
@@ -684,7 +685,7 @@ module GraphQL
                 if hash_value == false
                   hash_value
                 else
-                  hash_value || (@fallback_value != :not_given ? @fallback_value : nil)
+                  hash_value || (@fallback_value != NOT_CONFIGURED ? @fallback_value : nil)
                 end
               elsif obj.respond_to?(resolver_method)
                 method_to_call = resolver_method
@@ -702,7 +703,7 @@ module GraphQL
                   inner_object[@method_sym]
                 elsif inner_object.key?(@method_str)
                   inner_object[@method_str]
-                elsif @fallback_value != :not_given
+                elsif @fallback_value != NOT_CONFIGURED
                   @fallback_value
                 else
                   nil
@@ -715,7 +716,7 @@ module GraphQL
                 else
                   inner_object.public_send(@method_sym)
                 end
-              elsif @fallback_value != :not_given
+              elsif @fallback_value != NOT_CONFIGURED
                 @fallback_value
               else
                 raise <<-ERR
@@ -752,6 +753,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/field_extension.rb

@@ -71,14 +71,11 @@ module GraphQL
           elsif inherited_extras
             inherited_extras
           else
-            NO_EXTRAS
+            GraphQL::EmptyObjects::EMPTY_ARRAY
           end
         end
       end
 
-      NO_EXTRAS = [].freeze
-      private_constant :NO_EXTRAS
-
       # Called when this extension is attached to a field.
       # The field definition may be extended during this method.
       # @return [void]

data/lib/graphql/schema/find_inherited_value.rb

@@ -2,17 +2,12 @@
 module GraphQL
   class Schema
     module FindInheritedValue
-      module EmptyObjects
-        EMPTY_HASH = {}.freeze
-        EMPTY_ARRAY = [].freeze
-      end
-
       def self.extended(child_cls)
-        child_cls.singleton_class.include(EmptyObjects)
+        child_cls.singleton_class.include(GraphQL::EmptyObjects)
       end
 
       def self.included(child_cls)
-        child_cls.include(EmptyObjects)
+        child_cls.include(GraphQL::EmptyObjects)
       end
 
       private

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_arguments.rb

@@ -413,7 +413,7 @@ module GraphQL
           end
         end
 
-        NO_ARGUMENTS = {}.freeze
+        NO_ARGUMENTS =  GraphQL::EmptyObjects::EMPTY_HASH
         def own_arguments
           @own_arguments || NO_ARGUMENTS
         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.
@@ -23,8 +33,6 @@ module GraphQL
           nil
         end
 
-        NO_DIRECTIVES = [].freeze
-
         def directives
           HasDirectives.get_directives(self, @own_directives, :directives)
         end
@@ -45,7 +53,7 @@ module GraphQL
               inherited_directives = if schema_member.superclass.respond_to?(directives_method)
                 get_directives(schema_member.superclass, schema_member.superclass.public_send(directives_method), directives_method)
               else
-                NO_DIRECTIVES
+                GraphQL::EmptyObjects::EMPTY_ARRAY
               end
               if inherited_directives.any? && directives
                 dirs = []
@@ -57,7 +65,7 @@ module GraphQL
               elsif inherited_directives.any?
                 inherited_directives
               else
-                NO_DIRECTIVES
+                GraphQL::EmptyObjects::EMPTY_ARRAY
               end
             when Module
               dirs = nil
@@ -72,9 +80,9 @@ module GraphQL
                 dirs ||= []
                 merge_directives(dirs, directives)
               end
-              dirs || NO_DIRECTIVES
+              dirs || GraphQL::EmptyObjects::EMPTY_ARRAY
             when HasDirectives
-              directives || NO_DIRECTIVES
+              directives || GraphQL::EmptyObjects::EMPTY_ARRAY
             else
               raise "Invariant: how could #{schema_member} not be a Class, Module, or instance of HasDirectives?"
             end
@@ -101,12 +109,9 @@ module GraphQL
           end
         end
 
-
         protected
 
-        def own_directives
-          @own_directives
-        end
+        attr_accessor :own_directives
       end
     end
   end