elysia 2.0.0-beta.13 → 2.0.0-beta.15

package/dist/type/elysia/cookie.mjs

@@ -15,27 +15,18 @@ const COOKIE_OPTION_KEYS = [
 	"sign",
 	"legacySignature"
 ];
-function extractConfig(options) {
-	if (!options) return {
-		config: void 0,
-		rest: void 0
-	};
-	let config;
+const isSchema = (value) => !!value && typeof value === "object" && "~kind" in value;
+function Cookie(first, options) {
+	const raw = options;
+	let configRaw;
 	let rest;
-	for (const key in options) {
-		const value = options[key];
+	if (raw) for (const key in raw) {
+		const value = raw[key];
 		if (value === void 0) continue;
-		if (COOKIE_OPTION_KEYS.includes(key)) (config ??= {})[key] = value;
+		if (COOKIE_OPTION_KEYS.includes(key)) (configRaw ??= {})[key] = value;
 		else (rest ??= {})[key] = value;
 	}
-	return {
-		config,
-		rest
-	};
-}
-const isSchema = (value) => !!value && typeof value === "object" && "~kind" in value;
-function Cookie(first, options) {
-	const { config, rest } = extractConfig(options);
+	const config = configRaw;
 	if (isSchema(first)) {
 		if (!config) return first;
 		const target = Object.create(Object.getPrototypeOf(first), Object.getOwnPropertyDescriptors(first));

package/dist/type/elysia/date.js

@@ -10,12 +10,6 @@ const require_type_elysia_number = require('./number.js');
 //#region src/type/elysia/date.ts
 const ISO8601 = /T\d\d(?::\d\d){1,2} \d\d:\d\d$/;
 const removeTime = / (\d{2}:\d{2})$/;
-const toTimestamp = (value) => {
-	if (value instanceof Date) return value.getTime();
-	let t = new Date(value).getTime();
-	if (isNaN(t) && typeof value === "string" && /T\d{2}:\d{2}(:\d{2})? \d{2}:\d{2}$/.test(value)) t = new Date(value.replace(/ (\d{2}:\d{2})$/, "+$1")).getTime();
-	return t;
-};
 let StringifiedDate;
 let emptyDate;
 let sharedDate;
@@ -57,7 +51,12 @@ function DateWithProperty(options) {
 	if (minMessage || maxMessage || xMinMessage || xMaxMessage || stepMessage) {
 		let failed = "must be Date";
 		schema = require_type_typebox_type.Refine(schema, (value) => {
-			const t = toTimestamp(value);
+			let t;
+			if (value instanceof Date) t = value.getTime();
+			else {
+				t = new Date(value).getTime();
+				if (isNaN(t) && typeof value === "string" && /T\d{2}:\d{2}(:\d{2})? \d{2}:\d{2}$/.test(value)) t = new Date(value.replace(/ (\d{2}:\d{2})$/, "+$1")).getTime();
+			}
 			if (minMessage && t < min) {
 				failed = minMessage;
 				return false;

package/dist/type/elysia/date.mjs

@@ -9,12 +9,6 @@ import { NumberType } from "./number.mjs";
 //#region src/type/elysia/date.ts
 const ISO8601 = /T\d\d(?::\d\d){1,2} \d\d:\d\d$/;
 const removeTime = / (\d{2}:\d{2})$/;
-const toTimestamp = (value) => {
-	if (value instanceof Date) return value.getTime();
-	let t = new Date(value).getTime();
-	if (isNaN(t) && typeof value === "string" && /T\d{2}:\d{2}(:\d{2})? \d{2}:\d{2}$/.test(value)) t = new Date(value.replace(/ (\d{2}:\d{2})$/, "+$1")).getTime();
-	return t;
-};
 let StringifiedDate;
 let emptyDate;
 let sharedDate;
@@ -56,7 +50,12 @@ function DateWithProperty(options) {
 	if (minMessage || maxMessage || xMinMessage || xMaxMessage || stepMessage) {
 		let failed = "must be Date";
 		schema = Refine(schema, (value) => {
-			const t = toTimestamp(value);
+			let t;
+			if (value instanceof Date) t = value.getTime();
+			else {
+				t = new Date(value).getTime();
+				if (isNaN(t) && typeof value === "string" && /T\d{2}:\d{2}(:\d{2})? \d{2}:\d{2}$/.test(value)) t = new Date(value.replace(/ (\d{2}:\d{2})$/, "+$1")).getTime();
+			}
 			if (minMessage && t < min) {
 				failed = minMessage;
 				return false;

package/dist/type/elysia/numeric.js

@@ -37,14 +37,6 @@ function isDecimalString(value) {
 }
 let StringifiedNumber;
 let emptyNumeric;
-function passesConstraints(n, c) {
-	if (typeof c.minimum === "number" && n < c.minimum) return false;
-	if (typeof c.maximum === "number" && n > c.maximum) return false;
-	if (typeof c.exclusiveMinimum === "number" && n <= c.exclusiveMinimum) return false;
-	if (typeof c.exclusiveMaximum === "number" && n >= c.exclusiveMaximum) return false;
-	if (typeof c.multipleOf === "number" && n % c.multipleOf !== 0) return false;
-	return true;
-}
 function Numeric(property) {
 	StringifiedNumber ??= require_type_shared.pureRefine(require_type_typebox_type.Decode(require_type_typebox_type.Refine(require_type_elysia_string.StringType(), isDecimalString, () => "must be number"), (value) => +value));
 	if (!property || require_utils.isEmpty(property)) return emptyNumeric ??= Object.freeze(require_type_elysia_utils.elyType(require_type_constants.ELYSIA_TYPES.Numeric, require_type_elysia_union.Union([require_type_elysia_number.NumberType(), StringifiedNumber])));
@@ -52,7 +44,14 @@ function Numeric(property) {
 	const number = require_type_elysia_number.NumberType(constraints);
 	const stringified = require_type_typebox_type.Decode(require_type_typebox_type.Refine(require_type_elysia_string.StringType(), (value) => {
 		if (!isDecimalString(value)) return false;
-		return passesConstraints(+value, constraints);
+		const n = +value;
+		const c = constraints;
+		if (typeof c.minimum === "number" && n < c.minimum) return false;
+		if (typeof c.maximum === "number" && n > c.maximum) return false;
+		if (typeof c.exclusiveMinimum === "number" && n <= c.exclusiveMinimum) return false;
+		if (typeof c.exclusiveMaximum === "number" && n >= c.exclusiveMaximum) return false;
+		if (typeof c.multipleOf === "number" && n % c.multipleOf !== 0) return false;
+		return true;
 	}, () => "must be number"), (value) => +value);
 	require_type_shared.pureRefine(stringified);
 	return require_type_elysia_utils.elyType(require_type_constants.ELYSIA_TYPES.Numeric, require_type_elysia_union.Union([number, stringified], meta));

package/dist/type/elysia/numeric.mjs

@@ -36,14 +36,6 @@ function isDecimalString(value) {
 }
 let StringifiedNumber;
 let emptyNumeric;
-function passesConstraints(n, c) {
-	if (typeof c.minimum === "number" && n < c.minimum) return false;
-	if (typeof c.maximum === "number" && n > c.maximum) return false;
-	if (typeof c.exclusiveMinimum === "number" && n <= c.exclusiveMinimum) return false;
-	if (typeof c.exclusiveMaximum === "number" && n >= c.exclusiveMaximum) return false;
-	if (typeof c.multipleOf === "number" && n % c.multipleOf !== 0) return false;
-	return true;
-}
 function Numeric(property) {
 	StringifiedNumber ??= pureRefine(Decode(Refine(StringType(), isDecimalString, () => "must be number"), (value) => +value));
 	if (!property || isEmpty(property)) return emptyNumeric ??= Object.freeze(elyType(ELYSIA_TYPES.Numeric, Union([NumberType(), StringifiedNumber])));
@@ -51,7 +43,14 @@ function Numeric(property) {
 	const number = NumberType(constraints);
 	const stringified = Decode(Refine(StringType(), (value) => {
 		if (!isDecimalString(value)) return false;
-		return passesConstraints(+value, constraints);
+		const n = +value;
+		const c = constraints;
+		if (typeof c.minimum === "number" && n < c.minimum) return false;
+		if (typeof c.maximum === "number" && n > c.maximum) return false;
+		if (typeof c.exclusiveMinimum === "number" && n <= c.exclusiveMinimum) return false;
+		if (typeof c.exclusiveMaximum === "number" && n >= c.exclusiveMaximum) return false;
+		if (typeof c.multipleOf === "number" && n % c.multipleOf !== 0) return false;
+		return true;
 	}, () => "must be number"), (value) => +value);
 	pureRefine(stringified);
 	return elyType(ELYSIA_TYPES.Numeric, Union([number, stringified], meta));

package/dist/type/elysia/problem.d.ts

@@ -0,0 +1,20 @@
+import { TInteger, TObject, TObjectOptions, TOptional, TProperties, TString } from "typebox";
+
+//#region src/type/elysia/problem.d.ts
+interface TProblemBase {
+  type: TString;
+  code: TOptional<TString>;
+  title: TString;
+  status: TInteger;
+  detail: TOptional<TString>;
+  instance: TOptional<TString>;
+}
+/**
+ * RFC 9457 Problem Details schema. Extension members are spread last, so they
+ * may override a base member.
+ *
+ * @see https://www.rfc-editor.org/info/rfc9457
+ */
+declare const Problem: <T extends TProperties = {}>(extension?: T, options?: TObjectOptions) => TObject<Omit<TProblemBase, keyof T> & T>;
+//#endregion
+export { Problem };

package/dist/type/elysia/problem.js

@@ -0,0 +1,25 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_type_elysia_string = require('./string.js');
+const require_type_elysia_object = require('./object.js');
+const require_type_elysia_integer = require('./integer.js');
+const require_type_elysia_optional = require('./optional.js');
+
+//#region src/type/elysia/problem.ts
+/**
+* RFC 9457 Problem Details schema. Extension members are spread last, so they
+* may override a base member.
+*
+* @see https://www.rfc-editor.org/info/rfc9457
+*/
+const Problem = (extension, options) => require_type_elysia_object.ObjectType({
+	type: require_type_elysia_string.StringType(),
+	code: require_type_elysia_optional.Optional(require_type_elysia_string.StringType()),
+	title: require_type_elysia_string.StringType(),
+	status: require_type_elysia_integer.Integer(),
+	detail: require_type_elysia_optional.Optional(require_type_elysia_string.StringType()),
+	instance: require_type_elysia_optional.Optional(require_type_elysia_string.StringType()),
+	...extension
+}, options);
+
+//#endregion
+exports.Problem = Problem;

package/dist/type/elysia/problem.mjs

@@ -0,0 +1,24 @@
+import { StringType } from "./string.mjs";
+import { ObjectType } from "./object.mjs";
+import { Integer } from "./integer.mjs";
+import { Optional } from "./optional.mjs";
+
+//#region src/type/elysia/problem.ts
+/**
+* RFC 9457 Problem Details schema. Extension members are spread last, so they
+* may override a base member.
+*
+* @see https://www.rfc-editor.org/info/rfc9457
+*/
+const Problem = (extension, options) => ObjectType({
+	type: StringType(),
+	code: Optional(StringType()),
+	title: StringType(),
+	status: Integer(),
+	detail: Optional(StringType()),
+	instance: Optional(StringType()),
+	...extension
+}, options);
+
+//#endregion
+export { Problem };

package/dist/type/exports.d.ts

@@ -21,6 +21,7 @@ import { NumericEnum } from "./elysia/numeric-enum.js";
 import { ObjectType } from "./elysia/object.js";
 import { ObjectString } from "./elysia/object-string.js";
 import { Optional } from "./elysia/optional.js";
+import { Problem } from "./elysia/problem.js";
 import { StringType } from "./elysia/string.js";
 import { Uint8ArrayType } from "./elysia/uint8-array.js";
 import { Union } from "./elysia/union.js";
@@ -29,8 +30,8 @@ export * from "typebox/type";
 
 //#region src/type/exports.d.ts
 declare namespace exports_d_exports {
-  export { Accelerate, ArrayType as Array, ArrayBufferType as ArrayBuffer, ArrayString, BooleanType as Boolean, BooleanString, Cookie, DateType as Date, File, Files, Form, Integer, IntegerString, Intersect, MaybeEmpty, NoValidate, Nullable, NumberType as Number, Numeric, NumericEnum, ObjectType as Object, ObjectString, Optional, StringType as String, Uint8ArrayType as Uint8Array, Union, UnionEnum };
+  export { Accelerate, ArrayType as Array, ArrayBufferType as ArrayBuffer, ArrayString, BooleanType as Boolean, BooleanString, Cookie, DateType as Date, File, Files, Form, Integer, IntegerString, Intersect, MaybeEmpty, NoValidate, Nullable, NumberType as Number, Numeric, NumericEnum, ObjectType as Object, ObjectString, Optional, Problem, StringType as String, Uint8ArrayType as Uint8Array, Union, UnionEnum };
 }
 import * as import_typebox_type from "typebox/type";
 //#endregion
-export { Accelerate, ArrayType as Array, ArrayBufferType as ArrayBuffer, ArrayString, BooleanType as Boolean, BooleanString, Cookie, DateType as Date, File, Files, Form, Integer, IntegerString, Intersect, MaybeEmpty, NoValidate, Nullable, NumberType as Number, Numeric, NumericEnum, ObjectType as Object, ObjectString, Optional, StringType as String, Uint8ArrayType as Uint8Array, Union, UnionEnum, exports_d_exports };
+export { Accelerate, ArrayType as Array, ArrayBufferType as ArrayBuffer, ArrayString, BooleanType as Boolean, BooleanString, Cookie, DateType as Date, File, Files, Form, Integer, IntegerString, Intersect, MaybeEmpty, NoValidate, Nullable, NumberType as Number, Numeric, NumericEnum, ObjectType as Object, ObjectString, Optional, Problem, StringType as String, Uint8ArrayType as Uint8Array, Union, UnionEnum, exports_d_exports };

package/dist/type/exports.js

@@ -27,6 +27,7 @@ const require_type_elysia_no_validate = require('./elysia/no-validate.js');
 const require_type_elysia_nullable = require('./elysia/nullable.js');
 const require_type_elysia_numeric_enum = require('./elysia/numeric-enum.js');
 const require_type_elysia_optional = require('./elysia/optional.js');
+const require_type_elysia_problem = require('./elysia/problem.js');
 const require_type_elysia_uint8_array = require('./elysia/uint8-array.js');
 const require_type_elysia_union_enum = require('./elysia/union-enum.js');
 let typebox_type = require("typebox/type");
@@ -65,6 +66,7 @@ exports.NumericEnum = require_type_elysia_numeric_enum.NumericEnum;
 exports.Object = require_type_elysia_object.ObjectType;
 exports.ObjectString = require_type_elysia_object_string.ObjectString;
 exports.Optional = require_type_elysia_optional.Optional;
+exports.Problem = require_type_elysia_problem.Problem;
 exports.String = require_type_elysia_string.StringType;
 exports.Uint8Array = require_type_elysia_uint8_array.Uint8ArrayType;
 exports.Union = require_type_elysia_union.Union;

package/dist/type/exports.mjs

@@ -25,6 +25,7 @@ import { NoValidate } from "./elysia/no-validate.mjs";
 import { Nullable } from "./elysia/nullable.mjs";
 import { NumericEnum } from "./elysia/numeric-enum.mjs";
 import { Optional } from "./elysia/optional.mjs";
+import { Problem } from "./elysia/problem.mjs";
 import { Uint8ArrayType } from "./elysia/uint8-array.mjs";
 import { UnionEnum } from "./elysia/union-enum.mjs";
 import * as type from "typebox/type";
@@ -40,4 +41,4 @@ injectTypeboxType({
 setupTypebox();
 
 //#endregion
-export { Accelerate, ArrayType as Array, ArrayBufferType as ArrayBuffer, ArrayString, BooleanType as Boolean, BooleanString, Cookie, DateType as Date, File, Files, Form, Integer, IntegerString, Intersect, MaybeEmpty, NoValidate, Nullable, NumberType as Number, Numeric, NumericEnum, ObjectType as Object, ObjectString, Optional, StringType as String, Uint8ArrayType as Uint8Array, Union, UnionEnum };
+export { Accelerate, ArrayType as Array, ArrayBufferType as ArrayBuffer, ArrayString, BooleanType as Boolean, BooleanString, Cookie, DateType as Date, File, Files, Form, Integer, IntegerString, Intersect, MaybeEmpty, NoValidate, Nullable, NumberType as Number, Numeric, NumericEnum, ObjectType as Object, ObjectString, Optional, Problem, StringType as String, Uint8ArrayType as Uint8Array, Union, UnionEnum };

package/dist/type/index.js

@@ -28,6 +28,7 @@ const require_type_elysia_no_validate = require('./elysia/no-validate.js');
 const require_type_elysia_nullable = require('./elysia/nullable.js');
 const require_type_elysia_numeric_enum = require('./elysia/numeric-enum.js');
 const require_type_elysia_optional = require('./elysia/optional.js');
+const require_type_elysia_problem = require('./elysia/problem.js');
 const require_type_elysia_uint8_array = require('./elysia/uint8-array.js');
 const require_type_elysia_union_enum = require('./elysia/union-enum.js');
 
@@ -86,6 +87,7 @@ const t = lazyNamespace(() => require_type_typebox_type.loadTypeNamespace().type
 	Object: require_type_elysia_object.ObjectType,
 	ObjectString: require_type_elysia_object_string.ObjectString,
 	Optional: require_type_elysia_optional.Optional,
+	Problem: require_type_elysia_problem.Problem,
 	String: require_type_elysia_string.StringType,
 	Uint8Array: require_type_elysia_uint8_array.Uint8ArrayType,
 	Union: require_type_elysia_union.Union,

package/dist/type/index.mjs

@@ -27,6 +27,7 @@ import { NoValidate } from "./elysia/no-validate.mjs";
 import { Nullable } from "./elysia/nullable.mjs";
 import { NumericEnum } from "./elysia/numeric-enum.mjs";
 import { Optional } from "./elysia/optional.mjs";
+import { Problem } from "./elysia/problem.mjs";
 import { Uint8ArrayType } from "./elysia/uint8-array.mjs";
 import { UnionEnum } from "./elysia/union-enum.mjs";
 
@@ -85,6 +86,7 @@ const t = lazyNamespace(() => loadTypeNamespace().type, {
 	Object: ObjectType,
 	ObjectString,
 	Optional,
+	Problem,
 	String: StringType,
 	Uint8Array: Uint8ArrayType,
 	Union,

package/dist/type/validator/clean-safe.d.ts

@@ -1,8 +1,7 @@
 //#region src/type/validator/clean-safe.d.ts
 declare function schemaSome(schema: any, test: (node: any) => boolean, seen?: WeakSet<object>, prune?: (node: any) => boolean): boolean;
 declare const schemaHasDangerousProperties: (schema: any) => boolean;
-declare const schemaContainsRef: (node: any, seen?: WeakSet<WeakKey>) => boolean;
 declare function isCleanSafeNode(node: any, visiting: WeakSet<object>, clean: WeakSet<object>): boolean;
 declare function isFullyClosedObject(schema: any): boolean;
 //#endregion
-export { isCleanSafeNode, isFullyClosedObject, schemaContainsRef, schemaHasDangerousProperties, schemaSome };
+export { isCleanSafeNode, isFullyClosedObject, schemaHasDangerousProperties, schemaSome };

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

@@ -39,7 +39,6 @@ const schemaHasDangerousProperties = (schema) => schemaSome(schema, (node) => {
 	for (const key of require_constants.dangerousKeys) if (Object.hasOwn(properties, key)) return true;
 	return false;
 });
-const schemaContainsRef = (node, seen = /* @__PURE__ */ new WeakSet()) => schemaSome(node, (n) => !!n.$ref, seen);
 function isCleanSafeNode(node, visiting, clean) {
 	if (!node || typeof node !== "object") return true;
 	if (clean.has(node)) return true;
@@ -77,6 +76,5 @@ function isFullyClosedObject(schema) {
 //#endregion
 exports.isCleanSafeNode = isCleanSafeNode;
 exports.isFullyClosedObject = isFullyClosedObject;
-exports.schemaContainsRef = schemaContainsRef;
 exports.schemaHasDangerousProperties = schemaHasDangerousProperties;
 exports.schemaSome = schemaSome;

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

@@ -38,7 +38,6 @@ const schemaHasDangerousProperties = (schema) => schemaSome(schema, (node) => {
 	for (const key of dangerousKeys) if (Object.hasOwn(properties, key)) return true;
 	return false;
 });
-const schemaContainsRef = (node, seen = /* @__PURE__ */ new WeakSet()) => schemaSome(node, (n) => !!n.$ref, seen);
 function isCleanSafeNode(node, visiting, clean) {
 	if (!node || typeof node !== "object") return true;
 	if (clean.has(node)) return true;
@@ -74,4 +73,4 @@ function isFullyClosedObject(schema) {
 }
 
 //#endregion
-export { isCleanSafeNode, isFullyClosedObject, schemaContainsRef, schemaHasDangerousProperties, schemaSome };
+export { isCleanSafeNode, isFullyClosedObject, schemaHasDangerousProperties, schemaSome };

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

@@ -49,31 +49,6 @@ const literalOf = (propSchema) => {
 	if ("const" in propSchema) return { value: propSchema.const };
 	if (Array.isArray(propSchema.enum) && propSchema.enum.length === 1) return { value: propSchema.enum[0] };
 };
-function computeDiscriminators(branches) {
-	let candidates;
-	for (const branch of branches) {
-		if (!branch || !branch.properties) return;
-		const keys = /* @__PURE__ */ new Set();
-		for (const k in branch.properties) if (literalOf(branch.properties[k])) keys.add(k);
-		if (!keys.size) return;
-		if (!candidates) candidates = keys;
-		else for (const c of [...candidates]) if (!keys.has(c)) candidates.delete(c);
-		if (!candidates.size) return;
-	}
-	if (!candidates || !candidates.size) return;
-	const perBranch = branches.map(require_utils.nullObject);
-	let hasDisambiguating = false;
-	for (const key of candidates) {
-		const seenValues = [];
-		for (let i = 0; i < branches.length; i++) {
-			const lit = literalOf(branches[i].properties[key]);
-			perBranch[i][key] = lit.value;
-			seenValues.push(lit.value);
-		}
-		if (new Set(seenValues).size === branches.length) hasDisambiguating = true;
-	}
-	return hasDisambiguating ? perBranch : void 0;
-}
 function buildFindCustomError(schema, frozen) {
 	const nodes = collectCustomErrorNodes(schema, [], [], /* @__PURE__ */ new WeakSet());
 	if (!nodes.length) return;
@@ -94,7 +69,43 @@ function buildFindCustomError(schema, frozen) {
 	};
 	const discriminatorsOf = (node, branches) => {
 		if (discriminatorCache.has(node)) return discriminatorCache.get(node) ?? void 0;
-		const d = computeDiscriminators(branches) ?? null;
+		let discriminators;
+		let rejected = false;
+		let candidates;
+		for (const branch of branches) {
+			if (!branch || !branch.properties) {
+				rejected = true;
+				break;
+			}
+			const keys = /* @__PURE__ */ new Set();
+			for (const k in branch.properties) if (literalOf(branch.properties[k])) keys.add(k);
+			if (!keys.size) {
+				rejected = true;
+				break;
+			}
+			if (!candidates) candidates = keys;
+			else for (const c of [...candidates]) if (!keys.has(c)) candidates.delete(c);
+			if (!candidates.size) {
+				rejected = true;
+				break;
+			}
+		}
+		if (rejected || !candidates || !candidates.size) discriminators = void 0;
+		else {
+			const perBranch = branches.map(require_utils.nullObject);
+			let hasDisambiguating = false;
+			for (const key of candidates) {
+				const seenValues = [];
+				for (let i = 0; i < branches.length; i++) {
+					const lit = literalOf(branches[i].properties[key]);
+					perBranch[i][key] = lit.value;
+					seenValues.push(lit.value);
+				}
+				if (new Set(seenValues).size === branches.length) hasDisambiguating = true;
+			}
+			discriminators = hasDisambiguating ? perBranch : void 0;
+		}
+		const d = discriminators ?? null;
 		discriminatorCache.set(node, d);
 		return d ?? void 0;
 	};

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

@@ -48,31 +48,6 @@ const literalOf = (propSchema) => {
 	if ("const" in propSchema) return { value: propSchema.const };
 	if (Array.isArray(propSchema.enum) && propSchema.enum.length === 1) return { value: propSchema.enum[0] };
 };
-function computeDiscriminators(branches) {
-	let candidates;
-	for (const branch of branches) {
-		if (!branch || !branch.properties) return;
-		const keys = /* @__PURE__ */ new Set();
-		for (const k in branch.properties) if (literalOf(branch.properties[k])) keys.add(k);
-		if (!keys.size) return;
-		if (!candidates) candidates = keys;
-		else for (const c of [...candidates]) if (!keys.has(c)) candidates.delete(c);
-		if (!candidates.size) return;
-	}
-	if (!candidates || !candidates.size) return;
-	const perBranch = branches.map(nullObject);
-	let hasDisambiguating = false;
-	for (const key of candidates) {
-		const seenValues = [];
-		for (let i = 0; i < branches.length; i++) {
-			const lit = literalOf(branches[i].properties[key]);
-			perBranch[i][key] = lit.value;
-			seenValues.push(lit.value);
-		}
-		if (new Set(seenValues).size === branches.length) hasDisambiguating = true;
-	}
-	return hasDisambiguating ? perBranch : void 0;
-}
 function buildFindCustomError(schema, frozen) {
 	const nodes = collectCustomErrorNodes(schema, [], [], /* @__PURE__ */ new WeakSet());
 	if (!nodes.length) return;
@@ -93,7 +68,43 @@ function buildFindCustomError(schema, frozen) {
 	};
 	const discriminatorsOf = (node, branches) => {
 		if (discriminatorCache.has(node)) return discriminatorCache.get(node) ?? void 0;
-		const d = computeDiscriminators(branches) ?? null;
+		let discriminators;
+		let rejected = false;
+		let candidates;
+		for (const branch of branches) {
+			if (!branch || !branch.properties) {
+				rejected = true;
+				break;
+			}
+			const keys = /* @__PURE__ */ new Set();
+			for (const k in branch.properties) if (literalOf(branch.properties[k])) keys.add(k);
+			if (!keys.size) {
+				rejected = true;
+				break;
+			}
+			if (!candidates) candidates = keys;
+			else for (const c of [...candidates]) if (!keys.has(c)) candidates.delete(c);
+			if (!candidates.size) {
+				rejected = true;
+				break;
+			}
+		}
+		if (rejected || !candidates || !candidates.size) discriminators = void 0;
+		else {
+			const perBranch = branches.map(nullObject);
+			let hasDisambiguating = false;
+			for (const key of candidates) {
+				const seenValues = [];
+				for (let i = 0; i < branches.length; i++) {
+					const lit = literalOf(branches[i].properties[key]);
+					perBranch[i][key] = lit.value;
+					seenValues.push(lit.value);
+				}
+				if (new Set(seenValues).size === branches.length) hasDisambiguating = true;
+			}
+			discriminators = hasDisambiguating ? perBranch : void 0;
+		}
+		const d = discriminators ?? null;
 		discriminatorCache.set(node, d);
 		return d ?? void 0;
 	};

package/dist/type/validator/default-precompute.js

@@ -110,20 +110,19 @@ function containsRefLike(node, seen = /* @__PURE__ */ new WeakSet()) {
 	if (node.$ref !== void 0 || node["~kind"] === "Ref" || node["~kind"] === "This" || node["~kind"] === "Cyclic") return true;
 	return childSchemaSome(node, (child) => containsRefLike(child, seen));
 }
-function hasDivergentDefaultBelow(node) {
-	const ownKey = "default" in node ? canonical(node.default) : void 0;
-	let bad = false;
-	const visit = (n) => {
-		if (!n || typeof n !== "object") return false;
-		if ("default" in n && (ownKey === void 0 || canonical(n.default) !== ownKey)) return bad = true;
-		return childSchemaSome(n, visit);
-	};
-	childSchemaSome(node, visit);
-	return bad;
-}
 function structuralPreallocatable(schema, depth = 0) {
 	if (!schema || typeof schema !== "object") return true;
-	if (!((schema["~kind"] === "Object" || schema.type === "object") && !schema["~codec"] && !schema["~refine"] && !Array.isArray(schema.anyOf) && !Array.isArray(schema.allOf) && !Array.isArray(schema.oneOf) && schema.$ref === void 0 && schema.if === void 0 && schema.not === void 0)) return !hasDivergentDefaultBelow(schema);
+	if (!((schema["~kind"] === "Object" || schema.type === "object") && !schema["~codec"] && !schema["~refine"] && !Array.isArray(schema.anyOf) && !Array.isArray(schema.allOf) && !Array.isArray(schema.oneOf) && schema.$ref === void 0 && schema.if === void 0 && schema.not === void 0)) {
+		const ownKey = "default" in schema ? canonical(schema.default) : void 0;
+		let bad = false;
+		const visit = (n) => {
+			if (!n || typeof n !== "object") return false;
+			if ("default" in n && (ownKey === void 0 || canonical(n.default) !== ownKey)) return bad = true;
+			return childSchemaSome(n, visit);
+		};
+		childSchemaSome(schema, visit);
+		return !bad;
+	}
 	if (depth > 0 && schema.default === void 0 && hasDefaultBelow(schema)) return false;
 	if (typeof schema.additionalProperties === "object" && subtreeHasDefault(schema.additionalProperties)) return false;
 	if (schema.patternProperties) {
@@ -296,10 +295,6 @@ function mergeCategory(node) {
 	if ((kind === "Array" || node.type === "array") && node.items) return !Array.isArray(node.items) && subtreeHasDefault(node.items) ? "array" : "identity";
 	return "identity";
 }
-function presentExpr(child, isObject, varName) {
-	if (child === "") return varName;
-	return isObject ? `(${varName}!==null&&typeof ${varName}==='object'&&!Array.isArray(${varName})?${child}(${varName}):${varName})` : `(Array.isArray(${varName})?${child}(${varName}):${varName})`;
-}
 function mergeExpression(schema, varName, helpers, memo) {
 	const full = require_type_typebox_value.Default(schema, void 0);
 	const child = emitMerger(schema, helpers, memo);
@@ -307,9 +302,13 @@ function mergeExpression(schema, varName, helpers, memo) {
 	const absent = full === void 0 ? void 0 : cloneExpression(full);
 	if (full !== void 0 && absent === void 0) return;
 	const isObject = mergeCategory(schema) === "object";
+	let present;
+	if (child === "") present = varName;
+	else if (isObject) present = `(${varName}!==null&&typeof ${varName}==='object'&&!Array.isArray(${varName})?${child}(${varName}):${varName})`;
+	else present = `(Array.isArray(${varName})?${child}(${varName}):${varName})`;
 	return {
 		absent,
-		present: presentExpr(child, isObject, varName),
+		present,
 		child,
 		isObject
 	};
@@ -375,14 +374,6 @@ function emitMerger(node, helpers, memo = /* @__PURE__ */ new WeakMap()) {
 	helpers[+name.slice(2)] = `function ${name}(v){if(!Array.isArray(v))return v;const o=new Array(v.length);let e;for(let i=0;i<v.length;i++){e=v[i];o[i]=${assign}}return o}`;
 	return name;
 }
-function buildMergeSource(schema) {
-	const category = mergeCategory(schema);
-	if (category !== "object" && category !== "array") return;
-	const helpers = [];
-	const root = emitMerger(schema, helpers, /* @__PURE__ */ new WeakMap());
-	if (!root) return;
-	return `(function(){${helpers.join(";")};return ${root}})()`;
-}
 let probeImpl;
 function setDefaultProbeImpl(impl) {
 	probeImpl = impl;
@@ -414,7 +405,14 @@ function verifyPreallocatableDefault(schema, validate = true) {
 	if (containsRefLike(schema)) return;
 	if (!isEmittable(pd, /* @__PURE__ */ new Set(), true) || pod !== void 0 && !isEmittable(pod, /* @__PURE__ */ new Set(), true)) return;
 	const nullDefault = isPrecomputeSafe(schema);
-	let ms = buildMergeSource(schema);
+	let ms;
+	const category = mergeCategory(schema);
+	if (category !== "object" && category !== "array") ms = void 0;
+	else {
+		const helpers = [];
+		const root = emitMerger(schema, helpers, /* @__PURE__ */ new WeakMap());
+		ms = root ? `(function(){${helpers.join(";")};return ${root}})()` : void 0;
+	}
 	if (ms !== void 0 && validate && !probe().validateMergeSource(schema, ms)) ms = void 0;
 	if (!nullDefault && ms === void 0) {
 		if (!rootIsObject) return;