graphql 1.13.5 → 1.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 532fad107d6e2086bf07c1501a5a14aff55bb7dbafb5d6813a2fb902ac9eb1ff
-  data.tar.gz: 87e0d968351c5e6bf74d0036cfcb87ec0114d575d632794f1b71f2c40e44e4af
+  metadata.gz: d4cb09369d39b11ac4ebb242db3da4bc008a850cdd78c88816143cdfd84addd9
+  data.tar.gz: 4c5fc1be26724efda2dfc4e0f6ae0ad0ff9593b8708cf38ce3ec3a2ffae759d7
 SHA512:
-  metadata.gz: 4721a304fde79ad452e4d6c265841c04c300f34c23c727d374bb584d289277c6352dad5b572d1acc7b79311040b84c49f67a5ab2c34749a27dd366f2fdae3bb3
-  data.tar.gz: c773bcd7603ab6c665e0058fe9852fa241f91db068fa7b1cdb382ddf36e90ffeb4134891ccb37786c60b95e5efb6dc259338aeecb70138fb74122c49277711bd
+  metadata.gz: ea28714d8d623e7591325672a08d031f03877f3744fdc18554ac0be2f2e3149dc2f99ee209f3b91d2d3f82564617d71eee5675a32ea1f60d0d75cc7cdffcf1b3
+  data.tar.gz: 492bd5f0312bb01a79175fdf87388e2ffd51a3bbe2d8a485a78e30f89634fd1a5ec28fbb1626ea775b38cd1984a3abfa2cc7ba58bd6189165fc91f923a668e30

data/lib/graphql/date_encoding_error.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module GraphQL
+  # This error is raised when `Types::ISO8601Date` is asked to return a value
+  # that cannot be parsed to a Ruby Date.
+  #
+  # @see GraphQL::Types::ISO8601Date which raises this error
+  class DateEncodingError < GraphQL::RuntimeTypeError
+    # The value which couldn't be encoded
+    attr_reader :date_value
+
+    def initialize(value)
+      @date_value = value
+      super("Date cannot be parsed: #{value}. \nDate must be be able to be parsed as a Ruby Date object.")
+    end
+  end
+end

data/lib/graphql/execution/interpreter/runtime.rb

@@ -207,7 +207,7 @@ module GraphQL
             # Root .authorized? returned false.
             @response = nil
           else
-            resolve_with_directives(object_proxy, root_operation.directives) do # execute query level directives
+            call_method_on_directives(:resolve, object_proxy, root_operation.directives) do # execute query level directives
               gathered_selections = gather_selections(object_proxy, root_type, root_operation.selections)
               # This is kind of a hack -- `gathered_selections` is an Array if any of the selections
               # require isolation during execution (because of runtime directives). In that case,
