tinygql 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f2ac9d1c4531277689c6eec21fd29cd1e6fe9715284813b57c741e3e9bace2
-  data.tar.gz: b9cd18ac29f1aeea347296f0408deadddec7a902d25495e3232b472180718695
+  metadata.gz: 4a68b5713ff3ff9e39df6e5eb89f7eec5fc74f524df33f9840f58cd8ac5027ec
+  data.tar.gz: f823e82df55af3ca0327889627e99f6d896242327369b698d505b921bba819a9
 SHA512:
-  metadata.gz: 63c931df357b6091070a7cd0adab859f7a7489f8fa1220ffa2cfb7fc6a7af6660ede87af6c3a8b804ef1a2114594aa3086a3792b5d3ef40e20ac1a4546d13120
-  data.tar.gz: 96e0a9164e835cb382391c9ea761cdf2405ac6f38e268034f810f8ce369d4e968ec5a2c174f22f03f50a99bd1f155449e5d9e7b46c65fc771263cbc03a8f2f8b
+  metadata.gz: a0b4cd65e5c017f820e7198479a54dde8f676eb52fac56d9672a173ef282b21862a028f4a685d59c49c6dbfbd2d213148eff27674b071cff561e1cd6fe685251
+  data.tar.gz: 266db1a7ad62bae36b375403286ec1a08b774f2fad5dc1808bacbac5e86e89ea165d9dc9d1a7598e9e4d059a7e55e0a88396df786f17aba2c6c011534a201e14

data/.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos]
-        ruby: [ head, 3.2 ]
+        ruby: [ head, 3.2, truffleruby, truffleruby-head, jruby ]
 
     steps:
       - uses: actions/checkout@v3
@@ -31,7 +31,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos]
-        ruby: [ head, 3.2 ]
+        ruby: [ head, 3.2, truffleruby, truffleruby-head ]
 
     steps:
       - uses: actions/checkout@v3

data/Gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
 gem "benchmark-ips"
-gem "vernier"
 
 gemspec

data/lib/tinygql/lexer.rb

@@ -71,10 +71,37 @@ module TinyGQL
     ESCAPED_QUOTE = /\\"/;
     STRING_CHAR = /#{ESCAPED_QUOTE}|[^"\\]|#{UNICODE_ESCAPE}|#{STRING_ESCAPE}/
 
