update node modules

node_modules/ajv/lib/dot/_limit.jst

@@ -50,6 +50,14 @@
                 )
             || {{=$data}} !== {{=$data}}) {
     var op{{=$lvl}} = {{=$exclusive}} ? '{{=$op}}' : '{{=$op}}=';
+    {{
+      if ($schema === undefined) {
+        $errorKeyword = $exclusiveKeyword;
+        $errSchemaPath = it.errSchemaPath + '/' + $exclusiveKeyword;
+        $schemaValue = $schemaValueExcl;
+        $isData = $isDataExcl;
+      }
+    }}
 {{??}}
   {{
     var $exclIsNumber = typeof $schemaExcl == 'number'

node_modules/ajv/lib/dot/comment.jst

@@ -0,0 +1,9 @@
+{{# def.definitions }}
+{{# def.setupKeyword }}
+
+{{ var $comment = it.util.toQuotedString($schema); }}
+{{? it.opts.$comment === true }}
+  console.log({{=$comment}});
+{{?? typeof it.opts.$comment == 'function' }}
+  self._opts.$comment({{=$comment}}, {{=it.util.toQuotedString($errSchemaPath)}}, validate.root.schema);
+{{?}}

node_modules/ajv/lib/dot/custom.jst

@@ -112,13 +112,13 @@ var {{=$valid}};
   {{# def.storeDefOut:def_callRuleValidate }}
 
   {{? $rDef.errors === false }}
-    {{=$valid}} = {{? $asyncKeyword }}{{=it.yieldAwait}}{{?}}{{= def_callRuleValidate }};
+    {{=$valid}} = {{? $asyncKeyword }}await {{?}}{{= def_callRuleValidate }};
   {{??}}
     {{? $asyncKeyword }}
       {{ $ruleErrs = 'customErrors' + $lvl; }}
       var {{=$ruleErrs}} = null;
       try {
-        {{=$valid}} = {{=it.yieldAwait}}{{= def_callRuleValidate }};
+        {{=$valid}} = await {{= def_callRuleValidate }};
       } catch (e) {
         {{=$valid}} = false;
         if (e instanceof ValidationError) {{=$ruleErrs}} = e.errors;

node_modules/ajv/lib/dot/defaults.def

@@ -1,10 +1,25 @@
 {{## def.assignDefault:
-  if ({{=$passData}} === undefined)
-    {{=$passData}} = {{? it.opts.useDefaults == 'shared' }}
-                       {{= it.useDefault($sch.default) }}
-                     {{??}}
-                       {{= JSON.stringify($sch.default) }}
-                     {{?}};
+  {{? it.compositeRule }}
+    {{
+      if (it.opts.strictDefaults) {
+        var $defaultMsg = 'default is ignored for: ' + $passData;
+        if (it.opts.strictDefaults === 'log') it.logger.warn($defaultMsg);
+        else throw new Error($defaultMsg);
+      }
+    }}
+  {{??}}
+    if ({{=$passData}} === undefined
+      {{? it.opts.useDefaults == 'empty' }}
+        || {{=$passData}} === null
+        || {{=$passData}} === ''
+      {{?}}
+    )
+      {{=$passData}} = {{? it.opts.useDefaults == 'shared' }}
+                         {{= it.useDefault($sch.default) }}
+                       {{??}}
+                         {{= JSON.stringify($sch.default) }}
+                       {{?}};
+  {{?}}
 #}}
 
 

node_modules/ajv/lib/dot/errors.def

@@ -94,23 +94,23 @@
   'false schema':  "'boolean schema is false'",
   $ref:            "'can\\\'t resolve reference {{=it.util.escapeQuotes($schema)}}'",
   additionalItems: "'should NOT have more than {{=$schema.length}} items'",
-  additionalProperties: "'should NOT have additional properties'",
+  additionalProperties: "'{{? it.opts._errorDataPathProperty }}is an invalid additional property{{??}}should NOT have additional properties{{?}}'",
   anyOf:           "'should match some schema in anyOf'",
   const:           "'should be equal to constant'",
   contains:        "'should contain a valid item'",
   dependencies:    "'should have {{? $deps.length == 1 }}property {{= it.util.escapeQuotes($deps[0]) }}{{??}}properties {{= it.util.escapeQuotes($deps.join(\", \")) }}{{?}} when property {{= it.util.escapeQuotes($property) }} is present'",
   'enum':          "'should be equal to one of the allowed values'",
   format:          "'should match format \"{{#def.concatSchemaEQ}}\"'",
+  'if':            "'should match \"' + {{=$ifClause}} + '\" schema'",
   _limit:          "'should be {{=$opStr}} {{#def.appendSchema}}",
   _exclusiveLimit: "'{{=$exclusiveKeyword}} should be boolean'",
-  _limitItems:     "'should NOT have {{?$keyword=='maxItems'}}more{{??}}less{{?}} than {{#def.concatSchema}} items'",
+  _limitItems:     "'should NOT have {{?$keyword=='maxItems'}}more{{??}}fewer{{?}} than {{#def.concatSchema}} items'",
   _limitLength:    "'should NOT be {{?$keyword=='maxLength'}}longer{{??}}shorter{{?}} than {{#def.concatSchema}} characters'",
-  _limitProperties:"'should NOT have {{?$keyword=='maxProperties'}}more{{??}}less{{?}} than {{#def.concatSchema}} properties'",
+  _limitProperties:"'should NOT have {{?$keyword=='maxProperties'}}more{{??}}fewer{{?}} than {{#def.concatSchema}} properties'",
   multipleOf:      "'should be multiple of {{#def.appendSchema}}",
   not:             "'should NOT be valid'",
   oneOf:           "'should match exactly one schema in oneOf'",
   pattern:         "'should match pattern \"{{#def.concatSchemaEQ}}\"'",
-  patternGroups:   "'should NOT have {{=$moreOrLess}} than {{=$limit}} properties matching pattern \"{{=it.util.escapeQuotes($pgProperty)}}\"'",
   propertyNames:   "'property name \\'{{=$invalidName}}\\' is invalid'",
   required:        "'{{? it.opts._errorDataPathProperty }}is a required property{{??}}should have required property \\'{{=$missingProperty}}\\'{{?}}'",
   type:            "'should be {{? $typeIsArray }}{{= $typeSchema.join(\",\") }}{{??}}{{=$typeSchema}}{{?}}'",
@@ -137,6 +137,7 @@
   dependencies:    "validate.schema{{=$schemaPath}}",
   'enum':          "validate.schema{{=$schemaPath}}",
   format:          "{{#def.schemaRefOrQS}}",
+  'if':            "validate.schema{{=$schemaPath}}",
   _limit:          "{{#def.schemaRefOrVal}}",
   _exclusiveLimit: "validate.schema{{=$schemaPath}}",
   _limitItems:     "{{#def.schemaRefOrVal}}",
@@ -146,7 +147,6 @@
   not:             "validate.schema{{=$schemaPath}}",
   oneOf:           "validate.schema{{=$schemaPath}}",
   pattern:         "{{#def.schemaRefOrQS}}",
-  patternGroups:   "validate.schema{{=$schemaPath}}",
   propertyNames:   "validate.schema{{=$schemaPath}}",
   required:        "validate.schema{{=$schemaPath}}",
   type:            "validate.schema{{=$schemaPath}}",
@@ -167,11 +167,12 @@
   additionalItems: "{ limit: {{=$schema.length}} }",
   additionalProperties: "{ additionalProperty: '{{=$additionalProperty}}' }",
   anyOf:           "{}",
-  const:           "{}",
+  const:           "{ allowedValue: schema{{=$lvl}} }",
   contains:        "{}",
   dependencies:    "{ property: '{{= it.util.escapeQuotes($property) }}', missingProperty: '{{=$missingProperty}}', depsCount: {{=$deps.length}}, deps: '{{= it.util.escapeQuotes($deps.length==1 ? $deps[0] : $deps.join(\", \")) }}' }",
   'enum':          "{ allowedValues: schema{{=$lvl}} }",
   format:          "{ format: {{#def.schemaValueQS}} }",
+  'if':            "{ failingKeyword: {{=$ifClause}} }",
   _limit:          "{ comparison: {{=$opExpr}}, limit: {{=$schemaValue}}, exclusive: {{=$exclusive}} }",
   _exclusiveLimit: "{}",
   _limitItems:     "{ limit: {{=$schemaValue}} }",
@@ -179,9 +180,8 @@
   _limitProperties:"{ limit: {{=$schemaValue}} }",
   multipleOf:      "{ multipleOf: {{=$schemaValue}} }",
   not:             "{}",
-  oneOf:           "{}",
+  oneOf:           "{ passingSchemas: {{=$passingSchemas}} }",
   pattern:         "{ pattern: {{#def.schemaValueQS}} }",
-  patternGroups:   "{ reason: '{{=$reason}}', limit: {{=$limit}}, pattern: '{{=it.util.escapeQuotes($pgProperty)}}' }",
   propertyNames:   "{ propertyName: '{{=$invalidName}}' }",
   required:        "{ missingProperty: '{{=$missingProperty}}' }",
   type:            "{ type: '{{? $typeIsArray }}{{= $typeSchema.join(\",\") }}{{??}}{{=$typeSchema}}{{?}}' }",

node_modules/ajv/lib/dot/format.jst

@@ -24,7 +24,7 @@
    ({{=$format}} && {{=$formatType}} == '{{=$ruleType}}'
                  && !(typeof {{=$format}} == 'function'
                      ? {{? it.async}}
-                        (async{{=$lvl}} ? {{=it.yieldAwait}} {{=$format}}({{=$data}}) : {{=$format}}({{=$data}}))
+                        (async{{=$lvl}} ? await {{=$format}}({{=$data}}) : {{=$format}}({{=$data}}))
                        {{??}}
                         {{=$format}}({{=$data}})
                        {{?}}
@@ -97,7 +97,7 @@
       if (!it.async) throw new Error('async format in sync schema');
       var $formatRef = 'formats' + it.util.getProperty($schema) + '.validate';
     }}
-    if (!({{=it.yieldAwait}} {{=$formatRef}}({{=$data}}))) {
+    if (!(await {{=$formatRef}}({{=$data}}))) {
   {{??}}
     if (!{{# def.checkFormat }}) {
   {{?}}

node_modules/ajv/lib/dot/if.jst

@@ -0,0 +1,75 @@
+{{# def.definitions }}
+{{# def.errors }}
+{{# def.setupKeyword }}
+{{# def.setupNextLevel }}
+
+
+{{## def.validateIfClause:_clause:
+  {{
+    $it.schema = it.schema['_clause'];
+    $it.schemaPath = it.schemaPath + '._clause';
+    $it.errSchemaPath = it.errSchemaPath + '/_clause';
+  }}
+  {{# def.insertSubschemaCode }}
+  {{=$valid}} = {{=$nextValid}};
+  {{? $thenPresent && $elsePresent }}
+    {{ $ifClause = 'ifClause' + $lvl; }}
+    var {{=$ifClause}} = '_clause';
+  {{??}}
+    {{ $ifClause = '\'_clause\''; }}
+  {{?}}
+#}}
+
+{{
+  var $thenSch = it.schema['then']
+    , $elseSch = it.schema['else']
+    , $thenPresent = $thenSch !== undefined && {{# def.nonEmptySchema:$thenSch }}
+    , $elsePresent = $elseSch !== undefined && {{# def.nonEmptySchema:$elseSch }}
+    , $currentBaseId = $it.baseId;
+}}
+
+{{? $thenPresent || $elsePresent }}
+  {{
+    var $ifClause;
+    $it.createErrors = false;
+    $it.schema = $schema;
+    $it.schemaPath = $schemaPath;
+    $it.errSchemaPath = $errSchemaPath;
+  }}
+  var {{=$errs}} = errors;
+  var {{=$valid}} = true;
+
+  {{# def.setCompositeRule }}
+  {{# def.insertSubschemaCode }}
+  {{ $it.createErrors = true; }}
+  {{# def.resetErrors }}
+  {{# def.resetCompositeRule }}
+
+  {{? $thenPresent }}
+    if ({{=$nextValid}}) {
+      {{# def.validateIfClause:then }}
+    }
+    {{? $elsePresent }}
+      else {
+    {{?}}
+  {{??}}
+    if (!{{=$nextValid}}) {
+  {{?}}
+
+  {{? $elsePresent }}
+      {{# def.validateIfClause:else }}
+    }
+  {{?}}
+
+  if (!{{=$valid}}) {
+    {{# def.extraError:'if' }}
+  } 
+  {{? $breakOnError }} else { {{?}}
+
+  {{# def.cleanUp }}
+{{??}}
+  {{? $breakOnError }}
+    if (true) {
+  {{?}}
+{{?}}
+

node_modules/ajv/lib/dot/oneOf.jst

@@ -3,11 +3,17 @@
 {{# def.setupKeyword }}
 {{# def.setupNextLevel }}
 
-var {{=$errs}} = errors;
-var prevValid{{=$lvl}} = false;
-var {{=$valid}} = false;
+{{
+  var $currentBaseId = $it.baseId
+    , $prevValid = 'prevValid' + $lvl
+    , $passingSchemas = 'passingSchemas' + $lvl;
+}}
+
+var {{=$errs}} = errors
+  , {{=$prevValid}} = false
+  , {{=$valid}} = false
+  , {{=$passingSchemas}} = null;
 
-{{ var $currentBaseId = $it.baseId; }}
 {{# def.setCompositeRule }}
 
 {{~ $schema:$sch:$i }}
@@ -24,13 +30,17 @@ var {{=$valid}} = false;
   {{?}}
 
   {{? $i }}
-    if ({{=$nextValid}} && prevValid{{=$lvl}})
+    if ({{=$nextValid}} && {{=$prevValid}}) {
       {{=$valid}} = false;
-    else {
+      {{=$passingSchemas}} = [{{=$passingSchemas}}, {{=$i}}];
+    } else {
     {{ $closingBraces += '}'; }}
   {{?}}
 
-    if ({{=$nextValid}}) {{=$valid}} = prevValid{{=$lvl}} = true;
+    if ({{=$nextValid}}) {
+      {{=$valid}} = {{=$prevValid}} = true;
+      {{=$passingSchemas}} = {{=$i}};
+    }
 {{~}}
 
 {{# def.resetCompositeRule }}

node_modules/ajv/lib/dot/properties.jst

@@ -42,13 +42,8 @@
     , $currentBaseId = it.baseId;
 
   var $required = it.schema.required;
-  if ($required && !(it.opts.v5 && $required.$data) && $required.length < it.opts.loopRequired)
+  if ($required && !(it.opts.$data && $required.$data) && $required.length < it.opts.loopRequired)
     var $requiredHash = it.util.toHash($required);
-
-  if (it.opts.patternGroups) {
-    var $pgProperties = it.schema.patternGroups || {}
-      , $pgPropertyKeys = Object.keys($pgProperties);
-  }
 }}
 
 
@@ -63,8 +58,8 @@ var {{=$nextValid}} = true;
     {{? $someProperties }}
       var isAdditional{{=$lvl}} = !(false
         {{? $schemaKeys.length }}
-          {{? $schemaKeys.length > 5 }}
-            || validate.schema{{=$schemaPath}}[{{=$key}}]
+          {{? $schemaKeys.length > 8 }}
+            || validate.schema{{=$schemaPath}}.hasOwnProperty({{=$key}})
           {{??}}
             {{~ $schemaKeys:$propertyKey }}
               || {{=$key}} == {{= it.util.toQuotedString($propertyKey) }}
@@ -76,11 +71,6 @@ var {{=$nextValid}} = true;
             || {{= it.usePattern($pProperty) }}.test({{=$key}})
           {{~}}
         {{?}}
-        {{? it.opts.patternGroups && $pgPropertyKeys.length }}
-          {{~ $pgPropertyKeys:$pgProperty:$i }}
-            || {{= it.usePattern($pgProperty) }}.test({{=$key}})
-          {{~}}
-        {{?}}
       );
 
       if (isAdditional{{=$lvl}}) {
@@ -246,79 +236,6 @@ var {{=$nextValid}} = true;
 {{?}}
 
 
-{{? it.opts.patternGroups && $pgPropertyKeys.length }}
-  {{~ $pgPropertyKeys:$pgProperty }}
-    {{
-      var $pgSchema = $pgProperties[$pgProperty]
-        , $sch = $pgSchema.schema;
-    }}
-
-    {{? {{# def.nonEmptySchema:$sch}} }}
-      {{
-        $it.schema = $sch;
-        $it.schemaPath = it.schemaPath + '.patternGroups' + it.util.getProperty($pgProperty) + '.schema';
-        $it.errSchemaPath = it.errSchemaPath + '/patternGroups/'
-                                             + it.util.escapeFragment($pgProperty)
-                                             + '/schema';
-      }}
-
-      var pgPropCount{{=$lvl}} = 0;
-
-      {{# def.iterateProperties }}
-        if ({{= it.usePattern($pgProperty) }}.test({{=$key}})) {
-          pgPropCount{{=$lvl}}++;
-
-          {{
-            $it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
-            var $passData = $data + '[' + $key + ']';
-            $it.dataPathArr[$dataNxt] = $key;
-          }}
-
-          {{# def.generateSubschemaCode }}
-          {{# def.optimizeValidate }}
-
-          {{? $breakOnError }} if (!{{=$nextValid}}) break; {{?}}
-        }
-        {{? $breakOnError }} else {{=$nextValid}} = true; {{?}}
-      }
-
-      {{# def.ifResultValid }}
-
-      {{
-        var $pgMin = $pgSchema.minimum
-          , $pgMax = $pgSchema.maximum;
-      }}
-      {{? $pgMin !== undefined || $pgMax !== undefined }}
-        var {{=$valid}} = true;
-
-        {{ var $currErrSchemaPath = $errSchemaPath; }}
-
-        {{? $pgMin !== undefined }}
-          {{ var $limit = $pgMin, $reason = 'minimum', $moreOrLess = 'less'; }}
-          {{=$valid}} = pgPropCount{{=$lvl}} >= {{=$pgMin}};
-          {{ $errSchemaPath = it.errSchemaPath + '/patternGroups/minimum'; }}
-          {{# def.checkError:'patternGroups' }}
-          {{? $pgMax !== undefined }}
-            else
-          {{?}}
-        {{?}}
-
-        {{? $pgMax !== undefined }}
-          {{ var $limit = $pgMax, $reason = 'maximum', $moreOrLess = 'more'; }}
-          {{=$valid}} = pgPropCount{{=$lvl}} <= {{=$pgMax}};
-          {{ $errSchemaPath = it.errSchemaPath + '/patternGroups/maximum'; }}
-          {{# def.checkError:'patternGroups' }}
-        {{?}}
-
-        {{ $errSchemaPath = $currErrSchemaPath; }}
-
-        {{# def.ifValid }}
-      {{?}}
-    {{?}} {{ /* def.nonEmptySchema */ }}
-  {{~}}
-{{?}}
-
-
 {{? $breakOnError }}
   {{= $closingBraces }}
   if ({{=$errs}} == errors) {

node_modules/ajv/lib/dot/propertyNames.jst

@@ -3,6 +3,8 @@
 {{# def.setupKeyword }}
 {{# def.setupNextLevel }}
 
+var {{=$errs}} = errors;
+
 {{? {{# def.nonEmptySchema:$schema }} }}
   {{
     $it.schema = $schema;
@@ -22,8 +24,6 @@
       , $currentBaseId = it.baseId;
   }}
 
-  var {{=$errs}} = errors;
-
   {{? $ownProperties }}
     var {{=$dataProperties}} = undefined;
   {{?}}

node_modules/ajv/lib/dot/ref.jst

@@ -50,7 +50,7 @@
     {{?}}
   {{??}}
     {{
-      $async = $refVal.$async === true;
+      $async = $refVal.$async === true || (it.async && $refVal.$async !== false);
       $refCode = $refVal.code;
     }}
   {{?}}
@@ -65,7 +65,7 @@
     {{ if (!it.async) throw new Error('async schema referenced by sync schema'); }}
     {{? $breakOnError }} var {{=$valid}}; {{?}}
     try {
-      {{=it.yieldAwait}} {{=__callValidate}};
+      await {{=__callValidate}};
       {{? $breakOnError }} {{=$valid}} = true; {{?}}
     } catch (e) {
       if (!(e instanceof ValidationError)) throw e;

node_modules/ajv/lib/dot/uniqueItems.jst

@@ -14,18 +14,42 @@
     else {
   {{?}}
 
-  var {{=$valid}} = true;
-  if ({{=$data}}.length > 1) {
-    var i = {{=$data}}.length, j;
-    outer:
-    for (;i--;) {
-      for (j = i; j--;) {
-        if (equal({{=$data}}[i], {{=$data}}[j])) {
-          {{=$valid}} = false;
-          break outer;
+  var i = {{=$data}}.length
+    , {{=$valid}} = true
+    , j;
+  if (i > 1) {
+    {{
+      var $itemType = it.schema.items && it.schema.items.type
+        , $typeIsArray = Array.isArray($itemType);
+    }}
+    {{? !$itemType || $itemType == 'object' || $itemType == 'array' ||
+        ($typeIsArray && ($itemType.indexOf('object') >= 0 || $itemType.indexOf('array') >= 0)) }}
+      outer:
+      for (;i--;) {
+        for (j = i; j--;) {
+          if (equal({{=$data}}[i], {{=$data}}[j])) {
+            {{=$valid}} = false;
+            break outer;
+          }
         }
       }
-    }
+    {{??}}
+      var itemIndices = {}, item;
+      for (;i--;) {
+        var item = {{=$data}}[i];
+        {{ var $method = 'checkDataType' + ($typeIsArray ? 's' : ''); }}
+        if ({{= it.util[$method]($itemType, 'item', true) }}) continue;
+        {{? $typeIsArray}}
+          if (typeof item == 'string') item = '"' + item;
+        {{?}}
+        if (typeof itemIndices[item] == 'number') {
+          {{=$valid}} = false;
+          j = itemIndices[item];
+          break;
+        }
+        itemIndices[item] = i;
+      }
+    {{?}}
   }
 
   {{? $isData }}  }  {{?}}

node_modules/ajv/lib/dot/validate.jst

@@ -20,30 +20,23 @@
     , $id = it.self._getId(it.schema);
 }}
 
-{{? it.isTop }}
-  {{? $async }}
-    {{
-      it.async = true;
-      var $es7 = it.opts.async == 'es7';
-      it.yieldAwait = $es7 ? 'await' : 'yield';
-    }}
-  {{?}}
+{{
+  if (it.opts.strictKeywords) {
+    var $unknownKwd = it.util.schemaUnknownRules(it.schema, it.RULES.keywords);
+    if ($unknownKwd) {
+      var $keywordsMsg = 'unknown keyword: ' + $unknownKwd;
+      if (it.opts.strictKeywords === 'log') it.logger.warn($keywordsMsg);
+      else throw new Error($keywordsMsg);
+    }
+  }
+}}
 
-  var validate =
-    {{? $async }}
-      {{? $es7 }}
-        (async function
-      {{??}}
-        {{? it.opts.async != '*'}}co.wrap{{?}}(function*
-      {{?}}
-    {{??}}
-      (function
+{{? it.isTop }}
+  var validate = {{?$async}}{{it.async = true;}}async {{?}}function(data, dataPath, parentData, parentDataProperty, rootData) {
+    'use strict';
+    {{? $id && (it.opts.sourceCode || it.opts.processCode) }}
+      {{= '/\*# sourceURL=' + $id + ' */' }}
     {{?}}
-        (data, dataPath, parentData, parentDataProperty, rootData) {
-          'use strict';
-          {{? $id && (it.opts.sourceCode || it.opts.processCode) }}
-            {{= '/\*# sourceURL=' + $id + ' */' }}
-          {{?}}
 {{?}}
 
 {{? typeof it.schema == 'boolean' || !($refKeywords || it.schema.$ref) }}
@@ -70,7 +63,7 @@
   {{?}}
 
   {{? it.isTop}}
-    });
+    };
     return validate;
   {{?}}
 
@@ -89,6 +82,12 @@
     delete it.isTop;
 
     it.dataPathArr = [undefined];
+
+    if (it.schema.default !== undefined && it.opts.useDefaults && it.opts.strictDefaults) {
+      var $defaultMsg = 'default is ignored in the schema root';
+      if (it.opts.strictDefaults === 'log') it.logger.warn($defaultMsg);
+      else throw new Error($defaultMsg);
+    }
   }}
 
   var vErrors = null; {{ /* don't edit, used in replace */ }}
@@ -118,6 +117,16 @@
   var $typeSchema = it.schema.type
     , $typeIsArray = Array.isArray($typeSchema);
 
+  if ($typeSchema && it.opts.nullable && it.schema.nullable === true) {
+    if ($typeIsArray) {
+      if ($typeSchema.indexOf('null') == -1)
+        $typeSchema = $typeSchema.concat('null');
+    } else if ($typeSchema != 'null') {
+      $typeSchema = [$typeSchema, 'null'];
+      $typeIsArray = true;
+    }
+  }
+
   if ($typeIsArray && $typeSchema.length == 1) {
     $typeSchema = $typeSchema[0];
     $typeIsArray = false;
@@ -145,6 +154,10 @@
   {{?}}
 {{?}}
 
+{{? it.schema.$comment && it.opts.$comment }}
+  {{= it.RULES.all.$comment.code(it, '$comment') }}
+{{?}}
+
 {{? $typeSchema }}
   {{? it.opts.coerceTypes }}
     {{ var $coerceToTypes = it.util.coerceToTypes(it.opts.coerceTypes, $typeSchema); }}
@@ -176,15 +189,12 @@
     {{ $closingBraces2 += '}'; }}
   {{?}}
 {{??}}
-  {{? it.opts.v5 && it.schema.patternGroups }}
-    {{ it.logger.warn('keyword "patternGroups" is deprecated and disabled. Use option patternGroups: true to enable.'); }}
-  {{?}}
   {{~ it.RULES:$rulesGroup }}
     {{? $shouldUseGroup($rulesGroup) }}
       {{? $rulesGroup.type }}
         if ({{= it.util.checkDataType($rulesGroup.type, $data) }}) {
       {{?}}
-        {{? it.opts.useDefaults && !it.compositeRule }}
+        {{? it.opts.useDefaults }}
           {{? $rulesGroup.type == 'object' && it.schema.properties }}
             {{# def.defaultProperties }}
           {{?? $rulesGroup.type == 'array' && Array.isArray(it.schema.items) }}
@@ -237,7 +247,7 @@
       validate.errors = vErrors; {{ /* don't edit, used in replace */ }}
       return errors === 0;       {{ /* don't edit, used in replace */ }}
     {{?}}
-  });
+  };
 
   return validate;
 {{??}}