@oscarpalmer/jhunal 0.24.0 → 0.26.0

package/src/validator/object.validator.ts

@@ -23,7 +23,7 @@ import {
 	getSchematicPropertyTypeMessage,
 	getUnknownKeysMessage,
 } from '../helpers/message.helper';
-import {getParameters, isSchematic} from '../helpers/misc.helper';
+import {getParameters, isSchema} from '../helpers/misc.helper';
 import type {ValueName} from '../models/misc.model';
 import {
 	type NamedValidatorHandlers,
@@ -34,13 +34,33 @@ import {
 	type Validator,
 	type ValidatorDefaults,
 	type ValidatorItem,
+	type ValidatorParameters,
 	type ValidatorType,
 } from '../models/validation.model';
 import {getBaseValidator} from './base.validator';
 import {getFunctionValidator} from './function.validator';
 import {getNamedHandlers} from './named.handler';
 import {getNamedValidator} from './named.validator';
-import {getSchematicValidator} from './schematic.validator';
+import {getSchemaValidator} from './schema.validator';
+
+type ReportParameters<Callback extends (...args: any[]) => string> = {
+	extract?: boolean;
+	information?: ReportParametersInformation;
+	key: ValidationInformationKey;
+	message: ReportParametersMessage<Callback>;
+	original: ValidatorParameters;
+	value: unknown;
+};
+
+type ReportParametersMessage<Callback extends (...args: any[]) => string> = {
+	arguments: Parameters<Callback>;
+	callback: Callback;
+};
+
+type ReportParametersInformation = {
+	all: ValidationInformation[];
+	existing?: ValidationInformation[];
+};
 
 function getDefaults(
 	obj: PlainObject,
@@ -106,12 +126,12 @@ export function getObjectValidator(
 		const key = keys[keyIndex];
 		const value = original[key];
 
+		const prefixedKey = origin == null ? key : join([origin.full, key], '.');
+
 		if (value == null) {
-			throw new SchematicError(getSchematicPropertyNullableMessage(join([origin?.full, key], '.')));
+			throw new SchematicError(getSchematicPropertyNullableMessage(prefixedKey));
 		}
 
-		const prefixedKey = origin == null ? key : join([origin.full, key], '.');
-
 		const fullKey: ValidationInformationKey = {
 			full: prefixedKey,
 			short: key,
@@ -161,8 +181,8 @@ export function getObjectValidator(
 					validator = getObjectValidator(type, fullKey, typed);
 					break;
 
-				case isSchematic(type):
-					validator = getSchematicValidator(type);
+				case isSchema(type):
+					validator = getSchemaValidator(type);
 					break;
 
 				case TYPE_ALL.has(type as ValueName):
@@ -203,26 +223,23 @@ export function getObjectValidator(
 
 	return (input, parameters, get) => {
 		if (!isPlainObject(input)) {
-			if (origin != null) {
-				return [];
-			}
-
-			const information: ValidationInformation = {
-				key: {
-					full: '',
-					short: '',
-				},
-				value: input,
-				message: getInputTypeMessage(input),
-			};
-
-			if (parameters.reporting.throw) {
-				throw new ValidationError([information]);
-			}
-
-			parameters.information?.push(information);
-
-			return [information];
+			return origin == null
+				? report(
+						{
+							key: {
+								full: '',
+								short: '',
+							},
+							message: {
+								arguments: [input],
+								callback: getInputTypeMessage,
+							},
+							original: parameters,
+							value: input,
+						},
+						true,
+					)
+				: [];
 		}
 
 		if (parameters.strict) {
@@ -249,6 +266,8 @@ export function getObjectValidator(
 			}
 		}
 
+		const getAndClone = get && parameters.clone;
+
 		const allInformation: ValidationInformation[] = [];
 		const output: PlainObject = {};
 
@@ -260,7 +279,13 @@ export function getObjectValidator(
 			if (value === undefined) {
 				if (required) {
 					if (get && defaults != null) {
-						output[key.short] = clone(defaults.value);
+						const defaultValue = clone(defaults.value);
+
+						if (parameters.clone) {
+							output[key.short] = defaultValue;
+						} else {
+							input[key.short] = defaultValue;
+						}
 
 						continue;
 					}
@@ -269,25 +294,24 @@ export function getObjectValidator(
 						return [];
 					}
 
-					const information: ValidationInformation = {
+					const reported = report({
 						key,
 						value,
-						message: getInputPropertyMissingMessage(key.full, types),
-					};
-
-					if (parameters.reporting.throw) {
-						throw new ValidationError([information]);
-					}
-
-					parameters.information?.push(information);
-
-					if (parameters.reporting.all) {
-						allInformation.push(information);
-
+						information: {
+							all: allInformation,
+						},
+						message: {
+							arguments: [key.full, types],
+							callback: getInputPropertyMissingMessage,
+						},
+						original: parameters,
+					});
+
+					if (reported == null) {
 						continue;
 					}
 
-					return [information];
+					return reported;
 				}
 
 				continue;
@@ -302,8 +326,8 @@ export function getObjectValidator(
 			parameters.output = previousOutput;
 
 			if (result === true) {
-				if (get && !isPlainObject(value)) {
-					output[key.short] = parameters.clone ? clone(value) : value;
+				if (getAndClone && !isPlainObject(value)) {
+					output[key.short] = clone(value);
 				}
 
 				continue;
@@ -313,31 +337,29 @@ export function getObjectValidator(
 				return [];
 			}
 
-			const information: ValidationInformation[] =
-				typeof result !== 'boolean' && result.length > 0
-					? result
-					: [
-							{
-								key,
-								value,
-								message: getInputPropertyTypeMessage(key.full, types, value),
-							},
-						];
-
-			if (parameters.reporting.throw) {
-				throw new ValidationError(information);
-			}
-
-			if (parameters.reporting.all) {
-				allInformation.push(...information);
+			const reported = report({
+				key,
+				value,
+				extract: false,
+				information: {
+					all: allInformation,
+					existing: typeof result !== 'boolean' && result.length > 0 ? result : undefined,
+				},
+				message: {
+					arguments: [key.full, types, value],
+					callback: getInputPropertyTypeMessage,
+				},
+				original: parameters,
+			});
 
+			if (reported == null) {
 				continue;
 			}
 
-			return information;
+			return reported;
 		}
 
-		if (get) {
+		if (getAndClone) {
 			if (origin == null) {
 				parameters.output = output;
 			} else {
@@ -364,3 +386,41 @@ function getRequired(obj: PlainObject, key: string, allowed: boolean): boolean |
 
 	return obj[PROPERTY_REQUIRED];
 }
+
+function report<Callback extends (...args: any[]) => string>(
+	parameters: ReportParameters<Callback>,
+	getReports: true,
+): ValidationInformation[];
+
+function report<Callback extends (...args: any[]) => string>(
+	parameters: ReportParameters<Callback>,
+): ValidationInformation[] | undefined;
+
+function report<Callback extends (...args: any[]) => string>(
+	parameters: ReportParameters<Callback>,
+	getReports?: boolean,
+): ValidationInformation[] | undefined {
+	const {information, message, original} = parameters;
+
+	const reported: ValidationInformation[] = information?.existing ?? [
+		{
+			key: parameters.key,
+			value: parameters.value,
+			message: message.callback(...message.arguments),
+		},
+	];
+
+	if (original.reporting.throw) {
+		throw new ValidationError(reported);
+	}
+
+	information?.all.push(...reported);
+
+	if (parameters.extract ?? true) {
+		original.information?.push(...reported);
+	}
+
+	if ((getReports ?? false) || !original.reporting.all) {
+		return reported;
+	}
+}

package/src/validator/{schematic.validator.ts → schema.validator.ts}

@@ -1,9 +1,9 @@
 import {isPlainObject} from '@oscarpalmer/atoms/is';
 import type {Validator} from '../models/validation.model';
-import {Schematic, schematicValidator} from '../schematic';
+import {Schema, schemaValidators} from '../schema';
 
-export function getSchematicValidator(schematic: Schematic<unknown>): Validator {
-	const validator = schematicValidator.get(schematic)!;
+export function getSchemaValidator(schematic: Schema<unknown>): Validator {
+	const validator = schemaValidators.get(schematic)!;
 
 	return (input, parameters, get) => {
 		let result: ReturnType<Validator>;

package/dist/validator/schematic.validator.d.mts

@@ -1,7 +0,0 @@
-import { Validator } from "../models/validation.model.mjs";
-import { Schematic } from "../schematic.mjs";
-
-//#region src/validator/schematic.validator.d.ts
-declare function getSchematicValidator(schematic: Schematic<unknown>): Validator;
-//#endregion
-export { getSchematicValidator };