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

util.jsonschema: Silence Teal warnings about counting items in tables

Browse source 
Teal thinks that these are key-value maps which are always of length
zero, but that is not the case.
This commit is contained in:
Kim Alvefur 2023-06-17 17:12:54 +02:00
parent 97f85e98f2
commit c8b5d7e99a
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -320,11 +320,11 @@ function complex_validate (schema : json_schema_object, data : any, root : json_
-- validations in this block, which could be useful for validating Lua -- validations in this block, which could be useful for validating Lua
-- tables -- tables
if schema.maxItems and #data > schema.maxItems then if schema.maxItems and #(data as {any}) > schema.maxItems then
return false return false
end end
if schema.minItems and #data < schema.minItems then if schema.minItems and #(data as {any}) < schema.minItems then
return false return false
end end
@ -428,7 +428,7 @@ function complex_validate (schema : json_schema_object, data : any, root : json_
end end
if schema.items ~= nil then if schema.items ~= nil then
for i = p+1, #data do for i = p+1, #(data as {any}) do
if not validate(schema.items, data[i], root) then if not validate(schema.items, data[i], root) then
return false return false
end end
@ -437,7 +437,7 @@ function complex_validate (schema : json_schema_object, data : any, root : json_
if schema.contains ~= nil then if schema.contains ~= nil then
local found = 0 local found = 0
for i = 1, #data do for i = 1, #(data as {any}) do
if validate(schema.contains, data[i], root) then if validate(schema.contains, data[i], root) then
found = found + 1 found = found + 1
end end

8
util/jsonschema.lua
View file

@ -199,11 +199,11 @@ function complex_validate(schema, data, root)
if type(data) == "table" then if type(data) == "table" then
if schema.maxItems and #data > schema.maxItems then if schema.maxItems and #(data) > schema.maxItems then
return false return false
end end
if schema.minItems and #data < schema.minItems then if schema.minItems and #(data) < schema.minItems then
return false return false
end end
@ -303,7 +303,7 @@ function complex_validate(schema, data, root)
end end
if schema.items ~= nil then if schema.items ~= nil then
for i = p + 1, #data do for i = p + 1, #(data) do
if not validate(schema.items, data[i], root) then if not validate(schema.items, data[i], root) then
return false return false
end end
@ -312,7 +312,7 @@ function complex_validate(schema, data, root)
if schema.contains ~= nil then if schema.contains ~= nil then
local found = 0 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 = found + 1 found = found + 1
end end