graphql 1.7.9 → 1.7.10

data/lib/graphql/language/parser.y

@@ -82,8 +82,7 @@ rule
     | EQUALS literal_value  { return val[1] }
 
   selection_set:
-      LCURLY RCURLY                { return [] }
-    | LCURLY selection_list RCURLY { return val[1] }
+      LCURLY selection_list RCURLY { return val[1] }
 
   selection_set_opt:
       /* none */    { return [] }

data/lib/graphql/language/printer.rb

@@ -154,8 +154,8 @@ module GraphQL
       def print_object_type_definition(object_type)
         out = print_description(object_type)
         out << "type #{object_type.name}"
-        out << print_directives(object_type.directives)
         out << " implements " << object_type.interfaces.map(&:name).join(", ") unless object_type.interfaces.empty?
+        out << print_directives(object_type.directives)
         out << print_field_definitions(object_type.fields)
       end
 

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

@@ -24,7 +24,11 @@ module GraphQL
         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(", ")}])"
+          if ast_node.selections.first.is_a?(GraphQL::Language::Nodes::InlineFragment)
+            "Selections can't be made on scalars (%{node_name} returns #{resolved_type.name} but has inline fragments [#{ast_node.selections.map(&:type).map(&:name).join(", ")}])"
+          else
+            "Selections can't be made on scalars (%{node_name} returns #{resolved_type.name} but has selections [#{ast_node.selections.map(&:name).join(", ")}])"
+          end
         elsif resolved_type.kind.object? && ast_node.selections.none?
           "Objects must have selections (%{node_name} returns #{resolved_type.name} but has no selections)"
         else

data/lib/graphql/version.rb

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

data/spec/graphql/language/printer_spec.rb

@@ -105,7 +105,7 @@ describe GraphQL::Language::Printer do
       end
 
       describe "full featured schema" do
-        # From: https://github.com/graphql/graphql-js/blob/bc96406ab44453a120da25a0bd6e2b0237119ddf/src/language/__tests__/schema-kitchen-sink.graphql
+        # Based on: https://github.com/graphql/graphql-js/blob/bc96406ab44453a120da25a0bd6e2b0237119ddf/src/language/__tests__/schema-kitchen-sink.graphql
         let(:query_string) {<<-schema
           schema {
             query: QueryType
@@ -128,7 +128,7 @@ describe GraphQL::Language::Printer do
           # Scalar description
           scalar CustomScalar
 
-          type AnnotatedObject @onObject(arg: "value") {
+          type AnnotatedObject implements Bar @onObject(arg: "value") {
             annotatedField(arg: Type = "default" @onArg): Type @onField
           }
 

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

@@ -8,18 +8,19 @@ describe GraphQL::StaticValidation::FieldsHaveAppropriateSelections do
       okCheese: cheese(id: 1) { fatContent, similarCheese(source: YAK) { source } }
       missingFieldsCheese: cheese(id: 1)
       illegalSelectionCheese: cheese(id: 1) { id { something, ... someFields } }
+      incorrectFragmentSpread: cheese(id: 1) { flavor { ... on String { __typename } } }
     }
   "}
 
   it "adds errors for selections on scalars" do
-    assert_equal(2, errors.length)
+    assert_equal(3, errors.length)
 
     illegal_selection_error = {
       "message"=>"Selections can't be made on scalars (field 'id' returns Int but has selections [something, someFields])",
       "locations"=>[{"line"=>5, "column"=>47}],
       "fields"=>["query getCheese", "illegalSelectionCheese", "id"],
     }
-    assert_includes(errors, illegal_selection_error, "finds illegal selections on scalarss")
+    assert_includes(errors, illegal_selection_error, "finds illegal selections on scalars")
 
     selection_required_error = {
       "message"=>"Objects must have selections (field 'cheese' returns Cheese but has no selections)",
@@ -27,6 +28,13 @@ describe GraphQL::StaticValidation::FieldsHaveAppropriateSelections do
       "fields"=>["query getCheese", "missingFieldsCheese"],
     }
     assert_includes(errors, selection_required_error, "finds objects without selections")
+
+    incorrect_fragment_error = {
+      "message"=>"Selections can't be made on scalars (field 'flavor' returns String but has inline fragments [String])",
+      "locations"=>[{"line"=>6, "column"=>48}],
+      "fields"=>["query getCheese", "incorrectFragmentSpread", "flavor"],
+    }
+    assert_includes(errors, incorrect_fragment_error, "finds scalar fields with selections")
   end
 
   describe "anonymous operations" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.7.10
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -1030,7 +1030,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby