vitalif-js
/
ajv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: omptimise/fix generated code 

optimize code for schemas without validation keywords
fix bug in determining empty schema
master
Evgeny Poberezkin 2016-12-25 15:32:53 +00:00
parent 71c3709c2a
commit 225ef67ce5
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/compile/rules.js
View File

@ -34,6 +34,7 @@ module.exports = function rules() {
keyword = key;
implKeywords.forEach(function (k) {
ALL.push(k);
RULES.all[k] = true;
});
}
ALL.push(keyword);

27
lib/dot/validate.jst
View File

@ -14,7 +14,10 @@
* validateRef etc. are defined in the parent scope in index.js
*/ }}
{{ var $async = it.schema.$async === true; }}
{{
var $async = it.schema.$async === true
, $refKeywords = it.util.schemaHasRulesExcept(it.schema, it.RULES.all, '$ref');
}}
{{? it.isTop }}
{{? $async }}
@ -39,16 +42,8 @@
'use strict';
{{?}}
{{? typeof it.schema == 'boolean' }}
{{? it.schema }}
{{? it.isTop}}
{{? !$async }} validate.errors = null; {{?}}
return true;
{{??}}
var {{=$valid}} = true;
{{?}}
{{??}}
{{? typeof it.schema == 'boolean' || !($refKeywords || it.schema.$ref) }}
{{? it.schema === false}}
{{ var $keyword = 'false schema'; }}
{{# def.setupKeyword }}
{{? it.isTop}}
@ -57,6 +52,13 @@
var {{=$valid}} = false;
{{?}}
{{# def.error:'false schema' }}
{{??}}
{{? it.isTop}}
{{? !$async }} validate.errors = null; {{?}}
return true;
{{??}}
var {{=$valid}} = true;
{{?}}
{{?}}
{{? it.isTop}}
@ -128,8 +130,7 @@
{{?}}
{{?}}
{{ var $refKeywords; }}
{{? it.schema.$ref && ($refKeywords = it.util.schemaHasRulesExcept(it.schema, it.RULES.all, '$ref')) }}
{{? it.schema.$ref && $refKeywords }}
{{? it.opts.extendRefs == 'ignore' }}
{{
$refKeywords = false;