tinygql 0.1.2 → 0.1.4

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/nodes.rb

@@ -42,6 +42,11 @@ module TinyGQL
     def executable_directive_location?; false; end
     def type_system_directive_location?; false; end
     def directive_definition?; false; end
+    def scalar_type_extension?; false; end
+    def interface_type_extension?; false; end
+    def union_type_extension?; false; end
+    def enum_type_extension?; false; end
+    def input_object_type_extension?; false; end
       def each(&blk)
         yield self
         children.each { |v| v.each(&blk) }
@@ -422,7 +427,7 @@ module TinyGQL
       def directive?; true; end
 
       def children
-        ary = []; ary.concat(arguments); ary
+        ary = []; ary.concat(arguments) if arguments; ary
       end
     end
     class TypeCondition < Node
@@ -488,7 +493,7 @@ module TinyGQL
       def fragment_spread?; true; end
 
       def children
-        ary = []; ary << fragment_name; ary.concat(directives) if directives; ary
+        ary = []; ary.concat(directives) if directives; ary
       end
     end
     class FragmentDefinition < Node
@@ -512,7 +517,7 @@ module TinyGQL
       def fragment_definition?; true; end
 
       def children
-        ary = []; ary << fragment_name; ary << type_condition; ary.concat(directives) if directives; ary.concat(selection_set); ary
+        ary = []; ary << type_condition; ary.concat(directives) if directives; ary.concat(selection_set); ary
       end
     end
     class RootOperationTypeDefinition < Node
@@ -534,13 +539,14 @@ module TinyGQL
       def root_operation_type_definition?; true; end
 
       def children
-        ary = []; ary << operation_type; ary << named_type; ary
+        ary = []; 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
@@ -556,7 +562,7 @@ module TinyGQL
       def schema_definition?; true; end
 
       def children
-        ary = []; ary.concat(directives) if directives; ary.concat(root_operation_definitions); ary
+        ary = []; ary << description if description; ary.concat(directives) if directives; ary.concat(root_operation_definitions); ary
       end
     end
     class FieldDefinition < Node
@@ -581,7 +587,7 @@ module TinyGQL
       def field_definition?; true; end
 
       def children
-        ary = []; ary.concat(arguments_definition) if arguments_definition; ary << type; ary.concat(directives) if directives; ary
+        ary = []; ary << description if description; ary.concat(arguments_definition) if arguments_definition; ary << type; ary.concat(directives) if directives; ary
       end
     end
     class InputValueDefinition < Node
@@ -606,7 +612,7 @@ module TinyGQL
       def input_value_definition?; true; end
 
       def children
-        ary = []; ary << type; ary << default_value if default_value; ary.concat(directives) if directives; ary
+        ary = []; ary << description if description; ary << type; ary << default_value if default_value; ary.concat(directives) if directives; ary
       end
     end
     class ObjectTypeDefinition < Node
@@ -631,7 +637,7 @@ module TinyGQL
       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
+        ary = []; ary << description if description; ary.concat(implements_interfaces) if implements_interfaces; ary.concat(directives) if directives; ary.concat(fields_definition) if fields_definition; ary
       end
     end
     class InterfaceTypeDefinition < Node
@@ -655,7 +661,7 @@ module TinyGQL
       def interface_type_definition?; true; end
 
       def children
-        ary = []; ary.concat(directives) if directives; ary.concat(fields_definition) if fields_definition; ary
+        ary = []; ary << description if description; ary.concat(directives) if directives; ary.concat(fields_definition) if fields_definition; ary
       end
     end
     class UnionTypeDefinition < Node
@@ -679,7 +685,7 @@ module TinyGQL
       def union_type_definition?; true; end
 
       def children
-        ary = []; ary.concat(directives) if directives; ary.concat(union_member_types) if union_member_types; ary
+        ary = []; ary << description if description; ary.concat(directives) if directives; ary.concat(union_member_types) if union_member_types; ary
       end
     end
     class ScalarTypeDefinition < Node
@@ -702,7 +708,7 @@ module TinyGQL
       def scalar_type_definition?; true; end
 
       def children
-        ary = []; ary.concat(directives) if directives; ary
+        ary = []; ary << description if description; ary.concat(directives) if directives; ary
       end
     end
     class EnumValueDefinition < Node
@@ -725,7 +731,7 @@ module TinyGQL
       def enum_value_definition?; true; end
 
       def children
-        ary = []; ary << enum_value; ary.concat(directives) if directives; ary
+        ary = []; ary << description if description; ary << enum_value; ary.concat(directives) if directives; ary
       end
     end
     class EnumTypeDefinition < Node
@@ -749,7 +755,7 @@ module TinyGQL
       def enum_type_definition?; true; end
 
       def children
