z-schema 12.1.1 → 12.3.1

package/umd/ZSchema.js

@@ -9,7 +9,7 @@
 	var __getOwnPropNames = Object.getOwnPropertyNames;
 	var __getProtoOf = Object.getPrototypeOf;
 	var __hasOwnProp = Object.prototype.hasOwnProperty;
-	var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+	var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 	var __copyProps = (to, from, except, desc) => {
 		if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 			key = keys[i];
@@ -25,17 +25,6 @@
 		enumerable: true
 	}) : target, mod));
 	//#endregion
-	//#region src/utils/uri.ts
-	const getQueryPath = (uri) => {
-		const io = uri.indexOf("#");
-		return io === -1 ? void 0 : uri.slice(io + 1);
-	};
-	const getRemotePath = (uri) => {
-		const io = uri.indexOf("#");
-		return io === -1 ? uri : uri.slice(0, io);
-	};
-	const isAbsoluteUri = (uri) => /^[a-zA-Z][a-zA-Z\d+.-]*:/.test(uri);
-	//#endregion
 	//#region src/utils/constants.ts
 	/**
 	* Maximum allowed value for {@link ZSchemaOptions.asyncTimeout} in milliseconds.
@@ -51,6 +40,17 @@
 	*/
 	const MAX_SCHEMA_REGEX_LENGTH = 1e4;
 	//#endregion
+	//#region src/utils/uri.ts
+	const getQueryPath = (uri) => {
+		const io = uri.indexOf("#");
+		return io === -1 ? void 0 : uri.slice(io + 1);
+	};
+	const getRemotePath = (uri) => {
+		const io = uri.indexOf("#");
+		return io === -1 ? uri : uri.slice(0, io);
+	};
+	const isAbsoluteUri = (uri) => /^[a-zA-Z][a-zA-Z\d+.-]*:/.test(uri);
+	//#endregion
 	//#region src/utils/what-is.ts
 	const whatIs = (what) => {
 		if (typeof what === "object") {
@@ -59,8 +59,7 @@
 			return "object";
 		}
 		if (typeof what === "number") {
-			if (Number.isFinite(what)) if (what % 1 === 0) return "integer";
-			else return "number";
+			if (Number.isFinite(what)) return what % 1 === 0 ? "integer" : "number";
 			if (Number.isNaN(what)) return "not-a-number";
 			return "unknown-number";
 		}
@@ -72,18 +71,12 @@
 	function isInteger(value) {
 		return typeof value === "number" && Number.isFinite(value) && value % 1 === 0;
 	}
-	//#endregion
-	//#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 = [
+	const NON_SCHEMA_KEYWORDS_SET = new Set([
 		"enum",
 		"const",
 		"default",
 		"examples"
-	];
+	]);
 	/** Returns true if the key is an internal z-schema property (prefixed with `__$`). */
 	const isInternalKey = (key) => key.startsWith("__$");
 	const getId = (schema) => {
@@ -104,7 +97,7 @@
 			} catch {}
 		}
 		if (!targetBaseUri || nextBaseUri === targetBaseUri) {
-			if (schemaId && (schemaId === id || schemaId[0] === "#" && schemaId.substring(1) === id)) return schema;
+			if (schemaId && (schemaId === id || schemaId.startsWith("#") && schemaId.slice(1) === id)) return schema;
 			if (schema.$anchor === id || schema.$dynamicAnchor === id) return schema;
 		}
 		let result;
@@ -116,7 +109,7 @@
 			const keys = Object.keys(schema);
 			for (let i = keys.length - 1; i >= 0; i--) {
 				const k = keys[i];
-				if (isInternalKey(k) || NON_SCHEMA_KEYWORDS.includes(k)) continue;
+				if (isInternalKey(k) || NON_SCHEMA_KEYWORDS_SET.has(k)) continue;
 				result = findId(schema[k], id, targetBaseUri, nextBaseUri, maxDepth, _depth + 1);
 				if (result) return result;
 			}
@@ -177,11 +170,10 @@
 		MAX_RECURSION_DEPTH_EXCEEDED: "Maximum recursion depth ({0}) exceeded. If your schema or data is deeply nested and valid, increase the maxRecursionDepth option."
 	};
 	var ValidateError = class extends Error {
-		name;
+		name = "ValidateError";
 		details;
 		constructor(message, details) {
 			super(message);
-			this.name = "z-schema validation error";
 			this.details = details;
 		}
 	};
@@ -202,49 +194,48 @@
 	//#region src/utils/clone.ts
 	const shallowClone = (src) => {
 		if (src == null || typeof src !== "object") return src;
-		let res;
 		if (Array.isArray(src)) {
-			res = [];
+			const res = [];
 			for (let i = 0; i < src.length; i++) res[i] = src[i];
-		} else {
-			res = {};
-			const keys = Object.keys(src).sort();
-			for (const key of keys) copyProp(src, res, key);
+			return res;
 		}
+		const res = {};
+		const keys = Object.keys(src).sort();
+		for (let i = 0; i < keys.length; i++) copyProp(src, res, keys[i]);
 		return res;
 	};
 	const deepClone = (src, maxDepth = 100) => {
 		let vidx = 0;
 		const visited = /* @__PURE__ */ new Map();
 		const cloned = [];
-		const cloneDeepInner = (src, _depth) => {
-			if (typeof src !== "object" || src === null) return src;
+		const cloneDeepInner = (node, _depth) => {
+			if (typeof node !== "object" || node === null) return node;
 			if (_depth >= maxDepth) throw new Error(`Maximum recursion depth (${maxDepth}) exceeded in deepClone. If your schema or data is deeply nested and valid, increase the maxRecursionDepth option.`);
-			let res;
-			const cidx = visited.get(src);
+			const cidx = visited.get(node);
 			if (cidx !== void 0) return cloned[cidx];
-			visited.set(src, vidx++);
-			if (Array.isArray(src)) {
-				res = [];
+			visited.set(node, vidx++);
+			if (Array.isArray(node)) {
+				const res = [];
 				cloned.push(res);
-				for (let i = 0; i < src.length; i++) res[i] = cloneDeepInner(src[i], _depth + 1);
-			} else {
-				res = {};
-				cloned.push(res);
-				const keys = Object.keys(src).sort();
-				for (const key of keys) copyProp(src, res, key, (v) => cloneDeepInner(v, _depth + 1));
+				for (let i = 0; i < node.length; i++) res[i] = cloneDeepInner(node[i], _depth + 1);
+				return res;
 			}
+			const res = {};
+			cloned.push(res);
+			const keys = Object.keys(node).sort();
+			for (let i = 0; i < keys.length; i++) copyProp(node, res, keys[i], (v) => cloneDeepInner(v, _depth + 1));
 			return res;
 		};
 		return cloneDeepInner(src, 0);
 	};
 	//#endregion
 	//#region src/utils/json.ts
+	const sortedKeys = (obj) => Object.keys(obj).sort();
 	const areEqual = (json1, json2, options, _depth = 0) => {
 		const caseInsensitiveComparison = options?.caseInsensitiveComparison || false;
 		const maxDepth = options?.maxDepth ?? 100;
 		if (json1 === json2) return true;
-		if (caseInsensitiveComparison === true && typeof json1 === "string" && typeof json2 === "string" && json1.toUpperCase() === json2.toUpperCase()) return true;
+		if (caseInsensitiveComparison && typeof json1 === "string" && typeof json2 === "string" && json1.toUpperCase() === json2.toUpperCase()) return true;
 		if (_depth >= maxDepth) throw new Error(`Maximum recursion depth (${maxDepth}) exceeded in areEqual. If your data is deeply nested and valid, increase the maxRecursionDepth option.`);
 		let i, len;
 		if (Array.isArray(json1) && Array.isArray(json2)) {
@@ -262,13 +253,16 @@
 		}
 		return false;
 	};
-	const decodeJSONPointer = (str) => {
-		return decodeURIComponent(str).replace(/~[0-1]/g, (x) => x === "~1" ? "/" : "~");
-	};
-	const sortedKeys = (obj) => Object.keys(obj).sort();
+	const decodeJSONPointer = (str) => decodeURIComponent(str).replaceAll(/~[0-1]/g, (x) => x === "~1" ? "/" : "~");
 	const get = (obj, path) => {
 		if (typeof path === "string") path = path.split(".");
-		return path.reduce((acc, key) => acc && acc[key] !== void 0 ? acc[key] : void 0, obj);
+		let acc = obj;
+		for (let i = 0; i < path.length; i++) {
+			const key = path[i];
+			if (acc && acc[key] !== void 0) acc = acc[key];
+			else return;
+		}
+		return acc;
 	};
 	//#endregion
 	//#region src/utils/symbols.ts
@@ -298,8 +292,8 @@
 			if (parentOrOptions instanceof Report) {
 				this.reportOptions = reportOptionsOrValidate || {};
 				this.validateOptions = validateOptions || parentOrOptions.validateOptions;
-				this.__$recursiveAnchorStack = [...parentOrOptions.__$recursiveAnchorStack];
-				this.__$dynamicScopeStack = [...parentOrOptions.__$dynamicScopeStack];
+				this.__$recursiveAnchorStack = parentOrOptions.__$recursiveAnchorStack.slice();
+				this.__$dynamicScopeStack = parentOrOptions.__$dynamicScopeStack.slice();
 				this.__validationResultCache = parentOrOptions.__validationResultCache;
 			} else {
 				this.reportOptions = {};
@@ -382,30 +376,24 @@
 			setTimeout(checkTimeout, ASYNC_TIMEOUT_POLL_MS);
 		}
 		getPath(returnPathAsString) {
-			let path = [];
-			if (this.parentReport) path = path.concat(this.parentReport.path);
-			path = path.concat(this.path);
-			if (returnPathAsString !== true) return "#/" + path.map(function(segment) {
+			const path = this.parentReport ? this.parentReport.path.concat(this.path) : this.path.slice();
+			if (returnPathAsString !== true) return `#/${path.map((segment) => {
 				segment = segment.toString();
-				if (isAbsoluteUri(segment)) return "uri(" + segment + ")";
-				return segment.replace(/~/g, "~0").replace(/\//g, "~1");
-			}).join("/");
+				if (isAbsoluteUri(segment)) return `uri(${segment})`;
+				return segment.replaceAll("~", "~0").replaceAll("/", "~1");
+			}).join("/")}`;
 			return path;
 		}
 		getSchemaPath() {
-			let schemaPath = [];
-			if (this.parentReport) schemaPath = schemaPath.concat(this.parentReport.schemaPath);
-			schemaPath = schemaPath.concat(this.schemaPath);
-			return schemaPath;
+			if (this.parentReport) return this.parentReport.schemaPath.concat(this.schemaPath);
+			return this.schemaPath.slice();
 		}
 		getSchemaId() {
 			if (!this.rootSchema) return;
-			let path = [];
-			if (this.parentReport) path = path.concat(this.parentReport.path);
-			path = path.concat(this.path);
+			const path = this.parentReport ? this.parentReport.path.concat(this.path) : this.path.slice();
 			while (path.length > 0) {
 				const obj = get(this.rootSchema, path);
-				if (obj && obj.id) return obj.id;
+				if (isObject(obj) && typeof obj.id === "string") return obj.id;
 				path.pop();
 			}
 			return this.rootSchema.id;
@@ -428,11 +416,11 @@
 		}
 		addCustomError(errorCode, errorMessage, params, subReports, schema, keyword) {
 			if (typeof this.reportOptions.maxErrors === "number" && this.errors.length >= this.reportOptions.maxErrors) return;
-			if (!errorMessage) throw new Error("No errorMessage known for code " + errorCode);
-			params = params || [];
+			if (!errorMessage) throw new Error(`No errorMessage known for code ${errorCode}`);
+			params ||= [];
 			for (let idx = 0; idx < params.length; idx++) {
 				const param = params[idx] === null || isObject(params[idx]) ? JSON.stringify(params[idx]) : params[idx];
-				errorMessage = errorMessage.replace("{" + idx + "}", param.toString());
+				errorMessage = errorMessage.replace(`{${idx}}`, param.toString());
 			}
 			const err = {
 				code: errorCode,
@@ -441,10 +429,10 @@
 				path: this.getPath(this.options.reportPathAsArray),
 				schemaPath: this.getSchemaPath(),
 				schemaId: this.getSchemaId(),
-				keyword
+				keyword,
+				[schemaSymbol]: schema,
+				[jsonSymbol]: this.getJson()
 			};
-			err[schemaSymbol] = schema;
-			err[jsonSymbol] = this.getJson();
 			if (schema && typeof schema === "string") err.description = schema;
 			else if (schema && typeof schema === "object") {
 				if (schema.title) err.title = schema.title;
@@ -453,7 +441,10 @@
 			if (subReports != null) {
 				if (!Array.isArray(subReports)) subReports = [subReports];
 				err.inner = [];
-				for (const subReport of subReports) for (const error of subReport.errors) err.inner.push(error);
+				for (let si = 0; si < subReports.length; si++) {
+					const errs = subReports[si].errors;
+					for (let ei = 0; ei < errs.length; ei++) err.inner.push(errs[ei]);
+				}
 				if (err.inner.length === 0) err.inner = void 0;
 			}
 			if (Array.isArray(this.validateOptions.excludeErrors) && this.validateOptions.excludeErrors.includes(errorCode)) return;
@@ -503,7 +494,7 @@
 		let normalized;
 		if (typeof options === "object") {
 			let keys = Object.keys(options);
-			for (const key of keys) if (defaultOptions[key] === void 0) throw new Error("Unexpected option passed to constructor: " + key);
+			for (const key of keys) if (defaultOptions[key] === void 0) throw new Error(`Unexpected option passed to constructor: ${key}`);
 			keys = Object.keys(defaultOptions);
 			for (const key of keys) if (options[key] === void 0) options[key] = shallowClone(defaultOptions[key]);
 			normalized = options;
@@ -531,7 +522,7 @@
 	}
 	const getEffectiveId = (schema) => {
 		let id = getId(schema);
-		if ((!id || !isAbsoluteUri(id)) && typeof schema.id === "string" && isAbsoluteUri(schema.id)) id = schema.id;
+		if ((!id || !isAbsoluteUri(id)) && typeof schema.id === "string" && isAbsoluteUri(schema.id)) ({id} = schema);
 		return id;
 	};
 	/**
@@ -540,9 +531,7 @@
 	* the instance `validator.setRemoteReference()` (instance cache).
 	*/
 	function prepareRemoteSchema(schema, uri, validationOptions, maxCloneDepth) {
-		let _schema;
-		if (typeof schema === "string") _schema = JSON.parse(schema);
-		else _schema = deepClone(schema, maxCloneDepth);
+		const _schema = typeof schema === "string" ? JSON.parse(schema) : deepClone(schema, maxCloneDepth);
 		if (!_schema.id) _schema.id = uri;
 		if (validationOptions) _schema.__$validationOptions = normalizeOptions(validationOptions);
 		return _schema;
@@ -550,6 +539,7 @@
 	var SchemaCache = class SchemaCache {
 		static global_cache = Object.create(null);
 		cache = Object.create(null);
+		validator;
 		constructor(validator) {
 			this.validator = validator;
 		}
@@ -626,7 +616,7 @@
 						usesAncestorReport = true;
 					} else {
 						remoteReport = new Report(report);
-						const noCache = result.id && isAbsoluteUri(result.id) ? false : true;
+						const noCache = !(result.id && isAbsoluteUri(result.id));
 						if (this.validator.sc.compileSchema(remoteReport, result, { noCache })) {
 							const savedOptions = this.validator.options;
 							try {
@@ -1728,9 +1718,18 @@
 	var require_merge = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		Object.defineProperty(exports, "__esModule", { value: true });
 		exports.default = merge;
+		function _typeof(o) {
+			"@babel/helpers - typeof";
+			return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
+				return typeof o;
+			} : function(o) {
+				return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+			}, _typeof(o);
+		}
 		function merge() {
 			var obj = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
 			var defaults = arguments.length > 1 ? arguments[1] : void 0;
+			if (_typeof(obj) !== "object" || obj === null) obj = {};
 			for (var key in defaults) if (typeof obj[key] === "undefined") obj[key] = defaults[key];
 			return obj;
 		}
@@ -1957,8 +1956,8 @@
 		module.exports.default = exports.default;
 	}));
 	//#endregion
-	//#region src/utils/date.ts
-	var import_isURL = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exports, module) => {
+	//#region node_modules/validator/lib/isURL.js
+	var require_isURL = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		Object.defineProperty(exports, "__esModule", { value: true });
 		exports.default = isURL;
 		var _assertString = _interopRequireDefault(require_assertString());
@@ -2123,9 +2122,12 @@
 		}
 		module.exports = exports.default;
 		module.exports.default = exports.default;
-	})))(), 1);
-	var import_isEmail = /* @__PURE__ */ __toESM(require_isEmail(), 1);
+	}));
+	//#endregion
+	//#region src/utils/date.ts
 	var import_isIP = /* @__PURE__ */ __toESM(require_isIP(), 1);
+	var import_isEmail = /* @__PURE__ */ __toESM(require_isEmail(), 1);
+	var import_isURL = /* @__PURE__ */ __toESM(require_isURL(), 1);
 	const isLeapYear = (year) => year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
 	const getDaysInMonth = (year, month) => {
 		switch (month) {
@@ -2291,8 +2293,8 @@
 			let k = 0;
 			delta = firstTime ? floor(delta / damp) : delta >> 1;
 			delta += floor(delta / numPoints);
-			for (; delta > baseMinusTMin * tMax >> 1; k += base) delta = floor(delta / baseMinusTMin);
-			return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
+			for (; delta > 455; k += base) delta = floor(delta / baseMinusTMin);
+			return floor(k + 36 * delta / (delta + skew));
 		};
 		/**
 		* Converts a Punycode string of ASCII-only symbols to a string of Unicode
@@ -2417,7 +2419,19 @@
 			});
 		};
 		module.exports = {
+			/**
+			* A string representing the current Punycode.js version number.
+			* @memberOf punycode
+			* @type String
+			*/
 			"version": "2.3.1",
+			/**
+			* An object of methods to convert from JavaScript's internal character
+			* representation (UCS-2) to Unicode code points, and back.
+			* @see <https://mathiasbynens.be/notes/javascript-encoding>
+			* @memberOf punycode
+			* @type Object
+			*/
 			"ucs2": {
 				"decode": ucs2decode,
 				"encode": ucs2encode
@@ -2428,13 +2442,16 @@
 			"toUnicode": toUnicode
 		};
 	})))(), 1);
