From 6a7346ac8e06ff00ba016141ccda99b4af83347e Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 9 Mar 2021 02:26:05 +0100 Subject: util.jsonschema: Correct "items" keyword 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. --- util/jsonschema.lua | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'util') diff --git a/util/jsonschema.lua b/util/jsonschema.lua index cc182773..23a47bd7 100644 --- a/util/jsonschema.lua +++ b/util/jsonschema.lua @@ -194,20 +194,12 @@ type_validators.table = function(schema, data) return true end - local item_schemas = schema.items - if item_schemas and item_schemas[1] == nil then - local item_schema = item_schemas - for i, v in pairs(data) do - if type(i) == "number" then - if not validate(item_schema, v) then - return false - end + if schema.items then + for i = 1, #data do + if not validate(schema.items, data[i]) then + return false 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 return true -- cgit v1.2.3