aboutsummaryrefslogtreecommitdiff
path: root/node_modules/ajv/lib/dotjs/oneOf.js
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-08-14 05:01:11 +0200
committerFlorian Dold <florian.dold@gmail.com>2017-08-14 05:02:09 +0200
commit363723fc84f7b8477592e0105aeb331ec9a017af (patch)
tree29f92724f34131bac64d6a318dd7e30612e631c7 /node_modules/ajv/lib/dotjs/oneOf.js
parent5634e77ad96bfe1818f6b6ee70b7379652e5487f (diff)
node_modules
Diffstat (limited to 'node_modules/ajv/lib/dotjs/oneOf.js')
-rw-r--r--node_modules/ajv/lib/dotjs/oneOf.js16
1 files changed, 5 insertions, 11 deletions
diff --git a/node_modules/ajv/lib/dotjs/oneOf.js b/node_modules/ajv/lib/dotjs/oneOf.js
index 39f60e620..b4cd46065 100644
--- a/node_modules/ajv/lib/dotjs/oneOf.js
+++ b/node_modules/ajv/lib/dotjs/oneOf.js
@@ -1,5 +1,5 @@
'use strict';
-module.exports = function generate_oneOf(it, $keyword) {
+module.exports = function generate_oneOf(it, $keyword, $ruleType) {
var out = ' ';
var $lvl = it.level;
var $dataLvl = it.dataLevel;
@@ -41,10 +41,7 @@ module.exports = function generate_oneOf(it, $keyword) {
}
}
it.compositeRule = $it.compositeRule = $wasComposite;
- out += '' + ($closingBraces) + 'if (!' + ($valid) + ') { ';
- var $$outStack = $$outStack || [];
- $$outStack.push(out);
- out = ''; /* istanbul ignore else */
+ out += '' + ($closingBraces) + 'if (!' + ($valid) + ') { var err = '; /* istanbul ignore else */
if (it.createErrors !== false) {
out += ' { keyword: \'' + ('oneOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
if (it.opts.messages !== false) {
@@ -57,16 +54,13 @@ module.exports = function generate_oneOf(it, $keyword) {
} else {
out += ' {} ';
}
- var __err = out;
- out = $$outStack.pop();
+ out += '; if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
if (it.async) {
- out += ' throw new ValidationError([' + (__err) + ']); ';
+ out += ' throw new ValidationError(vErrors); ';
} else {
- out += ' validate.errors = [' + (__err) + ']; return false; ';
+ out += ' validate.errors = vErrors; return false; ';
}
- } else {
- out += ' var err = ' + (__err) + '; if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
}
out += '} else { errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; }';
if (it.opts.allErrors) {