tinygql 0.1.3 → 0.2.0

data/lib/tinygql/visitors.rb.erb

@@ -1,46 +1,34 @@
 module TinyGQL
   module Visitors
     module Visitor
-<%- nodes.each do |node| -%>
+<% nodes.each do |node| %>
       def handle_<%= node.human_name %> obj
       <%- node.fields.find_all(&:visitable?).each do |field| -%>
-        <%- if field.nullable? -%>
-        if obj.<%= field.name %>
-        <%- end -%>
         <%- if field.list? -%>
-            obj.<%= field.name %>.each { |v| v.accept self }
+        obj.<%= field.name %>.each { |v| v.accept self }<% if field.nullable? %> if obj.<%= field.name %><% end %>
         <%- end -%>
         <%- if field.node? -%>
-            obj.<%= field.name %>.accept self
-        <%- end -%>
-        <%- if field.nullable? -%>
-        end
+        obj.<%= field.name %>.accept(self)<% if field.nullable? %> if obj.<%= field.name %><% end %>
         <%- end -%>
       <%- end -%>
       end
-<%- end -%>
+<% end %>
     end
 
     module Fold
-<%- nodes.each do |node| -%>
+<% nodes.each do |node| %>
       def handle_<%= node.human_name %> obj, seed
       <%- node.fields.find_all(&:visitable?).each do |field| -%>
-        <%- if field.nullable? -%>
-        if obj.<%= field.name %>
-        <%- end -%>
         <%- if field.list? -%>
-            obj.<%= field.name %>.each { |v| seed = v.fold(self, seed) }
+        obj.<%= field.name %>.each { |v| seed = v.fold(self, seed) }<% if field.nullable? %> if obj.<%= field.name %><% end %>
         <%- end -%>
         <%- if field.node? -%>
-            seed = obj.<%= field.name %>.fold self, seed
-        <%- end -%>
-        <%- if field.nullable? -%>
-        end
+        seed = obj.<%= field.name %>.fold(self, seed)<% if field.nullable? %> if obj.<%= field.name %><% end %>
         <%- end -%>
       <%- end -%>
         seed
       end
-<%- end -%>
+<% end %>
     end
   end
 end

data/test/lexer_test.rb

@@ -101,5 +101,83 @@ eod
                     [:RCURLY, "}"],
                     [:RCURLY, "}"]], toks
     end
+
+    def test_lex_4
+      words = ["true", "null", "enum", "type"]
+      doc = words.join(" ")
+
+      lexer = Lexer.new doc
+      toks = []
+      while tok = lexer.next_token
+        toks << tok
+      end
+
+      assert_equal words.map { |x| [x.upcase.to_sym, x] }, toks
+    end
+
+    def test_lex_5
+      words = ["input", "false", "query", "union"]
+      doc = words.join(" ")
+
+      lexer = Lexer.new doc
+      toks = []
+      while tok = lexer.next_token
+        toks << tok
+      end
+
+      assert_equal words.map { |x| [x.upcase.to_sym, x] }, toks
+    end
+
+    def test_lex_6
+      words = ["extend", "scalar", "schema"]
+      doc = words.join(" ")
+
+      lexer = Lexer.new doc
+      toks = []
+      while tok = lexer.next_token
+        toks << tok
+      end
+
+      assert_equal words.map { |x| [x.upcase.to_sym, x] }, toks
+    end
+
+    def test_lex_8
+      words = ["mutation", "fragment"]
+      doc = words.join(" ")
+
+      lexer = Lexer.new doc
+      toks = []
+      while tok = lexer.next_token
+        toks << tok
+      end
+
+      assert_equal words.map { |x| [x.upcase.to_sym, x] }, toks
+    end
+
+    def test_lex_9
+      words = ["interface", "directive"]
+      doc = words.join(" ")
+
+      lexer = Lexer.new doc
+      toks = []
+      while tok = lexer.next_token
+        toks << tok
+      end
+
+      assert_equal words.map { |x| [x.upcase.to_sym, x] }, toks
+    end
+
+    def test_kw_lex
+      words = ["on", "fragment", "true", "false", "null", "query", "mutation", "subscription", "schema", "scalar", "type", "extend", "implements", "interface", "union", "enum", "input", "directive", "repeatable"]
+      doc = words.join(" ")
+
+      lexer = Lexer.new doc
+      toks = []
+      while tok = lexer.next_token
+        toks << tok
+      end
+
+      assert_equal words.map { |x| [x.upcase.to_sym, x] }, toks
+    end
   end
 end

data/test/parser_test.rb

@@ -3,6 +3,13 @@ require "tinygql"
 
 module TinyGQL
   class ParserTest < Test
