Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion graphql/schema.lua
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ function schema:generateDirectiveMap()
if argumentType == nil then
error('Must supply type for argument "' .. name .. '" on "' .. directive.name .. '"')
end
argumentType.defaultValue = argument.defaultValue
self:generateTypeMap(argumentType)
end
end
Expand Down
67 changes: 67 additions & 0 deletions test/integration/graphql_test.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1804,3 +1804,70 @@ function g.test_skip_include_directives()
t.assert_equals(errors, nil)
t.assert_items_equals(data, {test = {uri = "uri1", uris = {uri = "uri2"}}})
end

-- test simultaneous usage of mutation and directive default values
function g.test_mutation_and_directive_arguments_default_values()
local function callback(_, _)
return nil
end

local mutation_schema = {
['test_mutation'] = {
kind = types.string.nonNull,
arguments = {
object_arg = {
kind = types.inputObject({
name = 'test_input_object',
fields = {
nested = {
kind = types.string,
defaultValue = 'default Value',
},
},
kind = types.string,
}),
},
mutation_arg = {
kind = types.int,
defaultValue = 1,
},

},
resolve = callback,
}
}

local directives = {
types.directive({
schema = schema,
name = 'timeout',
description = 'Request execute timeout',
arguments = {
seconds = {
kind = types.int,
description = 'Request timeout (in seconds). Default: 1 second',
defaultValue = 1,
},
},
onField = true,
})
}

local root = {
query = types.object({
name = 'Query',
fields = {},
}),
mutation = types.object({
name = 'Mutation',
fields = mutation_schema or {},
}),
directives = directives,
}

local compiled_schema = schema.create(root, test_schema_name)

-- test that schema.typeMap is not corrupted when both mutation and
-- directive default values used on the same argument type
t.assert_equals(compiled_schema.typeMap['Int'].defaultValue, nil)
end