-        ary = []; ary.concat(directives) if directives; ary.concat(enum_value_definition) if enum_value_definition; ary
+        ary = []; ary << description if description; ary.concat(directives) if directives; ary.concat(enum_value_definition) if enum_value_definition; ary
       end
     end
     class InputObjectTypeDefinition < Node
@@ -773,7 +779,7 @@ module TinyGQL
       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
+        ary = []; ary << description if description; ary.concat(directives) if directives; ary.concat(input_fields_definition) if input_fields_definition; ary
       end
     end
     class ObjectTypeExtension < Node
@@ -863,7 +869,122 @@ module TinyGQL
       def directive_definition?; true; end
 
       def children
-        ary = []; ary.concat(arguments_definition) if arguments_definition; ary.concat(directive_locations); ary
+        ary = []; ary << description if description; ary.concat(arguments_definition) if arguments_definition; ary.concat(directive_locations); ary
+      end
+    end
+    class ScalarTypeExtension < Node
+      attr_reader :name, :directives
+
+      def initialize name, directives
+        @name = name
+        @directives = directives
+      end
+
+      def accept viz
+        viz.handle_scalar_type_extension self
+      end
+
+      def fold viz, seed
+        viz.handle_scalar_type_extension self, seed
+      end
+
+      def scalar_type_extension?; true; end
+
+      def children
+        ary = []; ary.concat(directives) if directives; ary
+      end
+    end
+    class InterfaceTypeExtension < Node
+      attr_reader :name, :implements_interfaces, :directives, :fields_definition
+
+      def initialize name, implements_interfaces, directives, fields_definition
+        @name = name
+        @implements_interfaces = implements_interfaces
+        @directives = directives
+        @fields_definition = fields_definition
+      end
+
+      def accept viz
+        viz.handle_interface_type_extension self
+      end
+
+      def fold viz, seed
+        viz.handle_interface_type_extension self, seed
+      end
+
+      def interface_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
+      end
+    end
+    class UnionTypeExtension < Node
+      attr_reader :name, :directives, :union_member_types
+
+      def initialize name, directives, union_member_types
+        @name = name
+        @directives = directives
+        @union_member_types = union_member_types
+      end
+
+      def accept viz
+        viz.handle_union_type_extension self
+      end
+
+      def fold viz, seed
+        viz.handle_union_type_extension self, seed
+      end
+
+      def union_type_extension?; true; end
+
+      def children
+        ary = []; ary.concat(directives) if directives; ary.concat(union_member_types) if union_member_types; ary
+      end
+    end
+    class EnumTypeExtension < Node
+      attr_reader :name, :directives, :enum_value_definition
+
+      def initialize name, directives, enum_value_definition
+        @name = name
+        @directives = directives
+        @enum_value_definition = enum_value_definition
+      end
+
+      def accept viz
+        viz.handle_enum_type_extension self
+      end
+
+      def fold viz, seed
+        viz.handle_enum_type_extension self, seed
+      end
+
+      def enum_type_extension?; true; end
+
+      def children
+        ary = []; ary.concat(directives) if directives; ary.concat(enum_value_definition) if enum_value_definition; ary
+      end
+    end
+    class InputObjectTypeExtension < Node
+      attr_reader :name, :directives, :input_fields_definition
+
+      def initialize name, directives, input_fields_definition
+        @name = name
+        @directives = directives
+        @input_fields_definition = input_fields_definition
+      end
+
+      def accept viz
+        viz.handle_input_object_type_extension self
+      end
+
+      def fold viz, seed
+        viz.handle_input_object_type_extension self, seed
+      end
+
+      def input_object_type_extension?; true; end
+
+      def children
+        ary = []; ary.concat(directives) if directives; ary.concat(input_fields_definition) if input_fields_definition; ary
       end
     end
   end

data/lib/tinygql/nodes.yml

@@ -84,7 +84,7 @@ nodes:
   - name: Directive
     fields:
       - name: literal
-      - arguments: list
+      - arguments?: list
 
   - name: TypeCondition
     fields:
@@ -98,29 +98,30 @@ nodes:
 
   - name: FragmentSpread
     fields:
-      - fragment_name
+      - fragment_name: literal
       - directives?: list
 
   - name: FragmentDefinition
     fields:
-      - fragment_name
+      - fragment_name: literal
       - type_condition
       - directives?: list
       - selection_set: list
 
   - name: RootOperationTypeDefinition
     fields:
-      - operation_type
+      - operation_type: literal
       - named_type
 
   - name: SchemaDefinition
     fields:
+      - description?
       - directives?: list
       - root_operation_definitions: list
 
   - name: FieldDefinition
     fields:
-      - description?: literal
+      - description?
       - name: literal
       - arguments_definition?: list
       - type
@@ -128,7 +129,7 @@ nodes:
 
   - name: InputValueDefinition
     fields:
