tinygql 0.1.1 → 0.1.3

data/bin/bench.rb

@@ -1,11 +1,22 @@
 # frozen_string_literal: true
 
-$:.unshift(File.expand_path("../lib", __dir__))
 require "tinygql"
-require "benchmark"
+require "benchmark/ips"
 
 source = File.read(File.expand_path("../test/kitchen-sink.graphql", __dir__))
 
-Benchmark.bm do |x|
-  x.report { 10_000.times { TinyGQL::Parser.new(source).parse } }
+files = Dir[File.join(File.expand_path("../benchmark", __dir__), "**/*")].select { |f| File.file? f }
+
+Benchmark.ips do |x|
+  x.report "kitchen-sink" do
+    TinyGQL.parse source
+  end
+
+  files.each do |file_name|
+    data = File.read file_name
+    name = File.basename(file_name, File.extname(file_name))
+    x.report name do
+      TinyGQL.parse data
+    end
+  end
 end

data/bin/profile.rb

@@ -0,0 +1,5 @@
+require "vernier"
+
+Vernier.trace(out: "time_profile.json") {
+  require_relative "bench"
+}

data/lib/tinygql/lexer.rb

@@ -4,38 +4,41 @@ require "strscan"
 
 module TinyGQL
   class Lexer
-    IDENTIFIER =    /[_A-Za-z][_0-9A-Za-z]*/
+    IDENTIFIER =    /[_A-Za-z][_0-9A-Za-z]*\b/
     IGNORE   =       %r{
       (?:
         [, \c\r\n\t]+ |
         \#.*$
-      )
+      )*
     }x
     INT =           /[-]?(?:[0]|[1-9][0-9]*)/
     FLOAT_DECIMAL = /[.][0-9]+/
     FLOAT_EXP =     /[eE][+-]?[0-9]+/
-    FLOAT =         /#{INT}(#{FLOAT_DECIMAL}#{FLOAT_EXP}|#{FLOAT_DECIMAL}|#{FLOAT_EXP})/
+    NUMERIC =  /#{INT}(#{FLOAT_DECIMAL}#{FLOAT_EXP}|#{FLOAT_DECIMAL}|#{FLOAT_EXP})?/
+
+    KEYWORDS = {
+      "on" => :ON,
+      "fragment" => :FRAGMENT,
+      "true" => :TRUE,
+      "false" => :FALSE,
+      "null" => :NULL,
+      "query" => :QUERY,
+      "mutation" => :MUTATION,
+      "subscription" => :SUBSCRIPTION,
+      "schema" => :SCHEMA,
+      "scalar" => :SCALAR,
+      "type" => :TYPE,
+      "extend" => :EXTEND,
+      "implements" => :IMPLEMENTS,
+      "interface" => :INTERFACE,
+      "union" => :UNION,
+      "enum" => :ENUM,
+      "input" => :INPUT,
+      "directive" => :DIRECTIVE,
+      "repeatable" => :REPEATABLE
+    }.freeze
 
     module Literals
-      ON =            /on\b/
-      FRAGMENT =      /fragment\b/
-      TRUE =          /true\b/
-      FALSE =         /false\b/
-      NULL =          /null\b/
-      QUERY =         /query\b/
-      MUTATION =      /mutation\b/
-      SUBSCRIPTION =  /subscription\b/
-      SCHEMA =        /schema\b/
-      SCALAR =        /scalar\b/
-      TYPE =          /type\b/
-      EXTEND =        /extend\b/
-      IMPLEMENTS =    /implements\b/
-      INTERFACE =     /interface\b/
-      UNION =         /union\b/
-      ENUM =          /enum\b/
-      INPUT =         /input\b/
-      DIRECTIVE =     /directive\b/
-      REPEATABLE =    /repeatable\b/
       LCURLY =        '{'
       RCURLY =        '}'
       LPAREN =        '('
