1 files changed, 27 insertions, 38 deletions

diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/ajv/lib/compile/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/ajv/lib/compile/index.js
index c9c6730f8a..45e35d905b 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/ajv/lib/compile/index.js
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/ajv/lib/compile/index.js
@@ -2,18 +2,8 @@
 
 var resolve = require('./resolve')
   , util = require('./util')
-  , stableStringify = require('json-stable-stringify')
-  , async = require('../async');
-
-var beautify;
-
-function loadBeautify(){
-  if (beautify === undefined) {
-    var name = 'js-beautify';
-    try { beautify = require(name).js_beautify; }
-    catch(e) { beautify = false; }
-  }
-}
+  , errorClasses = require('./error_classes')
+  , stableStringify = require('json-stable-stringify');
 
 var validateGenerator = require('../dotjs/validate');
 
@@ -23,10 +13,10 @@ var validateGenerator = require('../dotjs/validate');
 
 var co = require('co');
 var ucs2length = util.ucs2length;
-var equal = require('./equal');
+var equal = require('fast-deep-equal');
 
 // this error is thrown by async schemas to return validation errors via exception
-var ValidationError = require('./validation_error');
+var ValidationError = errorClasses.Validation;
 
 module.exports = compile;
 
@@ -51,8 +41,7 @@ function compile(schema, root, localRefs, baseId) {
     , patternsHash = {}
     , defaults = []
     , defaultsHash = {}
-    , customRules = []
-    , keepSourceCode = opts.sourceCode !== false;
+    , customRules = [];
 
   root = root || { schema: schema, refVal: refVal, refs: refs };
 
@@ -74,7 +63,7 @@ function compile(schema, root, localRefs, baseId) {
       cv.refVal = v.refVal;
       cv.root = v.root;
       cv.$async = v.$async;
-      if (keepSourceCode) cv.sourceCode = v.sourceCode;
+      if (opts.sourceCode) cv.source = v.source;
     }
     return v;
   } finally {
@@ -94,7 +83,6 @@ function compile(schema, root, localRefs, baseId) {
       return compile.call(self, _schema, _root, localRefs, baseId);
 
     var $async = _schema.$async === true;
-    if ($async && !opts.transpile) async.setup(opts);
 
     var sourceCode = validateGenerator({
       isTop: true,
@@ -105,6 +93,7 @@ function compile(schema, root, localRefs, baseId) {
       schemaPath: '',
       errSchemaPath: '#',
       errorPath: '""',
+      MissingRefError: errorClasses.MissingRef,
       RULES: RULES,
       validate: validateGenerator,
       util: util,
@@ -122,20 +111,10 @@ function compile(schema, root, localRefs, baseId) {
                    + vars(defaults, defaultCode) + vars(customRules, customRuleCode)
                    + sourceCode;
 
-    if (opts.beautify) {
-      loadBeautify();
-      /* istanbul ignore else */
-      if (beautify) sourceCode = beautify(sourceCode, opts.beautify);
-      else console.error('"npm install js-beautify" to use beautify option');
-    }
-    // console.log('\n\n\n *** \n', sourceCode);
-    var validate, validateCode
-      , transpile = opts._transpileFunc;
+    if (opts.processCode) sourceCode = opts.processCode(sourceCode);
+    // console.log('\n\n\n *** \n', JSON.stringify(sourceCode));
+    var validate;
     try {
-      validateCode = $async && transpile
-                      ? transpile(sourceCode)
-                      : sourceCode;
-
       var makeValidate = new Function(
         'self',
         'RULES',
@@ -148,7 +127,7 @@ function compile(schema, root, localRefs, baseId) {
         'equal',
         'ucs2length',
         'ValidationError',
-        validateCode
+        sourceCode
       );
 
       validate = makeValidate(
@@ -167,7 +146,7 @@ function compile(schema, root, localRefs, baseId) {
 
       refVal[0] = validate;
     } catch(e) {
-      console.error('Error compiling schema, function code:', validateCode);
+      console.error('Error compiling schema, function code:', sourceCode);
       throw e;
     }
 
@@ -177,9 +156,9 @@ function compile(schema, root, localRefs, baseId) {
     validate.refVal = refVal;
     validate.root = isRoot ? validate : _root;
     if ($async) validate.$async = true;
-    if (keepSourceCode) validate.sourceCode = sourceCode;
     if (opts.sourceCode === true) {
       validate.source = {
+        code: sourceCode,
         patterns: patterns,
         defaults: defaults
       };
@@ -208,7 +187,7 @@ function compile(schema, root, localRefs, baseId) {
 
     refCode = addLocalRef(ref);
     var v = resolve.call(self, localCompile, root, ref);
-    if (!v) {
+    if (v === undefined) {
       var localSchema = localRefs && localRefs[ref];
       if (localSchema) {
         v = resolve.inlineRef(localSchema, opts.inlineRefs)
@@ -217,7 +196,9 @@ function compile(schema, root, localRefs, baseId) {
       }
     }
 
-    if (v) {
+    if (v === undefined) {
+      removeLocalRef(ref);
+    } else {
       replaceLocalRef(ref, v);
       return resolvedRef(v, refCode);
     }
@@ -230,13 +211,17 @@ function compile(schema, root, localRefs, baseId) {
     return 'refVal' + refId;
   }
 
+  function removeLocalRef(ref) {
+    delete refs[ref];
+  }
+
   function replaceLocalRef(ref, v) {
     var refId = refs[ref];
     refVal[refId] = v;
   }
 
   function resolvedRef(refVal, code) {
-    return typeof refVal == 'object'
+    return typeof refVal == 'object' || typeof refVal == 'boolean'
             ? { code: code, schema: refVal, inline: true }
             : { code: code, $async: refVal && refVal.$async };
   }
@@ -294,8 +279,12 @@ function compile(schema, root, localRefs, baseId) {
       validate = inline.call(self, it, rule.keyword, schema, parentSchema);
     } else {
       validate = rule.definition.validate;
+      if (!validate) return;
     }
 
+    if (validate === undefined)
+      throw new Error('custom keyword "' + rule.keyword + '"failed to compile');
+
     var index = customRules.length;
     customRules[index] = validate;
 
@@ -372,7 +361,7 @@ function defaultCode(i) {
 
 
 function refValCode(i, refVal) {
-  return refVal[i] ? 'var refVal' + i + ' = refVal[' + i + '];' : '';
+  return refVal[i] === undefined ? '' : 'var refVal' + i + ' = refVal[' + i + '];';
 }