-	const IDN_SEPARATOR_REGEX = /[\u3002\uff0e\uff61]/g;
-	const IDN_SEPARATOR_TEST_REGEX = /[\u3002\uff0e\uff61]/;
+	const IDN_SEPARATOR_REGEX = /[\u3002\uFF0E\uFF61]/g;
+	const IDN_SEPARATOR_TEST_REGEX = /[\u3002\uFF0E\uFF61]/;
 	const splitHostnameLabels = (hostname) => {
 		if (hostname.length === 0 || hostname.length > 255) return null;
 		if (hostname.startsWith(".") || hostname.endsWith(".")) return null;
 		const labels = hostname.split(".");
-		if (labels.some((label) => label.length === 0 || label.length > 63)) return null;
+		for (let i = 0; i < labels.length; i++) {
+			const len = labels[i].length;
+			if (len === 0 || len > 63) return null;
+		}
 		return labels;
 	};
 	const isAsciiHostnameLabel = (label) => /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i.test(label);
@@ -2445,7 +2462,7 @@
 		if (!/^xn--/i.test(label)) return label;
 		try {
 			return import_punycode.default.toUnicode(label.toLowerCase());
-		} catch (_e) {
+		} catch {
 			return null;
 		}
 	};
@@ -2453,34 +2470,27 @@
 		if (label.startsWith("-") || label.endsWith("-")) return false;
 		if (label.length >= 4 && label[2] === "-" && label[3] === "-" && !/^xn--/i.test(label)) return false;
 		if (/^\p{M}/u.test(label)) return false;
-		if (/[\u302e\u302f\u0640\u07fa]/u.test(label)) return false;
+		if (/[\u302E\u302F\u0640\u07FA]/u.test(label)) return false;
 		for (let idx = 0; idx < label.length; idx++) {
 			const char = label[idx];
-			if (char === "·") {
-				if (idx === 0 || idx === label.length - 1 || label[idx - 1] !== "l" || label[idx + 1] !== "l") return false;
-			}
-			if (char === "͵") {
-				if (idx === label.length - 1 || !isGreek(label[idx + 1])) return false;
-			}
-			if (char === "׳" || char === "״") {
-				if (idx === 0 || !isHebrew(label[idx - 1])) return false;
-			}
-			if (char === "‍") {
-				if (idx === 0 || label[idx - 1] !== "्") return false;
-			}
+			if (char === "·" && (idx === 0 || idx === label.length - 1 || label[idx - 1] !== "l" || label[idx + 1] !== "l")) return false;
+			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 (label.includes("・") && !hasCjkKanaOrHan(label.replace(/\u30fb/g, ""))) return false;
+		if (label.includes("・") && !hasCjkKanaOrHan(label.replaceAll("・", ""))) return false;
 		const hasArabicIndic = /[\u0660-\u0669]/.test(label);
-		const hasExtendedArabicIndic = /[\u06f0-\u06f9]/.test(label);
+		const hasExtendedArabicIndic = /[\u06F0-\u06F9]/.test(label);
 		if (hasArabicIndic && hasExtendedArabicIndic) return false;
 		return true;
 	};
 	const isValidHostname = (hostname) => {
-		if (IDN_SEPARATOR_TEST_REGEX.test(hostname) || /[^\x00-\x7F]/.test(hostname)) return false;
+		if (IDN_SEPARATOR_TEST_REGEX.test(hostname) || /[^\u0000-\u007F]/.test(hostname)) return false;
 		if (import_isIP.default.default(hostname, 4)) return false;
 		const labels = splitHostnameLabels(hostname);
 		if (labels === null) return false;
-		for (const label of labels) {
+		for (let i = 0; i < labels.length; i++) {
+			const label = labels[i];
 			if (!isAsciiHostnameLabel(label)) return false;
 			if (/^xn--/i.test(label)) {
 				const unicodeLabel = toUnicodeLabel(label);
@@ -2492,7 +2502,8 @@
 	const isValidIdnHostname = (hostname) => {
 		const labels = splitHostnameLabels(hostname.replace(IDN_SEPARATOR_REGEX, "."));
 		if (labels === null) return false;
-		for (const label of labels) {
+		for (let i = 0; i < labels.length; i++) {
+			const label = labels[i];
 			const unicodeLabel = toUnicodeLabel(label);
 			if (unicodeLabel === null || !isValidIdnUnicodeLabel(unicodeLabel)) return false;
 		}
@@ -2513,9 +2524,9 @@
 	const parseRfc3339Time = (time) => {
 		const matches = RFC3339_TIME_REGEX.exec(time);
 		if (matches === null) return null;
-		const hour = parseInt(matches[1], 10);
-		const minute = parseInt(matches[2], 10);
-		const second = parseInt(matches[3], 10);
+		const hour = Number.parseInt(matches[1], 10);
+		const minute = Number.parseInt(matches[2], 10);
+		const second = Number.parseInt(matches[3], 10);
 		if (hour > 23 || minute > 59 || second > 60) return null;
 		let utcHour = hour;
 		let utcMinute = minute;
@@ -2523,8 +2534,8 @@
 			const offsetMatches = /^([+-])([0-9]{2}):([0-9]{2})$/.exec(matches[5]);
 			if (offsetMatches === null) return null;
 			const offsetSign = offsetMatches[1];
-			const offsetHour = parseInt(offsetMatches[2], 10);
-			const offsetMinute = parseInt(offsetMatches[3], 10);
+			const offsetHour = Number.parseInt(offsetMatches[2], 10);
+			const offsetMinute = Number.parseInt(offsetMatches[3], 10);
 			if (offsetHour > 23 || offsetMinute > 59) return null;
 			const utc = toUtcTime(hour, minute, offsetSign, offsetHour, offsetMinute);
 			utcHour = utc.hour;
@@ -2545,17 +2556,18 @@
 		if (typeof date !== "string") return true;
 		const matches = /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/.exec(date);
 		if (matches === null) return false;
-		return isValidRfc3339Date(parseInt(matches[1], 10), parseInt(matches[2], 10), parseInt(matches[3], 10));
+		return isValidRfc3339Date(Number.parseInt(matches[1], 10), Number.parseInt(matches[2], 10), Number.parseInt(matches[3], 10));
 	};
 	const dateTimeValidator = (dateTime) => {
 		if (typeof dateTime !== "string") return true;
-		const s = dateTime.toLowerCase().split("t");
-		if (s.length !== 2) return false;
-		const datePart = s[0];
-		const timePart = s[1];
+		let tIdx = dateTime.indexOf("T");
+		if (tIdx === -1) tIdx = dateTime.indexOf("t");
+		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);
 		if (dateMatches === null) return false;
-		if (!isValidRfc3339Date(parseInt(dateMatches[1], 10), parseInt(dateMatches[2], 10), parseInt(dateMatches[3], 10))) 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;
 	};
 	const emailValidator = (email) => {
@@ -2584,26 +2596,26 @@
 		if (ipv6.includes("%")) return false;
 		return import_isIP.default.default(ipv6, 6);
 	};
+	const INVALID_REGEX_ESCAPES = new Set(["a"]);
 	const regexValidator = (input) => {
 		if (typeof input !== "string") return true;
-		const invalidEscapes = new Set(["a"]);
 		for (let idx = 0; idx < input.length; idx++) {
 			if (input[idx] !== "\\") continue;
 			idx++;
 			if (idx >= input.length) return false;
 			const escaped = input[idx];
-			if (invalidEscapes.has(escaped)) return false;
+			if (INVALID_REGEX_ESCAPES.has(escaped)) return false;
 		}
 		try {
-			RegExp(input);
+			new RegExp(input);
 			return true;
-		} catch (_e) {
+		} catch {
 			return false;
 		}
 	};
 	const durationValidator = (input) => {
 		if (typeof input !== "string") return true;
-		if (!/^P[\x00-\x7F]*$/.test(input)) return false;
+		if (!/^P[\u0000-\u007F]*$/.test(input)) return false;
 		if (!input.startsWith("P")) return false;
 		const body = input.slice(1);
 		if (body.length === 0) return false;
@@ -2613,7 +2625,7 @@
 		const datePart = parts[0];
 		const timePart = parts.length === 2 ? parts[1] : void 0;
 		if (datePart.length > 0 && !/^(?:\d+Y(?:\d+M(?:\d+D)?)?|\d+M(?:\d+D)?|\d+D)$/.test(datePart)) return false;
-		const hasDateComponent = /\d+[YMD]/.test(datePart);
+		const hasDateComponent = datePart.length > 0;
 		let hasTimeComponent = false;
 		if (timePart !== void 0) {
 			if (timePart.length === 0) return false;
@@ -2628,32 +2640,31 @@
 		return /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(input);
 	};
 	const strictUriValidator = (uri) => typeof uri !== "string" || import_isURL.default.default(uri);
+	const isHexChar = (c) => c >= 48 && c <= 57 || c >= 65 && c <= 70 || c >= 97 && c <= 102;
 	const hasValidPercentEncoding = (str) => {
-		for (let i = 0; i < str.length; i++) if (str[i] === "%") {
-			if (i + 2 >= str.length || !/[0-9a-fA-F]/.test(str[i + 1]) || !/[0-9a-fA-F]/.test(str[i + 2])) return false;
-		}
+		for (let i = 0; i < str.length; i++) if (str[i] === "%" && (i + 2 >= str.length || !isHexChar(str.charCodeAt(i + 1)) || !isHexChar(str.charCodeAt(i + 2)))) return false;
 		return true;
 	};
-	const uriValidator = function(uri) {
+	const uriValidator = (uri) => {
 		if (typeof uri !== "string") return true;
-		if (/[^\x00-\x7F]/.test(uri)) return false;
+		if (/[^\u0000-\u007F]/.test(uri)) return false;
 		if (!hasValidPercentEncoding(uri)) return false;
-		const match = uri.match(/^([a-zA-Z][a-zA-Z0-9+.-]*):\/\/([^/?#]*)/);
+		const match = /^([a-zA-Z][a-zA-Z0-9+.-]*):\/\/([^/?#]*)/.exec(uri);
 		if (match) {
 			const authority = match[2];
 			const atIndex = authority.indexOf("@");
 			if (atIndex > 0) {
-				const userinfo = authority.substring(0, atIndex);
+				const userinfo = authority.slice(0, atIndex);
 				if (userinfo.includes("[") || userinfo.includes("]")) return false;
 			}
-			let hostPort = atIndex >= 0 ? authority.substring(atIndex + 1) : authority;
+			let hostPort = atIndex === -1 ? authority : authority.slice(atIndex + 1);
 			if (hostPort.startsWith("[")) {
 				const bracketEnd = hostPort.indexOf("]");
-				if (bracketEnd >= 0) hostPort = hostPort.substring(bracketEnd + 1);
+				if (bracketEnd !== -1) hostPort = hostPort.slice(bracketEnd + 1);
 			}
 			const colonIndex = hostPort.lastIndexOf(":");
-			if (colonIndex >= 0) {
-				const port = hostPort.substring(colonIndex + 1);
+			if (colonIndex !== -1) {
+				const port = hostPort.slice(colonIndex + 1);
 				if (port.length > 0 && !/^\d+$/.test(port)) return false;
 			}
 		}
@@ -2661,7 +2672,7 @@
 	};
 	const uriReferenceValidator = (uri) => {
 		if (typeof uri !== "string") return true;
-		if (/[^\x00-\x7F]/.test(uri)) return false;
+		if (/[^\u0000-\u007F]/.test(uri)) return false;
 		return /^([a-zA-Z][a-zA-Z0-9+.-]*:)?[^"\\<>^{}^`| ]*$/.test(uri);
 	};
 	const uriTemplateValidator = (uri) => {
@@ -2692,20 +2703,20 @@
 		if (typeof pointer !== "string") return true;
 		if (pointer === "") return true;
 		if (!/^(?:\/[^/]*)+$/.test(pointer)) return false;
-		const tokens = pointer.split("/").slice(1);
-		for (const token of tokens) if (!hasValidTildeEscapes(token)) return false;
+		const tokens = pointer.split("/");
+		for (let i = 1; i < tokens.length; i++) if (!hasValidTildeEscapes(tokens[i])) return false;
 		return true;
 	};
 	const relativeJsonPointerValidator = (pointer) => {
 		if (typeof pointer !== "string") return true;
-		const match = pointer.match(/^(0|[1-9]\d*)(.*)$/);
+		const match = /^(0|[1-9]\d*)(.*)$/.exec(pointer);
 		if (!match) return false;
 		const suffix = match[2];
 		if (suffix === "" || suffix === "#") return true;
 		if (!suffix.startsWith("/")) return false;
 		if (!/^(?:\/[^/]*)+$/.test(suffix)) return false;
-		const tokens = suffix.split("/").slice(1);
-		for (const token of tokens) if (!hasValidTildeEscapes(token)) return false;
+		const tokens = suffix.split("/");
+		for (let i = 1; i < tokens.length; i++) if (!hasValidTildeEscapes(tokens[i])) return false;
 		return true;
 	};
 	const timeValidator = (time) => {
@@ -2726,7 +2737,7 @@
 		try {
 			new URL(iri);
 			return true;
-		} catch (_e) {
+		} catch {
 			return false;
 		}
 	};
@@ -2758,13 +2769,12 @@
 		uuid: uuidValidator
 	};
 	const customValidators = {};
-	function getFormatValidators(options) {
-		return {
-			...inbuiltValidators,
-			...options?.strictUris ? { uri: strictUriValidator } : {},
-			...customValidators,
-			...options?.customFormats || {}
-		};
+	function resolveFormatValidator(name, options) {
+		const custom = options?.customFormats;
+		if (custom && Object.hasOwn(custom, name)) return custom[name];
+		if (Object.hasOwn(customValidators, name)) return customValidators[name];
+		if (options?.strictUris && name === "uri") return strictUriValidator;
+		return inbuiltValidators[name];
 	}
 	function registerFormat(name, validatorFunction) {
 		customValidators[name] = validatorFunction;
@@ -3617,8 +3627,9 @@
 				if (starHeight > 1) return false;
 				if (opts.reps > opts.limit) return false;
 			}
-			if (node.options) for (i = 0, len = node.options.length; i < len; i++) {
-				ok = walk({ stack: node.options[i] }, opts, starHeight);
+			const options = node.options || node.value?.options;
+			if (options) for (i = 0, len = options.length; i < len; i++) {
+				ok = walk({ stack: options[i] }, opts, starHeight);
 				if (!ok) return false;
 			}
 			const stack = node.stack || node.value?.stack;
@@ -3679,12 +3690,12 @@
 				ok: true,
 				value: new RegExp(pattern, "u")
 			};
-		} catch (e) {
+		} catch (error) {
 			return {
 				ok: false,
 				error: {
 					pattern,
-					message: e && e.message ? e.message : "Invalid regular expression"
+					message: error instanceof Error ? error.message : "Invalid regular expression"
 				}
 			};
 		}
@@ -3693,12 +3704,12 @@
 				ok: true,
 				value: new RegExp(pattern)
 			};
-		} catch (e) {
+		} catch (error) {
 			return {
 				ok: false,
 				error: {
 					pattern,
-					message: e && e.message ? e.message : "Invalid regular expression"
+					message: error instanceof Error ? error.message : "Invalid regular expression"
 				}
 			};
 		}
@@ -3727,7 +3738,7 @@
 			const seen = /* @__PURE__ */ new Set();
 			for (let i = 0; i < l; i++) {
 				const v = arr[i];
-				const key = typeof v + ":" + String(v);
+				const key = `${typeof v}:${String(v)}`;
 				if (seen.has(key)) {
 					if (indexes) for (let j = 0; j < i; j++) {
 						const prev = arr[j];
@@ -3742,7 +3753,8 @@
 			}
 			return true;
 		}
-		for (let i = 0; i < l; i++) for (let j = i + 1; j < l; j++) if (areEqual(arr[i], arr[j], { maxDepth })) {
+		const eqOpts = { maxDepth };
+		for (let i = 0; i < l; i++) for (let j = i + 1; j < l; j++) if (areEqual(arr[i], arr[j], eqOpts)) {
 			if (indexes) indexes.push(i, j);
 			return false;
 		}
@@ -3757,11 +3769,7 @@
 	};
 	//#endregion
 	//#region src/validation/shared.ts
-	const shouldSkipValidate = function(options, errors) {
-		return options && Array.isArray(options.includeErrors) && options.includeErrors.length > 0 && !errors.some(function(err) {
-			return options.includeErrors.includes(err);
-		});
-	};
+	const shouldSkipValidate = (options, errors) => options && Array.isArray(options.includeErrors) && options.includeErrors.length > 0 && !errors.some((err) => options.includeErrors.includes(err));
 	const supportsDependentKeywords = (schema, version) => {
 		if (typeof schema.$schema === "string") return !/draft-04|draft-06|draft-07/.test(schema.$schema);
 		return !(version === "draft-04" || version === "draft-06" || version === "draft-07");
@@ -3801,7 +3809,7 @@
 		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] === true || vocabulary[VOCAB_VALIDATION_2020_12] === true;
+		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];
 		return false;
 	};
 	/**
@@ -3817,8 +3825,8 @@
 		const metaSchema = currentSchemaMeta || rootSchemaMeta;
 		if (!metaSchema || typeof metaSchema !== "object" || !isObject(metaSchema.$vocabulary)) return false;
 		const vocabulary = metaSchema.$vocabulary;
-		if (Object.hasOwn(vocabulary, VOCAB_FORMAT_ASSERTION_2020_12)) return vocabulary[VOCAB_FORMAT_ASSERTION_2020_12] === true;
-		if (Object.hasOwn(vocabulary, VOCAB_FORMAT_2019_09)) return vocabulary[VOCAB_FORMAT_2019_09] === true;
+		if (Object.hasOwn(vocabulary, VOCAB_FORMAT_ASSERTION_2020_12)) return vocabulary[VOCAB_FORMAT_ASSERTION_2020_12];
+		if (Object.hasOwn(vocabulary, VOCAB_FORMAT_2019_09)) return vocabulary[VOCAB_FORMAT_2019_09];
 		return false;
 	};
 	function cacheValidationResult(report, schema, json, passed) {
@@ -3842,9 +3850,14 @@
 	*/
 	function deferOrRunSync(report, subReports, decisionFn) {
 		const asyncTasksBefore = report.asyncTasks.length;
-		for (const subReport of subReports) report.asyncTasks.push(...subReport.asyncTasks);
+		for (let i = 0; i < subReports.length; i++) {
+			const tasks = subReports[i].asyncTasks;
+			for (let j = 0; j < tasks.length; j++) report.asyncTasks.push(tasks[j]);
+		}
 		if (report.asyncTasks.length > asyncTasksBefore) report.addAsyncTaskWithPath((callback) => {
-			setTimeout(() => callback(null), 0);
+			setTimeout(() => {
+				callback(null);
+			}, 0);
 		}, [], () => {
 			decisionFn();
 		});
@@ -3852,35 +3865,33 @@
 	}
 	//#endregion
 	//#region src/validation/array.ts
-	function additionalItemsValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["ARRAY_ADDITIONAL_ITEMS"])) return;
+	function additionalItemsValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["ARRAY_ADDITIONAL_ITEMS"])) return;
 		if (!Array.isArray(json)) return;
-		if (schema.additionalItems === false && Array.isArray(schema.items)) {
-			if (json.length > schema.items.length) report.addError("ARRAY_ADDITIONAL_ITEMS", void 0, void 0, schema, "additionalItems");
-		}
+		if (schema.additionalItems === false && Array.isArray(schema.items) && json.length > schema.items.length) report.addError("ARRAY_ADDITIONAL_ITEMS", void 0, void 0, schema, "additionalItems");
 	}
 	function itemsValidator() {}
 	function prefixItemsValidator() {}
-	function maxItemsValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["ARRAY_LENGTH_LONG"])) return;
+	function maxItemsValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["ARRAY_LENGTH_LONG"])) return;
 		if (!Array.isArray(json)) return;
 		if (json.length > schema.maxItems) report.addError("ARRAY_LENGTH_LONG", [json.length, schema.maxItems], void 0, schema, "maxItems");
 	}
