graphlyte 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a541bce9d787c84cbb85652dfaebced77765a79ef1256f016a723d574e389313
-  data.tar.gz: 2b1e62293e73d388bb539fcec90f7f6f1269d843db8cd0410176ff4d90426a82
+  metadata.gz: 5e01c43639c294e8ae4121522a6b0a5e498e69fd9e4f91e9f3e0a3a04753f826
+  data.tar.gz: 985c22c79e96547fdb5da497b52b5c2e8d03621f38253847e57afb932e18c752
 SHA512:
-  metadata.gz: 2dc601050babce04c958e6bb6f3bfcf84d55962f8164ffbb1452e69105795961e570c247f8af303baee982173c77eebd049027381a86573780408516a059e1ee
-  data.tar.gz: 05d5f0acce7bb921cd721125eb63728c347f136eaf6a552385d53eb537578a341707d454be924e82a9b35d13acf9af77874d5c9731ad0215159401f6407f3873
+  metadata.gz: 54d9dc438641a2f9f800eff0ade575f893472bbf96faba57e9d69171efbae8a8bd8caf50bdaeb4d7e71aadc37161c61e55c2385a1da98f04d0b687b20b6d654e
+  data.tar.gz: 671f0580825f19ce0f010926a40a4cdece1ddb408dbda8ec10120c80ad0a2274680fae80085679a1e5f688fc5049e9ad1efae52b21c595ddfa166f2c759fc509

data/lib/graphlyte/arguments/set.rb

@@ -26,15 +26,15 @@ module Graphlyte
         variables
       end
 
-      def to_h(inner = false)
+      def to_h(raw = false)
         return {} unless values && !values.empty?
         values.inject({}) do |memo, (k, v)|
           if v.is_a?(Array)
-            memo[k.to_s.to_camel_case] = v.map(&:to_s)
+            memo[k.to_s.to_camel_case] = v.map { |value| value.to_s(raw) }
           elsif v.is_a?(Set)
             memo[k.to_s.to_camel_case] = v.to_h
           else
-            memo[k.to_s.to_camel_case] = v.to_s
+            memo[k.to_s.to_camel_case] = v.to_s(raw)
           end
           memo
         end
@@ -42,7 +42,15 @@ module Graphlyte
       
       def to_s(inner = false)
         return "" unless values && !values.empty?
-        arr = values.map do |k,v| 
+        arr = stringify_arguments
+        return arr.join(", ") if inner
+        "(#{arr.join(", ")})"
+      end
+
+      private 
+
+      def stringify_arguments
+        values.map do |k,v|
           if v.is_a?(Array)
             "#{k.to_s.to_camel_case}: [#{v.map(&:to_s).join(", ")}]"
           elsif v.is_a?(Set)
@@ -51,12 +59,8 @@ module Graphlyte
             "#{k.to_s.to_camel_case}: #{v.to_s}"
           end
         end
-        return arr.join(", ") if inner
-        "(#{arr.join(", ")})"
       end
 
-      private 
-
       def expand_arguments(data)
         data.inject({}) do |memo, (k, v)|
           if v.is_a?(Array)

data/lib/graphlyte/arguments/value.rb

@@ -4,17 +4,11 @@ module Graphlyte
     class Value
       using Refinements::StringRefinement
 
-      attr_reader :value, :default
+      attr_reader :value
 
-      def initialize(value, default = nil)
+      def initialize(value)
         raise ArgumentError, "Hash not allowed in this context" if value.is_a? Hash
-        if value.is_a?(Value)
-          @value = value.value
-          @default = value.default
-        else
-          @value = value
-          @default = default
-        end
+        @value = value
       end
 
       def symbol?
@@ -25,10 +19,10 @@ module Graphlyte
         value.is_a? Schema::Types::Base
       end
 
-      def to_s
+      def to_s(raw = false)
         return "$#{value.to_s.to_camel_case}" if value.is_a? Symbol
         return value if value.is_a? Numeric
