diff options
Diffstat (limited to 'node_modules/ajv/lib')
-rw-r--r-- | node_modules/ajv/lib/dot/validate.jst | 4 | ||||
-rw-r--r-- | node_modules/ajv/lib/dotjs/validate.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/node_modules/ajv/lib/dot/validate.jst b/node_modules/ajv/lib/dot/validate.jst index f216864a0..896e0860a 100644 --- a/node_modules/ajv/lib/dot/validate.jst +++ b/node_modules/ajv/lib/dot/validate.jst @@ -141,7 +141,7 @@ {{?}} {{? $rulesGroup.type }} } - {{? $typeSchema && $typeSchema === $rulesGroup.type }} + {{? $typeSchema && $typeSchema === $rulesGroup.type && !$coerceToTypes }} {{ var $typeChecked = true; }} else { {{ @@ -161,7 +161,7 @@ {{~}} {{?}} -{{? $typeSchema && !$typeChecked && !(it.opts.coerceTypes && $coerceToTypes) }} +{{? $typeSchema && !$typeChecked && !$coerceToTypes }} {{# def.checkType }} {{# def.error:'type' }} } diff --git a/node_modules/ajv/lib/dotjs/validate.js b/node_modules/ajv/lib/dotjs/validate.js index 961e33b55..0c4112e1d 100644 --- a/node_modules/ajv/lib/dotjs/validate.js +++ b/node_modules/ajv/lib/dotjs/validate.js @@ -238,7 +238,7 @@ module.exports = function generate_validate(it, $keyword) { } if ($rulesGroup.type) { out += ' } '; - if ($typeSchema && $typeSchema === $rulesGroup.type) { + if ($typeSchema && $typeSchema === $rulesGroup.type && !$coerceToTypes) { var $typeChecked = true; out += ' else { '; var $schemaPath = it.schemaPath + '.type', @@ -298,7 +298,7 @@ module.exports = function generate_validate(it, $keyword) { } } } - if ($typeSchema && !$typeChecked && !(it.opts.coerceTypes && $coerceToTypes)) { + if ($typeSchema && !$typeChecked && !$coerceToTypes) { var $schemaPath = it.schemaPath + '.type', $errSchemaPath = it.errSchemaPath + '/type', $method = $typeIsArray ? 'checkDataTypes' : 'checkDataType'; |