graphql 1.9.0.pre3 → 1.9.0.pre4

data/lib/graphql/types/relay/node_field.rb

@@ -4,6 +4,21 @@ module GraphQL
     module Relay
       # This can be used for implementing `Query.node(id: ...)`,
       # or use it for inspiration for your own field definition.
+      #
+      # @example Adding this field directly
+      #   add_field(GraphQL::Types::Relay::NodeField)
+      #
+      # @example Implementing a similar field in your own Query root
+      #
+      #   field :node, GraphQL::Types::Relay::Node, null: true,
+      #     description: "Fetches an object given its ID" do
+      #       argument :id, ID, required: true
+      #     end
+      #
+      #   def node(id:)
+      #     context.schema.object_from_id(context, id)
+      #   end
+      #
       NodeField = GraphQL::Schema::Field.new(
         name: "node",
         owner: nil,

data/lib/graphql/types/relay/nodes_field.rb

@@ -4,7 +4,23 @@ module GraphQL
     module Relay
       # This can be used for implementing `Query.nodes(ids: ...)`,
       # or use it for inspiration for your own field definition.
-      # @see GraphQL::Types::Relay::NodeField
+      #
+      # @example Adding this field directly
+      #   add_field(GraphQL::Types::Relay::NodesField)
+      #
+      # @example Implementing a similar field in your own Query root
+      #
+      #   field :nodes, [GraphQL::Types::Relay::Node, null: true], null: false,
+      #     description: Fetches a list of objects given a list of IDs." do
+      #       argument :ids, [ID], required: true
+      #     end
+      #
+      #   def nodes(ids:)
+      #     ids.map do |id|
+      #       context.schema.object_from_id(context, id)
+      #     end
+      #   end
+      #
       NodesField = GraphQL::Schema::Field.new(
         name: "nodes",
         owner: nil,

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.9.0.pre3"
+  VERSION = "1.9.0.pre4"
 end

data/spec/graphql/analysis/ast_spec.rb

@@ -137,6 +137,18 @@ describe GraphQL::Analysis::AST do
       }
     |}
 
+    describe "without a selected operation" do
+      let(:query_string) {%|
+        # A comment
+        # And nothing else
+        # Should not break
+      |}
+
+      it "bails early when there is no selected operation to be executed" do
+        assert_equal 2, reduce_result.size
+      end
+    end
+
     describe "conditional analysis" do
       let(:analyzers) { [AstTypeCollector, AstConditionalAnalyzer] }
 

data/spec/graphql/execution/interpreter_spec.rb

@@ -78,6 +78,8 @@ describe GraphQL::Execution::Interpreter do
     end
 
     class FieldCounter < GraphQL::Schema::Object
+      implements GraphQL::Types::Relay::Node
+
       field :field_counter, FieldCounter, null: false
       def field_counter; :field_counter; end
 
@@ -167,13 +169,52 @@ describe GraphQL::Execution::Interpreter do
 
       field :field_counter, FieldCounter, null: false
       def field_counter; :field_counter; end
+
+      field :node, field: GraphQL::Relay::Node.field
+      field :nodes, field: GraphQL::Relay::Node.plural_field
+    end
+
+    class Counter < GraphQL::Schema::Object
+      field :value, Integer, null: false
+      field :lazy_value, Integer, null: false
+
+      def lazy_value
+        Box.new { object.value }
+      end
+
+      field :increment, Counter, null: false
+
+      def increment
+        object.value += 1
+        object
+      end
+    end
+
+
+    class Mutation < GraphQL::Schema::Object
+      field :increment_counter, Counter, null: false
+
+      def increment_counter
+        counter = context[:counter]
+        counter.value += 1
+        counter
+      end
     end
 
     class Schema < GraphQL::Schema
       use GraphQL::Execution::Interpreter
       use GraphQL::Analysis::AST
       query(Query)
+      mutation(Mutation)
       lazy_resolve(Box, :value)
+
+      def self.object_from_id(id, ctx)
+        OpenStruct.new(id: id)
+      end
+
+      def self.resolve_type(type, obj, ctx)
+        FieldCounter
+      end
     end
   end
 
