@nhtio/validation 0.1.0-master-87fc6cd7 → 0.1.0-master-06559f66

package/README.md

@@ -6,8 +6,4 @@ For more information, see the [official documentation](https://validation.nht.io
 
 ## Wish List
 
-- JSON
-- YAML
-- string.fqdn
-- Encrypted / Decrypted chaining
 - Hash comparisons

package/index.cjs

@@ -37166,7 +37166,7 @@ var require_messages = __commonJSMin((exports) => {
 var require_extend = __commonJSMin((exports) => {
 	const { assert: assert$23, clone: clone$10 } = require_lib$4();
 	const Common$19 = require_common();
-	const Messages$5 = require_messages();
+	const Messages$6 = require_messages();
 	const internals$21 = {};
 	exports.type = function(from$2, options) {
 		const base$3 = Object.getPrototypeOf(from$2);
@@ -37176,7 +37176,7 @@ var require_extend = __commonJSMin((exports) => {
 		delete def.base;
 		prototype._definition = def;
 		const parent = base$3._definition || {};
-		def.messages = Messages$5.merge(parent.messages, def.messages);
+		def.messages = Messages$6.merge(parent.messages, def.messages);
 		def.properties = Object.assign({}, parent.properties, def.properties);
 		schema$2.type = def.type;
 		def.flags = Object.assign({}, parent.flags, def.flags);
@@ -37319,7 +37319,7 @@ var require_manifest = __commonJSMin((exports) => {
 	init_dist();
 	const { assert: assert$22, clone: clone$9 } = require_lib$4();
 	const Common$18 = require_common();
-	const Messages$4 = require_messages();
+	const Messages$5 = require_messages();
 	const Ref$6 = require_ref();
 	const Template$5 = require_template();
 	let Schemas$3;
@@ -37336,7 +37336,7 @@ var require_manifest = __commonJSMin((exports) => {
 		if (schema$2._preferences) {
 			desc$1.preferences = clone$9(schema$2._preferences, { shallow: ["messages"] });
 			delete desc$1.preferences[Common$18.symbols.prefs];
-			if (desc$1.preferences.messages) desc$1.preferences.messages = Messages$4.decompile(desc$1.preferences.messages);
+			if (desc$1.preferences.messages) desc$1.preferences.messages = Messages$5.decompile(desc$1.preferences.messages);
 		}
 		if (schema$2._valids) desc$1.allow = schema$2._valids.describe();
 		if (schema$2._invalids) desc$1.invalid = schema$2._invalids.describe();
@@ -38617,7 +38617,7 @@ var require_base = __commonJSMin((exports, module) => {
 	const Errors$5 = require_errors();
 	const Extend$2 = require_extend();
 	const Manifest$2 = require_manifest();
-	const Messages$3 = require_messages();
+	const Messages$4 = require_messages();
 	const Modify = require_modify();
 	const Ref$4 = require_ref();
 	const Trace$2 = require_trace();
@@ -39022,7 +39022,7 @@ var require_base = __commonJSMin((exports, module) => {
 		}
 		$_createError(code$2, value, local, state, prefs, options = {}) {
 			const flags = options.flags !== false ? this._flags : {};
-			const messages$3 = options.messages ? Messages$3.merge(this._definition.messages, options.messages) : this._definition.messages;
+			const messages$3 = options.messages ? Messages$4.merge(this._definition.messages, options.messages) : this._definition.messages;
 			return new Errors$5.Report(code$2, value, local, flags, messages$3, state, prefs);
 		}
 		$_getFlag(name$2) {
@@ -39291,7 +39291,7 @@ var require_any = __commonJSMin((exports, module) => {
 	const { assert: assert$17 } = require_lib$4();
 	const Base = require_base();
 	const Common$12 = require_common();
-	const Messages$2 = require_messages();
+	const Messages$3 = require_messages();
 	module.exports = Base.extend({
 		type: "any",
 		flags: { only: { default: false } },
@@ -39363,7 +39363,7 @@ var require_any = __commonJSMin((exports, module) => {
 				rule.keep = enabled;
 			},
 			message(rule, message) {
-				rule.message = Messages$2.compile(message);
+				rule.message = Messages$3.compile(message);
 			},
 			warn(rule, enabled = true) {
 				rule.warn = enabled;
@@ -45239,7 +45239,7 @@ var require_schemas = __commonJSMin((exports) => {
 var require_common = __commonJSMin((exports) => {
 	const { assert: Assert, AssertError } = require_lib$4();
 	const Pkg = (init_package(), __toCommonJS(package_exports).default);
-	let Messages$1;
+	let Messages$2;
 	let Schemas$1;
 	const internals$1 = { 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)?)?)?)?$/ };
 	exports.version = Pkg.version;
@@ -45329,7 +45329,7 @@ var require_common = __commonJSMin((exports) => {
 		return Number.isSafeInteger(value) && value >= 0;
 	};
 	exports.preferences = function(target, source) {
-		Messages$1 = Messages$1 || require_messages();
+		Messages$2 = Messages$2 || require_messages();
 		target = target || {};
 		source = source || {};
 		const merged = Object.assign({}, target, source);
@@ -45337,7 +45337,7 @@ var require_common = __commonJSMin((exports) => {
 			merged.errors = Object.assign({}, target.errors, source.errors);
 			merged.errors.wrap = Object.assign({}, target.errors.wrap, source.errors.wrap);
 		}
-		if (source.messages) merged.messages = Messages$1.compile(source.messages, target.messages);
+		if (source.messages) merged.messages = Messages$2.compile(source.messages, target.messages);
 		delete merged[exports.symbols.prefs];
 		return merged;
 	};
@@ -45807,7 +45807,7 @@ var RootFactory = class RootFactory {
 		return instance;
 	}
 };
-var import_messages = __toESM(require_messages());
+var import_messages$1 = __toESM(require_messages());
 const knexMessages = {
 	"knex.unique": "The {{#label}} has already been taken",
 	"knex.exists": "The selected {{#label}} is invalid",
@@ -45855,7 +45855,7 @@ const resolveQueryBuilder = (connection, table$2) => {
 		query: conn.table(table$2)
 	};
 };
-const getMergableMessages = (schema$2) => {
+const getMergableMessages$1 = (schema$2) => {
 	if ("_definition" in schema$2) {
 		const def = schema$2._definition;
 		if ("messages" in def && def.messages) if ("string" === typeof def.messages) return {};
@@ -45902,8 +45902,8 @@ function findKnexConnection() {
 }
 const knex = (schema$2, root$11, args$1) => {
 	const prototype = Object.getPrototypeOf(schema$2);
-	const originalMessages = getMergableMessages(schema$2);
-	const mergedMessages = import_messages.merge(originalMessages, knexMessages);
+	const originalMessages = getMergableMessages$1(schema$2);
+	const mergedMessages = import_messages$1.merge(originalMessages, knexMessages);
 	prototype._definition.messages = mergedMessages;
 	prototype._definition.flags.knexConnection = {
 		default: void 0,
@@ -46047,6 +46047,43 @@ const knex = (schema$2, root$11, args$1) => {
 	};
 	return RootFactory.generate(root$11, schema$2, args$1);
 };
+var import_messages = __toESM(require_messages());
+const fqdnMessages = { "string.fqdn": "{{#label}} must be a valid fully qualified domain name" };
+const getMergableMessages = (schema$2) => {
+	if ("_definition" in schema$2) {
+		const def = schema$2._definition;
+		if ("messages" in def && def.messages) if ("string" === typeof def.messages) return {};
+		else return def.messages;
+	}
+	return {};
+};
+const fqdn = (schema$2, root$11, args$1) => {
+	if (schema$2.type !== "string") return schema$2;
+	const prototype = Object.getPrototypeOf(schema$2);
+	const originalMessages = getMergableMessages(schema$2);
+	const mergedMessages = import_messages.merge(originalMessages, fqdnMessages);
+	prototype._definition.messages = mergedMessages;
+	prototype._definition.rules.fqdn = {
+		method() {
+			return this.addRule("fqdn");
+		},
+		validate(value, helpers$8) {
+			if ("string" !== typeof value || value.trim().length === 0) return void 0;
+			if (value.includes("..")) return helpers$8.error("string.fqdn");
+			const labels = value.split(".");
+			for (const label of labels) {
+				if (label.length === 0 || label.length > 63) return helpers$8.error("string.fqdn");
+				if (label.startsWith("-") || label.endsWith("-")) return helpers$8.error("string.fqdn");
+				if (!/^[a-zA-Z0-9-]+$/.test(label)) return helpers$8.error("string.fqdn");
+			}
+			return value;
+		}
+	};
+	if (!prototype.fqdn) prototype.fqdn = function() {
+		return this.$_addRule({ name: "fqdn" });
+	};
+	return RootFactory.generate(root$11, schema$2, args$1);
+};
 var De = (t$7) => {
 	throw TypeError(t$7);
 };
@@ -134809,6 +134846,13 @@ const phone = function(joi) {
 		type: "phone",
 		base: joi.any(),
 		validate(value, { error, schema: schema$2, prefs, state }) {
+			const isEmpty$13 = value === null || value === void 0;
+			const isRequired = schema$2._flags.presence === "required";
+			if (isEmpty$13 && !isRequired) return { value: null };
+			if (isEmpty$13 && isRequired) return {
+				value,
+				errors: [error("any.required", { label: schema$2._flags.label })]
+			};
 			const arg = schema$2.$_getFlag("country");
 			const country = joi.isRef(arg) ? arg.resolve(value, state, prefs) : arg;
 			const pObj = getPhoneObject(value, country);
@@ -135517,6 +135561,13 @@ const bigint = function(joi) {
 			compare: {
 				method: false,
 				validate(value, helpers$8, { limit }, { name: name$2, operator: operator$1 }) {
+					const isEmpty$13 = value === null || value === void 0;
+					const isRequired = helpers$8.schema._flags.presence === "required";
+					if (isEmpty$13 && !isRequired) return null;
+					if (isEmpty$13 && isRequired) return {
+						value,
+						errors: [helpers$8.error("any.required", { label: helpers$8.schema._flags.label })]
+					};
 					const big = big_default(value.toString());
 					const threshold = big_default(limit.toString());
 					const valid$2 = compare$13(big, threshold, operator$1);
@@ -140136,6 +140187,13 @@ const toDateTime = (value, format) => {
 	return false;
 };
 const coerce$2 = (value, helpers$8) => {
+	const isEmpty$13 = value === null || value === void 0;
+	const isRequired = helpers$8.schema._flags.presence === "required";
+	if (isEmpty$13 && !isRequired) return { value: null };
+	if (isEmpty$13 && isRequired) return {
+		value,
+		errors: [helpers$8.error("any.required", { label: helpers$8.schema._flags.label })]
+	};
 	const converted = toDateTime(value);
 	if (converted) {
 		const { schema: schema$2, prefs } = helpers$8;
@@ -140540,7 +140598,8 @@ const knownMessages = {
 	...messages$1,
 	...messages$2,
 	...messages,
-	...knexMessages
+	...knexMessages,
+	...fqdnMessages
 };
 countries.forEach((name$2, iso) => {
 	knownMessages[`country.${iso}`] = name$2;
@@ -140731,6 +140790,7 @@ const i18n = (toPatch) => {
 						"string.uriCustomScheme": $t("string.uriCustomScheme"),
 						"string.uriRelativeOnly": $t("string.uriRelativeOnly"),
 						"string.uppercase": $t("string.uppercase"),
+						...fqdnMessages,
 						...knexTranslations
 					});
 					case "symbol": return applyMessagesToSchema(schema$2, {
@@ -143076,7 +143136,7 @@ const encode = (schema$2, options = {}) => {
 		});
 	}
 	const json$1 = JSON.stringify({
-		version: "0.1.0-master-87fc6cd7",
+		version: "0.1.0-master-06559f66",
 		schema: description$2
 	}, (key, value) => {
 		if (typeof value === "bigint") return value.toString();
@@ -143124,14 +143184,14 @@ const decode = (base64, options = {}) => {
 	});
 	if (!isPlainObject(description$2) || !("version" in description$2) || !("schema" in description$2) || typeof description$2.version !== "string" || !isPlainObject(description$2.schema)) throw new TypeError("Not a valid encoded schema");
 	const { version: schemaVersion, schema: schema$2 } = description$2;
-	if (import_semver.valid("0.1.0-master-87fc6cd7")) {
+	if (import_semver.valid("0.1.0-master-06559f66")) {
 		if (!import_semver.valid(import_semver.coerce(schemaVersion))) throw new TypeError(`Invalid schema version: ${schemaVersion}`);
-		if (import_semver.gt(import_semver.coerce(schemaVersion), "0.1.0-master-87fc6cd7")) throw new TypeError(`Schema version ${schemaVersion} is not compatible with current version 0.1.0-master-87fc6cd7`);
+		if (import_semver.gt(import_semver.coerce(schemaVersion), "0.1.0-master-06559f66")) throw new TypeError(`Schema version ${schemaVersion} is not compatible with current version 0.1.0-master-06559f66`);
 	}
 	return validator.build(schema$2);
 };
 const Joi = RootFactory.create({
-	schemaTypeModifiers: [knex],
+	schemaTypeModifiers: [knex, fqdn],
 	shortcutsModifiers: []
 });
 const validator = patch(Joi.extend(bigint).extend(datetime).extend(phone));
@@ -144580,7 +144640,7 @@ init_esm();
 var import_lib = __toESM(require_lib$3());
 var import_lib$1 = __toESM(require_lib$2());
 var import_lib$2 = __toESM(require_lib());
-const version = "0.1.0-master-87fc6cd7";
+const version = "0.1.0-master-06559f66";
 Object.defineProperty(exports, "ValidationError", {
 	enumerable: true,
 	get: function() {