Merge pull request #4324 from rmosolgo/fix-json-hash-nils

Fix nils in JSON Type hash values

lib/graphql/static_validation/literal_validator.rb

@@ -22,11 +22,8 @@ def replace_nulls_in(ast_value)
         case ast_value
         when Array
           ast_value.map { |v| replace_nulls_in(v) }
-        when Hash
-          new_v = {}
-          ast_value.each do |k, v|
-            new_v[k] = replace_nulls_in(v)
-          end
+        when GraphQL::Language::Nodes::InputObject
+          ast_value.to_h
         when GraphQL::Language::Nodes::NullValue
           nil
         else

spec/graphql/schema/build_from_definition_spec.rb

@@ -1678,7 +1678,12 @@ def call(parent_type, field, object, args, context)
       end
 
       def coerce_input(type, value, ctx)
-        (ctx[:nils] ||= []).push(value[2])
+        nils = ctx[:nils] ||= []
+        if value.is_a?(Array)
+          nils << value[2]
+        else
+          nils << value["abc"]
+        end
         ::JSON.generate(value)
       end
 
@@ -1707,6 +1712,23 @@ def coerce_result(type, value, ctx)
       assert_equal([3, "abc", nil, 7], res_2["data"]["echoJsonValue"])
       assert_equal [nil, nil], res_2.context[:nils]
 
+      res_3 = app.execute_query(<<~EOS, arg: { "abc" => nil, "def" => 7 })
+      query WithArg($arg: JsonValue) {
+        echoJsonValue(arg: $arg)
+      }
+      EOS
+
+      assert_equal({ "abc" => nil, "def" => 7 }, res_3["data"]["echoJsonValue"])
+      assert_equal [nil, nil], res_3.context[:nils]
+
+      res_4 = app.execute_query(<<~EOS)
+      query {
+        echoJsonValue(arg: { abc: null, def: 7, ghi: { jkl: null } })
+      }
+      EOS
+
+      assert_equal({ "abc" => nil, "def" => 7, "ghi"=>{"jkl"=>nil} }, res_4["data"]["echoJsonValue"])
+      assert_equal [nil, nil], res_4.context[:nils]
     end
   end
 end