joi 17.13.2 → 18.0.0

package/lib/types/symbol.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/lib/assert');
+const { assert } = require('@hapi/hoek');
 
 const Any = require('./any');
 
@@ -62,17 +62,17 @@ module.exports = Any.extend({
                     iterable = Object.entries(iterable);
                 }
 
-                Assert(iterable && iterable[Symbol.iterator], 'Iterable must be an iterable or object');
+                assert(iterable && iterable[Symbol.iterator], 'Iterable must be an iterable or object');
 
                 const obj = this.clone();
 
                 const symbols = [];
                 for (const entry of iterable) {
-                    Assert(entry && entry[Symbol.iterator], 'Entry must be an iterable');
+                    assert(entry && entry[Symbol.iterator], 'Entry must be an iterable');
                     const [key, value] = entry;
 
-                    Assert(typeof key !== 'object' && typeof key !== 'function' && typeof key !== 'symbol', 'Key must not be of type object, function, or Symbol');
-                    Assert(typeof value === 'symbol', 'Value must be a Symbol');
+                    assert(typeof key !== 'object' && typeof key !== 'function' && typeof key !== 'symbol', 'Key must not be of type object, function, or Symbol');
+                    assert(typeof value === 'symbol', 'Value must be a Symbol');
 
                     obj.$_terms.map.set(key, value);
                     symbols.push(value);

package/lib/validator.js

@@ -1,9 +1,6 @@
 'use strict';
 
-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 { assert, clone, ignore, reach } = require('@hapi/hoek');
 
 const Common = require('./common');
 const Errors = require('./errors');
@@ -19,13 +16,13 @@ exports.entry = function (value, schema, prefs) {
 
     let settings = Common.defaults;
     if (prefs) {
-        Assert(prefs.warnings === undefined, 'Cannot override warnings preference in synchronous validation');
-        Assert(prefs.artifacts === undefined, 'Cannot override artifacts preference in synchronous validation');
+        assert(prefs.warnings === undefined, 'Cannot override warnings preference in synchronous validation');
+        assert(prefs.artifacts === undefined, 'Cannot override artifacts preference in synchronous validation');
         settings = Common.preferences(Common.defaults, prefs);
     }
 
     const result = internals.entry(value, schema, settings);
-    Assert(!result.mainstay.externals.length, 'Schema with external rules must use validateAsync()');
+    assert(!result.mainstay.externals.length, 'Schema with external rules must use validateAsync()');
     const outcome = { value: result.value };
 
     if (result.error) {
@@ -76,7 +73,7 @@ exports.entryAsync = async function (value, schema, prefs) {
             let parent;
 
             const ancestors = path.length ? [root] : [];
-            const original = path.length ? Reach(value, path) : value;
+            const original = path.length ? reach(value, path) : value;
 
             if (path.length) {
                 key = path[path.length - 1];
@@ -189,6 +186,17 @@ exports.entryAsync = async function (value, schema, prefs) {
 };
 
 
+exports.standard = function (value, schema) {
+
+
+    if (schema.isAsync()) {
+        return exports.entryAsync(value, schema);
+    }
+
+    return exports.entry(value, schema);
+};
+
+
 internals.Mainstay = class {
 
     constructor(tracer, debug, links) {
@@ -259,7 +267,7 @@ internals.tracer = function (schema, prefs) {
     }
 
     if (prefs.debug) {
-        Assert(schema.$_root.trace, 'Debug mode not supported');
+        assert(schema.$_root.trace, 'Debug mode not supported');
         return { tracer: schema.$_root.trace()._register(schema), cleanup: true };
     }
 
@@ -575,7 +583,7 @@ internals.finalize = function (value, errors, helpers) {
             }
 
             for (const error of errors) {
-                Assert(error instanceof Error || error instanceof Errors.Report, 'error() must return an Error object');
+                assert(error instanceof Error || error instanceof Errors.Report, 'error() must return an Error object');
             }
         }
         else {
@@ -687,7 +695,7 @@ internals.default = function (flag, value, errors, helpers) {
     }
 
     if (typeof source === 'function') {
-        const args = source.length ? [Clone(state.ancestors[0]), helpers] : [];
+        const args = source.length ? [clone(state.ancestors[0]), helpers] : [];
 
         try {
             return source(...args);
@@ -710,7 +718,7 @@ internals.default = function (flag, value, errors, helpers) {
         return source.resolve(value, state, prefs);
     }
 
-    return Clone(source);
+    return clone(source);
 };
 
 
@@ -733,12 +741,12 @@ internals.trim = function (value, schema) {
 
 internals.ignore = {
     active: false,
-    debug: Ignore,
-    entry: Ignore,
-    filter: Ignore,
-    log: Ignore,
-    resolve: Ignore,
-    value: Ignore
+    debug: ignore,
+    entry: ignore,
+    filter: ignore,
+    log: ignore,
+    resolve: ignore,
+    value: ignore
 };
 
 

package/lib/values.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/lib/assert');
-const DeepEqual = require('@hapi/hoek/lib/deepEqual');
+const { assert, deepEqual } = require('@hapi/hoek');
 
 const Common = require('./common');
 
@@ -132,7 +131,7 @@ module.exports = internals.Values = class {
 
         if (typeof value === 'object') {
             for (const item of this._values) {
-                if (DeepEqual(item, value)) {
+                if (deepEqual(item, value)) {
                     return { value: item };
                 }
             }
@@ -165,7 +164,7 @@ module.exports = internals.Values = class {
                         }
                     }
                     else {
-                        if (DeepEqual(item, value)) {
+                        if (deepEqual(item, value)) {
                             return { value: item, ref };
                         }
                     }
@@ -209,7 +208,7 @@ module.exports = internals.Values = class {
 
     concat(source) {
 
-        Assert(!source._override, 'Cannot concat override set of values');
+        assert(!source._override, 'Cannot concat override set of values');
 
         const set = new internals.Values([...this._values, ...source._values], [...this._refs, ...source._refs]);
         set._override = this._override;

package/package.json

@@ -1,8 +1,14 @@
 {
     "name": "joi",
     "description": "Object schema validation",
-    "version": "17.13.2",
-    "repository": "git://github.com/hapijs/joi",
+    "version": "18.0.0",
+    "repository": {
+        "url": "git://github.com/hapijs/joi",
+        "type": "git"
+    },
+    "engines": {
+        "node": ">= 20"
+    },
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "browser": "dist/joi-browser.min.js",
@@ -15,19 +21,22 @@
         "validation"
     ],
     "dependencies": {
-        "@hapi/hoek": "^9.3.0",
-        "@hapi/topo": "^5.1.0",
-        "@sideway/address": "^4.1.5",
-        "@sideway/formula": "^3.0.1",
-        "@sideway/pinpoint": "^2.0.0"
+        "@hapi/address": "^5.1.1",
+        "@hapi/formula": "^3.0.2",
+        "@hapi/hoek": "^11.0.7",
+        "@hapi/pinpoint": "^2.0.1",
+        "@hapi/tlds": "^1.1.1",
+        "@hapi/topo": "^6.0.2",
+        "@standard-schema/spec": "^1.0.0"
     },
     "devDependencies": {
-        "@hapi/bourne": "2.x.x",
-        "@hapi/code": "8.x.x",
+        "@hapi/bourne": "^3.0.0",
+        "@hapi/code": "^9.0.3",
+        "@hapi/eslint-plugin": "^7.0.0",
         "@hapi/joi-legacy-test": "npm:@hapi/joi@15.x.x",
-        "@hapi/lab": "^25.1.3",
-        "@types/node": "^14.18.63",
-        "typescript": "4.3.x"
+        "@hapi/lab": "^26.0.0",
+        "@types/node": "^20.17.47",
+        "typescript": "^5.8.3"
     },
     "scripts": {
         "prepublishOnly": "cd browser && npm install && npm run build",