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. --- teal-src/util/jsonschema.tl | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'teal-src') diff --git a/teal-src/util/jsonschema.tl b/teal-src/util/jsonschema.tl index 13537e0a..c6347de6 100644 --- a/teal-src/util/jsonschema.tl +++ b/teal-src/util/jsonschema.tl @@ -37,7 +37,7 @@ local record schema_t format : string -- arrays - items : { schema_t } | schema_t + items : schema_t contains : { schema_t } maxItems : number minItems : number @@ -274,20 +274,12 @@ type_validators.table = function (schema : schema_t, data : any) : boolean return true end - local item_schemas = schema.items as {schema_t} - if item_schemas and item_schemas[1] == nil then - local item_schema = item_schemas as schema_t - for i, v in pairs(data) do - if i is 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