graphql: handle nested inputObjects properly

Closes #223

Author: olegrok

cartridge/graphql/rules.lua

@@ -413,11 +413,6 @@ function rules.variableDefaultValuesHaveCorrectType(node, context)
 end
 
 function rules.variablesAreUsed(node, context)
-  local operationName = node.name and node.name.value or ''
-  if context.skipVariableUseCheck[operationName] then
-    return
-  end
-
   if node.variableDefinitions then
     for _, definition in ipairs(node.variableDefinitions) do
       local variableName = definition.variable.name.value

cartridge/graphql/validate.lua

@@ -260,7 +260,10 @@ local visitors = {
 
     children = function(node)
       return util.map(node.value.values or {}, function(value)
-        return value.value
+        if value.value ~= nil then
+          return value.value
+        end
+        return value
       end)
     end,
 
@@ -277,6 +280,12 @@ local visitors = {
     rules = { rules.uniqueInputObjectFields }
   },
 
+  list = {
+    children = function(node)
+      return node.values
+    end,
+  },
+
   variable = {
     enter = function(node, context)
       context.variableReferences[node.name.value] = true
@@ -300,7 +309,6 @@ local function validate(schema, tree)
     objects = {},
     currentOperation = nil,
     variableReferences = nil,
-    skipVariableUseCheck = {}, -- operation name -> boolean
   }
 
   local function visit(node)

test/integration/graphql_test.lua

@@ -25,6 +25,7 @@ g.before_all = function()
     })
     cluster:start()
 end
+
 g.after_all = function()
     cluster:stop()
     fio.rmtree(cluster.datadir)
@@ -170,6 +171,130 @@ function g.test_reread_request()
     server:graphql({ query = '{}' })
 end
 
+g.test_nested_input = function()
+    local server = cluster.main_server
+
+    server.net_box:eval([[
+        package.loaded['test'] = {}
+        package.loaded['test']['test_nested_InputObject'] = function(root, args)
+          return args.servers[1].field
+        end
+
+        package.loaded['test']['test_nested_list'] = function(root, args)
+          return args.servers[1]
+        end
+
+        package.loaded['test']['test_nested_InputObject_complex'] = function(root, args)
+          return ('%s+%s+%s'):format(args.upvalue, args.servers.field2, args.servers.test.field[1])
+        end
+
+        local graphql = require('cartridge.graphql')
+        local types = require('cartridge.graphql.types')
+
+        local nested_InputObject = types.inputObject {
+            name = 'nested_InputObject',
+            fields = {
+                field = types.string.nonNull,
+            }
+        }
+
+        graphql.add_mutation({
+            name = 'test_nested_InputObject',
+            args = {
+                servers = types.list(nested_InputObject),
+            },
+            kind = types.string,
+            callback = 'test.test_nested_InputObject',
+        })
+
+        graphql.add_mutation({
+            name = 'test_nested_list',
+            args = {
+                servers = types.list(types.string),
+            },
+            kind = types.string,
+            callback = 'test.test_nested_list',
+        })
+
+        graphql.add_callback({
+            name = 'test_nested_InputObject_complex',
+            args = {
+                upvalue = types.string,
+                servers = types.inputObject({
+                    name = 'ComplexInputObject',
+                    fields = {
+                        field2 = types.string,
+                        test = types.inputObject({
+                            name = 'ComplexNestedInputObject',
+                            fields = {
+                                field = types.list(types.string)
+                            }
+                        }),
+                    }
+                }),
+            },
+            kind = types.string,
+            callback = 'test.test_nested_InputObject_complex',
+        })
+    ]])
+
+    t.assert_equals(
+        server:graphql({
+            query = [[
+                mutation($field: String!) {
+                    test_nested_InputObject(
+                        servers: [{ field: $field }]
+                    )
+                }
+            ]],
+        variables = {field = 'echo'}}
+        ).data.test_nested_InputObject, 'echo'
+    )
+
+    t.assert_error_msg_contains('Unused variable "field"', function()
+        server:graphql({
+            query = [[
+                mutation($field: String!) {
+                    test_nested_InputObject(
+                        servers: [{ field: "not-variable" }]
+                    )
+                }
+            ]],
+        variables = {field = 'echo'}}
+        )
+    end)
+
+    t.assert_equals(
+        server:graphql({
+            query = [[
+                mutation($field: String!) {
+                    test_nested_list(
+                        servers: [$field]
+                    )
+                }
+            ]],
+        variables = {field = 'echo'}}
+        ).data.test_nested_list, 'echo'
+    )
+
+    t.assert_equals(
+        server:graphql({
+            query = [[
+                query($field: String! $field2: String! $upvalue: String!) {
+                    test_nested_InputObject_complex(
+                        upvalue: $upvalue,
+                        servers: {
+                            field2: $field2
+                            test: { field: [$field] }
+                        }
+                    )
+                }
+            ]],
+        variables = {field = 'echo', field2 = 'field', upvalue = 'upvalue'}}
+        ).data.test_nested_InputObject_complex, 'upvalue+field+echo'
+    )
+end
+
 function g.test_fail_validate()
     t.assert_error_msg_contains('Scalar field "uri" cannot have subselections', function()
         cluster.main_server:graphql({