Merge pull request rmosolgo#342 from rmosolgo/use-typename-nodes

refactor(Parser) parse type conditions as TypeNames, not strings

Author: rmosolgo

lib/graphql/language/generation.rb

@@ -36,7 +36,9 @@ def generate(node, indent: "")
           out
         when Nodes::FragmentDefinition
           out = "#{indent}fragment #{node.name}"
-          out << " on #{node.type}" if node.type
+          if node.type
+            out << " on #{generate(node.type)}"
+          end
           out << generate_directives(node.directives)
           out << generate_selections(node.selections, indent: indent)
           out
@@ -46,7 +48,9 @@ def generate(node, indent: "")
           out
         when Nodes::InlineFragment
           out = "#{indent}..."
-          out << " on #{node.type}" if node.type
+          if node.type
+            out << " on #{generate(node.type)}"
+          end
           out << generate_directives(node.directives)
           out << generate_selections(node.selections, indent: indent)
           out

lib/graphql/language/parser.rb

@@ -214,7 +214,7 @@ rule
       ELLIPSIS name_without_on directives_list_opt { return make_node(:FragmentSpread, name: val[1], directives: val[2], position_source: val[0]) }
 
   inline_fragment:
-      ELLIPSIS ON name directives_list_opt selection_set {
+      ELLIPSIS ON type directives_list_opt selection_set {
         return make_node(:InlineFragment, {
           type: val[2],
           directives: val[3],
@@ -232,7 +232,7 @@ rule
       }
 
   fragment_definition:
-    FRAGMENT fragment_name_opt ON name_without_on directives_list_opt selection_set {
+    FRAGMENT fragment_name_opt ON type directives_list_opt selection_set {
       return make_node(:FragmentDefinition, {
           name:       val[1],
           type:       val[3],

lib/graphql/language/parser.y

@@ -65,7 +65,7 @@ def self.included(test)
                 assert fragment_def.is_a?(GraphQL::Language::Nodes::FragmentDefinition)
                 assert_equal "moreNestedFields", fragment_def.name
                 assert_equal 1, fragment_def.selections.length
-                assert_equal "NestedType", fragment_def.type
+                assert_equal "NestedType", fragment_def.type.name
                 assert_equal 1, fragment_def.directives.length
                 assert_equal [20, 13], fragment_def.position
               end
@@ -173,7 +173,7 @@ def self.included(test)
                 let(:typeless_inline_fragment) { query.selections[3] }
 
                 it "gets the type and directives" do
-                  assert_equal "OtherType", inline_fragment.type
+                  assert_equal "OtherType", inline_fragment.type.name
                   assert_equal 2, inline_fragment.selections.length
                   assert_equal 1, inline_fragment.directives.length
                 end

lib/graphql/language/parser_tests.rb

@@ -22,7 +22,7 @@ def validate(context)
 
         context.visitor[GraphQL::Language::Nodes::Document].leave << ->(doc_node, parent) {
           spreads_to_validate.each do |frag_spread|
-            fragment_child_name = context.fragments[frag_spread.node.name].type
+            fragment_child_name = context.fragments[frag_spread.node.name].type.name
             fragment_child = context.schema.types.fetch(fragment_child_name, nil) # Might be non-existent type name
             if fragment_child
               validate_fragment_in_scope(frag_spread.parent_type, fragment_child, frag_spread.node, context, frag_spread.path)

lib/graphql/static_validation/rules/fragment_spreads_are_possible.rb

@@ -18,9 +18,10 @@ def validate(context)
 
       def validate_type_exists(node, context)
         return unless node.type
-        type = context.schema.types.fetch(node.type, nil)
+        type_name = node.type.name
+        type = context.schema.types.fetch(type_name, nil)
         if type.nil?
-          context.errors << message("No such type #{node.type}, so it can't be a fragment condition", node, context: context)
+          context.errors << message("No such type #{type_name}, so it can't be a fragment condition", node, context: context)
           GraphQL::Language::Visitor::SKIP
         end
       end

lib/graphql/static_validation/rules/fragment_types_exist.rb

@@ -19,12 +19,16 @@ def validate(context)
       private
 
       def validate_type_is_composite(node, context)
-        type_name = node.type
-        return unless type_name
-        type_def = context.schema.types[type_name]
-        if type_def.nil? || !type_def.kind.composite?
-          context.errors <<  message("Invalid fragment on type #{type_name} (must be Union, Interface or Object)", node, context: context)
-          GraphQL::Language::Visitor::SKIP
+        node_type = node.type
+        if node_type.nil?
+          # Inline fragment on the same type
+        else
+          type_name = node_type.to_query_string
+          type_def = context.schema.types.fetch(type_name, nil)
+          if type_def.nil? || !type_def.kind.composite?
+            context.errors <<  message("Invalid fragment on type #{type_name} (must be Union, Interface or Object)", node, context: context)
+            GraphQL::Language::Visitor::SKIP
+          end
         end
       end
     end

lib/graphql/static_validation/rules/fragments_are_on_composite_types.rb

@@ -57,7 +57,7 @@ def initialize(schema, visitor)
       module FragmentWithTypeStrategy
         def push(stack, node)
           object_type = if node.type
-            stack.schema.types.fetch(node.type, nil)
+            stack.schema.types.fetch(node.type.name, nil)
           else
             stack.object_types.last
           end
@@ -86,7 +86,7 @@ module InlineFragmentStrategy
         extend FragmentWithTypeStrategy
         module_function
         def push_path_member(stack, node)
-          stack.path.push("...#{node.type ? " on #{node.type}" : ""}")
+          stack.path.push("...#{node.type ? " on #{node.type.to_query_string}" : ""}")
         end
       end
 

lib/graphql/static_validation/type_stack.rb

@@ -25,7 +25,7 @@
           assert fragment.is_a?(GraphQL::Language::Nodes::FragmentDefinition)
           assert_equal nil, fragment.name
           assert_equal 1, fragment.selections.length
-          assert_equal "NestedType", fragment.type
+          assert_equal "NestedType", fragment.type.name
           assert_equal 1, fragment.directives.length
           assert_equal [2, 7], fragment.position
         end