tinygql 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bb94d776ff356520312d76baadfe817ca813c617165479b3ed49887566fc4ff
-  data.tar.gz: e5c1b0e354a07108d1e237b8e10c378b58df57cc093c4c75d7a96e6a64982c3a
+  metadata.gz: 65e2106ae71f78971f49cbb5d1f718a0d17bcf7071d8cca8e15c7ca261e3deab
+  data.tar.gz: 5e5799f7ee255b306928caaacde79f803af0d5672a36da7404097ff4bd518b77
 SHA512:
-  metadata.gz: 7e96c6748835b72e3d2a38c312d7eb0b67ba0ddf77cc11aab8ac5d43a1bf83025b23526beb3409602a23a78d91a10f4d3d4f9d2ec94d3951c0035620de401426
-  data.tar.gz: df88fd036d265ba22c28cba79f7b76df502e20d30387f6d76a6838ddc743d0dd4d9a9373ce73282a67d6cbfdf00f55e6383865d2e28e9a338ad1fdee72183661
+  metadata.gz: 3e52942d40f93c438e5702bbca34b93d5a5156dd3ac939e0cdfb0459d37b163575f76e66c95a5873a2a0409c11d1e7df24bea02f8af91490ad34ed1b9e0b016c
+  data.tar.gz: e4d9add489df9f33191d4684de2550a578ff333879a28e333666b2d4cfe20ff2fda98a1729be0aa7ddd934dd0cc62a01522911b50336e9382e161f04e6325ed9

data/lib/tinygql/lexer.rb

@@ -98,7 +98,7 @@ module TinyGQL
     end
 
     def line
-      @scan.string[0, @scan.pos].count("\n")
+      @scan.string[0, @scan.pos].count("\n") + 1
     end
 
     def done?

data/lib/tinygql/nodes.rb.erb

@@ -8,14 +8,14 @@ module TinyGQL
 <%- end -%>
       def each(&blk)
         yield self
-        children.each { _1.each(&blk) }
+        children.each { |v| v.each(&blk) }
       end
     end
 
 <%- nodes.each do |node| -%>
     class <%= node.name %> < <%= node.parent ? node.parent : "Node" %>
       <%- if node.fields.any? -%>
-      attr_reader <%= node.fields.map { ":" + _1.name }.join(", ") %>
+      attr_reader <%= node.fields.map { |v| ":" + v.name }.join(", ") %>
 
       def initialize <%= node.fields.map(&:name).join(", ") %>
         <%- node.fields.each do |field| -%>

data/lib/tinygql/parser.rb

@@ -254,8 +254,9 @@ module TinyGQL
     def implements_interfaces
       expect_token :IMPLEMENTS
       list = [self.named_type]
-      while at?(:AMP)
-        accept_token
+      while true
+        accept_token if at?(:AMP)
+        break unless at?(:IDENTIFIER)
         list << self.named_type
       end
       list
@@ -570,7 +571,7 @@ module TinyGQL
 
     def expect_token tok
       unless at?(tok)
-        raise UnexpectedToken, "Expected token #{tok}, actual: #{token_name} line: #{@lexer.line}"
+        raise UnexpectedToken, "Expected token #{tok}, actual: #{token_name} #{@lexer.token_value} line: #{@lexer.line}"
       end
       accept_token
     end

data/lib/tinygql/version.rb

@@ -1,3 +1,3 @@
 module TinyGQL
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/tinygql/visitors.rb.erb

@@ -8,7 +8,7 @@ module TinyGQL
         if obj.<%= field.name %>
         <%- end -%>
         <%- if field.list? -%>
-            obj.<%= field.name %>.each { _1.accept self }
+            obj.<%= field.name %>.each { |v| v.accept self }
         <%- end -%>
         <%- if field.node? -%>
             obj.<%= field.name %>.accept self
@@ -29,7 +29,7 @@ module TinyGQL
         if obj.<%= field.name %>
         <%- end -%>
         <%- if field.list? -%>
-            obj.<%= field.name %>.each { seed = _1.fold(self, seed) }
+            obj.<%= field.name %>.each { |v| seed = v.fold(self, seed) }
         <%- end -%>
         <%- if field.node? -%>
             seed = obj.<%= field.name %>.fold self, seed

data/test/parser_test.rb

@@ -140,5 +140,26 @@ eod
       assert_equal "a", node.aliaz
       assert_equal 1, node.arguments.length
     end
+
+    def test_multiple_implements
+      doc = <<-eod
+type SomeType implements a, b, c {
+}
+eod
+      parser = Parser.new doc
+      ast = parser.parse
+      node = ast.find(&:object_type_definition?).first
+      assert_equal ["a", "b", "c"], node.implements_interfaces.map(&:name)
+    end
+
+    def test_multiple_implements_no_end
+      doc = <<-eod
+type SomeType implements a, b, c
+eod
+      parser = Parser.new doc
+      ast = parser.parse
+      node = ast.find(&:object_type_definition?).first
+      assert_equal ["a", "b", "c"], node.implements_interfaces.map(&:name)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinygql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-10 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake