From 1317e78fbb50d585d3f0aa55262690db8c096026 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 9 Mar 2021 02:43:50 +0100 Subject: util.jsonschema: Implement "propertyNames" This is a bit special in Lua as tables are not limited to string keys --- teal-src/util/jsonschema.tl | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'teal-src/util') diff --git a/teal-src/util/jsonschema.tl b/teal-src/util/jsonschema.tl index d359207b..9600fee4 100644 --- a/teal-src/util/jsonschema.tl +++ b/teal-src/util/jsonschema.tl @@ -54,6 +54,7 @@ local record schema_t dependentRequired : { string : { string } } additionalProperties: schema_t patternProperties: schema_t + propertyNames : schema_t -- xml record xml_t @@ -239,6 +240,9 @@ type_validators.table = function (schema : schema_t, data : any) : boolean if schema.properties then local additional : schema_t | boolean = schema.additionalProperties or true for k, v in pairs(data) do + if schema.propertyNames and not validate(schema.propertyNames, k) then + return false + end local s = schema.properties[k as string] or additional as schema_t if not validate(s, v) then return false @@ -246,6 +250,9 @@ type_validators.table = function (schema : schema_t, data : any) : boolean end elseif schema.additionalProperties then for k, v in pairs(data) do + if schema.propertyNames and not validate(schema.propertyNames, k) then + return false + end if not validate(schema.additionalProperties, v) then return false end -- cgit v1.2.3