-        return "\"#{value}\"" if value.is_a? String
+        return "\"#{value}\"" if value.is_a?(String) && !raw
         return "null" if value.nil?
         return "$#{value.placeholder.to_camel_case}" if value.is_a? Schema::Types::Base
         value.to_s

data/lib/graphlyte/query.rb

@@ -19,8 +19,9 @@ module Graphlyte
           str = ":#{value.value.placeholder} of #{value.value.name}"
         end
 
-        if value.default
-          str += " with default #{value.default.to_s}"
+        if value.value.default
+          str += " with default "
+          value.value.default.merge!(str)
         end
         str
       end.join("\n")
@@ -33,11 +34,16 @@ module Graphlyte
       str = "#{type} #{query_name}"
       unless types.empty?
         type_new = types.map do |type_arr|
-          "$#{type_arr[0].to_camel_case}: #{type_arr[1]}"
+          type_str = "$#{type_arr[0].to_camel_case}: #{type_arr[1]}"
+          unless type_arr[2].nil?
+            type_str << " = "
+            type_arr[2].merge!(type_str)
+          end
+          type_str
         end
         str += "(#{type_new.join(", ")})"
       end
-      { query: "#{str} #{to_s(1)}", variables: Arguments::Set.new(hargs).to_h }.to_json
+      { query: "#{str} #{to_s(1)}", variables: Arguments::Set.new(hargs).to_h(true) }.to_json
     end
 
     def to_s(indent=0)
@@ -59,12 +65,12 @@ module Graphlyte
             memo <<  "[#{merge_variable_types(var.value, hargs).first}]"
           end
         else
-          memo << [var.value.placeholder, var.value.name]
+          memo << [var.value.placeholder, var.value.name, var.value.default]
         end
         memo
       end
     end
-    
+
     def format_fragments
       str = "\n"
       flatten(builder.>>).each do |_, fragment|

data/lib/graphlyte/schema/parser.rb

@@ -63,11 +63,7 @@ module Graphlyte
           defaults = parse_default
           key = token[0][1]
           hash = {}
-          if [Array, Hash].include?(value.class)
-            hash[key] = value
-          else
-            hash[key] = Graphlyte::Arguments::Value.new(value, defaults)
-          end
+          hash[key] = value
           hash
         elsif (token = expect(:SPECIAL_ARG_KEY)) && (value = parse_value)
           defaults = parse_default
@@ -76,7 +72,8 @@ module Graphlyte
           if [Array, Hash].include?(value.class)
             arg[token[0][1]] = value
           else
-            arg[token[0][1]] = Graphlyte::Arguments::Value.new(value, defaults)
+            new_val = Schema::Types::Base.new(value, token[0][1], defaults)
+            arg[token[0][1]] = new_val
           end
           @special_args.merge!(arg)
           arg
@@ -89,8 +86,7 @@ module Graphlyte
         elsif token = expect(:SPECIAL_ARG_REF)
           ref = token[0][1]
           raise "Can't find ref $#{ref}" unless @special_args[ref]
-          value = @special_args[ref]
-          Arguments::Value.new(Graphlyte::TYPES.send(value.value, ref.to_sym), value.default)
+          @special_args[ref]
         elsif token = expect(:SPECIAL_ARG_VAL)
           token[0][1]
         elsif token = expect(:ARG_HASH_START)
@@ -108,10 +104,15 @@ module Graphlyte
 
       def parse_arg_hash
         if (key = expect(:ARG_KEY)) && (value = parse_value)
-          need(:ARG_HASH_END)
           hash = {}
           hash[key[0][1]] = value
           hash
+          if new_hash = parse_arg_hash
+            hash.merge!(new_hash)
+          else
+            need(:ARG_HASH_END)
+            hash
+          end
         end
       end
 
@@ -205,6 +206,7 @@ module Graphlyte
 
       def parse_fragment
         if token = expect(:START_FRAGMENT)
