tinygql 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 445c7c3eccff7132942d89394f68b4d1f9b431b31ce8c69ed5411e07d9c35ee4
-  data.tar.gz: 26a1faa1b1a29a76ce1c3fdaabecd413816fd96eeffc2663f0b6d99dd27beeb2
+  metadata.gz: ef7a07443c070f78f1ad6324890611e1ea70298c7d67eac591911c208b42aa0f
+  data.tar.gz: 3311b13953c075059a737b46f82f50aa3fd2428d844499c64354a285aa2774cd
 SHA512:
-  metadata.gz: 9825170ead631c309d1fae5e918c232102ff9673b686365b37cf60d8bd0f07a5888d42848d1f0a9eb529a3c5fe58fc47b066741c29de7bd236be10d3b7587fb6
-  data.tar.gz: c8a569419d177b5c06ee73cbf69b38290cefe40b3c781e6c730ca95ce8b2e978254b9465a0ea37d9c29c29388d2c7ffab2fd247ab193322bd9797cc35920c27f
+  metadata.gz: 814659e285e05236a4861931cf548eabab4abeaccdbc5b959adc12e3a3e6f6b9a67ea5626117ae44f46a9316c8d3210adafbf269730aec23b8c9d5ac0a538832
+  data.tar.gz: 3603440c4c6aa2aed7c361439299b8218b2f01a2c5ea96ed100da5028ac6fe391d62322a4431124861db7de50c60c69fd50d3da92178c12ef04dd58fbe63e2d3

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,7 +539,7 @@ 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
@@ -557,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
@@ -582,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
@@ -607,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
@@ -632,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
@@ -656,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
@@ -680,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
@@ -703,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
@@ -726,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
@@ -750,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
@@ -774,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
@@ -864,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,19 +98,19 @@ 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
@@ -204,3 +204,33 @@ nodes:
       - 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

@@ -53,12 +53,57 @@ module TinyGQL
     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
@@ -128,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
 
@@ -300,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)
@@ -353,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
@@ -477,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.3'
+  VERSION = '0.1.4'
 end