@@ -225,6 +266,34 @@ describe GraphQL::Execution::Interpreter do
     assert_equal expected_abstract_list, result["data"]["find"]
   end
 
+  it "runs mutation roots atomically and sequentially" do
+    query_str = <<-GRAPHQL
+    mutation {
+      i1: incrementCounter { value lazyValue
+        i2: increment { value lazyValue }
+        i3: increment { value lazyValue }
+      }
+      i4: incrementCounter { value lazyValue }
+      i5: incrementCounter { value lazyValue }
+    }
+    GRAPHQL
+
+    result = InterpreterTest::Schema.execute(query_str, context: { counter: OpenStruct.new(value: 0) })
+    expected_data = {
+      "i1" => {
+        "value" => 1,
+        # All of these get `3` as lazy value. They're resolved together,
+        # since they aren't _root_ mutation fields.
+        "lazyValue" => 3,
+        "i2" => { "value" => 2, "lazyValue" => 3 },
+        "i3" => { "value" => 3, "lazyValue" => 3 },
+      },
+      "i4" => { "value" => 4, "lazyValue" => 4},
+      "i5" => { "value" => 5, "lazyValue" => 5},
+    }
+    assert_equal expected_data, result["data"]
+  end
+
   it "runs skip and include" do
     query_str = <<-GRAPHQL
     query($truthy: Boolean!, $falsey: Boolean!){
@@ -277,6 +346,9 @@ describe GraphQL::Execution::Interpreter do
 
   describe "CI setup" do
     it "sets interpreter based on a constant" do
+      # Force the plugins to be applied
+      Jazz::Schema.graphql_definition
+      Dummy::Schema.graphql_definition
       if TESTING_INTERPRETER
         assert_equal GraphQL::Execution::Interpreter, Jazz::Schema.query_execution_strategy
         assert_equal GraphQL::Execution::Interpreter, Dummy::Schema.query_execution_strategy
@@ -286,6 +358,7 @@ describe GraphQL::Execution::Interpreter do
       end
     end
   end
+
   describe "null propagation" do
     it "propagates nulls" do
       query_str = <<-GRAPHQL
@@ -399,4 +472,14 @@ describe GraphQL::Execution::Interpreter do
       assert_equal 3, res["data"]["fieldCounter"]["fieldCounter"]["c3"]
     end
   end
+
+  describe "backwards compatibility" do
+    it "handles a legacy nodes field" do
+      res = InterpreterTest::Schema.execute('{ node(id: "abc") { id } }')
+      assert_equal "abc", res["data"]["node"]["id"]
+
+      res = InterpreterTest::Schema.execute('{ nodes(ids: ["abc", "xyz"]) { id } }')
+      assert_equal ["abc", "xyz"], res["data"]["nodes"].map { |n| n["id"] }
+    end
+  end
 end

data/spec/graphql/schema/field_extension_spec.rb

@@ -20,7 +20,7 @@ describe GraphQL::Schema::FieldExtension do
         field.argument(:factor, Integer, required: true)
       end
 
-      def before_resolve(object:, arguments:, context:)
+      def resolve(object:, arguments:, context:)
         factor = arguments.delete(:factor)
         yield(object, arguments, factor)
       end
@@ -30,6 +30,19 @@ describe GraphQL::Schema::FieldExtension do
       end
     end
 
+    class MultiplyByArgumentUsingResolve < GraphQL::Schema::FieldExtension
+      def apply
+        field.argument(:factor, Integer, required: true)
+      end
+
+      # `yield` returns the user-returned value
+      # This method's return value is passed along
+      def resolve(object:, arguments:, context:)
+        factor = arguments.delete(:factor)
+        yield(object, arguments) * factor
+      end
+    end
+
     class BaseObject < GraphQL::Schema::Object
     end
 
@@ -43,7 +56,7 @@ describe GraphQL::Schema::FieldExtension do
         input # return it as-is, it will be modified by extensions
       end
 
-      field :trippled_by_option, Integer, null: false, resolver_method: :pass_thru do
+      field :tripled_by_option, Integer, null: false, resolver_method: :pass_thru do
         extension(MultiplyByOption, factor: 3)
         argument :input, Integer, required: true
       end
@@ -51,6 +64,10 @@ describe GraphQL::Schema::FieldExtension do
       field :multiply_input, Integer, null: false, resolver_method: :pass_thru, extensions: [MultiplyByArgument] do
         argument :input, Integer, required: true
       end
+
+      field :multiply_input2, Integer, null: false, resolver_method: :pass_thru, extensions: [MultiplyByArgumentUsingResolve] do
+        argument :input, Integer, required: true
+      end
     end
 
     class Schema < GraphQL::Schema
@@ -79,10 +96,15 @@ describe GraphQL::Schema::FieldExtension do
       assert_equal 10, res["data"]["doubled"]
     end
 
+    it "returns the modified value from `yield`" do
+      res = exec_query("{ multiplyInput2(input: 5, factor: 5) }")
+      assert_equal 25, res["data"]["multiplyInput2"]
+    end
+
     it "has access to config options" do
       # The factor of three came from an option
-      res = exec_query("{ trippledByOption(input: 4) }")
-      assert_equal 12, res["data"]["trippledByOption"]
+      res = exec_query("{ tripledByOption(input: 4) }")
+      assert_equal 12, res["data"]["tripledByOption"]
     end
 
     it "can hide arguments from resolve methods" do

data/spec/graphql/static_validation/rules/argument_literals_are_compatible_spec.rb

@@ -10,7 +10,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
       stringCheese: cheese(id: "aasdlkfj") { ...cheeseFields }
       cheese(id: 1) { source @skip(if: "whatever") }
       yakSource: searchDairy(product: [{source: COW, fatContent: 1.1}]) { __typename }
-      badSource: searchDairy(product: [{source: 1.1}]) { __typename }
+      badSource: searchDairy(product: {source: 1.1}) { __typename }
       missingSource: searchDairy(product: [{fatContent: 1.1}]) { __typename }
       listCoerce: cheese(id: 1) { similarCheese(source: YAK) { __typename } }
       missingInputField: searchDairy(product: [{source: YAK, wacky: 1}]) { __typename }
@@ -46,7 +46,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
 
         input_object_field_error = {
           "message"=>"Argument 'source' on InputObject 'DairyProductInput' has an invalid value. Expected type 'DairyAnimal!'.",
-          "locations"=>[{"line"=>6, "column"=>40}],
+          "locations"=>[{"line"=>6, "column"=>39}],
           "path"=>["query getCheese", "badSource", "product", "source"],
           "extensions"=>{"code"=>"argumentLiteralsIncompatible", "typeName"=>"InputObject", "argumentName"=>"source"},
         }
@@ -91,7 +91,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
 
         input_object_field_error = {
           "message"=>"Argument 'source' on InputObject 'DairyProductInput' has an invalid value. Expected type 'DairyAnimal!'.",
-          "locations"=>[{"line"=>6, "column"=>40}],
+          "locations"=>[{"line"=>6, "column"=>39}],
           "path"=>["query getCheese", "badSource", "product", "source"],
           "extensions"=>{"code"=>"argumentLiteralsIncompatible", "typeName"=>"InputObject", "argumentName"=>"source"},
         }

data/spec/integration/rails/graphql/relay/mutation_spec.rb

@@ -336,4 +336,52 @@ describe GraphQL::Relay::Mutation do
       assert_equal(expected, result)
     end
   end
+
+  describe 'supports new input object definition with old mutation definition' do
+    let(:some_attribute_type) do
+      Class.new(GraphQL::Schema::InputObject) do
+        graphql_name 'SomeAttribute'
+        argument :something, String, required: false
+      end
+    end
+
+    let(:do_something_mutation) do
+      some_attribute = some_attribute_type
+
+      GraphQL::Relay::Mutation.define do
+        name 'DoSomethingMutation'
+        input_field :someAttributes, types[some_attribute.graphql_definition]
+
+        return_field :anything, types.String
+
+        resolve ->(_obj, inputs, _ctx) {
+          {
+            anything: inputs.to_h['someAttributes'][0].class.to_s
+          }
+        }
+      end
+    end
+
+    let(:mutation_type) do
+      do_something = do_something_mutation
+
+      Class.new(GraphQL::Schema::Object) do
+        graphql_name 'Mutation'
+        field :doSomething, field: do_something.field
+      end
+    end
+
+    let(:schema) do
+      mutation = mutation_type
+
+      Class.new(GraphQL::Schema) do
+        mutation mutation
+      end
+    end
+
+    it 'converts to hash the whole input' do
+      result = schema.execute('mutation { doSomething(input: {someAttributes: [{something: "string"}]}) { anything } }')
+      assert_equal 'Hash', result['data']['doSomething']['anything']
+    end
+  end
 end

data/spec/integration/tmp/app/graphql/types/family_type.rb

@@ -0,0 +1,9 @@
+module Types
+  class FamilyType < Types::BaseEnum
+    value "NIGHTSHADE"
+    value "BRASSICA", value: Family::COLE
+    value "UMBELLIFER", value: :umbellifer
+    value "LEGUME", value: "bean & friends"
+    value "CURCURBITS", value: 5
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.9.0.pre3
+  version: 1.9.0.pre4
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -969,54 +969,7 @@ files:
 - spec/integration/rails/graphql/schema_spec.rb
 - spec/integration/rails/graphql/tracing/active_support_notifications_tracing_spec.rb
 - spec/integration/rails/spec_helper.rb
-- spec/integration/tmp/app/graphql/types/bird_type.rb
-- spec/integration/tmp/dummy/Gemfile
-- spec/integration/tmp/dummy/README.rdoc
-- spec/integration/tmp/dummy/Rakefile
-- spec/integration/tmp/dummy/app/assets/javascripts/application.js
-- spec/integration/tmp/dummy/app/assets/stylesheets/application.css
-- spec/integration/tmp/dummy/app/controllers/application_controller.rb
-- spec/integration/tmp/dummy/app/controllers/graphql_controller.rb
-- spec/integration/tmp/dummy/app/graphql/dummy_schema.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_enum.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_input_object.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_interface.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_object.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_scalar.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_union.rb
-- spec/integration/tmp/dummy/app/graphql/types/mutation_type.rb
-- spec/integration/tmp/dummy/app/graphql/types/query_type.rb
-- spec/integration/tmp/dummy/app/helpers/application_helper.rb
-- spec/integration/tmp/dummy/app/views/layouts/application.html.erb
-- spec/integration/tmp/dummy/bin/bundle
-- spec/integration/tmp/dummy/bin/rails
-- spec/integration/tmp/dummy/bin/rake
-- spec/integration/tmp/dummy/bin/setup
-- spec/integration/tmp/dummy/config.ru
-- spec/integration/tmp/dummy/config/application.rb
-- spec/integration/tmp/dummy/config/boot.rb
-- spec/integration/tmp/dummy/config/environment.rb
-- spec/integration/tmp/dummy/config/environments/development.rb
-- spec/integration/tmp/dummy/config/environments/production.rb
-- spec/integration/tmp/dummy/config/environments/test.rb
-- spec/integration/tmp/dummy/config/initializers/assets.rb
-- spec/integration/tmp/dummy/config/initializers/backtrace_silencers.rb
-- spec/integration/tmp/dummy/config/initializers/cookies_serializer.rb
-- spec/integration/tmp/dummy/config/initializers/filter_parameter_logging.rb
-- spec/integration/tmp/dummy/config/initializers/inflections.rb
-- spec/integration/tmp/dummy/config/initializers/mime_types.rb
-- spec/integration/tmp/dummy/config/initializers/session_store.rb
-- spec/integration/tmp/dummy/config/initializers/to_time_preserves_timezone.rb
-- spec/integration/tmp/dummy/config/initializers/wrap_parameters.rb
-- spec/integration/tmp/dummy/config/locales/en.yml
-- spec/integration/tmp/dummy/config/routes.rb
-- spec/integration/tmp/dummy/config/secrets.yml
-- spec/integration/tmp/dummy/db/seeds.rb
-- spec/integration/tmp/dummy/public/404.html
-- spec/integration/tmp/dummy/public/422.html
-- spec/integration/tmp/dummy/public/500.html
-- spec/integration/tmp/dummy/public/favicon.ico
-- spec/integration/tmp/dummy/public/robots.txt
+- spec/integration/tmp/app/graphql/types/family_type.rb
 - spec/spec_helper.rb
 - spec/support/dummy/data.rb
 - spec/support/dummy/schema.rb
@@ -1135,54 +1088,7 @@ test_files:
 - spec/integration/mongoid/star_trek/schema.rb
 - spec/integration/mongoid/star_trek/data.rb
 - spec/integration/mongoid/graphql/relay/mongo_relation_connection_spec.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_input_object.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_enum.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_interface.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_scalar.rb
-- spec/integration/tmp/dummy/app/graphql/types/mutation_type.rb
-- spec/integration/tmp/dummy/app/graphql/types/query_type.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_object.rb
-- spec/integration/tmp/dummy/app/graphql/types/base_union.rb
-- spec/integration/tmp/dummy/app/graphql/dummy_schema.rb
-- spec/integration/tmp/dummy/app/controllers/application_controller.rb
-- spec/integration/tmp/dummy/app/controllers/graphql_controller.rb
-- spec/integration/tmp/dummy/app/views/layouts/application.html.erb
-- spec/integration/tmp/dummy/app/assets/javascripts/application.js
-- spec/integration/tmp/dummy/app/assets/stylesheets/application.css
-- spec/integration/tmp/dummy/app/helpers/application_helper.rb
-- spec/integration/tmp/dummy/bin/rake
-- spec/integration/tmp/dummy/bin/setup
-- spec/integration/tmp/dummy/bin/bundle
-- spec/integration/tmp/dummy/bin/rails
-- spec/integration/tmp/dummy/config/secrets.yml
-- spec/integration/tmp/dummy/config/routes.rb
-- spec/integration/tmp/dummy/config/locales/en.yml
-- spec/integration/tmp/dummy/config/environments/production.rb
-- spec/integration/tmp/dummy/config/environments/development.rb
-- spec/integration/tmp/dummy/config/environments/test.rb
-- spec/integration/tmp/dummy/config/environment.rb
-- spec/integration/tmp/dummy/config/application.rb
-- spec/integration/tmp/dummy/config/boot.rb
-- spec/integration/tmp/dummy/config/initializers/backtrace_silencers.rb
-- spec/integration/tmp/dummy/config/initializers/mime_types.rb
-- spec/integration/tmp/dummy/config/initializers/filter_parameter_logging.rb
-- spec/integration/tmp/dummy/config/initializers/session_store.rb
-- spec/integration/tmp/dummy/config/initializers/wrap_parameters.rb
-- spec/integration/tmp/dummy/config/initializers/assets.rb
-- spec/integration/tmp/dummy/config/initializers/cookies_serializer.rb
-- spec/integration/tmp/dummy/config/initializers/to_time_preserves_timezone.rb
-- spec/integration/tmp/dummy/config/initializers/inflections.rb
-- spec/integration/tmp/dummy/config.ru
-- spec/integration/tmp/dummy/Rakefile
-- spec/integration/tmp/dummy/public/favicon.ico
-- spec/integration/tmp/dummy/public/422.html
-- spec/integration/tmp/dummy/public/500.html
-- spec/integration/tmp/dummy/public/404.html
-- spec/integration/tmp/dummy/public/robots.txt
-- spec/integration/tmp/dummy/db/seeds.rb
-- spec/integration/tmp/dummy/Gemfile
-- spec/integration/tmp/dummy/README.rdoc
-- spec/integration/tmp/app/graphql/types/bird_type.rb
+- spec/integration/tmp/app/graphql/types/family_type.rb
 - spec/integration/rails/spec_helper.rb
 - spec/integration/rails/data.rb
 - spec/integration/rails/graphql/tracing/active_support_notifications_tracing_spec.rb