mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.jsonschema: Restructure "type" keyword handling

Browse source 
More in line with the other tests
This commit is contained in:
Kim Alvefur 2021-03-09 14:31:11 +01:00
parent 44edd47ca8
commit 6db9456d88
2 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
util/jsonschema.lua
View file

@ -110,10 +110,6 @@ local function validate(schema, data)
end
end
if not simple_validate(schema.type, data) then
return false
end
if schema.const ~= nil and schema.const ~= data then
return false
end
@ -127,12 +123,17 @@ local function validate(schema, data)
return false
end
local validator = type_validators[schema.type]
if not validator then
return true
end
if schema.type then
if not simple_validate(schema.type, data) then
return false
end
return validator(schema, data)
local validator = type_validators[schema.type]
if validator then
return validator(schema, data)
end
end
return true
end
end