-	function minItemsValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["ARRAY_LENGTH_SHORT"])) return;
+	function minItemsValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["ARRAY_LENGTH_SHORT"])) return;
 		if (!Array.isArray(json)) return;
 		if (json.length < schema.minItems) report.addError("ARRAY_LENGTH_SHORT", [json.length, schema.minItems], void 0, schema, "minItems");
 	}
-	function uniqueItemsValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["ARRAY_UNIQUE"])) return;
+	function uniqueItemsValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["ARRAY_UNIQUE"])) return;
 		if (!Array.isArray(json)) return;
 		if (schema.uniqueItems === true) {
 			const matches = [];
-			if (isUniqueArray(json, matches, this.options.maxRecursionDepth) === false) report.addError("ARRAY_UNIQUE", matches, void 0, schema, "uniqueItems");
+			if (!isUniqueArray(json, matches, ctx.options.maxRecursionDepth)) report.addError("ARRAY_UNIQUE", matches, void 0, schema, "uniqueItems");
 		}
 	}
-	function containsValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["CONTAINS"])) return;
+	function containsValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["CONTAINS"])) return;
 		if (!Array.isArray(json)) return;
 		const containsSchema = schema.contains;
 		if (containsSchema === void 0) return;
@@ -3889,16 +3900,16 @@
 		for (let idx = 0; idx < json.length; idx++) {
 			const subReport = new Report_(report);
 			subReports.push(subReport);
-			this._jsonValidate(subReport, containsSchema, json[idx]);
+			ctx._jsonValidate(subReport, containsSchema, json[idx]);
 			cacheValidationResult(report, containsSchema, json[idx], subReport.errors.length === 0);
 		}
 		const addContainsErrorIfNeeded = () => {
 			let matchingItems = 0;
-			for (const subReport of subReports) if (subReport.errors.length === 0) matchingItems += 1;
-			const supportsContainsBounds = this.options.version === "draft2019-09" || this.options.version === "draft2020-12";
+			for (let i = 0; i < subReports.length; i++) if (subReports[i].errors.length === 0) matchingItems += 1;
+			const supportsContainsBounds = ctx.options.version === "draft2019-09" || ctx.options.version === "draft2020-12";
 			const minContains = supportsContainsBounds && typeof schema.minContains === "number" ? schema.minContains ?? 1 : 1;
 			const maxContains = supportsContainsBounds && typeof schema.maxContains === "number" ? schema.maxContains : void 0;
-			if (!(matchingItems >= minContains) || !(maxContains === void 0 || matchingItems <= maxContains)) report.addError("CONTAINS", void 0, subReports, schema, void 0);
+			if (!(matchingItems >= minContains) || !(maxContains === void 0 || matchingItems <= maxContains)) report.addError("CONTAINS", void 0, subReports, schema);
 		};
 		deferOrRunSync(report, subReports, addContainsErrorIfNeeded);
 	}
@@ -3906,18 +3917,18 @@
 	function minContainsValidator() {}
 	//#endregion
 	//#region src/validation/combinators.ts
-	function allOfValidator(report, schema, json) {
+	function allOfValidator(ctx, report, schema, json) {
 		for (let i = 0; i < schema.allOf.length; i++) {
-			const validateResult = this._jsonValidate(report, schema.allOf[i], json);
-			if (this.options.breakOnFirstError && validateResult === false) break;
+			const validateResult = ctx._jsonValidate(report, schema.allOf[i], json);
+			if (ctx.options.breakOnFirstError && !validateResult) break;
 		}
 	}
-	function anyOfValidator(report, schema, json) {
+	function anyOfValidator(ctx, report, schema, json) {
 		const subReports = [];
 		for (let i = 0; i < schema.anyOf.length; i++) {
 			const subReport = new Report(report);
 			subReports.push(subReport);
-			this._jsonValidate(subReport, schema.anyOf[i], json);
+			ctx._jsonValidate(subReport, schema.anyOf[i], json);
 			cacheValidationResult(report, schema.anyOf[i], json, subReport.errors.length === 0);
 		}
 		deferOrRunSync(report, subReports, () => {
@@ -3926,15 +3937,15 @@
 				passed = true;
 				break;
 			}
-			if (passed === false) report.addError("ANY_OF_MISSING", void 0, subReports, schema, "anyOf");
+			if (!passed) report.addError("ANY_OF_MISSING", void 0, subReports, schema, "anyOf");
 		});
 	}
-	function oneOfValidator(report, schema, json) {
+	function oneOfValidator(ctx, report, schema, json) {
 		const subReports = [];
 		for (let i = 0; i < schema.oneOf.length; i++) {
 			const subReport = new Report(report);
 			subReports.push(subReport);
-			this._jsonValidate(subReport, schema.oneOf[i], json);
+			ctx._jsonValidate(subReport, schema.oneOf[i], json);
 			cacheValidationResult(report, schema.oneOf[i], json, subReport.errors.length === 0);
 		}
 		deferOrRunSync(report, subReports, () => {
@@ -3944,77 +3955,77 @@
 			else if (passes > 1) report.addError("ONE_OF_MULTIPLE", void 0, void 0, schema, "oneOf");
 		});
 	}
-	function notValidator(report, schema, json) {
+	function notValidator(ctx, report, schema, json) {
 		const subReport = new Report(report);
-		if (this._jsonValidate(subReport, schema.not, json) === true) report.addError("NOT_PASSED", void 0, void 0, schema, "not");
+		if (ctx._jsonValidate(subReport, schema.not, json)) report.addError("NOT_PASSED", void 0, void 0, schema, "not");
 	}
-	function ifValidator(report, schema, json) {
-		if (this.options.version === "draft-04" || this.options.version === "draft-06") return;
+	function ifValidator(ctx, report, schema, json) {
+		if (ctx.options.version === "draft-04" || ctx.options.version === "draft-06") return;
 		const conditionSchema = schema.if;
 		const thenSchema = schema.then;
 		const elseSchema = schema.else;
 		if (conditionSchema === void 0 || thenSchema === void 0 && elseSchema === void 0) return;
 		const conditionReport = new Report(report);
-		this._jsonValidate(conditionReport, conditionSchema, json);
+		ctx._jsonValidate(conditionReport, conditionSchema, json);
 		cacheValidationResult(report, conditionSchema, json, conditionReport.errors.length === 0);
 		const branchSchema = conditionReport.errors.length === 0 ? thenSchema : elseSchema;
 		if (branchSchema === void 0) return;
-		this._jsonValidate(report, branchSchema, json);
+		ctx._jsonValidate(report, branchSchema, json);
 	}
 	function thenValidator() {}
 	function elseValidator() {}
 	//#endregion
 	//#region src/validation/numeric.ts
-	function multipleOfValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["MULTIPLE_OF"])) return;
+	function multipleOfValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["MULTIPLE_OF"])) return;
 		if (typeof json !== "number") return;
 		const result = json / schema.multipleOf;
 		if (!Number.isFinite(result) || Math.abs(result - Math.round(result)) >= 1e-10) report.addError("MULTIPLE_OF", [json, schema.multipleOf], void 0, schema, "multipleOf");
 	}
-	function maximumValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["MAXIMUM", "MAXIMUM_EXCLUSIVE"])) return;
+	function maximumValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["MAXIMUM", "MAXIMUM_EXCLUSIVE"])) return;
 		if (typeof json !== "number") return;
 		if (schema.exclusiveMaximum !== true) {
 			if (json > schema.maximum) report.addError("MAXIMUM", [json, schema.maximum], void 0, schema, "maximum");
 		} else if (json >= schema.maximum) report.addError("MAXIMUM_EXCLUSIVE", [json, schema.maximum], void 0, schema, "maximum");
 	}
-	function exclusiveMaximumValidator(report, schema, json) {
+	function exclusiveMaximumValidator(ctx, report, schema, json) {
 		if (typeof schema.exclusiveMaximum === "number") {
-			if (shouldSkipValidate(this.validateOptions, ["MAXIMUM_EXCLUSIVE"])) return;
+			if (shouldSkipValidate(ctx.validateOptions, ["MAXIMUM_EXCLUSIVE"])) return;
 			if (typeof json !== "number") return;
 			if (json >= schema.exclusiveMaximum) report.addError("MAXIMUM_EXCLUSIVE", [json, schema.exclusiveMaximum], void 0, schema, "exclusiveMaximum");
 		}
 	}
-	function minimumValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["MINIMUM", "MINIMUM_EXCLUSIVE"])) return;
+	function minimumValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["MINIMUM", "MINIMUM_EXCLUSIVE"])) return;
 		if (typeof json !== "number") return;
 		if (schema.exclusiveMinimum !== true) {
 			if (json < schema.minimum) report.addError("MINIMUM", [json, schema.minimum], void 0, schema, "minimum");
 		} else if (json <= schema.minimum) report.addError("MINIMUM_EXCLUSIVE", [json, schema.minimum], void 0, schema, "minimum");
 	}
-	function exclusiveMinimumValidator(report, schema, json) {
+	function exclusiveMinimumValidator(ctx, report, schema, json) {
 		if (typeof schema.exclusiveMinimum === "number") {
-			if (shouldSkipValidate(this.validateOptions, ["MINIMUM_EXCLUSIVE"])) return;
+			if (shouldSkipValidate(ctx.validateOptions, ["MINIMUM_EXCLUSIVE"])) return;
 			if (typeof json !== "number") return;
 			if (json <= schema.exclusiveMinimum) report.addError("MINIMUM_EXCLUSIVE", [json, schema.exclusiveMinimum], void 0, schema, "exclusiveMinimum");
 		}
 	}
 	//#endregion
 	//#region src/validation/object.ts
-	function maxPropertiesValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["OBJECT_PROPERTIES_MAXIMUM"])) return;
+	function maxPropertiesValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["OBJECT_PROPERTIES_MAXIMUM"])) return;
 		if (!isObject(json)) return;
 		const keysCount = Object.keys(json).length;
 		if (keysCount > schema.maxProperties) report.addError("OBJECT_PROPERTIES_MAXIMUM", [keysCount, schema.maxProperties], void 0, schema, "maxProperties");
 	}
-	function minPropertiesValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["OBJECT_PROPERTIES_MINIMUM"])) return;
+	function minPropertiesValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["OBJECT_PROPERTIES_MINIMUM"])) return;
 		if (!isObject(json)) return;
 		const keysCount = Object.keys(json).length;
 		if (keysCount < schema.minProperties) report.addError("OBJECT_PROPERTIES_MINIMUM", [keysCount, schema.minProperties], void 0, schema, "minProperties");
 	}
-	function requiredValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["OBJECT_MISSING_REQUIRED_PROPERTY"])) return;
+	function requiredValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["OBJECT_MISSING_REQUIRED_PROPERTY"])) return;
 		if (!isObject(json)) return;
 		const idx = schema.required.length;
 		for (let i = 0; i < idx; i++) {
@@ -4022,30 +4033,31 @@
 			if (!Object.hasOwn(json, requiredPropertyName)) report.addError("OBJECT_MISSING_REQUIRED_PROPERTY", [requiredPropertyName], void 0, schema, "required");
 		}
 	}
-	function additionalPropertiesValidator(report, schema, json) {
-		if (schema.properties === void 0 && schema.patternProperties === void 0) return propertiesValidator.call(this, report, schema, json);
+	function additionalPropertiesValidator(ctx, report, schema, json) {
+		if (schema.properties === void 0 && schema.patternProperties === void 0) propertiesValidator(ctx, report, schema, json);
 	}
-	function patternPropertiesValidator(report, schema, json) {
-		if (schema.properties === void 0) return propertiesValidator.call(this, report, schema, json);
+	function patternPropertiesValidator(ctx, report, schema, json) {
+		if (schema.properties === void 0) propertiesValidator(ctx, report, schema, json);
 	}
-	function propertiesValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["OBJECT_ADDITIONAL_PROPERTIES"])) return;
+	function propertiesValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["OBJECT_ADDITIONAL_PROPERTIES"])) return;
 		if (!isObject(json)) return;
-		const properties = schema.properties !== void 0 ? schema.properties : {};
-		const patternProperties = schema.patternProperties !== void 0 ? schema.patternProperties : {};
+		const properties = schema.properties === void 0 ? {} : schema.properties;
+		const patternProperties = schema.patternProperties === void 0 ? {} : schema.patternProperties;
 		if (schema.additionalProperties === false) {
 			let s = Object.keys(json);
 			const p = Object.keys(properties);
 			const pp = Object.keys(patternProperties);
 			s = difference(s, p);
-			for (const ppKey of pp) {
+			for (let i = 0; i < pp.length; i++) {
+				const ppKey = pp[i];
 				const result = compileSchemaRegex(ppKey);
 				if (!result.ok) continue;
 				const regExp = result.value;
-				for (let idx2 = s.length - 1; idx2 >= 0; idx2--) if (regExp.test(s[idx2]) === true) s.splice(idx2, 1);
+				for (let idx2 = s.length - 1; idx2 >= 0; idx2--) if (regExp.test(s[idx2])) s.splice(idx2, 1);
 			}
 			if (s.length > 0) {
-				if (Array.isArray(this.options.assumeAdditional)) for (const allowed of this.options.assumeAdditional) {
+				if (Array.isArray(ctx.options.assumeAdditional)) for (const allowed of ctx.options.assumeAdditional) {
 					const io = s.indexOf(allowed);
 					if (io !== -1) s.splice(io, 1);
 				}
@@ -4053,29 +4065,29 @@
 			}
 		}
 	}
-	function dependenciesValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["OBJECT_DEPENDENCY_KEY"])) return;
+	function dependenciesValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["OBJECT_DEPENDENCY_KEY"])) return;
 		if (!isObject(json)) return;
 		const keys = Object.keys(schema.dependencies);
 		for (const dependencyName of keys) if (Object.hasOwn(json, dependencyName)) {
 			const dependencyDefinition = schema.dependencies[dependencyName];
 			if (Array.isArray(dependencyDefinition)) {
 				for (const requiredPropertyName of dependencyDefinition) if (!Object.hasOwn(json, requiredPropertyName)) report.addError("OBJECT_DEPENDENCY_KEY", [requiredPropertyName, dependencyName], void 0, schema, "dependencies");
-			} else this._jsonValidate(report, dependencyDefinition, json);
+			} else ctx._jsonValidate(report, dependencyDefinition, json);
 		}
 	}
-	function dependentSchemasValidator(report, schema, json) {
-		if (!supportsDependentKeywords(schema, this.options.version)) return;
+	function dependentSchemasValidator(ctx, report, schema, json) {
+		if (!supportsDependentKeywords(schema, ctx.options.version)) return;
 		if (!isObject(json) || !isObject(schema.dependentSchemas)) return;
 		const keys = Object.keys(schema.dependentSchemas);
 		for (const dependencyName of keys) if (Object.hasOwn(json, dependencyName)) {
 			const dependencySchema = schema.dependentSchemas[dependencyName];
-			this._jsonValidate(report, dependencySchema, json);
+			ctx._jsonValidate(report, dependencySchema, json);
 		}
 	}
-	function dependentRequiredValidator(report, schema, json) {
-		if (!supportsDependentKeywords(schema, this.options.version)) return;
-		if (shouldSkipValidate(this.validateOptions, ["OBJECT_DEPENDENCY_KEY"])) return;
+	function dependentRequiredValidator(ctx, report, schema, json) {
+		if (!supportsDependentKeywords(schema, ctx.options.version)) return;
+		if (shouldSkipValidate(ctx.validateOptions, ["OBJECT_DEPENDENCY_KEY"])) return;
 		if (!isObject(json) || !isObject(schema.dependentRequired)) return;
 		const keys = Object.keys(schema.dependentRequired);
 		for (const dependencyName of keys) {
@@ -4085,8 +4097,8 @@
 			for (const requiredPropertyName of requiredProperties) if (!Object.hasOwn(json, requiredPropertyName)) report.addError("OBJECT_DEPENDENCY_KEY", [requiredPropertyName, dependencyName], void 0, schema, "dependentRequired");
 		}
 	}
-	function propertyNamesValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["PROPERTY_NAMES"])) return;
+	function propertyNamesValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["PROPERTY_NAMES"])) return;
 		if (!isObject(json)) return;
 		const propertyNamesSchema = schema.propertyNames;
 		if (propertyNamesSchema === void 0) return;
@@ -4096,10 +4108,10 @@
 		for (const key of keys) {
 			const subReport = new Report_(report);
 			subReports.push(subReport);
-			this._jsonValidate(subReport, propertyNamesSchema, key);
+			ctx._jsonValidate(subReport, propertyNamesSchema, key);
 		}
 		const addPropertyNameErrors = () => {
-			for (let idx = 0; idx < keys.length; idx++) if (subReports[idx].errors.length > 0) report.addError("PROPERTY_NAMES", [keys[idx]], subReports[idx], schema, void 0);
+			for (let idx = 0; idx < keys.length; idx++) if (subReports[idx].errors.length > 0) report.addError("PROPERTY_NAMES", [keys[idx]], subReports[idx], schema);
 		};
 		deferOrRunSync(report, subReports, addPropertyNameErrors);
 	}
@@ -4109,7 +4121,7 @@
 		const hashIdx = dynamicRef.indexOf("#");
 		if (hashIdx === -1) return;
 		const fragment = dynamicRef.slice(hashIdx + 1);
