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 handling of "properties" and "additionalProperties"

Browse source 
This is a bit cleaner, I think
This commit is contained in:
Kim Alvefur 2021-03-09 02:41:47 +01:00
parent ae40825925
commit d8303be145
2 changed files with 16 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -237,31 +237,17 @@ type_validators.table = function (schema : schema_t, data : any) : boolean
end
if schema.properties then
for k, s in pairs(schema.properties) do
if data[k] ~= nil then
if not validate(s, data[k]) then
return false
end
end
end
end
if schema.additionalProperties then
local additional : schema_t | boolean = schema.additionalProperties or true
for k, v in pairs(data) do
if k is string then
if not (schema.properties and schema.properties[k]) then
if not validate(schema.additionalProperties, v) then
return false
end
end
local s = schema.properties[k as string] or additional as schema_t
if not validate(s, v) then
return false
end
end
elseif schema.properties then
for k in pairs(data) do
if k is string then
if schema.properties[k] == nil then
return false
end
elseif schema.additionalProperties then
for k, v in pairs(data) do
if not validate(schema.additionalProperties, v) then
return false
end
end
end

30
util/jsonschema.lua
View file

@ -156,31 +156,17 @@ type_validators.table = function(schema, data)
end
if schema.properties then
for k, s in pairs(schema.properties) do
if data[k] ~= nil then
if not validate(s, data[k]) then
return false
end
end
end
end
if schema.additionalProperties then
local additional = schema.additionalProperties or true
for k, v in pairs(data) do
if type(k) == "string" then
if not (schema.properties and schema.properties[k]) then
if not validate(schema.additionalProperties, v) then
return false
end
end
local s = schema.properties[k] or additional
if not validate(s, v) then
return false
end
end
elseif schema.properties then
for k in pairs(data) do
if type(k) == "string" then
if schema.properties[k] == nil then
return false
end
elseif schema.additionalProperties then
for k, v in pairs(data) do
if not validate(schema.additionalProperties, v) then
return false
end
end
end