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: Implement 'minContains' and 'maxContains'

Browse source
This commit is contained in:
Kim Alvefur 2023-04-23 10:26:43 +02:00
parent d78a32f136
commit 3621b8ce91
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/util_jsonschema_spec.lua
View file

@ -22,10 +22,8 @@ local skip = {
["dynamicRef.json"] = "NYI", ["dynamicRef.json"] = "NYI",
["enum.json:1:3"] = "deepcompare", ["enum.json:1:3"] = "deepcompare",
["id.json"] = "NYI", ["id.json"] = "NYI",
["maxContains.json"] = "NYI",
["maxLength.json:0:4"] = "UTF-16", ["maxLength.json:0:4"] = "UTF-16",
["maxProperties.json"] = "NYI", ["maxProperties.json"] = "NYI",
["minContains.json"] = "NYI",
["minLength.json:0:4"] = "UTF-16", ["minLength.json:0:4"] = "UTF-16",
["minProperties.json"] = "NYI", ["minProperties.json"] = "NYI",
["multipleOf.json:1"] = "multiples of IEEE 754 fractions", ["multipleOf.json:1"] = "multiples of IEEE 754 fractions",

11
teal-src/prosody/util/jsonschema.tl
View file

@ -84,8 +84,8 @@ local record json_schema_object
maxItems : integer maxItems : integer
minItems : integer minItems : integer
uniqueItems : boolean uniqueItems : boolean
maxContains : integer -- NYI maxContains : integer
minContains : integer -- NYI minContains : integer
-- objects -- objects
maxProperties : integer -- NYI maxProperties : integer -- NYI
@ -429,14 +429,13 @@ function complex_validate (schema : json_schema_object, data : any, root : json_
end end
if schema.contains ~= nil then if schema.contains ~= nil then
local found = false local found = 0
for i = 1, #data do for i = 1, #data do
if validate(schema.contains, data[i], root) then if validate(schema.contains, data[i], root) then
found = true found = found + 1
break
end end
end end
if not found then if found < (schema.minContains or 1) or found > (schema.maxContains or math.huge) then
return false return false
end end
end end

7
util/jsonschema.lua
View file

@ -305,14 +305,13 @@ function complex_validate(schema, data, root)
end end
if schema.contains ~= nil then if schema.contains ~= nil then
local found = false local found = 0
for i = 1, #data do for i = 1, #data do
if validate(schema.contains, data[i], root) then if validate(schema.contains, data[i], root) then
found = true found = found + 1
break
end end
end end
if not found then if found < (schema.minContains or 1) or found > (schema.maxContains or math.huge) then
return false return false
end end
end end