Skip to content

feat: Clarify numerical validation errors #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 20, 2021
Merged

feat: Clarify numerical validation errors #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3a605e
Clarify numerical validation errors
ypnos Feb 22, 2021
e8a71cf
Avoid closure for better performance
ypnos Apr 19, 2021
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
32 changes: 11 additions & 21 deletions lib/jsonschema.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,13 @@ local function to_lua_code(var)
return code .. "}"
end

local function addRangeCheck(ctx, op, reference, msg)
ctx:stmt(sformat(' if %s %s %s then', ctx:param(1), op, reference))
ctx:stmt(sformat(' return false, %s("expected %%s to be %s %s", %s)',
ctx:libfunc('string.format'), msg, reference, ctx:param(1)))
ctx:stmt( ' end')
end

generate_validator = function(ctx, schema)
-- get type informations as they will be necessary anyway
local datatype = ctx:localvartab(sformat('%s(%s)',
Expand Down Expand Up @@ -896,33 +903,16 @@ generate_validator = function(ctx, schema)
ctx:stmt(sformat('if %s == "number" then', datatype))

if schema.minimum then
local op = '<'
local msg = 'greater'
ctx:stmt(sformat(' if %s %s %s then', ctx:param(1), op, schema.minimum))
ctx:stmt(sformat(' return false, %s("expected %%s to be %s than %s", %s)',
ctx:libfunc('string.format'), msg, schema.minimum, ctx:param(1)))
ctx:stmt( ' end')
addRangeCheck(ctx, '<', schema.minimum, 'at least')
end

if schema.exclusiveMinimum then
ctx:stmt(sformat(' if %s %s %s then', ctx:param(1), "<=", schema.exclusiveMinimum))
ctx:stmt(sformat(' return false, %s("expected %%s to be %s than %s", %s)',
ctx:libfunc('string.format'), 'strictly greater', schema.exclusiveMinimum, ctx:param(1)))
ctx:stmt( ' end')
addRangeCheck(ctx, '<=', schema.exclusiveMinimum, 'greater than')
end

if schema.maximum then
ctx:stmt(sformat(' if %s %s %s then', ctx:param(1), ">", schema.maximum))
ctx:stmt(sformat(' return false, %s("expected %%s to be %s than %s", %s)',
ctx:libfunc('string.format'), "smaller", schema.maximum, ctx:param(1)))
ctx:stmt( ' end')
addRangeCheck(ctx, '>', schema.maximum, 'at most')
end

if schema.exclusiveMaximum then
ctx:stmt(sformat(' if %s %s %s then', ctx:param(1), ">=", schema.exclusiveMaximum))
ctx:stmt(sformat(' return false, %s("expected %%s to be %s than %s", %s)',
ctx:libfunc('string.format'), 'strictly smaller', schema.exclusiveMaximum, ctx:param(1)))
ctx:stmt( ' end')
addRangeCheck(ctx, '>=', schema.exclusiveMaximum, 'smaller than')
end

local mof = schema.multipleOf
Expand Down