diff options
| author | cjihrig <cjihrig@gmail.com> | 2019-07-21 00:15:32 -0400 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-07-22 22:32:11 -0700 |
| commit | e5736d817c93ff9ac88c24d9e6a247a0f057a266 (patch) | |
| tree | ca899e9f333880f500f060c424d37992b2b63fd2 /tools/node_modules/eslint/node_modules/ajv/lib/dotjs/anyOf.js | |
| parent | 9949fbda469e70acc45975f5e50eedd2a3cde57d (diff) | |
| download | android-node-v8-e5736d817c93ff9ac88c24d9e6a247a0f057a266.tar.gz android-node-v8-e5736d817c93ff9ac88c24d9e6a247a0f057a266.tar.bz2 android-node-v8-e5736d817c93ff9ac88c24d9e6a247a0f057a266.zip | |
tools: update ESLint to 6.1.0
Update ESLint to 6.1.0
PR-URL: https://github.com/nodejs/node/pull/28793
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Diffstat (limited to 'tools/node_modules/eslint/node_modules/ajv/lib/dotjs/anyOf.js')
| -rw-r--r-- | tools/node_modules/eslint/node_modules/ajv/lib/dotjs/anyOf.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/node_modules/eslint/node_modules/ajv/lib/dotjs/anyOf.js b/tools/node_modules/eslint/node_modules/ajv/lib/dotjs/anyOf.js index 819c6f8a4b..01551d54b1 100644 --- a/tools/node_modules/eslint/node_modules/ajv/lib/dotjs/anyOf.js +++ b/tools/node_modules/eslint/node_modules/ajv/lib/dotjs/anyOf.js @@ -15,7 +15,7 @@ module.exports = function generate_anyOf(it, $keyword, $ruleType) { $it.level++; var $nextValid = 'valid' + $it.level; var $noEmptySchema = $schema.every(function($sch) { - return it.util.schemaHasRules($sch, it.RULES.all); + return (it.opts.strictKeywords ? typeof $sch == 'object' && Object.keys($sch).length > 0 : it.util.schemaHasRules($sch, it.RULES.all)); }); if ($noEmptySchema) { var $currentBaseId = $it.baseId; |