joi 12.0.0 → 12.1.1

package/LICENSE.md

@@ -0,0 +1,7 @@
+COMMERCIAL LICENSE
+
+Copyright (c) 2019-2020 Sideway Inc.
+
+This package requires a commercial license. You may not use, copy, or distribute it without first acquiring a commercial license from Sideway Inc. Using this software without a license is a violation of US and international law. To obtain a license, please contact [sales@sideway.com](mailto:sales@sideway.com).
+
+This package contains code previously published under an open source license. You can find the previous materials and the terms under which they were originally published at: [https://github.com/hapijs/joi/blob/master/LICENSE](https://github.com/hapijs/joi/blob/master/LICENSE).

package/README.md

@@ -1,23 +1,12 @@
-![joi Logo](https://raw.github.com/hapijs/joi/master/images/joi.png)
+# joi
 
 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)
-<!--
+[![Build Status](https://travis-ci.org/hapijs/joi.svg?branch=v12-commercial)](https://travis-ci.org/hapijs/joi)
 
-Remove those badges until they work properly on semver.
+## License
 
-[![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/github/hapijs/joi/badge.svg)](https://snyk.io/test/github/hapijs/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)
-
-Lead Maintainer: [Nicolas Morel](https://github.com/marsup)
+This version of the package requires a commercial license. You may not use, copy, or distribute it without first acquiring a commercial license from Sideway Inc. Using this software without a license is a violation of US and international law. To obtain a license, please contact [sales@sideway.com](mailto:sales@sideway.com). The open source version of this package can be found [here](https://github.com/hapijs/joi).
 
 # Introduction
 
@@ -26,7 +15,8 @@ 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/v12.0.0/API.md).
+
+See the detailed [API Reference](https://github.com/hapijs/joi/blob/v12-commercial/API.md).
 
 # Example
 

package/lib/cast.js

@@ -1,15 +1,11 @@
 'use strict';
 
-// Load modules
-
 const Hoek = require('hoek');
-const Ref = require('./ref');
 
+const Ref = require('./ref');
 // Type modules are delay-loaded to prevent circular dependencies
 
 
-// Declare internals
-
 const internals = {};
 
 

package/lib/errors.js

@@ -1,17 +1,15 @@
 'use strict';
 
-// Load modules
-
 const Hoek = require('hoek');
-const Language = require('./language');
 
+const Language = require('./language');
 
-// Declare internals
 
 const internals = {
     annotations: Symbol('joi-annotations')
 };
 
+
 internals.stringify = function (value, wrapArrays) {
 
     const type = typeof value;
@@ -45,6 +43,7 @@ internals.stringify = function (value, wrapArrays) {
     return JSON.stringify(value);
 };
 
+
 exports.Err = class {
 
     constructor(type, context, state, options, flags, message, template) {
@@ -198,11 +197,13 @@ exports.process = function (errors, object) {
 
 
 // Inspired by json-stringify-safe
+
 internals.safeStringify = function (obj, spaces) {
 
     return JSON.stringify(obj, internals.serializer(), spaces);
 };
 
+
 internals.serializer = function () {
 
     const keys = [];

package/lib/index.js

@@ -1,8 +1,7 @@
 'use strict';
 
-// Load modules
-
 const Hoek = require('hoek');
+
 const Any = require('./types/any');
 const Cast = require('./cast');
 const Errors = require('./errors');
@@ -10,8 +9,6 @@ const Lazy = require('./types/lazy');
 const Ref = require('./ref');
 
 
-// Declare internals
-
 const internals = {
     alternatives: require('./types/alternatives'),
     array: require('./types/array'),
@@ -24,6 +21,7 @@ const internals = {
     string: require('./types/string')
 };
 
+
 internals.applyDefaults = function (schema) {
 
     Hoek.assert(this, 'Must be invoked on a Joi instance.');
@@ -37,6 +35,7 @@ internals.applyDefaults = function (schema) {
     return schema;
 };
 
+
 internals.root = function () {
 
     const any = new Any();
@@ -430,5 +429,4 @@ internals.root = function () {
     return root;
 };
 
-
 module.exports = internals.root();

package/lib/language.js

@@ -1,10 +1,5 @@
 'use strict';
 
-// Load modules
-
-
-// Declare internals
-
 const internals = {};
 
 

package/lib/ref.js

@@ -1,12 +1,8 @@
 'use strict';
 
-// Load modules
-
 const Hoek = require('hoek');
 
 
-// Declare internals
-
 const internals = {};
 
 

package/lib/schemas.js

@@ -1,14 +1,11 @@
 'use strict';
 
-// Load modules
-
 const Joi = require('../');
 
 
-// Declare internals
-
 const internals = {};
 
+
 exports.options = Joi.object({
     abortEarly: Joi.boolean(),
     convert: Joi.boolean(),

package/lib/set.js

@@ -2,6 +2,10 @@
 
 const Ref = require('./ref');
 
+
+const internals = {};
+
+
 module.exports = class Set {
 
     constructor() {

package/lib/types/alternatives/index.js

@@ -1,15 +1,12 @@
 'use strict';
 
-// Load modules
-
 const Hoek = require('hoek');
+
 const Any = require('../any');
 const Cast = require('../../cast');
 const Ref = require('../../ref');
 
 
-// Declare internals
-
 const internals = {};
 
 

package/lib/types/any/index.js

@@ -1,16 +1,13 @@
 'use strict';
 
-// Load modules
-
 const Hoek = require('hoek');
+
 const Ref = require('../../ref');
 const Errors = require('../../errors');
 let Alternatives = null;                // Delay-loaded to prevent circular dependencies
 let Cast = null;
 
 
-// Declare internals
-
 const internals = {
     Set: require('../../set')
 };

package/lib/types/array/index.js

@@ -1,14 +1,11 @@
 'use strict';
 
-// Load modules
+const Hoek = require('hoek');
 
 const Any = require('../any');
 const Cast = require('../../cast');
 const Ref = require('../../ref');
-const Hoek = require('hoek');
-
 
-// Declare internals
 
 const internals = {};
 

package/lib/types/binary/index.js

@@ -1,12 +1,9 @@
 'use strict';
 
-// Load modules
-
-const Any = require('../any');
 const Hoek = require('hoek');
 
+const Any = require('../any');
 
-// Declare internals
 
 const internals = {};
 
@@ -29,7 +26,7 @@ internals.Binary = class extends Any {
             options.convert) {
 
             try {
-                result.value = new Buffer(value, this._flags.encoding);
+                result.value = Buffer.from(value, this._flags.encoding);
             }
             catch (e) {
             }

package/lib/types/boolean/index.js

@@ -1,12 +1,9 @@
 'use strict';
 
-// Load modules
-
-const Any = require('../any');
 const Hoek = require('hoek');
 
+const Any = require('../any');
 
-// Declare internals
 
 const internals = {
     Set: require('../../set')

package/lib/types/date/index.js

@@ -1,16 +1,14 @@
 'use strict';
 
-// Load modules
+const Hoek = require('hoek');
 
 const Any = require('../any');
 const Ref = require('../../ref');
-const Hoek = require('hoek');
-
 
-// Declare internals
 
 const internals = {};
 
+
 internals.isoDate = /^(?:[-+]\d{2})?(?:\d{4}(?!\d{2}\b))(?:(-?)(?:(?:0[1-9]|1[0-2])(?:\1(?:[12]\d|0[1-9]|3[01]))?|W(?:[0-4]\d|5[0-2])(?:-?[1-7])?|(?:00[1-9]|0[1-9]\d|[12]\d{2}|3(?:[0-5]\d|6[1-6])))(?![T]$|[T][\d]+Z$)(?:[T\s](?:(?:(?:[01]\d|2[0-3])(?:(:?)[0-5]\d)?|24\:?00)(?:[.,]\d+(?!:))?)(?:\2[0-5]\d(?:[.,]\d+)?)?(?:[Z]|(?:[+-])(?:[01]\d|2[0-3])(?::?[0-5]\d)?)?)?)?$/;
 internals.invalidDate = new Date('');
 internals.isIsoDate = (() => {
@@ -23,6 +21,7 @@ internals.isIsoDate = (() => {
     };
 })();
 
+
 internals.Date = class extends Any {
 
     constructor() {

package/lib/types/func/index.js

@@ -1,14 +1,11 @@
 'use strict';
 
-// Load modules
-
 const Hoek = require('hoek');
+
 const ObjectType = require('../object');
 const Ref = require('../../ref');
 
 
-// Declare internals
-
 const internals = {};
 
 

package/lib/types/lazy/index.js

@@ -1,12 +1,9 @@
 'use strict';
 
-// Load modules
-
-const Any = require('../any');
 const Hoek = require('hoek');
 
+const Any = require('../any');
 
-// Declare internals
 
 const internals = {};
 

package/lib/types/number/index.js

@@ -1,13 +1,10 @@
 'use strict';
 
-// Load modules
+const Hoek = require('hoek');
 
 const Any = require('../any');
 const Ref = require('../../ref');
-const Hoek = require('hoek');
-
 
-// Declare internals
 
 const internals = {
     precisionRx: /(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/

package/lib/types/object/index.js

@@ -1,16 +1,13 @@
 'use strict';
 
-// Load modules
-
 const Hoek = require('hoek');
 const Topo = require('topo');
+
 const Any = require('../any');
 const Errors = require('../../errors');
 const Cast = require('../../cast');
 
 
-// Declare internals
-
 const internals = {};
 
 

package/lib/types/string/index.js

@@ -1,17 +1,16 @@
 'use strict';
 
-// Load modules
-
 const Net = require('net');
+
+const Address = require('@hapi/address');
 const Hoek = require('hoek');
-let Isemail;                            // Loaded on demand
+
 const Any = require('../any');
 const Ref = require('../../ref');
 const JoiDate = require('../date');
 const Uri = require('./uri');
 const Ip = require('./ip');
 
-// Declare internals
 
 const internals = {
     uriRegex: Uri.createUriRegex(),
@@ -30,6 +29,7 @@ const internals = {
     normalizationForms: ['NFC', 'NFD', 'NFKC', 'NFKD']
 };
 
+
 internals.String = class extends Any {
 
     constructor() {
@@ -168,41 +168,62 @@ internals.String = class extends Any {
         });
     }
 
-    email(isEmailOptions) {
-
-        if (isEmailOptions) {
-            Hoek.assert(typeof isEmailOptions === 'object', 'email options must be an object');
-            Hoek.assert(typeof isEmailOptions.checkDNS === 'undefined', 'checkDNS option is not supported');
-            Hoek.assert(typeof isEmailOptions.tldWhitelist === 'undefined' ||
-                typeof isEmailOptions.tldWhitelist === 'object', 'tldWhitelist must be an array or object');
-            Hoek.assert(
-                typeof isEmailOptions.minDomainAtoms === 'undefined' ||
-                Number.isSafeInteger(isEmailOptions.minDomainAtoms) &&
-                isEmailOptions.minDomainAtoms > 0,
-                'minDomainAtoms must be a positive integer'
-            );
-            Hoek.assert(
-                typeof isEmailOptions.errorLevel === 'undefined' ||
-                typeof isEmailOptions.errorLevel === 'boolean' ||
-                (
-                    Number.isSafeInteger(isEmailOptions.errorLevel) &&
-                    isEmailOptions.errorLevel >= 0
-                ),
-                'errorLevel must be a non-negative integer or boolean'
-            );
-        }
+    email(validationOptions) {
 
-        return this._test('email', isEmailOptions, function (value, state, options) {
+        if (validationOptions) {
+            Hoek.assert(typeof validationOptions === 'object', 'email options must be an object');
 
-            Isemail = Isemail || require('isemail');
+            // Migration validation for unsupported options
 
-            try {
-                const result = Isemail.validate(value, isEmailOptions);
-                if (result === true || result === 0) {
-                    return value;
-                }
+            Hoek.assert(validationOptions.checkDNS === undefined, 'checkDNS option is not supported');
+            Hoek.assert(validationOptions.errorLevel === undefined, 'errorLevel option is not supported');
+            Hoek.assert(validationOptions.minDomainAtoms === undefined, 'minDomainAtoms option is not supported, use minDomainSegments instead');
+            Hoek.assert(validationOptions.tldBlacklist === undefined, 'tldBlacklist option is not supported, use tlds.deny instead');
+            Hoek.assert(validationOptions.tldWhitelist === undefined, 'tldWhitelist option is not supported, use tlds.allow instead');
+
+            // Validate options
+
+            if (validationOptions.tlds &&
+                typeof validationOptions.tlds === 'object') {
+
+                Hoek.assert(validationOptions.tlds.allow === undefined ||
+                    validationOptions.tlds.allow === false ||
+                    validationOptions.tlds.allow === true ||
+                    Array.isArray(validationOptions.tlds.allow) ||
+                    validationOptions.tlds.allow instanceof Set, 'tlds.allow must be an array, Set, or boolean');
+
+                Hoek.assert(validationOptions.tlds.deny === undefined ||
+                    Array.isArray(validationOptions.tlds.deny) ||
+                    validationOptions.tlds.deny instanceof Set, 'tlds.deny must be an array or Set');
+
+                const normalizeTable = (table, name) => {
+
+                    if (table === undefined ||
+                        typeof table === 'boolean' ||
+                        table instanceof Set) {
+
+                        return table;
+                    }
+
+                    return new Set(table);
+                };
+
+                validationOptions = Object.assign({}, validationOptions);       // Shallow cloned
+                validationOptions.tlds = {
+                    allow: normalizeTable(validationOptions.tlds.allow),
+                    deny: normalizeTable(validationOptions.tlds.deny)
+                };
+            }
+
+            Hoek.assert(validationOptions.minDomainSegments === undefined ||
+                Number.isSafeInteger(validationOptions.minDomainSegments) && validationOptions.minDomainSegments > 0, 'minDomainSegments must be a positive integer');
+        }
+
+        return this._test('email', validationOptions, function (value, state, options) {
+
+            if (Address.email.isValid(value, validationOptions)) {
+                return value;
             }
-            catch (e) { }
 
             return this.createError('string.email', { value }, state, options);
         });

package/lib/types/string/ip.js

@@ -1,12 +1,8 @@
 'use strict';
 
-// Load modules
-
 const RFC3986 = require('./rfc3986');
 
 
-// Declare internals
-
 const internals = {
     Ip: {
         cidrs: {

package/lib/types/string/rfc3986.js

@@ -1,10 +1,5 @@
 'use strict';
 
-// Load modules
-
-
-// Delcare internals
-
 const internals = {
     rfc3986: {}
 };

package/lib/types/string/uri.js

@@ -1,12 +1,8 @@
 'use strict';
 
-// Load Modules
-
 const RFC3986 = require('./rfc3986');
 
 
-// Declare internals
-
 const internals = {
     Uri: {
         createUriRegex: function (optionalScheme, allowRelative, relativeOnly) {
@@ -42,5 +38,4 @@ const internals = {
     }
 };
 
-
 module.exports = internals.Uri;

package/package.json

@@ -1,33 +1,30 @@
 {
   "name": "joi",
   "description": "Object schema validation",
-  "version": "12.0.0",
+  "version": "12.1.1",
   "homepage": "https://github.com/hapijs/joi",
   "repository": "git://github.com/hapijs/joi",
+  "engines": {
+    "node": ">=6.0.0"
+  },
   "main": "lib/index.js",
   "keywords": [
     "hapi",
     "schema",
     "validation"
   ],
-  "engines": {
-    "node": ">=4.0.0"
-  },
   "dependencies": {
+    "@hapi/address": "1.x.x",
     "hoek": "4.x.x",
-    "isemail": "3.x.x",
     "topo": "2.x.x"
   },
   "devDependencies": {
-    "hapitoc": "1.x.x",
+    "code": "4.x.x",
     "lab": "14.x.x"
   },
   "scripts": {
-    "test": "lab -t 100 -a code -L",
-    "test-debug": "lab -a code",
-    "test-cov-html": "lab -r html -o coverage.html -a code",
-    "toc": "hapitoc",
-    "version": "npm run toc && git add API.md README.md"
+    "test": "lab -t 100 -a code -L -l",
+    "test-cov-html": "lab -r html -o coverage.html -a code -l"
   },
-  "license": "BSD-3-Clause"
+  "license": "SEE LICENSE IN LICENSE.md"
 }

package/CHANGELOG.md

@@ -1,3 +0,0 @@
-Breaking changes are documented using GitHub issues, see [issues labeled "release notes"](https://github.com/hapijs/joi/issues?q=is%3Aissue+label%3A%22release+notes%22).
-
-If you want changes of a specific minor or patch release, you can browse the [GitHub milestones](https://github.com/hapijs/joi/milestones?state=closed&direction=asc&sort=due_date).

package/LICENSE

@@ -1,29 +0,0 @@
-Copyright (c) 2012-2017, Project contributors
-Copyright (c) 2012-2014, Walmart
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * The names of any contributors may not be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-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