+          parse_args
           builder = Builder.new parse_fields
           fragment = Fragment.new(token[0][1], token[0][2], builder: builder)
           @fragments_dictionary[token[0][1]] = fragment
@@ -300,12 +302,12 @@ module Graphlyte
               @tokens << [:END_FRAGMENT]
               pop_state
               pop_context
-            elsif scanner.check /^\s*\{\s*$/
+            elsif scanner.check /^\s*\{\s*/
               if get_context == :field
                 push_state :field
                 push_context :field
               else
-                scanner.scan /^\s*\{\s*$/
+                scanner.scan /^\s*\{\s*/
                 push_context :field
               end
             else
@@ -327,16 +329,16 @@ module Graphlyte
               handle_field
             end
           when :query
-            if scanner.scan /\}/
+            if scanner.scan /\s*\}\s*/
               @tokens << [:END_QUERY]
               pop_state
               pop_context
-            elsif scanner.check /^\s*\{\s*$/
+            elsif scanner.check /^\s*\{\s*/
               if get_context == :field
                 push_state :field
                 push_context :field
               else
-                scanner.scan /^\s*\{\s*$/
+                scanner.scan /^\s*\{\s*/
                 push_context :field
               end
             else
@@ -397,7 +399,8 @@ module Graphlyte
           scanner.scan /\.{3}(\w+)/
           @tokens << [:FRAGMENT_REF, scanner[1]]
           pop_context
-          pop_state if scanner.check /\s*\}\s*\}/
+          # we need to pop state if we are nested in a field, and not in the query context
+          pop_state if get_context == :field
         elsif scanner.scan /\.{3}(\w+)/
           @tokens << [:FRAGMENT_REF, scanner[1]]
         elsif scanner.scan /\s*(\w+):\s*/
@@ -406,7 +409,8 @@ module Graphlyte
           scanner.scan /\s*(\w+)\s*/
           @tokens << [:FIELD_NAME, scanner[1]]
           pop_context
-          pop_state if scanner.check /\s*\}\s*\}/
+          # we need to pop state if we are nested in a field, and not in the query context
+          pop_state if get_context == :field
         elsif scanner.scan /\s*(\w+)\s*/
           @tokens << [:FIELD_NAME, scanner[1]]
         elsif scanner.scan /^\s*\(/

data/lib/graphlyte/schema/types/base.rb

@@ -1,12 +1,52 @@
 module Graphlyte
   module Schema
     module Types
+      class Defaults
+        attr_reader :value
+        def initialize(value)
+          @value = value
+        end
+
+        def merge!(str)
+          parse_value(@value, str)
+        end
+
+        def parse_value(value, str)
+          if value.is_a?(Hash)
+            str << "{ "
+            value.each_with_index do |(k, v), idx|
+              str << "#{k}: "
+              parse_value(v, str)
+              str << ", " if idx < (value.size - 1)
+            end
+            str << " }"
+          elsif value.is_a?(Array)
+            str << "["
+            value.each_with_index do |item, idx|
+              parse_value(item, str)
+              str << ", " if idx < (value.size - 1)
+            end
+            str << "]"
+          elsif value.is_a?(Symbol)
+            str << value.to_s
+          else
+            str << "#{Arguments::Value.new(value).to_s}"
+          end
+        end
+      end
+
       class Base
         attr_reader :name, :placeholder
 
-        def initialize(name, placeholder)
+        def initialize(name, placeholder, defaults=nil)
           @name = name
           @placeholder = placeholder
+          @defaults = defaults
+        end
+
+        def default
+          return nil if @defaults.class == NilClass
+          Defaults.new(@defaults)
         end
       end
     end

data/lib/graphlyte/types.rb

@@ -2,8 +2,8 @@ require_relative "schema/types/base"
 
 module Graphlyte
   class Types
-    def method_missing(method, placeholder)
-      Schema::Types::Base.new(method, placeholder)
+    def method_missing(method, placeholder, default = nil)
+      Schema::Types::Base.new(method, placeholder, default)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphlyte
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Sean Gregory
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec