From 6db9456d8881cf0ea4d926384c93d25bc0c94978 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 9 Mar 2021 14:31:11 +0100 Subject: util.jsonschema: Restructure "type" keyword handling More in line with the other tests --- teal-src/util/jsonschema.tl | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'teal-src') diff --git a/teal-src/util/jsonschema.tl b/teal-src/util/jsonschema.tl index 3df17477..87269f01 100644 --- a/teal-src/util/jsonschema.tl +++ b/teal-src/util/jsonschema.tl @@ -192,10 +192,6 @@ local function validate(schema : schema_t | type_e | boolean, data : any) : bool end end - if not simple_validate(schema.type, data) then - return false - end - if schema.const ~= nil and schema.const ~= data then return false end @@ -209,12 +205,17 @@ local function validate(schema : schema_t | type_e | boolean, data : any) : bool return false end - local validator = type_validators[schema.type] - if not validator then - return true - end + if schema.type then + if not simple_validate(schema.type, data) then + return false + end - return validator(schema, data) + local validator = type_validators[schema.type] + if validator then + return validator(schema, data) + end + end + return true end end -- cgit v1.2.3