@@ -227,7 +227,7 @@ module GraphQL
 
                 @dataloader.append_job {
                   set_all_interpreter_context(query.root_value, nil, nil, path)
-                  resolve_with_directives(object_proxy, selections.graphql_directives) do
+                  call_method_on_directives(:resolve, object_proxy, selections.graphql_directives) do
                     evaluate_selections(
                       path,
                       context.scoped_context,
@@ -503,7 +503,7 @@ module GraphQL
               }
             end
 
-            field_result = resolve_with_directives(object, directives) do
+            field_result = call_method_on_directives(:resolve, object, directives) do
               # Actually call the field resolver and capture the result
               app_result = begin
                 query.with_error_handling do
@@ -735,7 +735,7 @@ module GraphQL
                     final_result = nil
                   end
                   set_all_interpreter_context(continue_value, nil, nil, path) # reset this mutable state
-                  resolve_with_directives(continue_value, selections.graphql_directives) do
+                  call_method_on_directives(:resolve, continue_value, selections.graphql_directives) do
                     evaluate_selections(
                       path,
                       context.scoped_context,
@@ -754,6 +754,8 @@ module GraphQL
             end
           when "LIST"
             inner_type = current_type.of_type
+            # This is true for objects, unions, and interfaces
+            use_dataloader_job = !inner_type.unwrap.kind.input?
             response_list = GraphQLResultArray.new(result_name, selection_result)
             response_list.graphql_non_null_list_items = inner_type.non_null?
             set_result(selection_result, result_name, response_list)
@@ -768,12 +770,12 @@ module GraphQL
                 this_idx = idx
                 next_path.freeze
                 idx += 1
-                # This will update `response_list` with the lazy
-                after_lazy(inner_value, owner: inner_type, path: next_path, ast_node: ast_node, scoped_context: scoped_context, field: field, owner_object: owner_object, arguments: arguments, result_name: this_idx, result: response_list) do |inner_inner_value|
-                  continue_value = continue_value(next_path, inner_inner_value, owner_type, field, inner_type.non_null?, ast_node, this_idx, response_list)
-                  if HALT != continue_value
-                    continue_field(next_path, continue_value, owner_type, field, inner_type, ast_node, next_selections, false, owner_object, arguments, this_idx, response_list)
+                if use_dataloader_job
+                  @dataloader.append_job do
+                    resolve_list_item(inner_value, inner_type, next_path, ast_node, scoped_context, field, owner_object, arguments, this_idx, response_list, next_selections, owner_type)
                   end
+                else
+                  resolve_list_item(inner_value, inner_type, next_path, ast_node, scoped_context, field, owner_object, arguments, this_idx, response_list, next_selections, owner_type)
                 end
               end
             rescue NoMethodError => err
@@ -793,12 +795,25 @@ module GraphQL
           end
         end
 
-        def resolve_with_directives(object, directives, &block)
+        def resolve_list_item(inner_value, inner_type, next_path, ast_node, scoped_context, field, owner_object, arguments, this_idx, response_list, next_selections, owner_type) # rubocop:disable Metrics/ParameterLists
+          set_all_interpreter_context(nil, nil, nil, next_path)
+          call_method_on_directives(:resolve_each, owner_object, ast_node.directives) do
+            # This will update `response_list` with the lazy
+            after_lazy(inner_value, owner: inner_type, path: next_path, ast_node: ast_node, scoped_context: scoped_context, field: field, owner_object: owner_object, arguments: arguments, result_name: this_idx, result: response_list) do |inner_inner_value|
+              continue_value = continue_value(next_path, inner_inner_value, owner_type, field, inner_type.non_null?, ast_node, this_idx, response_list)
+              if HALT != continue_value
+                continue_field(next_path, continue_value, owner_type, field, inner_type, ast_node, next_selections, false, owner_object, arguments, this_idx, response_list)
+              end
+            end
+          end
+        end
+
+        def call_method_on_directives(method_name, object, directives, &block)
           return yield if directives.nil? || directives.empty?
-          run_directive(object, directives, 0, &block)
+          run_directive(method_name, object, directives, 0, &block)
         end
 
-        def run_directive(object, directives, idx, &block)
+        def run_directive(method_name, object, directives, idx, &block)
           dir_node = directives[idx]
           if !dir_node
             yield
@@ -822,8 +837,8 @@ module GraphQL
             if dir_args == HALT
               nil
             else
-              dir_defn.resolve(object, dir_args, context) do
-                run_directive(object, directives, idx + 1, &block)
+              dir_defn.public_send(method_name, object, dir_args, context) do
+                run_directive(method_name, object, directives, idx + 1, &block)
               end
             end
           end

data/lib/graphql/introspection/directive_location_enum.rb

@@ -6,8 +6,8 @@ module GraphQL
       description "A Directive can be adjacent to many parts of the GraphQL language, "\
                   "a __DirectiveLocation describes one such possible adjacencies."
 
-      GraphQL::Directive::LOCATIONS.each do |location|
-        value(location.to_s, GraphQL::Directive::LOCATION_DESCRIPTIONS[location], value: location)
+      GraphQL::Schema::Directive::LOCATIONS.each do |location|
+        value(location.to_s, GraphQL::Schema::Directive::LOCATION_DESCRIPTIONS[location], value: location)
       end
       introspection true
     end

data/lib/graphql/introspection/directive_type.rb

@@ -19,6 +19,8 @@ module GraphQL
       field :on_fragment, Boolean, null: false, deprecation_reason: "Use `locations`.", method: :on_fragment?
       field :on_field, Boolean, null: false, deprecation_reason: "Use `locations`.", method: :on_field?
 
+      field :is_repeatable, Boolean, method: :repeatable?
+
       def args(include_deprecated:)
         args = @context.warden.arguments(@object)
         args = args.reject(&:deprecation_reason) unless include_deprecated

data/lib/graphql/introspection/schema_type.rb

@@ -13,6 +13,11 @@ module GraphQL
       field :mutation_type, GraphQL::Schema::LateBoundType.new("__Type"), "If this server supports mutation, the type that mutation operations will be rooted at."
       field :subscription_type, GraphQL::Schema::LateBoundType.new("__Type"), "If this server support subscription, the type that subscription operations will be rooted at."
       field :directives, [GraphQL::Schema::LateBoundType.new("__Directive")], "A list of all directives supported by this server.", null: false
+      field :description, String, resolver_method: :schema_description
+
+      def schema_description
+        context.schema.description
+      end
 
       def types
         @context.warden.reachable_types.sort_by(&:graphql_name)

data/lib/graphql/introspection/type_type.rb

@@ -12,7 +12,7 @@ module GraphQL
                   "possible at runtime. List and NonNull types compose other types."
 
       field :kind, GraphQL::Schema::LateBoundType.new("__TypeKind"), null: false
-      field :name, String
+      field :name, String, method: :graphql_name
       field :description, String
       field :fields, [GraphQL::Schema::LateBoundType.new("__Field")] do
         argument :include_deprecated, Boolean, required: false, default_value: false
@@ -27,8 +27,14 @@ module GraphQL
       end
       field :of_type, GraphQL::Schema::LateBoundType.new("__Type")
 
-      def name
-        object.graphql_name
+      field :specified_by_url, String
+
+      def specified_by_url
+        if object.kind.scalar?
+          object.specified_by_url
+        else
+          nil
+        end
       end
 
       def kind

data/lib/graphql/introspection.rb

@@ -7,6 +7,7 @@ module GraphQL
       <<-QUERY
 query IntrospectionQuery {
   __schema {
+    description
     queryType { name }
     mutationType { name }
     subscriptionType { name }
@@ -17,6 +18,7 @@ query IntrospectionQuery {
       name
       description
       locations
+      isRepeatable
       args#{include_deprecated_args ? '(includeDeprecated: true)' : ''} {
         ...InputValue
       }
@@ -27,6 +29,7 @@ fragment FullType on __Type {
   kind
   name
   description
+  specifiedByUrl
   fields(includeDeprecated: true) {
     name
     description

data/lib/graphql/pagination/relation_connection.rb

@@ -47,7 +47,7 @@ module GraphQL
       def cursor_for(item)
         load_nodes
         # index in nodes + existing offset + 1 (because it's offset, not index)
-        offset = nodes.index(item) + 1 + (@paged_nodes_offset || 0) + (relation_offset(items) || 0)
+        offset = nodes.index(item) + 1 + (@paged_nodes_offset || 0) - (relation_offset(items) || 0)
         encode(offset.to_s)
       end
 
@@ -116,9 +116,9 @@ module GraphQL
         if defined?(@sliced_nodes_limit)
           return
         else
+          next_offset = relation_offset(items) || 0
           if after_offset
-            previous_offset = relation_offset(items) || 0
-            relation_offset = previous_offset + after_offset
+            next_offset += after_offset
           end
 
           if before_offset && after_offset
@@ -136,7 +136,7 @@ module GraphQL
           end
 
           @sliced_nodes_limit = relation_limit
-          @sliced_nodes_offset = relation_offset || 0
+          @sliced_nodes_offset = next_offset
         end
       end
 

data/lib/graphql/schema/directive.rb

@@ -90,6 +90,11 @@ module GraphQL
           yield
         end
 
+        # Continuing is passed as a block, yield to continue.
+        def resolve_each(object, arguments, context)
+          yield
+        end
+
         def on_field?
           locations.include?(FIELD)
         end
@@ -147,6 +152,7 @@ module GraphQL
         ENUM_VALUE =             :ENUM_VALUE,
         INPUT_OBJECT =           :INPUT_OBJECT,
         INPUT_FIELD_DEFINITION = :INPUT_FIELD_DEFINITION,
+        VARIABLE_DEFINITION =    :VARIABLE_DEFINITION,
       ]
 
       DEFAULT_DEPRECATION_REASON = 'No longer supported'
@@ -169,6 +175,7 @@ module GraphQL
         ENUM_VALUE:               'Location adjacent to an enum value definition.',
         INPUT_OBJECT:             'Location adjacent to an input object type definition.',
         INPUT_FIELD_DEFINITION:   'Location adjacent to an input object field definition.',
+        VARIABLE_DEFINITION:      'Location adjacent to a variable definition.',
       }
 
       private

data/lib/graphql/schema/loader.rb

@@ -34,6 +34,7 @@ module GraphQL
         Class.new(GraphQL::Schema) do
           orphan_types(types.values)
           directives(directives)
+          description(schema["description"])
 
           def self.resolve_type(*)
             raise(GraphQL::RequiredImplementationMissingError, "This schema was loaded from string, so it can't resolve types for objects")
@@ -141,6 +142,7 @@ module GraphQL
               Class.new(GraphQL::Schema::Scalar) do
                 graphql_name(type["name"])
                 description(type["description"])
+                specified_by_url(type["specifiedByUrl"])
               end
             end
           when "UNION"
@@ -160,6 +162,7 @@ module GraphQL
             graphql_name(directive["name"])
             description(directive["description"])
             locations(*directive["locations"].map(&:to_sym))
+            repeatable(directive["isRepeatable"])
             loader.build_arguments(self, directive["args"], type_resolver)
           end
         end

data/lib/graphql/schema/scalar.rb

@@ -32,6 +32,18 @@ module GraphQL
           GraphQL::TypeKinds::SCALAR
         end
 
+        def specified_by_url(new_url = nil)
+          if new_url
+            @specified_by_url = new_url
+          elsif defined?(@specified_by_url)
+            @specified_by_url
+          elsif superclass.respond_to?(:specified_by_url)
+            superclass.specified_by_url
+          else
+            nil
+          end
+        end
+
         def default_scalar(is_default = nil)
           if !is_default.nil?
             @default_scalar = is_default

data/lib/graphql/schema.rb

@@ -892,6 +892,17 @@ module GraphQL
         GraphQL::Language::DocumentFromSchemaDefinition.new(self).document
       end
 
+      # @return [String, nil]
+      def description(new_description = nil)
+        if new_description
+          @description = new_description
+        elsif defined?(@description)
+          @description
+        else
+          find_inherited_value(:description, nil)
+        end
+      end
+
       def find(path)
         if !@finder
           @find_cache = {}

data/lib/graphql/types/iso_8601_date.rb

@@ -21,13 +21,21 @@ module GraphQL
         Date.parse(value.to_s).iso8601
       end
 
-      # @param str_value [String]
+      # @param str_value [String, Date, DateTime, Time]
       # @return [Date]
-      def self.coerce_input(str_value, _ctx)
-        Date.iso8601(str_value)
+      def self.coerce_input(value, ctx)
+        if value.is_a?(::Date)
+          value
+        elsif value.is_a?(::DateTime)
+          value.to_date
+        elsif value.is_a?(::Time)
+          value.to_date
+        else
+          Date.iso8601(value)
+        end
       rescue ArgumentError, TypeError
-        # Invalid input
-        nil
+        err = GraphQL::DateEncodingError.new(value)
+        ctx.schema.type_error(err, ctx)
       end
     end
   end

data/lib/graphql/version.rb

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

data/lib/graphql.rb

@@ -69,6 +69,7 @@ require "graphql/invalid_name_error"
 require "graphql/integer_decoding_error"
 require "graphql/integer_encoding_error"
 require "graphql/string_encoding_error"
+require "graphql/date_encoding_error"
 
 require "graphql/define"
 require "graphql/base_type"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.13.5
+  version: 1.13.6
 platform: ruby
 authors:
 - Robert Mosolgo
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -323,6 +323,7 @@ files:
 - lib/graphql/dataloader/request.rb
 - lib/graphql/dataloader/request_all.rb
 - lib/graphql/dataloader/source.rb
+- lib/graphql/date_encoding_error.rb
 - lib/graphql/define.rb
 - lib/graphql/define/assign_argument.rb
 - lib/graphql/define/assign_connection.rb
@@ -695,7 +696,7 @@ metadata:
   source_code_uri: https://github.com/rmosolgo/graphql-ruby
   bug_tracker_uri: https://github.com/rmosolgo/graphql-ruby/issues
   mailing_list_uri: https://tinyletter.com/graphql-ruby
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -710,8 +711,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby
 test_files: []