Skip to content

fix enum validation type 'array', add path to error for nested props, fix cast for the case when 'type' is an array #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

fix enum validation type 'array', add path to error for nested props, fix cast for the case when 'type' is an array #44

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5e0fa81
fix enum validation when type is array
leonidaz Apr 16, 2013
06e7bef
add path to error object for nested properties
leonidaz Apr 17, 2013
7d7c55c
fix cast for the case when 'type' is an array
leonidaz Apr 18, 2013
8217163
add support for path in errors for arrays of objects
leonidaz Apr 21, 2013
b15f05c
added default error message for 'additionalProperties'
leonidaz Oct 17, 2013
6f9d69e
add object (data to check) to conform
leonidaz Oct 17, 2013
9c73e6d
add recursive check for children when parent property is missing of t…
leonidaz Oct 18, 2013
4207b6a
minor adjustment to previous commit to make sure schema type == 'array'
leonidaz Oct 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 56 additions & 30 deletions lib/revalidator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@
uniqueItems: "must hold a unique set of values",
format: "is not a valid %{expected}",
conform: "must conform to given constraint",
type: "must be of %{expected} type"
type: "must be of %{expected} type",
additionalProperties: "extra properties are not allowed"
};
validate.messages['enum'] = "must be present in given enumerator";

Expand Down Expand Up @@ -158,7 +159,7 @@
return obj;
};

function validateObject(object, schema, options, errors) {
function validateObject(object, schema, options, errors, path) {
var props, allProps = Object.keys(object),
visitedProps = [];

Expand All @@ -168,7 +169,7 @@
for (var p in props) {
if (props.hasOwnProperty(p)) {
visitedProps.push(p);
validateProperty(object, object[p], p, props[p], options, errors);
validateProperty(object, object[p], p, props[p], options, errors, path);
}
}
}
Expand All @@ -185,7 +186,7 @@
if (object.hasOwnProperty(k)) {
visitedProps.push(k);
if (re.exec(k) !== null) {
validateProperty(object, object[k], p, props[p], options, errors);
validateProperty(object, object[k], p, props[p], options, errors, path);
}
}
}
Expand All @@ -204,51 +205,65 @@
// Prevent additional properties; each unvisited property is therefore an error
if (schema.additionalProperties === false && unvisitedProps.length > 0) {
for (i = 0, l = unvisitedProps.length; i < l; i++) {
error("additionalProperties", unvisitedProps[i], object[unvisitedProps[i]], false, errors);
error("additionalProperties", unvisitedProps[i], object[unvisitedProps[i]], false, errors, path);
}
}
// additionalProperties is a schema and validate unvisited properties against that schema
else if (typeof schema.additionalProperties == "object" && unvisitedProps.length > 0) {
for (i = 0, l = unvisitedProps.length; i < l; i++) {
validateProperty(object, object[unvisitedProps[i]], unvisitedProps[i], schema.unvisitedProperties, options, errors);
validateProperty(object, object[unvisitedProps[i]], unvisitedProps[i], schema.unvisitedProperties, options, errors, path);
}
}
}

};

