graphql 1.8.0 → 1.12.12

data/lib/graphql/compatibility/query_parser_specification/parse_error_specification.rb

@@ -70,15 +70,11 @@ module GraphQL
           ")
         end
 
-        def assert_empty_document(query_string)
-          doc = parse(query_string)
-          assert_equal 0, doc.definitions.length
-        end
-
-        def test_it_parses_blank_queries
-          assert_empty_document("")
-          assert_empty_document(" ")
-          assert_empty_document("\t \t")
+        def test_it_rejects_blank_queries
+          assert_raises_parse_error("")
+          assert_raises_parse_error(" ")
+          assert_raises_parse_error("\t \t")
+          assert_raises_parse_error(" # comment ")
         end
 
         def test_it_restricts_on

data/lib/graphql/compatibility/query_parser_specification.rb

@@ -11,6 +11,8 @@ module GraphQL
       # @yieldreturn [GraphQL::Language::Nodes::Document]
       # @return [Class<Minitest::Test>] A test suite for this parse function
       def self.build_suite(&block)
+        GraphQL::Deprecation.warn "#{self} will be removed from GraphQL-Ruby 2.0. There is no replacement, please open an issue on GitHub if you need support."
+
         Class.new(Minitest::Test) do
           include QueryAssertions
           include ParseErrorSpecification

data/lib/graphql/compatibility/schema_parser_specification.rb

@@ -8,6 +8,8 @@ module GraphQL
       # @yieldreturn [GraphQL::Language::Nodes::Document]
       # @return [Class<Minitest::Test>] A test suite for this parse function
       def self.build_suite(&block)
+        GraphQL::Deprecation.warn "#{self} will be removed from GraphQL-Ruby 2.0. There is no replacement, please open an issue on GitHub if you need support."
+
         Class.new(Minitest::Test) do
           @@parse_fn = block
 
@@ -78,6 +80,34 @@ module GraphQL
             assert_equal [], type.values[2].directives
           end
 
+          def test_it_parses_union_types
+            document = parse(
+              "union BagOfThings = \n" \
+              "A |\n" \
+              "B |\n" \
+              "C"
+            )
+
+            union = document.definitions.first
+
+            assert_equal GraphQL::Language::Nodes::UnionTypeDefinition, union.class
+            assert_equal 'BagOfThings', union.name
+            assert_equal 3, union.types.length
+            assert_equal [1, 1], union.position
+
+            assert_equal GraphQL::Language::Nodes::TypeName, union.types[0].class
+            assert_equal 'A', union.types[0].name
+            assert_equal [2, 1], union.types[0].position
+
+            assert_equal GraphQL::Language::Nodes::TypeName, union.types[1].class
+            assert_equal 'B', union.types[1].name
+            assert_equal [3, 1], union.types[1].position
+
+            assert_equal GraphQL::Language::Nodes::TypeName, union.types[2].class
+            assert_equal 'C', union.types[2].name
+            assert_equal [4, 1], union.types[2].position
+          end
+
           def test_it_parses_input_types
             document = parse('
               input EmptyMutationInput {
@@ -109,7 +139,19 @@ module GraphQL
             assert_equal 'if', type.arguments[0].name
             assert_equal 'Boolean', type.arguments[0].type.of_type.name
 
-            assert_equal ['FIELD', 'FRAGMENT_SPREAD', 'INLINE_FRAGMENT'], type.locations
+            assert_equal 3, type.locations.length
+
+            assert_instance_of GraphQL::Language::Nodes::DirectiveLocation, type.locations[0]
+            assert_equal 'FIELD', type.locations[0].name
+            assert_equal [3, 20], type.locations[0].position
+
+            assert_instance_of GraphQL::Language::Nodes::DirectiveLocation, type.locations[1]
+            assert_equal 'FRAGMENT_SPREAD', type.locations[1].name
+            assert_equal [4, 19], type.locations[1].position
+
+            assert_instance_of GraphQL::Language::Nodes::DirectiveLocation, type.locations[2]
+            assert_equal 'INLINE_FRAGMENT', type.locations[2].name
+            assert_equal [5, 19], type.locations[2].position
           end
 
           def test_it_parses_field_arguments
@@ -152,36 +194,430 @@ 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)
 
             assert_equal 6, document.definitions.size
 
-            schema_definition = document.definitions.shift
+            schema_definition, directive_definition, enum_type_definition, object_type_definition, input_object_type_definition, interface_type_definition = document.definitions
+
             assert_equal GraphQL::Language::Nodes::SchemaDefinition, schema_definition.class
 
-            directive_definition = document.definitions.shift
             assert_equal GraphQL::Language::Nodes::DirectiveDefinition, directive_definition.class
             assert_equal 'This is a directive', directive_definition.description
 
-            enum_type_definition = document.definitions.shift
             assert_equal GraphQL::Language::Nodes::EnumTypeDefinition, enum_type_definition.class
             assert_equal "Multiline comment\n\nWith an enum", enum_type_definition.description
 
             assert_nil enum_type_definition.values[0].description
             assert_equal 'Not a creative color', enum_type_definition.values[1].description
 
-            object_type_definition = document.definitions.shift
             assert_equal GraphQL::Language::Nodes::ObjectTypeDefinition, object_type_definition.class
             assert_equal 'Comment without preceding space', object_type_definition.description
             assert_equal 'And a field to boot', object_type_definition.fields[0].description
 
-            input_object_type_definition = document.definitions.shift
             assert_equal GraphQL::Language::Nodes::InputObjectTypeDefinition, input_object_type_definition.class
             assert_equal 'Comment for input object types', input_object_type_definition.description
             assert_equal 'Color of the car', input_object_type_definition.fields[0].description
 
-            interface_type_definition = document.definitions.shift
             assert_equal GraphQL::Language::Nodes::InterfaceTypeDefinition, interface_type_definition.class
             assert_equal 'Comment for interface definitions', interface_type_definition.description
             assert_equal 'Amount of wheels', interface_type_definition.fields[0].description

data/lib/graphql/dataloader/null_dataloader.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module GraphQL
+  class Dataloader
+    # The default implementation of dataloading -- all no-ops.
+    #
+    # The Dataloader interface isn't public, but it enables
+    # simple internal code while adding the option to add Dataloader.
+    class NullDataloader < Dataloader
+      # These are all no-ops because code was
+      # executed sychronously.
+      def run; end
+      def run_isolated; yield; end
+      def yield; end
+
+      def append_job
+        yield
+        nil
+      end
+    end
+  end
+end

data/lib/graphql/dataloader/request.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module GraphQL
+  class Dataloader
+    # @see Source#request which returns an instance of this
+    class Request
+      def initialize(source, key)
+        @source = source
+        @key = key
+      end
+
+      # Call this method to cause the current Fiber to wait for the results of this request.
+      #
+      # @return [Object] the object loaded for `key`
+      def load
+        @source.load(@key)
+      end
+    end
+  end
+end

data/lib/graphql/dataloader/request_all.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module GraphQL
+  class Dataloader
+    # @see Source#request_all which returns an instance of this.
+    class RequestAll < Request
+      def initialize(source, keys)
+        @source = source
+        @keys = keys
+      end
+
+      # Call this method to cause the current Fiber to wait for the results of this request.
+      #
+      # @return [Array<Object>] One object for each of `keys`
+      def load
+        @source.load_all(@keys)
+      end
+    end
+  end
+end