alex/yomichan
1
Fork 0
Code Releases Activity

Add simplified isObject test

Browse Source
This commit is contained in:
toasted-nutbread 2020-01-26 11:06:03 -05:00
parent f23e0c9c95
commit 0b474751b5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,19 +131,19 @@ class JsonSchemaProxyHandler {
case 'object': case 'object':
{ {
const properties = schema.properties; const properties = schema.properties;
if (properties !== null && typeof properties === 'object' && !Array.isArray(properties)) { if (JsonSchemaProxyHandler.isObject(properties)) {
if (Object.prototype.hasOwnProperty.call(properties, property)) { if (Object.prototype.hasOwnProperty.call(properties, property)) {
return properties[property]; return properties[property];
} }
} }
const additionalProperties = schema.additionalProperties; const additionalProperties = schema.additionalProperties;
return (additionalProperties !== null && typeof additionalProperties === 'object' && !Array.isArray(additionalProperties)) ? additionalProperties : null; return JsonSchemaProxyHandler.isObject(additionalProperties) ? additionalProperties : null;
} }
case 'array': case 'array':
{ {
const items = schema.items; const items = schema.items;
return (items !== null && typeof items === 'object' && !Array.isArray(items)) ? items : null; return JsonSchemaProxyHandler.isObject(items) ? items : null;
} }
default: default:
return null; return null;
@ -399,6 +399,10 @@ class JsonSchemaProxyHandler {
return value; return value;
} }
static isObject(value) {
return typeof value === 'object' && value !== null && !Array.isArray(value);
}
} }
class JsonSchema { class JsonSchema {