graphql 1.4.4 → 1.4.5

data/lib/graphql/language/parser.y

@@ -26,11 +26,21 @@ rule
           }
         )
       }
-    | selection_set {
+    | LCURLY selection_list RCURLY {
         return make_node(
           :OperationDefinition, {
             operation_type: "query",
-            selections: val[0],
+            selections: val[1],
+            position_source: val[0],
+          }
+        )
+      }
+    | LCURLY RCURLY {
+        return make_node(
+          :OperationDefinition, {
+            operation_type: "query",
+            selections: [],
+            position_source: val[0],
           }
         )
       }

data/lib/graphql/query.rb

@@ -14,8 +14,12 @@ module GraphQL
     extend Forwardable
 
     class OperationNameMissingError < GraphQL::ExecutionError
-      def initialize(names)
-        msg = "You must provide an operation name from: #{names.join(", ")}"
+      def initialize(name)
+        msg = if name.nil?
+          %|An operation name is required|
+        else
+          %|No operation named "#{name}"|
+        end
         super(msg)
       end
     end
@@ -84,7 +88,7 @@ module GraphQL
       if @operations.any?
         @selected_operation = find_operation(@operations, @operation_name)
         if @selected_operation.nil?
-          @validation_errors << GraphQL::Query::OperationNameMissingError.new(@operations.keys)
+          @validation_errors << GraphQL::Query::OperationNameMissingError.new(@operation_name)
         else
           @ast_variables = @selected_operation.variables
           @mutation = @selected_operation.operation_type == "mutation"
@@ -239,12 +243,12 @@ module GraphQL
     end
 
     def find_operation(operations, operation_name)
-      if operations.length == 1
+      if operation_name.nil? && operations.length == 1
         operations.values.first
-      elsif operations.length == 0 || !operations.key?(operation_name)
+      elsif !operations.key?(operation_name)
         nil
       else
-        operations[operation_name]
+        operations.fetch(operation_name)
       end
     end
 

data/lib/graphql/static_validation/all_rules.rb

@@ -28,6 +28,7 @@ module GraphQL
       GraphQL::StaticValidation::VariableUsagesAreAllowed,
       GraphQL::StaticValidation::MutationRootExists,
       GraphQL::StaticValidation::SubscriptionRootExists,
+      GraphQL::StaticValidation::OperationNamesAreValid,
     ]
   end
 end

data/lib/graphql/static_validation/rules/fields_have_appropriate_selections.rb

@@ -9,25 +9,42 @@ module GraphQL
       def validate(context)
         context.visitor[GraphQL::Language::Nodes::Field] << ->(node, parent)  {
           field_defn = context.field_definition
-          validate_field_selections(node, field_defn, context)
+          validate_field_selections(node, field_defn.type.unwrap, context)
+        }
+
+        context.visitor[GraphQL::Language::Nodes::OperationDefinition] << ->(node, parent)  {
+          validate_field_selections(node, context.type_definition, context)
         }
       end
 
       private
 
-      def validate_field_selections(ast_field, field_defn, context)
-        resolved_type = field_defn.type.unwrap
 
-        if resolved_type.kind.scalar? && ast_field.selections.any?
-          error = message("Selections can't be made on scalars (field '#{ast_field.name}' returns #{resolved_type.name} but has selections [#{ast_field.selections.map(&:name).join(", ")}])", ast_field, context: context)
-        elsif resolved_type.kind.object? && ast_field.selections.none?
-          error = message("Objects must have selections (field '#{ast_field.name}' returns #{resolved_type.name} but has no selections)", ast_field, context: context)
+      def validate_field_selections(ast_node, resolved_type, context)
+        msg = if resolved_type.nil?
+          nil
+        elsif resolved_type.kind.scalar? && ast_node.selections.any?
+          "Selections can't be made on scalars (%{node_name} returns #{resolved_type.name} but has selections [#{ast_node.selections.map(&:name).join(", ")}])"
+        elsif resolved_type.kind.object? && ast_node.selections.none?
+          "Objects must have selections (%{node_name} returns #{resolved_type.name} but has no selections)"
         else
-          error = nil
+          nil
         end
 
-        if !error.nil?
-          context.errors << error
+        if msg
+          node_name = case ast_node
+          when GraphQL::Language::Nodes::Field
+            "field '#{ast_node.name}'"
+          when GraphQL::Language::Nodes::OperationDefinition
+            if ast_node.name.nil?
+              "anonymous query"
+            else
+              "#{ast_node.operation_type} '#{ast_node.name}'"
+            end
+          else
+            raise("Unexpected node #{ast_node}")
+          end
+          context.errors << message(msg % { node_name: node_name }, ast_node, context: context)
           GraphQL::Language::Visitor::SKIP
         end
       end

