graphlyte 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c3b9e1d17580b4d94cf3ffaa9f7291d8ff10c9441a9c2270a378daad39f977
-  data.tar.gz: f3586e4ea3a92e0ac462b92a17115a81a8c64e6643c296861072a23543ae2b92
+  metadata.gz: 62efb09535601a1ef60cd1f6d24108a32c954382a8e2f280e8e570bf8d14d0e2
+  data.tar.gz: 9098e5efe7b6344f1bff6effddd660de3e4d6632ec5d8c7b18516cdc7d522a4e
 SHA512:
-  metadata.gz: a4dd27faa45576150659090362b94f30297faad8a1a1d5758480e63359bd74e92a30960e70fad8aa446c60e1540dd384458590d5f6cc00eb49c9aa09b44d6659
-  data.tar.gz: 1887884979b8f92cc8c1b145c782363b7be9e907fc3541cee5e103a4e901d07261f1a6f69aa0aafcce337efda5e5de4a3950fa4803f17a074f4cc6bbd0555ace
+  metadata.gz: 2577fa1470f54149841295630b98b865f44b2cc5059c67a34bdea735dfb10b0da8bedfd325567577b7e0d6b900f9cc5004e4cf7d4b7fe8e6ac801ea491487e49
+  data.tar.gz: b319c1970a99b031e13df0b33c74a5687490e423c4d141016cb01edf1fb0e2a5a17474ed19bea4b4db709715a883fb3148fac8414a1da1d293fca52d355d5c7c

data/lib/graphlyte/arguments/set.rb

@@ -62,27 +62,17 @@ module Graphlyte
       end
 
       def expand_arguments(data)
-        data.inject({}) do |memo, (k, v)|
-          if v.is_a?(Array)
-            memo[k] = v.map do |item|
-              if item.is_a?(Value)
-                item
-              else
-                Value.new(item)
-              end
-            end
-          elsif v.is_a?(Hash)
-            memo[k] = Set.new(v)
+        data.transform_values do |value|
+          case value
+          when Array
+            value.map { |item| Value.from(item) }
+          when Hash
+            Set.new(value)
           else
-            if v.is_a?(Value)
-              memo[k] = v
-            else
-              memo[k] = Value.new(v)
-            end
+            Value.from(value)
           end
-          memo
         end
       end
     end
   end
-end
+end

data/lib/graphlyte/arguments/value.rb

@@ -11,6 +11,12 @@ module Graphlyte
         @value = value
       end
 
+      def self.from(value)
+        return value if value.is_a? self
+
+        new(value)
+      end
+
       def symbol?
         value.is_a? Symbol
       end

data/lib/graphlyte/builder.rb

@@ -18,7 +18,13 @@ module Graphlyte
 
     def remove(field_symbol)
       @fields.reject! do |field|
-        field.name == field_symbol.to_s
+        field.class == Fragment ? false : field.name == field_symbol.to_s
+      end
+
+      @fields.select { |field| field.class == Fragment }.each do |fragment|
+        fragment.fields.reject! do |field|
+          field.name == field_symbol.to_s
+        end
       end
     end
     

data/lib/graphlyte/directive.rb

@@ -9,10 +9,14 @@ module Graphlyte
       @inputs = Arguments::Set.new(hargs)
     end
 
-    def inflate(indent, string, field: nil)
+    def inflate(indent, string, field: nil, args: nil)
       # add directive after fieldname?
-      string += ' ' * indent
-      string += "#{field} " if field
+      string += ' ' * indent unless indent.nil?
+      if !args.nil? && args.to_s.empty?
+        string += "#{field} " if field
+      else
+        string += "#{field}#{args.to_s} "
+      end
       string += "@#{name}"
       string += @inputs.to_s unless @inputs.to_s.empty?
       string

data/lib/graphlyte/field.rb

@@ -43,7 +43,7 @@ module Graphlyte
         str += "#{actual_indent}#{@alias}: #{name}"
         str += inputs.to_s.empty? ? "()" : inputs.to_s
       elsif @directive
-        str = @directive.inflate(indent * 2, str, field: name)
+        str = @directive.inflate(indent * 2, str, field: name, args: inputs)
       else
         str += "#{actual_indent}#{name}#{inputs.to_s}"
       end

data/lib/graphlyte/inline_fragment.rb

@@ -15,10 +15,10 @@ module Graphlyte
 
     def to_s(indent=0)
       actual_indent = ("\s" * indent) * 2
-      string = '... '
-      string += "on #{model_name}" if model_name
+      string = '...'
+      string += " on #{model_name}" if model_name
       inflate_indent = model_name ? 1 : 0
-      string = directive.inflate(inflate_indent, string) if directive
+      string = directive.inflate(0, string) if directive
       string += " {\n"
       string += super(indent + 1)
       string += "\n#{actual_indent}}"

data/lib/graphlyte/query.rb

@@ -11,6 +11,8 @@ module Graphlyte
 
       if token == '*'
         fields.each do |field|
