node_modules

1 files changed, 15 insertions, 8 deletions

diff --git a/node_modules/ajv/lib/dot/custom.jst b/node_modules/ajv/lib/dot/custom.jst
index e91c50e6f..402028e6b 100644
--- a/node_modules/ajv/lib/dot/custom.jst
+++ b/node_modules/ajv/lib/dot/custom.jst
@@ -6,7 +6,8 @@
 {{
   var $rule = this
     , $definition = 'definition' + $lvl
-    , $rDef = $rule.definition;
+    , $rDef = $rule.definition
+    , $closingBraces = '';
   var $validate = $rDef.validate;
   var $compile, $inline, $macro, $ruleValidate, $validateCode;
 }}
@@ -21,6 +22,7 @@
 {{??}}
   {{
     $ruleValidate = it.useCustomRule($rule, $schema, it.schema, it);
+    if (!$ruleValidate) return;
     $schemaValue = 'validate.schema' + $schemaPath;
     $validateCode = $ruleValidate.code;
     $compile = $rDef.compile;
@@ -76,9 +78,16 @@ var {{=$valid}};
 #}}
 
 
-{{? $validateSchema }}
-  {{=$valid}} = {{=$definition}}.validateSchema({{=$schemaValue}});
-  if ({{=$valid}}) {
+{{? $isData && $rDef.$data }}
+  {{ $closingBraces += '}'; }}
+  if ({{=$schemaValue}} === undefined) {
+    {{=$valid}} = true;
+  } else {
+  {{? $validateSchema }}
+    {{ $closingBraces += '}'; }}
+    {{=$valid}} = {{=$definition}}.validateSchema({{=$schemaValue}});
+    if ({{=$valid}}) {
+  {{?}}
 {{?}}
 
 {{? $inline }}
@@ -123,12 +132,10 @@ var {{=$valid}};
 {{?}}
 
 {{? $rDef.modifying }}
-  {{=$data}} = {{=$parentData}}[{{=$parentDataProperty}}];
+  if ({{=$parentData}}) {{=$data}} = {{=$parentData}}[{{=$parentDataProperty}}];
 {{?}}
 
-{{? $validateSchema }}
-  }
-{{?}}
+{{= $closingBraces }}
 
 {{## def.notValidationResult:
   {{? $rDef.valid === undefined }}