-		if (!fragment || fragment[0] === "/") return;
+		if (!fragment || fragment.startsWith("/")) return;
 		return fragment;
 	};
 	const findDynamicAnchorInScope = (scopeSchema, anchorName) => {
@@ -4136,7 +4148,7 @@
 	*/
 	const resolveDynamicRef = (schema, dynamicScopeStack) => {
 		const resolved = schema.__$dynamicRefResolved;
-		if (typeof resolved === "undefined" || !schema.$dynamicRef) return resolved;
+		if (resolved === void 0 || !schema.$dynamicRef) return resolved;
 		let target = resolved;
 		const anchorName = getDynamicRefAnchorName(schema.$dynamicRef);
 		if (anchorName && typeof target === "object" && target.$dynamicAnchor === anchorName) for (let scopeIdx = 0; scopeIdx < dynamicScopeStack.length; scopeIdx++) {
@@ -4163,8 +4175,9 @@
 		} catch {
 			return;
 		}
-		if (typeof Buffer !== "undefined") try {
-			return Buffer.from(value, "base64").toString("utf8");
+		const bufferCtor = globalThis.Buffer;
+		if (bufferCtor !== void 0) try {
+			return bufferCtor.from(value, "base64").toString("utf-8");
 		} catch {
 			return;
 		}
@@ -4173,27 +4186,37 @@
 	//#region src/utils/unicode.ts
 	/**
 	* Returns the number of Unicode code points in the string.
-	* Uses the built-in string iterator which correctly handles surrogate pairs.
+	* Uses a surrogate-aware charCodeAt scan (equivalent to the string iterator)
+	* that counts a surrogate pair as one code point and lone surrogates as one each.
 	*/
 	function unicodeLength(str) {
-		let count = 0;
-		for (const _cp of str) count++;
+		let count = str.length;
+		for (let i = 0; i < str.length - 1; i++) {
+			const hi = str.charCodeAt(i);
+			if (hi >= 55296 && hi <= 56319) {
+				const lo = str.charCodeAt(i + 1);
+				if (lo >= 56320 && lo <= 57343) {
+					count--;
+					i++;
+				}
+			}
+		}
 		return count;
 	}
 	//#endregion
 	//#region src/validation/string.ts
-	function minLengthValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["MIN_LENGTH"])) return;
+	function minLengthValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["MIN_LENGTH"])) return;
 		if (typeof json !== "string") return;
 		if (unicodeLength(json) < schema.minLength) report.addError("MIN_LENGTH", [json.length, schema.minLength], void 0, schema, "minLength");
 	}
-	function maxLengthValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["MAX_LENGTH"])) return;
+	function maxLengthValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["MAX_LENGTH"])) return;
 		if (typeof json !== "string") return;
 		if (unicodeLength(json) > schema.maxLength) report.addError("MAX_LENGTH", [json.length, schema.maxLength], void 0, schema, "maxLength");
 	}
-	function patternValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["PATTERN"])) return;
+	function patternValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["PATTERN"])) return;
 		if (typeof json !== "string") return;
 		const result = compileSchemaRegex(schema.pattern);
 		if (!result.ok) {
@@ -4206,46 +4229,46 @@
 		}
 		if (!result.value.test(json)) report.addError("PATTERN", [schema.pattern, json], void 0, schema, "pattern");
 	}
-	function formatValidator(report, schema, json) {
-		if (this.options.formatAssertions === false) return;
-		if (this.options.formatAssertions === true) {
-			if (!isFormatAssertionVocabEnabled(schema, report, this.options.version)) return;
-		}
-		const isModernDraft = this.options.version === "draft2019-09" || this.options.version === "draft2020-12";
-		const formatValidatorFn = getFormatValidators(this.options)[schema.format];
+	function formatValidator(ctx, report, schema, json) {
+		if (ctx.options.formatAssertions === false) return;
+		if (ctx.options.formatAssertions === true && !isFormatAssertionVocabEnabled(schema, report, ctx.options.version)) return;
+		const isModernDraft = ctx.options.version === "draft2019-09" || ctx.options.version === "draft2020-12";
+		const formatValidatorFn = resolveFormatValidator(schema.format, ctx.options);
 		if (typeof formatValidatorFn === "function") {
-			if (shouldSkipValidate(this.validateOptions, ["INVALID_FORMAT"])) return;
+			if (shouldSkipValidate(ctx.validateOptions, ["INVALID_FORMAT"])) return;
 			if (report.hasError("INVALID_TYPE", [schema.type, whatIs(json)])) return;
-			if (formatValidatorFn.length === 2) report.addAsyncTaskWithPath(formatValidatorFn, [json], function(result) {
+			if (formatValidatorFn.length === 2) report.addAsyncTaskWithPath(formatValidatorFn, [json], (result) => {
 				if (result !== true) report.addError("INVALID_FORMAT", [schema.format, JSON.stringify(json)], void 0, schema, "format");
 			});
 			else {
-				const result = formatValidatorFn.call(this, json);
+				const result = formatValidatorFn.call(ctx, json);
 				if (result instanceof Promise) {
 					const promiseResult = result;
 					report.addAsyncTaskWithPath(async (callback) => {
 						try {
 							callback(await promiseResult);
-						} catch (_error) {
+						} catch {
 							callback(false);
 						}
-					}, [], function(resolvedResult) {
+					}, [], (resolvedResult) => {
 						if (resolvedResult !== true) report.addError("INVALID_FORMAT", [schema.format, JSON.stringify(json)], void 0, schema, "format");
 					});
-				} else if (result !== true) report.addError("INVALID_FORMAT", [schema.format, JSON.stringify(json)], void 0, schema, "format");
+				} else if (!result) report.addError("INVALID_FORMAT", [schema.format, JSON.stringify(json)], void 0, schema, "format");
 			}
-		} else if (this.options.ignoreUnknownFormats !== true && !isModernDraft) report.addError("UNKNOWN_FORMAT", [schema.format], void 0, schema, "format");
+		} else if (ctx.options.ignoreUnknownFormats !== true && !isModernDraft) report.addError("UNKNOWN_FORMAT", [schema.format], void 0, schema, "format");
 	}
-	function contentEncodingValidator(report, schema, json) {
-		if (this.options.version !== "draft-07") return;
+	function contentEncodingValidator(ctx, report, schema, json) {
+		if (ctx.options.version !== "draft-07") return;
 		if (typeof json !== "string") return;
-		if (schema.contentEncoding !== "base64") return;
+		const { contentEncoding } = schema;
+		if (contentEncoding !== "base64") return;
 		if (!isValidBase64(json)) report.addError("INVALID_FORMAT", ["contentEncoding:base64", JSON.stringify(json)], void 0, schema, "contentEncoding");
 	}
-	function contentMediaTypeValidator(report, schema, json) {
-		if (this.options.version !== "draft-07") return;
+	function contentMediaTypeValidator(ctx, report, schema, json) {
+		if (ctx.options.version !== "draft-07") return;
 		if (typeof json !== "string") return;
-		if (schema.contentMediaType !== "application/json") return;
+		const { contentMediaType } = schema;
+		if (contentMediaType !== "application/json") return;
 		let payload = json;
 		if (schema.contentEncoding === "base64") {
 			const decoded = decodeBase64(json);
@@ -4263,38 +4286,40 @@
 	}
 	//#endregion
 	//#region src/validation/type.ts
-	function typeValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["INVALID_TYPE"])) return;
+	function typeValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["INVALID_TYPE"])) return;
 		const jsonType = whatIs(json);
 		if (typeof schema.type === "string") {
 			if (jsonType !== schema.type && (jsonType !== "integer" || schema.type !== "number")) report.addError("INVALID_TYPE", [schema.type, jsonType], void 0, schema, "type");
 		} else if (!schema.type.includes(jsonType) && (jsonType !== "integer" || !schema.type.includes("number"))) report.addError("INVALID_TYPE", [JSON.stringify(schema.type), jsonType], void 0, schema, "type");
 	}
