graphlyte 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25e9370260ac88d2a810c879bf663c4965340c6838e8e19b18f19309d81ffec1
-  data.tar.gz: dc7c5ba7909fb9f4615021e07e819771f66a0d73ba8cc5772928cb896808b2e8
+  metadata.gz: 4993b6b7dba33932ac40eff10ac57644a120ee41d23df9408d70ea3c5fe12aec
+  data.tar.gz: f7fba13051b20ad335936347753ec3507b113852bcbdd4c5ad62ac3b127496ec
 SHA512:
-  metadata.gz: 77b742ef11daf4270c22e9ede3ae848dfb0d81a6ad4717c7a6a75ffa88ecf9f688630aa1348d7b8092d0096314596ccef9a34d95ef87486f2292481795763669
-  data.tar.gz: 53c19eab7a95e2ee2b4d5f2d9412560035c511c5be12bc8af443cad6f742aea36aa34ffffc5242cc58fe9ab685f0465f1e67344905f5baadd196a4b0552148d2
+  metadata.gz: 3bab812cb94fd2abeb816180683297c4c95f1486368a5f3029a9917fcf4dcf505d8b6c82777ef4574f550fdc8cd6f0878a92bebcbeb09702b3d832f664e4a0fa
+  data.tar.gz: cbbfbbff19e0f789d09b01e8581ded8892601b85710b9c9a84ffcc9e393c1ef69aa27c094deb2a81a23078614982519d6ee0f8047ff63d3f1991fddab764a39f

data/lib/graphlyte/arguments/set.rb

@@ -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?

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,7 +34,12 @@ 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
@@ -59,7 +65,7 @@ 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

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
 

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

@@ -1,12 +1,50 @@
 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 << "]"
+          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

metadata

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