elysia 2.0.0-beta.2 → 2.0.0-beta.21

package/dist/type/validator/index.mjs

@@ -2,19 +2,18 @@ import { ELYSIA_FORM_PROTOTYPE, nullObject } from "../../utils.mjs";
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { ValidationError } from "../../error.mjs";
 import { Capture, Compiled, EMPTY_EXTERNALS, captureImpl, reconstruct } from "../../compile/aot.mjs";
-import { isPureRefinement, nonAdditionalProperties } from "../shared.mjs";
-import { collectFileTypeChecks, isAsyncPredicate, takeFileTypeChecks } from "../elysia/file-type.mjs";
-import { isFullyClosedObject, schemaContainsRef, schemaHasDangerousProperties, schemaSome } from "./clean-safe.mjs";
+import { dropCompiledSource, isPureRefinement, nonAdditionalProperties } from "../shared.mjs";
+import { isFullyClosedObject, schemaHasDangerousProperties, schemaSome } from "./clean-safe.mjs";
 import { hasProperty } from "../utils.mjs";
-import { Validator as Validator$1 } from "../../validator/index.mjs";
+import { Validator } from "../../validator/index.mjs";
+import { Evaluate, Intersect, Module } from "../typebox-type.mjs";
+import { Build, Check, Clean, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec, SchemaCompile } from "../typebox-value.mjs";
 import { applyCoercions, buildCoercedFromPlan } from "../coerce.mjs";
-import { applyPrecomputed, createDefaultCloner, createMergerFromSource, createObjectDefaultMerger, verifyPreallocatableDefault } from "./default-precompute.mjs";
+import { ASYNC_REFINE, collectFileTypeChecks, isAsyncPredicate, takeFileTypeChecks } from "../elysia/file-type.mjs";
+import { applyPrecomputed, createDefaultCloner, createMergerFromSource, createObjectDefaultMerger, precomputeCompileFailures, verifyPreallocatableDefault } from "./default-precompute.mjs";
 import { buildFindCustomError } from "./custom-error.mjs";
 import { exactMirrorRequired, getExactMirror } from "./exact-mirror.mjs";
 import { TypeBoxValidatorCache, mayHaveFileType } from "./validator-cache.mjs";
-import { Evaluate, Intersect, Module } from "typebox/type";
-import { Check, Clean, Decode as Decode$1, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec } from "typebox/value";
-import { Compile } from "typebox/schema";
 
 //#region src/type/validator/index.ts
 const moduleCache = /* @__PURE__ */ new WeakMap();
@@ -38,6 +37,19 @@ const freshRefineValidation = (groups) => {
 		checking: false
 	};
 };
+const UNAWAITED_REFINE = "[Elysia] t.Refine check must be synchronous";
+const guardedChecks = /* @__PURE__ */ new WeakSet();
+function guardRefinement(refinement) {
+	const check = refinement.check;
+	if (guardedChecks.has(check) || check["~elyAsyncRefine"] === true || isPureRefinement(refinement)) return;
+	const guarded = function(value) {
+		const result = check.call(this, value);
+		if (typeof result?.then === "function") throw new Error(UNAWAITED_REFINE);
+		return result;
+	};
+	guardedChecks.add(guarded);
+	refinement.check = guarded;
+}
 function collectRefinements(schema, out = /* @__PURE__ */ new Set(), seen = /* @__PURE__ */ new WeakSet()) {
 	if (!schema || typeof schema !== "object" || seen.has(schema)) return out;
 	seen.add(schema);
@@ -46,7 +58,8 @@ function collectRefinements(schema, out = /* @__PURE__ */ new Set(), seen = /* @
 		let group = refinementGroups.get(refinements);
 		if (!group) {
 			const members = refinements.filter((refinement) => refinement && typeof refinement === "object" && typeof refinement.check === "function");
-			if (members.length) {
+			for (const refinement of members) guardRefinement(refinement);
+			if (members.length && !isAsyncPredicate(members)) {
 				group = {
 					checks: members.map((refinement) => refinement.check),
 					pure: members.every(isPureRefinement)
@@ -82,6 +95,7 @@ function collectRefinements(schema, out = /* @__PURE__ */ new Set(), seen = /* @
 						if (slot.occurrences > slot.recorded) return true;
 						return slot.verdicts[slot.occurrences - 1][index];
 					};
+					guardedChecks.add(refinement.check);
 				}
 			}
 		}
@@ -118,20 +132,6 @@ function collectRefinements(schema, out = /* @__PURE__ */ new Set(), seen = /* @
 	]) if (Array.isArray(schema[key])) for (const child of schema[key]) collectRefinements(child, out, seen);
 	return out;
 }
-const materializeModels = (models) => {
-	const out = {};
-	for (const name in models) {
-		const schema = models[name];
-		const value = {};
-		let source = schema;
-		while (source && source !== Object.prototype) {
-			for (const key of Object.getOwnPropertyNames(source)) if (key !== "$id" && !Object.hasOwn(value, key)) Object.defineProperty(value, key, Object.getOwnPropertyDescriptor(source, key));
-			source = Object.getPrototypeOf(source);
-		}
-		out[name] = value;
-	}
-	return out;
-};
 function divergesFromEvaluate(node, seen) {
 	if (!node || typeof node !== "object" || seen.has(node)) return false;
 	seen.add(node);
@@ -181,7 +181,6 @@ function schemaMayHaveAsyncRefine(node, seen = /* @__PURE__ */ new WeakSet()) {
 	}
 	return false;
 }
