z-schema 12.3.1 → 12.4.0

package/cjs/index.cjs

@@ -80,7 +80,7 @@ function isObject(value) {
 function isInteger(value) {
 	return typeof value === "number" && Number.isFinite(value) && value % 1 === 0;
 }
-const NON_SCHEMA_KEYWORDS_SET = new Set([
+const NON_SCHEMA_KEYWORDS_SET = /* @__PURE__ */ new Set([
 	"enum",
 	"const",
 	"default",
@@ -255,7 +255,8 @@ const areEqual = (json1, json2, options, _depth = 0) => {
 	}
 	if (isObject(json1) && isObject(json2)) {
 		const keys1 = sortedKeys(json1);
-		if (!areEqual(keys1, sortedKeys(json2), options, _depth + 1)) return false;
+		const keys2 = sortedKeys(json2);
+		if (!areEqual(keys1, keys2, options, _depth + 1)) return false;
 		len = keys1.length;
 		for (i = 0; i < len; i++) if (!areEqual(json1[keys1[i]], json2[keys1[i]], options, _depth + 1)) return false;
 		return true;
@@ -1680,6 +1681,94 @@ const isValidRfc3339Date = (year, month, day) => {
 //#region src/utils/hostname.ts
 const IDN_SEPARATOR_REGEX = /[\u3002\uFF0E\uFF61]/g;
 const IDN_SEPARATOR_TEST_REGEX = /[\u3002\uFF0E\uFF61]/;
+const XN_LABEL_REGEX = /^xn--/i;
+const DISALLOWED_CATEGORY_REGEX = /[\p{P}\p{S}\p{Z}\p{C}]/u;
+const DISALLOWED_CATEGORY_WHITELIST = /* @__PURE__ */ new Set([
+	"-",
+	"·",
+	"͵",
+	"׳",
+	"״",
+	"・",
+	"۽",
+	"۾",
+	"་",
+	"‌",
+	"‍"
+]);
+const isDisallowedCodePoint = (char) => DISALLOWED_CATEGORY_REGEX.test(char) && !DISALLOWED_CATEGORY_WHITELIST.has(char);
+const TRANSPARENT_MARK_REGEX = /\p{Mn}/u;
+const ARABIC_SCRIPT_REGEX = /\p{Script=Arabic}/u;
+const ARABIC_INDIC_DIGITS_REGEX = /[\u0660-\u0669\u06F0-\u06F9]/;
+const isArabicJoiningLetter = (char) => char !== void 0 && ARABIC_SCRIPT_REGEX.test(char) && !ARABIC_INDIC_DIGITS_REGEX.test(char);
+const hasZwnjJoiningContext = (label, idx) => {
+	let before = idx - 1;
+	while (before >= 0 && TRANSPARENT_MARK_REGEX.test(label[before])) before--;
+	let after = idx + 1;
+	while (after < label.length && TRANSPARENT_MARK_REGEX.test(label[after])) after++;
+	return isArabicJoiningLetter(label[before]) && isArabicJoiningLetter(label[after]);
+};
+const BIDI_NSM_REGEX = /[\p{Mn}\p{Me}]/u;
+const BIDI_ARABIC_INDIC_DIGIT_REGEX = /[\u0660-\u0669]/;
+const BIDI_EXTENDED_ARABIC_INDIC_DIGIT_REGEX = /[\u06F0-\u06F9]/;
+const BIDI_HEBREW_SCRIPT_REGEX = /\p{Script=Hebrew}/u;
+const BIDI_AL_SCRIPT_REGEX = /[\p{Script=Arabic}\p{Script=Syriac}\p{Script=Thaana}]/u;
+const BIDI_ASCII_DIGIT_REGEX = /[0-9]/;
+const BIDI_LETTER_REGEX = /\p{L}/u;
+const classifyBidi = (char) => {
+	if (BIDI_NSM_REGEX.test(char)) return "NSM";
+	if (BIDI_ARABIC_INDIC_DIGIT_REGEX.test(char)) return "AN";
+	if (BIDI_EXTENDED_ARABIC_INDIC_DIGIT_REGEX.test(char)) return "EN";
+	if (BIDI_HEBREW_SCRIPT_REGEX.test(char)) return "R";
+	if (BIDI_AL_SCRIPT_REGEX.test(char)) return "AL";
+	if (BIDI_ASCII_DIGIT_REGEX.test(char)) return "EN";
+	if (BIDI_LETTER_REGEX.test(char)) return "L";
+	return "ON";
+};
+const isLabelBidiTriggering = (label) => {
+	for (const char of label) {
+		const bidiClass = classifyBidi(char);
+		if (bidiClass === "R" || bidiClass === "AL" || bidiClass === "AN") return true;
+	}
+	return false;
+};
+const isLabelBidiRuleValid = (label) => {
+	const classes = [];
+	for (const char of label) classes.push(classifyBidi(char));
+	if (classes.length === 0) return false;
+	const first = classes[0];
+	if (first !== "L" && first !== "R" && first !== "AL") return false;
+	let lastIdx = classes.length - 1;
+	while (lastIdx > 0 && classes[lastIdx] === "NSM") lastIdx--;
+	const last = classes[lastIdx];
+	if (first === "R" || first === "AL") {
+		let hasEN = false;
+		let hasAN = false;
+		for (let i = 0; i < classes.length; i++) {
+			const c = classes[i];
+			if (c !== "R" && c !== "AL" && c !== "AN" && c !== "EN" && c !== "NSM" && c !== "ON") return false;
+			if (c === "EN") hasEN = true;
+			else if (c === "AN") hasAN = true;
+		}
+		if (hasEN && hasAN) return false;
+		return last === "R" || last === "AL" || last === "EN" || last === "AN";
+	}
+	for (let i = 0; i < classes.length; i++) {
+		const c = classes[i];
+		if (c !== "L" && c !== "EN" && c !== "NSM" && c !== "ON") return false;
+	}
+	return last === "L" || last === "EN";
+};
+const isDomainBidiValid = (unicodeLabels) => {
+	let isBidiDomain = false;
+	for (let i = 0; i < unicodeLabels.length; i++) if (isLabelBidiTriggering(unicodeLabels[i])) {
+		isBidiDomain = true;
+		break;
+	}
+	if (!isBidiDomain) return true;
+	for (let i = 0; i < unicodeLabels.length; i++) if (!isLabelBidiRuleValid(unicodeLabels[i])) return false;
+	return true;
+};
 const splitHostnameLabels = (hostname) => {
 	if (hostname.length === 0 || hostname.length > 255) return null;
 	if (hostname.startsWith(".") || hostname.endsWith(".")) return null;
@@ -1695,7 +1784,7 @@ const isGreek = (char) => /\p{Script=Greek}/u.test(char);
 const isHebrew = (char) => /\p{Script=Hebrew}/u.test(char);
 const hasCjkKanaOrHan = (input) => /[\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Han}]/u.test(input);
 const toUnicodeLabel = (label) => {
-	if (!/^xn--/i.test(label)) return label;
+	if (!XN_LABEL_REGEX.test(label)) return label;
 	try {
 		return punycode_punycode_js.default.toUnicode(label.toLowerCase());
 	} catch {
@@ -1704,7 +1793,7 @@ const toUnicodeLabel = (label) => {
 };
 const isValidIdnUnicodeLabel = (label) => {
 	if (label.startsWith("-") || label.endsWith("-")) return false;
-	if (label.length >= 4 && label[2] === "-" && label[3] === "-" && !/^xn--/i.test(label)) return false;
+	if (label.length >= 4 && label[2] === "-" && label[3] === "-" && !XN_LABEL_REGEX.test(label)) return false;
 	if (/^\p{M}/u.test(label)) return false;
 	if (/[\u302E\u302F\u0640\u07FA]/u.test(label)) return false;
 	for (let idx = 0; idx < label.length; idx++) {
@@ -1713,7 +1802,9 @@ const isValidIdnUnicodeLabel = (label) => {
 		if (char === "͵" && (idx === label.length - 1 || !isGreek(label[idx + 1]))) return false;
 		if ((char === "׳" || char === "״") && (idx === 0 || !isHebrew(label[idx - 1]))) return false;
 		if (char === "‍" && (idx === 0 || label[idx - 1] !== "्")) return false;
+		if (char === "‌" && (idx === 0 || label[idx - 1] !== "्" && !hasZwnjJoiningContext(label, idx))) return false;
 	}
+	for (const char of label) if (isDisallowedCodePoint(char)) return false;
 	if (label.includes("・") && !hasCjkKanaOrHan(label.replaceAll("・", ""))) return false;
 	const hasArabicIndic = /[\u0660-\u0669]/.test(label);
 	const hasExtendedArabicIndic = /[\u06F0-\u06F9]/.test(label);
@@ -1728,7 +1819,7 @@ const isValidHostname = (hostname) => {
 	for (let i = 0; i < labels.length; i++) {
 		const label = labels[i];
 		if (!isAsciiHostnameLabel(label)) return false;
-		if (/^xn--/i.test(label)) {
+		if (XN_LABEL_REGEX.test(label)) {
 			const unicodeLabel = toUnicodeLabel(label);
 			if (unicodeLabel === null || !isValidIdnUnicodeLabel(unicodeLabel)) return false;
 		}
@@ -1736,14 +1827,28 @@ const isValidHostname = (hostname) => {
 	return true;
 };
 const isValidIdnHostname = (hostname) => {
-	const labels = splitHostnameLabels(hostname.replace(IDN_SEPARATOR_REGEX, "."));
+	const normalizedHostname = hostname.replace(IDN_SEPARATOR_REGEX, ".");
+	const labels = splitHostnameLabels(normalizedHostname);
 	if (labels === null) return false;
+	const unicodeLabels = [];
+	let totalLength = labels.length - 1;
 	for (let i = 0; i < labels.length; i++) {
 		const label = labels[i];
 		const unicodeLabel = toUnicodeLabel(label);
 		if (unicodeLabel === null || !isValidIdnUnicodeLabel(unicodeLabel)) return false;
+		let aLabel;
+		try {
+			aLabel = punycode_punycode_js.default.toASCII(unicodeLabel);
+		} catch {
+			return false;
+		}
+		if (XN_LABEL_REGEX.test(label) && aLabel.toLowerCase() !== label.toLowerCase()) return false;
+		if (aLabel.length > 63) return false;
+		totalLength += aLabel.length;
+		unicodeLabels.push(unicodeLabel);
 	}
-	return true;
+	if (totalLength > 253) return false;
+	return isDomainBidiValid(unicodeLabels);
 };
 //#endregion
 //#region src/utils/time.ts
@@ -1756,7 +1861,7 @@ const toUtcTime = (hour, minute, offsetSign, offsetHour, offsetMinute) => {
 		minute: normalizedUtcTotalMinutes % 60
 	};
 };
-const RFC3339_TIME_REGEX = /^([0-9]{2}):([0-9]{2}):([0-9]{2})(\.[0-9]+)?(z|([+-][0-9]{2}:[0-9]{2}))$/i;
+const RFC3339_TIME_REGEX = /^(?<hour>[0-9]{2}):(?<minute>[0-9]{2}):(?<second>[0-9]{2})(?<fraction>\.[0-9]+)?(?<offset>z|(?<offsetValue>[+-][0-9]{2}:[0-9]{2}))$/i;
 const parseRfc3339Time = (time) => {
 	const matches = RFC3339_TIME_REGEX.exec(time);
 	if (matches === null) return null;
@@ -1767,7 +1872,7 @@ const parseRfc3339Time = (time) => {
 	let utcHour = hour;
 	let utcMinute = minute;
 	if (matches[5].toLowerCase() !== "z") {
-		const offsetMatches = /^([+-])([0-9]{2}):([0-9]{2})$/.exec(matches[5]);
+		const offsetMatches = /^(?<sign>[+-])(?<hour>[0-9]{2}):(?<minute>[0-9]{2})$/.exec(matches[5]);
 		if (offsetMatches === null) return null;
 		const offsetSign = offsetMatches[1];
 		const offsetHour = Number.parseInt(offsetMatches[2], 10);
@@ -1790,7 +1895,7 @@ const parseRfc3339Time = (time) => {
 //#region src/format-validators.ts
 const dateValidator = (date) => {
 	if (typeof date !== "string") return true;
-	const matches = /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/.exec(date);
+	const matches = /^(?<year>[0-9]{4})-(?<month>[0-9]{2})-(?<day>[0-9]{2})$/.exec(date);
 	if (matches === null) return false;
 	return isValidRfc3339Date(Number.parseInt(matches[1], 10), Number.parseInt(matches[2], 10), Number.parseInt(matches[3], 10));
 };
@@ -1801,7 +1906,7 @@ const dateTimeValidator = (dateTime) => {
 	if (tIdx === -1) return false;
 	const datePart = dateTime.slice(0, tIdx);
 	const timePart = dateTime.slice(tIdx + 1);
-	const dateMatches = /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/.exec(datePart);
+	const dateMatches = /^(?<year>[0-9]{4})-(?<month>[0-9]{2})-(?<day>[0-9]{2})$/.exec(datePart);
 	if (dateMatches === null) return false;
 	if (!isValidRfc3339Date(Number.parseInt(dateMatches[1], 10), Number.parseInt(dateMatches[2], 10), Number.parseInt(dateMatches[3], 10))) return false;
 	return parseRfc3339Time(timePart) !== null;
@@ -1812,7 +1917,7 @@ const emailValidator = (email) => {
 		require_tld: true,
 		allow_ip_domain: true
 	})) return true;
-	const ipv6Literal = /^(.+)@\[IPv6:([^\]]+)\]$/i.exec(email);
+	const ipv6Literal = /^(?<localPart>.+)@\[IPv6:(?<address>[^\]]+)\]$/i.exec(email);
 	if (!ipv6Literal) return false;
 	const localPart = ipv6Literal[1];
 	const addressPart = ipv6Literal[2];
@@ -1832,7 +1937,7 @@ const ipv6Validator = (ipv6) => {
 	if (ipv6.includes("%")) return false;
 	return validator_lib_isIP_js.default.default(ipv6, 6);
 };
-const INVALID_REGEX_ESCAPES = new Set(["a"]);
+const INVALID_REGEX_ESCAPES = /* @__PURE__ */ new Set(["a"]);
 const regexValidator = (input) => {
 	if (typeof input !== "string") return true;
 	for (let idx = 0; idx < input.length; idx++) {
@@ -1885,7 +1990,7 @@ const uriValidator = (uri) => {
 	if (typeof uri !== "string") return true;
 	if (/[^\u0000-\u007F]/.test(uri)) return false;
 	if (!hasValidPercentEncoding(uri)) return false;
-	const match = /^([a-zA-Z][a-zA-Z0-9+.-]*):\/\/([^/?#]*)/.exec(uri);
+	const match = /^(?<scheme>[a-zA-Z][a-zA-Z0-9+.-]*):\/\/(?<authority>[^/?#]*)/.exec(uri);
 	if (match) {
 		const authority = match[2];
 		const atIndex = authority.indexOf("@");
@@ -1909,11 +2014,11 @@ const uriValidator = (uri) => {
 const uriReferenceValidator = (uri) => {
 	if (typeof uri !== "string") return true;
 	if (/[^\u0000-\u007F]/.test(uri)) return false;
-	return /^([a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^{}^`| ]*$/.test(uri);
+	return /^(?:[a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^{}^`| ]*$/.test(uri);
 };
 const uriTemplateValidator = (uri) => {
 	if (typeof uri !== "string") return true;
-	if (!/^([a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^`| ]*$/.test(uri)) return false;
+	if (!/^(?:[a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^`| ]*$/.test(uri)) return false;
 	let inExpression = false;
 	for (let idx = 0; idx < uri.length; idx++) {
 		const ch = uri[idx];
@@ -1945,7 +2050,7 @@ const jsonPointerValidator = (pointer) => {
 };
 const relativeJsonPointerValidator = (pointer) => {
 	if (typeof pointer !== "string") return true;
-	const match = /^(0|[1-9]\d*)(.*)$/.exec(pointer);
+	const match = /^(?<int>0|[1-9]\d*)(?<suffix>.*)$/.exec(pointer);
 	if (!match) return false;
 	const suffix = match[2];
 	if (suffix === "" || suffix === "#") return true;
@@ -1959,9 +2064,19 @@ const timeValidator = (time) => {
 	if (typeof time !== "string") return true;
 	return parseRfc3339Time(time) !== null;
 };
+const LONE_SURROGATE_REGEX = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:^|[^\uD800-\uDBFF])[\uDC00-\uDFFF]/;
+const QUOTED_LOCAL_PART_REGEX = /^"(?:[^"\\]|\\.)*"$/u;
+const UNQUOTED_LOCAL_PART_REGEX = /^[^\s@]+$/u;
+const isValidIdnEmailLocalPart = (localPart) => {
+	if (localPart.length === 0 || LONE_SURROGATE_REGEX.test(localPart)) return false;
+	if (localPart.length >= 2 && localPart.startsWith("\"") && localPart.endsWith("\"")) return QUOTED_LOCAL_PART_REGEX.test(localPart);
+	return UNQUOTED_LOCAL_PART_REGEX.test(localPart);
+};
 const idnEmailValidator = (email) => {
 	if (typeof email !== "string") return true;
-	return /^[^\s@]+@[^\s@]+$/.test(email);
+	const atIdx = email.lastIndexOf("@");
+	if (atIdx <= 0 || atIdx === email.length - 1) return false;
+	return isValidIdnEmailLocalPart(email.slice(0, atIdx)) && isValidIdnHostname(email.slice(atIdx + 1));
 };
 const idnHostnameValidator = (hostname) => {
 	if (typeof hostname !== "string") return true;
@@ -1979,7 +2094,7 @@ const iriValidator = (iri) => {
 };
 const iriReferenceValidator = (iriReference) => {
 	if (typeof iriReference !== "string") return true;
-	return /^([a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^{}^`| ]*$/u.test(iriReference);
+	return /^(?:[a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^{}^`| ]*$/u.test(iriReference);
 };
 const inbuiltValidators = {
 	date: dateValidator,
@@ -2156,7 +2271,7 @@ const VOCAB_VALIDATION_2019_09 = "https://json-schema.org/draft/2019-09/vocab/va
 const VOCAB_VALIDATION_2020_12 = "https://json-schema.org/draft/2020-12/vocab/validation";
 const VOCAB_FORMAT_2019_09 = "https://json-schema.org/draft/2019-09/vocab/format";
 const VOCAB_FORMAT_ASSERTION_2020_12 = "https://json-schema.org/draft/2020-12/vocab/format-assertion";
-const VALIDATION_VOCAB_KEYWORDS = new Set([
+const VALIDATION_VOCAB_KEYWORDS = /* @__PURE__ */ new Set([
 	"type",
 	"multipleOf",
 	"maximum",
@@ -2187,7 +2302,9 @@ const isValidationVocabularyEnabled = (schema, report, version) => {
 	const metaSchema = currentSchemaMeta || rootSchemaMeta;
 	if (!metaSchema || typeof metaSchema !== "object" || !isObject(metaSchema.$vocabulary)) return true;
 	const vocabulary = metaSchema.$vocabulary;
-	if (Object.hasOwn(vocabulary, VOCAB_VALIDATION_2019_09) || Object.hasOwn(vocabulary, VOCAB_VALIDATION_2020_12)) return vocabulary[VOCAB_VALIDATION_2019_09] || vocabulary[VOCAB_VALIDATION_2020_12];
+	const has2019 = Object.hasOwn(vocabulary, VOCAB_VALIDATION_2019_09);
+	const has2020 = Object.hasOwn(vocabulary, VOCAB_VALIDATION_2020_12);
+	if (has2019 || has2020) return vocabulary[VOCAB_VALIDATION_2019_09] || vocabulary[VOCAB_VALIDATION_2020_12];
 	return false;
 };
 /**
@@ -2623,11 +2740,11 @@ function formatValidator(ctx, report, schema, json) {
 			if (result instanceof Promise) {
 				const promiseResult = result;
 				report.addAsyncTaskWithPath(async (callback) => {
+					let resolved = false;
 					try {
-						callback(await promiseResult);
-					} catch {
-						callback(false);
-					}
+						resolved = await promiseResult;
+					} catch {}
+					callback(resolved);
 				}, [], (resolvedResult) => {
 					if (resolvedResult !== true) report.addError("INVALID_FORMAT", [schema.format, JSON.stringify(json)], void 0, schema, "format");
 				});
@@ -3120,7 +3237,8 @@ function validate(ctx, report, schema, json) {
 		}
 	}
 	if (deferredUnevaluatedKeys.length > 0 && !(report.errors.length > 0 && ctx.options.breakOnFirstError)) for (let i = 0; i < deferredUnevaluatedKeys.length; i++) {
-		const validator = JsonValidators[deferredUnevaluatedKeys[i]];
+		const key = deferredUnevaluatedKeys[i];
+		const validator = JsonValidators[key];
 		if (validator) {
 			validator(ctx, report, schema, json);
 			if (report.errors.length && ctx.options.breakOnFirstError) break;
@@ -3147,7 +3265,7 @@ function setSchemaReader(schemaReader) {
 }
 //#endregion
 //#region src/schema-compiler.ts
-const UNSAFE_TARGETS = new Set([
+const UNSAFE_TARGETS = /* @__PURE__ */ new Set([
 	Object.prototype,
 	Function.prototype,
 	Array.prototype
@@ -3229,7 +3347,10 @@ const collectIds = (obj, maxDepth = 100) => {
 					}
 				}
 				id.absoluteParent = absoluteParent;
-				if (id.absoluteParent) id.absoluteUri = resolveSchemaScopeId(id.absoluteParent.absoluteUri || id.absoluteParent.id, schemaNode, id.id);
+				if (id.absoluteParent) {
+					const parentUri = id.absoluteParent.absoluteUri || id.absoluteParent.id;
+					id.absoluteUri = resolveSchemaScopeId(parentUri, schemaNode, id.id);
+				}
 			}
 			ids.push(id);
 			scope.push(id);
@@ -3313,7 +3434,8 @@ var SchemaCompiler = class {
 		for (const item of ids) if (item.absoluteUri) {
 			this.validator.scache.cacheSchemaByUri(item.absoluteUri, item.obj);
 			if (item.type === "relative" && item.absoluteParent && isSimpleIdentifier(item.id)) {
-				const altAbsoluteUri = resolveReference(item.absoluteParent.absoluteUri || item.absoluteParent.id, item.id);
+				const parentUri = item.absoluteParent.absoluteUri || item.absoluteParent.id;
+				const altAbsoluteUri = resolveReference(parentUri, item.id);
 				this.validator.scache.cacheSchemaByUri(altAbsoluteUri, item.obj);
 			}
 		} else if (item.type === "root") this.validator.scache.cacheSchemaByUri(item.id, item.obj);

package/dist/format-validators.js

@@ -8,7 +8,7 @@ import isURLModule from "validator/lib/isURL.js";
 //#region src/format-validators.ts
 const dateValidator = (date) => {
 	if (typeof date !== "string") return true;
-	const matches = /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/.exec(date);
+	const matches = /^(?<year>[0-9]{4})-(?<month>[0-9]{2})-(?<day>[0-9]{2})$/.exec(date);
 	if (matches === null) return false;
 	return isValidRfc3339Date(Number.parseInt(matches[1], 10), Number.parseInt(matches[2], 10), Number.parseInt(matches[3], 10));
 };
@@ -19,7 +19,7 @@ const dateTimeValidator = (dateTime) => {
 	if (tIdx === -1) return false;
 	const datePart = dateTime.slice(0, tIdx);
 	const timePart = dateTime.slice(tIdx + 1);
-	const dateMatches = /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/.exec(datePart);
+	const dateMatches = /^(?<year>[0-9]{4})-(?<month>[0-9]{2})-(?<day>[0-9]{2})$/.exec(datePart);
 	if (dateMatches === null) return false;
 	if (!isValidRfc3339Date(Number.parseInt(dateMatches[1], 10), Number.parseInt(dateMatches[2], 10), Number.parseInt(dateMatches[3], 10))) return false;
 	return parseRfc3339Time(timePart) !== null;
@@ -30,7 +30,7 @@ const emailValidator = (email) => {
 		require_tld: true,
 		allow_ip_domain: true
 	})) return true;
-	const ipv6Literal = /^(.+)@\[IPv6:([^\]]+)\]$/i.exec(email);
+	const ipv6Literal = /^(?<localPart>.+)@\[IPv6:(?<address>[^\]]+)\]$/i.exec(email);
 	if (!ipv6Literal) return false;
 	const localPart = ipv6Literal[1];
 	const addressPart = ipv6Literal[2];
@@ -50,7 +50,7 @@ const ipv6Validator = (ipv6) => {
 	if (ipv6.includes("%")) return false;
 	return isIPModule.default(ipv6, 6);
 };
-const INVALID_REGEX_ESCAPES = new Set(["a"]);
+const INVALID_REGEX_ESCAPES = /* @__PURE__ */ new Set(["a"]);
 const regexValidator = (input) => {
 	if (typeof input !== "string") return true;
 	for (let idx = 0; idx < input.length; idx++) {
@@ -103,7 +103,7 @@ const uriValidator = (uri) => {
 	if (typeof uri !== "string") return true;
 	if (/[^\u0000-\u007F]/.test(uri)) return false;
 	if (!hasValidPercentEncoding(uri)) return false;
-	const match = /^([a-zA-Z][a-zA-Z0-9+.-]*):\/\/([^/?#]*)/.exec(uri);
+	const match = /^(?<scheme>[a-zA-Z][a-zA-Z0-9+.-]*):\/\/(?<authority>[^/?#]*)/.exec(uri);
 	if (match) {
 		const authority = match[2];
 		const atIndex = authority.indexOf("@");
@@ -127,11 +127,11 @@ const uriValidator = (uri) => {
 const uriReferenceValidator = (uri) => {
 	if (typeof uri !== "string") return true;
 	if (/[^\u0000-\u007F]/.test(uri)) return false;
-	return /^([a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^{}^`| ]*$/.test(uri);
+	return /^(?:[a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^{}^`| ]*$/.test(uri);
 };
 const uriTemplateValidator = (uri) => {
 	if (typeof uri !== "string") return true;
-	if (!/^([a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^`| ]*$/.test(uri)) return false;
+	if (!/^(?:[a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^`| ]*$/.test(uri)) return false;
 	let inExpression = false;
 	for (let idx = 0; idx < uri.length; idx++) {
 		const ch = uri[idx];
@@ -163,7 +163,7 @@ const jsonPointerValidator = (pointer) => {
 };
 const relativeJsonPointerValidator = (pointer) => {
 	if (typeof pointer !== "string") return true;
-	const match = /^(0|[1-9]\d*)(.*)$/.exec(pointer);
+	const match = /^(?<int>0|[1-9]\d*)(?<suffix>.*)$/.exec(pointer);
 	if (!match) return false;
 	const suffix = match[2];
 	if (suffix === "" || suffix === "#") return true;
@@ -177,9 +177,19 @@ const timeValidator = (time) => {
 	if (typeof time !== "string") return true;
 	return parseRfc3339Time(time) !== null;
 };
+const LONE_SURROGATE_REGEX = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:^|[^\uD800-\uDBFF])[\uDC00-\uDFFF]/;
+const QUOTED_LOCAL_PART_REGEX = /^"(?:[^"\\]|\\.)*"$/u;
+const UNQUOTED_LOCAL_PART_REGEX = /^[^\s@]+$/u;
+const isValidIdnEmailLocalPart = (localPart) => {
+	if (localPart.length === 0 || LONE_SURROGATE_REGEX.test(localPart)) return false;
+	if (localPart.length >= 2 && localPart.startsWith("\"") && localPart.endsWith("\"")) return QUOTED_LOCAL_PART_REGEX.test(localPart);
+	return UNQUOTED_LOCAL_PART_REGEX.test(localPart);
+};
 const idnEmailValidator = (email) => {
 	if (typeof email !== "string") return true;
-	return /^[^\s@]+@[^\s@]+$/.test(email);
+	const atIdx = email.lastIndexOf("@");
+	if (atIdx <= 0 || atIdx === email.length - 1) return false;
+	return isValidIdnEmailLocalPart(email.slice(0, atIdx)) && isValidIdnHostname(email.slice(atIdx + 1));
 };
 const idnHostnameValidator = (hostname) => {
 	if (typeof hostname !== "string") return true;
@@ -197,7 +207,7 @@ const iriValidator = (iri) => {
 };
 const iriReferenceValidator = (iriReference) => {
 	if (typeof iriReference !== "string") return true;
-	return /^([a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^{}^`| ]*$/u.test(iriReference);
+	return /^(?:[a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^{}^`| ]*$/u.test(iriReference);
 };
 const inbuiltValidators = {
 	date: dateValidator,

package/dist/json-schema.js

@@ -1,11 +1,17 @@
 import { getRemotePath, isAbsoluteUri } from "./utils/uri.js";
 import { isObject } from "./utils/what-is.js";
-const NON_SCHEMA_KEYWORDS_SET = new Set([
+//#region src/json-schema.ts
+/**
+* Keywords whose values are not JSON Schema sub-schemas and must not be
+* traversed during schema walking (id collection, reference collection, etc.).
+*/
+const NON_SCHEMA_KEYWORDS = [
 	"enum",
 	"const",
 	"default",
 	"examples"
-]);
+];
+const NON_SCHEMA_KEYWORDS_SET = new Set(NON_SCHEMA_KEYWORDS);
 /** Returns true if the key is an internal z-schema property (prefixed with `__$`). */
 const isInternalKey = (key) => key.startsWith("__$");
 const getId = (schema) => {
@@ -45,4 +51,4 @@ const findId = (schema, id, targetBaseUri, currentBaseUri, maxDepth = 100, _dept
 	}
 };
 //#endregion
-export { NON_SCHEMA_KEYWORDS_SET, findId, getId, isInternalKey };
+export { NON_SCHEMA_KEYWORDS, NON_SCHEMA_KEYWORDS_SET, findId, getId, isInternalKey };

package/dist/json-validation.js

@@ -437,7 +437,8 @@ function validate(ctx, report, schema, json) {
 		}
 	}
 	if (deferredUnevaluatedKeys.length > 0 && !(report.errors.length > 0 && ctx.options.breakOnFirstError)) for (let i = 0; i < deferredUnevaluatedKeys.length; i++) {
-		const validator = JsonValidators[deferredUnevaluatedKeys[i]];
+		const key = deferredUnevaluatedKeys[i];
+		const validator = JsonValidators[key];
 		if (validator) {
 			validator(ctx, report, schema, json);
 			if (report.errors.length && ctx.options.breakOnFirstError) break;
@@ -454,4 +455,4 @@ function validate(ctx, report, schema, json) {
 	return report.errors.length === 0;
 }
 //#endregion
-export { validate };
+export { JsonValidators, validate };

package/dist/report.d.ts

@@ -93,4 +93,4 @@ declare class Report {
   addCustomError(errorCode: ErrorCode, errorMessage: string, params?: ErrorParam[], subReports?: Report | Report[], schema?: JsonSchema | boolean, keyword?: keyof JsonSchemaAll): void;
 }
 //#endregion
-export { Report, SchemaErrorDetail };
+export { Report, ReportOptions, SchemaErrorDetail };

package/dist/schema-cache.d.ts

@@ -20,4 +20,4 @@ declare class SchemaCache {
   getSchemaByUri(report: Report, uri: string, root?: JsonSchemaInternal): JsonSchemaInternal | undefined;
 }
 //#endregion
-export { SchemaCache };
+export { SchemaCache, SchemaCacheStorage };

package/dist/schema-compiler.js

@@ -3,7 +3,7 @@ import { NON_SCHEMA_KEYWORDS_SET, getId, isInternalKey } from "./json-schema.js"
 import { Report } from "./report.js";
 import { getSchemaReader } from "./z-schema-reader.js";
 //#region src/schema-compiler.ts
-const UNSAFE_TARGETS = new Set([
+const UNSAFE_TARGETS = /* @__PURE__ */ new Set([
 	Object.prototype,
 	Function.prototype,
 	Array.prototype
@@ -85,7 +85,10 @@ const collectIds = (obj, maxDepth = 100) => {
 					}
 				}
 				id.absoluteParent = absoluteParent;
-				if (id.absoluteParent) id.absoluteUri = resolveSchemaScopeId(id.absoluteParent.absoluteUri || id.absoluteParent.id, schemaNode, id.id);
+				if (id.absoluteParent) {
+					const parentUri = id.absoluteParent.absoluteUri || id.absoluteParent.id;
+					id.absoluteUri = resolveSchemaScopeId(parentUri, schemaNode, id.id);
+				}
 			}
 			ids.push(id);
 			scope.push(id);
@@ -169,7 +172,8 @@ var SchemaCompiler = class {
 		for (const item of ids) if (item.absoluteUri) {
 			this.validator.scache.cacheSchemaByUri(item.absoluteUri, item.obj);
 			if (item.type === "relative" && item.absoluteParent && isSimpleIdentifier(item.id)) {
-				const altAbsoluteUri = resolveReference(item.absoluteParent.absoluteUri || item.absoluteParent.id, item.id);
+				const parentUri = item.absoluteParent.absoluteUri || item.absoluteParent.id;
+				const altAbsoluteUri = resolveReference(parentUri, item.id);
 				this.validator.scache.cacheSchemaByUri(altAbsoluteUri, item.obj);
 			}
 		} else if (item.type === "root") this.validator.scache.cacheSchemaByUri(item.id, item.obj);
@@ -280,4 +284,4 @@ var SchemaCompiler = class {
 	}
 };
 //#endregion
-export { SchemaCompiler };
+export { SchemaCompiler, collectIds, collectReferences };