graphlyte 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62efb09535601a1ef60cd1f6d24108a32c954382a8e2f280e8e570bf8d14d0e2
-  data.tar.gz: 9098e5efe7b6344f1bff6effddd660de3e4d6632ec5d8c7b18516cdc7d522a4e
+  metadata.gz: 93f97fef094a43b1c151dee58329d7b198210246b1fec046e18263d65437d3f4
+  data.tar.gz: 3d057d189d9a93e601c7b91ce5ad1feb1fd00b0ab17e1c772ebdbff58cbe8349
 SHA512:
-  metadata.gz: 2577fa1470f54149841295630b98b865f44b2cc5059c67a34bdea735dfb10b0da8bedfd325567577b7e0d6b900f9cc5004e4cf7d4b7fe8e6ac801ea491487e49
-  data.tar.gz: b319c1970a99b031e13df0b33c74a5687490e423c4d141016cb01edf1fb0e2a5a17474ed19bea4b4db709715a883fb3148fac8414a1da1d293fca52d355d5c7c
+  metadata.gz: 8f106a673e0d70b97d0a4d5634c5c5b03c540fa4e4b857465e2da4252053744f2950e1b78021b99fd0ff3a4fb7bdd896aedbe775a9afc5c2e50b9017692dc626
+  data.tar.gz: 5ce5c740e6b25fca56736261db1596e25471f1e7bf5bd91785f81da8d2d8d6641b75487b325063ff115a2a3594c6f3fb891e47613c93e2ea5d53529240251b06

data/lib/graphlyte/arguments/set.rb

@@ -12,6 +12,22 @@ module Graphlyte
         @values = expand_arguments(data) unless data.nil?
       end
 
+      def resolve_lazy_special_args(parser_special_args)
+        @values&.each do |key, value|
+          if value.is_a?(Set)
+            value.resolve_lazy_special_args(parser_special_args) if value.is_a?(Set)
+          elsif value.is_a?(Array)
+            value.each do |it|
+              it.refresh(parser_special_args) if it.is_a?(Value)
+              it.resolve_lazy_special_args(parser_special_args) if it.is_a?(Set)
+            end
+          else
+            value.refresh(parser_special_args)
+          end
+          [key, value]
+        end.to_h
+      end
+
       def extract_variables(values=@values, variables=[])
         values&.each do |key, value|
           if value.is_a?(Set)

data/lib/graphlyte/arguments/value.rb

@@ -25,6 +25,10 @@ module Graphlyte
         value.is_a? Schema::Types::Base
       end
 
+      def refresh(args)
+        @value = value.call(args) if value.is_a? Proc
+      end
+
       def to_s(raw = false)
         return "$#{value.to_s.to_camel_case}" if value.is_a? Symbol
         return value if value.is_a? Numeric

data/lib/graphlyte/arguments/value_literal.rb

@@ -0,0 +1,17 @@
+module Graphlyte
+  module Arguments
+    class ValueLiteral
+      attr_reader :value
+
+      def initialize(string)
+        raise 'Value must be a string' unless string.class == String
+
+        @value = string
+      end
+
+      def to_s
+        @value
+      end
+    end
+  end
+end

data/lib/graphlyte/schema/parser.rb

@@ -4,6 +4,7 @@ require_relative "../query"
 require_relative "../fragment"
 require_relative "../schema_query"
 require_relative "../types"
+require_relative "../arguments/value_literal"
 
 module Graphlyte
   module Schema
@@ -122,10 +123,20 @@ module Graphlyte
       def parse_value
         if token = expect(:ARG_NUM_VALUE) || expect(:ARG_STRING_VALUE) || expect(:ARG_BOOL_VALUE) || expect(:ARG_FLOAT_VALUE)
           token[0][1]
+        elsif token = expect(:ARG_LITERAL_VALUE)
+          Graphlyte::Arguments::ValueLiteral.new(token[0][1])
         elsif token = expect(:SPECIAL_ARG_REF)
           ref = token[0][1]