@@ -66,9 +69,7 @@ module TinyGQL
     STRING_CHAR = /#{ESCAPED_QUOTE}|[^"\\]|#{UNICODE_ESCAPE}|#{STRING_ESCAPE}/
 
     LIT_NAME_LUT = Literals.constants.each_with_object({}) { |n, o|
-      key = Literals.const_get(n)
-      key = key.is_a?(Regexp) ? key.source.gsub(/(\\b|\\)/, '') : key
-      o[key] = n
+      o[Literals.const_get(n)] = n
     }
 
     LIT = Regexp.union(Literals.constants.map { |n| Literals.const_get(n) })
@@ -86,9 +87,6 @@ module TinyGQL
         #{BLOCK_QUOTE}
     }xm
 
-    # # catch-all for anything else. must be at the bottom for precedence.
-    UNKNOWN_CHAR =         /./
-
     def initialize string
       raise unless string.valid_encoding?
 
@@ -106,25 +104,17 @@ module TinyGQL
     end
 
     def advance
-      while true
-        if @scan.eos?
-          emit nil, nil
-          return false
-        end
-
-        case
-        when @scan.skip(IGNORE)              then redo
-        when str = @scan.scan(FLOAT)         then return emit(:FLOAT, str)
-        when str = @scan.scan(INT)           then return emit(:INT, str)
-        when str = @scan.scan(LIT)           then return emit(LIT_NAME_LUT[str], str)
-        when str = @scan.scan(IDENTIFIER)    then return emit(:IDENTIFIER, str)
-        when @scan.skip(BLOCK_STRING)        then return emit_block(@scan[1])
-        when @scan.skip(QUOTED_STRING)       then return emit_string(@scan[1])
-        when str = @scan.scan(UNKNOWN_CHAR)  then return emit(:UNKNOWN_CHAR, str)
-        else
-          # This should never happen since `UNKNOWN_CHAR` ensures we make progress
-          raise "Unknown string?"
-        end
+      @scan.skip(IGNORE)
+
+      case
+      when str = @scan.scan(LIT)           then return emit(LIT_NAME_LUT[str], str)
+      when str = @scan.scan(IDENTIFIER)    then return emit(KEYWORDS.fetch(str, :IDENTIFIER), str)
+      when @scan.skip(BLOCK_STRING)        then return emit_block(@scan[1])
+      when @scan.skip(QUOTED_STRING)       then return emit_string(@scan[1])
+      when str = @scan.scan(NUMERIC)       then return emit(@scan[1] ? :FLOAT : :INT, str)
+      when @scan.eos?                      then emit(nil, nil) and return false
+      else
+        emit(:UNKNOWN_CHAR, @scan.getch)
       end
     end
 

data/lib/tinygql/nodes.rb

@@ -3,48 +3,48 @@ module TinyGQL
     class Node
       include Enumerable
 
-      def document? = false
-      def operation_definition? = false
-      def variable? = false
-      def named_type? = false
-      def not_null_type? = false
-      def list_type? = false
-      def variable_definition? = false
-      def value? = false
-      def argument? = false
-      def field? = false
-      def object_field? = false
-      def int_value? = false
-      def float_value? = false
-      def string_value? = false
-      def boolean_value? = false
-      def null_value? = false
-      def enum_value? = false
-      def list_value? = false
-      def object_value? = false
-      def directive? = false
-      def type_condition? = false
-      def inline_fragment? = false
-      def fragment_spread? = false
-      def fragment_definition? = false
-      def root_operation_type_definition? = false
-      def schema_definition? = false
-      def field_definition? = false
-      def input_value_definition? = false
-      def object_type_definition? = false
-      def interface_type_definition? = false
-      def union_type_definition? = false
-      def scalar_type_definition? = false
-      def enum_value_definition? = false
-      def enum_type_definition? = false
-      def input_object_type_definition? = false
-      def object_type_extension? = false
-      def executable_directive_location? = false
-      def type_system_directive_location? = false
-      def directive_definition? = false
+    def document?; false; end
+    def operation_definition?; false; end
+    def variable?; false; end
+    def named_type?; false; end
+    def not_null_type?; false; end
+    def list_type?; false; end
+    def variable_definition?; false; end
+    def value?; false; end
+    def argument?; false; end
+    def field?; false; end
+    def object_field?; false; end
+    def int_value?; false; end
+    def float_value?; false; end
+    def string_value?; false; end
+    def boolean_value?; false; end
+    def null_value?; false; end
+    def enum_value?; false; end
+    def list_value?; false; end
+    def object_value?; false; end
+    def directive?; false; end
+    def type_condition?; false; end
+    def inline_fragment?; false; end
+    def fragment_spread?; false; end
+    def fragment_definition?; false; end
+    def root_operation_type_definition?; false; end
+    def schema_definition?; false; end
+    def field_definition?; false; end
+    def input_value_definition?; false; end
+    def object_type_definition?; false; end
+    def interface_type_definition?; false; end
+    def union_type_definition?; false; end
+    def scalar_type_definition?; false; end
+    def enum_value_definition?; false; end
+    def enum_type_definition?; false; end
+    def input_object_type_definition?; false; end
+    def object_type_extension?; false; end
+    def executable_directive_location?; false; end
+    def type_system_directive_location?; false; end
+    def directive_definition?; false; end
       def each(&blk)
         yield self
