@hpcc-js/ddl-shim 2.17.23 → 2.17.24

package/dist/index.js

@@ -5,8 +5,8 @@
 }(this, (function (exports) { 'use strict';
 
     var PKG_NAME = "@hpcc-js/ddl-shim";
-    var PKG_VERSION = "2.17.23";
-    var BUILD_VERSION = "2.99.0";
+    var PKG_VERSION = "2.17.24";
+    var BUILD_VERSION = "2.100.0";
 
     function isWorkunitDatasource(ref) {
         return ref.WUID !== undefined;
@@ -2506,21 +2506,18 @@
 
     unwrapExports(uri_all);
 
-    var isArray = Array.isArray;
-    var keyList = Object.keys;
-    var hasProp = Object.prototype.hasOwnProperty;
+    // do not edit .js files directly - edit src/index.jst
+
+
 
     var fastDeepEqual = function equal(a, b) {
       if (a === b) return true;
 
       if (a && b && typeof a == 'object' && typeof b == 'object') {
-        var arrA = isArray(a)
-          , arrB = isArray(b)
-          , i
-          , length
-          , key;
+        if (a.constructor !== b.constructor) return false;
 
-        if (arrA && arrB) {
+        var length, i, keys;
+        if (Array.isArray(a)) {
           length = a.length;
           if (length != b.length) return false;
           for (i = length; i-- !== 0;)
@@ -2528,35 +2525,29 @@
           return true;
         }
 
-        if (arrA != arrB) return false;
 
-        var dateA = a instanceof Date
-          , dateB = b instanceof Date;
-        if (dateA != dateB) return false;
-        if (dateA && dateB) return a.getTime() == b.getTime();
 
-        var regexpA = a instanceof RegExp
-          , regexpB = b instanceof RegExp;
-        if (regexpA != regexpB) return false;
-        if (regexpA && regexpB) return a.toString() == b.toString();
+        if (a.constructor === RegExp) return a.source === b.source && a.flags === b.flags;
+        if (a.valueOf !== Object.prototype.valueOf) return a.valueOf() === b.valueOf();
+        if (a.toString !== Object.prototype.toString) return a.toString() === b.toString();
 
-        var keys = keyList(a);
+        keys = Object.keys(a);
         length = keys.length;
-
-        if (length !== keyList(b).length)
-          return false;
+        if (length !== Object.keys(b).length) return false;
 
         for (i = length; i-- !== 0;)
-          if (!hasProp.call(b, keys[i])) return false;
+          if (!Object.prototype.hasOwnProperty.call(b, keys[i])) return false;
 
         for (i = length; i-- !== 0;) {
-          key = keys[i];
+          var key = keys[i];
+
           if (!equal(a[key], b[key])) return false;
         }
 
         return true;
       }
 
+      // true if both NaN, false otherwise
       return a!==a && b!==b;
     };
 
@@ -2591,8 +2582,6 @@
       ucs2length: ucs2length,
       varOccurences: varOccurences,
       varReplace: varReplace,
-      cleanUpCode: cleanUpCode,
-      finalCleanUpCode: finalCleanUpCode,
       schemaHasRules: schemaHasRules,
       schemaHasRulesExcept: schemaHasRulesExcept,
       schemaUnknownRules: schemaUnknownRules,
@@ -2614,7 +2603,7 @@
     }
 
 
-    function checkDataType(dataType, data, negate) {
+    function checkDataType(dataType, data, strictNumbers, negate) {
       var EQUAL = negate ? ' !== ' : ' === '
         , AND = negate ? ' || ' : ' && '
         , OK = negate ? '!' : ''
@@ -2627,15 +2616,18 @@
                               NOT + 'Array.isArray(' + data + '))';
         case 'integer': return '(typeof ' + data + EQUAL + '"number"' + AND +
                                NOT + '(' + data + ' % 1)' +
-                               AND + data + EQUAL + data + ')';
+                               AND + data + EQUAL + data +
+                               (strictNumbers ? (AND + OK + 'isFinite(' + data + ')') : '') + ')';
+        case 'number': return '(typeof ' + data + EQUAL + '"' + dataType + '"' +
+                              (strictNumbers ? (AND + OK + 'isFinite(' + data + ')') : '') + ')';
         default: return 'typeof ' + data + EQUAL + '"' + dataType + '"';
       }
     }
 
 
-    function checkDataTypes(dataTypes, data) {
+    function checkDataTypes(dataTypes, data, strictNumbers) {
       switch (dataTypes.length) {
-        case 1: return checkDataType(dataTypes[0], data, true);
+        case 1: return checkDataType(dataTypes[0], data, strictNumbers, true);
         default:
           var code = '';
           var types = toHash(dataTypes);
@@ -2648,7 +2640,7 @@
           }
           if (types.number) delete types.integer;
           for (var t in types)
-            code += (code ? ' && ' : '' ) + checkDataType(t, data, true);
+            code += (code ? ' && ' : '' ) + checkDataType(t, data, strictNumbers, true);
 
           return code;
       }
@@ -2714,42 +2706,6 @@
     }
 
 
-    var EMPTY_ELSE = /else\s*{\s*}/g
-      , EMPTY_IF_NO_ELSE = /if\s*\([^)]+\)\s*\{\s*\}(?!\s*else)/g
-      , EMPTY_IF_WITH_ELSE = /if\s*\(([^)]+)\)\s*\{\s*\}\s*else(?!\s*if)/g;
-    function cleanUpCode(out) {
-      return out.replace(EMPTY_ELSE, '')
-                .replace(EMPTY_IF_NO_ELSE, '')
-                .replace(EMPTY_IF_WITH_ELSE, 'if (!($1))');
-    }
-
-
-    var ERRORS_REGEXP = /[^v.]errors/g
-      , REMOVE_ERRORS = /var errors = 0;|var vErrors = null;|validate.errors = vErrors;/g
-      , REMOVE_ERRORS_ASYNC = /var errors = 0;|var vErrors = null;/g
-      , RETURN_VALID = 'return errors === 0;'
-      , RETURN_TRUE = 'validate.errors = null; return true;'
-      , RETURN_ASYNC = /if \(errors === 0\) return data;\s*else throw new ValidationError\(vErrors\);/
-      , RETURN_DATA_ASYNC = 'return data;'
-      , ROOTDATA_REGEXP = /[^A-Za-z_$]rootData[^A-Za-z0-9_$]/g
-      , REMOVE_ROOTDATA = /if \(rootData === undefined\) rootData = data;/;
-
-    function finalCleanUpCode(out, async) {
-      var matches = out.match(ERRORS_REGEXP);
-      if (matches && matches.length == 2) {
-        out = async
-              ? out.replace(REMOVE_ERRORS_ASYNC, '')
-                   .replace(RETURN_ASYNC, RETURN_DATA_ASYNC)
-              : out.replace(REMOVE_ERRORS, '')
-                   .replace(RETURN_VALID, RETURN_TRUE);
-      }
-
-      matches = out.match(ROOTDATA_REGEXP);
-      if (!matches || matches.length !== 3) return out;
-      return out.replace(REMOVE_ROOTDATA, '');
-    }
-
-
     function schemaHasRules(schema, rules) {
       if (typeof schema == 'boolean') return !schema;
       for (var key in schema) if (rules[key]) return true;
@@ -2828,7 +2784,7 @@
 
     function joinPaths (a, b) {
       if (a == '""') return b;
-      return (a + ' + ' + b).replace(/' \+ '/g, '');
+      return (a + ' + ' + b).replace(/([^\\])' \+ '/g, '$1');
     }
 
 
@@ -3392,7 +3348,7 @@
         it.rootId = it.resolve.fullPath(it.self._getId(it.root.schema));
         it.baseId = it.baseId || it.rootId;
         delete it.isTop;
-        it.dataPathArr = [undefined];
+        it.dataPathArr = [""];
         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);
@@ -3450,47 +3406,39 @@
           var $schemaPath = it.schemaPath + '.type',
             $errSchemaPath = it.errSchemaPath + '/type',
             $method = $typeIsArray ? 'checkDataTypes' : 'checkDataType';
-          out += ' if (' + (it.util[$method]($typeSchema, $data, true)) + ') { ';
+          out += ' if (' + (it.util[$method]($typeSchema, $data, it.opts.strictNumbers, true)) + ') { ';
           if ($coerceToTypes) {
             var $dataType = 'dataType' + $lvl,
               $coerced = 'coerced' + $lvl;
-            out += ' var ' + ($dataType) + ' = typeof ' + ($data) + '; ';
+            out += ' var ' + ($dataType) + ' = typeof ' + ($data) + '; var ' + ($coerced) + ' = undefined; ';
             if (it.opts.coerceTypes == 'array') {
-              out += ' if (' + ($dataType) + ' == \'object\' && Array.isArray(' + ($data) + ')) ' + ($dataType) + ' = \'array\'; ';
+              out += ' if (' + ($dataType) + ' == \'object\' && Array.isArray(' + ($data) + ') && ' + ($data) + '.length == 1) { ' + ($data) + ' = ' + ($data) + '[0]; ' + ($dataType) + ' = typeof ' + ($data) + '; if (' + (it.util.checkDataType(it.schema.type, $data, it.opts.strictNumbers)) + ') ' + ($coerced) + ' = ' + ($data) + '; } ';
             }
-            out += ' var ' + ($coerced) + ' = undefined; ';
-            var $bracesCoercion = '';
+            out += ' if (' + ($coerced) + ' !== undefined) ; ';
             var arr1 = $coerceToTypes;
             if (arr1) {
               var $type, $i = -1,
                 l1 = arr1.length - 1;
               while ($i < l1) {
                 $type = arr1[$i += 1];
-                if ($i) {
-                  out += ' if (' + ($coerced) + ' === undefined) { ';
-                  $bracesCoercion += '}';
-                }
-                if (it.opts.coerceTypes == 'array' && $type != 'array') {
-                  out += ' if (' + ($dataType) + ' == \'array\' && ' + ($data) + '.length == 1) { ' + ($coerced) + ' = ' + ($data) + ' = ' + ($data) + '[0]; ' + ($dataType) + ' = typeof ' + ($data) + ';  } ';
-                }
                 if ($type == 'string') {
-                  out += ' if (' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\') ' + ($coerced) + ' = \'\' + ' + ($data) + '; else if (' + ($data) + ' === null) ' + ($coerced) + ' = \'\'; ';
+                  out += ' else if (' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\') ' + ($coerced) + ' = \'\' + ' + ($data) + '; else if (' + ($data) + ' === null) ' + ($coerced) + ' = \'\'; ';
                 } else if ($type == 'number' || $type == 'integer') {
-                  out += ' if (' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' === null || (' + ($dataType) + ' == \'string\' && ' + ($data) + ' && ' + ($data) + ' == +' + ($data) + ' ';
+                  out += ' else if (' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' === null || (' + ($dataType) + ' == \'string\' && ' + ($data) + ' && ' + ($data) + ' == +' + ($data) + ' ';
                   if ($type == 'integer') {
                     out += ' && !(' + ($data) + ' % 1)';
                   }
                   out += ')) ' + ($coerced) + ' = +' + ($data) + '; ';
                 } else if ($type == 'boolean') {
-                  out += ' if (' + ($data) + ' === \'false\' || ' + ($data) + ' === 0 || ' + ($data) + ' === null) ' + ($coerced) + ' = false; else if (' + ($data) + ' === \'true\' || ' + ($data) + ' === 1) ' + ($coerced) + ' = true; ';
+                  out += ' else if (' + ($data) + ' === \'false\' || ' + ($data) + ' === 0 || ' + ($data) + ' === null) ' + ($coerced) + ' = false; else if (' + ($data) + ' === \'true\' || ' + ($data) + ' === 1) ' + ($coerced) + ' = true; ';
                 } else if ($type == 'null') {
-                  out += ' if (' + ($data) + ' === \'\' || ' + ($data) + ' === 0 || ' + ($data) + ' === false) ' + ($coerced) + ' = null; ';
+                  out += ' else if (' + ($data) + ' === \'\' || ' + ($data) + ' === 0 || ' + ($data) + ' === false) ' + ($coerced) + ' = null; ';
                 } else if (it.opts.coerceTypes == 'array' && $type == 'array') {
-                  out += ' if (' + ($dataType) + ' == \'string\' || ' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' == null) ' + ($coerced) + ' = [' + ($data) + ']; ';
+                  out += ' else if (' + ($dataType) + ' == \'string\' || ' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' == null) ' + ($coerced) + ' = [' + ($data) + ']; ';
                 }
               }
             }
-            out += ' ' + ($bracesCoercion) + ' if (' + ($coerced) + ' === undefined) {   ';
+            out += ' else {   ';
             var $$outStack = $$outStack || [];
             $$outStack.push(out);
             out = ''; /* istanbul ignore else */
@@ -3530,7 +3478,7 @@
             } else {
               out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
             }
-            out += ' } else {  ';
+            out += ' } if (' + ($coerced) + ' !== undefined) {  ';
             var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
               $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
             out += ' ' + ($data) + ' = ' + ($coerced) + '; ';
@@ -3603,7 +3551,7 @@
             $rulesGroup = arr2[i2 += 1];
             if ($shouldUseGroup($rulesGroup)) {
               if ($rulesGroup.type) {
-                out += ' if (' + (it.util.checkDataType($rulesGroup.type, $data)) + ') { ';
+                out += ' if (' + (it.util.checkDataType($rulesGroup.type, $data, it.opts.strictNumbers)) + ') { ';
               }
               if (it.opts.useDefaults) {
                 if ($rulesGroup.type == 'object' && it.schema.properties) {
@@ -3771,10 +3719,6 @@
       } else {
         out += ' var ' + ($valid) + ' = errors === errs_' + ($lvl) + ';';
       }
-      out = it.util.cleanUpCode(out);
-      if ($top) {
-        out = it.util.finalCleanUpCode(out, $async);
-      }
 
       function $shouldUseGroup($rulesGroup) {
         var rules = $rulesGroup.rules;
@@ -3900,7 +3844,7 @@
                        + vars(defaults, defaultCode) + vars(customRules, customRuleCode)
                        + sourceCode;
 
-        if (opts.processCode) sourceCode = opts.processCode(sourceCode);
+        if (opts.processCode) sourceCode = opts.processCode(sourceCode, _schema);
         // console.log('\n\n\n *** \n', JSON.stringify(sourceCode));
         var validate$1;
         try {
@@ -4203,8 +4147,8 @@
 
     var DATE = /^(\d\d\d\d)-(\d\d)-(\d\d)$/;
     var DAYS = [0,31,28,31,30,31,30,31,31,30,31,30,31];
-    var TIME = /^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d:\d\d)?$/i;
-    var HOSTNAME = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*$/i;
+    var TIME = /^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d(?::?\d\d)?)?$/i;
+    var HOSTNAME = /^(?=.{1,253}\.?$)[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*\.?$/i;
     var URI = /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)(?:\?(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
     var URIREF = /^(?:[a-z][a-z0-9+\-.]*:)?(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'"()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?(?:\?(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
     // uri-template: https://tools.ietf.org/html/rfc6570
@@ -4212,8 +4156,8 @@
     // For the source: https://gist.github.com/dperini/729294
     // For test cases: https://mathiasbynens.be/demo/url-regex
     // @todo Delete current URL in favour of the commented out URL rule when this issue is fixed https://github.com/eslint/eslint/issues/7983.
-    // var URL = /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)(?:\.(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)*(?:\.(?:[a-z\u{00a1}-\u{ffff}]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/iu;
-    var URL = /^(?:(?:http[s\u017F]?|ftp):\/\/)(?:(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+(?::(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?@)?(?:(?!10(?:\.[0-9]{1,3}){3})(?!127(?:\.[0-9]{1,3}){3})(?!169\.254(?:\.[0-9]{1,3}){2})(?!192\.168(?:\.[0-9]{1,3}){2})(?!172\.(?:1[6-9]|2[0-9]|3[01])(?:\.[0-9]{1,3}){2})(?:[1-9][0-9]?|1[0-9][0-9]|2[01][0-9]|22[0-3])(?:\.(?:1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])){2}(?:\.(?:[1-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-4]))|(?:(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)(?:\.(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)*(?:\.(?:(?:[KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]){2,})))(?::[0-9]{2,5})?(?:\/(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?$/i;
+    // var URL = /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u{00a1}-\u{ffff}0-9]+-)*[a-z\u{00a1}-\u{ffff}0-9]+)(?:\.(?:[a-z\u{00a1}-\u{ffff}0-9]+-)*[a-z\u{00a1}-\u{ffff}0-9]+)*(?:\.(?:[a-z\u{00a1}-\u{ffff}]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/iu;
+    var URL = /^(?:(?:http[s\u017F]?|ftp):\/\/)(?:(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+(?::(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?@)?(?:(?!10(?:\.[0-9]{1,3}){3})(?!127(?:\.[0-9]{1,3}){3})(?!169\.254(?:\.[0-9]{1,3}){2})(?!192\.168(?:\.[0-9]{1,3}){2})(?!172\.(?:1[6-9]|2[0-9]|3[01])(?:\.[0-9]{1,3}){2})(?:[1-9][0-9]?|1[0-9][0-9]|2[01][0-9]|22[0-3])(?:\.(?:1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])){2}(?:\.(?:[1-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-4]))|(?:(?:(?:[0-9a-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-)*(?:[0-9a-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)(?:\.(?:(?:[0-9a-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-)*(?:[0-9a-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)*(?:\.(?:(?:[a-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]){2,})))(?::[0-9]{2,5})?(?:\/(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?$/i;
     var UUID = /^(?:urn:uuid:)?[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/i;
     var JSON_POINTER$1 = /^(?:\/(?:[^~/]|~0|~1)*)*$/;
     var JSON_POINTER_URI_FRAGMENT = /^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i;
@@ -4232,11 +4176,11 @@
       // date: http://tools.ietf.org/html/rfc3339#section-5.6
       date: /^\d\d\d\d-[0-1]\d-[0-3]\d$/,
       // date-time: http://tools.ietf.org/html/rfc3339#section-5.6
-      time: /^(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,
-      'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s](?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d:\d\d)$/i,
+      time: /^(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)?$/i,
+      'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s](?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)$/i,
       // uri: https://github.com/mafintosh/is-my-json-valid/blob/master/formats.js
-      uri: /^(?:[a-z][a-z0-9+-.]*:)(?:\/?\/)?[^\s]*$/i,
-      'uri-reference': /^(?:(?:[a-z][a-z0-9+-.]*:)?\/?\/)?(?:[^\\\s#][^\s#]*)?(?:#[^\\\s]*)?$/i,
+      uri: /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/)?[^\s]*$/i,
+      'uri-reference': /^(?:(?:[a-z][a-z0-9+\-.]*:)?\/?\/)?(?:[^\\\s#][^\s#]*)?(?:#[^\\\s]*)?$/i,
       'uri-template': URITEMPLATE,
       url: URL,
       // email (sources from jsen validator):
@@ -4269,7 +4213,7 @@
       'uri-template': URITEMPLATE,
       url: URL,
       email: /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i,
-      hostname: hostname,
+      hostname: HOSTNAME,
       ipv4: /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,
       ipv6: /^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,
       regex: regex,
@@ -4322,13 +4266,6 @@
     }
 
 
-    function hostname(str) {
-      // https://tools.ietf.org/html/rfc1034#section-3.5
-      // https://tools.ietf.org/html/rfc1123#section-2
-      return str.length <= 255 && HOSTNAME.test(str);
-    }
-
-
     var NOT_URI_FRAGMENT = /\/|:/;
     function uri(str) {
       // http://jmrware.com/articles/2009/uri_regexp/URI_regex.html + optional protocol + required "."
@@ -4489,7 +4426,7 @@
           l1 = arr1.length - 1;
         while ($i < l1) {
           $sch = arr1[$i += 1];
-          if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
             $allSchemasEmpty = false;
             $it.schema = $sch;
             $it.schemaPath = $schemaPath + '[' + $i + ']';
@@ -4510,7 +4447,6 @@
           out += ' ' + ($closingBraces.slice(0, -1)) + ' ';
         }
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
@@ -4530,7 +4466,7 @@
       $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) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all));
       });
       if ($noEmptySchema) {
         var $currentBaseId = $it.baseId;
@@ -4579,7 +4515,6 @@
         if (it.opts.allErrors) {
           out += ' } ';
         }
-        out = it.util.cleanUpCode(out);
       } else {
         if ($breakOnError) {
           out += ' if (true) { ';
@@ -4673,7 +4608,7 @@
         $dataNxt = $it.dataLevel = it.dataLevel + 1,
         $nextData = 'data' + $dataNxt,
         $currentBaseId = it.baseId,
-        $nonEmptySchema = it.util.schemaHasRules($schema, it.RULES.all);
+        $nonEmptySchema = (it.opts.strictKeywords ? (typeof $schema == 'object' && Object.keys($schema).length > 0) || $schema === false : it.util.schemaHasRules($schema, it.RULES.all));
       out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
       if ($nonEmptySchema) {
         var $wasComposite = it.compositeRule;
@@ -4732,7 +4667,6 @@
       if (it.opts.allErrors) {
         out += ' } ';
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
@@ -4754,6 +4688,7 @@
         $propertyDeps = {},
         $ownProperties = it.opts.ownProperties;
       for ($property in $schema) {
+        if ($property == '__proto__') continue;
         var $sch = $schema[$property];
         var $deps = Array.isArray($sch) ? $propertyDeps : $schemaDeps;
         $deps[$property] = $sch;
@@ -4879,7 +4814,7 @@
       var $currentBaseId = $it.baseId;
       for (var $property in $schemaDeps) {
         var $sch = $schemaDeps[$property];
-        if (it.util.schemaHasRules($sch, it.RULES.all)) {
+        if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
           out += ' ' + ($nextValid) + ' = true; if ( ' + ($data) + (it.util.getProperty($property)) + ' !== undefined ';
           if ($ownProperties) {
             out += ' && Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($property)) + '\') ';
@@ -4900,7 +4835,6 @@
       if ($breakOnError) {
         out += '   ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
@@ -5132,8 +5066,8 @@
       var $nextValid = 'valid' + $it.level;
       var $thenSch = it.schema['then'],
         $elseSch = it.schema['else'],
-        $thenPresent = $thenSch !== undefined && it.util.schemaHasRules($thenSch, it.RULES.all),
-        $elsePresent = $elseSch !== undefined && it.util.schemaHasRules($elseSch, it.RULES.all),
+        $thenPresent = $thenSch !== undefined && (it.opts.strictKeywords ? (typeof $thenSch == 'object' && Object.keys($thenSch).length > 0) || $thenSch === false : it.util.schemaHasRules($thenSch, it.RULES.all)),
+        $elsePresent = $elseSch !== undefined && (it.opts.strictKeywords ? (typeof $elseSch == 'object' && Object.keys($elseSch).length > 0) || $elseSch === false : it.util.schemaHasRules($elseSch, it.RULES.all)),
         $currentBaseId = $it.baseId;
       if ($thenPresent || $elsePresent) {
         var $ifClause;
@@ -5211,7 +5145,6 @@
         if ($breakOnError) {
           out += ' else { ';
         }
-        out = it.util.cleanUpCode(out);
       } else {
         if ($breakOnError) {
           out += ' if (true) { ';
@@ -5287,7 +5220,7 @@
             l1 = arr1.length - 1;
           while ($i < l1) {
             $sch = arr1[$i += 1];
-            if (it.util.schemaHasRules($sch, it.RULES.all)) {
+            if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
               out += ' ' + ($nextValid) + ' = true; if (' + ($data) + '.length > ' + ($i) + ') { ';
               var $passData = $data + '[' + $i + ']';
               $it.schema = $sch;
@@ -5310,7 +5243,7 @@
             }
           }
         }
-        if (typeof $additionalItems == 'object' && it.util.schemaHasRules($additionalItems, it.RULES.all)) {
+        if (typeof $additionalItems == 'object' && (it.opts.strictKeywords ? (typeof $additionalItems == 'object' && Object.keys($additionalItems).length > 0) || $additionalItems === false : it.util.schemaHasRules($additionalItems, it.RULES.all))) {
           $it.schema = $additionalItems;
           $it.schemaPath = it.schemaPath + '.additionalItems';
           $it.errSchemaPath = it.errSchemaPath + '/additionalItems';
@@ -5334,7 +5267,7 @@
             $closingBraces += '}';
           }
         }
-      } else if (it.util.schemaHasRules($schema, it.RULES.all)) {
+      } else if ((it.opts.strictKeywords ? (typeof $schema == 'object' && Object.keys($schema).length > 0) || $schema === false : it.util.schemaHasRules($schema, it.RULES.all))) {
         $it.schema = $schema;
         $it.schemaPath = $schemaPath;
         $it.errSchemaPath = $errSchemaPath;
@@ -5357,7 +5290,6 @@
       if ($breakOnError) {
         out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
@@ -5386,6 +5318,12 @@
         $op = $isMax ? '<' : '>',
         $notOp = $isMax ? '>' : '<',
         $errorKeyword = undefined;
+      if (!($isData || typeof $schema == 'number' || $schema === undefined)) {
+        throw new Error($keyword + ' must be number');
+      }
+      if (!($isDataExcl || $schemaExcl === undefined || typeof $schemaExcl == 'number' || typeof $schemaExcl == 'boolean')) {
+        throw new Error($exclusiveKeyword + ' must be number or boolean');
+      }
       if ($isDataExcl) {
         var $schemaValueExcl = it.util.getData($schemaExcl.$data, $dataLvl, it.dataPathArr),
           $exclusive = 'exclusive' + $lvl,
@@ -5536,6 +5474,9 @@
       } else {
         $schemaValue = $schema;
       }
+      if (!($isData || typeof $schema == 'number')) {
+        throw new Error($keyword + ' must be number');
+      }
       var $op = $keyword == 'maxItems' ? '>' : '<';
       out += 'if ( ';
       if ($isData) {
@@ -5613,6 +5554,9 @@
       } else {
         $schemaValue = $schema;
       }
+      if (!($isData || typeof $schema == 'number')) {
+        throw new Error($keyword + ' must be number');
+      }
       var $op = $keyword == 'maxLength' ? '>' : '<';
       out += 'if ( ';
       if ($isData) {
@@ -5695,6 +5639,9 @@
       } else {
         $schemaValue = $schema;
       }
+      if (!($isData || typeof $schema == 'number')) {
+        throw new Error($keyword + ' must be number');
+      }
       var $op = $keyword == 'maxProperties' ? '>' : '<';
       out += 'if ( ';
       if ($isData) {
@@ -5771,6 +5718,9 @@
       } else {
         $schemaValue = $schema;
       }
+      if (!($isData || typeof $schema == 'number')) {
+        throw new Error($keyword + ' must be number');
+      }
       out += 'var division' + ($lvl) + ';if (';
       if ($isData) {
         out += ' ' + ($schemaValue) + ' !== undefined && ( typeof ' + ($schemaValue) + ' != \'number\' || ';
@@ -5844,7 +5794,7 @@
       var $it = it.util.copy(it);
       $it.level++;
       var $nextValid = 'valid' + $it.level;
-      if (it.util.schemaHasRules($schema, it.RULES.all)) {
+      if ((it.opts.strictKeywords ? (typeof $schema == 'object' && Object.keys($schema).length > 0) || $schema === false : it.util.schemaHasRules($schema, it.RULES.all))) {
         $it.schema = $schema;
         $it.schemaPath = $schemaPath;
         $it.errSchemaPath = $errSchemaPath;
@@ -5942,7 +5892,7 @@
           l1 = arr1.length - 1;
         while ($i < l1) {
           $sch = arr1[$i += 1];
-          if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
             $it.schema = $sch;
             $it.schemaPath = $schemaPath + '[' + $i + ']';
             $it.errSchemaPath = $errSchemaPath + '/' + $i;
@@ -6082,9 +6032,9 @@
         $dataNxt = $it.dataLevel = it.dataLevel + 1,
         $nextData = 'data' + $dataNxt,
         $dataProperties = 'dataProperties' + $lvl;
-      var $schemaKeys = Object.keys($schema || {}),
+      var $schemaKeys = Object.keys($schema || {}).filter(notProto),
         $pProperties = it.schema.patternProperties || {},
-        $pPropertyKeys = Object.keys($pProperties),
+        $pPropertyKeys = Object.keys($pProperties).filter(notProto),
         $aProperties = it.schema.additionalProperties,
         $someProperties = $schemaKeys.length || $pPropertyKeys.length,
         $noAdditional = $aProperties === false,
@@ -6094,7 +6044,13 @@
         $ownProperties = it.opts.ownProperties,
         $currentBaseId = it.baseId;
       var $required = it.schema.required;
-      if ($required && !(it.opts.$data && $required.$data) && $required.length < it.opts.loopRequired) var $requiredHash = it.util.toHash($required);
+      if ($required && !(it.opts.$data && $required.$data) && $required.length < it.opts.loopRequired) {
+        var $requiredHash = it.util.toHash($required);
+      }
+
+      function notProto(p) {
+        return p !== '__proto__';
+      }
       out += 'var ' + ($errs) + ' = errors;var ' + ($nextValid) + ' = true;';
       if ($ownProperties) {
         out += ' var ' + ($dataProperties) + ' = undefined;';
@@ -6247,7 +6203,7 @@
           while (i3 < l3) {
             $propertyKey = arr3[i3 += 1];
             var $sch = $schema[$propertyKey];
-            if (it.util.schemaHasRules($sch, it.RULES.all)) {
+            if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
               var $prop = it.util.getProperty($propertyKey),
                 $passData = $data + $prop,
                 $hasDefault = $useDefaults && $sch.default !== undefined;
@@ -6350,7 +6306,7 @@
           while (i4 < l4) {
             $pProperty = arr4[i4 += 1];
             var $sch = $pProperties[$pProperty];
-            if (it.util.schemaHasRules($sch, it.RULES.all)) {
+            if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
               $it.schema = $sch;
               $it.schemaPath = it.schemaPath + '.patternProperties' + it.util.getProperty($pProperty);
               $it.errSchemaPath = it.errSchemaPath + '/patternProperties/' + it.util.escapeFragment($pProperty);
@@ -6389,7 +6345,6 @@
       if ($breakOnError) {
         out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
@@ -6408,7 +6363,7 @@
       $it.level++;
       var $nextValid = 'valid' + $it.level;
       out += 'var ' + ($errs) + ' = errors;';
-      if (it.util.schemaHasRules($schema, it.RULES.all)) {
+      if ((it.opts.strictKeywords ? (typeof $schema == 'object' && Object.keys($schema).length > 0) || $schema === false : it.util.schemaHasRules($schema, it.RULES.all))) {
         $it.schema = $schema;
         $it.schemaPath = $schemaPath;
         $it.errSchemaPath = $errSchemaPath;
@@ -6471,7 +6426,6 @@
       if ($breakOnError) {
         out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
@@ -6500,7 +6454,7 @@
             while (i1 < l1) {
               $property = arr1[i1 += 1];
               var $propertySch = it.schema.properties[$property];
-              if (!($propertySch && it.util.schemaHasRules($propertySch, it.RULES.all))) {
+              if (!($propertySch && (it.opts.strictKeywords ? (typeof $propertySch == 'object' && Object.keys($propertySch).length > 0) || $propertySch === false : it.util.schemaHasRules($propertySch, it.RULES.all)))) {
                 $required[$required.length] = $property;
               }
             }
@@ -6771,7 +6725,7 @@
         } else {
           out += ' var itemIndices = {}, item; for (;i--;) { var item = ' + ($data) + '[i]; ';
           var $method = 'checkDataType' + ($typeIsArray ? 's' : '');
-          out += ' if (' + (it.util[$method]($itemType, 'item', true)) + ') continue; ';
+          out += ' if (' + (it.util[$method]($itemType, 'item', it.opts.strictNumbers, true)) + ') continue; ';
           if ($typeIsArray) {
             out += ' if (typeof item == \'string\') item = \'"\' + item; ';
           }
@@ -6961,7 +6915,7 @@
             keywords[key] = {
               anyOf: [
                 schema,
-                { $ref: 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#' }
+                { $ref: 'https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#' }
               ]
             };
           }
@@ -7553,20 +7507,10 @@
 
     var require$$2 = getCjsExportFromNamespace(jsonSchemaDraft07$1);
 
-    var IDENTIFIER$1 = /^[a-z_$][a-z0-9_$-]*$/i;
-
-    var metaSchema = require$$2;
-
-    var keyword = {
-      add: addKeyword,
-      get: getKeyword,
-      remove: removeKeyword,
-      validate: validateKeyword
-    };
-
-    var definitionSchema = {
+    var definition_schema = {
+      $id: 'https://github.com/ajv-validator/ajv/blob/master/lib/definition_schema.js',
       definitions: {
-        simpleTypes: metaSchema.definitions.simpleTypes
+        simpleTypes: require$$2.definitions.simpleTypes
       },
       type: 'object',
       dependencies: {
@@ -7576,7 +7520,7 @@
         valid: {not: {required: ['macro']}}
       },
       properties: {
-        type: metaSchema.properties.type,
+        type: require$$2.properties.type,
         schema: {type: 'boolean'},
         statements: {type: 'boolean'},
         dependencies: {
@@ -7597,6 +7541,18 @@
       }
     };
 
+    var IDENTIFIER$1 = /^[a-z_$][a-z0-9_$-]*$/i;
+
+
+
+    var keyword = {
+      add: addKeyword,
+      get: getKeyword,
+      remove: removeKeyword,
+      validate: validateKeyword
+    };
+
+
     /**
      * Define custom keyword
      * @this  Ajv
@@ -7631,7 +7587,7 @@
             metaSchema = {
               anyOf: [
                 metaSchema,
-                { '$ref': 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#' }
+                { '$ref': 'https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#' }
               ]
             };
           }
@@ -7720,7 +7676,7 @@
     function validateKeyword(definition, throwError) {
       validateKeyword.errors = null;
       var v = this._validateKeyword = this._validateKeyword
-                                      || this.compile(definitionSchema, true);
+                                      || this.compile(definition_schema, true);
 
       if (v(definition)) return true;
       validateKeyword.errors = v.errors;
@@ -7731,7 +7687,7 @@
     }
 
     var $schema$1 = "http://json-schema.org/draft-07/schema#";
-    var $id$1 = "https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#";
+    var $id$1 = "https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#";
     var description = "Meta-schema for $data reference (JSON Schema extension proposal)";
     var type$1 = "object";
     var required$1 = [
@@ -7834,6 +7790,7 @@
       this._metaOpts = getMetaSchemaOptions(this);
 
       if (opts.formats) addInitialFormats(this);
+      if (opts.keywords) addInitialKeywords(this);
       addDefaultMetaSchema(this);
       if (typeof opts.meta == 'object') this.addMetaSchema(opts.meta);
       if (opts.nullable) this.addKeyword('nullable', {metaSchema: {type: 'boolean'}});
@@ -8232,6 +8189,14 @@
     }
 
 
+    function addInitialKeywords(self) {
+      for (var name in self._opts.keywords) {
+        var keyword = self._opts.keywords[name];
+        self.addKeyword(name, keyword);
+      }
+    }
+
+
     function checkUnique(self, id) {
       if (self._schemas[id] || self._refs[id])
         throw new Error('schema with key or id "' + id + '" already exists');