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

util.jsonschema: Correct "items" keyword

Browse source 
Upon re-reading the JSON Schema spec, I found that 'items' wasn't a
union of an array of schemas or a single schema, not sure where I got
that from.
This commit is contained in:
Kim Alvefur 2021-03-09 02:26:05 +01:00
parent 07889f274d
commit 6a7346ac8e
2 changed files with 9 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
teal-src/util/jsonschema.tl
View file

@ -37,7 +37,7 @@ local record schema_t
format : string format : string
-- arrays -- arrays
items : { schema_t } | schema_t items : schema_t
contains : { schema_t } contains : { schema_t }
maxItems : number maxItems : number
minItems : number minItems : number
@ -274,20 +274,12 @@ type_validators.table = function (schema : schema_t, data : any) : boolean
return true return true
end end
local item_schemas = schema.items as {schema_t} if schema.items then
if item_schemas and item_schemas[1] == nil then for i = 1, #data do
local item_schema = item_schemas as schema_t if not validate(schema.items, data[i]) then
for i, v in pairs(data) do return false
if i is number then
if not validate(item_schema, v) then
return false
end
end end
end end
elseif item_schemas and item_schemas[1] ~= nil then
for i, s in ipairs(item_schemas) do
validate(s, data[i])
end
end end
return true return true

16
util/jsonschema.lua
View file

@ -194,20 +194,12 @@ type_validators.table = function(schema, data)
return true return true
end end
local item_schemas = schema.items if schema.items then
if item_schemas and item_schemas[1] == nil then for i = 1, #data do
local item_schema = item_schemas if not validate(schema.items, data[i]) then
for i, v in pairs(data) do return false
if type(i) == "number" then
if not validate(item_schema, v) then
return false
end
end end
end end
elseif item_schemas and item_schemas[1] ~= nil then
for i, s in ipairs(item_schemas) do
validate(s, data[i])
end
end end
return true return true