joi 13.5.0 → 13.7.0

package/README.md

@@ -16,7 +16,7 @@ Imagine you run facebook and you want visitors to sign up on the website with re
 This is joi, joi allows you to create *blueprints* or *schemas* for JavaScript objects (an object that stores information) to ensure *validation* of key information.
 
 # API
-See the detailed [API Reference](https://github.com/hapijs/joi/blob/v13.5.0/API.md).
+See the detailed [API Reference](https://github.com/hapijs/joi/blob/v13.7.0/API.md).
 
 # Example
 
@@ -28,7 +28,7 @@ const schema = Joi.object().keys({
     password: Joi.string().regex(/^[a-zA-Z0-9]{3,30}$/),
     access_token: [Joi.string(), Joi.number()],
     birthyear: Joi.number().integer().min(1900).max(2013),
-    email: Joi.string().email()
+    email: Joi.string().email({ minDomainAtoms: 2 })
 }).with('username', 'birthyear').without('password', 'access_token');
 
 // Return result.
@@ -56,6 +56,7 @@ The above schema defines the following constraints:
     * an integer between 1900 and 2013
 * `email`
     * a valid email address string
+    * must have two domain parts e.g. `example.com`
 
 # Usage
 

package/lib/index.js

@@ -22,7 +22,8 @@ const internals = {
     func: require('./types/func'),
     number: require('./types/number'),
     object: require('./types/object'),
-    string: require('./types/string')
+    string: require('./types/string'),
+    symbol: require('./types/symbol')
 };
 
 internals.callWithDefaults = function (schema, args) {
@@ -112,6 +113,13 @@ internals.root = function () {
         return internals.callWithDefaults.call(this, internals.string, args);
     };
 
+    root.symbol = function (...args) {
+
+        Hoek.assert(args.length === 0, 'Joi.symbol() does not allow arguments.');
+
+        return internals.callWithDefaults.call(this, internals.symbol, args);
+    };
+
     root.ref = function (...args) {
 
         return Ref.create(...args);

package/lib/language.js

@@ -157,5 +157,9 @@ exports.errors = {
         ref: 'references "{{ref}}" which is not a number',
         ip: 'must be a valid ip address with a {{cidr}} CIDR',
         ipVersion: 'must be a valid ip address of one of the following versions {{version}} with a {{cidr}} CIDR'
+    },
+    symbol: {
+        base: 'must be a symbol',
+        map: 'must be one of {{map}}'
     }
 };

package/lib/types/alternatives/index.js

@@ -150,7 +150,7 @@ internals.Alternatives = class extends Any {
 
     describe() {
 
-        const description = Any.prototype.describe.call(this);
+        const description = super.describe();
         const alternatives = [];
         for (let i = 0; i < this._inner.matches.length; ++i) {
             const item = this._inner.matches[i];

package/lib/types/array/index.js

@@ -311,7 +311,7 @@ internals.Array = class extends Any {
 
     describe() {
 
-        const description = Any.prototype.describe.call(this);
+        const description = super.describe();
 
         if (this._inner.ordereds.length) {
             description.orderedItems = [];

package/lib/types/boolean/index.js

@@ -87,7 +87,7 @@ internals.Boolean = class extends Any {
 
     describe() {
 
-        const description = Any.prototype.describe.call(this);
+        const description = super.describe();
         description.truthy = [true].concat(this._inner.truthySet.values());
         description.falsy = [false].concat(this._inner.falsySet.values());
         return description;

package/lib/types/number/index.js

@@ -47,7 +47,7 @@ internals.Number = class extends Any {
             result.value = Math.round(result.value * precision) / precision;
         }
 
-        result.errors = isNumber ? null : this.createError('number.base', null, state, options);
+        result.errors = isNumber ? null : this.createError('number.base', { value }, state, options);
         return result;
     }
 

package/lib/types/object/index.js

@@ -615,7 +615,7 @@ internals.Object = class extends Any {
 
     describe(shallow) {
 
-        const description = Any.prototype.describe.call(this);
+        const description = super.describe();
 
         if (description.rules) {
             for (let i = 0; i < description.rules.length; ++i) {

package/lib/types/symbol/index.js

@@ -0,0 +1,93 @@
+'use strict';
+
+// Load modules
+
+const Util = require('util');
+
+const Any = require('../any');
+const Hoek = require('hoek');
+
+
+// Declare internals
+
+const internals = {};
+
+
+internals.Map = class extends Map {
+
+    slice() {
+
+        return new internals.Map(this);
+    }
+
+    toString() {
+
+        return Util.inspect(this);
+    }
+};
+
+
+internals.Symbol = class extends Any {
+
+    constructor() {
+
+        super();
+        this._type = 'symbol';
+        this._inner.map = new internals.Map();
+    }
+
+    _base(value, state, options) {
+
+        if (options.convert) {
+            const lookup = this._inner.map.get(value);
+            if (lookup) {
+                value = lookup;
+            }
+
+            if (this._flags.allowOnly) {
+                return {
+                    value,
+                    errors: (typeof value === 'symbol') ? null : this.createError('symbol.map', { map: this._inner.map }, state, options)
+                };
+            }
+        }
+
+        return {
+            value,
+            errors: (typeof value === 'symbol') ? null : this.createError('symbol.base', null, state, options)
+        };
+    }
+
+    map(iterable) {
+
+        if (iterable && !iterable[Symbol.iterator] && typeof iterable === 'object') {
+            iterable = Object.entries(iterable);
+        }
+
+        Hoek.assert(iterable && iterable[Symbol.iterator], 'Iterable must be an iterable or object');
+        const obj = this.clone();
+
+        const symbols = [];
+        for (const entry of iterable) {
+            Hoek.assert(entry && entry[Symbol.iterator], 'Entry must be an iterable');
+            const [key, value] = entry;
+
+            Hoek.assert(typeof key !== 'object' && typeof key !== 'function' && typeof key !== 'symbol', 'Key must not be an object, function, or Symbol');
+            Hoek.assert(typeof value === 'symbol', 'Value must be a Symbol');
+            obj._inner.map.set(key, value);
+            symbols.push(value);
+        }
+
+        return obj.valid(...symbols);
+    }
+
+    describe() {
+
+        const description = super.describe();
+        description.map = new Map(this._inner.map);
+        return description;
+    }
+};
+
+
+module.exports = new internals.Symbol();

package/package.json

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