-        children.each { _1.each(&blk) }
+        children.each { |v| v.each(&blk) }
       end
     end
 
@@ -63,7 +63,7 @@ module TinyGQL
         viz.handle_document self, seed
       end
 
-      def document? = true
+      def document?; true; end
 
       def children
         ary = []; ary.concat(definitions); ary
@@ -88,7 +88,7 @@ module TinyGQL
         viz.handle_operation_definition self, seed
       end
 
-      def operation_definition? = true
+      def operation_definition?; true; end
 
       def children
         ary = []; ary.concat(variable_definitions) if variable_definitions; ary.concat(directives) if directives; ary.concat(selection_set); ary
@@ -109,7 +109,7 @@ module TinyGQL
         viz.handle_variable self, seed
       end
 
-      def variable? = true
+      def variable?; true; end
 
       def children
         ary = []; ary
@@ -130,7 +130,7 @@ module TinyGQL
         viz.handle_named_type self, seed
       end
 
-      def named_type? = true
+      def named_type?; true; end
 
       def children
         ary = []; ary
@@ -151,7 +151,7 @@ module TinyGQL
         viz.handle_not_null_type self, seed
       end
 
-      def not_null_type? = true
+      def not_null_type?; true; end
 
       def children
         ary = []; ary << type; ary
@@ -172,7 +172,7 @@ module TinyGQL
         viz.handle_list_type self, seed
       end
 
-      def list_type? = true
+      def list_type?; true; end
 
       def children
         ary = []; ary << type; ary
@@ -195,7 +195,7 @@ module TinyGQL
         viz.handle_variable_definition self, seed
       end
 
-      def variable_definition? = true
+      def variable_definition?; true; end
 
       def children
         ary = []; ary << variable; ary << type; ary << default_value if default_value; ary
@@ -216,7 +216,7 @@ module TinyGQL
         viz.handle_value self, seed
       end
 
-      def value? = true
+      def value?; true; end
 
       def children
         ary = []; ary
@@ -238,7 +238,7 @@ module TinyGQL
         viz.handle_argument self, seed
       end
 
-      def argument? = true
+      def argument?; true; end
 
       def children
         ary = []; ary << value; ary
@@ -263,7 +263,7 @@ module TinyGQL
         viz.handle_field self, seed
       end
 
-      def field? = true
+      def field?; true; end
 
       def children
         ary = []; ary.concat(arguments) if arguments; ary.concat(directives) if directives; ary.concat(selection_set) if selection_set; ary
@@ -285,7 +285,7 @@ module TinyGQL
         viz.handle_object_field self, seed
       end
 
-      def object_field? = true
+      def object_field?; true; end
 
       def children
         ary = []; ary << value; ary
@@ -301,7 +301,7 @@ module TinyGQL
         viz.handle_int_value self, seed
       end
 