-const schemaHasCustomError = (schema) => schemaSome(schema, (node) => node.error !== void 0);
 async function enforceFileTypeChecks(pending, type, value, schema) {
 	const results = await Promise.all(pending.map((x) => x.check));
 	for (let i = 0; i < results.length; i++) if (results[i] !== true) throw new ValidationError(type, value, [{
@@ -204,7 +203,24 @@ function findInstancePath(value, target, path = "") {
 		if (found !== void 0) return found;
 	}
 }
-var TypeBoxValidator = class extends Validator$1 {
+function warnMirrorFailure(schema, error) {
+	console.warn("Failed to create exactMirror. Please report the following to https://github.com/elysiajs/elysia/issues");
+	let report;
+	try {
+		report = JSON.stringify(schema, (key, value) => key === "secrets" ? "[redacted]" : value);
+	} catch {
+		report = "[unserializable schema]";
+	}
+	console.warn(report);
+	console.warn(error);
+}
+let warnedMissingMirror = false;
+var TypeBoxValidator = class extends Validator {
+	static member(schema, compiled) {
+		const isAsync = (compiled.buildResult ?? Build(schema)).external.variables.some(isAsyncPredicate);
+		collectRefinements(schema);
+		return isAsync;
+	}
 	#decodeMirror;
 	#encodeMirror;
 	#refinements;
@@ -234,13 +250,29 @@ var TypeBoxValidator = class extends Validator$1 {
 		const frozen = options?.aot && options.slot ? Compiled.getValidator(options.aot.method, options.aot.path, options.slot, options.app?.["~programId"]) : void 0;
 		let schemaHasRef = false;
 		if (name && options?.models) {
-			schema = moduleCache.getOrInsertComputed(options.models, () => Module(materializeModels(options.models)))[name];
+			let modelModule = moduleCache.get(options.models);
+			if (modelModule === void 0) {
+				const models = options.models;
+				const out = {};
+				for (const modelName in models) {
+					const modelSchema = models[modelName];
+					const value = {};
+					let source = modelSchema;
+					while (source && source !== Object.prototype) {
+						for (const key of Object.getOwnPropertyNames(source)) if (key !== "$id" && !Object.hasOwn(value, key)) Object.defineProperty(value, key, Object.getOwnPropertyDescriptor(source, key));
+						source = Object.getPrototypeOf(source);
+					}
+					out[modelName] = value;
+				}
+				moduleCache.set(options.models, modelModule = Module(out));
+			}
+			schema = modelModule[name];
 			if (isIntersectable) {
 				const members = [schema, ...options.schemas];
 				schema = shallowMergeObjects(members) ?? Evaluate(Intersect(members));
 			}
 		} else if (options?.models && typeof name !== "string") {
-			schemaHasRef = frozen ? frozen.r === 1 : schemaContainsRef(schema);
+			schemaHasRef = frozen ? frozen.r === 1 : schemaSome(schema, (n) => !!n.$ref);
 			if (schemaHasRef) {
 				const id = `inline@${++inlineRefId}`;
 				schema = Module({
@@ -249,19 +281,28 @@ var TypeBoxValidator = class extends Validator$1 {
 				})[id];
 			}
 		}
-		const isFrozen = this.#reconstruct(options, frozen);
+		let isFrozen;
+		if (!options?.aot || !options.slot || options.normalize === "typebox") isFrozen = false;
+		else if (!frozen?.c && !frozen?.cm) isFrozen = false;
+		else {
+			this.isAsync = frozen.a === 1;
+			this.hasDefault = frozen.d === 1;
+			this.hasCodec = frozen.k === 1;
+			isFrozen = true;
+		}
 		this.schema = isFrozen && frozen.cp ? buildCoercedFromPlan(schema, frozen.cp) : isFrozen && !this.hasCodec ? schema : applyCoercions(schema, options?.coerces);
 		if (options?.normalize === false && options.slot !== "headers" && options.slot !== "cookie") this.schema = nonAdditionalProperties(this.schema);
 		if (!isFrozen) {
 			const capturing = Capture.isCapturing();
 			this.hasCodec = HasCodec(this.schema);
 			this.hasDefault = hasProperty("default", this.schema);
-			if (!capturing && !options?.eager && !schemaMayHaveAsyncRefine(this.schema) && !schemaHasCustomError(this.schema)) {
+			if (!capturing && !options?.eager && !schemaMayHaveAsyncRefine(this.schema) && !schemaSome(this.schema, (node) => node.error !== void 0)) {
 				this.#deferred = true;
 				this.isAsync = false;
 			} else {
-				this.tb = capturing && captureImpl ? captureImpl.sourceOnlyValidator(this.schema) : Compile(this.schema);
-				this.isAsync = this.tb.buildResult.external.variables.some(isAsyncPredicate) ?? false;
+				this.tb = capturing && captureImpl ? captureImpl.sourceOnlyValidator(this.schema) : SchemaCompile(this.schema);
+				const build = this.tb.buildResult ?? Build(this.schema);
+				this.isAsync = build.external.variables.some(isAsyncPredicate);
 				if (capturing && captureImpl && options?.aot && options.slot) captureImpl.maybeCapture({
 					aot: options.aot,
 					slot: options.slot,
@@ -273,15 +314,13 @@ var TypeBoxValidator = class extends Validator$1 {
 					coerces: options.coerces,
 					normalize: options.normalize,
 					sanitize: options.sanitize,
-					buildResult: this.tb.buildResult
+					buildResult: build
 				});
-				else if (!capturing) this.#dropCompiledSource();
+				else if (!capturing) dropCompiledSource(this.tb);
 			}
 		}
-		if (!this.isAsync) {
-			const refinements = collectRefinements(this.schema);
-			if (refinements.size) this.#refinements = refinements;
-		}
+		const refinements = collectRefinements(this.schema);
+		if (!this.isAsync && refinements.size) this.#refinements = refinements;
 		if (frozen?.ps === 1) {
 			const objectTemplate = frozen.pod !== void 0 ? Object.freeze(frozen.pod) : void 0;
 			this.precomputeSafe = true;
@@ -297,6 +336,7 @@ var TypeBoxValidator = class extends Validator$1 {
 			if (defaults) {
 				this.precomputeSafe = true;
 				const objectTemplate = defaults.pod !== void 0 ? Object.freeze(defaults.pod) : void 0;
+				const failures = precomputeCompileFailures();
 				this.#defaultFastPath = {
 					value: defaults.pd,
 					appliesToNull: defaults.pn,
@@ -304,6 +344,7 @@ var TypeBoxValidator = class extends Validator$1 {
 					clone: defaults.pd !== void 0 ? createDefaultCloner(defaults.pd) : void 0,
 					merge: defaults.ms ? createMergerFromSource(defaults.ms) : objectTemplate !== void 0 ? createObjectDefaultMerger(objectTemplate) : void 0
 				};
+				if (precomputeCompileFailures() !== failures) this.precomputeSafe = false;
 			} else {
 				this.precomputeSafe = false;
 				this.#defaultFastPath = void 0;
@@ -319,27 +360,57 @@ var TypeBoxValidator = class extends Validator$1 {
 			this.Clean = options?.normalize === false ? void 0 : schemaHasDangerousProperties(this.schema) ? (value) => Clean(this.schema, value) : both.clean;
 		} else {
 			if (isFrozen) this.reconstructedCheck = frozen.c(frozen.e ? reconstruct().collectExternals(this.schema) : EMPTY_EXTERNALS);
-			if (!getExactMirror() && !frozen?.m && !schemaHasDangerousProperties(this.schema) && options?.normalize !== false && options?.normalize !== "typebox" && (options?.normalize === true || options?.normalize === "exactMirror" || !!options?.sanitize)) throw exactMirrorRequired();
+			if (!getExactMirror() && !frozen?.m && !schemaHasDangerousProperties(this.schema) && options?.normalize !== false && options?.normalize !== "typebox") {
+				if (options?.normalize === "exactMirror" || options?.sanitize) throw exactMirrorRequired();
+				if (options?.normalize === true && !warnedMissingMirror) {
+					warnedMissingMirror = true;
+					console.warn("exact-mirror is unavailable, normalization degraded to TypeBox. Install exact-mirror, or bundle it statically with the AOT build plugin ('elysia/plugin/aot') to restore the fast path. Use normalize: 'typebox' to silence this.");
+				}
+			}
 			try {
-				this.Clean = options?.normalize === false ? void 0 : options?.normalize === "typebox" ? (value) => Clean(this.schema, value) : this.#setupMirror(schema, options, frozen);
+				if (options?.normalize === false) this.Clean = void 0;
+				else if (options?.normalize === "typebox") this.Clean = (value) => Clean(this.schema, value);
+				else if (schemaHasDangerousProperties(this.schema)) this.Clean = (value) => Clean(this.schema, value);
+				else {
+					const aot = options?.aot;
+					const slot = options?.slot;
+					if (aot && slot && frozen?.m) {
+						const m = frozen.m;
+						let clean;
+						this.Clean = (value) => {
+							if (clean === void 0) try {
+								clean = reconstruct().instantiateFrozenMirror(m, schema);
+							} catch (error) {
+								warnMirrorFailure(schema, error);
+								clean = (v) => v;
+							}
+							return clean(value);
+						};
+					} else {
+						if (aot && slot && Capture.isCapturing() && captureImpl) captureImpl.captureMirror(schema, aot, slot, options?.sanitize);
+						const createMirror = getExactMirror();
+						this.Clean = !createMirror ? (value) => Clean(this.schema, value) : createMirror(schema, {
+							Compile: SchemaCompile,
+							sanitize: options?.sanitize
+						});
+					}
+				}
 			} catch (error) {
-				console.warn("Failed to create exactMirror. Please report the following code to https://github.com/elysiajs/elysia/issues");
-				console.warn(schema);
-				console.warn(error);
+				warnMirrorFailure(schema, error);
 				if (options?.normalize !== false) this.Clean = (value) => Clean(this.schema, value);
 			}
 		}
 		this.#cleanRedundant = !!this.Clean && !options?.sanitize && options?.normalize !== "typebox" && isFullyClosedObject(this.schema);
-		if (this.hasCodec && !this.#isForm && !this.#noValidate && !options?.slot?.startsWith("r") && options?.normalize !== false && options?.normalize !== "typebox") this.#decodeMirror = this.#setupCodecMirror(this.schema, options, frozen, "decode");
-		if (this.hasCodec && !this.#isForm && !this.#noValidate && options?.slot?.startsWith("r") && options?.normalize !== false && options?.normalize !== "typebox") this.#encodeMirror = this.#setupCodecMirror(this.schema, options, frozen, "encode");
+		if (this.hasCodec && !this.#isForm && !this.#noValidate && options?.normalize !== false && options?.normalize !== "typebox") if (options?.slot?.startsWith("r")) this.#encodeMirror = this.#setupCodecMirror(this.schema, options, frozen, "encode");
+		else this.#decodeMirror = this.#setupCodecMirror(this.schema, options, frozen, "decode");
 		if (!this.#noValidate) this.#findCustomError = buildFindCustomError(this.schema, frozen);
 		if (options?.aot && options.slot && Capture.isCapturing() && captureImpl) captureImpl.captureBridgeFree(options.aot, options.slot, rawSchema);
 	}
 	#error(value, type, errors) {
 		return new ValidationError(type, value, errors ?? (() => this.Errors(value)), this.schema, this.#findCustomError);
 	}
-	#validate(value) {
-		if (!this.#refinements) return this.Check(value) ? void 0 : [];
+	#validate(value, countHit = true) {
+		if (!this.#refinements) return (countHit ? this.Check(value) : this.#check(value, false)) ? void 0 : [];
 		const pool = this.#refineScratch ??= freshRefineValidation(this.#refinements);
 		const usingPool = !pool.active;
 		const validation = usingPool ? pool : freshRefineValidation(this.#refinements);
@@ -349,7 +420,7 @@ var TypeBoxValidator = class extends Validator$1 {
 		validation.replay = false;
 		activeRefineValidation = validation;
 		try {
-			if (this.Check(value)) return;
+			if (countHit ? this.Check(value) : this.#check(value, false)) return;
 			validation.replay = true;
 			validation.replayEpoch++;
 			return this.Errors(value);
@@ -358,33 +429,6 @@ var TypeBoxValidator = class extends Validator$1 {
 			if (usingPool) pool.active = false;
 		}
 	}
-	#setupMirror(schema, options, frozen) {
-		if (schemaHasDangerousProperties(this.schema)) return (value) => Clean(this.schema, value);
-		const aot = options?.aot;
-		const slot = options?.slot;
-		if (aot && slot && frozen?.m) {
-			const m = frozen.m;
-			let clean;
-			return (value) => {
-				if (clean === void 0) try {
-					clean = reconstruct().instantiateFrozenMirror(m, schema);
-				} catch (error) {
-					console.warn("Failed to create exactMirror. Please report the following code to https://github.com/elysiajs/elysia/issues");
-					console.warn(schema);
-					console.warn(error);
-					clean = (v) => v;
-				}
-				return clean(value);
-			};
-		}
-		if (aot && slot && Capture.isCapturing() && captureImpl) captureImpl.captureMirror(schema, aot, slot, options?.sanitize);
-		const createMirror = getExactMirror();
-		if (!createMirror) return (value) => Clean(this.schema, value);
-		return createMirror(schema, {
-			Compile,
-			sanitize: options?.sanitize
-		});
-	}
 	#setupCodecMirror(schema, options, frozen, dir) {
 		if (schemaHasDangerousProperties(this.schema)) return;
 		const aot = options?.aot;
@@ -415,14 +459,17 @@ var TypeBoxValidator = class extends Validator$1 {
 		if (!createMirror) return;
 		try {
 			return createMirror(schema, {
-				Compile,
+				Compile: SchemaCompile,
 				sanitize: options?.sanitize,
 				...dirOpt
 			});
 		} catch {}
 	}
 	Check(value) {
-		this.#tick();
+		return this.#check(value, true);
+	}
+	#check(value, countHit) {
+		if (countHit) this.#tick();
 		const pool = this.#refineScratch;
 		if (pool?.active && this.#refinements) {
 			if (pool.checking) {
@@ -455,51 +502,32 @@ var TypeBoxValidator = class extends Validator$1 {
 	* Promote a deferred validator to the compiled `Check` fast path
 	*/
 	#materialize() {
-		const tb = Compile(this.schema);
+		const tb = SchemaCompile(this.schema);
 		this.tb = tb;
-		this.#dropCompiledSource();
+		dropCompiledSource(tb);
 		this.#deferred = false;
 	}
-	#reconstruct(options, frozen) {
-		if (!options?.aot || !options.slot || options.normalize === "typebox") return false;
-		if (!frozen?.c && !frozen?.cm) return false;
-		this.isAsync = frozen.a === 1;
-		this.hasDefault = frozen.d === 1;
-		this.hasCodec = frozen.k === 1;
-		return true;
-	}
-	#dropCompiledSource() {
-		const tb = this.tb;
-		if (!tb) return;
-		if (tb.evaluateResult) tb.evaluateResult.code = void 0;
-		if (tb.buildResult) tb.buildResult.functions = void 0;
-	}
 	Errors(value) {
 		return Errors(this.schema, value);
 	}
 	Decode(value) {
-		return Decode$1(this.schema, value);
+		return Decode(this.schema, value);
 	}
 	Encode(value) {
 		return this.hasCodec ? Encode(this.schema, value) : value;
 	}
 	EncodeFrom(value, type) {
 		this.#tick();
-		if (this.#isForm) {
-			const errors = this.#noValidate ? void 0 : this.#validate(value);
-			if (errors) throw this.#error(value, type, errors.length ? errors : void 0);
-			return value;
-		}
-		if (!this.hasCodec) {
-			const errors = this.#noValidate ? void 0 : this.#validate(value);
+		if (this.#isForm || !this.hasCodec) {
+			const errors = this.#noValidate ? void 0 : this.#validate(value, false);
 			if (errors) throw this.#error(value, type, errors.length ? errors : void 0);
-			if (this.Clean) value = this.Clean(value);
+			if (this.Clean && !this.#isForm) value = this.Clean(value);
 			return value;
 		}
 		try {
 			if (this.#encodeMirror) {
 				const out = this.#encodeMirror(value);
-				const errors = this.#noValidate ? void 0 : this.#validate(out);
+				const errors = this.#noValidate ? void 0 : this.#validate(out, false);
 				if (errors) throw new ValidationError(type, out, errors.length ? errors : () => this.Errors(out), this.schema);
 				return out;
 			}
@@ -507,12 +535,15 @@ var TypeBoxValidator = class extends Validator$1 {
 			return this.Clean ? this.Clean(out) : out;
 		} catch (e) {
 			if (this.#noValidate) return this.Clean ? this.Clean(value) : value;
-			if (e instanceof ValidationError) throw e;
-			if (e?.error) throw e.error;
-			if (e?.status) throw e;
-			throw new ValidationError(type, value, () => this.Errors(value), this.schema);
+			this.#rethrow(e, value, type);
 		}
 	}
+	#rethrow(e, value, type) {
+		if (e instanceof ValidationError) throw e;
+		if (e?.error) throw e.error;
+		if (e?.status) throw e;
+		throw new ValidationError(type, value, () => this.Errors(value), this.schema);
+	}
 	#markForm(value) {
 		if (this.#isForm && value !== null && typeof value === "object") {
 			const previous = Object.getPrototypeOf(value);
@@ -539,6 +570,15 @@ var TypeBoxValidator = class extends Validator$1 {
 		if (Array.isArray(value)) return value;
 		return applyPrecomputed(defaults.objectTemplate, value);
 	}
+	#applyDefault(value) {
+		const defaults = this.#defaultFastPath;
+		if (defaults) {
+			if (value === void 0 || value === null && defaults.appliesToNull) return this.#cloneSharedDefault();
+			if (value !== null && typeof value === "object" && (defaults.merge !== void 0 || defaults.objectTemplate !== void 0)) return this.#applyPrecomputedObjectDefault(value);
+			return value;
+		}
+		return Default(this.schema, value);
+	}
 	optionalBypass(value) {
 		const schema = this.schema;
 		if (!schema?.["~optional"]) return;
@@ -552,13 +592,7 @@ var TypeBoxValidator = class extends Validator$1 {
 		};
 	}
 	async FromAsync(value, type) {
-		if (this.hasDefault) {
-			const defaults = this.#defaultFastPath;
-			if (defaults) {
-				if (value === void 0 || value === null && defaults.appliesToNull) value = this.#cloneSharedDefault();
-				else if (value !== null && typeof value === "object" && (defaults.merge !== void 0 || defaults.objectTemplate !== void 0)) value = this.#applyPrecomputedObjectDefault(value);
-			} else value = Default(this.schema, value);
-		}
+		if (this.hasDefault) value = this.#applyDefault(value);
 		if (this.#hasOptional) {
 			const bypass = this.optionalBypass(value);
 			if (bypass) return bypass.value;
@@ -566,29 +600,7 @@ var TypeBoxValidator = class extends Validator$1 {
 		const markedValue = value;
 		const marked = this.#isForm ? this.#markForm(value) : void 0;
 		try {
-			if (this.hasCodec) {
-				if (!this.#noValidate) {
-					collectFileTypeChecks();
-					let errors;
-					let pendingFile;
-					try {
-						errors = this.#validate(value);
-					} finally {
-						pendingFile = takeFileTypeChecks();
-					}
-					if (errors) throw this.#error(value, type, errors.length ? errors : void 0);
-					if (pendingFile) await enforceFileTypeChecks(pendingFile, type, value, this.schema);
-				}
-				if (this.#decodeMirror) value = this.#decodeMirror(value);
-				else try {
-					value = DecodeUnsafe(nullObject(), this.schema, value);
-				} catch (e) {
-					if (e instanceof ValidationError) throw e;
-					if (e?.error) throw e.error;
-					if (e?.status) throw e;
-					throw new ValidationError(type, value, () => this.Errors(value), this.schema);
-				}
-			} else if (!this.#noValidate) {
+			if (!this.#noValidate) {
 				collectFileTypeChecks();
 				let errors;
 				let pendingFile;
@@ -600,6 +612,12 @@ var TypeBoxValidator = class extends Validator$1 {
 				if (errors) throw this.#error(value, type, errors.length ? errors : void 0);
 				if (pendingFile) await enforceFileTypeChecks(pendingFile, type, value, this.schema);
 			}
+			if (this.hasCodec) if (this.#decodeMirror) value = this.#decodeMirror(value);
+			else try {
+				value = DecodeUnsafe(nullObject(), this.schema, value);
+			} catch (e) {
+				this.#rethrow(e, value, type);
+			}
 			if (this.Clean && !this.#decodeMirror && !this.#cleanRedundant) value = this.Clean(value);
 			return value;
 		} finally {
@@ -607,13 +625,7 @@ var TypeBoxValidator = class extends Validator$1 {
 		}
 	}
 	FromSync(value, type) {
-		if (this.hasDefault) {
-			const defaults = this.#defaultFastPath;
-			if (defaults) {
-				if (value === void 0 || value === null && defaults.appliesToNull) value = this.#cloneSharedDefault();
-				else if (value !== null && typeof value === "object" && (defaults.merge !== void 0 || defaults.objectTemplate !== void 0)) value = this.#applyPrecomputedObjectDefault(value);
-			} else value = Default(this.schema, value);
-		}
+		if (this.hasDefault) value = this.#applyDefault(value);
 		if (this.#hasOptional) {
 			const bypass = this.optionalBypass(value);
 			if (bypass) return bypass.value;
@@ -621,21 +633,13 @@ var TypeBoxValidator = class extends Validator$1 {
 		const markedValue = value;
 		const marked = this.#isForm ? this.#markForm(value) : void 0;
 		try {
-			if (this.hasCodec) {
-				const errors = this.#noValidate ? void 0 : this.#validate(value);
-				if (errors) throw this.#error(value, type, errors.length ? errors : void 0);
-				if (this.#decodeMirror) value = this.#decodeMirror(value);
-				else try {
-					value = DecodeUnsafe(nullObject(), this.schema, value);
-				} catch (e) {
-					if (e instanceof ValidationError) throw e;
-					if (e?.error) throw e.error;
-					if (e?.status) throw e;
-					throw new ValidationError(type, value, () => this.Errors(value), this.schema);
-				}
-			} else {
-				const errors = this.#noValidate ? void 0 : this.#validate(value);
-				if (errors) throw this.#error(value, type, errors.length ? errors : void 0);
+			const errors = this.#noValidate ? void 0 : this.#validate(value);
+			if (errors) throw this.#error(value, type, errors.length ? errors : void 0);
+			if (this.hasCodec) if (this.#decodeMirror) value = this.#decodeMirror(value);
+			else try {
+				value = DecodeUnsafe(nullObject(), this.schema, value);
+			} catch (e) {
+				this.#rethrow(e, value, type);
 			}
 			if (this.Clean && !this.#decodeMirror && !this.#cleanRedundant) value = this.Clean(value);
 			return value;

package/dist/type/validator/string-codec-aot.d.ts

@@ -3,6 +3,7 @@ import { CapturedValidator } from "../../compile/aot.js";
 import { TSchema } from "typebox/type";
 
 //#region src/type/validator/string-codec-aot.d.ts
+declare function compileWithBuild(schema: TSchema): any;
 declare function captureStringCodecEntries(schema: TSchema, sanitize: ValidatorOptions['sanitize']): CapturedValidator['innerCodecs'] | undefined;
 //#endregion
-export { captureStringCodecEntries };
+export { captureStringCodecEntries, compileWithBuild };

package/dist/type/validator/string-codec-aot.js

@@ -9,6 +9,11 @@ const require_type_validator_exact_mirror = require('./exact-mirror.js');
 let typebox_schema = require("typebox/schema");
 
 //#region src/type/validator/string-codec-aot.ts
+function compileWithBuild(schema) {
+	const v = (0, typebox_schema.Compile)(schema);
+	v.buildResult ??= (0, typebox_schema.Build)(schema);
+	return v;
+}
 function captureInnerCodec(inner, open, sanitize) {
 	if (require_type_validator_clean_safe.schemaHasDangerousProperties(inner)) return;
 	const createMirror = require_type_validator_exact_mirror.getExactMirror();
@@ -23,7 +28,7 @@ function captureInnerCodec(inner, open, sanitize) {
 	let decode;
 	try {
 		const emitted = createMirror(inner, {
-			Compile: typebox_schema.Compile,
+			Compile: compileWithBuild,
 			sanitize,
 			decode: true,
 			emit: true
@@ -65,4 +70,5 @@ function captureStringCodecEntries(schema, sanitize) {
 }
 
 //#endregion
-exports.captureStringCodecEntries = captureStringCodecEntries;
+exports.captureStringCodecEntries = captureStringCodecEntries;
+exports.compileWithBuild = compileWithBuild;

package/dist/type/validator/string-codec-aot.mjs

@@ -7,6 +7,11 @@ import { getExactMirror } from "./exact-mirror.mjs";
 import { Build, Compile } from "typebox/schema";
 
 //#region src/type/validator/string-codec-aot.ts
+function compileWithBuild(schema) {
+	const v = Compile(schema);
+	v.buildResult ??= Build(schema);
+	return v;
+}
 function captureInnerCodec(inner, open, sanitize) {
 	if (schemaHasDangerousProperties(inner)) return;
 	const createMirror = getExactMirror();
@@ -21,7 +26,7 @@ function captureInnerCodec(inner, open, sanitize) {
 	let decode;
 	try {
 		const emitted = createMirror(inner, {
-			Compile,
+			Compile: compileWithBuild,
 			sanitize,
 			decode: true,
 			emit: true
@@ -63,4 +68,4 @@ function captureStringCodecEntries(schema, sanitize) {
 }
 
 //#endregion
-export { captureStringCodecEntries };
+export { captureStringCodecEntries, compileWithBuild };

package/dist/type/validator/validator-cache.d.ts

@@ -11,16 +11,17 @@ interface SchemaMeta {
   key: string | undefined;
 }
 declare function fnKey(fn: Function): string;
-declare const schemaCacheKey: (schema: TSchema) => string | undefined;
+declare function computeSchemaMeta(schema: TSchema, forceKey: boolean): SchemaMeta;
 declare const mayHaveFileType: (schema: object) => boolean;
+type Coercions = CoerceOption[] | {};
 declare class TypeBoxValidatorCache {
   #private;
   private static EMPTY;
   static meta(schema: TSchema): SchemaMeta;
   constructor(gcTime?: number);
-  get(schema: TSchema, coercions?: CoerceOption[] | typeof TypeBoxValidatorCache.EMPTY, normalize?: string, models?: object): Validator<_$typebox_schema0.XSchema, unknown> | undefined;
-  set(schema: TSchema, coercions?: CoerceOption[] | typeof TypeBoxValidatorCache.EMPTY, validator?: Validator, normalize?: string, models?: object): void;
+  get(schema: TSchema, coercions?: Coercions, normalize?: string, models?: object): Validator<_$typebox_schema0.XSchema, unknown> | undefined;
+  set(schema: TSchema, coercions?: Coercions, validator?: Validator, normalize?: string, models?: object): void;
   clear(): void;
 }
 //#endregion
-export { SchemaMeta, TypeBoxValidatorCache, fnKey, mayHaveFileType, schemaCacheKey };
+export { SchemaMeta, TypeBoxValidatorCache, computeSchemaMeta, fnKey, mayHaveFileType };