joi 9.0.3 → 9.2.0

package/LICENSE

@@ -1,5 +1,5 @@
-Copyright (c) 2012-2016, Project contributors.
-Copyright (c) 2012-2014, Walmart.
+Copyright (c) 2012-2016, Project contributors
+Copyright (c) 2012-2014, Walmart
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -26,4 +26,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
                                   *   *   *
 
-The complete list of contributors can be found at: https://github.com/hapijs/joi/graphs/contributors
+The complete list of contributors can be found at: https://github.com/hapijs/joi/graphs/contributors

package/README.md

@@ -4,8 +4,15 @@ Object schema description language and validator for JavaScript objects.
 
 [![npm version](https://badge.fury.io/js/joi.svg)](http://badge.fury.io/js/joi)
 [![Build Status](https://secure.travis-ci.org/hapijs/joi.svg?branch=master)](http://travis-ci.org/hapijs/joi)
+<!--
+
+Remove those badges until they work properly on semver.
+
 [![Dependencies Status](https://david-dm.org/hapijs/joi.svg)](https://david-dm.org/hapijs/joi)
 [![DevDependencies Status](https://david-dm.org/hapijs/joi/dev-status.svg)](https://david-dm.org/hapijs/joi#info=devDependencies)
+
+-->
+[![NSP Status](https://nodesecurity.io/orgs/hapijs/projects/0394bf83-b5bc-410b-878c-e8cf1b92033e/badge)](https://nodesecurity.io/orgs/hapijs/projects/0394bf83-b5bc-410b-878c-e8cf1b92033e)
 [![Known Vulnerabilities](https://snyk.io/test/npm/joi/badge.svg)](https://snyk.io/test/npm/joi)
 
 [![Join the chat at https://gitter.im/hapijs/joi](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hapijs/joi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -95,7 +102,7 @@ When validating a schema:
 * Rules are defined in an additive fashion and evaluated in order after whitelist and blacklist checks.
 
 # API
-See the [API Reference](https://github.com/hapijs/joi/blob/v9.0.3/API.md).
+See the [API Reference](https://github.com/hapijs/joi/blob/v9.2.0/API.md).
 
 # Browsers
 

package/lib/any.js

@@ -450,15 +450,15 @@ module.exports = internals.Any = class {
                 else if (typeof this._flags.default === 'function' &&
                     !(this._flags.func && !this._flags.default.description)) {
 
-                    let arg;
+                    let args;
 
                     if (state.parent !== null &&
                         this._flags.default.length > 0) {
 
-                        arg = Hoek.clone(state.parent);
+                        args = [Hoek.clone(state.parent), options];
                     }
 
-                    const defaultValue = internals._try(this._flags.default, arg);
+                    const defaultValue = internals._try(this._flags.default, args);
                     finalValue = defaultValue.value;
                     if (defaultValue.error) {
                         errors.push(this.createError('any.default', defaultValue.error, state, options));
@@ -766,13 +766,13 @@ internals.Any.prototype.disallow = internals.Any.prototype.not = internals.Any.p
 internals.Any.prototype.exist = internals.Any.prototype.required;
 
 
-internals._try = function (fn, arg) {
+internals._try = function (fn, args) {
 
     let err;
     let result;
 
     try {
-        result = fn.call(null, arg);
+        result = fn.apply(null, args);
     }
     catch (e) {
         err = e;

package/lib/array.js

@@ -509,14 +509,14 @@ internals.Array = class extends Any {
 
         if (knownMisses.length) {
             if (unknownMisses) {
-                errors.push(this.createError('array.includesRequiredBoth', { knownMisses: knownMisses, unknownMisses: unknownMisses }, { key: state.key, path: state.path }, options));
+                errors.push(this.createError('array.includesRequiredBoth', { knownMisses, unknownMisses }, { key: state.key, path: state.path }, options));
             }
             else {
-                errors.push(this.createError('array.includesRequiredKnowns', { knownMisses: knownMisses }, { key: state.key, path: state.path }, options));
+                errors.push(this.createError('array.includesRequiredKnowns', { knownMisses }, { key: state.key, path: state.path }, options));
             }
         }
         else {
-            errors.push(this.createError('array.includesRequiredUnknowns', { unknownMisses: unknownMisses }, { key: state.key, path: state.path }, options));
+            errors.push(this.createError('array.includesRequiredUnknowns', { unknownMisses }, { key: state.key, path: state.path }, options));
         }
     }
 

package/lib/errors.js

@@ -232,7 +232,11 @@ internals.serializer = function () {
 };
 
 
-internals.annotate = function () {
+internals.annotate = function (stripColorCodes) {
+
+    const redFgEscape = stripColorCodes ? '' : '\u001b[31m';
+    const redBgEscape = stripColorCodes ? '' : '\u001b[41m';
+    const endColor = stripColorCodes ? '' : '\u001b[0m';
 
     if (typeof this._object !== 'object') {
         return this.details[0].message;
@@ -242,7 +246,7 @@ internals.annotate = function () {
 
     const lookup = {};
     for (let i = this.details.length - 1; i >= 0; --i) {        // Reverse order to process deepest child first
-        const pos = this.details.length - i;
+        const pos = i + 1;
         const error = this.details[i];
         const path = error.path.split('.');
         let ref = obj;
@@ -254,13 +258,13 @@ internals.annotate = function () {
             else {
                 const value = ref[seg];
                 if (Array.isArray(ref)) {
-                    const arrayLabel = '_$idx$_' + (i + 1) + '_$end$_';
+                    const arrayLabel = `_$idx$_${pos}_$end$_`;
                     if (!ref.placeholders) {
                         ref.placeholders = {};
                     }
 
                     if (ref.placeholders[seg]) {
-                        ref.placeholders[seg] = ref.placeholders[seg].replace('_$end$_', ', ' + (i + 1) + '_$end$_');
+                        ref.placeholders[seg] = ref.placeholders[seg].replace('_$end$_', `, ${pos}_$end$_`);
                     }
                     else {
                         ref.placeholders[seg] = arrayLabel;
@@ -269,19 +273,19 @@ internals.annotate = function () {
                 else {
                     if (value !== undefined) {
                         delete ref[seg];
-                        const objectLabel = seg + '_$key$_' + pos + '_$end$_';
+                        const objectLabel = `${seg}_$key$_${pos}_$end$_`;
                         ref[objectLabel] = value;
                         lookup[error.path] = objectLabel;
                     }
                     else if (lookup[error.path]) {
                         const replacement = lookup[error.path];
-                        const appended = replacement.replace('_$end$_', ', ' + pos + '_$end$_');
+                        const appended = replacement.replace('_$end$_', `, ${pos}_$end$_`);
                         ref[appended] = ref[replacement];
                         lookup[error.path] = appended;
                         delete ref[replacement];
                     }
                     else {
-                        ref['_$miss$_' + seg + '|' + pos + '_$end$_'] = '__missing__';
+                        ref[`_$miss$_${seg}|${pos}_$end$_`] = '__missing__';
                     }
                 }
             }
@@ -296,18 +300,19 @@ internals.annotate = function () {
     };
 
     let message = internals.safeStringify(obj, 2)
-        .replace(replacers.key, ($0, $1) => '" \u001b[31m[' + $1 + ']\u001b[0m')
-        .replace(replacers.missing, ($0, $1, $2) => '\u001b[41m"' + $1 + '"\u001b[0m\u001b[31m [' + $2 + ']: -- missing --\u001b[0m')
-        .replace(replacers.arrayIndex, ($0, $1, $2) => '\n' + $2 + ' \u001b[31m[' + $1 + ']\u001b[0m')
+        .replace(replacers.key, ($0, $1) => `" ${redFgEscape}[${$1}]${endColor}`)
+        .replace(replacers.missing, ($0, $1, $2) => `${redBgEscape}"${$1}"${endColor}${redFgEscape} [${$2}]: -- missing --${endColor}`)
+        .replace(replacers.arrayIndex, ($0, $1, $2) => `\n${$2} ${redFgEscape}[${$1}]${endColor}`)
         .replace(replacers.specials, ($0, $1) => $1);
 
-    message = message + '\n\u001b[31m';
+    message = `${message}\n${redFgEscape}`;
 
     for (let i = 0; i < this.details.length; ++i) {
-        message = message + '\n[' + (i + 1) + '] ' + this.details[i].message;
+        const pos = i + 1;
+        message = `${message}\n[${pos}] ${this.details[i].message}`;
     }
 
-    message = message + '\u001b[0m';
+    message = message + endColor;
 
     return message;
 };

package/lib/object.js

@@ -244,7 +244,7 @@ internals.Object = class extends Any {
 
         for (let i = 0; i < this._inner.dependencies.length; ++i) {
             const dep = this._inner.dependencies[i];
-            const err = internals[dep.type].call(this, dep.key !== null && value[dep.key], dep.peers, target, { key: dep.key, path: (state.path || '') + (dep.key ? '.' + dep.key : '') }, options);
+            const err = internals[dep.type].call(this, dep.key !== null && target[dep.key], dep.peers, target, { key: dep.key, path: (state.path || '') + (dep.key ? '.' + dep.key : '') }, options);
             if (err instanceof Errors.Err) {
                 errors.push(err);
                 if (options.abortEarly) {

package/lib/string.js

@@ -292,18 +292,73 @@ internals.String = class extends Any {
         });
     }
 
-    guid() {
+    guid(guidOptions) {
 
-        const regex = /^[A-F0-9]{8}(?:-?[A-F0-9]{4}){3}-?[A-F0-9]{12}$/i;
-        const regex2 = /^\{[A-F0-9]{8}(?:-?[A-F0-9]{4}){3}-?[A-F0-9]{12}\}$/i;
+        const brackets = {
+            '{': '}', '[': ']', '(': ')', '': ''
+        };
+
+        const uuids = {
+            'uuidv1': '1',
+            'uuidv2': '2',
+            'uuidv3': '3',
+            'uuidv4': '4',
+            'uuidv5': '5'
+        };
 
-        return this._test('guid', undefined, function (value, state, options) {
+        const versions = [];
 
-            if (regex.test(value) || regex2.test(value)) {
-                return value;
+        if (guidOptions && guidOptions.version) {
+            if (!Array.isArray(guidOptions.version)) {
+                guidOptions.version = [guidOptions.version];
+            }
+
+            Hoek.assert(guidOptions.version.length >= 1, 'version must have at least 1 valid version specified');
+
+            for (let i = 0; i < guidOptions.version.length; ++i) {
+                let version = guidOptions.version[i];
+                Hoek.assert(typeof version === 'string', 'version at position ' + i + ' must be a string');
+                version = version.toLowerCase();
+                Hoek.assert(uuids[version], 'version at position ' + i + ' must be one of ' + Object.keys(uuids).join(', '));
+                Hoek.assert(versions.indexOf(version) === -1, 'version at position ' + i + ' must not be a duplicate.');
+                versions.push(version);
+            }
+        }
+
+        const regex = /^([\[{\(]?)([0-9A-F]{8})([:-]?)([0-9A-F]{4})([:-]?)([0-9A-F]{4})([:-]?)([0-9A-F]{4})([:-]?)([0-9A-F]{12})([\]}\)]?)$/i;
+
+        return this._test('guid', guidOptions, function (value, state, options) {
+
+            const results = regex.exec(value);
+
+            if (!results) {
+                return this.createError('string.guid', { value }, state, options);
+            }
+
+            // Matching braces
+            if (brackets[results[1]] !== results[11]) {
+                return this.createError('string.guid', { value }, state, options);
+            }
+
+            // Matching separators
+            if (results[3] !== results[5] || results[3] !== results[7] || results[3] !== results[9]) {
+                return this.createError('string.guid', { value }, state, options);
             }
 
-            return this.createError('string.guid', { value }, state, options);
+            // Specific UUID versions
+            if (versions.length) {
+                const validVersions = versions.some((uuidVersion) => {
+
+                    return results[6][0] === uuids[uuidVersion];
+                });
+
+                // Valid version and 89AB check
+                if (!(validVersions && /[89AB]/i.test(results[8][0]))) {
+                    return this.createError('string.guid', { value }, state, options);
+                }
+            }
+
+            return value;
         });
     }
 
@@ -475,5 +530,8 @@ internals.String.prototype.length = internals.compare('length', (value, limit, e
     return length === limit;
 });
 
+// Aliases
+
+internals.String.prototype.uuid = internals.String.prototype.guid;
 
 module.exports = new internals.String();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "joi",
   "description": "Object schema validation",
-  "version": "9.0.3",
+  "version": "9.2.0",
   "homepage": "https://github.com/hapijs/joi",
   "repository": "git://github.com/hapijs/joi",
   "main": "lib/index.js",
@@ -21,9 +21,9 @@
     "topo": "2.x.x"
   },
   "devDependencies": {
-    "code": "3.x.x",
-    "lab": "10.x.x",
-    "markdown-toc": "0.12.x"
+    "code": "4.x.x",
+    "lab": "11.x.x",
+    "markdown-toc": "0.13.x"
   },
   "scripts": {
     "test": "lab -t 100 -a code -L",