-      def int_value? = true
+      def int_value?; true; end
 
     end
     class FloatValue < Value
@@ -314,7 +314,7 @@ module TinyGQL
         viz.handle_float_value self, seed
       end
 
-      def float_value? = true
+      def float_value?; true; end
 
     end
     class StringValue < Value
@@ -327,7 +327,7 @@ module TinyGQL
         viz.handle_string_value self, seed
       end
 
-      def string_value? = true
+      def string_value?; true; end
 
     end
     class BooleanValue < Value
@@ -340,7 +340,7 @@ module TinyGQL
         viz.handle_boolean_value self, seed
       end
 
-      def boolean_value? = true
+      def boolean_value?; true; end
 
     end
     class NullValue < Value
@@ -353,7 +353,7 @@ module TinyGQL
         viz.handle_null_value self, seed
       end
 
-      def null_value? = true
+      def null_value?; true; end
 
     end
     class EnumValue < Value
@@ -366,7 +366,7 @@ module TinyGQL
         viz.handle_enum_value self, seed
       end
 
-      def enum_value? = true
+      def enum_value?; true; end
 
     end
     class ListValue < Value
@@ -379,7 +379,7 @@ module TinyGQL
         viz.handle_list_value self, seed
       end
 
-      def list_value? = true
+      def list_value?; true; end
 
     end
     class ObjectValue < Node
@@ -397,7 +397,7 @@ module TinyGQL
         viz.handle_object_value self, seed
       end
 
-      def object_value? = true
+      def object_value?; true; end
 
       def children
         ary = []; ary.concat(values); ary
@@ -419,7 +419,7 @@ module TinyGQL
         viz.handle_directive self, seed
       end
 
-      def directive? = true
+      def directive?; true; end
 
       def children
         ary = []; ary.concat(arguments); ary
@@ -440,7 +440,7 @@ module TinyGQL
         viz.handle_type_condition self, seed
       end
 
-      def type_condition? = true
+      def type_condition?; true; end
 
       def children
         ary = []; ary << named_type; ary
@@ -463,7 +463,7 @@ module TinyGQL
         viz.handle_inline_fragment self, seed
       end
 
-      def inline_fragment? = true
+      def inline_fragment?; true; end
 
       def children
         ary = []; ary << type_condition if type_condition; ary.concat(directives) if directives; ary.concat(selection_set); ary
@@ -485,7 +485,7 @@ module TinyGQL
         viz.handle_fragment_spread self, seed
       end
 
-      def fragment_spread? = true
+      def fragment_spread?; true; end
 
       def children
         ary = []; ary << fragment_name; ary.concat(directives) if directives; ary
@@ -509,7 +509,7 @@ module TinyGQL
         viz.handle_fragment_definition self, seed
       end
 
-      def fragment_definition? = true
+      def fragment_definition?; true; end
 
       def children
         ary = []; ary << fragment_name; ary << type_condition; ary.concat(directives) if directives; ary.concat(selection_set); ary
@@ -531,16 +531,17 @@ module TinyGQL
         viz.handle_root_operation_type_definition self, seed
       end
 
-      def root_operation_type_definition? = true
+      def root_operation_type_definition?; true; end
 
       def children
         ary = []; ary << operation_type; ary << named_type; ary
       end
     end
     class SchemaDefinition < Node
-      attr_reader :directives, :root_operation_definitions
+      attr_reader :description, :directives, :root_operation_definitions
 
-      def initialize directives, root_operation_definitions
+      def initialize description, directives, root_operation_definitions
+        @description = description
         @directives = directives
         @root_operation_definitions = root_operation_definitions
       end
@@ -553,7 +554,7 @@ module TinyGQL
         viz.handle_schema_definition self, seed
       end
 
-      def schema_definition? = true
+      def schema_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary.concat(root_operation_definitions); ary
@@ -578,7 +579,7 @@ module TinyGQL
         viz.handle_field_definition self, seed
       end
 