-      - description?: literal
+      - description?
       - name: literal
       - type
       - default_value?
@@ -136,7 +137,7 @@ nodes:
 
   - name: ObjectTypeDefinition
     fields:
-      - description?: literal
+      - description?
       - name: literal
       - implements_interfaces?: list
       - directives?: list
@@ -144,40 +145,40 @@ nodes:
 
   - name: InterfaceTypeDefinition
     fields:
-      - description?: literal
+      - description?
       - name: literal
       - directives?: list
       - fields_definition?: list
 
   - name: UnionTypeDefinition
     fields:
-      - description?: literal
+      - description?
       - name: literal
       - directives?: list
       - union_member_types?: list
 
   - name: ScalarTypeDefinition
     fields:
-      - description?: literal
+      - description?
       - name: literal
       - directives?: list
 
   - name: EnumValueDefinition
     fields:
-      - description?: literal
+      - description?
       - enum_value
       - directives?: list
 
   - name: EnumTypeDefinition
     fields:
-      - description?: literal
+      - description?
       - name: literal
       - directives?: list
       - enum_value_definition?: list
 
   - name: InputObjectTypeDefinition
     fields:
-      - description?: literal
+      - description?
       - name: literal
       - directives?: list
       - input_fields_definition?: list
@@ -199,7 +200,37 @@ nodes:
 
   - name: DirectiveDefinition
     fields:
-      - description?: literal
+      - description?
       - name: literal
       - arguments_definition?: list
       - directive_locations: list
+
+  - name: ScalarTypeExtension
+    fields:
+      - name: literal
+      - directives?: list
+
+  - name: InterfaceTypeExtension
+    fields:
+      - name: literal
+      - implements_interfaces?: list
+      - directives?: list
+      - fields_definition?: list
+
+  - name: UnionTypeExtension
+    fields:
+      - name: literal
+      - directives?: list
+      - union_member_types?: list
+
+  - name: EnumTypeExtension
+    fields:
+      - name: literal
+      - directives?: list
+      - enum_value_definition?: list
+
+  - name: InputObjectTypeExtension
+    fields:
+      - name: literal
+      - directives?: list
+      - input_fields_definition?: list

data/lib/tinygql/parser.rb

@@ -7,7 +7,9 @@ module TinyGQL
   class Parser
     class UnexpectedToken < StandardError; end
 
-    attr_reader :token_name
+    def self.parse doc
+      new(doc).parse
+    end
 
     def initialize doc
       @lexer = Lexer.new doc
@@ -21,6 +23,8 @@ module TinyGQL
 
     private
 
+    attr_reader :token_name
+
     def document
       Nodes::Document.new definition_list
     end
@@ -40,19 +44,66 @@ module TinyGQL
       when :EXTEND
         type_system_extension
       else
-        type_system_definition
+        desc = if at?(:STRING); string_value; end
+
+        type_system_definition desc
       end
     end
 
     def type_system_extension
       expect_token :EXTEND
       case token_name
+      when :SCALAR then scalar_type_extension
       when :TYPE then object_type_extension
+      when :INTERFACE then interface_type_extension
+      when :UNION then union_type_extension
+      when :ENUM then enum_type_extension
+      when :INPUT then input_object_type_extension
       else
-        expect_token :FAIL
+        expect_token :SCALAR
       end
     end
 
+    def input_object_type_extension
+      expect_token :INPUT
+      name = self.name
+      directives = if at?(:DIR_SIGN); self.directives; end
+      input_fields_definition = if at?(:LCURLY); self.input_fields_definition; end
+      Nodes::InputObjectTypeExtension.new(name, directives, input_fields_definition)
+    end
+
+    def enum_type_extension
+      expect_token :ENUM
+      name = self.name
+      directives = if at?(:DIR_SIGN); self.directives; end
+      enum_values_definition = if at?(:LCURLY); self.enum_values_definition; end
+      Nodes::EnumTypeExtension.new(name, directives, enum_values_definition)
+    end
+
+    def union_type_extension
+      expect_token :UNION
+      name = self.name
+      directives = if at?(:DIR_SIGN); self.directives; end
+      union_member_types = if at?(:EQUALS); self.union_member_types; end
+      Nodes::UnionTypeExtension.new(name, directives, union_member_types)
+    end
+
+    def interface_type_extension
+      expect_token :INTERFACE
+      name = self.name
+      implements_interfaces = if at?(:IMPLEMENTS); self.implements_interfaces; end
+      directives           = if at?(:DIR_SIGN); self.directives; end
+      fields_definition   = if at?(:LCURLY); self.fields_definition; end
+      Nodes::InterfaceTypeExtension.new(name, implements_interfaces, directives, fields_definition)
+    end
+
+    def scalar_type_extension
+      expect_token :SCALAR
+      name = self.name
+      directives = if at?(:DIR_SIGN); self.directives; end
+      Nodes::ScalarTypeExtension.new(name, directives)
+    end
+
     def object_type_extension
       expect_token :TYPE
       name = self.name