+          next if field.class == Fragment
+
           modify(field.fieldset.fields, [token], &block)
           field.fieldset.builder.instance_eval(&block) unless field.fieldset.fields.empty?
         end
@@ -95,7 +97,7 @@ module Graphlyte
           elsif hargs[var.value].is_a? Integer
             memo << [var.value, "Int"]
           elsif hargs[var.value].is_a? Array
-            memo <<  "[#{merge_variable_types(var.value, hargs).first}]"
+            memo << "[#{merge_variable_types(var.value, hargs).first}]"
           end
         else
           memo << [var.value.placeholder, var.value.name, var.value.default]
@@ -117,7 +119,7 @@ module Graphlyte
     def flatten_variables(fields, variables=[])
       fields.each do |field|
         variables.concat field.inputs.extract_variables unless [InlineFragment, Fragment].include? field.class
-        variables.concat field.directive.inputs.extract_variables if field.class == InlineFragment && field.directive
+        variables.concat field.directive.inputs.extract_variables if field.respond_to?(:directive) && field.directive
         if [InlineFragment, Fragment].include? field.class
           flatten_variables(field.fields, variables)
         else

data/lib/graphlyte/schema/parser.rb

@@ -92,24 +92,31 @@ module Graphlyte
 
       def parse_arg
         if (token = expect(:ARG_KEY)) && (value = parse_value)
-          defaults = parse_default
+          parse_default
           key = token[0][1]
-          hash = {}
-          hash[key] = value
-          hash
-        elsif (token = expect(:SPECIAL_ARG_KEY)) && (value = parse_value)
-          defaults = parse_default
-          @special_args ||= {}
           arg = {}
-          if [Array, Hash].include?(value.class)
-            arg[token[0][1]] = value
-          else
-            new_val = Schema::Types::Base.new(value, token[0][1], defaults)
-            arg[token[0][1]] = new_val
-          end
-          @special_args.merge!(arg)
-          arg
+          arg[key] = value
+        elsif (token = expect(:SPECIAL_ARG_KEY)) && (value = parse_value)
+          arg = expect_and_inflate_special_args(token, value)
+        end
+
+        arg
+      end
+
+      def expect_and_inflate_special_args(token, value)
+        return { token[0][1] => value } if value.class == Schema::Types::Base
+
+        defaults = parse_default
+        @special_args ||= {}
+        arg = {}
+        if [Array, Hash].include?(value.class)
+          arg[token[0][1]] = value
+        else
+          new_val = Schema::Types::Base.new(value, token[0][1], defaults)
+          arg[token[0][1]] = new_val
         end
+        @special_args.merge!(arg)
+        arg
       end
 
       def parse_value
@@ -206,40 +213,24 @@ module Graphlyte
         end
       end
 
-      def take_fragments
-        aggregate = @tokens.inject({taking: false, idx: 0,  fragments: []}) do |memo, token_arr|
-          if token_arr[0] == :END_FIELDSET
-            memo[:fragments][memo[:idx]] << token_arr
-            memo[:taking] = false
-            memo[:idx] += 1
-          elsif token_arr[0] === :FRAGMENT
-            memo[:fragments][memo[:idx]] = [token_arr]
-            memo[:taking] = true
-          elsif memo[:taking]
-            memo[:fragments][memo[:idx]] << token_arr
-          end
-          memo
-        end
-        aggregate[:fragments]
-      end
-
+      # Select the fragments tokens as an array of arrays
+      # @return Array [[[:FRAGMENT, 'foo', bar], [:FIELDSET], [:END_FIELDSET]], [[:FRAGMENT 'buzz', 'bazz']...
       def fetch_fragments(tokens = @tokens.dup, fragment_tokens = [], memo = { active: false, starts: 0, ends: 0, idx: 0 })
         token_arr = tokens.shift
         return fragment_tokens if token_arr.nil?
 
-
         if memo[:active] == true
           fragment_tokens[memo[:idx]] << token_arr
         end
 
         if token_arr[0] == :END_FIELDSET && memo[:active] == true
           memo[:ends] += 1
-          fragment_tokens[memo[:idx]] << token_arr if memo[:starts] == memo[:ends]
-
-          memo[:active] = false
-          memo[:ends] = 0
-          memo[:starts] = 0
-          memo[:idx] += 1
+          if memo[:starts] == memo[:ends] + 1
+            memo[:active] = false
+            memo[:ends] = 0
+            memo[:starts] = 0
+            memo[:idx] += 1
+          end
         elsif token_arr[0] == :FRAGMENT
           memo[:active] = true
           memo[:starts] += 1
@@ -248,7 +239,6 @@ module Graphlyte
           memo[:starts] += 1
         end
 
-
         fetch_fragments(tokens, fragment_tokens, memo)
       end
     end
