graphql 2.5.25 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b41789f8a04e203b8ddd9d5b00f860f2a7d927c80d8d92d8783c34a8c18d2fcf
-  data.tar.gz: a36f4f17957950cda4911c16c9dda77f3bd46ab33f070b02b4b3978b22a57b93
+  metadata.gz: 73ce16b1c358f4ab02c2d2d00e3a2a6b58a36ec2ca2d3012026ef5e346976b15
+  data.tar.gz: 8608b2cb12777e9d53c26508fb592a4c71bd733973e80608fa0010f46933d714
 SHA512:
-  metadata.gz: 961a464af616838a0b64c3e164c31e430fd81c6890505ad57af9df6125d2d58cd0abf477945544a05bcb4738732662003099691033a5323558e506c03df56a5f
-  data.tar.gz: e97f0af53c9c9a37137a0802ef634bbf29c37579b0f6de644af7e14b2a22d2f469dac3e3d2e8352bab4493d49d0e5929623ebf085c5cac4d80e40d36b14dfa11
+  metadata.gz: ee646816ac6503e2a50e601b8bcde6750409fb7bb34dd3395e7a6ba36cfc7f86ba2cd4a07b1a300b9f15d480d5a40e1e681b6a54a8355201997bff1ac3675566
+  data.tar.gz: c7f5679d27b0c4141feb01b2b15a5e04bdf5e77c3ef940d5c0cc8ecdcec995ef2e47657f8b2838ea317c639b9be628fd57c4224864b6b754207f18c4d9087b51

data/lib/graphql/schema/build_from_definition.rb

@@ -99,6 +99,16 @@ module GraphQL
               # It's possible that this was already loaded by the directives
               prev_type = types[definition.name]
               if prev_type.nil? || prev_type.is_a?(Schema::LateBoundType)
+                if definition.is_a?(GraphQL::Language::Nodes::ObjectTypeDefinition) || definition.is_a?(Language::Nodes::InterfaceTypeDefinition)
+                  interface_names = definition.interfaces.map(&:name)
+                  transitive_names = interface_names.map { |n| document.definitions.find { |d| d.respond_to?(:name) && d.name == n }&.interfaces&.map(&:name) }
+                  transitive_names.flatten!
+                  transitive_names.compact!
+                  if !(missing_transitive_interfaces = transitive_names - interface_names).empty?
+                    raise GraphQL::Schema::InvalidDocumentError, "type #{definition.name} is missing one or more transitive interface names: #{missing_transitive_interfaces.join(", ")}. Add them to the type's `implements` list and try again."
+                  end
+                end
+
                 types[definition.name] = build_definition_from_node(definition, type_resolver, default_resolve, base_types)
               end
             end

data/lib/graphql/schema/resolver.rb

@@ -66,14 +66,31 @@ module GraphQL
         q = context.query
         trace_objs = [object]
         q.current_trace.begin_execute_field(field, @prepared_arguments, trace_objs, q)
-        begin
-          is_authed, new_return_value = authorized?(**@prepared_arguments)
-        rescue GraphQL::UnauthorizedError  => err
-          new_return_value = q.schema.unauthorized_object(err)
-          is_authed = true # the error was handled
+        is_ready = ready?(**@prepared_arguments)
+        runner = @field_resolve_step.runner
+        if runner.resolves_lazies && runner.schema.lazy?(is_ready)
+          is_ready, new_return_value = runner.schema.sync_lazy(is_ready)
         end
 
-        if (runner = @field_resolve_step.runner).resolves_lazies && runner.schema.lazy?(is_authed)
+        if is_ready.is_a?(Array)
+          is_ready, new_return_value = is_ready
+          if is_ready != false
+            raise "Unexpected result from #ready? (expected `true`, `false` or `[false, {...}]`): [#{is_ready.inspect}, #{new_return_value.inspect}]"
+          else
+            new_return_value
+          end
+        end
+
+        if is_ready
+          begin
+            is_authed, new_return_value = authorized?(**@prepared_arguments)
+          rescue GraphQL::UnauthorizedError  => err
+            new_return_value = q.schema.unauthorized_object(err)
+            is_authed = true # the error was handled
+          end
+        end
+
+        if runner.resolves_lazies && runner.schema.lazy?(is_authed)
           is_authed, new_return_value = runner.schema.sync_lazy(is_authed)
         end
 
@@ -93,7 +110,13 @@ module GraphQL
         q = context.query
         q.current_trace.end_execute_field(field, @prepared_arguments, trace_objs, q, [result])
         exec_result[exec_index] = result
-      rescue RuntimeError => err
+      rescue GraphQL::UnauthorizedError => auth_err
+        exec_result[exec_index] = begin
+          context.schema.unauthorized_object(auth_err)
+        rescue GraphQL::ExecutionError => exec_err
+          exec_err
+        end
+      rescue GraphQL::RuntimeError => err
         exec_result[exec_index] = err
       rescue StandardError => stderr
         exec_result[exec_index] = begin

data/lib/graphql/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.5.25
+  version: 2.6.0
 platform: ruby
 authors:
 - Robert Mosolgo