graphql 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 879e9096d14bb82f2c28f57c60d34e66c6706181
-  data.tar.gz: c39e6b2c81303fba7c2dfa1527932af7d8eb9d31
+  metadata.gz: 2d2c09e6e6d782f0eb3cbb46086cd63e52fa26d1
+  data.tar.gz: 34f2ed0c60277b31b0ade93428a48bb77dc4b52e
 SHA512:
-  metadata.gz: 79d69e540d7cb3063ce6fea65286f0e66634edeced066930cbc63de169eb9f2a53412f606aacfbf02e28fccfd11781122e95cc31ee234073c6b0f3246c7ac26e
-  data.tar.gz: 4fe1822b9f021f064a2ba383c65a8c889a4acd08927f0c99ed9d9e473890474c3529afa97ed5cb95fd4f67f5d7754b595cdd654734a2fa595ecfebebeb4ff2a8
+  metadata.gz: 91ca8e91bd60c9595113ed6f482a2178d4a56dec6d5d05d08755beaac8f9dac489b7ce952f43e8d585a9d25d0a189684ea207604231bf207254f53af821e964d
+  data.tar.gz: 9ce5edd8f2965b7a373aa8f9f7eafac03fc23e241f0bd0f13267accc3c265151b54ac84f70b26edd877e4b198fd2fd17bbd4792a1dcb9c2afc8ceb64ee4b9692

data/lib/generators/graphql/templates/graphql_controller.erb

@@ -9,6 +9,9 @@ class GraphqlController < ApplicationController
     }
     result = <%= schema_name %>.execute(query, variables: variables, context: context, operation_name: operation_name)
     render json: result
+  rescue => e
+    raise e unless Rails.env.development?
+    handle_error_in_development e
   end
 
   private
@@ -30,4 +33,11 @@ class GraphqlController < ApplicationController
       raise ArgumentError, "Unexpected parameter: #{ambiguous_param}"
     end
   end
+
+  def handle_error_in_development(e)
+    logger.error e.message
+    logger.error e.backtrace.join("\n")
+
+    render json: { error: { message: e.message, backtrace: e.backtrace }, data: {} }, status: 500
+  end
 end

data/lib/graphql/compatibility/schema_parser_specification.rb

@@ -192,6 +192,404 @@ module GraphQL
             assert_equal 'SubscriptionRoot', schema.subscription
           end
 
