Merge pull request #267 from goco-inc/alt-consistent-default-values

Alternative: Make default_value behavior consistent

Author: Robert Mosolgo

graphql.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "codeclimate-test-reporter", "~>0.4"
   s.add_development_dependency "pry", "~> 0.10"
+  s.add_development_dependency 'pry-stack_explorer'
   s.add_development_dependency "guard", "~> 2.12"
   s.add_development_dependency "guard-bundler", "~> 2.1"
   s.add_development_dependency "guard-minitest", "~> 2.4"

lib/graphql/input_object_type.rb

@@ -87,5 +87,19 @@ def coerce_non_null_input(value)
 
       GraphQL::Query::Arguments.new(input_values)
     end
+
+    def coerce_result(value)
+      # Allow the application to provide values as :symbols, and convert them to the strings
+      value = value.reduce({}) { |memo, (k, v)| memo[k.to_s] = v; memo }
+
+      result = {}
+
+      arguments.each do |input_key, input_field_defn|
+        input_value = value[input_key]
+        result[input_key] = input_value.nil? ? nil : input_field_defn.type.coerce_result(input_value)
+      end
+
+      result
+    end
   end
 end

lib/graphql/introspection/input_value_type.rb

@@ -7,11 +7,7 @@
   field :defaultValue, types.String, "The value applied if no other value is provided" do
     resolve -> (obj, args, ctx) {
       value = obj.default_value
-      if value.is_a?(String)
-        "\"#{value}\""
-      else
-        value
-      end
+      value.nil? ? nil : JSON.dump(obj.type.coerce_result(value))
     }
   end
 end

lib/graphql/list_type.rb

@@ -53,7 +53,11 @@ def validate_non_null_input(value)
     end
 
     def coerce_non_null_input(value)
-      ensure_array(value).map{ |item| of_type.coerce_input(item) }
+      ensure_array(value).map { |item| of_type.coerce_input(item) }
+    end
+
+    def coerce_result(value)
+      ensure_array(value).map { |item| item.nil? ? nil : of_type.coerce_result(item) }
     end
 
     private

lib/graphql/non_null_type.rb

@@ -57,6 +57,10 @@ def coerce_input(value)
       of_type.coerce_input(value)
     end
 
+    def coerce_result(value)
+      of_type.coerce_result(value)
+    end
+
     def kind
       GraphQL::TypeKinds::NON_NULL
     end

lib/graphql/query/literal_input.rb

@@ -16,7 +16,7 @@ def self.from_arguments(ast_arguments, argument_defns, variables)
         values_hash = {}
         argument_defns.each do |arg_name, arg_defn|
           ast_arg = ast_arguments.find { |ast_arg| ast_arg.name == arg_name }
-          arg_default_value = arg_defn.type.coerce_input(arg_defn.default_value)
+          arg_default_value = arg_defn.default_value
           if ast_arg.nil? && arg_default_value.nil?
             # If it wasn't in the document,
             # and there's no provided default,

lib/graphql/scalar_type.rb

@@ -62,7 +62,7 @@ def coerce_input=(proc)
 
     def coerce_result(value)
       ensure_defined
-      @coerce_result_proc.call(value)
+      @coerce_result_proc ? @coerce_result_proc.call(value) : value
     end
 
     def coerce_result=(proc)

lib/graphql/schema/loader.rb

@@ -58,7 +58,7 @@ def define_type(type, type_resolver)
                   name: enum["name"],
                   description: enum["description"],
                   deprecation_reason: enum["deprecationReason"],
-                  value: enum["value"]
+                  value: enum["name"]
                 )
               })
           when "INTERFACE"
@@ -102,7 +102,7 @@ def define_type(type, type_resolver)
               name: type["name"],
               type: type_resolver.call(type["type"]),
               description: type["description"],
-              default_value: type["defaultValue"]
+              default_value: type["defaultValue"] ? JSON.parse(type["defaultValue"], quirks_mode: true) : nil
             )
           when "SCALAR"
             case type.fetch("name")

lib/graphql/schema/validation.rb

@@ -100,9 +100,16 @@ def self.assert_named_items_are_valid(item_name, get_items_proc)
 
         DEFAULT_VALUE_IS_VALID_FOR_TYPE = -> (type) {
           if !type.default_value.nil?
-            coerced_value = type.type.coerce_input(type.default_value)
-            if coerced_value.nil?
-              "default value #{type.default_value.inspect} is not valid for type #{type.type}"
+            coerced_value = begin
+              type.type.coerce_result(type.default_value)
+            rescue => ex
+              ex
+            end
+
+            if coerced_value.nil? || coerced_value.is_a?(StandardError)
+              msg = "default value #{type.default_value.inspect} is not valid for type #{type.type}"
+              msg += " (#{coerced_value})" if coerced_value.is_a?(StandardError)
+              msg
             end
           end
         }

spec/graphql/argument_spec.rb

@@ -15,7 +15,7 @@
     }
 
     expected_error = %|Query is invalid: field "invalid" argument "invalid" default value ["123"] is not valid for type Float|
-    assert_equal expected_error, err.message
+    assert_includes err.message, expected_error
   end
 
   it "accepts proc type" do