-	function enumValidator(report, schema, json) {
-		if (shouldSkipValidate(this.validateOptions, ["ENUM_CASE_MISMATCH", "ENUM_MISMATCH"])) return;
-		let match = false, caseInsensitiveMatch = false;
-		for (const enumVal of schema.enum) if (areEqual(json, enumVal, { maxDepth: this.options.maxRecursionDepth })) {
+	function enumValidator(ctx, report, schema, json) {
+		if (shouldSkipValidate(ctx.validateOptions, ["ENUM_CASE_MISMATCH", "ENUM_MISMATCH"])) return;
+		const eqOpts = { maxDepth: ctx.options.maxRecursionDepth };
+		const eqOptsCI = {
+			caseInsensitiveComparison: true,
+			maxDepth: ctx.options.maxRecursionDepth
+		};
+		let caseInsensitiveMatch = false, match = false;
+		for (const enumVal of schema.enum) if (areEqual(json, enumVal, eqOpts)) {
 			match = true;
 			break;
-		} else if (areEqual(json, enumVal, {
-			caseInsensitiveComparison: true,
-			maxDepth: this.options.maxRecursionDepth
-		})) caseInsensitiveMatch = true;
-		if (match === false) {
-			const error = caseInsensitiveMatch && this.options.enumCaseInsensitiveComparison ? "ENUM_CASE_MISMATCH" : "ENUM_MISMATCH";
+		} else if (areEqual(json, enumVal, eqOptsCI)) caseInsensitiveMatch = true;
+		if (!match) {
+			const error = caseInsensitiveMatch && ctx.options.enumCaseInsensitiveComparison ? "ENUM_CASE_MISMATCH" : "ENUM_MISMATCH";
 			report.addError(error, [JSON.stringify(json)], void 0, schema, "enum");
 		}
 	}
-	function constValidator(report, schema, json) {
+	function constValidator(ctx, report, schema, json) {
 		const constValue = schema.const;
-		if (areEqual(json, constValue, { maxDepth: this.options.maxRecursionDepth }) === false) report.addError("CONST", [JSON.stringify(constValue)], void 0, schema, void 0);
+		if (!areEqual(json, constValue, { maxDepth: ctx.options.maxRecursionDepth })) report.addError("CONST", [JSON.stringify(constValue)], void 0, schema);
 	}
 	//#endregion
 	//#region src/json-validation.ts
-	function collectEvaluated(args) {
+	function collectEvaluated(ctx, args) {
 		const { report, currentSchema, json, mode, depth } = args;
 		if (!currentSchema || typeof currentSchema === "boolean") return /* @__PURE__ */ new Set();
-		if (depth > (this.options.maxRecursionDepth ?? 100)) {
+		if (depth > (ctx.options.maxRecursionDepth ?? 100)) {
 			report.addError("COLLECT_EVALUATED_DEPTH_EXCEEDED", [depth]);
 			return /* @__PURE__ */ new Set();
 		}
@@ -4305,7 +4330,7 @@
 			return false;
 		};
 		const recurse = (subSchema) => {
-			if (mode === "items") return collectEvaluated.call(this, {
+			if (mode === "items") return collectEvaluated(ctx, {
 				report,
 				currentSchema: subSchema,
 				json,
@@ -4313,7 +4338,7 @@
 				jsonArr: args.jsonArr,
 				depth: depth + 1
 			});
-			return collectEvaluated.call(this, {
+			return collectEvaluated(ctx, {
 				report,
 				currentSchema: subSchema,
 				json,
@@ -4323,7 +4348,7 @@
 			});
 		};
 		if (mode === "items") {
-			const jsonArr = args.jsonArr;
+			const { jsonArr } = args;
 			if (Array.isArray(currentSchema.prefixItems)) {
 				const len = Math.min(currentSchema.prefixItems.length, jsonArr.length);
 				for (let i = 0; i < len; i++) evaluated.add(i);
@@ -4339,104 +4364,102 @@
 				let passed = getCachedValidationResult(report, currentSchema.contains, jsonArr[i]);
 				if (passed === void 0) {
 					const subReport = new Report(report);
-					validate.call(this, subReport, currentSchema.contains, jsonArr[i]);
+					validate(ctx, subReport, currentSchema.contains, jsonArr[i]);
 					passed = subReport.errors.length === 0;
 				}
 				if (passed) evaluated.add(i);
 			}
 			if (currentSchema.unevaluatedItems === true) return "all";
 		} else {
-			const jsonData = args.jsonData;
+			const { jsonData } = args;
 			if (isObject(currentSchema.properties)) {
-				for (const key of Object.keys(currentSchema.properties)) if (Object.hasOwn(jsonData, key)) evaluated.add(key);
+				const propKeysCE = Object.keys(currentSchema.properties);
+				for (let i = 0; i < propKeysCE.length; i++) {
+					const key = propKeysCE[i];
+					if (Object.hasOwn(jsonData, key)) evaluated.add(key);
+				}
 			}
 			if (isObject(currentSchema.patternProperties)) for (const pattern of Object.keys(currentSchema.patternProperties)) {
 				const result = compileSchemaRegex(pattern);
 				if (result.ok) {
-					for (const key of Object.keys(jsonData)) if (result.value.test(key)) evaluated.add(key);
+					const jdKeys = Object.keys(jsonData);
+					for (let i = 0; i < jdKeys.length; i++) if (result.value.test(jdKeys[i])) evaluated.add(jdKeys[i]);
 				}
 			}
 			if (currentSchema.additionalProperties !== void 0) {
-				const propKeys = isObject(currentSchema.properties) ? Object.keys(currentSchema.properties) : [];
+				const propKeySet = new Set(isObject(currentSchema.properties) ? Object.keys(currentSchema.properties) : []);
 				const patternRegexes = [];
 				if (isObject(currentSchema.patternProperties)) for (const pattern of Object.keys(currentSchema.patternProperties)) {
 					const result = compileSchemaRegex(pattern);
 					if (result.ok) patternRegexes.push(result.value);
 				}
-				for (const key of Object.keys(jsonData)) {
-					if (propKeys.includes(key)) continue;
-					if (patternRegexes.some((re) => re.test(key))) continue;
+				const apKeys = Object.keys(jsonData);
+				for (let i = 0; i < apKeys.length; i++) {
+					const key = apKeys[i];
+					if (propKeySet.has(key)) continue;
+					let matchedPattern = false;
+					for (let pi = 0; pi < patternRegexes.length; pi++) if (patternRegexes[pi].test(key)) {
+						matchedPattern = true;
+						break;
+					}
+					if (matchedPattern) continue;
 					evaluated.add(key);
 				}
 			}
 			if (isObject(currentSchema.dependentSchemas)) {
-				for (const [depKey, depSchema] of Object.entries(currentSchema.dependentSchemas)) if (Object.hasOwn(jsonData, depKey)) {
-					if (merge(recurse(depSchema))) return "all";
-				}
+				for (const [depKey, depSchema] of Object.entries(currentSchema.dependentSchemas)) if (Object.hasOwn(jsonData, depKey) && merge(recurse(depSchema))) return "all";
 			}
 			if (currentSchema.unevaluatedProperties === true) return "all";
 		}
 		if (Array.isArray(currentSchema.allOf)) {
-			for (const subSchema of currentSchema.allOf) if (merge(recurse(subSchema))) return "all";
+			for (let i = 0; i < currentSchema.allOf.length; i++) if (merge(recurse(currentSchema.allOf[i]))) return "all";
 		}
-		if (Array.isArray(currentSchema.anyOf)) for (const subSchema of currentSchema.anyOf) {
+		if (Array.isArray(currentSchema.anyOf)) for (let i = 0; i < currentSchema.anyOf.length; i++) {
+			const subSchema = currentSchema.anyOf[i];
 			let passed = getCachedValidationResult(report, subSchema, json);
 			if (passed === void 0) {
 				const subReport = new Report(report);
-				validate.call(this, subReport, subSchema, json);
+				validate(ctx, subReport, subSchema, json);
 				passed = subReport.errors.length === 0;
 			}
-			if (passed) {
-				if (merge(recurse(subSchema))) return "all";
-			}
+			if (passed && merge(recurse(subSchema))) return "all";
 		}
-		if (Array.isArray(currentSchema.oneOf)) for (const subSchema of currentSchema.oneOf) {
+		if (Array.isArray(currentSchema.oneOf)) for (let i = 0; i < currentSchema.oneOf.length; i++) {
+			const subSchema = currentSchema.oneOf[i];
 			let passed = getCachedValidationResult(report, subSchema, json);
 			if (passed === void 0) {
 				const subReport = new Report(report);
-				validate.call(this, subReport, subSchema, json);
+				validate(ctx, subReport, subSchema, json);
 				passed = subReport.errors.length === 0;
 			}
-			if (passed) {
-				if (merge(recurse(subSchema))) return "all";
-			}
+			if (passed && merge(recurse(subSchema))) return "all";
 		}
 		if (currentSchema.if !== void 0) {
 			let condPassed = getCachedValidationResult(report, currentSchema.if, json);
 			if (condPassed === void 0) {
 				const condReport = new Report(report);
-				validate.call(this, condReport, currentSchema.if, json);
+				validate(ctx, condReport, currentSchema.if, json);
 				condPassed = condReport.errors.length === 0;
 			}
 			if (condPassed) {
 				if (merge(recurse(currentSchema.if))) return "all";
-				if (currentSchema.then !== void 0) {
-					if (merge(recurse(currentSchema.then))) return "all";
-				}
-			} else if (currentSchema.else !== void 0) {
-				if (merge(recurse(currentSchema.else))) return "all";
-			}
-		}
-		if (currentSchema.__$refResolved && currentSchema.__$refResolved !== currentSchema) {
-			if (merge(recurse(currentSchema.__$refResolved))) return "all";
+				if (currentSchema.then !== void 0 && merge(recurse(currentSchema.then))) return "all";
+			} else if (currentSchema.else !== void 0 && merge(recurse(currentSchema.else))) return "all";
 		}
+		if (currentSchema.__$refResolved && currentSchema.__$refResolved !== currentSchema && merge(recurse(currentSchema.__$refResolved))) return "all";
 		const recursiveTarget = resolveRecursiveRef(currentSchema, report.__$recursiveAnchorStack);
-		if (recursiveTarget && recursiveTarget !== currentSchema) {
-			if (merge(recurse(recursiveTarget))) return "all";
-		}
+		if (recursiveTarget && recursiveTarget !== currentSchema && merge(recurse(recursiveTarget))) return "all";
 		const dynamicTarget = resolveDynamicRef(currentSchema, report.__$dynamicScopeStack);
-		if (dynamicTarget && dynamicTarget !== currentSchema) {
-			if (merge(recurse(dynamicTarget))) return "all";
-		}
+		if (dynamicTarget && dynamicTarget !== currentSchema && merge(recurse(dynamicTarget))) return "all";
 		return evaluated;
 	}
-	function unevaluatedItemsValidator(report, schema, json) {
+	function unevaluatedItemsValidator(ctx, report, schema, json) {
 		if (!Array.isArray(json)) return;
 		if (schema.unevaluatedItems === true) return;
 		const unevalSchema = schema.unevaluatedItems;
 		if (unevalSchema === void 0) return;
 		if (json.length === 0) return;
-		const evaluatedItems = collectEvaluated.call(this, {
+		const evaluatedItems = collectEvaluated(ctx, {
 			report,
 			currentSchema: schema,
 			json,
@@ -4449,23 +4472,24 @@
 		for (let i = 0; i < json.length; i++) if (!evaluatedItems.has(i)) unevaluatedIndices.push(i);
 		if (unevaluatedIndices.length === 0) return;
 		if (unevalSchema === false) report.addError("ARRAY_UNEVALUATED_ITEMS", void 0, void 0, schema, "unevaluatedItems");
-		else for (const idx of unevaluatedIndices) {
+		else for (let i = 0; i < unevaluatedIndices.length; i++) {
+			const idx = unevaluatedIndices[i];
 			const subReport = new Report(report);
-			validate.call(this, subReport, unevalSchema, json[idx]);
+			validate(ctx, subReport, unevalSchema, json[idx]);
 			if (subReport.errors.length > 0) {
 				report.addError("ARRAY_UNEVALUATED_ITEMS", void 0, void 0, schema, "unevaluatedItems");
 				break;
 			}
 		}
 	}
-	function unevaluatedPropertiesValidator(report, schema, json) {
+	function unevaluatedPropertiesValidator(ctx, report, schema, json) {
 		if (!isObject(json)) return;
 		if (schema.unevaluatedProperties === true) return;
 		const unevalSchema = schema.unevaluatedProperties;
 		if (unevalSchema === void 0) return;
 		const allKeys = Object.keys(json);
 		if (allKeys.length === 0) return;
-		const evaluatedProperties = collectEvaluated.call(this, {
+		const evaluatedProperties = collectEvaluated(ctx, {
 			report,
 			currentSchema: schema,
 			json,
@@ -4474,32 +4498,35 @@
 			depth: 0
 		});
 		if (evaluatedProperties === "all") return;
-		const unevaluatedKeys = allKeys.filter((key) => !evaluatedProperties.has(key));
+		const unevaluatedKeys = [];
+		for (let i = 0; i < allKeys.length; i++) if (!evaluatedProperties.has(allKeys[i])) unevaluatedKeys.push(allKeys[i]);
 		if (unevaluatedKeys.length === 0) return;
 		if (unevalSchema === false) report.addError("OBJECT_UNEVALUATED_PROPERTIES", [unevaluatedKeys.join(", ")], void 0, schema, "unevaluatedProperties");
-		else for (const key of unevaluatedKeys) {
+		else for (let i = 0; i < unevaluatedKeys.length; i++) {
+			const key = unevaluatedKeys[i];
 			const subReport = new Report(report);
-			validate.call(this, subReport, unevalSchema, json[key]);
+			validate(ctx, subReport, unevalSchema, json[key]);
 			if (subReport.errors.length > 0) report.addError("OBJECT_UNEVALUATED_PROPERTIES", [key], void 0, schema, "unevaluatedProperties");
 		}
 	}
 	function definitionsValidator() {}
+	const noopValidator = () => {};
 	const JsonValidators = {
-		id: () => {},
-		$id: () => {},
-		$ref: () => {},
-		$schema: () => {},
-		$dynamicAnchor: () => {},
-		$dynamicRef: () => {},
-		$anchor: () => {},
-		$defs: () => {},
-		$vocabulary: () => {},
-		$recursiveAnchor: () => {},
-		$recursiveRef: () => {},
-		examples: () => {},
-		title: () => {},
-		description: () => {},
-		default: () => {},
+		id: noopValidator,
+		$id: noopValidator,
+		$ref: noopValidator,
+		$schema: noopValidator,
+		$dynamicAnchor: noopValidator,
+		$dynamicRef: noopValidator,
+		$anchor: noopValidator,
+		$defs: noopValidator,
+		$vocabulary: noopValidator,
+		$recursiveAnchor: noopValidator,
+		$recursiveRef: noopValidator,
+		examples: noopValidator,
+		title: noopValidator,
+		description: noopValidator,
+		default: noopValidator,
 		type: typeValidator,
 		enum: enumValidator,
 		const: constValidator,
@@ -4544,18 +4571,18 @@
 		else: elseValidator,
 		definitions: definitionsValidator
 	};
-	const recurseArray = function(report, schema, json) {
+	function recurseArray(ctx, report, schema, json) {
 		const schemaUri = typeof schema.$schema === "string" ? schema.$schema : void 0;
-		const prefixItems = (schemaUri === "https://json-schema.org/draft/2020-12/schema" || !schemaUri && this.options.version === "draft2020-12") && Array.isArray(schema.prefixItems) ? schema.prefixItems : void 0;
+		const prefixItems = (schemaUri === "https://json-schema.org/draft/2020-12/schema" || !schemaUri && ctx.options.version === "draft2020-12") && Array.isArray(schema.prefixItems) ? schema.prefixItems : void 0;
 		if (prefixItems) {
 			for (let idx = 0; idx < json.length; idx++) if (idx < prefixItems.length) {
 				report.path.push(idx);
-				validate.call(this, report, prefixItems[idx], json[idx]);
+				validate(ctx, report, prefixItems[idx], json[idx]);
 				report.path.pop();
 			} else if (schema.items !== void 0 && !Array.isArray(schema.items)) {
 				report.path.push(idx);
 				report.schemaPath.push("items");
-				validate.call(this, report, schema.items, json[idx]);
+				validate(ctx, report, schema.items, json[idx]);
 				report.schemaPath.pop();
 				report.path.pop();
 			}
@@ -4564,50 +4591,56 @@
 		if (Array.isArray(schema.items)) {
 			for (let idx = 0; idx < json.length; idx++) if (idx < schema.items.length) {
 				report.path.push(idx);
-				validate.call(this, report, schema.items[idx], json[idx]);
+				validate(ctx, report, schema.items[idx], json[idx]);
 				report.path.pop();
 			} else if (typeof schema.additionalItems === "object") {
 				report.path.push(idx);
-				validate.call(this, report, schema.additionalItems, json[idx]);
+				validate(ctx, report, schema.additionalItems, json[idx]);
 				report.path.pop();
 			}
 		} else if (typeof schema.items === "object" || typeof schema.items === "boolean") for (let idx = 0; idx < json.length; idx++) {
 			report.path.push(idx);
 			report.schemaPath.push("items");
-			validate.call(this, report, schema.items, json[idx]);
+			validate(ctx, report, schema.items, json[idx]);
 			report.schemaPath.pop();
 			report.path.pop();
 		}
-	};
-	const recurseObject = function(report, schema, json) {
-		let additionalProperties = schema.additionalProperties;
+	}
+	function recurseObject(ctx, report, schema, json) {
+		let { additionalProperties } = schema;
 		if (additionalProperties === true || additionalProperties === void 0) additionalProperties = {};
 		const p = schema.properties ? Object.keys(schema.properties) : [];
 		const pp = schema.patternProperties ? Object.keys(schema.patternProperties) : [];
 		const keys = Object.keys(json);
+		const ppCompiled = [];
+		for (let i = 0; i < pp.length; i++) {
+			const r = compileSchemaRegex(pp[i]);
+			if (r.ok) ppCompiled.push({
+				key: pp[i],
+				re: r.value
+			});
+		}
 		for (const m of keys) {
 			const propertyValue = json[m];
+			const isProp = p.includes(m);
 			const s = [];
-			if (p.includes(m)) s.push(schema.properties[m]);
-			for (const regexString of pp) {
-				const result = compileSchemaRegex(regexString);
-				if (result.ok && result.value.test(m) === true) s.push(schema.patternProperties[regexString]);
-			}
+			if (isProp) s.push(schema.properties[m]);
+			for (let i = 0; i < ppCompiled.length; i++) if (ppCompiled[i].re.test(m)) s.push(schema.patternProperties[ppCompiled[i].key]);
 			if (s.length === 0 && additionalProperties !== false) s.push(additionalProperties);
 			for (const schema_s of s) {
 				report.path.push(m);
-				if (p.includes(m)) {
+				if (isProp) {
 					report.schemaPath.push("properties");
 					report.schemaPath.push(m);
 				} else report.schemaPath.push("additionalProperties");
-				validate.call(this, report, schema_s, propertyValue);
+				validate(ctx, report, schema_s, propertyValue);
 				report.path.pop();
 				report.schemaPath.pop();
-				if (p.includes(m)) report.schemaPath.pop();
+				if (isProp) report.schemaPath.pop();
 			}
 		}
-	};
-	function validate(report, schema, json) {
+	}
+	function validate(ctx, report, schema, json) {
 		report.commonErrorMessage = "JSON_OBJECT_VALIDATION_FAILED";
 		if (schema === true) return true;
 		if (schema === false) {
@@ -4631,7 +4664,7 @@
 		let pushedDynamicScope = false;
 		const schemaId = getId(schema);
 		const dynamicScopeEntry = schema.__$resourceRoot || (isRoot || typeof schemaId === "string" ? schema : void 0);
-		if (dynamicScopeEntry && dynamicScopeStack[dynamicScopeStack.length - 1] !== dynamicScopeEntry) {
+		if (dynamicScopeEntry && dynamicScopeStack.at(-1) !== dynamicScopeEntry) {
 			dynamicScopeStack.push(dynamicScopeEntry);
 			pushedDynamicScope = true;
 		}
@@ -4639,10 +4672,11 @@
 			recursiveAnchorStack.push(schema);
 			pushedRecursiveAnchor = true;
 		}
-		if (schema.$ref !== void 0) if (this.options.version === "draft2019-09" || this.options.version === "draft2020-12") {
-			if (!schema.__$refResolved) report.addError("REF_UNRESOLVED", [schema.$ref], void 0, schema);
-			else validate.call(this, report, schema.__$refResolved, json);
-			keys = keys.filter((key) => key !== "$ref");
+		if (schema.$ref !== void 0) if (ctx.options.version === "draft2019-09" || ctx.options.version === "draft2020-12") {
+			if (schema.__$refResolved) validate(ctx, report, schema.__$refResolved, json);
+			else report.addError("REF_UNRESOLVED", [schema.$ref], void 0, schema);
+			const refIdx = keys.indexOf("$ref");
+			if (refIdx !== -1) keys.splice(refIdx, 1);
 		} else {
 			let maxRefs = 99;
 			while (schema.$ref && maxRefs > 0) {
@@ -4660,58 +4694,65 @@
 			report.schemaPath = [];
 		}
 		if (schema.$recursiveRef !== void 0) {
-			if (this.options.version === "draft2019-09" || this.options.version === "draft2020-12") {
+			if (ctx.options.version === "draft2019-09" || ctx.options.version === "draft2020-12") {
 				const recursiveRefTarget = resolveRecursiveRef(schema, recursiveAnchorStack);
-				if (!recursiveRefTarget) report.addError("REF_UNRESOLVED", [schema.$recursiveRef], void 0, schema);
-				else validate.call(this, report, recursiveRefTarget, json);
-				keys = keys.filter((key) => key !== "$recursiveRef");
+				if (recursiveRefTarget) validate(ctx, report, recursiveRefTarget, json);
+				else report.addError("REF_UNRESOLVED", [schema.$recursiveRef], void 0, schema);
+				const recursiveRefIdx = keys.indexOf("$recursiveRef");
+				if (recursiveRefIdx !== -1) keys.splice(recursiveRefIdx, 1);
 			}
 		}
 		if (schema.$dynamicRef !== void 0) {
-			if (this.options.version === "draft2020-12") {
+			if (ctx.options.version === "draft2020-12") {
 				const dynamicRefTarget = resolveDynamicRef(schema, dynamicScopeStack);
-				if (typeof dynamicRefTarget === "undefined") report.addError("REF_UNRESOLVED", [schema.$dynamicRef], void 0, schema);
-				else validate.call(this, report, dynamicRefTarget, json);
-				keys = keys.filter((key) => key !== "$dynamicRef");
+				if (dynamicRefTarget === void 0) report.addError("REF_UNRESOLVED", [schema.$dynamicRef], void 0, schema);
+				else validate(ctx, report, dynamicRefTarget, json);
+				const dynamicRefIdx = keys.indexOf("$dynamicRef");
+				if (dynamicRefIdx !== -1) keys.splice(dynamicRefIdx, 1);
 			}
 		}
-		const validationVocabularyEnabled = isValidationVocabularyEnabled(schema, report, this.options.version);
-		if (!validationVocabularyEnabled) keys = keys.filter((key) => !VALIDATION_VOCAB_KEYWORDS.has(key));
+		const validationVocabularyEnabled = isValidationVocabularyEnabled(schema, report, ctx.options.version);
+		if (!validationVocabularyEnabled) {
+			let wi = 0;
+			for (let ri = 0; ri < keys.length; ri++) if (!VALIDATION_VOCAB_KEYWORDS.has(keys[ri])) keys[wi++] = keys[ri];
+			keys.length = wi;
+		}
 		if (validationVocabularyEnabled && schema.type) {
 			keys.splice(keys.indexOf("type"), 1);
 			report.schemaPath.push("type");
-			JsonValidators.type.call(this, report, schema, json);
+			JsonValidators.type(ctx, report, schema, json);
 			report.schemaPath.pop();
-			if (report.errors.length && this.options.breakOnFirstError) {
+			if (report.errors.length && ctx.options.breakOnFirstError) {
 				if (pushedRecursiveAnchor) recursiveAnchorStack.pop();
 				if (pushedDynamicScope) dynamicScopeStack.pop();
 				return false;
 			}
 		}
 		const deferredUnevaluatedKeys = [];
-		for (const key of keys) {
+		for (let i = 0; i < keys.length; i++) {
+			const key = keys[i];
 			if (key === "unevaluatedItems" || key === "unevaluatedProperties") {
 				deferredUnevaluatedKeys.push(key);
 				continue;
 			}
 			const validator = JsonValidators[key];
 			if (validator) {
-				validator.call(this, report, schema, json);
-				if (report.errors.length && this.options.breakOnFirstError) break;
+				validator(ctx, report, schema, json);
+				if (report.errors.length && ctx.options.breakOnFirstError) break;
 			}
 		}
-		if (deferredUnevaluatedKeys.length > 0 && !(report.errors.length > 0 && this.options.breakOnFirstError)) for (const key of deferredUnevaluatedKeys) {
-			const validator = JsonValidators[key];
+		if (deferredUnevaluatedKeys.length > 0 && !(report.errors.length > 0 && ctx.options.breakOnFirstError)) for (let i = 0; i < deferredUnevaluatedKeys.length; i++) {
+			const validator = JsonValidators[deferredUnevaluatedKeys[i]];
 			if (validator) {
-				validator.call(this, report, schema, json);
-				if (report.errors.length && this.options.breakOnFirstError) break;
+				validator(ctx, report, schema, json);
+				if (report.errors.length && ctx.options.breakOnFirstError) break;
 			}
 		}
-		if (report.errors.length === 0 || this.options.breakOnFirstError === false) {
-			if (Array.isArray(json)) recurseArray.call(this, report, schema, json);
-			else if (isObject(json)) recurseObject.call(this, report, schema, json);
+		if (report.errors.length === 0 || ctx.options.breakOnFirstError === false) {
+			if (Array.isArray(json)) recurseArray(ctx, report, schema, json);
+			else if (isObject(json)) recurseObject(ctx, report, schema, json);
 		}
-		if (typeof this.options.customValidator === "function") this.options.customValidator.call(this, report, schema, json);
+		if (typeof ctx.options.customValidator === "function") ctx.options.customValidator.call(ctx, report, schema, json);
 		if (pushedRecursiveAnchor) recursiveAnchorStack.pop();
 		if (pushedDynamicScope) dynamicScopeStack.pop();
 		if (isRoot) report.rootSchema = void 0;
@@ -4728,14 +4769,14 @@
 	}
 	//#endregion
 	//#region src/schema-compiler.ts
-	const UNSAFE_TARGETS = [
+	const UNSAFE_TARGETS = new Set([
 		Object.prototype,
 		Function.prototype,
 		Array.prototype
-	];
+	]);
 	/** Returns true if `obj` is a built-in prototype that must not be mutated. */
 	function isUnsafeTarget(obj) {
-		return UNSAFE_TARGETS.includes(obj);
+		return UNSAFE_TARGETS.has(obj);
 	}
 	/** Safely assign a property on `obj`, refusing prototype-polluting keys. */
 	function safeSetProperty(obj, key, value) {
@@ -4748,35 +4789,78 @@
 		if (isUnsafeTarget(obj)) return;
 		if (key !== "__proto__" && key !== "constructor" && key !== "prototype") delete obj[key];
 	}
+	const resolveReference = (base, ref) => {
+		if (isAbsoluteUri(ref)) return ref;
+		const baseStr = base ?? "";
+		if (ref.startsWith("#")) {
+			const hashIndex = baseStr.indexOf("#");
+			return (hashIndex === -1 ? baseStr : baseStr.slice(0, hashIndex)) + ref;
+		}
+		if (!baseStr) return ref;
+		const hashIndex = baseStr.indexOf("#");
+		const baseNoFrag = hashIndex === -1 ? baseStr : baseStr.slice(0, hashIndex);
+		if (isAbsoluteUri(baseNoFrag)) try {
+			return new URL(ref, baseNoFrag).toString();
+		} catch {}
+		let baseDir = baseNoFrag;
+		if (!baseDir.endsWith("/")) {
+			const lastSlash = baseDir.lastIndexOf("/");
+			baseDir = lastSlash === -1 ? "" : baseDir.slice(0, lastSlash + 1);
+		}
+		return baseDir + ref;
+	};
+	const isSimpleIdentifier = (id) => !id.startsWith("#") && !id.includes("/") && !id.includes(".") && !id.includes("#");
+	const resolveIdScope = (base, id) => {
+		if (isAbsoluteUri(id)) return id;
+		const baseStr = base ?? "";
+		if (isSimpleIdentifier(id)) {
+			const hashIndex = baseStr.indexOf("#");
+			return `${hashIndex === -1 ? baseStr : baseStr.slice(0, hashIndex)}#${id}`;
+		}
+		return resolveReference(base, id);
+	};
+	const resolveSchemaScopeId = (base, schema, id) => {
+		if (typeof schema.$id === "string") return resolveReference(base, id);
+		return resolveIdScope(base, id);
+	};
 	const collectIds = (obj, maxDepth = 100) => {
 		const ids = [];
 		function walk(node, scope, _depth = 0) {
 			if (typeof node !== "object" || node == null) return;
+			const schemaNode = node;
 			if (_depth >= maxDepth) throw new Error(`Maximum recursion depth (${maxDepth}) exceeded in collectIds. If your schema is deeply nested and valid, increase the maxRecursionDepth option.`);
 			let addedScope = false;
-			const nodeId = getId(node);
+			const nodeId = getId(schemaNode);
 			if (typeof nodeId === "string") {
 				let type = isAbsoluteUri(nodeId) ? "absolute" : "relative";
 				if (scope.length === 0) type = "root";
 				const id = {
 					id: nodeId,
 					type,
-					obj: node
+					obj: schemaNode
 				};
 				if (type === "absolute" || type === "root" && isAbsoluteUri(nodeId)) id.absoluteUri = nodeId;
-				else if (type === "root" && typeof node.id === "string" && isAbsoluteUri(node.id) && node.id !== nodeId) id.absoluteUri = resolveSchemaScopeId(node.id, node, nodeId);
+				else if (type === "root" && typeof schemaNode.id === "string" && isAbsoluteUri(schemaNode.id) && schemaNode.id !== nodeId) id.absoluteUri = resolveSchemaScopeId(schemaNode.id, schemaNode, nodeId);
 				else if (type === "relative") {
-					id.absoluteParent = scope.filter((x) => x.type === "absolute" || x.type === "root" && x.absoluteUri).slice(-1)[0];
-					if (id.absoluteParent) id.absoluteUri = resolveSchemaScopeId(id.absoluteParent.absoluteUri || id.absoluteParent.id, node, id.id);
+					let absoluteParent;
+					for (let i = scope.length - 1; i >= 0; i--) {
+						const sc = scope[i];
+						if (sc.type === "absolute" || sc.type === "root" && sc.absoluteUri) {
+							absoluteParent = sc;
+							break;
+						}
+					}
+					id.absoluteParent = absoluteParent;
+					if (id.absoluteParent) id.absoluteUri = resolveSchemaScopeId(id.absoluteParent.absoluteUri || id.absoluteParent.id, schemaNode, id.id);
 				}
 				ids.push(id);
 				scope.push(id);
 				addedScope = true;
 			}
 			if (Array.isArray(node)) for (const item of node) walk(item, scope, _depth + 1);
-			else for (const key of Object.keys(node)) {
-				if (isInternalKey(key) || NON_SCHEMA_KEYWORDS.includes(key)) continue;
-				walk(node[key], scope, _depth + 1);
+			else for (const key of Object.keys(schemaNode)) {
+				if (isInternalKey(key) || NON_SCHEMA_KEYWORDS_SET.has(key)) continue;
+				walk(schemaNode[key], scope, _depth + 1);
 			}
 			if (addedScope) scope.pop();
 		}
@@ -4784,42 +4868,42 @@
 		return ids;
 	};
 	const collectReferences = (obj, results, scope, path, options, maxDepth = 100, _depth = 0) => {
-		results = results || [];
-		scope = scope || [];
-		path = path || [];
-		options = options || {};
+		results ||= [];
+		scope ||= [];
+		path ||= [];
+		options ||= {};
 		if (typeof obj !== "object" || obj === null) return results;
 		if (_depth >= maxDepth) throw new Error(`Maximum recursion depth (${maxDepth}) exceeded in collectReferences. If your schema is deeply nested and valid, increase the maxRecursionDepth option.`);
-		const hasRef = typeof obj.$ref === "string" && typeof obj.__$refResolved === "undefined";
+		const hasRef = typeof obj.$ref === "string" && obj.__$refResolved === void 0;
 		let addedScope = false;
 		const isRootScope = scope.length === 0;
 		let scopeId = getId(obj);
 		if (typeof obj.id === "string" && isAbsoluteUri(obj.id) && (!scopeId || !isAbsoluteUri(scopeId))) scopeId = obj.id;
 		if (typeof scopeId === "string" && (isRootScope || !hasRef || options.useRefObjectScope === true)) {
-			const base = scope.length > 0 ? scope[scope.length - 1] : void 0;
+			const base = scope.length > 0 ? scope.at(-1) : void 0;
 			scope.push(resolveSchemaScopeId(base, obj, scopeId));
 			addedScope = true;
 		}
 		if (hasRef) results.push({
-			ref: resolveReference(scope[scope.length - 1], obj.$ref),
+			ref: resolveReference(scope.at(-1), obj.$ref),
 			key: "$ref",
 			obj,
 			path: path.slice(0)
 		});
-		if (typeof obj.$recursiveRef === "string" && typeof obj.__$recursiveRefResolved === "undefined") results.push({
-			ref: resolveReference(scope[scope.length - 1], obj.$recursiveRef),
+		if (typeof obj.$recursiveRef === "string" && obj.__$recursiveRefResolved === void 0) results.push({
+			ref: resolveReference(scope.at(-1), obj.$recursiveRef),
 			key: "$recursiveRef",
 			obj,
 			path: path.slice(0)
 		});
-		if (typeof obj.$dynamicRef === "string" && typeof obj.__$dynamicRefResolved === "undefined") results.push({
-			ref: resolveReference(scope[scope.length - 1], obj.$dynamicRef),
+		if (typeof obj.$dynamicRef === "string" && obj.__$dynamicRefResolved === void 0) results.push({
+			ref: resolveReference(scope.at(-1), obj.$dynamicRef),
 			key: "$dynamicRef",
 			obj,
 			path: path.slice(0)
 		});
-		if (typeof obj.$schema === "string" && typeof obj.__$schemaResolved === "undefined") results.push({
-			ref: resolveReference(scope[scope.length - 1], obj.$schema),
+		if (typeof obj.$schema === "string" && obj.__$schemaResolved === void 0) results.push({
+			ref: resolveReference(scope.at(-1), obj.$schema),
 			key: "$schema",
 			obj,
 			path: path.slice(0)
@@ -4832,7 +4916,7 @@
 		else {
 			const keys = Object.keys(obj);
 			for (const key of keys) {
-				if (isInternalKey(key) || NON_SCHEMA_KEYWORDS.includes(key)) continue;
+				if (isInternalKey(key) || NON_SCHEMA_KEYWORDS_SET.has(key)) continue;
 				path.push(key);
 				collectReferences(obj[key], results, scope, path, options, maxDepth, _depth + 1);
 				path.pop();
@@ -4841,41 +4925,8 @@
 		if (addedScope) scope.pop();
 		return results;
 	};
-	const resolveReference = (base, ref) => {
-		if (isAbsoluteUri(ref)) return ref;
-		const baseStr = base ?? "";
-		if (ref[0] === "#") {
-			const hashIndex = baseStr.indexOf("#");
-			return (hashIndex === -1 ? baseStr : baseStr.slice(0, hashIndex)) + ref;
-		}
-		if (!baseStr) return ref;
-		const hashIndex = baseStr.indexOf("#");
-		const baseNoFrag = hashIndex === -1 ? baseStr : baseStr.slice(0, hashIndex);
-		if (isAbsoluteUri(baseNoFrag)) try {
-			return new URL(ref, baseNoFrag).toString();
-		} catch {}
-		let baseDir = baseNoFrag;
-		if (!baseDir.endsWith("/")) {
-			const lastSlash = baseDir.lastIndexOf("/");
-			baseDir = lastSlash === -1 ? "" : baseDir.slice(0, lastSlash + 1);
-		}
-		return baseDir + ref;
-	};
-	const isSimpleIdentifier = (id) => id[0] !== "#" && !id.includes("/") && !id.includes(".") && !id.includes("#");
-	const resolveIdScope = (base, id) => {
-		if (isAbsoluteUri(id)) return id;
-		const baseStr = base ?? "";
-		if (isSimpleIdentifier(id)) {
-			const hashIndex = baseStr.indexOf("#");
-			return (hashIndex === -1 ? baseStr : baseStr.slice(0, hashIndex)) + "#" + id;
-		}
-		return resolveReference(base, id);
-	};
-	const resolveSchemaScopeId = (base, schema, id) => {
-		if (typeof schema.$id === "string") return resolveReference(base, id);
-		return resolveIdScope(base, id);
-	};
 	var SchemaCompiler = class {
+		validator;
 		constructor(validator) {
 			this.validator = validator;
 		}
@@ -4893,19 +4944,19 @@
 			report.commonErrorMessage = "SCHEMA_COMPILATION_FAILED";
 			if (typeof schema === "string") {
 				const loadedSchema = this.validator.scache.getSchemaByUri(report, schema);
-				if (typeof loadedSchema === "undefined") {
+				if (loadedSchema === void 0) {
 					report.addError("SCHEMA_NOT_REACHABLE", [schema]);
 					return false;
 				}
 				schema = loadedSchema;
 			}
 			if (Array.isArray(schema)) {
-				if (!options?.noCache) schema.forEach((s) => this.collectAndCacheIds(s));
+				if (!options?.noCache) for (let i = 0; i < schema.length; i++) this.collectAndCacheIds(schema[i]);
 				return this.compileArrayOfSchemas(report, schema);
 			} else if (typeof schema === "boolean") return true;
-			else if (!options?.noCache) this.collectAndCacheIds(schema);
+			if (!options?.noCache) this.collectAndCacheIds(schema);
 			const canMutateSchemaObject = schema !== Object.prototype && schema !== Function.prototype && schema !== Array.prototype;
-			if (canMutateSchemaObject && schema.__$compiled && schema.id && this.validator.scache.checkCacheForUri(schema.id) === false) schema.__$compiled = void 0;
+			if (canMutateSchemaObject && schema.__$compiled && schema.id && !this.validator.scache.checkCacheForUri(schema.id)) schema.__$compiled = void 0;
 			if (schema.__$compiled) return true;
 			if (canMutateSchemaObject && !schema.$schema && this.validator.options.version !== "none") schema.$schema = this.validator.getDefaultSchemaId();
 			if (schema.id && typeof schema.id === "string" && !options?.noCache) this.validator.scache.cacheSchemaByUri(schema.id, schema);
@@ -4920,7 +4971,7 @@
 			const refs = collectReferences(schema, void 0, void 0, void 0, { useRefObjectScope }, this.validator.options.maxRecursionDepth);
 			for (const refObj of refs) {
 				let response = this.validator.scache.getSchemaByUri(report, refObj.ref, schema);
-				if (typeof response === "undefined") {
+				if (response === void 0) {
 					const schemaReader = getSchemaReader();
 					if (schemaReader) {
 						const remotePath = getRemotePath(refObj.ref);
@@ -4928,23 +4979,24 @@
 						if (s) {
 							s.id = remotePath;
 							const subreport = new Report(report);
-							if (!this.compileSchema(subreport, s)) report.errors = report.errors.concat(subreport.errors);
-							else response = this.validator.scache.getSchemaByUri(report, refObj.ref, schema);
+							if (this.compileSchema(subreport, s)) response = this.validator.scache.getSchemaByUri(report, refObj.ref, schema);
+							else for (let i = 0; i < subreport.errors.length; i++) report.errors.push(subreport.errors[i]);
 						}
 					}
 				}
-				if (typeof response === "undefined") {
+				if (response === void 0) {
 					const hasNotValid = report.hasError("REMOTE_NOT_VALID", [refObj.ref]);
 					const isAbsolute = isAbsoluteUri(refObj.ref);
 					let isDownloaded = false;
 					const ignoreUnresolvableRemotes = this.validator.options.ignoreUnresolvableReferences === true;
 					if (isAbsolute) isDownloaded = this.validator.scache.checkCacheForUri(refObj.ref);
 					if (hasNotValid) {} else if (ignoreUnresolvableRemotes && isAbsolute) {} else if (isDownloaded) {} else {
-						report.path.push(...refObj.path);
+						const pathLen = refObj.path.length;
+						for (let i = 0; i < pathLen; i++) report.path.push(refObj.path[i]);
 						report.addError("UNRESOLVABLE_REFERENCE", [refObj.ref]);
-						report.path = report.path.slice(0, -refObj.path.length);
+						report.path.length -= pathLen;
 						if (isValidExceptReferences && canMutateSchemaObject && !isUnsafeTarget(schema)) {
-							schema.__$missingReferences = schema.__$missingReferences || [];
+							schema.__$missingReferences ||= [];
 							schema.__$missingReferences.push(refObj);
 						}
 					}
@@ -4959,13 +5011,20 @@
 		compileArrayOfSchemas(report, arr) {
 			let compiled = 0, lastLoopCompiled;
 			do {
-				report.errors = report.errors.filter((e) => e.code !== "UNRESOLVABLE_REFERENCE");
+				let wi = 0;
+				for (let ri = 0; ri < report.errors.length; ri++) if (report.errors[ri].code !== "UNRESOLVABLE_REFERENCE") report.errors[wi++] = report.errors[ri];
+				report.errors.length = wi;
 				lastLoopCompiled = compiled;
 				compiled = this.compileArrayOfSchemasLoop(report, arr);
+				const idMap = /* @__PURE__ */ new Map();
+				for (let i = 0; i < arr.length; i++) {
+					const schemaId = arr[i].id;
+					if (schemaId && !idMap.has(schemaId)) idMap.set(schemaId, arr[i]);
+				}
 				for (const sch of arr) if (sch.__$missingReferences) {
 					for (let idx2 = sch.__$missingReferences.length - 1; idx2 >= 0; idx2--) {
 						const refObj = sch.__$missingReferences[idx2];
-						const response = arr.find((x) => x.id === refObj.ref);
+						const response = idMap.get(refObj.ref);
 						if (response) {
 							safeSetProperty(refObj.obj, `__${refObj.key}Resolved`, response);
 							sch.__$missingReferences.splice(idx2, 1);
@@ -4981,62 +5040,74 @@
 			for (const schema of arr) {
 				const report = new Report(mainReport);
 				if (this.compileSchema(report, schema)) compiledCount++;
-				mainReport.errors = mainReport.errors.concat(report.errors);
+				for (let i = 0; i < report.errors.length; i++) mainReport.errors.push(report.errors[i]);
 			}
 			return compiledCount;
 		}
 	};
 	//#endregion
 	//#region src/schema-validator.ts
+	const PRIMITIVE_TYPES = [
+		"array",
+		"boolean",
+		"integer",
+		"number",
+		"null",
+		"object",
+		"string"
+	];
+	const PRIMITIVE_TYPE_STR = PRIMITIVE_TYPES.join(",");
+	const PRIMITIVE_TYPES_SET = new Set(PRIMITIVE_TYPES);
 	const SchemaValidators = {
-		$ref: function(report, schema) {
+		$ref(report, schema) {
 			if (typeof schema.$ref !== "string") report.addError("KEYWORD_TYPE_EXPECTED", ["$ref", "string"], void 0, schema, "$ref");
 		},
-		$schema: function(report, schema) {
+		$schema(report, schema) {
 			if (typeof schema.$schema !== "string") report.addError("KEYWORD_TYPE_EXPECTED", ["$schema", "string"], void 0, schema, "$schema");
 		},
-		multipleOf: function(report, schema) {
+		multipleOf(report, schema) {
 			if (typeof schema.multipleOf !== "number") report.addError("KEYWORD_TYPE_EXPECTED", ["multipleOf", "number"], void 0, schema, "multipleOf");
 			else if (schema.multipleOf <= 0) report.addError("KEYWORD_MUST_BE", ["multipleOf", "strictly greater than 0"], void 0, schema, "multipleOf");
 		},
-		maximum: function(report, schema) {
+		maximum(report, schema) {
 			if (typeof schema.maximum !== "number") report.addError("KEYWORD_TYPE_EXPECTED", ["maximum", "number"], void 0, schema, "maximum");
 		},
-		exclusiveMaximum: function(report, schema) {
+		exclusiveMaximum(report, schema) {
 			if (report.options.version === "draft-04") {
 				if (typeof schema.exclusiveMaximum !== "boolean") report.addError("KEYWORD_TYPE_EXPECTED", ["exclusiveMaximum", "boolean"], void 0, schema, "exclusiveMaximum");
 				else if (schema.maximum === void 0) report.addError("KEYWORD_DEPENDENCY", ["exclusiveMaximum", "maximum"], void 0, schema, "exclusiveMaximum");
 			} else if (typeof schema.exclusiveMaximum !== "boolean" && typeof schema.exclusiveMaximum !== "number") report.addError("KEYWORD_TYPE_EXPECTED", ["exclusiveMaximum", ["boolean", "number"]], void 0, schema, "exclusiveMaximum");
 		},
-		minimum: function(report, schema) {
+		minimum(report, schema) {
 			if (typeof schema.minimum !== "number") report.addError("KEYWORD_TYPE_EXPECTED", ["minimum", "number"], void 0, schema, "minimum");
 		},
-		exclusiveMinimum: function(report, schema) {
+		exclusiveMinimum(report, schema) {
 			if (report.options.version === "draft-04") {
 				if (typeof schema.exclusiveMinimum !== "boolean") report.addError("KEYWORD_TYPE_EXPECTED", ["exclusiveMinimum", "boolean"], void 0, schema, "exclusiveMinimum");
 				else if (schema.minimum === void 0) report.addError("KEYWORD_DEPENDENCY", ["exclusiveMinimum", "minimum"], void 0, schema, "exclusiveMinimum");
 			} else if (typeof schema.exclusiveMinimum !== "boolean" && typeof schema.exclusiveMinimum !== "number") report.addError("KEYWORD_TYPE_EXPECTED", ["exclusiveMinimum", ["boolean", "number"]], void 0, schema, "exclusiveMinimum");
 		},
-		maxLength: function(report, schema) {
+		maxLength(report, schema) {
 			if (!isInteger(schema.maxLength)) report.addError("KEYWORD_TYPE_EXPECTED", ["maxLength", "integer"], void 0, schema, "maxLength");
 			else if (schema.maxLength < 0) report.addError("KEYWORD_MUST_BE", ["maxLength", "greater than, or equal to 0"], void 0, schema, "maxLength");
 		},
-		minLength: function(report, schema) {
+		minLength(report, schema) {
 			if (!isInteger(schema.minLength)) report.addError("KEYWORD_TYPE_EXPECTED", ["minLength", "integer"], void 0, schema, "minLength");
 			else if (schema.minLength < 0) report.addError("KEYWORD_MUST_BE", ["minLength", "greater than, or equal to 0"], void 0, schema, "minLength");
 		},
-		pattern: function(report, schema) {
-			if (typeof schema.pattern !== "string") report.addError("KEYWORD_TYPE_EXPECTED", ["pattern", "string"], void 0, schema, "pattern");
-			else {
-				const result = compileSchemaRegex(schema.pattern);
-				if (!result.ok) report.addError("KEYWORD_PATTERN", [
-					"pattern",
-					schema.pattern,
-					result.error.message
-				], void 0, schema, "pattern");
+		pattern(report, schema) {
+			if (typeof schema.pattern !== "string") {
+				report.addError("KEYWORD_TYPE_EXPECTED", ["pattern", "string"], void 0, schema, "pattern");
+				return;
 			}
+			const result = compileSchemaRegex(schema.pattern);
+			if (!result.ok) report.addError("KEYWORD_PATTERN", [
+				"pattern",
+				schema.pattern,
+				result.error.message
+			], void 0, schema, "pattern");
 		},
-		additionalItems: function(report, schema) {
+		additionalItems(report, schema) {
 			if (typeof schema.additionalItems !== "boolean" && !isObject(schema.additionalItems)) report.addError("KEYWORD_TYPE_EXPECTED", ["additionalItems", ["boolean", "object"]], void 0, schema, "additionalItems");
 			else if (isObject(schema.additionalItems)) {
 				report.path.push("additionalItems");
@@ -5044,7 +5115,7 @@
 				report.path.pop();
 			}
 		},
-		items: function(report, schema) {
+		items(report, schema) {
 			if (Array.isArray(schema.items)) for (let idx = 0; idx < schema.items.length; idx++) {
 				report.path.push("items");
 				report.path.push(idx);
@@ -5064,34 +5135,34 @@
 			if (this.options.forceAdditional === true && schema.additionalItems === void 0 && Array.isArray(schema.items)) report.addError("KEYWORD_UNDEFINED_STRICT", ["additionalItems"], void 0, schema, "additionalItems");
 			if (this.options.assumeAdditional && schema.additionalItems === void 0 && Array.isArray(schema.items)) schema.additionalItems = false;
 		},
-		maxItems: function(report, schema) {
+		maxItems(report, schema) {
 			if (typeof schema.maxItems !== "number") report.addError("KEYWORD_TYPE_EXPECTED", ["maxItems", "integer"], void 0, schema, "maxItems");
 			else if (schema.maxItems < 0) report.addError("KEYWORD_MUST_BE", ["maxItems", "greater than, or equal to 0"], void 0, schema, "maxItems");
 		},
-		minItems: function(report, schema) {
+		minItems(report, schema) {
 			if (!isInteger(schema.minItems)) report.addError("KEYWORD_TYPE_EXPECTED", ["minItems", "integer"], void 0, schema, "minItems");
 			else if (schema.minItems < 0) report.addError("KEYWORD_MUST_BE", ["minItems", "greater than, or equal to 0"], void 0, schema, "minItems");
 		},
-		uniqueItems: function(report, schema) {
+		uniqueItems(report, schema) {
 			if (typeof schema.uniqueItems !== "boolean") report.addError("KEYWORD_TYPE_EXPECTED", ["uniqueItems", "boolean"], void 0, schema, "uniqueItems");
 		},
-		maxProperties: function(report, schema) {
+		maxProperties(report, schema) {
 			if (!isInteger(schema.maxProperties)) report.addError("KEYWORD_TYPE_EXPECTED", ["maxProperties", "integer"], void 0, schema, "maxProperties");
 			else if (schema.maxProperties < 0) report.addError("KEYWORD_MUST_BE", ["maxProperties", "greater than, or equal to 0"], void 0, schema, "maxProperties");
 		},
-		minProperties: function(report, schema) {
+		minProperties(report, schema) {
 			if (!isInteger(schema.minProperties)) report.addError("KEYWORD_TYPE_EXPECTED", ["minProperties", "integer"], void 0, schema, "minProperties");
 			else if (schema.minProperties < 0) report.addError("KEYWORD_MUST_BE", ["minProperties", "greater than, or equal to 0"], void 0, schema, "minProperties");
 		},
-		required: function(report, schema) {
+		required(report, schema) {
 			if (!Array.isArray(schema.required)) report.addError("KEYWORD_TYPE_EXPECTED", ["required", "array"], void 0, schema, "required");
 			else if (report.options.version === "draft-04" && schema.required.length === 0) report.addError("KEYWORD_MUST_BE", ["required", "an array with at least one element"], void 0, schema, "required");
 			else {
 				for (const item of schema.required) if (typeof item !== "string") report.addError("KEYWORD_VALUE_TYPE", ["required", "string"], void 0, schema, "required");
-				if (isUniqueArray(schema.required) === false) report.addError("KEYWORD_MUST_BE", ["required", "an array with unique items"], void 0, schema, "required");
+				if (!isUniqueArray(schema.required)) report.addError("KEYWORD_MUST_BE", ["required", "an array with unique items"], void 0, schema, "required");
 			}
 		},
-		additionalProperties: function(report, schema) {
+		additionalProperties(report, schema) {
 			if (typeof schema.additionalProperties !== "boolean" && !isObject(schema.additionalProperties)) report.addError("KEYWORD_TYPE_EXPECTED", ["additionalProperties", ["boolean", "object"]], void 0, schema, "additionalProperties");
 			else if (isObject(schema.additionalProperties)) {
 				report.path.push("additionalProperties");
@@ -5099,7 +5170,7 @@
 				report.path.pop();
 			}
 		},
-		properties: function(report, schema) {
+		properties(report, schema) {
 			if (!isObject(schema.properties)) {
 				report.addError("KEYWORD_TYPE_EXPECTED", ["properties", "object"], void 0, schema, "properties");
 				return;
@@ -5117,7 +5188,7 @@
 			if (this.options.assumeAdditional && schema.additionalProperties === void 0) schema.additionalProperties = false;
 			if (this.options.forceProperties === true && keys.length === 0) report.addError("CUSTOM_MODE_FORCE_PROPERTIES", ["properties"], void 0, schema, "properties");
 		},
-		patternProperties: function(report, schema) {
+		patternProperties(report, schema) {
 			if (!isObject(schema.patternProperties)) {
 				report.addError("KEYWORD_TYPE_EXPECTED", ["patternProperties", "object"], void 0, schema, "patternProperties");
 				return;
@@ -5139,93 +5210,52 @@
 			}
 			if (this.options.forceProperties === true && keys.length === 0) report.addError("CUSTOM_MODE_FORCE_PROPERTIES", ["patternProperties"], void 0, schema, "patternProperties");
 		},
-		dependencies: function(report, schema) {
-			if (!isObject(schema.dependencies)) report.addError("KEYWORD_TYPE_EXPECTED", ["dependencies", "object"], void 0, schema, "dependencies");
-			else {
-				const keys = Object.keys(schema.dependencies);
-				for (const schemaKey of keys) {
-					const schemaDependency = schema.dependencies[schemaKey];
-					if (isObject(schemaDependency) || report.options.version !== "draft-04" && typeof schemaDependency === "boolean") {
-						report.path.push("dependencies");
-						report.path.push(schemaKey);
-						this.validateSchema(report, schemaDependency);
-						report.path.pop();
-						report.path.pop();
-					} else if (Array.isArray(schemaDependency)) {
-						const depArray = schemaDependency;
-						if (report.options.version === "draft-04" && depArray.length === 0) report.addError("KEYWORD_MUST_BE", ["dependencies", "not empty array"], void 0, schema, "dependencies");
-						for (const dep of depArray) if (typeof dep !== "string") report.addError("KEYWORD_VALUE_TYPE", ["dependencies", "string"], void 0, schema, "dependencies");
-						if (isUniqueArray(depArray) === false) report.addError("KEYWORD_MUST_BE", ["dependencies", "an array with unique items"], void 0, schema, "dependencies");
-					} else report.addError("KEYWORD_VALUE_TYPE", ["dependencies", report.options.version === "draft-04" ? "object or array" : "boolean, object or array"], void 0, schema, "dependencies");
-				}
+		dependencies(report, schema) {
+			if (!isObject(schema.dependencies)) {
+				report.addError("KEYWORD_TYPE_EXPECTED", ["dependencies", "object"], void 0, schema, "dependencies");
+				return;
+			}
+			const keys = Object.keys(schema.dependencies);
+			for (const schemaKey of keys) {
+				const schemaDependency = schema.dependencies[schemaKey];
+				if (isObject(schemaDependency) || report.options.version !== "draft-04" && typeof schemaDependency === "boolean") {
+					report.path.push("dependencies");
+					report.path.push(schemaKey);
+					this.validateSchema(report, schemaDependency);
+					report.path.pop();
+					report.path.pop();
+				} else if (Array.isArray(schemaDependency)) {
+					const depArray = schemaDependency;
+					if (report.options.version === "draft-04" && depArray.length === 0) report.addError("KEYWORD_MUST_BE", ["dependencies", "not empty array"], void 0, schema, "dependencies");
+					for (const dep of depArray) if (typeof dep !== "string") report.addError("KEYWORD_VALUE_TYPE", ["dependencies", "string"], void 0, schema, "dependencies");
+					if (!isUniqueArray(depArray)) report.addError("KEYWORD_MUST_BE", ["dependencies", "an array with unique items"], void 0, schema, "dependencies");
+				} else report.addError("KEYWORD_VALUE_TYPE", ["dependencies", report.options.version === "draft-04" ? "object or array" : "boolean, object or array"], void 0, schema, "dependencies");
 			}
 		},
-		enum: function(report, schema) {
-			if (Array.isArray(schema.enum) === false) report.addError("KEYWORD_TYPE_EXPECTED", ["enum", "array"], void 0, schema, "enum");
+		enum(report, schema) {
+			if (!Array.isArray(schema.enum)) report.addError("KEYWORD_TYPE_EXPECTED", ["enum", "array"], void 0, schema, "enum");
 			else if (schema.enum.length === 0) report.addError("KEYWORD_MUST_BE", ["enum", "an array with at least one element"], void 0, schema, "enum");
-			else if (isUniqueArray(schema.enum) === false) report.addError("KEYWORD_MUST_BE", ["enum", "an array with unique elements"], void 0, schema, "enum");
+			else if (!isUniqueArray(schema.enum)) report.addError("KEYWORD_MUST_BE", ["enum", "an array with unique elements"], void 0, schema, "enum");
 		},
-		type: function(report, schema) {
-			const primitiveTypes = [
-				"array",
-				"boolean",
-				"integer",
-				"number",
-				"null",
-				"object",
-				"string"
-			];
-			const primitiveTypeStr = primitiveTypes.join(",");
+		type(report, schema) {
 			const isArray = Array.isArray(schema.type);
 			if (Array.isArray(schema.type)) {
-				for (const typeItem of schema.type) if (!primitiveTypes.includes(typeItem)) report.addError("KEYWORD_TYPE_EXPECTED", ["type", primitiveTypeStr], void 0, schema, "type");
-				if (isUniqueArray(schema.type) === false) report.addError("KEYWORD_MUST_BE", ["type", "an object with unique properties"], void 0, schema, "type");
+				for (const typeItem of schema.type) if (!PRIMITIVE_TYPES_SET.has(typeItem)) report.addError("KEYWORD_TYPE_EXPECTED", ["type", PRIMITIVE_TYPE_STR], void 0, schema, "type");
+				if (!isUniqueArray(schema.type)) report.addError("KEYWORD_MUST_BE", ["type", "an object with unique properties"], void 0, schema, "type");
 			} else if (typeof schema.type === "string") {
-				if (!primitiveTypes.includes(schema.type)) report.addError("KEYWORD_TYPE_EXPECTED", ["type", primitiveTypeStr], void 0, schema, "type");
+				if (!PRIMITIVE_TYPES_SET.has(schema.type)) report.addError("KEYWORD_TYPE_EXPECTED", ["type", PRIMITIVE_TYPE_STR], void 0, schema, "type");
 			} else report.addError("KEYWORD_TYPE_EXPECTED", ["type", ["string", "array"]], void 0, schema, "type");
-			if (this.options.noEmptyStrings === true) {
-				if (schema.type === "string" || isArray && schema.type.includes("string")) {
-					if (schema.minLength === void 0 && schema.enum === void 0 && schema.format === void 0) schema.minLength = 1;
-				}
-			}
-			if (this.options.noEmptyArrays === true) {
-				if (schema.type === "array" || isArray && schema.type.includes("array")) {
-					if (schema.minItems === void 0) schema.minItems = 1;
-				}
-			}
-			if (this.options.forceProperties === true) {
-				if (schema.type === "object" || isArray && schema.type.includes("object")) {
-					if (schema.properties === void 0 && schema.patternProperties === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["properties"], void 0, schema, "properties");
-				}
-			}
-			if (this.options.forceItems === true) {
-				if (schema.type === "array" || isArray && schema.type.includes("array")) {
-					if (schema.items === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["items"], void 0, schema, "items");
-				}
-			}
-			if (this.options.forceMinItems === true) {
-				if (schema.type === "array" || isArray && schema.type.includes("array")) {
-					if (schema.minItems === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["minItems"], void 0, schema, "minItems");
-				}
-			}
-			if (this.options.forceMaxItems === true) {
-				if (schema.type === "array" || isArray && schema.type.includes("array")) {
-					if (schema.maxItems === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["maxItems"], void 0, schema, "maxItems");
-				}
-			}
-			if (this.options.forceMinLength === true) {
-				if (schema.type === "string" || isArray && schema.type.includes("string")) {
-					if (schema.minLength === void 0 && schema.format === void 0 && schema.enum === void 0 && schema.pattern === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["minLength"], void 0, schema, "minLength");
-				}
-			}
-			if (this.options.forceMaxLength === true) {
-				if (schema.type === "string" || isArray && schema.type.includes("string")) {
-					if (schema.maxLength === void 0 && schema.format === void 0 && schema.enum === void 0 && schema.pattern === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["maxLength"], void 0, schema, "maxLength");
-				}
-			}
+			if (this.options.noEmptyStrings === true && (schema.type === "string" || isArray && schema.type.includes("string")) && schema.minLength === void 0 && schema.enum === void 0 && schema.format === void 0) schema.minLength = 1;
+			if (this.options.noEmptyArrays === true && (schema.type === "array" || isArray && schema.type.includes("array")) && schema.minItems === void 0) schema.minItems = 1;
+			if (this.options.forceProperties === true && (schema.type === "object" || isArray && schema.type.includes("object")) && schema.properties === void 0 && schema.patternProperties === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["properties"], void 0, schema, "properties");
+			if (this.options.forceItems === true && (schema.type === "array" || isArray && schema.type.includes("array")) && schema.items === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["items"], void 0, schema, "items");
+			if (this.options.forceMinItems === true && (schema.type === "array" || isArray && schema.type.includes("array")) && schema.minItems === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["minItems"], void 0, schema, "minItems");
+			if (this.options.forceMaxItems === true && (schema.type === "array" || isArray && schema.type.includes("array")) && schema.maxItems === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["maxItems"], void 0, schema, "maxItems");
+			if (this.options.forceMinLength === true && (schema.type === "string" || isArray && schema.type.includes("string")) && schema.minLength === void 0 && schema.format === void 0 && schema.enum === void 0 && schema.pattern === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["minLength"], void 0, schema, "minLength");
+			if (this.options.forceMaxLength === true && (schema.type === "string" || isArray && schema.type.includes("string")) && schema.maxLength === void 0 && schema.format === void 0 && schema.enum === void 0 && schema.pattern === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["maxLength"], void 0, schema, "maxLength");
 		},
-		allOf: function(report, schema) {
-			if (Array.isArray(schema.allOf) === false) report.addError("KEYWORD_TYPE_EXPECTED", ["allOf", "array"], void 0, schema, "allOf");
+		allOf(report, schema) {
+			if (!Array.isArray(schema.allOf)) report.addError("KEYWORD_TYPE_EXPECTED", ["allOf", "array"], void 0, schema, "allOf");
 			else if (schema.allOf.length === 0) report.addError("KEYWORD_MUST_BE", ["allOf", "an array with at least one element"], void 0, schema, "allOf");
 			else for (let idx = 0; idx < schema.allOf.length; idx++) {
 				report.path.push("allOf");
@@ -5235,8 +5265,8 @@
 				report.path.pop();
 			}
 		},
-		anyOf: function(report, schema) {
-			if (Array.isArray(schema.anyOf) === false) report.addError("KEYWORD_TYPE_EXPECTED", ["anyOf", "array"], void 0, schema, "anyOf");
+		anyOf(report, schema) {
+			if (!Array.isArray(schema.anyOf)) report.addError("KEYWORD_TYPE_EXPECTED", ["anyOf", "array"], void 0, schema, "anyOf");
 			else if (schema.anyOf.length === 0) report.addError("KEYWORD_MUST_BE", ["anyOf", "an array with at least one element"], void 0, schema, "anyOf");
 			else for (let idx = 0; idx < schema.anyOf.length; idx++) {
 				report.path.push("anyOf");
@@ -5246,8 +5276,8 @@
 				report.path.pop();
 			}
 		},
-		oneOf: function(report, schema) {
-			if (Array.isArray(schema.oneOf) === false) report.addError("KEYWORD_TYPE_EXPECTED", ["oneOf", "array"], void 0, schema, "oneOf");
+		oneOf(report, schema) {
+			if (!Array.isArray(schema.oneOf)) report.addError("KEYWORD_TYPE_EXPECTED", ["oneOf", "array"], void 0, schema, "oneOf");
 			else if (schema.oneOf.length === 0) report.addError("KEYWORD_MUST_BE", ["oneOf", "an array with at least one element"], void 0, schema, "oneOf");
 			else for (let idx = 0; idx < schema.oneOf.length; idx++) {
 				report.path.push("oneOf");
@@ -5257,16 +5287,17 @@
 				report.path.pop();
 			}
 		},
-		not: function(report, schema) {
+		not(report, schema) {
 			const notSchema = schema.not;
-			if (!(report.options.version === "draft-04" ? isObject(notSchema) : typeof notSchema === "boolean" || isObject(notSchema))) report.addError("KEYWORD_TYPE_EXPECTED", ["not", report.options.version === "draft-04" ? "object" : ["boolean", "object"]], void 0, schema, "not");
-			else {
-				report.path.push("not");
-				this.validateSchema(report, notSchema);
-				report.path.pop();
+			if (!(report.options.version === "draft-04" ? isObject(notSchema) : typeof notSchema === "boolean" || isObject(notSchema))) {
+				report.addError("KEYWORD_TYPE_EXPECTED", ["not", report.options.version === "draft-04" ? "object" : ["boolean", "object"]], void 0, schema, "not");
+				return;
 			}
+			report.path.push("not");
+			this.validateSchema(report, notSchema);
+			report.path.pop();
 		},
-		if: function(report, schema) {
+		if(report, schema) {
 			if (report.options.version !== "draft-07") return;
 			const ifSchema = schema.if;
 			if (!(typeof ifSchema === "boolean" || isObject(ifSchema))) {
@@ -5277,7 +5308,7 @@
 			this.validateSchema(report, ifSchema);
 			report.path.pop();
 		},
-		then: function(report, schema) {
+		then(report, schema) {
 			if (report.options.version !== "draft-07") return;
 			const thenSchema = schema.then;
 			if (!(typeof thenSchema === "boolean" || isObject(thenSchema))) {
@@ -5288,7 +5319,7 @@
 			this.validateSchema(report, thenSchema);
 			report.path.pop();
 		},
-		else: function(report, schema) {
+		else(report, schema) {
 			if (report.options.version !== "draft-07") return;
 			const elseSchema = schema.else;
 			if (!(typeof elseSchema === "boolean" || isObject(elseSchema))) {
@@ -5299,21 +5330,22 @@
 			this.validateSchema(report, elseSchema);
 			report.path.pop();
 		},
-		definitions: function(report, schema) {
-			if (!isObject(schema.definitions)) report.addError("KEYWORD_TYPE_EXPECTED", ["definitions", "object"], void 0, schema, "definitions");
-			else {
-				const keys = Object.keys(schema.definitions);
-				for (const key of keys) {
-					const val = schema.definitions[key];
-					report.path.push("definitions");
-					report.path.push(key);
-					this.validateSchema(report, val);
-					report.path.pop();
-					report.path.pop();
-				}
+		definitions(report, schema) {
+			if (!isObject(schema.definitions)) {
+				report.addError("KEYWORD_TYPE_EXPECTED", ["definitions", "object"], void 0, schema, "definitions");
+				return;
+			}
+			const keys = Object.keys(schema.definitions);
+			for (const key of keys) {
+				const val = schema.definitions[key];
+				report.path.push("definitions");
+				report.path.push(key);
+				this.validateSchema(report, val);
+				report.path.pop();
+				report.path.pop();
 			}
 		},
-		$defs: function(report, schema) {
+		$defs(report, schema) {
 			if (report.options.version !== "draft2019-09" && report.options.version !== "draft2020-12") return;
 			if (!isObject(schema.$defs)) {
 				report.addError("KEYWORD_TYPE_EXPECTED", ["$defs", "object"], void 0, schema, "$defs");
@@ -5329,34 +5361,36 @@
 				report.path.pop();
 			}
 		},
-		format: function(report, schema) {
+		format(report, schema) {
 			if (this.options.formatAssertions === false) return;
-			if (typeof schema.format !== "string") report.addError("KEYWORD_TYPE_EXPECTED", ["format", "string"], void 0, schema, "format");
-			else {
-				const isModernDraft = this.options.version === "draft2019-09" || this.options.version === "draft2020-12";
-				if (!isFormatSupported(schema.format, this.options.customFormats) && this.options.ignoreUnknownFormats !== true && !isModernDraft) report.addError("UNKNOWN_FORMAT", [schema.format], void 0, schema, "format");
+			if (typeof schema.format !== "string") {
+				report.addError("KEYWORD_TYPE_EXPECTED", ["format", "string"], void 0, schema, "format");
+				return;
 			}
+			const isModernDraft = this.options.version === "draft2019-09" || this.options.version === "draft2020-12";
+			if (!isFormatSupported(schema.format, this.options.customFormats) && this.options.ignoreUnknownFormats !== true && !isModernDraft) report.addError("UNKNOWN_FORMAT", [schema.format], void 0, schema, "format");
 		},
-		contentEncoding: function(report, schema) {
+		contentEncoding(report, schema) {
 			if (report.options.version !== "draft-07") return;
 			if (typeof schema.contentEncoding !== "string") report.addError("KEYWORD_TYPE_EXPECTED", ["contentEncoding", "string"], void 0, schema, "contentEncoding");
 		},
-		contentMediaType: function(report, schema) {
+		contentMediaType(report, schema) {
 			if (report.options.version !== "draft-07") return;
 			if (typeof schema.contentMediaType !== "string") report.addError("KEYWORD_TYPE_EXPECTED", ["contentMediaType", "string"], void 0, schema, "contentMediaType");
 		},
-		id: function(report, schema) {
+		id(report, schema) {
 			if (typeof schema.id !== "string") report.addError("KEYWORD_TYPE_EXPECTED", ["id", "string"], void 0, schema, "id");
 		},
-		title: function(report, schema) {
+		title(report, schema) {
 			if (typeof schema.title !== "string") report.addError("KEYWORD_TYPE_EXPECTED", ["title", "string"], void 0, schema, "title");
 		},
-		description: function(report, schema) {
+		description(report, schema) {
 			if (typeof schema.description !== "string") report.addError("KEYWORD_TYPE_EXPECTED", ["description", "string"], void 0, schema, "description");
 		},
-		default: function() {}
+		default() {}
 	};
 	var SchemaValidator = class {
+		validator;
 		constructor(validator) {
 			this.validator = validator;
 		}
@@ -5376,18 +5410,17 @@
 			if (hasParentSchema) {
 				if (schema.__$schemaResolved && schema.__$schemaResolved !== schema) {
 					const subReport = new Report(report);
-					if (validate.call(this.validator, subReport, schema.__$schemaResolved, schema) === false) report.addError("PARENT_SCHEMA_VALIDATION_FAILED", void 0, subReport, schema, "$schema");
+					if (!validate(this.validator, subReport, schema.__$schemaResolved, schema)) report.addError("PARENT_SCHEMA_VALIDATION_FAILED", void 0, subReport, schema, "$schema");
 				} else if (this.validator.options.ignoreUnresolvableReferences !== true) report.addError("REF_UNRESOLVED", [schema.$schema], void 0, schema, "$schema");
 			}
 			if (this.validator.options.noTypeless === true) {
 				if (schema.type !== void 0) {
-					let schemas = [];
-					if (Array.isArray(schema.anyOf)) schemas = schemas.concat(schema.anyOf);
-					if (Array.isArray(schema.oneOf)) schemas = schemas.concat(schema.oneOf);
-					if (Array.isArray(schema.allOf)) schemas = schemas.concat(schema.allOf);
-					schemas.forEach(function(sch) {
+					const inheritType = (sch) => {
 						if (!sch.type) sch.type = schema.type;
-					});
+					};
+					if (Array.isArray(schema.anyOf)) for (let i = 0; i < schema.anyOf.length; i++) inheritType(schema.anyOf[i]);
+					if (Array.isArray(schema.oneOf)) for (let i = 0; i < schema.oneOf.length; i++) inheritType(schema.oneOf[i]);
+					if (Array.isArray(schema.allOf)) for (let i = 0; i < schema.allOf.length; i++) inheritType(schema.allOf[i]);
 				}
 				if (schema.enum === void 0 && schema.type === void 0 && schema.anyOf === void 0 && schema.oneOf === void 0 && schema.not === void 0 && schema.$ref === void 0) report.addError("KEYWORD_UNDEFINED_STRICT", ["type"], void 0, schema, "type");
 			}
@@ -5395,9 +5428,7 @@
 			for (const key of keys) {
 				if (key.startsWith("__")) continue;
 				if (Object.hasOwn(SchemaValidators, key)) SchemaValidators[key].call(this, report, schema);
-				else if (!hasParentSchema) {
-					if (this.validator.options.noExtraKeywords === true) report.addError("KEYWORD_UNEXPECTED", [key], void 0, schema, void 0);
-				}
+				else if (!hasParentSchema && this.validator.options.noExtraKeywords === true) report.addError("KEYWORD_UNEXPECTED", [key], void 0, schema);
 			}
 			if (this.validator.options.pedanticCheck === true) {
 				if (schema.enum) {
@@ -5407,14 +5438,14 @@
 					report.path.push("enum");
 					for (let idx = 0; idx < schema.enum.length; idx++) {
 						report.path.push(idx);
-						validate.call(this.validator, report, tmpSchema, schema.enum[idx]);
+						validate(this.validator, report, tmpSchema, schema.enum[idx]);
 						report.path.pop();
 					}
 					report.path.pop();
 				}
 				if (schema.default) {
 					report.path.push("default");
-					validate.call(this.validator, report, schema, schema.default);
+					validate(this.validator, report, schema, schema.default);
 					report.path.pop();
 				}
 			}
@@ -5451,7 +5482,7 @@
 		* create a circular dependency).
 		*/
 		_jsonValidate(report, schema, json) {
-			return validate.call(this, report, schema, json);
+			return validate(this, report, schema, json);
 		}
 		getDefaultSchemaId() {
 			return this.options.version && this.options.version !== "none" ? VERSION_SCHEMA_URL_MAPPING[this.options.version] : VERSION_SCHEMA_URL_MAPPING[defaultOptions.version];
@@ -5464,9 +5495,9 @@
 			if (!options) options = {};
 			this.validateOptions = options;
 			if (typeof schema !== "string" && typeof schema !== "boolean" && !isObject(schema)) {
-				const e = /* @__PURE__ */ new Error("Invalid .validate call - schema must be a string or object but " + whatIs(schema) + " was passed!");
+				const e = /* @__PURE__ */ new Error(`Invalid .validate call - schema must be a string or object but ${whatIs(schema)} was passed!`);
 				if (callback) {
-					setTimeout(function() {
+					setTimeout(() => {
 						callback(e, false);
 					}, 0);
 					return;
@@ -5481,9 +5512,9 @@
 				const schemaName = schema;
 				_schema = this.scache.getSchema(report, schemaName);
 				if (!_schema) {
-					const e = /* @__PURE__ */ new Error("Schema with id '" + schemaName + "' wasn't found in the validator cache!");
+					const e = /* @__PURE__ */ new Error(`Schema with id '${schemaName}' wasn't found in the validator cache!`);
 					if (callback) {
-						setTimeout(function() {
+						setTimeout(() => {
 							callback(e, false);
 						}, 0);
 						return;
@@ -5501,9 +5532,9 @@
 				report.rootSchema = _schema;
 				_schema = get(_schema, options.schemaPath);
 				if (!_schema) {
-					const e = /* @__PURE__ */ new Error("Schema path '" + options.schemaPath + "' wasn't found in the schema!");
+					const e = /* @__PURE__ */ new Error(`Schema path '${options.schemaPath}' wasn't found in the schema!`);
 					if (callback) {
-						setTimeout(function() {
+						setTimeout(() => {
 							callback(e, false);
 						}, 0);
 						return;
@@ -5511,7 +5542,7 @@
 					throw e;
 				}
 			}
-			if (!foundError) validate.call(this, report, _schema, json);
+			if (!foundError) validate(this, report, _schema, json);
 			if (callback) {
 				report.processAsyncTasks(this.options.asyncTimeout, callback);
 				return;
@@ -5582,8 +5613,8 @@
 			if (!err) return [];
 			const details = err.details || [];
 			const missingRefs = [];
-			function collect(details) {
-				for (const detail of details) {
+			function collect(items) {
+				for (const detail of items) {
 					if (detail.code === "UNRESOLVABLE_REFERENCE" || detail.code === "SCHEMA_NOT_REACHABLE") missingRefs.push(detail.params[0]);
 					if (detail.inner) collect(detail.inner);
 				}
@@ -5599,9 +5630,13 @@
 		getMissingRemoteReferences(err) {
 			const missingReferences = this.getMissingReferences(err);
 			const missingRemoteReferences = [];
+			const seen = /* @__PURE__ */ new Set();
 			for (const ref of missingReferences) {
 				const remoteReference = getRemotePath(ref);
-				if (remoteReference && !missingRemoteReferences.includes(remoteReference)) missingRemoteReferences.push(remoteReference);
+				if (remoteReference && !seen.has(remoteReference)) {
+					seen.add(remoteReference);
+					missingRemoteReferences.push(remoteReference);
+				}
 			}
 			return missingRemoteReferences;
 		}
@@ -5614,24 +5649,25 @@
 		getResolvedSchema(schemaId) {
 			const report = new Report(this.options);
 			const schema = this.scache.getSchemaByUri(report, schemaId);
-			if (!schema) return void 0;
+			if (!schema) return;
 			const clonedSchema = deepClone(schema, this.options.maxRecursionDepth);
 			const visited = /* @__PURE__ */ new WeakSet();
-			const cleanup = function(schema) {
-				let key;
-				const typeOf = whatIs(schema);
+			const cleanup = (node) => {
+				const typeOf = whatIs(node);
 				if (typeOf !== "object" && typeOf !== "array") return;
-				if (visited.has(schema)) return;
-				visited.add(schema);
-				if (schema.$ref && schema.__$refResolved) {
-					const from = schema.__$refResolved;
-					const to = schema;
-					delete schema.$ref;
-					delete schema.__$refResolved;
-					for (key in from) copyProp(from, to, key);
+				if (visited.has(node)) return;
+				visited.add(node);
+				const schemaNode = node;
+				if (schemaNode.$ref && schemaNode.__$refResolved) {
+					const from = schemaNode.__$refResolved;
+					const to = schemaNode;
+					delete schemaNode.$ref;
+					delete schemaNode.__$refResolved;
+					for (const key in from) if (Object.hasOwn(from, key)) copyProp(from, to, key);
 				}
-				for (key in schema) if (Object.hasOwn(schema, key)) if (isInternalKey(key)) delete schema[key];
-				else cleanup(schema[key]);
+				const record = node;
+				for (const key in record) if (Object.hasOwn(record, key)) if (isInternalKey(key)) delete record[key];
+				else cleanup(record[key]);
 			};
 			cleanup(clonedSchema);
 			return clonedSchema;
@@ -5640,24 +5676,20 @@
 	//#endregion
 	//#region src/z-schema.ts
 	var ZSchema = class ZSchema extends ZSchemaBase {
-		/** @internal Use ZSchema.create() instead. */
-		constructor(options, token) {
-			super(options, token);
-		}
 		/**
 		* Register a global format validator available to all instances.
 		* @param name - The format name (e.g. `'email'`, `'date'`).
 		* @param validatorFunction - A sync or async function `(value: unknown) => boolean | Promise<boolean>`.
 		*/
 		static registerFormat(name, validatorFunction) {
-			return registerFormat(name, validatorFunction);
+			registerFormat(name, validatorFunction);
 		}
 		/**
 		* Remove a globally registered format validator.
 		* @param name - The format name to unregister.
 		*/
 		static unregisterFormat(name) {
-			return unregisterFormat(name);
+			unregisterFormat(name);
 		}
 		/** Returns the names of all globally registered format validators. */
 		static getRegisteredFormats() {
@@ -5686,7 +5718,7 @@
 		* @param schemaReader - A function `(uri: string) => JsonSchema | undefined`, or `undefined` to clear.
 		*/
 		static setSchemaReader(schemaReader) {
-			return setSchemaReader(schemaReader);
+			setSchemaReader(schemaReader);
 		}
 		static schemaSymbol = schemaSymbol;
 		static jsonSymbol = jsonSymbol;
@@ -5722,10 +5754,10 @@
 			try {
 				this._validate(json, schema, options ?? {});
 				return { valid: true };
-			} catch (err) {
+			} catch (error) {
 				return {
 					valid: false,
-					err
+					err: error
 				};
 			}
 		}
@@ -5740,9 +5772,12 @@
 		validateAsync(json, schema, options) {
 			return new Promise((resolve, reject) => {
 				try {
-					this._validate(json, schema, options || {}, (err, valid) => err || valid !== true ? reject(err) : resolve(valid));
-				} catch (err) {
-					reject(err);
+					this._validate(json, schema, options || {}, (err, valid) => {
+						if (err || !valid) reject(err ?? /* @__PURE__ */ new Error("Validation failed"));
+						else resolve(valid);
+					});
+				} catch (error) {
+					reject(error instanceof Error ? error : new Error(String(error), { cause: error }));
 				}
 			});
 		}
@@ -5763,10 +5798,10 @@
 							err
 						});
 					});
-				} catch (err) {
+				} catch (error) {
 					resolve({
 						valid: false,
-						err
+						err: error
 					});
 				}
 			});
@@ -5789,10 +5824,10 @@
 			try {
 				this._validateSchema(schemaOrArr);
 				return { valid: true };
-			} catch (err) {
+			} catch (error) {
 				return {
 					valid: false,
-					err
+					err: error
 				};
 			}
 		}
@@ -5802,10 +5837,6 @@
 	* Created via `ZSchema.create({ safe: true })`.
 	*/
 	var ZSchemaSafe = class extends ZSchemaBase {
-		/** @internal Use ZSchema.create() instead. */
-		constructor(options, token) {
-			super(options, token);
-		}
 		/**
 		* Validate JSON data against a schema.
 		* @param json - The data to validate.
@@ -5817,10 +5848,10 @@
 			try {
 				this._validate(json, schema, options);
 				return { valid: true };
-			} catch (err) {
+			} catch (error) {
 				return {
 					valid: false,
-					err
+					err: error
 				};
 			}
 		}
@@ -5833,10 +5864,10 @@
 			try {
 				this._validateSchema(schemaOrArr);
 				return { valid: true };
-			} catch (err) {
+			} catch (error) {
 				return {
 					valid: false,
-					err
+					err: error
 				};
 			}
 		}
@@ -5846,10 +5877,6 @@
 	* Created via `ZSchema.create({ async: true })`.
 	*/
 	var ZSchemaAsync = class extends ZSchemaBase {
-		/** @internal Use ZSchema.create() instead. */
-		constructor(options, token) {
-			super(options, token);
-		}
 		/**
 		* Validate JSON data against a schema asynchronously.
 		* @param json - The data to validate.
@@ -5861,9 +5888,12 @@
 		validate(json, schema, options = {}) {
 			return new Promise((resolve, reject) => {
 				try {
-					this._validate(json, schema, options, (err, valid) => err || valid !== true ? reject(err) : resolve(valid));
-				} catch (err) {
-					reject(err);
+					this._validate(json, schema, options, (err, valid) => {
+						if (err || !valid) reject(err ?? /* @__PURE__ */ new Error("Validation failed"));
+						else resolve(valid);
+					});
+				} catch (error) {
+					reject(error instanceof Error ? error : new Error(String(error), { cause: error }));
 				}
 			});
 		}
@@ -5882,10 +5912,6 @@
 	* Created via `ZSchema.create({ async: true, safe: true })`.
 	*/
 	var ZSchemaAsyncSafe = class extends ZSchemaBase {
-		/** @internal Use ZSchema.create() instead. */
-		constructor(options, token) {
-			super(options, token);
-		}
 		/**
 		* Validate JSON data against a schema asynchronously.
 		* The promise always resolves (never rejects).
@@ -5903,10 +5929,10 @@
 							err
 						});
 					});
-				} catch (err) {
+				} catch (error) {
 					resolve({
 						valid: false,
-						err
+						err: error
 					});
 				}
 			});
@@ -5920,10 +5946,10 @@
 			try {
 				this._validateSchema(schemaOrArr);
 				return { valid: true };
-			} catch (err) {
+			} catch (error) {
 				return {
 					valid: false,
-					err
+					err: error
 				};
 			}
 		}