@@ -363,10 +353,11 @@ module Graphlyte
               push_state :arguments
             end
           elsif scanner.check /\{/
+            @tokens << [:EXPRESSION, 'query', nil] if get_context == :default
             push_context :fieldset
 
             tokenize_fieldset
-          elsif scanner.scan %r{^(\w+) (\w+)}
+          elsif scanner.scan %r{^(\w+) (\w+)?}
             @tokens << [:EXPRESSION, scanner[1], scanner[2]]
             push_context :expression
             # check for a fieldset
@@ -391,7 +382,7 @@ module Graphlyte
         when :arguments
           tokenize_arguments
         when :argument_defaults
-          tokenize_shared_arguments
+          tokenize_argument_defaults
         when :hash_arguments
           tokenize_hash_arguments
         when :array_arguments
@@ -434,31 +425,22 @@ module Graphlyte
         scanner.scan /\s*\}/
         @tokens << [:END_FIELDSET]
         pop_state
+        pop_context if state == :default
       end
 
       def end_arguments
         scanner.scan /\s*\)/
         @tokens << [:END_ARGS]
         pop_state
-      end
-
-      def end_fragment
-        scanner.scan /\s*\}/
-        @tokens << [:END_FRAGMENT]
-        pop_state
-        pop_context
-      end
-
-      def end_expression
-        scanner.scan /\s*\}/
-        @tokens << [:END_EXPRESSION]
-        pop_state
-        pop_context
+        end_fieldset while check_for_last && state == :fieldset
       end
 
       # to tired to figure out why this is right now
       def tokenize_argument_defaults
-        if scanner.scan /\)/
+        if scanner.check /\)/
+          @tokens << [:END_DEFAULT_VALUE]
+          pop_state
+        elsif scanner.scan /[\n|,]/
           @tokens << [:END_DEFAULT_VALUE]
           pop_state
         else
@@ -509,6 +491,14 @@ module Graphlyte
         end
       end
 
+      def pop_argument_state
+        if check_for_last(/\s*\)/)
+          end_arguments
+        else
+          pop_state unless %i[argument_defaults hash_arguments array_arguments special_args arguments].include?(state)
+        end
+      end
+
       def tokenize_arguments
         # pop argument state if arguments are finished
         if scanner.scan %r{\)}
@@ -516,7 +506,6 @@ module Graphlyte
 
           pop_state
         # something(argument: $argument = true)
-        #                               ^
         elsif scanner.scan %r{=}
           @tokens << [:DEFAULT_VALUE]
 
@@ -543,19 +532,19 @@ module Graphlyte
         elsif scanner.scan %r{"(.*?)"}
           @tokens << [:ARG_STRING_VALUE, scanner[1]]
 
-          end_arguments if check_for_last(/\s*\)/)
+          pop_argument_state
         elsif scanner.scan /(\d+\.\d+)/
           @tokens << [:ARG_FLOAT_VALUE, scanner[1].to_f]
 
-          end_arguments if check_for_last(/\s*\)/)
+          pop_argument_state
         elsif scanner.scan /(\d+)/
           @tokens << [:ARG_NUM_VALUE, scanner[1].to_i]
 
-          end_arguments if check_for_last(/\s*\)/)
+          pop_argument_state
         elsif scanner.scan /(true|false)/
           @tokens << [:ARG_BOOL_VALUE, (scanner[1] == 'true')]
 
-          end_arguments if check_for_last(/\s*\)/)
+          pop_argument_state
         elsif scanner.scan /\$(\w+):/
           @tokens << [:SPECIAL_ARG_KEY, scanner[1]]
 
@@ -563,7 +552,7 @@ module Graphlyte
         elsif scanner.scan /\$(\w+)/
           @tokens << [:SPECIAL_ARG_REF, scanner[1]]
 
-          end_arguments if check_for_last(/\s*\)/)
+          pop_argument_state
         elsif scanner.scan /,/
           # no-op
         elsif check_for_last(/\s*\)/)
@@ -585,7 +574,9 @@ module Graphlyte
         # @directive
         elsif scanner.scan %r{@(\w+)}
           @tokens << [:DIRECTIVE, scanner[1]]
-        # ...fragmentReference (check for last since it is a field literal)
+
+          end_fieldset while check_for_last && state == :fieldset
+          # ...fragmentReference (check for last since it is a field literal)
         elsif scanner.scan /\.{3}(\w+)/
           @tokens << [:FRAGMENT_REF, scanner[1]]
 
@@ -603,14 +594,6 @@ module Graphlyte
           @tokens << [:START_ARGS]
 
           push_state :arguments
-        elsif check_for_final
-          if get_context == :fragments
-            end_fragment
-          elsif get_context == :expression
-            end_expression
-          else
-            advance
-          end
         else
           advance
         end
@@ -648,7 +631,7 @@ module Graphlyte
 
       def advance
         unless scanner.check /\s/
-          raise LexerError, "Unexpected Char: '#{scanner.peek(3)}'"
+          raise LexerError, "Unexpected Char: '#{scanner.peek(20)}'"
         end
 
         scanner.pos = scanner.pos + 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphlyte
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sean Gregory
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-26 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec