@oscarpalmer/jhunal 0.22.0 → 0.24.0

package/dist/index.mjs

@@ -1,7 +1,6 @@
 import { isConstructor, isPlainObject } from "@oscarpalmer/atoms/is";
 import { join } from "@oscarpalmer/atoms/string";
 import { error, ok } from "@oscarpalmer/atoms/result/misc";
-import { join as join$1 } from "@oscarpalmer/atoms";
 import { clone } from "@oscarpalmer/atoms/value/clone";
 //#region src/constants.ts
 const CONJUNCTION_OR = " or ";
@@ -9,14 +8,14 @@ const CONJUNCTION_OR_COMMA = ", or ";
 const CONJUNCTION_AND = " and ";
 const CONJUNCTION_AND_COMMA = ", and ";
 const MESSAGE_CONSTRUCTOR = "Expected a constructor function";
-const NAME_SCHEMATIC = "Schematic";
 const NAME_ERROR_SCHEMATIC = "SchematicError";
 const NAME_ERROR_VALIDATION = "ValidationError";
+const PROPERTY_DEFAULT = "$default";
 const PROPERTY_REQUIRED = "$required";
 const PROPERTY_SCHEMATIC = "$schematic";
 const PROPERTY_TYPE = "$type";
 const PROPERTY_VALIDATORS = "$validators";
-const VALIDATION_MESSAGE_INVALID_INPUT = "Expected 'object' as input but received <>";
+const VALIDATION_MESSAGE_INVALID_INPUT = "Expected an object as input but received <>";
 const VALIDATION_MESSAGE_INVALID_REQUIRED = "Expected <> for required property '<>'";
 const VALIDATION_MESSAGE_INVALID_TYPE = "Expected <> for '<>' but received <>";
 const VALIDATION_MESSAGE_INVALID_VALUE = "Value does not satisfy validator for '<>' and type '<>'";
@@ -31,8 +30,10 @@ const REPORTING_TYPES = new Set([
 	REPORTING_NONE,
 	REPORTING_THROW
 ]);
+const SCHEMATIC_MESSAGE_SCHEMA_INVALID_DEFAULT_REQUIRED = "'<>' has a default value but is not required";
+const SCHEMATIC_MESSAGE_SCHEMA_INVALID_DEFAULT_TYPE = "Expected default value for property '<>' to be <>";
 const SCHEMATIC_MESSAGE_SCHEMA_INVALID_EMPTY = "Schema must have at least one property";
-const SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_DISALLOWED = "'<>.<>' property is not allowed for schemas in $type";
+const SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_DISALLOWED = "'<>.<>' property is not allowed for plain schemas";
 const SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_NULLABLE = "'<>' property must not be 'null' or 'undefined'";
 const SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED = "'<>.$required' property must be a boolean";
 const SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE = "'<>' property must be of a valid type";
@@ -41,71 +42,62 @@ const SCHEMATIC_MESSAGE_VALIDATOR_INVALID_KEY = "Validator '<>' does not exist";
 const SCHEMATIC_MESSAGE_VALIDATOR_INVALID_TYPE = "Validators must be an object";
 const SCHEMATIC_MESSAGE_VALIDATOR_INVALID_VALUE = "Validator '<>' must be a function or an array of functions";
 const TYPE_ARRAY = "array";
+const TYPE_FUNCTION = "function";
+const TYPE_FUNCTION_RESULT = "a validated value";
 const TYPE_NULL = "null";
 const TYPE_OBJECT = "object";
 const TYPE_UNDEFINED = "undefined";
 const TYPE_ALL = new Set([
 	...new Set([
-		"array",
+		TYPE_ARRAY,
 		"bigint",
 		"boolean",
 		"date",
-		"function",
+		TYPE_FUNCTION,
 		"number",
+		TYPE_OBJECT,
 		"string",
-		"symbol",
-		TYPE_OBJECT
+		"symbol"
 	]),
-	"null",
+	TYPE_NULL,
 	TYPE_UNDEFINED
 ]);
+const PREFIXED_TYPES = {
+	[TYPE_ARRAY]: `an ${TYPE_ARRAY}`,
+	bigint: `a bigint`,
+	boolean: `a boolean`,
+	date: `a date`,
+	[TYPE_FUNCTION]: `a ${TYPE_FUNCTION}`,
+	[TYPE_NULL]: TYPE_NULL,
+	number: `a number`,
+	string: `a string`,
+	symbol: `a symbol`,
+	[TYPE_OBJECT]: `an ${TYPE_OBJECT}`,
+	[TYPE_UNDEFINED]: TYPE_UNDEFINED
+};
 //#endregion
-//#region src/helpers.ts
-function getInvalidInputMessage(actual) {
-	return VALIDATION_MESSAGE_INVALID_INPUT.replace("<>", getValueType(actual));
-}
-function getInvalidMissingMessage(key, types) {
-	let message = VALIDATION_MESSAGE_INVALID_REQUIRED.replace("<>", renderTypes(types));
-	message = message.replace("<>", key);
-	return message;
-}
-function getInvalidTypeMessage(key, types, actual) {
-	let message = VALIDATION_MESSAGE_INVALID_TYPE.replace("<>", renderTypes(types));
-	message = message.replace("<>", key);
-	message = message.replace("<>", getValueType(actual));
-	return message;
-}
-function getInvalidValidatorMessage(key, type, index, length) {
-	let message = VALIDATION_MESSAGE_INVALID_VALUE.replace("<>", key);
-	message = message.replace("<>", type);
-	if (length > 1) message += VALIDATION_MESSAGE_INVALID_VALUE_SUFFIX.replace("<>", String(index));
-	return message;
-}
+//#region src/helpers/misc.helper.ts
 function getParameters(input) {
 	if (typeof input === "boolean") return {
+		clone: true,
 		output: {},
-		reporting: getReporting(REPORTING_NONE),
+		reporting: getReporting(),
 		strict: input
 	};
 	if (REPORTING_TYPES.has(input)) return {
+		clone: true,
 		output: {},
 		reporting: getReporting(input),
 		strict: false
 	};
 	const options = isPlainObject(input) ? input : {};
 	return {
+		clone: typeof options.clone === "boolean" ? options.clone : true,
 		output: {},
 		reporting: getReporting(options.errors),
 		strict: typeof options.strict === "boolean" ? options.strict : false
 	};
 }
-function getPropertyType(original) {
-	if (typeof original === "function") return "a validated value";
-	if (Array.isArray(original)) return `'array'`;
-	if (isPlainObject(original)) return `'${TYPE_OBJECT}'`;
-	if (isSchematic(original)) return `a ${NAME_SCHEMATIC}`;
-	return `'${String(original)}'`;
-}
 function getReporting(value) {
 	const type = REPORTING_TYPES.has(value) ? value : REPORTING_NONE;
 	return {
@@ -116,21 +108,6 @@ function getReporting(value) {
 		[REPORTING_THROW]: type === REPORTING_THROW
 	};
 }
-function getUnknownKeysMessage(keys) {
-	return VALIDATION_MESSAGE_UNKNOWN_KEYS.replace("<>", renderKeys(keys));
-}
-function getValueType(value) {
-	const valueType = typeof value;
-	switch (true) {
-		case value === null: return `'${TYPE_NULL}'`;
-		case value === void 0: return `'${TYPE_UNDEFINED}'`;
-		case valueType !== TYPE_OBJECT: return `'${valueType}'`;
-		case Array.isArray(value): return `'${TYPE_ARRAY}'`;
-		case isPlainObject(value): return `'${TYPE_OBJECT}'`;
-		case isSchematic(value): return `a ${NAME_SCHEMATIC}`;
-		default: return value.constructor.name;
-	}
-}
 /**
 * Creates a validator function for a given constructor
 * @param constructor - Constructor to check against
@@ -151,6 +128,85 @@ function instanceOf(constructor) {
 function isSchematic(value) {
 	return typeof value === "object" && value !== null && "$schematic" in value && value["$schematic"] === true;
 }
+//#endregion
+//#region src/models/validation.model.ts
+/**
+* Thrown when a schema definition is invalid
+*/
+var SchematicError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = NAME_ERROR_SCHEMATIC;
+	}
+};
+/**
+* Thrown in `'throw'` mode when one or more properties fail validation; `information` holds all failures
+*/
+var ValidationError = class extends Error {
+	constructor(information) {
+		super(join(information.map((item) => item.message), "; "));
+		this.information = information;
+		this.name = NAME_ERROR_VALIDATION;
+	}
+};
+//#endregion
+//#region src/helpers/message.helper.ts
+function getDefaultRequiredMessage(key) {
+	return SCHEMATIC_MESSAGE_SCHEMA_INVALID_DEFAULT_REQUIRED.replace("<>", key);
+}
+function getDefaultTypeMessage(key, types) {
+	let message = SCHEMATIC_MESSAGE_SCHEMA_INVALID_DEFAULT_TYPE.replace("<>", key);
+	message = message.replace("<>", renderTypes(types));
+	return message;
+}
+function getDisallowedMessage(key, property) {
+	let message = SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_DISALLOWED.replace("<>", key);
+	message = message.replace("<>", property);
+	return message;
+}
+function getInputTypeMessage(actual) {
+	return VALIDATION_MESSAGE_INVALID_INPUT.replace("<>", getValueType(actual));
+}
+function getInputPropertyMissingMessage(key, types) {
+	let message = VALIDATION_MESSAGE_INVALID_REQUIRED.replace("<>", renderTypes(types));
+	message = message.replace("<>", key);
+	return message;
+}
+function getInputPropertyTypeMessage(key, types, actual) {
+	let message = VALIDATION_MESSAGE_INVALID_TYPE.replace("<>", renderTypes(types));
+	message = message.replace("<>", key);
+	message = message.replace("<>", getValueType(actual));
+	return message;
+}
+function getInputPropertyValidatorMessage(key, type, index, length) {
+	let message = VALIDATION_MESSAGE_INVALID_VALUE.replace("<>", key);
+	message = message.replace("<>", type);
+	if (length > 1) message += VALIDATION_MESSAGE_INVALID_VALUE_SUFFIX.replace("<>", String(index));
+	return message;
+}
+function getSchematicPropertyNullableMessage(key) {
+	return SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_NULLABLE.replace("<>", key);
+}
+function getSchematicPropertyTypeMessage(key) {
+	return SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE.replace("<>", key);
+}
+function getPropertyType(type) {
+	switch (true) {
+		case typeof type === "function": return isConstructor(type) ? type.name : TYPE_FUNCTION_RESULT;
+		case TYPE_ALL.has(type): return PREFIXED_TYPES[type];
+		default: return PREFIXED_TYPES[TYPE_OBJECT];
+	}
+}
+function getValueType(value) {
+	const valueType = typeof value;
+	switch (true) {
+		case value === null: return TYPE_NULL;
+		case Array.isArray(value): return PREFIXED_TYPES[TYPE_ARRAY];
+		case isPlainObject(value): return PREFIXED_TYPES[TYPE_OBJECT];
+		case valueType !== TYPE_OBJECT: return PREFIXED_TYPES[valueType];
+		default: return value.constructor.name;
+	}
+}
 function renderKeys(keys) {
 	return renderParts(keys.map((key) => `'${key}'`), CONJUNCTION_AND, CONJUNCTION_AND_COMMA);
 }
@@ -176,75 +232,117 @@ function renderTypes(types) {
 	}
 	return renderParts(parts, CONJUNCTION_OR, CONJUNCTION_OR_COMMA);
 }
+function getRequiredMessage(key) {
+	return SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED.replace("<>", key);
+}
+function getUnknownKeysMessage(keys) {
+	return VALIDATION_MESSAGE_UNKNOWN_KEYS.replace("<>", renderKeys(keys));
+}
 //#endregion
-//#region src/models/validation.model.ts
-/**
-* Thrown when a schema definition is invalid
-*/
-var SchematicError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = NAME_ERROR_SCHEMATIC;
-	}
-};
-/**
-* Thrown in `'throw'` mode when one or more properties fail validation; `information` holds all failures
-*/
-var ValidationError = class extends Error {
-	constructor(information) {
-		super(join(information.map((item) => item.message), "; "));
-		this.information = information;
-		this.name = NAME_ERROR_VALIDATION;
-	}
-};
-//#endregion
-//#region src/validation.ts
-function getDisallowedProperty(obj) {
-	if ("$required" in obj) return PROPERTY_REQUIRED;
-	if ("$type" in obj) return PROPERTY_TYPE;
-	if ("$validators" in obj) return PROPERTY_VALIDATORS;
+//#region src/validator/base.validator.ts
+function getBaseValidator(validators) {
+	const { length } = validators;
+	return (input, parameters, get) => {
+		const allInformation = [];
+		for (let index = 0; index < length; index += 1) {
+			const previousInformation = parameters.information;
+			parameters.information = [];
+			const result = validators[index](input, parameters, get);
+			parameters.information = previousInformation;
+			if (result === true) return true;
+			parameters.information?.push(...result);
+			allInformation.push(...result);
+		}
+		return allInformation;
+	};
 }
+//#endregion
+//#region src/validator/function.validator.ts
 function getFunctionValidator(fn) {
 	const validator = isConstructor(fn) ? instanceOf(fn) : fn;
-	return (input) => validator(input) === true;
+	return (input) => validator(input) ? true : [];
+}
+//#endregion
+//#region src/validator/named.handler.ts
+function getNamedHandlers(original, prefix, allowed) {
+	const handlers = {};
+	if (original == null) return handlers;
+	if (!allowed) throw new TypeError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_DISALLOWED.replace("<>", prefix).replace("<>", PROPERTY_VALIDATORS));
+	if (!isPlainObject(original)) throw new TypeError(SCHEMATIC_MESSAGE_VALIDATOR_INVALID_TYPE);
+	const keys = Object.keys(original);
+	const { length } = keys;
+	for (let index = 0; index < length; index += 1) {
+		const key = keys[index];
+		if (!TYPE_ALL.has(key)) throw new TypeError(SCHEMATIC_MESSAGE_VALIDATOR_INVALID_KEY.replace("<>", key));
+		const value = original[key];
+		handlers[key] = (Array.isArray(value) ? value : [value]).map((item) => {
+			if (typeof item !== "function") throw new TypeError(SCHEMATIC_MESSAGE_VALIDATOR_INVALID_VALUE.replace("<>", key).replace("<>", prefix));
+			return item;
+		});
+	}
+	return handlers;
 }
+//#endregion
+//#region src/validator/named.validator.ts
 function getNamedValidator(key, name, handlers) {
 	const validator = namedValidators[name];
 	const named = handlers[name] ?? [];
 	const { length } = named;
 	return (input, parameters) => {
-		if (!validator(input)) return false;
+		if (!validator(input)) return [];
 		for (let index = 0; index < length; index += 1) {
 			const handler = named[index];
 			if (handler(input) === true) continue;
 			const information = {
 				key,
 				validator,
-				message: getInvalidValidatorMessage(key.full, name, index, length),
+				message: getInputPropertyValidatorMessage(key.full, name, index, length),
 				value: input
 			};
 			parameters.information?.push(information);
-			return parameters.reporting.none ? false : [information];
+			return parameters.reporting.none ? [] : [information];
 		}
 		return true;
 	};
 }
-function getNamedHandlers(original, prefix) {
-	const handlers = {};
-	if (original == null) return handlers;
-	if (!isPlainObject(original)) throw new TypeError(SCHEMATIC_MESSAGE_VALIDATOR_INVALID_TYPE);
-	const keys = Object.keys(original);
-	const { length } = keys;
-	for (let index = 0; index < length; index += 1) {
-		const key = keys[index];
-		if (!TYPE_ALL.has(key)) throw new TypeError(SCHEMATIC_MESSAGE_VALIDATOR_INVALID_KEY.replace("<>", key));
-		const value = original[key];
-		handlers[key] = (Array.isArray(value) ? value : [value]).map((item) => {
-			if (typeof item !== "function") throw new TypeError(SCHEMATIC_MESSAGE_VALIDATOR_INVALID_VALUE.replace("<>", key).replace("<>", prefix));
-			return item;
-		});
-	}
-	return handlers;
+const namedValidators = {
+	array: Array.isArray,
+	bigint: (value) => typeof value === "bigint",
+	boolean: (value) => typeof value === "boolean",
+	date: (value) => value instanceof Date,
+	function: (value) => typeof value === "function",
+	null: (value) => value === null,
+	number: (value) => typeof value === "number",
+	object: (value) => typeof value === "object" && value !== null,
+	string: (value) => typeof value === "string",
+	symbol: (value) => typeof value === "symbol",
+	undefined: (value) => value === void 0
+};
+//#endregion
+//#region src/validator/schematic.validator.ts
+function getSchematicValidator(schematic) {
+	const validator = schematicValidator.get(schematic);
+	return (input, parameters, get) => {
+		let result;
+		if (isPlainObject(input)) result = validator(input, parameters, get);
+		else result = [];
+		if (result === true) return result;
+		parameters.information?.push(...result);
+		return result;
+	};
+}
+//#endregion
+//#region src/validator/object.validator.ts
+function getDefaults(obj, key, allowed) {
+	if (!("$default" in obj)) return;
+	if (!allowed) throw new SchematicError(getDisallowedMessage(key, PROPERTY_DEFAULT));
+	return { value: obj[PROPERTY_DEFAULT] };
+}
+function getDisallowedProperty(obj) {
+	if ("$default" in obj) return PROPERTY_DEFAULT;
+	if ("$required" in obj) return PROPERTY_REQUIRED;
+	if ("$type" in obj) return PROPERTY_TYPE;
+	if ("$validators" in obj) return PROPERTY_VALIDATORS;
 }
 function getObjectValidator(original, origin, fromType) {
 	const keys = Object.keys(original);
@@ -252,15 +350,15 @@ function getObjectValidator(original, origin, fromType) {
 	if (keysLength === 0) throw new SchematicError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_EMPTY);
 	if (fromType ?? false) {
 		const property = getDisallowedProperty(original);
-		if (property != null) throw new SchematicError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_DISALLOWED.replace("<>", origin.full).replace("<>", property));
+		if (property != null) throw new SchematicError(getDisallowedMessage(origin.full, property));
 	}
 	const set = /* @__PURE__ */ new Set();
 	const items = [];
 	for (let keyIndex = 0; keyIndex < keysLength; keyIndex += 1) {
 		const key = keys[keyIndex];
 		const value = original[key];
-		if (value == null) throw new SchematicError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_NULLABLE.replace("<>", join$1([origin?.full, key], ".")));
-		const prefixedKey = origin == null ? key : join$1([origin.full, key], ".");
+		if (value == null) throw new SchematicError(getSchematicPropertyNullableMessage(join([origin?.full, key], ".")));
+		const prefixedKey = origin == null ? key : join([origin.full, key], ".");
 		const fullKey = {
 			full: prefixedKey,
 			short: key
@@ -268,16 +366,18 @@ function getObjectValidator(original, origin, fromType) {
 		let handlers = {};
 		let required = true;
 		let typed = false;
+		let defaults;
 		let types;
 		const validators = [];
 		if (isPlainObject(value)) {
 			typed = PROPERTY_TYPE in value;
 			const type = typed ? value[PROPERTY_TYPE] : value;
-			handlers = getNamedHandlers(value[PROPERTY_VALIDATORS], prefixedKey);
-			required = getRequired(key, value) ?? required;
+			defaults = getDefaults(value, prefixedKey, typed);
+			handlers = getNamedHandlers(value[PROPERTY_VALIDATORS], prefixedKey, typed);
+			required = getRequired(value, prefixedKey, typed) ?? required;
 			types = Array.isArray(type) ? type : [type];
 		} else types = Array.isArray(value) ? value : [value];
-		if (types.length === 0) throw new SchematicError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE.replace("<>", prefixedKey).replace("<>", String(value)));
+		if (types.length === 0) throw new SchematicError(getSchematicPropertyTypeMessage(prefixedKey));
 		const typesLength = types.length;
 		for (let typeIndex = 0; typeIndex < typesLength; typeIndex += 1) {
 			const type = types[typeIndex];
@@ -295,33 +395,38 @@ function getObjectValidator(original, origin, fromType) {
 				case TYPE_ALL.has(type):
 					validator = getNamedValidator(fullKey, type, handlers);
 					break;
-				default: throw new SchematicError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE.replace("<>", prefixedKey).replace("<>", String(type)));
+				default: throw new SchematicError(getSchematicPropertyTypeMessage(prefixedKey));
 			}
 			validators.push(validator);
 		}
-		set.add(key);
+		required = required && !types.includes("undefined");
+		if (defaults != null && !required) throw new SchematicError(getDefaultRequiredMessage(prefixedKey));
+		const validator = getBaseValidator(validators);
+		if (defaults != null && Array.isArray(validator(defaults.value, getParameters(), false))) throw new SchematicError(getDefaultTypeMessage(prefixedKey, types));
 		items.push({
+			defaults,
+			required,
 			types,
-			key: fullKey,
-			required: required && !types.includes("undefined"),
-			validator: getValidator(validators)
+			validator,
+			key: fullKey
 		});
+		set.add(key);
 	}
 	const validatorsLength = items.length;
 	return (input, parameters, get) => {
 		if (!isPlainObject(input)) {
-			if (origin != null) return false;
+			if (origin != null) return [];
 			const information = {
 				key: {
 					full: "",
 					short: ""
 				},
 				value: input,
-				message: getInvalidInputMessage(input)
+				message: getInputTypeMessage(input)
 			};
 			if (parameters.reporting.throw) throw new ValidationError([information]);
 			parameters.information?.push(information);
-			return parameters.reporting.none ? false : [information];
+			return [information];
 		}
 		if (parameters.strict) {
 			const unknownKeys = Object.keys(input).filter((key) => !set.has(key));
@@ -336,21 +441,25 @@ function getObjectValidator(original, origin, fromType) {
 				};
 				if (parameters.reporting.throw) throw new ValidationError([information]);
 				parameters.information?.push(information);
-				return parameters.reporting.none ? false : [information];
+				return [information];
 			}
 		}
 		const allInformation = [];
 		const output = {};
 		for (let validatorIndex = 0; validatorIndex < validatorsLength; validatorIndex += 1) {
-			const { key, required, types, validator } = items[validatorIndex];
+			const { defaults, key, required, types, validator } = items[validatorIndex];
 			const value = input[key.short];
 			if (value === void 0) {
 				if (required) {
-					if (parameters.reporting.none) return false;
+					if (get && defaults != null) {
+						output[key.short] = clone(defaults.value);
+						continue;
+					}
+					if (parameters.reporting.none) return [];
 					const information = {
 						key,
 						value,
-						message: getInvalidMissingMessage(key.full, types)
+						message: getInputPropertyMissingMessage(key.full, types)
 					};
 					if (parameters.reporting.throw) throw new ValidationError([information]);
 					parameters.information?.push(information);
@@ -366,16 +475,15 @@ function getObjectValidator(original, origin, fromType) {
 			parameters.output = output;
 			const result = validator(value, parameters, get);
 			parameters.output = previousOutput;
-			if (result === false) continue;
 			if (result === true) {
-				if (get) output[key.short] = clone(value);
+				if (get && !isPlainObject(value)) output[key.short] = parameters.clone ? clone(value) : value;
 				continue;
 			}
-			if (parameters.reporting.none) return false;
+			if (parameters.reporting.none) return [];
 			const information = typeof result !== "boolean" && result.length > 0 ? result : [{
 				key,
 				value,
-				message: getInvalidTypeMessage(key.full, types, value)
+				message: getInputPropertyTypeMessage(key.full, types, value)
 			}];
 			if (parameters.reporting.throw) throw new ValidationError(information);
 			if (parameters.reporting.all) {
@@ -386,54 +494,15 @@ function getObjectValidator(original, origin, fromType) {
 		}
 		if (get) if (origin == null) parameters.output = output;
 		else parameters.output[origin.short] = output;
-		return parameters.reporting.none || allInformation.length === 0 ? true : allInformation;
+		return allInformation.length === 0 ? true : allInformation;
 	};
 }
-function getRequired(key, obj) {
+function getRequired(obj, key, allowed) {
 	if (!("$required" in obj)) return;
-	if (typeof obj["$required"] !== "boolean") throw new SchematicError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED.replace("<>", key));
+	if (!allowed) throw new SchematicError(getDisallowedMessage(key, PROPERTY_REQUIRED));
+	if (typeof obj["$required"] !== "boolean") throw new SchematicError(getRequiredMessage(key));
 	return obj[PROPERTY_REQUIRED];
 }
-function getSchematicValidator(schematic) {
-	const validator = schematicValidator.get(schematic);
-	return (input, parameters, get) => {
-		let result = false;
-		if (isPlainObject(input)) result = validator(input, parameters, get);
-		if (typeof result === "boolean") return result;
-		parameters.information?.push(...result);
-		return result.length === 0 ? true : result;
-	};
-}
-function getValidator(validators) {
-	const { length } = validators;
-	return (input, parameters, get) => {
-		const allInformation = [];
-		for (let index = 0; index < length; index += 1) {
-			const previousInformation = parameters.information;
-			parameters.information = [];
-			const result = validators[index](input, parameters, get);
-			parameters.information = previousInformation;
-			if (result === false) continue;
-			if (result === true) return true;
-			parameters.information?.push(...result);
-			allInformation.push(...result);
-		}
-		return allInformation;
-	};
-}
-const namedValidators = {
-	array: Array.isArray,
-	bigint: (value) => typeof value === "bigint",
-	boolean: (value) => typeof value === "boolean",
-	date: (value) => value instanceof Date,
-	function: (value) => typeof value === "function",
-	null: (value) => value === null,
-	number: (value) => typeof value === "number",
-	object: (value) => typeof value === "object" && value !== null,
-	string: (value) => typeof value === "string",
-	symbol: (value) => typeof value === "symbol",
-	undefined: (value) => value === void 0
-};
 //#endregion
 //#region src/schematic.ts
 /**
@@ -449,13 +518,15 @@ var Schematic = class {
 	get(value, options) {
 		const parameters = getParameters(options);
 		const result = this.#validator(value, parameters, true);
-		if (typeof result === "boolean") return parameters.reporting.none ? result ? parameters.output : void 0 : ok(parameters.output);
+		if (result === true) return parameters.reporting.none || parameters.reporting.throw ? parameters.output : ok(parameters.output);
+		if (parameters.reporting.none) return;
 		return error(parameters.reporting.all ? result : result[0]);
 	}
 	is(value, options) {
 		const parameters = getParameters(options);
 		const result = this.#validator(value, parameters, false);
-		if (typeof result === "boolean") return parameters.reporting.none ? result : ok(result);
+		if (result === true) return parameters.reporting.none || parameters.reporting.throw ? result : ok(result);
+		if (parameters.reporting.none) return false;
 		return error(parameters.reporting.all ? result : result[0]);
 	}
 };

package/dist/models/schema.plain.model.d.mts

@@ -9,6 +9,7 @@ import { Constructor } from "@oscarpalmer/atoms/models";
 type PlainSchema = {
   [key: string]: PlainSchema | SchemaEntry | SchemaEntry[] | undefined;
 } & {
+  $default?: never;
   $required?: never;
   $type?: never;
   $validators?: never;
@@ -48,6 +49,7 @@ type SchemaEntry = Constructor | PlainSchema | SchemaProperty | Schematic<unknow
  * ```
  */
 type SchemaProperty = {
+  $default?: unknown;
   /**
    * Whether the property is required _(defaults to `true`)_
    */

package/dist/models/schema.typed.model.d.mts

@@ -18,6 +18,7 @@ import { PlainObject, Simplify } from "@oscarpalmer/atoms/models";
  * ```
  */
 type TypedPropertyOptional<Value> = {
+  $default?: never;
   $required: false;
   $type: ToSchemaPropertyType<Exclude<Value, undefined>>;
   $validators?: PropertyValidators<ToSchemaPropertyType<Exclude<Value, undefined>>>;
@@ -35,6 +36,7 @@ type TypedPropertyOptional<Value> = {
  * ```
  */
 type TypedPropertyRequired<Value> = {
+  $default?: unknown;
   $required?: true;
   $type: ToSchemaPropertyType<Value>;
   $validators?: PropertyValidators<ToSchemaPropertyType<Value>>;
@@ -57,22 +59,6 @@ type TypedPropertyRequired<Value> = {
  * };
  * ```
  */
-type TypedSchema<Model extends PlainObject> = Simplify<{ [Key in RequiredKeys<Model>]: Model[Key] extends PlainObject ? TypedSchemaRequired<Model[Key]> | Schematic<Model[Key]> : ToSchemaType<Model[Key]> | TypedPropertyRequired<Model[Key]> } & { [Key in OptionalKeys<Model>]: Exclude<Model[Key], undefined> extends PlainObject ? TypedSchemaOptional<Exclude<Model[Key], undefined>> | Schematic<Exclude<Model[Key], undefined>> : TypedPropertyOptional<Model[Key]> }>;
-/**
- * A {@link TypedSchema} variant for optional nested objects, with `$required` fixed to `false`
- *
- * @template Model Nested object type
- */
-type TypedSchemaOptional<Model extends PlainObject> = {
-  $required: false;
-} & TypedSchema<Model>;
-/**
- * A {@link TypedSchema} variant for required nested objects, with `$required` defaulting to `true`
- *
- * @template Model Nested object type
- */
-type TypedSchemaRequired<Model extends PlainObject> = {
-  $required?: true;
-} & TypedSchema<Model>;
+type TypedSchema<Model extends PlainObject> = Simplify<{ [Key in RequiredKeys<Model>]: Model[Key] extends PlainObject ? Schematic<Model[Key]> : ToSchemaType<Model[Key]> | TypedPropertyRequired<Model[Key]> } & { [Key in OptionalKeys<Model>]: Exclude<Model[Key], undefined> extends PlainObject ? Schematic<Exclude<Model[Key], undefined>> : TypedPropertyOptional<Model[Key]> }>;
 //#endregion
 export { TypedPropertyOptional, TypedPropertyRequired, TypedSchema };