alex/yomichan
1
Fork 0
Code Releases Activity

Improve support for array schemas

Browse Source
This commit is contained in:
toasted-nutbread 2020-01-26 12:34:27 -05:00
parent a844698f15
commit 980a1ddf74
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ext/bg/js/json-schema.js
View File

@ -149,7 +149,23 @@ class JsonSchemaProxyHandler {
case 'array':
{
const items = schema.items;
return JsonSchemaProxyHandler.isObject(items) ? items : null;
if (JsonSchemaProxyHandler.isObject(items)) {
return items;
}
if (Array.isArray(items)) {
if (property >= 0 && property < items.length) {
return items[property];
}
}
const additionalItems = schema.additionalItems;
if (additionalItems === false) {
return null;
} else if (JsonSchemaProxyHandler.isObject(additionalItems)) {
return additionalItems;
} else {
return JsonSchemaProxyHandler._unconstrainedSchema;
}
}
default:
return null;
@ -322,6 +338,18 @@ class JsonSchemaProxyHandler {
return 'Array length too long';
}
for (let i = 0, ii = value.length; i < ii; ++i) {
const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, i, value);
if (propertySchema === null) {
return `No schema found for array[${i}]`;
}
const error = JsonSchemaProxyHandler.validate(value[i], propertySchema);
if (error !== null) {
return error;
}
}
return null;
}