-      def field_definition? = true
+      def field_definition?; true; end
 
       def children
         ary = []; ary.concat(arguments_definition) if arguments_definition; ary << type; ary.concat(directives) if directives; ary
@@ -603,7 +604,7 @@ module TinyGQL
         viz.handle_input_value_definition self, seed
       end
 
-      def input_value_definition? = true
+      def input_value_definition?; true; end
 
       def children
         ary = []; ary << type; ary << default_value if default_value; ary.concat(directives) if directives; ary
@@ -628,7 +629,7 @@ module TinyGQL
         viz.handle_object_type_definition self, seed
       end
 
-      def object_type_definition? = true
+      def object_type_definition?; true; end
 
       def children
         ary = []; ary.concat(implements_interfaces) if implements_interfaces; ary.concat(directives) if directives; ary.concat(fields_definition) if fields_definition; ary
@@ -652,7 +653,7 @@ module TinyGQL
         viz.handle_interface_type_definition self, seed
       end
 
-      def interface_type_definition? = true
+      def interface_type_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary.concat(fields_definition) if fields_definition; ary
@@ -676,7 +677,7 @@ module TinyGQL
         viz.handle_union_type_definition self, seed
       end
 
-      def union_type_definition? = true
+      def union_type_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary.concat(union_member_types) if union_member_types; ary
@@ -699,7 +700,7 @@ module TinyGQL
         viz.handle_scalar_type_definition self, seed
       end
 
-      def scalar_type_definition? = true
+      def scalar_type_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary
@@ -722,7 +723,7 @@ module TinyGQL
         viz.handle_enum_value_definition self, seed
       end
 
-      def enum_value_definition? = true
+      def enum_value_definition?; true; end
 
       def children
         ary = []; ary << enum_value; ary.concat(directives) if directives; ary
@@ -746,7 +747,7 @@ module TinyGQL
         viz.handle_enum_type_definition self, seed
       end
 
-      def enum_type_definition? = true
+      def enum_type_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary.concat(enum_value_definition) if enum_value_definition; ary
@@ -770,7 +771,7 @@ module TinyGQL
         viz.handle_input_object_type_definition self, seed
       end
 
-      def input_object_type_definition? = true
+      def input_object_type_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary.concat(input_fields_definition) if input_fields_definition; ary
@@ -794,7 +795,7 @@ module TinyGQL
         viz.handle_object_type_extension self, seed
       end
 
-      def object_type_extension? = true
+      def object_type_extension?; true; end
 
       def children
         ary = []; ary.concat(implements_interfaces) if implements_interfaces; ary.concat(directives) if directives; ary.concat(fields_definition) if fields_definition; ary
@@ -815,7 +816,7 @@ module TinyGQL
         viz.handle_executable_directive_location self, seed
       end
 
-      def executable_directive_location? = true
+      def executable_directive_location?; true; end
 
       def children
         ary = []; ary
@@ -836,7 +837,7 @@ module TinyGQL
         viz.handle_type_system_directive_location self, seed
       end
 
-      def type_system_directive_location? = true
+      def type_system_directive_location?; true; end
 
       def children
         ary = []; ary
@@ -860,7 +861,7 @@ module TinyGQL
         viz.handle_directive_definition self, seed
       end
 
-      def directive_definition? = true
+      def directive_definition?; true; end
 
       def children
         ary = []; ary.concat(arguments_definition) if arguments_definition; ary.concat(directive_locations); ary

data/lib/tinygql/nodes.rb.erb

@@ -4,7 +4,7 @@ module TinyGQL
       include Enumerable
 
 <%- nodes.each do |node| -%>
-      def <%= node.human_name %>? = false
+    def <%= node.human_name %>?; false; end
 <%- end -%>
       def each(&blk)
         yield self
@@ -32,7 +32,7 @@ module TinyGQL
         viz.handle_<%= node.human_name %> self, seed
       end
 
-      def <%= node.human_name %>? = true
+      def <%= node.human_name %>?; true; end
 
       <%- if node.has_children? -%>
       def children