+          def test_it_parses_schema_extensions
+            document = parse('
+              extend schema {
+                query: QueryRoot
+                mutation: MutationRoot
+                subscription: SubscriptionRoot
+              }
+            ')
+
+            schema_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::SchemaExtension, schema_extension.class
+            assert_equal [2, 15], schema_extension.position
+
+            assert_equal 'QueryRoot', schema_extension.query
+            assert_equal 'MutationRoot', schema_extension.mutation
+            assert_equal 'SubscriptionRoot', schema_extension.subscription
+          end
+
+          def test_it_parses_schema_extensions_with_directives
+            document = parse('
+              extend schema @something {
+                query: QueryRoot
+              }
+            ')
+
+            schema_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::SchemaExtension, schema_extension.class
+
+            assert_equal 1, schema_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, schema_extension.directives.first.class
+            assert_equal 'something', schema_extension.directives.first.name
+
+            assert_equal 'QueryRoot', schema_extension.query
+            assert_equal nil, schema_extension.mutation
+            assert_equal nil, schema_extension.subscription
+          end
+
+          def test_it_parses_schema_extensions_with_only_directives
+            document = parse('
+              extend schema @something
+            ')
+
+            schema_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::SchemaExtension, schema_extension.class
+
+            assert_equal 1, schema_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, schema_extension.directives.first.class
+            assert_equal 'something', schema_extension.directives.first.name
+
+            assert_equal nil, schema_extension.query
+            assert_equal nil, schema_extension.mutation
+            assert_equal nil, schema_extension.subscription
+          end
+
+          def test_it_parses_scalar_extensions
+            document = parse('
+              extend scalar Date @something @somethingElse
+            ')
+
+            scalar_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::ScalarTypeExtension, scalar_extension.class
+            assert_equal 'Date', scalar_extension.name
+            assert_equal [2, 15], scalar_extension.position
+
+            assert_equal 2, scalar_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, scalar_extension.directives.first.class
+            assert_equal 'something', scalar_extension.directives.first.name
+            assert_equal GraphQL::Language::Nodes::Directive, scalar_extension.directives.last.class
+            assert_equal 'somethingElse', scalar_extension.directives.last.name
+          end
+
+          def test_it_parses_object_type_extensions_with_field_definitions
+            document = parse('
+              extend type User {
+                login: String!
+              }
+            ')
+
+            object_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::ObjectTypeExtension, object_type_extension.class
+            assert_equal 'User', object_type_extension.name
+            assert_equal [2, 15], object_type_extension.position
+
+            assert_equal 1, object_type_extension.fields.length
+            assert_equal GraphQL::Language::Nodes::FieldDefinition, object_type_extension.fields.first.class
+          end
+
+          def test_it_parses_object_type_extensions_with_field_definitions_and_directives
+            document = parse('
+              extend type User @deprecated {
+                login: String!
+              }
+            ')
+
+            object_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::ObjectTypeExtension, object_type_extension.class
+            assert_equal 'User', object_type_extension.name
+            assert_equal [2, 15], object_type_extension.position
+
+            assert_equal 1, object_type_extension.fields.length
+            assert_equal GraphQL::Language::Nodes::FieldDefinition, object_type_extension.fields.first.class
+
+            assert_equal 1, object_type_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, object_type_extension.directives.first.class
+          end
+
+          def test_it_parses_object_type_extensions_with_field_definitions_and_implements
+            document = parse('
+              extend type User implements Node {
+                login: String!
+              }
+            ')
+
+            object_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::ObjectTypeExtension, object_type_extension.class
+            assert_equal 'User', object_type_extension.name
+            assert_equal [2, 15], object_type_extension.position
+
+            assert_equal 1, object_type_extension.fields.length
+            assert_equal GraphQL::Language::Nodes::FieldDefinition, object_type_extension.fields.first.class
+
+            assert_equal 1, object_type_extension.interfaces.length
+            assert_equal GraphQL::Language::Nodes::TypeName, object_type_extension.interfaces.first.class
+          end
+
+          def test_it_parses_object_type_extensions_with_only_directives
+            document = parse('
+              extend type User @deprecated
+            ')
+
+            object_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::ObjectTypeExtension, object_type_extension.class
+            assert_equal 'User', object_type_extension.name
+            assert_equal [2, 15], object_type_extension.position
+
+            assert_equal 1, object_type_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, object_type_extension.directives.first.class
+            assert_equal 'deprecated', object_type_extension.directives.first.name
+          end
+
+          def test_it_parses_object_type_extensions_with_implements_and_directives
+            document = parse('
+              extend type User implements Node @deprecated
+            ')
+
+            object_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::ObjectTypeExtension, object_type_extension.class
+            assert_equal 'User', object_type_extension.name
+            assert_equal [2, 15], object_type_extension.position
+
+            assert_equal 1, object_type_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, object_type_extension.directives.first.class
+            assert_equal 'deprecated', object_type_extension.directives.first.name
+
+            assert_equal 1, object_type_extension.interfaces.length
+            assert_equal GraphQL::Language::Nodes::TypeName, object_type_extension.interfaces.first.class
+            assert_equal 'Node', object_type_extension.interfaces.first.name
+          end
+
+          def test_it_parses_object_type_extensions_with_only_implements
+            document = parse('
+              extend type User implements Node
+            ')
+
+            object_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::ObjectTypeExtension, object_type_extension.class
+            assert_equal 'User', object_type_extension.name
+            assert_equal [2, 15], object_type_extension.position
+
+            assert_equal 1, object_type_extension.interfaces.length
+            assert_equal GraphQL::Language::Nodes::TypeName, object_type_extension.interfaces.first.class
+            assert_equal 'Node', object_type_extension.interfaces.first.name
+          end
+
+          def test_it_parses_interface_type_extensions_with_directives_and_fields
+            document = parse('
+              extend interface Node @directive {
+                field: String
+              }
+            ')
+
+            interface_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::InterfaceTypeExtension, interface_type_extension.class
+            assert_equal 'Node', interface_type_extension.name
+            assert_equal [2, 15], interface_type_extension.position
+
+            assert_equal 1, interface_type_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, interface_type_extension.directives.first.class
+            assert_equal 'directive', interface_type_extension.directives.first.name
+
+            assert_equal 1, interface_type_extension.fields.length
+            assert_equal GraphQL::Language::Nodes::FieldDefinition, interface_type_extension.fields.first.class
+            assert_equal 'field', interface_type_extension.fields.first.name
+          end
+
+          def test_it_parses_interface_type_extensions_with_fields
+            document = parse('
+              extend interface Node {
+                field: String
+              }
+            ')
+
+            interface_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::InterfaceTypeExtension, interface_type_extension.class
+            assert_equal 'Node', interface_type_extension.name
+            assert_equal [2, 15], interface_type_extension.position
+
+            assert_equal 0, interface_type_extension.directives.length
+
+            assert_equal 1, interface_type_extension.fields.length
+            assert_equal GraphQL::Language::Nodes::FieldDefinition, interface_type_extension.fields.first.class
+            assert_equal 'field', interface_type_extension.fields.first.name
+          end
+
+          def test_it_parses_interface_type_extensions_with_directives
+            document = parse('
+              extend interface Node @directive
+            ')
+
+            interface_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::InterfaceTypeExtension, interface_type_extension.class
+            assert_equal 'Node', interface_type_extension.name
+            assert_equal [2, 15], interface_type_extension.position
+
+            assert_equal 1, interface_type_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, interface_type_extension.directives.first.class
+            assert_equal 'directive', interface_type_extension.directives.first.name
+          end
+
+          def test_it_parses_union_type_extension_with_union_members
+            document = parse('
+              extend union BagOfThings = A | B
+            ')
+
+            union_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::UnionTypeExtension, union_type_extension.class
+            assert_equal 'BagOfThings', union_type_extension.name
+            assert_equal [2, 15], union_type_extension.position
+
+            assert_equal 0, union_type_extension.directives.length
+
+            assert_equal 2, union_type_extension.types.length
+            assert_equal GraphQL::Language::Nodes::TypeName, union_type_extension.types.first.class
+            assert_equal 'A', union_type_extension.types.first.name
+          end
+
+          def test_it_parses_union_type_extension_with_directives_and_union_members
+            document = parse('
+              extend union BagOfThings @directive = A | B
+            ')
+
+            union_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::UnionTypeExtension, union_type_extension.class
+            assert_equal 'BagOfThings', union_type_extension.name
+            assert_equal [2, 15], union_type_extension.position
+
+            assert_equal 1, union_type_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, union_type_extension.directives.first.class
+            assert_equal 'directive', union_type_extension.directives.first.name
+
+            assert_equal 2, union_type_extension.types.length
+            assert_equal GraphQL::Language::Nodes::TypeName, union_type_extension.types.first.class
+            assert_equal 'A', union_type_extension.types.first.name
+          end
+
+          def test_it_parses_union_type_extension_with_directives
+            document = parse('
+              extend union BagOfThings @directive
+            ')
+
+            union_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::UnionTypeExtension, union_type_extension.class
+            assert_equal 'BagOfThings', union_type_extension.name
+            assert_equal [2, 15], union_type_extension.position
+
+            assert_equal 1, union_type_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, union_type_extension.directives.first.class
+            assert_equal 'directive', union_type_extension.directives.first.name
+
+            assert_equal 0, union_type_extension.types.length
+          end
+
+          def test_it_parses_enum_type_extension_with_values
+            document = parse('
+              extend enum Status {
+                DRAFT
+                PUBLISHED
+              }
+            ')
+
+            enum_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::EnumTypeExtension, enum_type_extension.class
+            assert_equal 'Status', enum_type_extension.name
+            assert_equal [2, 15], enum_type_extension.position
+
+            assert_equal 0, enum_type_extension.directives.length
+
+            assert_equal 2, enum_type_extension.values.length
+            assert_equal GraphQL::Language::Nodes::EnumValueDefinition, enum_type_extension.values.first.class
+            assert_equal 'DRAFT', enum_type_extension.values.first.name
+          end
+
+          def test_it_parses_enum_type_extension_with_directives_and_values
+            document = parse('
+              extend enum Status @directive {
+                DRAFT
+                PUBLISHED
+              }
+            ')
+
+            enum_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::EnumTypeExtension, enum_type_extension.class
+            assert_equal 'Status', enum_type_extension.name
+            assert_equal [2, 15], enum_type_extension.position
+
+            assert_equal 1, enum_type_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, enum_type_extension.directives.first.class
+            assert_equal 'directive', enum_type_extension.directives.first.name
+
+            assert_equal 2, enum_type_extension.values.length
+            assert_equal GraphQL::Language::Nodes::EnumValueDefinition, enum_type_extension.values.first.class
+            assert_equal 'DRAFT', enum_type_extension.values.first.name
+          end
+
+          def test_it_parses_enum_type_extension_with_directives
+            document = parse('
+              extend enum Status @directive
+            ')
+
+            enum_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::EnumTypeExtension, enum_type_extension.class
+            assert_equal 'Status', enum_type_extension.name
+            assert_equal [2, 15], enum_type_extension.position
+
+            assert_equal 1, enum_type_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, enum_type_extension.directives.first.class
+            assert_equal 'directive', enum_type_extension.directives.first.name
+
+            assert_equal 0, enum_type_extension.values.length
+          end
+
+          def test_it_parses_input_object_type_extension_with_fields
+            document = parse('
+              extend input UserInput {
+                login: String!
+              }
+            ')
+
+            input_object_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::InputObjectTypeExtension, input_object_type_extension.class
+            assert_equal 'UserInput', input_object_type_extension.name
+            assert_equal [2, 15], input_object_type_extension.position
+
+            assert_equal 1, input_object_type_extension.fields.length
+            assert_equal GraphQL::Language::Nodes::InputValueDefinition, input_object_type_extension.fields.first.class
+            assert_equal 'login', input_object_type_extension.fields.first.name
+
+            assert_equal 0, input_object_type_extension.directives.length
+          end
+
+          def test_it_parses_input_object_type_extension_with_directives_and_fields
+            document = parse('
+              extend input UserInput @deprecated {
+                login: String!
+              }
+            ')
+
+            input_object_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::InputObjectTypeExtension, input_object_type_extension.class
+            assert_equal 'UserInput', input_object_type_extension.name
+            assert_equal [2, 15], input_object_type_extension.position
+
+            assert_equal 1, input_object_type_extension.fields.length
+            assert_equal GraphQL::Language::Nodes::InputValueDefinition, input_object_type_extension.fields.first.class
+            assert_equal 'login', input_object_type_extension.fields.first.name
+
+            assert_equal 1, input_object_type_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, input_object_type_extension.directives.first.class
+            assert_equal 'deprecated', input_object_type_extension.directives.first.name
+          end
+
+          def test_it_parses_input_object_type_extension_with_directives
+            document = parse('
+              extend input UserInput @deprecated
+            ')
+
+            input_object_type_extension = document.definitions.first
+            assert_equal GraphQL::Language::Nodes::InputObjectTypeExtension, input_object_type_extension.class
+            assert_equal 'UserInput', input_object_type_extension.name
+            assert_equal [2, 15], input_object_type_extension.position
+
+            assert_equal 0, input_object_type_extension.fields.length
+
+            assert_equal 1, input_object_type_extension.directives.length
+            assert_equal GraphQL::Language::Nodes::Directive, input_object_type_extension.directives.first.class
+            assert_equal 'deprecated', input_object_type_extension.directives.first.name
+          end
+
           def test_it_parses_whole_definition_with_descriptions
             document = parse(SCHEMA_DEFINITION_STRING)
 

data/lib/graphql/execution/execute.rb

@@ -102,9 +102,13 @@ module GraphQL
           field = field_ctx.field
 
           raw_value = begin
-            arguments = query.arguments_for(irep_node, field)
-            field_ctx.trace("execute_field", { context: field_ctx }) do
-              field_ctx.schema.middleware.invoke([parent_type, object, field, arguments, field_ctx])
+            begin
+              arguments = query.arguments_for(irep_node, field)
+              field_ctx.trace("execute_field", { context: field_ctx }) do
+                field_ctx.schema.middleware.invoke([parent_type, object, field, arguments, field_ctx])
+              end
+            rescue GraphQL::UnauthorizedError => err
+              field_ctx.schema.unauthorized_object(err)
             end
           rescue GraphQL::ExecutionError => err
             err
@@ -123,10 +127,10 @@ module GraphQL
                   err
                 end
               }
-              continue_or_wait(inner_value, arguments, field_ctx)
+              continue_or_wait(inner_value, field_ctx.type, field_ctx)
             }
           else
-            continue_or_wait(raw_value, arguments, field_ctx)
+            continue_or_wait(raw_value, field_ctx.type, field_ctx)
           end
         end
 
@@ -137,7 +141,7 @@ module GraphQL
         #
         # If the returned object is finished, continue to coerce
         # and resolve child fields
-        def continue_or_wait(raw_value, arguments, field_ctx)
+        def continue_or_wait(raw_value, field_type, field_ctx)
           if (lazy_method = field_ctx.schema.lazy_method_name(raw_value))
             field_ctx.value = Execution::Lazy.new {
               inner_value = begin
@@ -150,14 +154,14 @@ module GraphQL
                   err
                 end
 
-              field_ctx.value = continue_or_wait(inner_value, arguments, field_ctx)
+              field_ctx.value = continue_or_wait(inner_value, field_type, field_ctx)
             }
           else
-            field_ctx.value = continue_resolve_field(raw_value, field_ctx)
+            field_ctx.value = continue_resolve_field(raw_value, field_type, field_ctx)
           end
         end
 
-        def continue_resolve_field(raw_value, field_ctx)
+        def continue_resolve_field(raw_value, field_type, field_ctx)
           if field_ctx.parent.invalid_null?
             return nil
           end
@@ -169,19 +173,22 @@ module GraphQL
             raw_value.path = field_ctx.path
             query.context.errors.push(raw_value)
           when Array
-            list_errors = raw_value.each_with_index.select { |value, _| value.is_a?(GraphQL::ExecutionError) }
-            if list_errors.any?
-              list_errors.each do |error, index|
-                error.ast_node = field_ctx.ast_node
-                error.path = field_ctx.path + [index]
-                query.context.errors.push(error)
+            if !field_type.list?
+              # List type errors are handled above, this is for the case of fields returning an array of errors
+              list_errors = raw_value.each_with_index.select { |value, _| value.is_a?(GraphQL::ExecutionError) }
+              if list_errors.any?
+                list_errors.each do |error, index|
+                  error.ast_node = field_ctx.ast_node
+                  error.path = field_ctx.path + [index]
+                  query.context.errors.push(error)
+                end
               end
             end
           end
 
           resolve_value(
             raw_value,
-            field_ctx.type,
+            field_type,
             field_ctx,
           )
         end
@@ -229,7 +236,7 @@ module GraphQL
                   irep_node: field_ctx.irep_node,
                 )
 
-                inner_result = resolve_value(
+                inner_result = continue_or_wait(
                   inner_value,
                   inner_type,
                   inner_ctx,
@@ -237,7 +244,6 @@ module GraphQL
 
                 return PROPAGATE_NULL if inner_result == PROPAGATE_NULL
 
-                inner_ctx.value = inner_result
                 result << inner_ctx
                 i += 1
               end