data/lib/graphql/static_validation/rules/operation_names_are_valid.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+module GraphQL
+  module StaticValidation
+    class OperationNamesAreValid
+      include GraphQL::StaticValidation::Message::MessageHelper
+
+      def validate(context)
+        op_names = Hash.new { |h, k| h[k] = [] }
+
+        context.visitor[GraphQL::Language::Nodes::OperationDefinition].enter << -> (node, _parent) {
+          op_names[node.name] << node
+        }
+
+        context.visitor[GraphQL::Language::Nodes::Document].leave << -> (node, _parent) {
+          op_count = op_names.values.inject(0) { |m, v| m += v.size }
+
+          op_names.each do |name, nodes|
+            if name.nil? && op_count > 1
+              context.errors << message(%|Operation name is required when multiple operations are present|, nodes, context: context)
+            elsif nodes.length > 1
+              context.errors << message(%|Operation name "#{name}" must be unique|, nodes, context: context)
+            end
+          end
+        }
+      end
+    end
+  end
+end

data/lib/graphql/version.rb

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

data/spec/graphql/execution/execute_spec.rb

@@ -3,3 +3,77 @@ require "spec_helper"
 
 ExecuteSuite = GraphQL::Compatibility::ExecutionSpecification.build_suite(GraphQL::Execution::Execute)
 LazyExecuteSuite = GraphQL::Compatibility::LazyExecutionSpecification.build_suite(GraphQL::Execution::Execute)
+
+describe GraphQL::Execution::Execute do
+  describe "null propagation on mutation root" do
+    module MutationNullTestRoot
+      INTS = []
+      def self.push(args, ctx)
+        if args[:int] == 13
+          nil
+        else
+          INTS << args[:int]
+          args[:int]
+        end
+      end
+
+      def ints
+        INTS
+      end
+    end
+
+    let(:root) { MutationNullTestRoot }
+
+    let(:query_str) do
+      <<-GRAPHQL
+      mutation {
+        one: push(int: 1)
+        thirteen: push(int: 13)
+        two: push(int: 2)
+      }
+      GRAPHQL
+    end
+
+    before do
+      MutationNullTestRoot::INTS.clear
+    end
+
+    describe "when root fields are non-nullable" do
+      let(:schema) { GraphQL::Schema.from_definition <<-GRAPHQL
+        type Mutation {
+          push(int: Int!): Int!
+        }
+
+        type Query {
+          ints: [Int!]
+        }
+      GRAPHQL
+      }
+
+      it "propagates null to the root mutation and halts mutation execution" do
+        res = schema.execute(query_str, root_value: root)
+        assert_equal [1], MutationNullTestRoot::INTS
+        assert_equal(nil, res["data"])
+      end
+    end
+
+    describe 'mutation fields are nullable' do
+      let(:schema) { GraphQL::Schema.from_definition <<-GRAPHQL
+        type Mutation {
+          push(int: Int!): Int
+        }
+
+        type Query {
+          ints: [Int!]
+        }
+      GRAPHQL
+      }
+
+      it 'does not halt execution and returns data for the successful mutations' do
+        res = schema.execute(query_str, root_value: root)
+        assert_equal [1, 2], MutationNullTestRoot::INTS
+        assert_equal({"one"=>1, "thirteen"=>nil, "two"=>2}, res["data"])
+      end
+    end
+  end
+end

data/spec/graphql/query/executor_spec.rb

@@ -38,7 +38,19 @@ describe GraphQL::Query::Executor do
       it "returns an error" do
         expected = {
           "errors" => [
-            {"message" => "You must provide an operation name from: getCheese1, getCheese2"}
+            {"message" => "An operation name is required"}
+          ]
+        }
+        assert_equal(expected, result)
+      end
+    end
+
+    describe "when the named operation is not present" do
+      let(:operation_name) { "nonsenseOperation" }
+      it "returns an error" do
+        expected = {
+          "errors" => [
+            {"message" => 'No operation named "nonsenseOperation"'}
           ]
         }
         assert_equal(expected, result)

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

@@ -28,4 +28,18 @@ describe GraphQL::StaticValidation::FieldsHaveAppropriateSelections do
     }
     assert_includes(errors, selection_required_error, "finds objects without selections")
   end