@@ -62,12 +113,12 @@ module TinyGQL
       Nodes::ObjectTypeExtension.new(name, implements_interfaces, directives, fields_definition)
     end
 
-    def type_system_definition
+    def type_system_definition desc
       case token_name
-      when :SCHEMA then schema_definition
-      when :DIRECTIVE then directive_defintion(nil)
+      when :SCHEMA then schema_definition(desc)
+      when :DIRECTIVE then directive_defintion(desc)
       else
-        type_definition(nil)
+        type_definition(desc)
       end
     end
 
@@ -91,9 +142,11 @@ module TinyGQL
     end
 
     def directive_location
-      case token_name
+      directive = expect_token_value :IDENTIFIER
+
+      case directive
       when "QUERY", "MUTATION", "SUBSCRIPTION", "FIELD", "FRAGMENT_DEFINITION", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"
-        Nodes::ExecutableDirectiveLocation.new(accept_token_value)
+        Nodes::ExecutableDirectiveLocation.new(directive)
       when "SCHEMA",
         "SCALAR",
         "OBJECT",
@@ -105,9 +158,9 @@ module TinyGQL
         "ENUM_VALUE",
         "INPUT_OBJECT",
         "INPUT_FIELD_DEFINITION"
-        Nodes::TypeSystemDirectiveLocation.new(accept_token_value)
+        Nodes::TypeSystemDirectiveLocation.new(directive)
       else
-        expect_token(:IDENTIFIER); nil # error
+        raise UnexpectedToken, "Expected directive #{directive}"
       end
     end
 
@@ -120,7 +173,7 @@ module TinyGQL
       when :ENUM then enum_type_definition(desc)
       when :INPUT then input_object_type_definition(desc)
       else
-        expect_token :FAIL
+        expect_token :TYPE
       end
     end
 
@@ -161,7 +214,7 @@ module TinyGQL
     end
 
     def enum_value_definition
-      description = if at?(:STRING); accept_token_value; end
+      description = if at?(:STRING); string_value; end
       enum_value = self.enum_value
       directives = if at?(:DIR_SIGN); self.directives; end
       Nodes::EnumValueDefinition.new(description, enum_value, directives)
@@ -221,7 +274,7 @@ module TinyGQL
     end
 
     def field_definition
-      description = if at?(:STRING); accept_token_value; end
+      description = if at?(:STRING); string_value; end
       name = self.name
       arguments_definition = if at?(:LPAREN); self.arguments_definition; end
       expect_token :COLON
@@ -242,7 +295,7 @@ module TinyGQL
     end
 
     def input_value_definition
-      description = if at?(:STRING); accept_token_value; end
+      description = if at?(:STRING); string_value; end
       name = self.name
       expect_token :COLON
       type = self.type
@@ -262,14 +315,14 @@ module TinyGQL
       list
     end
 
-    def schema_definition
+    def schema_definition desc
       expect_token :SCHEMA
 
       directives = if at?(:DIR_SIGN); self.directives; end
       expect_token :LCURLY
       defs = root_operation_type_definition
       expect_token :RCURLY
-      Nodes::SchemaDefinition.new(directives, defs)
+      Nodes::SchemaDefinition.new(desc, directives, defs)
     end
 
     def root_operation_type_definition
@@ -292,7 +345,7 @@ module TinyGQL
 
     def fragment_definition
       expect_token :FRAGMENT
-      expect_token(:FAIL) if at?(:ON)
+      expect_token(:IDENTIFIER) if at?(:ON)
       name = self.name
       tc = self.type_condition
       directives = if at?(:DIR_SIGN)
@@ -345,15 +398,15 @@ module TinyGQL
       when :ON, :DIR_SIGN, :LCURLY then inline_fragment
       when :IDENTIFIER then fragment_spread
       else
-        expect_token :FAIL
+        expect_token :IDENTIFIER
       end
     end
 
     def fragment_spread
       name = self.name
-      directives = if at?(:DIR_SIGN)
-        self.directives
-      end
+      directives = if at?(:DIR_SIGN); self.directives; end
+
+      expect_token(:IDENTIFIER) if at?(:ON)
 
       Nodes::FragmentSpread.new(name, directives)
     end
@@ -469,7 +522,7 @@ module TinyGQL
       when :LCURLY then object_value
       when :VAR_SIGN then variable
       else
-        expect_token :FAIL
+        expect_token :INT
       end
     end
 

data/lib/tinygql/version.rb

@@ -1,3 +1,3 @@
 module TinyGQL
-  VERSION = '0.1.2'
+  VERSION = '0.1.4'
 end