-          raise "Can't find ref $#{ref}" unless @special_args[ref]
-          @special_args[ref]
+          # can't prove if this exists yet, so lets add it to the list
+          unless @special_args&.dig(ref)
+            @refs_to_validate ||= []
+            @refs_to_validate << ref
+            -> (args) do
+              args[ref]
+            end
+          else
+            @special_args[ref]
+          end
         elsif token = expect(:SPECIAL_ARG_VAL)
           token[0][1]
         elsif token = expect(:ARG_HASH)
@@ -244,7 +255,7 @@ module Graphlyte
     end
 
     class FragmentParser
-      attr_reader :tokens, :position, :fragments_dictionary
+      attr_reader :tokens, :position, :fragments_dictionary, :special_args
 
       include ParserHelpers
 
@@ -293,14 +304,34 @@ module Graphlyte
         @position = 0
       end
 
+      def refresh_lazy_refs(fields)
+        fields.each do |field|
+          if field.is_a? Fieldset
+            refresh_lazy_refs(field.fields)
+          else
+            field.inputs.resolve_lazy_special_args(@special_args)
+            refresh_lazy_refs(field.fieldset.fields)
+          end
+        end
+      end
+
       def parse
         if token = expect(:EXPRESSION)
-          parse_expression(token[0][1], token[0][2])
+          value = parse_expression(token[0][1], token[0][2])
+
+          # validate fragment refs
+          @refs_to_validate&.each do |ref|
+            raise "Argument reference #{ref} doesn't exist" unless @special_args[ref]
+          end
+
+          refresh_lazy_refs(value.builder.>>)
+
+          value
         elsif expect(:FRAGMENT)
           skip_fragments
           parse
         else
-          raise "INVALID"
+          raise "Expression or Fragment not found"
         end
       end
 
@@ -310,7 +341,6 @@ module Graphlyte
 
       def parse_expression(type, name)
         parse_args
-        fields = []
         builder = parse_fieldset_into_builder
         need(:END_FIELDSET)
         query = Query.new(name, type.to_sym, builder: builder)
@@ -369,11 +399,7 @@ module Graphlyte
               push_state :arguments
             end
           elsif scanner.check /\s*\}/
-            if get_context == :fragments
-              end_fragment
-            elsif get_context == :expression
-              end_expression
-            end
+            end_fieldset
           else
             advance
           end
@@ -431,6 +457,7 @@ module Graphlyte
       def end_arguments
         scanner.scan /\s*\)/
         @tokens << [:END_ARGS]
+        pop_state if state == :argument_defaults
         pop_state
         end_fieldset while check_for_last && state == :fieldset
       end
@@ -493,9 +520,10 @@ module Graphlyte
 
       def pop_argument_state
         if check_for_last(/\s*\)/)
+          @tokens << [:END_DEFAULT_VALUE] if state == :argument_defaults
           end_arguments
         else
-          pop_state unless %i[argument_defaults hash_arguments array_arguments special_args arguments].include?(state)
+          pop_state unless %i[arguments argument_defaults hash_arguments array_arguments special_args].include?(state)
         end
       end
 
@@ -555,17 +583,19 @@ module Graphlyte
           pop_argument_state
         elsif scanner.scan /,/
           # no-op
+        elsif scanner.scan /([A-Za-z_"]+)/
+          @tokens << [:ARG_LITERAL_VALUE, scanner[1]]
+
         elsif check_for_last(/\s*\)/)
           @tokens << [:END_DEFAULT_VALUE] if state == :argument_defaults
           end_arguments
-          pop_state
         else
           advance
         end
       end
 
       def tokenize_fields
-        if scanner.check %r[{]
+        if scanner.check %r[\s*{]
           tokenize_fieldset
         # ... on Model - or - ... @directive
         elsif scanner.scan %r{\.{3}\s}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphlyte
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Sean Gregory
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-27 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -47,6 +47,7 @@ files:
 - lib/graphlyte.rb
 - lib/graphlyte/arguments/set.rb
 - lib/graphlyte/arguments/value.rb
+- lib/graphlyte/arguments/value_literal.rb
 - lib/graphlyte/builder.rb
 - lib/graphlyte/directive.rb
 - lib/graphlyte/field.rb