+
+  describe "anonymous operations" do
+    let(:query_string) { "{ }" }
+    it "requires selections" do
+      assert_equal(1, errors.length)
+
+      selections_required_error = {
+        "message"=> "Objects must have selections (anonymous query returns Query but has no selections)",
+        "locations"=>[{"line"=>1, "column"=>1}],
+        "fields"=>["query"]
+      }
+      assert_includes(errors, selections_required_error)
+    end
+  end
 end

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

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::StaticValidation::OperationNamesAreValid do
+  include StaticValidationHelpers
+
+  describe "when there are multiple operations" do
+    let(:query_string) { <<-GRAPHQL
+    query getCheese {
+      cheese(id: 1) { flavor }
+    }
+
+    {
+      cheese(id: 2) { flavor }
+    }
+
+    {
+      cheese(id: 3) { flavor }
+    }
+    GRAPHQL
+    }
+
+    it "must have operation names" do
+      assert_equal 1, errors.length
+      requires_name_error = {
+        "message"=>"Operation name is required when multiple operations are present",
+        "locations"=>[{"line"=>5, "column"=>5}, {"line"=>9, "column"=>5}],
+        "fields"=>[],
+      }
+      assert_includes(errors, requires_name_error)
+    end
+  end
+
+  describe "when there are only unnamed operations" do
+    let(:query_string) { <<-GRAPHQL
+    {
+      cheese(id: 2) { flavor }
+    }
+
+    {
+      cheese(id: 3) { flavor }
+    }
+    GRAPHQL
+    }
+
+    it "requires names" do
+      assert_equal 1, errors.length
+      requires_name_error = {
+        "message"=>"Operation name is required when multiple operations are present",
+        "locations"=>[{"line"=>1, "column"=>5}, {"line"=>5, "column"=>5}],
+        "fields"=>[],
+      }
+      assert_includes(errors, requires_name_error)
+    end
+  end
+
+  describe "when multiple operations have names" do
+    let(:query_string) { <<-GRAPHQL
+    query getCheese {
+      cheese(id: 1) { flavor }
+    }
+
+    query getCheese {
+      cheese(id: 2) { flavor }
+    }
+    GRAPHQL
+    }
+
+    it "must be unique" do
+      assert_equal 1, errors.length
+      name_uniqueness_error = {
+        "message"=>'Operation name "getCheese" must be unique',
+        "locations"=>[{"line"=>1, "column"=>5}, {"line"=>5, "column"=>5}],
+        "fields"=>[],
+      }
+      assert_includes(errors, name_uniqueness_error)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -433,6 +433,7 @@ files:
 - lib/graphql/static_validation/rules/fragments_are_on_composite_types.rb
 - lib/graphql/static_validation/rules/fragments_are_used.rb
 - lib/graphql/static_validation/rules/mutation_root_exists.rb
+- lib/graphql/static_validation/rules/operation_names_are_valid.rb
 - lib/graphql/static_validation/rules/required_arguments_are_present.rb
 - lib/graphql/static_validation/rules/subscription_root_exists.rb
 - lib/graphql/static_validation/rules/unique_directives_per_location.rb
@@ -535,6 +536,7 @@ files:
 - spec/graphql/static_validation/rules/fragments_are_on_composite_types_spec.rb
 - spec/graphql/static_validation/rules/fragments_are_used_spec.rb
 - spec/graphql/static_validation/rules/mutation_root_exists_spec.rb
+- spec/graphql/static_validation/rules/operation_names_are_valid_spec.rb
 - spec/graphql/static_validation/rules/required_arguments_are_present_spec.rb
 - spec/graphql/static_validation/rules/subscription_root_exists_spec.rb
 - spec/graphql/static_validation/rules/unique_directives_per_location_spec.rb
@@ -553,7 +555,6 @@ files:
 - spec/support/star_wars/data.rb
 - spec/support/star_wars/schema.rb
 - spec/support/static_validation_helpers.rb
-- spec/tmp/app/graphql/types/bird_type.rb
 homepage: http://github.com/rmosolgo/graphql-ruby
 licenses:
 - MIT
@@ -665,6 +666,7 @@ test_files:
 - spec/graphql/static_validation/rules/fragments_are_on_composite_types_spec.rb
 - spec/graphql/static_validation/rules/fragments_are_used_spec.rb
 - spec/graphql/static_validation/rules/mutation_root_exists_spec.rb
+- spec/graphql/static_validation/rules/operation_names_are_valid_spec.rb
 - spec/graphql/static_validation/rules/required_arguments_are_present_spec.rb
 - spec/graphql/static_validation/rules/subscription_root_exists_spec.rb
 - spec/graphql/static_validation/rules/unique_directives_per_location_spec.rb
@@ -683,4 +685,3 @@ test_files:
 - spec/support/star_wars/data.rb
 - spec/support/star_wars/schema.rb
 - spec/support/static_validation_helpers.rb
-- spec/tmp/app/graphql/types/bird_type.rb

data/spec/tmp/app/graphql/types/bird_type.rb

@@ -1,5 +0,0 @@
-Types::BirdType = GraphQL::InterfaceType.define do
-  name "Bird"
-  field :wingspan, !types.Int
-  field :foliage, types[Types::ColorType]
-end