@nhtio/validation 0.1.0-master-67185cae → 0.1.0-master-effacff6

package/index.mjs

@@ -93982,6 +93982,87 @@ Settings.defaultWeekSettings = {
 	weekend: [6, 7]
 };
 Settings.throwOnInvalid = false;
+const removeComments = (str) => {
+	str = str.replace(/\/\/.*$/gm, "");
+	str = str.replace(/\/\*[\s\S]*?\*\//g, "");
+	return str;
+};
+const extractFunctionBody = (fn$1) => {
+	const fnString = fn$1.toString();
+	if (fnString.includes("[native code]")) throw new Error("Cannot extract body from native function");
+	const cleanedString = removeComments(fnString);
+	const arrowMatch = cleanedString.match(/^\s*(?:async\s+)?(?:\([^)]*\)|[^=]+)\s*=>\s*(.+)$/s);
+	if (arrowMatch && !arrowMatch[1].trim().startsWith("{")) {
+		const expression = arrowMatch[1].trim().replace(/;?\s*$/, "");
+		if (expression.startsWith("(") && expression.endsWith(")")) {
+			const unwrapped = expression.slice(1, -1).trim();
+			if (unwrapped.startsWith("{") && unwrapped.endsWith("}")) return `return ${unwrapped}`;
+		}
+		return `return ${expression}`;
+	}
+	let braceCount = 0;
+	let inString = false;
+	let stringChar = "";
+	let inTemplate = false;
+	let escaped = false;
+	let firstBrace = -1;
+	let lastBrace = -1;
+	for (const [i$3, char] of Array.from(cleanedString).entries()) {
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (!inString && !inTemplate) {
+			if (char === "\"" || char === "'") {
+				inString = true;
+				stringChar = char;
+				continue;
+			}
+			if (char === "`") {
+				inTemplate = true;
+				continue;
+			}
+		} else if (inString && char === stringChar) {
+			inString = false;
+			continue;
+		} else if (inTemplate && char === "`") {
+			inTemplate = false;
+			continue;
+		}
+		if (!inString && !inTemplate) {
+			if (char === "{") {
+				if (firstBrace === -1) firstBrace = i$3;
+				braceCount++;
+			} else if (char === "}") {
+				braceCount--;
+				if (braceCount === 0 && firstBrace !== -1) {
+					lastBrace = i$3;
+					break;
+				}
+			}
+		}
+	}
+	if (firstBrace === -1 || lastBrace === -1 || firstBrace >= lastBrace) throw new Error("Unable to extract function body - no valid braces found");
+	const body = cleanedString.slice(firstBrace + 1, lastBrace).trim();
+	if (/\breturn\b/.test(body)) return body;
+	const beforeBrace = cleanedString.slice(0, firstBrace).trim();
+	if (beforeBrace.endsWith("=>") || beforeBrace.endsWith("=> (") || beforeBrace.endsWith("=>(")) {
+		const objectLiteralPattern = /^\s*(?:[a-zA-Z_$][\w$]*\s*:|["'`][^"'`]+["'`]\s*:|get\s+|set\s+|\[)/;
+		if (objectLiteralPattern.test(body)) return `return {${body}}`;
+	}
+	return `return ${body}`;
+};
+const compileCallback = (body) => {
+	try {
+		return new Function("dt", "helpers", body);
+	} catch (error) {
+		throw new Error(`Failed to compile callback: ${error instanceof Error ? error.message : String(error)}`);
+	}
+};
 const messages$2 = {
 	"datetime.base": "{{#label}} must be a datetime value",
 	"datetime.exactly": "{{#label}} must be a datetime exactly equal to {{#limit}}",
@@ -94028,8 +94109,9 @@ const toDateTime = (value, format) => {
 			const dateTime = DateTime.fromFormat(value, format, { zone: "utc" });
 			if (dateTime.isValid) return dateTime;
 		}
+		const isoDateTime = DateTime.fromISO(value, { setZone: true });
+		if (isoDateTime.isValid) return isoDateTime;
 		const luxonMethods = [
-			DateTime.fromISO,
 			DateTime.fromRFC2822,
 			DateTime.fromHTTP,
 			DateTime.fromSQL
@@ -94049,10 +94131,27 @@ const coerce$2 = (value, helpers) => {
 		const { schema, prefs } = helpers;
 		if (prefs.convert) {
 			let returnable = converted;
-			if (schema._flags.setZone && Array.isArray(schema._flags.setZone)) {
+			if (schema._flags.setZone && Array.isArray(schema._flags.setZone)) if (Array.isArray(schema._flags.setZone[0])) Array.from(schema._flags.setZone).forEach((f) => {
+				if (!f) return;
+				const [zone, opts] = Array.from(f);
+				switch (zone) {
+					case "utc":
+					case "UTC":
+						returnable = returnable.toUTC();
+						break;
+					case "local":
+						returnable = returnable.toLocal();
+						break;
+					default:
+						returnable = returnable.setZone(zone, opts);
+						break;
+				}
+			});
+			else {
 				const [zone, opts] = Array.from(schema._flags.setZone);
 				switch (zone) {
 					case "utc":
+					case "UTC":
 						returnable = returnable.toUTC();
 						break;
 					case "local":
@@ -94068,8 +94167,19 @@ const coerce$2 = (value, helpers) => {
 				if (Array.isArray(schema._flags.toFormat)) {
 					const fmt = Array.from(schema._flags.toFormat);
 					const method = fmt.shift();
-					returnable = returnable[method](...fmt);
-				} else if (typeof schema._flags.toFormat === "string") returnable = returnable.toFormat(schema._flags.toFormat);
+					const processedArgs = fmt.map((arg) => {
+						if (typeof arg === "string" && arg.includes("return")) {
+							const compiledFn = compileCallback(arg);
+							return compiledFn(returnable, helpers);
+						}
+						return arg;
+					});
+					returnable = returnable[method](...processedArgs);
+				} else if (typeof schema._flags.toFormat === "string") if (schema._flags.toFormat.includes("return")) {
+					const compiledFn = compileCallback(schema._flags.toFormat);
+					const result = compiledFn(returnable, helpers);
+					returnable = returnable.toFormat(result);
+				} else returnable = returnable.toFormat(schema._flags.toFormat);
 			}
 			return { value: returnable };
 		}
@@ -94225,22 +94335,27 @@ const datetime = function(joi) {
 				return this.$_setFlag("setZone", [zone, opts]);
 			} },
 			toFormat: { method(format) {
-				return this.$_setFlag("toFormat", format, { clone: true });
+				const processedFormat = typeof format === "function" ? extractFunctionBody(format) : format;
+				return this.$_setFlag("toFormat", processedFormat, { clone: true });
 			} },
 			toLocalizedString: { method(formatOpts) {
-				return this.$_setFlag("toFormat", ["toLocaleString", formatOpts], { clone: true });
+				const processedOpts = typeof formatOpts === "function" ? extractFunctionBody(formatOpts) : formatOpts;
+				return this.$_setFlag("toFormat", ["toLocaleString", processedOpts], { clone: true });
 			} },
 			toISO: { method(opts) {
-				return this.$_setFlag("toFormat", opts ? ["toISO", opts] : ["toISO"], { clone: true });
+				const processedOpts = opts && typeof opts === "function" ? extractFunctionBody(opts) : opts;
+				return this.$_setFlag("toFormat", processedOpts ? ["toISO", processedOpts] : ["toISO"], { clone: true });
 			} },
 			toISODate: { method(opts) {
-				return this.$_setFlag("toFormat", opts ? ["toISODate", opts] : ["toISODate"], { clone: true });
+				const processedOpts = opts && typeof opts === "function" ? extractFunctionBody(opts) : opts;
+				return this.$_setFlag("toFormat", processedOpts ? ["toISODate", processedOpts] : ["toISODate"], { clone: true });
 			} },
 			toISOWeekDate: { method() {
 				return this.$_setFlag("toFormat", ["toISOWeekDate"], { clone: true });
 			} },
 			toISOTime: { method(opts) {
-				return this.$_setFlag("toFormat", opts ? ["toISOTime", opts] : ["toISOTime"], { clone: true });
+				const processedOpts = opts && typeof opts === "function" ? extractFunctionBody(opts) : opts;
+				return this.$_setFlag("toFormat", processedOpts ? ["toISOTime", processedOpts] : ["toISOTime"], { clone: true });
 			} },
 			toRFC2822: { method() {
 				return this.$_setFlag("toFormat", ["toRFC2822"], { clone: true });
@@ -94252,10 +94367,12 @@ const datetime = function(joi) {
 				return this.$_setFlag("toFormat", ["toSQLDate"], { clone: true });
 			} },
 			toSQLTime: { method(opts) {
-				return this.$_setFlag("toFormat", opts ? ["toSQLTime", opts] : ["toSQLTime"], { clone: true });
+				const processedOpts = opts && typeof opts === "function" ? extractFunctionBody(opts) : opts;
+				return this.$_setFlag("toFormat", processedOpts ? ["toSQLTime", processedOpts] : ["toSQLTime"], { clone: true });
 			} },
 			toSQL: { method(opts) {
-				return this.$_setFlag("toFormat", opts ? ["toSQL", opts] : ["toSQL"], { clone: true });
+				const processedOpts = opts && typeof opts === "function" ? extractFunctionBody(opts) : opts;
+				return this.$_setFlag("toFormat", processedOpts ? ["toSQL", processedOpts] : ["toSQL"], { clone: true });
 			} },
 			toMillis: { method() {
 				return this.$_setFlag("toFormat", ["toMillis"], { clone: true });
@@ -94273,14 +94390,15 @@ const datetime = function(joi) {
 				return this.$_setFlag("toFormat", ["toBSON"], { clone: true });
 			} },
 			toObject: { method(opts) {
-				const config = opts?.includeConfig !== void 0 ? { includeConfig: opts.includeConfig } : { includeConfig: false };
+				const config = typeof opts === "function" ? extractFunctionBody(opts) : opts?.includeConfig !== void 0 ? { includeConfig: opts.includeConfig } : { includeConfig: false };
 				return this.$_setFlag("toFormat", ["toObject", config], { clone: true });
 			} },
 			toJSDate: { method() {
 				return this.$_setFlag("toFormat", ["toJSDate"], { clone: true });
 			} },
 			toRelative: { method(opts) {
-				return this.$_setFlag("toFormat", opts ? ["toRelative", opts] : ["toRelative"], { clone: true });
+				const processedOpts = opts && typeof opts === "function" ? extractFunctionBody(opts) : opts;
+				return this.$_setFlag("toFormat", processedOpts ? ["toRelative", processedOpts] : ["toRelative"], { clone: true });
 			} },
 			setLocale: { method(locale) {
 				return this.$_setFlag("setLocale", locale);
@@ -109523,7 +109641,7 @@ const encode = (schema) => {
 		});
 	}
 	const json$1 = JSON.stringify({
-		version: "0.1.0-master-67185cae",
+		version: "0.1.0-master-effacff6",
 		schema: description$1
 	}, (_, value) => {
 		if (typeof value === "bigint") return value.toString();
@@ -109539,9 +109657,9 @@ const decode = (base64) => {
 	const description$1 = JSON.parse(json$1);
 	if (!isPlainObject(description$1) || !("version" in description$1) || !("schema" in description$1) || typeof description$1.version !== "string" || !isPlainObject(description$1.schema)) throw new TypeError("Not a valid encoded schema");
 	const { version: schemaVersion, schema } = description$1;
-	if (import_semver.valid("0.1.0-master-67185cae")) {
+	if (import_semver.valid("0.1.0-master-effacff6")) {
 		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-67185cae")) throw new TypeError(`Schema version ${schemaVersion} is not compatible with current version 0.1.0-master-67185cae`);
+		if (import_semver.gt(import_semver.coerce(schemaVersion), "0.1.0-master-effacff6")) throw new TypeError(`Schema version ${schemaVersion} is not compatible with current version 0.1.0-master-effacff6`);
 	}
 	return validator.build(schema);
 };
@@ -112807,7 +112925,7 @@ const tlds = new Set(TLDS.map((tld) => tld.toLowerCase()));
 var import_lib = __toESM(require_lib$1());
 var import_lib$1 = __toESM(require_lib());
 var import_lib$2 = __toESM(require_lib$2());
-const version = "0.1.0-master-67185cae";
+const version = "0.1.0-master-effacff6";
 var ValidationError = import_lib$2.ValidationError;
 var location = import_lib$1.location;
 export { ValidationError, esm_exports as address, decode, encode, import_lib as formula, location, tlds, validator, version };