joi 17.8.2 → 17.8.3

package/lib/annotate.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Clone = require('@hapi/hoek/clone');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Common = require('./common');
 

package/lib/base.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
-const DeepEqual = require('@hapi/hoek/deepEqual');
-const Merge = require('@hapi/hoek/merge');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
+const DeepEqual = require('@hapi/hoek/lib/deepEqual');
+const Merge = require('@hapi/hoek/lib/merge');
 
 const Cache = require('./cache');
 const Common = require('./common');

package/lib/cache.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Common = require('./common');
 

package/lib/common.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const AssertError = require('@hapi/hoek/assertError');
+const Assert = require('@hapi/hoek/lib/assert');
+const AssertError = require('@hapi/hoek/lib/error');
 
 const Pkg = require('../package.json');
 

package/lib/compile.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Common = require('./common');
 const Ref = require('./ref');

package/lib/extend.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Common = require('./common');
 const Messages = require('./messages');

package/lib/index.d.ts

@@ -290,12 +290,6 @@ declare namespace Joi {
          * @default true
          */
         allowUnicode?: boolean;
-        /**
-         * If `true`, underscores (`_`) are allowed in the domain name
-         *
-         * @default false
-         */
-        allowUnderscore?: boolean;
         /**
          * if `true`, ignore invalid email length errors.
          *
@@ -347,12 +341,7 @@ declare namespace Joi {
          * @default true
          */
         allowUnicode?: boolean;
-        /**
-         * If `true`, underscores (`_`) are allowed in the domain name
-         *
-         * @default false
-         */
-        allowUnderscore?: boolean;
+
         /**
          * Options for TLD (top level domain) validation. By default, the TLD must be a valid name listed on the [IANA registry](http://data.iana.org/TLD/tlds-alpha-by-domain.txt)
          *

package/lib/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Cache = require('./cache');
 const Common = require('./common');

package/lib/manifest.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Common = require('./common');
 const Messages = require('./messages');

package/lib/messages.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Template = require('./template');
 

package/lib/modify.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Common = require('./common');
 const Ref = require('./ref');

package/lib/ref.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
-const Reach = require('@hapi/hoek/reach');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
+const Reach = require('@hapi/hoek/lib/reach');
 
 const Common = require('./common');
 

package/lib/state.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Clone = require('@hapi/hoek/clone');
-const Reach = require('@hapi/hoek/reach');
+const Clone = require('@hapi/hoek/lib/clone');
+const Reach = require('@hapi/hoek/lib/reach');
 
 const Common = require('./common');
 

package/lib/template.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
-const EscapeHtml = require('@hapi/hoek/escapeHtml');
-const Formula = require('@hapi/formula');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
+const EscapeHtml = require('@hapi/hoek/lib/escapeHtml');
+const Formula = require('@sideway/formula');
 
 const Common = require('./common');
 const Errors = require('./errors');

package/lib/trace.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const DeepEqual = require('@hapi/hoek/deepEqual');
-const Pinpoint = require('@hapi/pinpoint');
+const DeepEqual = require('@hapi/hoek/lib/deepEqual');
+const Pinpoint = require('@sideway/pinpoint');
 
 const Errors = require('./errors');
 

package/lib/types/alternatives.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Merge = require('@hapi/hoek/merge');
+const Assert = require('@hapi/hoek/lib/assert');
+const Merge = require('@hapi/hoek/lib/merge');
 
 const Any = require('./any');
 const Common = require('../common');

package/lib/types/any.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Base = require('../base');
 const Common = require('../common');

package/lib/types/array.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const DeepEqual = require('@hapi/hoek/deepEqual');
-const Reach = require('@hapi/hoek/reach');
+const Assert = require('@hapi/hoek/lib/assert');
+const DeepEqual = require('@hapi/hoek/lib/deepEqual');
+const Reach = require('@hapi/hoek/lib/reach');
 
 const Any = require('./any');
 const Common = require('../common');

package/lib/types/binary.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Any = require('./any');
 const Common = require('../common');

package/lib/types/boolean.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Any = require('./any');
 const Common = require('../common');

package/lib/types/date.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Any = require('./any');
 const Common = require('../common');

package/lib/types/function.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Keys = require('./keys');
 

package/lib/types/keys.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const ApplyToDefaults = require('@hapi/hoek/applyToDefaults');
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
+const ApplyToDefaults = require('@hapi/hoek/lib/applyToDefaults');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
 const Topo = require('@hapi/topo');
 
 const Any = require('./any');

package/lib/types/link.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Any = require('./any');
 const Common = require('../common');

package/lib/types/number.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Any = require('./any');
 const Common = require('../common');

package/lib/types/string.js

@@ -1,16 +1,19 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const { isDomainValid, isEmailValid, ipRegex, uriRegex } = require('@hapi/address');
-const EscapeRegex = require('@hapi/hoek/escapeRegex');
-const Tlds = require('@hapi/tlds');
+const Assert = require('@hapi/hoek/lib/assert');
+const Domain = require('@sideway/address/lib/domain');
+const Email = require('@sideway/address/lib/email');
+const Ip = require('@sideway/address/lib/ip');
+const EscapeRegex = require('@hapi/hoek/lib/escapeRegex');
+const Tlds = require('@sideway/address/lib/tlds');
+const Uri = require('@sideway/address/lib/uri');
 
 const Any = require('./any');
 const Common = require('../common');
 
 
 const internals = {
-    tlds: Tlds.tlds instanceof Set ? { tlds: { allow: Tlds.tlds, deny: null } } : false,              // $lab:coverage:ignore$
+    tlds: Tlds instanceof Set ? { tlds: { allow: Tlds, deny: null } } : false,              // $lab:coverage:ignore$
     base64Regex: {
         // paddingRequired
         true: {
@@ -25,7 +28,7 @@ const internals = {
     },
     dataUriRegex: /^data:[\w+.-]+\/[\w+.-]+;((charset=[\w-]+|base64),)?(.*)$/,
     hexRegex: /^[a-f0-9]+$/i,
-    ipRegex: ipRegex({ cidr: 'forbidden' }).regex,
+    ipRegex: Ip.regex({ cidr: 'forbidden' }).regex,
     isoDurationRegex: /^P(?!$)(\d+Y)?(\d+M)?(\d+W)?(\d+D)?(T(?=\d)(\d+H)?(\d+M)?(\d+S)?)?$/,
 
     guidBrackets: {
@@ -261,7 +264,7 @@ module.exports = Any.extend({
             method(options) {
 
                 if (options) {
-                    Common.assertOptions(options, ['allowFullyQualified', 'allowUnicode', 'allowUnderscore', 'maxDomainSegments', 'minDomainSegments', 'tlds']);
+                    Common.assertOptions(options, ['allowFullyQualified', 'allowUnicode', 'maxDomainSegments', 'minDomainSegments', 'tlds']);
                 }
 
                 const address = internals.addressOptions(options);
@@ -269,7 +272,7 @@ module.exports = Any.extend({
             },
             validate(value, helpers, args, { address }) {
 
-                if (isDomainValid(value, address)) {
+                if (Domain.isValid(value, address)) {
                     return value;
                 }
 
@@ -293,7 +296,7 @@ module.exports = Any.extend({
                 const emails = options.multiple ? value.split(regex) : [value];
                 const invalids = [];
                 for (const email of emails) {
-                    if (!isEmailValid(email, address)) {
+                    if (!Email.isValid(email, address)) {
                         invalids.push(email);
                     }
                 }
@@ -392,7 +395,7 @@ module.exports = Any.extend({
             },
             validate(value, helpers) {
 
-                if (isDomainValid(value, { minDomainSegments: 1 }) ||
+                if (Domain.isValid(value, { minDomainSegments: 1 }) ||
                     internals.ipRegex.test(value)) {
 
                     return value;
@@ -414,7 +417,7 @@ module.exports = Any.extend({
 
                 Common.assertOptions(options, ['cidr', 'version']);
 
-                const { cidr, versions, regex } = ipRegex(options);
+                const { cidr, versions, regex } = Ip.regex(options);
                 const version = options.version ? versions : undefined;
                 return this.$_addRule({ name: 'ip', args: { options: { cidr, version } }, regex });
             },
@@ -639,7 +642,7 @@ module.exports = Any.extend({
                     Common.assertOptions(options.domain, ['allowFullyQualified', 'allowUnicode', 'maxDomainSegments', 'minDomainSegments', 'tlds']);
                 }
 
-                const { regex, scheme } = uriRegex(options);
+                const { regex, scheme } = Uri.regex(options);
                 const domain = options.domain ? internals.addressOptions(options.domain) : null;
                 return this.$_addRule({ name: 'uri', args: { options }, regex, domain, scheme });
             },
@@ -654,7 +657,7 @@ module.exports = Any.extend({
                     const matched = match[1] || match[2];
                     if (domain &&
                         (!options.allowRelative || matched) &&
-                        !isDomainValid(matched, domain)) {
+                        !Domain.isValid(matched, domain)) {
 
                         return helpers.error('string.domain', { value: matched });
                     }
@@ -772,7 +775,7 @@ internals.addressOptions = function (options) {
 
     const allow = options.tlds.allow;
     if (!allow) {
-        return { ...options, tlds: false };
+        return options;
     }
 
     if (allow === true) {
@@ -793,7 +796,7 @@ internals.addressOptions = function (options) {
 internals.validateTlds = function (set, source) {
 
     for (const tld of set) {
-        Assert(isDomainValid(tld, { minDomainSegments: 1, maxDomainSegments: 1 }), `${source} must contain valid top level domain names`);
+        Assert(Domain.isValid(tld, { minDomainSegments: 1, maxDomainSegments: 1 }), `${source} must contain valid top level domain names`);
     }
 };
 

package/lib/types/symbol.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Any = require('./any');
 

package/lib/validator.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
-const Ignore = require('@hapi/hoek/ignore');
-const Reach = require('@hapi/hoek/reach');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
+const Ignore = require('@hapi/hoek/lib/ignore');
+const Reach = require('@hapi/hoek/lib/reach');
 
 const Common = require('./common');
 const Errors = require('./errors');

package/lib/values.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const DeepEqual = require('@hapi/hoek/deepEqual');
+const Assert = require('@hapi/hoek/lib/assert');
+const DeepEqual = require('@hapi/hoek/lib/deepEqual');
 
 const Common = require('./common');
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "joi",
     "description": "Object schema validation",
-    "version": "17.8.2",
+    "version": "17.8.3",
     "repository": "git://github.com/hapijs/joi",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -15,18 +15,17 @@
         "validation"
     ],
     "dependencies": {
-        "@hapi/hoek": "^11.0.2",
-        "@hapi/tlds": "^1.0.1",
-        "@hapi/topo": "^6.0.1",
-        "@hapi/address": "^5.1.0",
-        "@hapi/pinpoint": "^2.0.1",
-        "@hapi/formula": "^3.0.2"
+        "@hapi/hoek": "^9.0.0",
+        "@hapi/topo": "^5.0.0",
+        "@sideway/address": "^4.1.3",
+        "@sideway/formula": "^3.0.1",
+        "@sideway/pinpoint": "^2.0.0"
     },
     "devDependencies": {
-        "@hapi/bourne": "^3.0.0",
-        "@hapi/code": "^9.0.3",
+        "@hapi/bourne": "2.x.x",
+        "@hapi/code": "8.x.x",
         "@hapi/joi-legacy-test": "npm:@hapi/joi@15.x.x",
-        "@hapi/lab": "^25.1.2",
+        "@hapi/lab": "^25.0.1",
         "@types/node": "^14.18.24",
         "typescript": "4.3.x"
     },