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

util.jsonschema: Implement 'dependentRequired'

Browse source 
If this field exists, then these fields must also exist.
This commit is contained in:
Kim Alvefur 2023-03-26 15:19:14 +02:00
parent 5427c2472d
commit 4bc62438db
3 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
spec/util_jsonschema_spec.lua
View file

@ -19,7 +19,6 @@ local skip = {
["const.json:9"] = "deepcompare",
["contains.json:0:5"] = "distinguishing objects from arrays",
["defs.json"] = "need built-in meta-schema",
["dependentRequired.json"] = "NYI",
["dependentSchemas.json"] = "NYI",
["dynamicRef.json"] = "NYI",
["enum.json:1:3"] = "deepcompare",

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

@ -295,6 +295,18 @@ function complex_validate (schema : json_schema_object, data : any, root : json_
end
end
if schema.dependentRequired then
for k, reqs in pairs(schema.dependentRequired) do
if data[k] ~= nil then
for _, req in ipairs(reqs) do
if data[req] == nil then
return false
end
end
end
end
end
if schema.propertyNames ~= nil then
for k in pairs(data) do
if not validate(schema.propertyNames, k, root) then

12
util/jsonschema.lua
View file

@ -206,6 +206,18 @@ function complex_validate(schema, data, root)
end
end
if schema.dependentRequired then
for k, reqs in pairs(schema.dependentRequired) do
if data[k] ~= nil then
for _, req in ipairs(reqs) do
if data[req] == nil then
return false
end
end
end
end
end
if schema.propertyNames ~= nil then
for k in pairs(data) do
if not validate(schema.propertyNames, k, root) then