elysia 2.0.0-beta.21 → 2.0.0-beta.22

package/dist/type/elysia/form.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { isElysiaForm } from "../../utils.mjs";
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { Decode, Refine, Unsafe } from "../typebox-type.mjs";

package/dist/type/elysia/integer-string.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { pureRefine } from "../shared.mjs";
 import { Refine } from "../typebox-type.mjs";

package/dist/type/elysia/integer.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { primitive } from "./number.mjs";
 
 //#region src/type/elysia/integer.ts

package/dist/type/elysia/intersect.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { noEnumerable } from "../constants.mjs";
 
 //#region src/type/elysia/intersect.ts

package/dist/type/elysia/json-string.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { Check, Compile, Decode } from "../bridge.mjs";
 import { dropCompiledSource } from "../shared.mjs";
 import { Decode as Decode$1, Refine } from "../typebox-type.mjs";

package/dist/type/elysia/keep-config.js

@@ -3,16 +3,16 @@ const require_utils = require('../../utils.js');
 const require_type_typebox_type = require('../typebox-type.js');
 
 //#region src/type/elysia/keep-config.ts
-const carries = (schema, field = false, seen = /* @__PURE__ */ new Set()) => {
+const mayCarryCookieConfig = (schema, isProperty = false, seen = /* @__PURE__ */ new Set()) => {
 	if (!schema || typeof schema !== "object" || seen.has(schema)) return false;
 	seen.add(schema);
-	if (schema.config !== void 0 || schema.$ref !== void 0 || schema["~kind"] === "Deferred" || require_utils.compositionKeys.some((key) => Array.isArray(schema[key]) && schema[key].some((member) => carries(member, field, seen)))) return true;
-	if (!field) {
-		for (const name in schema.properties) if (carries(schema.properties[name], true)) return true;
+	if (schema.config !== void 0 || schema.$ref !== void 0 || schema["~kind"] === "Deferred" || require_utils.compositionKeys.some((key) => Array.isArray(schema[key]) && schema[key].some((member) => mayCarryCookieConfig(member, isProperty, seen)))) return true;
+	if (!isProperty) {
+		for (const name in schema.properties) if (mayCarryCookieConfig(schema.properties[name], true)) return true;
 	}
 	return false;
 };
-const from = (schema, sources) => Object.defineProperty(Object.create(Object.getPrototypeOf(schema), Object.getOwnPropertyDescriptors(schema)), "~cookieFrom", {
+const withSources = (schema, sources) => Object.defineProperty(Object.create(Object.getPrototypeOf(schema), Object.getOwnPropertyDescriptors(schema)), "~cookieFrom", {
 	value: sources,
 	writable: true,
 	configurable: true
@@ -20,13 +20,13 @@ const from = (schema, sources) => Object.defineProperty(Object.create(Object.get
 const keep = (build, sourcesOf) => ((...args) => {
 	const sources = sourcesOf(...args);
 	const result = build(...args);
-	if (!sources.some((source) => carries(source))) return result;
-	const built = from(result, sources);
+	if (!sources.some((source) => mayCarryCookieConfig(source))) return result;
+	const built = withSources(result, sources);
 	const ref = built.$ref;
 	const replaced = sources[0]?.$defs?.[ref];
 	if (replaced && built.$defs?.[ref] && built.$defs[ref] !== replaced) built.$defs = {
 		...built.$defs,
-		[ref]: from(built.$defs[ref], [replaced])
+		[ref]: withSources(built.$defs[ref], [replaced])
 	};
 	return built;
 });

package/dist/type/elysia/keep-config.mjs

@@ -1,17 +1,18 @@
+// @bun
 import { compositionKeys } from "../../utils.mjs";
 import { Composite, Evaluate, Interface, Mapped, Omit, Partial, Pick, ReadonlyObject, Required } from "../typebox-type.mjs";
 
 //#region src/type/elysia/keep-config.ts
-const carries = (schema, field = false, seen = /* @__PURE__ */ new Set()) => {
+const mayCarryCookieConfig = (schema, isProperty = false, seen = /* @__PURE__ */ new Set()) => {
 	if (!schema || typeof schema !== "object" || seen.has(schema)) return false;
 	seen.add(schema);
-	if (schema.config !== void 0 || schema.$ref !== void 0 || schema["~kind"] === "Deferred" || compositionKeys.some((key) => Array.isArray(schema[key]) && schema[key].some((member) => carries(member, field, seen)))) return true;
-	if (!field) {
-		for (const name in schema.properties) if (carries(schema.properties[name], true)) return true;
+	if (schema.config !== void 0 || schema.$ref !== void 0 || schema["~kind"] === "Deferred" || compositionKeys.some((key) => Array.isArray(schema[key]) && schema[key].some((member) => mayCarryCookieConfig(member, isProperty, seen)))) return true;
+	if (!isProperty) {
+		for (const name in schema.properties) if (mayCarryCookieConfig(schema.properties[name], true)) return true;
 	}
 	return false;
 };
-const from = (schema, sources) => Object.defineProperty(Object.create(Object.getPrototypeOf(schema), Object.getOwnPropertyDescriptors(schema)), "~cookieFrom", {
+const withSources = (schema, sources) => Object.defineProperty(Object.create(Object.getPrototypeOf(schema), Object.getOwnPropertyDescriptors(schema)), "~cookieFrom", {
 	value: sources,
 	writable: true,
 	configurable: true
@@ -19,13 +20,13 @@ const from = (schema, sources) => Object.defineProperty(Object.create(Object.get
 const keep = (build, sourcesOf) => ((...args) => {
 	const sources = sourcesOf(...args);
 	const result = build(...args);
-	if (!sources.some((source) => carries(source))) return result;
-	const built = from(result, sources);
+	if (!sources.some((source) => mayCarryCookieConfig(source))) return result;
+	const built = withSources(result, sources);
 	const ref = built.$ref;
 	const replaced = sources[0]?.$defs?.[ref];
 	if (replaced && built.$defs?.[ref] && built.$defs[ref] !== replaced) built.$defs = {
 		...built.$defs,
-		[ref]: from(built.$defs[ref], [replaced])
+		[ref]: withSources(built.$defs[ref], [replaced])
 	};
 	return built;
 });

package/dist/type/elysia/maybe-empty.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { Null, Undefined } from "../typebox-type.mjs";
 import { Union } from "./union.mjs";

package/dist/type/elysia/no-validate.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { elyType } from "./utils.mjs";
 

package/dist/type/elysia/nullable.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { Null } from "../typebox-type.mjs";
 import { Union } from "./union.mjs";

package/dist/type/elysia/number.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { isEmpty } from "../../utils.mjs";
 import { noEnumerable } from "../constants.mjs";
 

package/dist/type/elysia/numeric-enum.d.ts

@@ -1,11 +1,13 @@
-import { TSchemaOptions } from "typebox";
+import { TSchemaOptions, Type } from "typebox";
 
 //#region src/type/elysia/numeric-enum.d.ts
 type AssertNumericEnum<T extends Record<string, string | number>> = { [K in keyof T]: K extends number ? string : K extends `${number}` ? string : K extends string ? number : never };
+type NumericEnumValue<T> = Extract<T[keyof T], number>;
+type NumericEnumSchema<T> = Type.TCodec<Type.TRefine<Type.TUnsafe<NumericEnumValue<T> | `${NumericEnumValue<T>}`>>, NumericEnumValue<T>>;
 /**
  * Numeric enum: accepts a numeric string or a number, decodes to the
  * matching enum value.
  */
-declare function NumericEnum<T extends AssertNumericEnum<T>>(item: T, property?: TSchemaOptions): any;
+declare function NumericEnum<T extends AssertNumericEnum<T>>(item: T, property?: TSchemaOptions): Readonly<NumericEnumSchema<T>>;
 //#endregion
 export { AssertNumericEnum, NumericEnum };

package/dist/type/elysia/numeric-enum.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { Decode, Refine } from "../typebox-type.mjs";
 import { StringType } from "./string.mjs";

package/dist/type/elysia/numeric.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { isEmpty } from "../../utils.mjs";
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { pureRefine } from "../shared.mjs";

package/dist/type/elysia/object-string.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { nullObject } from "../../utils.mjs";
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { jsonString } from "./json-string.mjs";

package/dist/type/elysia/object.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { isEmpty } from "../../utils.mjs";
 
 //#region src/type/elysia/object.ts

package/dist/type/elysia/optional.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { copyNonEnumerable } from "../shared.mjs";
 
 //#region src/type/elysia/optional.ts

package/dist/type/elysia/problem.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { StringType } from "./string.mjs";
 import { ObjectType } from "./object.mjs";
 import { Integer } from "./integer.mjs";

package/dist/type/elysia/string.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { evictOldestHalf } from "../../utils.mjs";
 import { noEnumerable } from "../constants.mjs";
 import { SHARED_REFERENCE_CACHE_LIMIT, referenceCache } from "../shared.mjs";

package/dist/type/elysia/uint8-array.d.ts

@@ -1,6 +1,7 @@
 import { ArrayBufferOptions } from "../types.js";
+import * as _$typebox from "typebox";
 
 //#region src/type/elysia/uint8-array.d.ts
-declare const Uint8ArrayType: (property?: ArrayBufferOptions) => any;
+declare const Uint8ArrayType: (property?: ArrayBufferOptions) => Readonly<_$typebox.TCodec<_$typebox.TRefine<_$typebox.TUnsafe<Uint8Array<ArrayBufferLike>>>, Uint8Array<ArrayBufferLike>>>;
 //#endregion
 export { Uint8ArrayType };

package/dist/type/elysia/uint8-array.js

@@ -4,8 +4,8 @@ const require_type_typebox_type = require('../typebox-type.js');
 const require_type_elysia_array_buffer = require('./array-buffer.js');
 
 //#region src/type/elysia/uint8-array.ts
-const isUint8Array = (value) => value instanceof Uint8Array || value instanceof ArrayBuffer;
-const uint8Array = /* @__PURE__ */ require_type_elysia_array_buffer.bufferType(require_type_constants.ELYSIA_TYPES.Uint8Array, () => require_type_typebox_type.Codec(require_type_typebox_type.Refine(require_type_typebox_type.Unsafe({ "~kind": "Uint8Array" }), isUint8Array, () => "must be Uint8Array")).Decode((value) => value instanceof Uint8Array ? value : new Uint8Array(value)).Encode((value) => value));
+const isUint8ArrayOrArrayBuffer = (value) => value instanceof Uint8Array || value instanceof ArrayBuffer;
+const uint8Array = /* @__PURE__ */ require_type_elysia_array_buffer.bufferType(require_type_constants.ELYSIA_TYPES.Uint8Array, () => require_type_typebox_type.Codec(require_type_typebox_type.Refine(require_type_typebox_type.Unsafe({ "~kind": "Uint8Array" }), isUint8ArrayOrArrayBuffer, () => "must be Uint8Array")).Decode((value) => value instanceof Uint8Array ? value : new Uint8Array(value)).Encode((value) => value));
 const Uint8ArrayType = (property) => uint8Array(property);
 
 //#endregion

package/dist/type/elysia/uint8-array.mjs

@@ -1,10 +1,11 @@
+// @bun
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { Codec, Refine, Unsafe } from "../typebox-type.mjs";
 import { bufferType } from "./array-buffer.mjs";
 
 //#region src/type/elysia/uint8-array.ts
-const isUint8Array = (value) => value instanceof Uint8Array || value instanceof ArrayBuffer;
-const uint8Array = /* @__PURE__ */ bufferType(ELYSIA_TYPES.Uint8Array, () => Codec(Refine(Unsafe({ "~kind": "Uint8Array" }), isUint8Array, () => "must be Uint8Array")).Decode((value) => value instanceof Uint8Array ? value : new Uint8Array(value)).Encode((value) => value));
+const isUint8ArrayOrArrayBuffer = (value) => value instanceof Uint8Array || value instanceof ArrayBuffer;
+const uint8Array = /* @__PURE__ */ bufferType(ELYSIA_TYPES.Uint8Array, () => Codec(Refine(Unsafe({ "~kind": "Uint8Array" }), isUint8ArrayOrArrayBuffer, () => "must be Uint8Array")).Decode((value) => value instanceof Uint8Array ? value : new Uint8Array(value)).Encode((value) => value));
 const Uint8ArrayType = (property) => uint8Array(property);
 
 //#endregion

package/dist/type/elysia/union-enum.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { Unsafe } from "../typebox-type.mjs";
 import { elyType } from "./utils.mjs";

package/dist/type/elysia/union.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { noEnumerable } from "../constants.mjs";
 
 //#region src/type/elysia/union.ts

package/dist/type/elysia/utils.js

@@ -25,9 +25,9 @@ function createSharedReference(createType) {
 		const hash = propertyChecksum(property);
 		if (hash[1]) return createType(property);
 		const h = hash[0];
-		const canonicalKey = JSON.stringify(property);
+		const serialized = JSON.stringify(property);
 		const bucket = shared.get(h);
-		if (bucket?.key === canonicalKey) {
+		if (bucket?.key === serialized) {
 			if (shared.size >= 1024) {
 				shared.delete(h);
 				shared.set(h, bucket);
@@ -37,7 +37,7 @@ function createSharedReference(createType) {
 		const schema = Object.freeze(createType(property));
 		if (!bucket && shared.size >= 1024) require_utils.evictOldestHalf(shared);
 		shared.set(h, {
-			key: canonicalKey,
+			key: serialized,
 			schema
 		});
 		return schema;

package/dist/type/elysia/utils.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { evictOldestHalf, fnv1a } from "../../utils.mjs";
 import { SHARED_REFERENCE_CACHE_LIMIT, copyNonEnumerable, referenceCache } from "../shared.mjs";
 import { Refine } from "../typebox-type.mjs";
@@ -24,9 +25,9 @@ function createSharedReference(createType) {
 		const hash = propertyChecksum(property);
 		if (hash[1]) return createType(property);
 		const h = hash[0];
-		const canonicalKey = JSON.stringify(property);
+		const serialized = JSON.stringify(property);
 		const bucket = shared.get(h);
-		if (bucket?.key === canonicalKey) {
+		if (bucket?.key === serialized) {
 			if (shared.size >= 1024) {
 				shared.delete(h);
 				shared.set(h, bucket);
@@ -36,7 +37,7 @@ function createSharedReference(createType) {
 		const schema = Object.freeze(createType(property));
 		if (!bucket && shared.size >= 1024) evictOldestHalf(shared);
 		shared.set(h, {
-			key: canonicalKey,
+			key: serialized,
 			schema
 		});
 		return schema;

package/dist/type/exports.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { injectTypeboxType } from "./typebox-type.mjs";
 import { ArrayType } from "./elysia/array.mjs";
 import { StringType } from "./elysia/string.mjs";

package/dist/type/index.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { loadTypeNamespace, markTypeUsed } from "./typebox-type.mjs";
 import { ArrayType } from "./elysia/array.mjs";
 import { StringType } from "./elysia/string.mjs";
@@ -113,7 +114,7 @@ const t = lazyNamespace(() => loadTypeNamespace().type, {
 * `typebox/system` is a subgraph of `typebox/type`, so a static re-export here
 * would pin ~231 KB of the deferral back into the eager graph. The proxy also
 * guarantees Elysia's own `Settings` default lands BEFORE the namespace is
-* handed out, keeping a user's explicit `TypeSystem.Settings.Set(...)` last —
+* handed out, keeping a user's explicit `TypeSystem.Settings.Set(...)` last \u2014
 * the ordering the eager `setupTypebox()` used to provide
 */
 const TypeSystem = lazyNamespace(() => typeSystem(loadTypeNamespace().system), Object.create(null));

package/dist/type/shared.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { noEnumerable } from "./constants.mjs";
 
 //#region src/type/shared.ts

package/dist/type/sync-require.mjs

@@ -1,3 +1,4 @@
+// @bun
 //#region src/type/sync-require.ts
 /**
 * Synchronous `require` resolving from the CALLER's module: pass its own

package/dist/type/typebox-system-lite.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { Arguments, Environment, Hashing, Memory, Settings } from "typebox/system";
 
 export { Arguments, Environment, Hashing, Memory, Settings };

package/dist/type/typebox-system-require.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { syncRequire } from "./sync-require.mjs";
 
 //#region src/type/typebox-system-require.ts

package/dist/type/typebox-type-live.mjs

@@ -1,3 +1,4 @@
+// @bun
 import * as type from "typebox/type";
 import { Codec, Composite, Decode, Evaluate, Interface, Intersect, Mapped, Module, Null, Omit, Partial, Pick, ReadonlyObject, Ref, Refine, Required, Undefined, Unsafe } from "typebox/type";
 import * as system from "./typebox-system-lite.mjs";

package/dist/type/typebox-value-live.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { Build, Compile as SchemaCompile } from "typebox/schema";
 import { Check, Clean, Clone, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec } from "typebox/value";
 import { Compile } from "typebox/compile";

package/dist/type/typebox-value-ops.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { Build, Compile as SchemaCompile } from "typebox/schema";
 import { Check, Clean, Clone, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec } from "typebox/value";
 import { Compile } from "typebox/compile";

package/dist/type/typebox-value.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { syncRequire } from "./sync-require.mjs";
 import { injectTypeboxType, isTypeNamespaceLoaded, isTypeUsed, loadTypeNamespace } from "./typebox-type.mjs";
 import { importTypebox, requireTypebox } from "./typebox-value-require.mjs";

package/dist/type/types.d.ts

@@ -1,5 +1,5 @@
-import { ELYSIA_TYPES } from "./constants.js";
 import { CookieOptions } from "../cookie/types.js";
+import { ELYSIA_TYPES } from "./constants.js";
 import { TObjectOptions, TSchemaOptions } from "typebox";
 import { TLocalizedValidationError } from "typebox/error";
 

package/dist/type/types.mjs

@@ -1 +1,2 @@
+// @bun
 export {  };

package/dist/type/utils.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { ELYSIA_TYPES, primitiveElysiaTypes } from "./constants.mjs";
 import { schemaSome } from "./validator/clean-safe.mjs";
 

package/dist/type/validator/clean-safe.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { dangerousKeys } from "../../constants.mjs";
 
 //#region src/type/validator/clean-safe.ts

package/dist/type/validator/custom-error.js

@@ -1,6 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_utils = require('../../utils.js');
-const require_error = require('../../error.js');
 const require_compile_aot = require('../../compile/aot.js');
 const require_type_typebox_value = require('../typebox-value.js');
 const require_type_validator_frozen_check = require('./frozen-check.js');
@@ -8,10 +7,10 @@ const require_type_validator_frozen_check = require('./frozen-check.js');
 //#region src/type/validator/custom-error.ts
 function encodePointer(segments) {
 	let out = "";
-	for (const s of segments) out += "/" + s.replace(/~/g, "~0").replace(/\//g, "~1");
+	for (const s of segments) out += "/" + (typeof s === "object" ? "[]" : String(s).replace(/~/g, "~0").replace(/\//g, "~1"));
 	return out;
 }
-function collectCustomErrorNodes(schema, segments, out, seen, union) {
+function collectCustomErrorNodes(schema, segments, out, seen, union, required) {
 	if (!schema || typeof schema !== "object") return out;
 	if (seen.has(schema)) return out;
 	seen.add(schema);
@@ -19,22 +18,16 @@ function collectCustomErrorNodes(schema, segments, out, seen, union) {
 		path: encodePointer(segments),
 		node: schema,
 		segments,
+		required,
 		union
 	});
-	if (schema.properties) for (const k in schema.properties) collectCustomErrorNodes(schema.properties[k], [...segments, k], out, seen, union);
-	const items = schema.items;
-	if (Array.isArray(items)) for (let i = 0; i < items.length; i++) collectCustomErrorNodes(items[i], [...segments, String(i)], out, seen, union);
-	else if (items && typeof items === "object") {
-		const inner = [];
-		collectCustomErrorNodes(items, [], inner, seen, union);
-		for (const child of inner) out.push({
-			path: encodePointer(segments) + "/[]" + child.path,
-			node: child.node,
-			segments,
-			each: { itemSegments: child.segments },
-			union: child.union
-		});
+	if (schema.properties) {
+		const keys = union?.segments !== segments && Array.isArray(schema.required) ? schema.required : void 0;
+		for (const k in schema.properties) collectCustomErrorNodes(schema.properties[k], [...segments, k], out, seen, union, keys?.includes(k));
 	}
+	const items = schema.items;
+	if (Array.isArray(items)) for (let i = 0; i < items.length; i++) collectCustomErrorNodes(items[i], [...segments, i], out, seen, union);
+	else if (items && typeof items === "object") collectCustomErrorNodes(items, [...segments, { items }], out, seen, union);
 	const branches = schema.anyOf ?? schema.oneOf;
 	if (Array.isArray(branches)) for (let i = 0; i < branches.length; i++) collectCustomErrorNodes(branches[i], segments, out, seen, {
 		node: schema,
@@ -77,26 +70,43 @@ function buildFindCustomError(schema, frozen) {
 	const nodes = collectCustomErrorNodes(schema, [], [], /* @__PURE__ */ new WeakSet());
 	if (!nodes.length) return;
 	const frozenByPath = frozen?.ce ? new Map(frozen.ce.map((e) => [e.p, e])) : void 0;
-	const unionCheckCache = /* @__PURE__ */ new WeakMap();
+	const checkCache = /* @__PURE__ */ new WeakMap();
 	const discriminatorCache = /* @__PURE__ */ new WeakMap();
-	const compileUnion = (node) => {
-		const cached = unionCheckCache.get(node);
+	const compileOnce = (node) => {
+		const cached = checkCache.get(node);
 		if (cached) return cached;
 		try {
 			const uc = require_type_typebox_value.SchemaCompile(node);
 			const fn = (v) => uc.Check(v);
-			unionCheckCache.set(node, fn);
+			checkCache.set(node, fn);
 			return fn;
 		} catch {
 			return;
 		}
 	};
+	let found;
+	const reach = (value, segments) => {
+		let current = value;
+		for (let i = 0; i < segments.length; i++) {
+			const s = segments[i];
+			if (current === null || typeof current !== "object" || Array.isArray(current) === (typeof s === "string")) return -1;
+			if (typeof s === "object") {
+				const check = compileOnce(s.items);
+				const at = check ? current.findIndex((x) => !check(x)) : -1;
+				if (at < 0) return -1;
+				current = current[at];
+			} else if (s in current) current = current[s];
+			else return i === segments.length - 1 ? 0 : -1;
+		}
+		found = current;
+		return 1;
+	};
 	const discriminatorsOf = (node, branches) => {
 		if (!discriminatorCache.has(node)) discriminatorCache.set(node, findDiscriminators(branches));
 		return discriminatorCache.get(node) ?? void 0;
 	};
 	const checks = [];
-	for (const { path, node, each, segments, union } of nodes) {
+	for (const { path, node, segments, required, union } of nodes) {
 		let check;
 		const fe = union ? void 0 : frozenByPath?.get(path);
 		if (fe) try {
@@ -107,23 +117,19 @@ function buildFindCustomError(schema, frozen) {
 			check = (v) => c.Check(v);
 		} catch {}
 		if (!check) continue;
-		if (each) {
-			const leafCheck = check;
-			const itemSegments = each.itemSegments;
-			check = (v) => !Array.isArray(v) || v.every((x) => leafCheck(require_error.subValueAt(x, itemSegments)));
-		}
 		let gate;
 		if (union) {
 			const branches = union.node.anyOf ?? union.node.oneOf ?? [];
 			const discriminators = discriminatorsOf(union.node, branches);
 			if (!discriminators) gate = () => true;
 			else {
-				const unionCheck = compileUnion(union.node);
+				const unionCheck = compileOnce(union.node);
 				if (!unionCheck) continue;
 				const unionSegments = union.segments;
 				const branchIndex = union.branchIndex;
 				gate = (root) => {
-					const unionValue = require_error.subValueAt(root, unionSegments);
+					if (reach(root, unionSegments) < 1) return true;
+					const unionValue = found;
 					if (unionCheck(unionValue)) return true;
 					if (unionValue === null || typeof unionValue !== "object") return true;
 					let matches = 0;
@@ -146,7 +152,7 @@ function buildFindCustomError(schema, frozen) {
 		}
 		checks.push({
 			segments,
-			each,
+			required,
 			check,
 			gate,
 			path,
@@ -154,11 +160,13 @@ function buildFindCustomError(schema, frozen) {
 		});
 	}
 	if (!checks.length) return;
-	checks.sort((a, b) => b.segments.length - a.segments.length || b.path.length - a.path.length);
+	checks.sort((a, b) => b.segments.length - a.segments.length);
 	return (value) => {
 		for (const c of checks) {
 			if (c.gate && c.gate(value)) continue;
-			if (!c.check(require_error.subValueAt(value, c.segments))) return {
+			const at = reach(value, c.segments);
+			if (at < 0 || !at && !c.required) continue;
+			if (!at || !c.check(found)) return {
 				instancePath: c.path,
 				error: c.error
 			};
@@ -169,8 +177,8 @@ function captureCustomErrors(schema) {
 	const ceNodes = collectCustomErrorNodes(schema, [], [], /* @__PURE__ */ new WeakSet());
 	if (!ceNodes.length) return;
 	const entries = [];
-	for (const { path, node, union, each } of ceNodes) {
-		if (union || each) continue;
+	for (const { path, node, union, segments } of ceNodes) {
+		if (union || segments.some((s) => typeof s === "object")) continue;
 		try {
 			const cf = require_type_validator_frozen_check.buildFrozenCheck(require_type_typebox_value.Build(node), node);
 			if (cf) entries.push({