-    LIT_NAME_LUT = Literals.constants.each_with_object([]) { |n, o|
+    PUNCT_LUT = Literals.constants.each_with_object([]) { |n, o|
       o[Literals.const_get(n).ord] = n
     }
 
+    LEAD_BYTES = Array.new(255) { 0 }
+
+    module LeadBytes
+      INT = 1
+      KW = 2
+      ELLIPSIS = 3
+      STRING = 4
+      PUNCT = 5
+      IDENT = 6
+    end
+
+    10.times { |i| LEAD_BYTES[i.to_s.ord] = LeadBytes::INT }
+
+    ("A".."Z").each { |chr| LEAD_BYTES[chr.ord] = LeadBytes::IDENT }
+    ("a".."z").each { |chr| LEAD_BYTES[chr.ord] = LeadBytes::IDENT }
+    LEAD_BYTES['_'.ord] = LeadBytes::IDENT
+
+    KEYWORDS.each { |kw| LEAD_BYTES[kw.getbyte(0)] = LeadBytes::KW }
+
+    LEAD_BYTES['.'.ord] = LeadBytes::ELLIPSIS
+
+    LEAD_BYTES['"'.ord] = LeadBytes::STRING
+
+    Literals.constants.each_with_object([]) { |n, o|
+      LEAD_BYTES[Literals.const_get(n).ord] = LeadBytes::PUNCT
+    }
+
     QUOTED_STRING = %r{#{QUOTE} ((?:#{STRING_CHAR})*) #{QUOTE}}x
     BLOCK_STRING = %r{
         #{BLOCK_QUOTE}
@@ -109,30 +136,54 @@ module TinyGQL
     def advance
       @scan.skip(IGNORE)
 
+      return false if @scan.eos?
+
       @start = @scan.pos
 
-      case
-      when @scan.eos?                      then false
-      when @scan.skip(ELLIPSIS)            then :ELLIPSIS
-      when tok = LIT_NAME_LUT[@string.getbyte(@start)] then
+      lead_byte = @string.getbyte(@start)
+      lead_code = LEAD_BYTES[lead_byte]
+
+      if lead_code == LeadBytes::PUNCT
         @scan.pos += 1
-        tok
-      when len = @scan.skip(KW_RE) then
-        return :ON if len == 2
-        return :SUBSCRIPTION if len == 12
+        PUNCT_LUT[lead_byte]
+
+      elsif lead_code == LeadBytes::KW
+        if len = @scan.skip(KW_RE)
+          return :ON if len == 2
+          return :SUBSCRIPTION if len == 12
+
+          pos = @start
 
-        pos = @start
+          # Second 2 bytes are unique, so we'll hash on those
+          key = (@string.getbyte(pos + 2) << 8) | @string.getbyte(pos + 1)
+
+          KW_LUT[_hash(key)]
+        else
+          @scan.skip(IDENTIFIER)
+          :IDENTIFIER
+        end
 
-        # Second 2 bytes are unique, so we'll hash on those
-        key = (@string.getbyte(pos + 2) << 8) | @string.getbyte(pos + 1)
+      elsif lead_code == LeadBytes::IDENT
+        @scan.skip(IDENTIFIER)
+        :IDENTIFIER
+
+      elsif lead_code == LeadBytes::INT
+        @scan.skip(NUMERIC)
+        @scan[1] ? :FLOAT : :INT
+
+      elsif lead_code == LeadBytes::ELLIPSIS
+        2.times do |i|
+          raise unless @string.getbyte(@start + i + 1) == 46
+        end
+        @scan.pos += 3
+        :ELLIPSIS
+
+      elsif lead_code == LeadBytes::STRING
+        raise unless @scan.skip(BLOCK_STRING) || @scan.skip(QUOTED_STRING)
+        :STRING
 
-        KW_LUT[_hash(key)]
-      when @scan.skip(IDENTIFIER)    then :IDENTIFIER
-      when @scan.skip(BLOCK_STRING)  then :STRING
-      when @scan.skip(QUOTED_STRING) then :STRING
-      when @scan.skip(NUMERIC) then (@scan[1] ? :FLOAT : :INT)
       else
-        @scan.getch
+        @scan.pos += 1
         :UNKNOWN_CHAR
       end
     end
@@ -157,6 +208,8 @@ module TinyGQL
       return unless tok = advance
       val = case tok
       when :STRING then string_value
+      when :ELLIPSIS then
+        @string.byteslice(@scan.pos - 3, 3)
       when *Literals.constants
         @string.byteslice(@scan.pos - 1, 1)
       else

data/lib/tinygql/version.rb

@@ -1,3 +1,3 @@
 module TinyGQL
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/tinygql/visitors.rb

@@ -461,5 +461,277 @@ module TinyGQL
       end
 
     end
+
+    module Null
+
+      def handle_document obj
+      end
+
+      def handle_operation_definition obj
+      end
+
+      def handle_variable obj
+      end
+
+      def handle_named_type obj
+      end
+
+      def handle_not_null_type obj
+      end
+
+      def handle_list_type obj
+      end
+
+      def handle_variable_definition obj
+      end
+
+      def handle_value obj
+      end
+
+      def handle_argument obj
+      end
+
+      def handle_field obj
+      end
+
+      def handle_object_field obj
+      end
+
+      def handle_int_value obj
+      end
+
+      def handle_float_value obj
+      end
+
+      def handle_string_value obj
+      end
+
+      def handle_boolean_value obj
+      end
+
+      def handle_null_value obj
+      end
+
+      def handle_enum_value obj
+      end
+
+      def handle_list_value obj
+      end
+
+      def handle_object_value obj
+      end
+
+      def handle_directive obj
+      end
+
+      def handle_type_condition obj
+      end
+
+      def handle_inline_fragment obj
+      end
+
+      def handle_fragment_spread obj
+      end
+
+      def handle_fragment_definition obj
+      end
+
+      def handle_root_operation_type_definition obj
+      end
+
+      def handle_schema_definition obj
+      end
+
+      def handle_field_definition obj
+      end
+
+      def handle_input_value_definition obj
+      end
+
+      def handle_object_type_definition obj
+      end
+
+      def handle_interface_type_definition obj
+      end
+
+      def handle_union_type_definition obj
+      end
+
+      def handle_scalar_type_definition obj
+      end
+
+      def handle_enum_value_definition obj
+      end
+
+      def handle_enum_type_definition obj
+      end
+
+      def handle_input_object_type_definition obj
+      end
+
+      def handle_object_type_extension obj
+      end
+
+      def handle_executable_directive_location obj
+      end
+
+      def handle_type_system_directive_location obj
+      end
+
+      def handle_directive_definition obj
+      end
+
+      def handle_scalar_type_extension obj
+      end
+
+      def handle_interface_type_extension obj
+      end
+
+      def handle_union_type_extension obj
+      end
+
+      def handle_enum_type_extension obj
+      end
+
+      def handle_input_object_type_extension obj
+      end
+
+    end
+
+    module NullFold
+
+      def handle_document obj, _
+      end
+
+      def handle_operation_definition obj, _
+      end
+
+      def handle_variable obj, _
+      end
+
+      def handle_named_type obj, _
+      end
+
+      def handle_not_null_type obj, _
+      end
+
+      def handle_list_type obj, _
+      end
+
+      def handle_variable_definition obj, _
+      end
+
+      def handle_value obj, _
+      end
+
+      def handle_argument obj, _
+      end
+
+      def handle_field obj, _
+      end
+
+      def handle_object_field obj, _
+      end
+
+      def handle_int_value obj, _
+      end
+
+      def handle_float_value obj, _
+      end
+
+      def handle_string_value obj, _
+      end
+
+      def handle_boolean_value obj, _
+      end
+
+      def handle_null_value obj, _
+      end
+
+      def handle_enum_value obj, _
+      end
+
+      def handle_list_value obj, _
+      end
+
+      def handle_object_value obj, _
+      end
+
+      def handle_directive obj, _
+      end
+
+      def handle_type_condition obj, _
+      end
+
+      def handle_inline_fragment obj, _
+      end
+
+      def handle_fragment_spread obj, _
+      end
+
+      def handle_fragment_definition obj, _
+      end
+
+      def handle_root_operation_type_definition obj, _
+      end
+
+      def handle_schema_definition obj, _
+      end
+
+      def handle_field_definition obj, _
+      end
+
+      def handle_input_value_definition obj, _
+      end
+
+      def handle_object_type_definition obj, _
+      end
+
+      def handle_interface_type_definition obj, _
+      end
+
+      def handle_union_type_definition obj, _
+      end
+
+      def handle_scalar_type_definition obj, _
+      end
+
+      def handle_enum_value_definition obj, _
+      end
+
+      def handle_enum_type_definition obj, _
+      end
+
+      def handle_input_object_type_definition obj, _
+      end
+
+      def handle_object_type_extension obj, _
+      end
+
+      def handle_executable_directive_location obj, _
+      end
+
+      def handle_type_system_directive_location obj, _
+      end
+
+      def handle_directive_definition obj, _
+      end
+
+      def handle_scalar_type_extension obj, _
+      end
+
+      def handle_interface_type_extension obj, _
+      end
+
+      def handle_union_type_extension obj, _
+      end
+
+      def handle_enum_type_extension obj, _
+      end
+
+      def handle_input_object_type_extension obj, _
+      end
+
+    end
   end
 end

data/lib/tinygql/visitors.rb.erb

@@ -28,6 +28,20 @@ module TinyGQL
       <%- end -%>
         seed
       end
+<% end %>
+    end
+
+    module Null
+<% nodes.each do |node| %>
+      def handle_<%= node.human_name %> obj
+      end
+<% end %>
+    end
+
+    module NullFold
+<% nodes.each do |node| %>
+      def handle_<%= node.human_name %> obj, _
+      end
 <% end %>
     end
   end

data/test/lexer_test.rb

@@ -21,7 +21,7 @@ module TinyGQL
         lexer = Lexer.new punc
         token = lexer.next_token
         expected = PUNC_LUT[punc]
-        assert_equal(expected || [:ON, "on"], token)
+        assert_equal(expected, token)
       end
     end
 

data/test/parser_test.rb

@@ -165,6 +165,54 @@ eod
       assert_equal 1, node.arguments.length
     end
 
+    def test_null
+      doc = <<-eod
+mutation {
+  a: likeStory(storyID: 12345) {
+    b: story {
+      c: likeCount
+    }
+  }
+}
+eod
+      viz = Module.new do
+        extend TinyGQL::Visitors::Null
+
+        def self.handle_field obj
+          true
+        end
+      end
+      parser = Parser.new doc
+      ast = parser.parse
+      ast.each { |node|
+        assert_equal(node.field?, !!node.accept(viz))
+      }
+    end
+
+    def test_null_fold
+      doc = <<-eod
+mutation {
+  a: likeStory(storyID: 12345) {
+    b: story {
+      c: likeCount
+    }
+  }
+}
+eod
+      viz = Module.new do
+        extend TinyGQL::Visitors::NullFold
+
+        def self.handle_field obj, x
+          x
+        end
+      end
+      parser = Parser.new doc
+      ast = parser.parse
+      ast.each { |node|
+        assert_equal(node.field?, !!node.fold(viz, true))
+      }
+    end
+
     def test_multiple_implements
       doc = <<-eod
 type SomeType implements a, b, c {

metadata

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