+    def test_homogeneous_ast
+      %w{ kitchen-sink.graphql schema-extensions.graphql schema-kitchen-sink.graphql }.each do |f|
+        ast = Parser.parse File.read(File.join(__dir__, f))
+        assert ast.all? { |x| x.is_a?(TinyGQL::Nodes::Node) }
+      end
+    end
+
     def test_multi_tok
       doc = <<-eod
 mutation aaron($neat: Int = 123) @foo(lol: { lon: 456 }) {
@@ -39,6 +46,23 @@ eod
       assert_equal ["likeStory", "story", "likeCount"], ast.find_all(&:field?).map(&:name)
     end
 
+    def test_has_position_and_line
+      doc = <<-eod
+mutation {
+  likeStory(sturyID: 12345) {
+    story {
+      likeCount
+    }
+  }
+}
+eod
+      parser = Parser.new doc
+      ast = parser.parse
+      expected = ["likeStory", "story", "likeCount"].map { |str| doc.index(str) + str.bytesize }
+      assert_equal expected, ast.find_all(&:field?).map(&:pos)
+      assert_equal [2, 3, 4], ast.find_all(&:field?).map { |n| n.line(doc) }
+    end
+
     def test_field_alias
       doc = <<-eod
 mutation {
@@ -187,5 +211,49 @@ directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
       assert_equal "neat!", node.description.value
       assert_equal ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"], node.directive_locations.map(&:name)
     end
+
+    def test_scalar_schema_extensions
+      ast = Parser.parse File.read(File.join(__dir__, "schema-extensions.graphql"))
+      node = ast.find { |x| x.scalar_type_extension? && x.name == "PositiveInt" }
+      assert node
+      assert_equal 2, node.directives.length
+    end
+
+    def test_scalar_schema_extensions_no_directives
+      ast = Parser.parse File.read(File.join(__dir__, "schema-extensions.graphql"))
+      node = ast.find { |x| x.scalar_type_extension? && x.name == "Aaron" }
+      assert node
+      assert_nil node.directives
+    end
+
+    def test_interface_extension
+      ast = Parser.parse File.read(File.join(__dir__, "schema-extensions.graphql"))
+      node = ast.find { |x| x.interface_type_extension? && x.name == "NamedEntity" }
+      assert node
+      assert_nil node.directives
+      assert node.fields_definition
+    end
+
+    def test_union_extension
+      ast = Parser.parse File.read(File.join(__dir__, "schema-extensions.graphql"))
+      node = ast.find { |x| x.union_type_extension? && x.name == "Cool" }
+      assert node
+      assert_equal 1, node.directives.length
+      assert_equal "foo", node.directives.first.name
+    end
+
+    def test_enum_extension
+      ast = Parser.parse File.read(File.join(__dir__, "schema-extensions.graphql"))
+      assert ast.find { |x| x.enum_type_extension? && x.name == "Direction" }
+      assert ast.find { |x| x.enum_type_extension? && x.name == "AnnotatedEnum" }
+      assert ast.find { |x| x.enum_type_extension? && x.name == "Neat" }
+    end
+
+    def test_input_extension
+      ast = Parser.parse File.read(File.join(__dir__, "schema-extensions.graphql"))
+      assert ast.find { |x| x.input_object_type_extension? && x.name == "InputType" }
+      assert ast.find { |x| x.input_object_type_extension? && x.name == "AnnotatedInput" }
+      assert ast.find { |x| x.input_object_type_extension? && x.name == "NeatInput" }
+    end
   end
 end

data/test/schema-extensions.graphql

@@ -0,0 +1,48 @@
+extend scalar PositiveInt
+    @serializationType(name: "global::System.Int32")
+    @runtimeType(name: "global::System.Int32")
+
+extend scalar Aaron
+
+extend interface NamedEntity {
+  nickname: String
+}
+
+extend type Person {
+  nickname: String
+}
+
+extend type Business {
+  nickname: String
+}
+
+extend interface NamedEntity @addedDirective
+
+extend union Cool @foo
+
+extend union Great @onUnion = A | B
+
+extend enum Direction {
+  NORTH
+  EAST
+  SOUTH
+  WEST
+}
+
+extend enum AnnotatedEnum @onEnum {
+  ANNOTATED_VALUE @onEnumValue
+  OTHER_VALUE
+}
+
+extend enum Neat @onEnum
+
+extend input InputType {
+  key: String!
+  answer: Int = 42
+}
+
+extend input AnnotatedInput @onInputObjectType {
+  annotatedField: Type @onField
+}
+
+extend input NeatInput @onInputObjectType

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinygql
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-12 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,6 +67,7 @@ files:
 - test/kitchen-sink.graphql
 - test/lexer_test.rb
 - test/parser_test.rb
+- test/schema-extensions.graphql
 - test/schema-kitchen-sink.graphql
 - tinygql.gemspec
 homepage: https://github.com/tenderlove/tinygql
@@ -97,4 +98,5 @@ test_files:
 - test/kitchen-sink.graphql
 - test/lexer_test.rb
 - test/parser_test.rb
+- test/schema-extensions.graphql
 - test/schema-kitchen-sink.graphql