function validateProperty(object, value, property, schema, options, errors) {
function validateProperty(object, value, property, schema, options, errors, path) {
var format,
valid,
spec,
type;

function constrain(name, value, assert) {
if (schema[name] !== undefined && !assert(value, schema[name])) {
error(name, property, value, schema, errors);
error(name, property, value, schema, errors, path);
}
}

if (value === undefined) {
if (schema.required && schema.type !== 'any') {
return error('required', property, undefined, schema, errors);
error('required', property, undefined, schema, errors, path);

if (schema.properties || schema.patternProperties || schema.additionalProperties) {
validateObject({}, schema, options, errors, (!path ? property : path) + ".");
}
else if(schema.items && schema.items.properties){
checkType([], schema.type, function(err, type){
if(!err && type=='array'){
validateObject({}, schema.items, options, errors, (!path ? property : path) + "[0].");
}
});
}
return;
} else {
return;
}
}

if (options.cast) {
if (('integer' === schema.type || 'number' === schema.type) && value == +value) {
value = +value;
}

if ('boolean' === schema.type) {
if ('true' === value || '1' === value || 1 === value) {
value = true;
if(schema.type !== undefined && schema.type !== null){
if((schema.type.indexOf('integer') > -1 || schema.type.indexOf('number') > -1) && value == +value){
value = +value;
}

if ('false' === value || '0' === value || 0 === value) {
value = false;
if (schema.type.indexOf('boolean') > -1){
if ('true' === value || '1' === value || 1 === value) {
value = true;
}

if ('false' === value || '0' === value || 0 === value) {
value = false;
}
}
}
}
Expand All @@ -260,30 +275,40 @@
if (!spec) { spec = validate.formats[format] }
if (!spec) {
if (options.validateFormatsStrict) {
return error('format', property, value, schema, errors);
return error('format', property, value, schema, errors, path);
}
}
else {
if (!spec.test(value)) {
return error('format', property, value, schema, errors);
return error('format', property, value, schema, errors, path);
}
}
}

if (schema['enum'] && schema['enum'].indexOf(value) === -1) {
error('enum', property, value, schema, errors);
if (schema['enum']){
if(schema['type']=='array' && isArray(value)){
for(var i=0; i<value.length; i++){
if(schema['enum'].indexOf(value[i]) === -1){
error('enum', property, value, schema, errors, path);
break;
}
}
}
else if(schema['enum'].indexOf(value) === -1){
error('enum', property, value, schema, errors, path);
}
}

// Dependencies (see 5.8)
if (typeof schema.dependencies === 'string' &&
object[schema.dependencies] === undefined) {
error('dependencies', property, null, schema, errors);
error('dependencies', property, null, schema, errors, path);
}

if (isArray(schema.dependencies)) {
for (var i = 0, l = schema.dependencies.length; i < l; i++) {
if (object[schema.dependencies[i]] === undefined) {
error('dependencies', property, null, schema, errors);
error('dependencies', property, null, schema, errors, path);
}
}
}
Expand All @@ -293,9 +318,9 @@
}

checkType(value, schema.type, function(err, type) {
if (err) return error('type', property, typeof value, schema, errors);
if (err) return error('type', property, typeof value, schema, errors, path);

constrain('conform', value, function (a, e) { return e(a) });
constrain('conform', value, function (a, e) { return e(a, object) });

switch (type || (isArray(value) ? 'array' : typeof value)) {
case 'string':
Expand Down Expand Up @@ -323,7 +348,7 @@
case 'array':
constrain('items', value, function (a, e) {
for (var i = 0, l = a.length; i < l; i++) {
validateProperty(object, a[i], property, e, options, errors);
validateProperty(object, a[i], property, e, options, errors, (!path ? property : path) + "[" + i + "]");
}
return true;
});
Expand All @@ -344,7 +369,7 @@
case 'object':
// Recursive validation
if (schema.properties || schema.patternProperties || schema.additionalProperties) {
validateObject(value, schema, options, errors);
validateObject(value, schema, options, errors, (!path ? property : path) + ".");
}
break;
}
Expand Down Expand Up @@ -378,7 +403,7 @@
callback(true);
};

function error(attribute, property, actual, schema, errors) {
function error(attribute, property, actual, schema, errors, path) {
var lookup = { expected: schema[attribute], attribute: attribute, property: property };
var message = schema.messages && schema.messages[attribute] || schema.message || validate.messages[attribute] || "no default message";
message = message.replace(/%\{([a-z]+)\}/ig, function (_, match) { return lookup[match.toLowerCase()] || ''; });
Expand All @@ -387,7 +412,8 @@
property: property,
expected: schema[attribute],
actual: actual,
message: message
message: message,
path: path ? path + property : undefined
});
};

Expand Down