joi 9.1.1 → 9.2.0

package/README.md

@@ -102,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.1.1/API.md).
+See the [API Reference](https://github.com/hapijs/joi/blob/v9.2.0/API.md).
 
 # Browsers
 

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "joi",
   "description": "Object schema validation",
-  "version": "9.1.1",
+  "version": "9.2.0",
   "homepage": "https://github.com/hapijs/joi",
   "repository": "git://github.com/hapijs/joi",
   "main": "lib/index.js",