joi 17.1.1 → 17.4.0

package/lib/validator.js

@@ -20,6 +20,7 @@ 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');
         settings = Common.preferences(Common.defaults, prefs);
     }
 
@@ -39,6 +40,10 @@ exports.entry = function (value, schema, prefs) {
         outcome.debug = result.mainstay.debug;
     }
 
+    if (result.mainstay.artifacts) {
+        outcome.artifacts = result.mainstay.artifacts;
+    }
+
     return outcome;
 };
 
@@ -74,7 +79,7 @@ exports.entryAsync = async function (value, schema, prefs) {
             }
 
             try {
-                const output = await method(node);
+                const output = await method(node, { prefs });
                 if (output === undefined ||
                     output === node) {
 
@@ -98,7 +103,8 @@ exports.entryAsync = async function (value, schema, prefs) {
     }
 
     if (!settings.warnings &&
-        !settings.debug) {
+        !settings.debug &&
+        !settings.artifacts) {
 
         return result.value;
     }
@@ -112,6 +118,10 @@ exports.entryAsync = async function (value, schema, prefs) {
         outcome.debug = mainstay.debug;
     }
 
+    if (mainstay.artifacts) {
+        outcome.artifacts = mainstay.artifacts;
+    }
+
     return outcome;
 };
 
@@ -190,6 +200,7 @@ exports.validate = function (value, schema, state, prefs, overrides = {}) {
         schema,
         state,
         error: createError,
+        errorsArray: internals.errorsArray,
         warn: (code, local, localState) => state.mainstay.warnings.push(createError(code, local, localState)),
         message: (messages, local) => schema.$_createError('custom', value, local, state, prefs, { messages })
     };
@@ -244,7 +255,7 @@ exports.validate = function (value, schema, state, prefs, overrides = {}) {
 
     // Presence requirements (required, optional, forbidden)
 
-    const presence = overrides.presence || schema._flags.presence || (schema._flags._endedSwitch ? 'ignore' : prefs.presence);
+    const presence = overrides.presence || schema._flags.presence || (schema._flags._endedSwitch ? null : prefs.presence);
     if (value === undefined) {
         if (presence === 'forbidden') {
             return internals.finalize(value, null, helpers);
@@ -416,7 +427,7 @@ internals.rule = function (ret, rule) {
     }
 
     if (Array.isArray(ret) &&
-        (ret[0] instanceof Errors.Report || ret[0] instanceof Error)) {
+        ret[Common.symbols.errors]) {
 
         ret.forEach((report) => internals.error(report, rule));
         return { errors: ret, value: null };
@@ -523,6 +534,20 @@ internals.finalize = function (value, errors, helpers) {
         schema._cache.set(helpers.original, result);
     }
 
+    // Artifacts
+
+    if (value !== undefined &&
+        !result.errors &&
+        schema._flags.artifact !== undefined) {
+
+        state.mainstay.artifacts = state.mainstay.artifacts || new Map();
+        if (!state.mainstay.artifacts.has(schema._flags.artifact)) {
+            state.mainstay.artifacts.set(schema._flags.artifact, []);
+        }
+
+        state.mainstay.artifacts.get(schema._flags.artifact).push(state.path);
+    }
+
     return result;
 };
 
@@ -615,3 +640,11 @@ internals.ignore = {
     resolve: Ignore,
     value: Ignore
 };
+
+
+internals.errorsArray = function () {
+
+    const errors = [];
+    errors[Common.symbols.errors] = true;
+    return errors;
+};

package/package.json

@@ -1,35 +1,37 @@
 {
-  "name": "joi",
-  "description": "Object schema validation",
-  "version": "17.1.1",
-  "repository": "git://github.com/sideway/joi",
-  "main": "lib/index.js",
-  "browser": "dist/joi-browser.min.js",
-  "files": [
-    "lib/**/*",
-    "dist/*"
-  ],
-  "keywords": [
-    "schema",
-    "validation"
-  ],
-  "dependencies": {
-    "@hapi/address": "^4.0.1",
-    "@hapi/formula": "^2.0.0",
-    "@hapi/hoek": "^9.0.0",
-    "@hapi/pinpoint": "^2.0.0",
-    "@hapi/topo": "^5.0.0"
-  },
-  "devDependencies": {
-    "@hapi/bourne": "2.x.x",
-    "@hapi/code": "8.x.x",
-    "@hapi/lab": "22.x.x",
-    "@hapi/joi-legacy-test": "npm:@hapi/joi@15.x.x"
-  },
-  "scripts": {
-    "prepublishOnly": "cd browser && npm install && npm run build",
-    "test": "lab -t 100 -a @hapi/code -L",
-    "test-cov-html": "lab -r html -o coverage.html -a @hapi/code"
-  },
-  "license": "BSD-3-Clause"
+    "name": "joi",
+    "description": "Object schema validation",
+    "version": "17.4.0",
+    "repository": "git://github.com/sideway/joi",
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
+    "browser": "dist/joi-browser.min.js",
+    "files": [
+        "lib/**/*",
+        "dist/*"
+    ],
+    "keywords": [
+        "schema",
+        "validation"
+    ],
+    "dependencies": {
+        "@hapi/hoek": "^9.0.0",
+        "@hapi/topo": "^5.0.0",
+        "@sideway/address": "^4.1.0",
+        "@sideway/formula": "^3.0.0",
+        "@sideway/pinpoint": "^2.0.0"
+    },
+    "devDependencies": {
+        "@hapi/bourne": "2.x.x",
+        "@hapi/code": "8.x.x",
+        "@hapi/joi-legacy-test": "npm:@hapi/joi@15.x.x",
+        "@hapi/lab": "24.x.x",
+        "typescript": "4.0.x"
+    },
+    "scripts": {
+        "prepublishOnly": "cd browser && npm install && npm run build",
+        "test": "lab -t 100 -a @hapi/code -L -Y",
+        "test-cov-html": "lab -r html -o coverage.html -a @hapi/code"
+    },
+    "license": "BSD-3-Clause"
 }