@oscarpalmer/jhunal 0.21.0 → 0.22.0

package/dist/helpers.d.mts

@@ -1,14 +1,14 @@
-import { ReportingInformation, ValidatedPropertyType, ValidationParameters } from "./models/validation.model.mjs";
+import { ReportingInformation, ValidatorParameters, ValidatorType } from "./models/validation.model.mjs";
 import { Schematic } from "./schematic.mjs";
 import { ValueName } from "./models/misc.model.mjs";
 import { Constructor } from "@oscarpalmer/atoms/models";
 
 //#region src/helpers.d.ts
 declare function getInvalidInputMessage(actual: unknown): string;
-declare function getInvalidMissingMessage(key: string, types: ValidatedPropertyType[]): string;
-declare function getInvalidTypeMessage(key: string, types: ValidatedPropertyType[], actual: unknown): string;
+declare function getInvalidMissingMessage(key: string, types: ValidatorType[]): string;
+declare function getInvalidTypeMessage(key: string, types: ValidatorType[], actual: unknown): string;
 declare function getInvalidValidatorMessage(key: string, type: ValueName, index: number, length: number): string;
-declare function getParameters(input?: unknown): ValidationParameters;
+declare function getParameters(input?: unknown): ValidatorParameters;
 declare function getReporting(value: unknown): ReportingInformation;
 declare function getUnknownKeysMessage(keys: string[]): string;
 /**

package/dist/helpers.mjs

@@ -41,7 +41,8 @@ function getParameters(input) {
 }
 function getPropertyType(original) {
 	if (typeof original === "function") return "a validated value";
-	if (Array.isArray(original)) return `'${TYPE_OBJECT}'`;
+	if (Array.isArray(original)) return `'array'`;
+	if (isPlainObject(original)) return `'${TYPE_OBJECT}'`;
 	if (isSchematic(original)) return `a ${NAME_SCHEMATIC}`;
 	return `'${String(original)}'`;
 }

package/dist/index.d.mts

@@ -182,13 +182,16 @@ type TypedSchemaRequired<Model extends PlainObject> = {
 } & TypedSchema<Model>;
 //#endregion
 //#region src/models/validation.model.d.ts
+type ReportingInformation = Record<ReportingType, boolean> & {
+  type: ReportingType;
+};
 /**
  * Controls how validation failures are reported
  *
- * - `'none'` — returns a boolean _(default)_
- * - `'first'` — returns the first failure as a `Result`
- * - `'all'` — returns all failures as a `Result` _(from same level)_
- * - `'throw'` — throws a {@link ValidationError} on failure
+ * - `'none'`, returns a boolean _(default)_
+ * - `'first'`, returns the first failure as a `Result`
+ * - `'all'`, returns all failures as a `Result` _(from same level)_
+ * - `'throw'`, throws a {@link ValidationError} on failure
  */
 type ReportingType = 'all' | 'first' | 'none' | 'throw';
 /**
@@ -197,49 +200,6 @@ type ReportingType = 'all' | 'first' | 'none' | 'throw';
 declare class SchematicError extends Error {
   constructor(message: string);
 }
-/**
- * The runtime representation of a parsed schema property, used internally during validation
- *
- * @example
- * ```ts
- * const parsed: ValidatedProperty = {
- *   key: 'age',
- *   required: true,
- *   types: ['number'],
- *   validators: { number: [(v) => v > 0] },
- * };
- * ```
- */
-type ValidatedProperty = {
-  /**
-   * The property name in the schema
-   */
-  key: string;
-  /**
-   * Whether the property is required
-   */
-  required: boolean;
-  /**
-   * The allowed types for this property
-   */
-  types: ValidatedPropertyType[];
-  /**
-   * Custom validators grouped by {@link ValueName}
-   */
-  validators: ValidatedPropertyValidators;
-};
-/**
- * A union of valid types for a {@link ValidatedProperty}'s `types` array
- *
- * Can be a callback _(custom validator)_, a {@link Schematic}, a nested {@link ValidatedProperty}, or a {@link ValueName} string
- */
-type ValidatedPropertyType = GenericCallback | ValidatedProperty[] | Schematic<unknown> | ValueName;
-/**
- * A map of validator functions keyed by {@link ValueName}, used at runtime in {@link ValidatedProperty}
- *
- * Each key holds an array of validator functions that receive an `unknown` value and return a `boolean`
- */
-type ValidatedPropertyValidators = { [Key in ValueName]?: Array<(value: unknown) => boolean> };
 /**
  * Thrown in `'throw'` mode when one or more properties fail validation; `information` holds all failures
  */
@@ -276,6 +236,13 @@ type ValidationOptions<Errors extends ReportingType> = {
    */
   strict?: boolean;
 };
+type Validator = (input: unknown, parameters: ValidatorParameters, get: boolean) => boolean | ValidationInformation[];
+type ValidatorParameters = {
+  information?: ValidationInformation[];
+  output: PlainObject;
+  reporting: ReportingInformation;
+  strict: boolean;
+};
 //#endregion
 //#region src/schematic.d.ts
 /**
@@ -284,7 +251,7 @@ type ValidationOptions<Errors extends ReportingType> = {
 declare class Schematic<Model> {
   #private;
   private readonly $schematic;
-  constructor(properties: ValidatedProperty[]);
+  constructor(validator: Validator);
   /**
    * Parse a value according to the schema
    *
@@ -452,19 +419,13 @@ type PlainSchema = {
  * };
  * ```
  */
-type Schema = SchemaIndex;
+type Schema = PlainSchema;
 /**
  * A union of all valid types for a single schema entry
  *
  * Can be a {@link Constructor}, {@link PlainSchema}, {@link SchemaProperty}, {@link Schematic}, {@link ValueName} string, or a custom validator function
  */
 type SchemaEntry = Constructor | PlainSchema | SchemaProperty | Schematic<unknown> | ValueName | ((value: unknown) => boolean);
-/**
- * Index signature interface backing {@link Schema}, allowing string-keyed entries of {@link PlainSchema}, {@link SchemaEntry}, or arrays of {@link SchemaEntry}
- */
-interface SchemaIndex {
-  [key: string]: PlainSchema | SchemaEntry | SchemaEntry[];
-}
 /**
  * A property definition with explicit type(s), an optional requirement flag, and optional validators
  *
@@ -672,4 +633,4 @@ declare function instanceOf<Instance>(constructor: Constructor<Instance>): (valu
  */
 declare function isSchematic(value: unknown): value is Schematic<never>;
 //#endregion
-export { type Schema, type Schematic, SchematicError, type TypedSchema, ValidationError, instanceOf, isSchematic, schematic };
+export { type Schema, type Schematic, SchematicError, type TypedSchema, ValidationError, type ValidationInformation, type ValidationOptions, instanceOf, isSchematic, schematic };

package/dist/index.mjs

@@ -1,6 +1,7 @@
 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 ";
@@ -43,19 +44,18 @@ const TYPE_ARRAY = "array";
 const TYPE_NULL = "null";
 const TYPE_OBJECT = "object";
 const TYPE_UNDEFINED = "undefined";
-const VALIDATABLE_TYPES = new Set([
-	"array",
-	"bigint",
-	"boolean",
-	"date",
-	"function",
-	"number",
-	"string",
-	"symbol",
-	TYPE_OBJECT
-]);
 const TYPE_ALL = new Set([
-	...VALIDATABLE_TYPES,
+	...new Set([
+		"array",
+		"bigint",
+		"boolean",
+		"date",
+		"function",
+		"number",
+		"string",
+		"symbol",
+		TYPE_OBJECT
+	]),
 	"null",
 	TYPE_UNDEFINED
 ]);
@@ -101,7 +101,8 @@ function getParameters(input) {
 }
 function getPropertyType(original) {
 	if (typeof original === "function") return "a validated value";
-	if (Array.isArray(original)) return `'${TYPE_OBJECT}'`;
+	if (Array.isArray(original)) return `'array'`;
+	if (isPlainObject(original)) return `'${TYPE_OBJECT}'`;
 	if (isSchematic(original)) return `a ${NAME_SCHEMATIC}`;
 	return `'${String(original)}'`;
 }
@@ -197,233 +198,230 @@ var ValidationError = class extends Error {
 	}
 };
 //#endregion
-//#region src/validation/property.validation.ts
+//#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;
 }
-function getProperties(original, prefix, fromType) {
-	if (Object.keys(original).length === 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("<>", prefix).replace("<>", property));
-	}
-	const keys = Object.keys(original);
-	const keysLength = keys.length;
-	const properties = [];
-	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([prefix, key], ".")));
-		const types = [];
-		let required = true;
-		let validators = {};
-		if (isPlainObject(value)) {
-			required = getRequired(key, value) ?? required;
-			validators = getValidators(value[PROPERTY_VALIDATORS]);
-			const hasType = PROPERTY_TYPE in value;
-			types.push(...getTypes(key, hasType ? value[PROPERTY_TYPE] : value, prefix, hasType));
-		} else types.push(...getTypes(key, value, prefix));
-		if (!required && !types.includes("undefined")) types.push(TYPE_UNDEFINED);
-		properties.push({
-			key,
-			types,
-			validators,
-			required: required && !types.includes("undefined")
-		});
-	}
-	return properties;
-}
-function getRequired(key, obj) {
-	if (!("$required" in obj)) return;
-	if (typeof obj["$required"] !== "boolean") throw new SchematicError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED.replace("<>", key));
-	return obj[PROPERTY_REQUIRED];
+function getFunctionValidator(fn) {
+	const validator = isConstructor(fn) ? instanceOf(fn) : fn;
+	return (input) => validator(input) === true;
 }
-function getTypes(key, original, prefix, fromType) {
-	const array = Array.isArray(original) ? original : [original];
-	const { length } = array;
-	const types = [];
-	for (let index = 0; index < length; index += 1) {
-		const value = array[index];
-		switch (true) {
-			case typeof value === "function":
-				types.push(isConstructor(value) ? instanceOf(value) : value);
-				break;
-			case isPlainObject(value):
-				types.push(getProperties(value, join([prefix, key], "."), fromType));
-				break;
-			case isSchematic(value):
-				types.push(value);
-				break;
-			case TYPE_ALL.has(value):
-				types.push(value);
-				break;
-			default: throw new SchematicError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE.replace("<>", join([prefix, key], ".")));
+function getNamedValidator(key, name, handlers) {
+	const validator = namedValidators[name];
+	const named = handlers[name] ?? [];
+	const { length } = named;
+	return (input, parameters) => {
+		if (!validator(input)) return false;
+		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),
+				value: input
+			};
+			parameters.information?.push(information);
+			return parameters.reporting.none ? false : [information];
 		}
-	}
-	if (types.length === 0) throw new SchematicError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE.replace("<>", join([prefix, key], ".")));
-	return types;
+		return true;
+	};
 }
-function getValidators(original) {
-	const validators = {};
-	if (original == null) return validators;
+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 (!VALIDATABLE_TYPES.has(key)) throw new TypeError(SCHEMATIC_MESSAGE_VALIDATOR_INVALID_KEY.replace("<>", key));
+		if (!TYPE_ALL.has(key)) throw new TypeError(SCHEMATIC_MESSAGE_VALIDATOR_INVALID_KEY.replace("<>", key));
 		const value = original[key];
-		validators[key] = (Array.isArray(value) ? value : [value]).map((item) => {
-			if (typeof item !== "function") throw new TypeError(SCHEMATIC_MESSAGE_VALIDATOR_INVALID_VALUE.replace("<>", 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 validators;
+	return handlers;
 }
-//#endregion
-//#region src/validation/value.validation.ts
-function validateNamed(name, value, parameters) {
-	if (!validators[name](value)) return false;
-	const propertyValidators = parameters.origin.validators[name];
-	if (propertyValidators == null || propertyValidators.length === 0) return true;
-	const { length } = propertyValidators;
-	for (let index = 0; index < length; index += 1) {
-		const validator = propertyValidators[index];
-		if (!validator(value)) {
-			parameters.information.push({
-				value,
-				key: {
-					full: parameters.prefix,
-					short: parameters.origin.key
-				},
-				message: getInvalidValidatorMessage(parameters.prefix, name, index, length),
-				validator
-			});
-			return false;
-		}
+function getObjectValidator(original, origin, fromType) {
+	const keys = Object.keys(original);
+	const keysLength = keys.length;
+	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));
 	}
-	return true;
-}
-function validateObject(obj, properties, parameters, get) {
-	if (!isPlainObject(obj)) {
-		const key = parameters?.origin == null ? {
-			full: "",
-			short: ""
-		} : {
-			full: parameters.prefix,
-			short: parameters.origin.key
-		};
-		const information = {
-			key,
-			message: parameters?.origin == null ? getInvalidInputMessage(obj) : getInvalidTypeMessage(key.full, parameters.origin.types, obj),
-			value: obj
+	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], ".");
+		const fullKey = {
+			full: prefixedKey,
+			short: key
 		};
-		if (parameters.reporting.throw) throw new ValidationError([information]);
-		parameters?.information?.push(information);
-		return parameters.reporting.none ? void 0 : [information];
+		let handlers = {};
+		let required = true;
+		let typed = false;
+		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;
+			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)));
+		const typesLength = types.length;
+		for (let typeIndex = 0; typeIndex < typesLength; typeIndex += 1) {
+			const type = types[typeIndex];
+			let validator;
+			switch (true) {
+				case typeof type === "function":
+					validator = getFunctionValidator(type);
+					break;
+				case isPlainObject(type):
+					validator = getObjectValidator(type, fullKey, typed);
+					break;
+				case isSchematic(type):
+					validator = getSchematicValidator(type);
+					break;
+				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)));
+			}
+			validators.push(validator);
+		}
+		set.add(key);
+		items.push({
+			types,
+			key: fullKey,
+			required: required && !types.includes("undefined"),
+			validator: getValidator(validators)
+		});
 	}
-	if (parameters.strict) {
-		const objKeys = Object.keys(obj);
-		const propertiesKeys = new Set(properties.map((property) => property.key));
-		const unknownKeys = objKeys.filter((key) => !propertiesKeys.has(key));
-		if (unknownKeys.length > 0) {
+	const validatorsLength = items.length;
+	return (input, parameters, get) => {
+		if (!isPlainObject(input)) {
+			if (origin != null) return false;
 			const information = {
-				key: parameters?.origin == null ? {
+				key: {
 					full: "",
 					short: ""
-				} : {
-					full: join([parameters.prefix, parameters.origin?.key], "."),
-					short: parameters.origin.key
 				},
-				message: getUnknownKeysMessage(unknownKeys.map((key) => join([parameters?.prefix, key], "."))),
-				value: obj
+				value: input,
+				message: getInvalidInputMessage(input)
 			};
 			if (parameters.reporting.throw) throw new ValidationError([information]);
-			parameters?.information?.push(information);
-			return parameters.reporting.none ? void 0 : [information];
+			parameters.information?.push(information);
+			return parameters.reporting.none ? false : [information];
 		}
-	}
-	const allInformation = [];
-	const output = {};
-	const propertiesLength = properties.length;
-	outer: for (let propertyIndex = 0; propertyIndex < propertiesLength; propertyIndex += 1) {
-		const property = properties[propertyIndex];
-		const { key, required, types } = property;
-		const value = obj[key];
-		if (get && value === void 0 && !required) continue;
-		if (value === void 0 && required) {
-			const prefixedKey = join([parameters.prefix, key], ".");
-			const information = {
+		if (parameters.strict) {
+			const unknownKeys = Object.keys(input).filter((key) => !set.has(key));
+			if (unknownKeys.length > 0) {
+				const information = {
+					key: origin ?? {
+						full: "",
+						short: ""
+					},
+					message: getUnknownKeysMessage(unknownKeys),
+					value: input
+				};
+				if (parameters.reporting.throw) throw new ValidationError([information]);
+				parameters.information?.push(information);
+				return parameters.reporting.none ? false : [information];
+			}
+		}
+		const allInformation = [];
+		const output = {};
+		for (let validatorIndex = 0; validatorIndex < validatorsLength; validatorIndex += 1) {
+			const { key, required, types, validator } = items[validatorIndex];
+			const value = input[key.short];
+			if (value === void 0) {
+				if (required) {
+					if (parameters.reporting.none) return false;
+					const information = {
+						key,
+						value,
+						message: getInvalidMissingMessage(key.full, types)
+					};
+					if (parameters.reporting.throw) throw new ValidationError([information]);
+					parameters.information?.push(information);
+					if (parameters.reporting.all) {
+						allInformation.push(information);
+						continue;
+					}
+					return [information];
+				}
+				continue;
+			}
+			const previousOutput = parameters.output;
+			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);
+				continue;
+			}
+			if (parameters.reporting.none) return false;
+			const information = typeof result !== "boolean" && result.length > 0 ? result : [{
+				key,
 				value,
-				key: {
-					full: prefixedKey,
-					short: key
-				},
-				message: getInvalidMissingMessage(prefixedKey, property.types)
-			};
-			if (parameters.reporting.throw) throw new ValidationError([information]);
-			parameters?.information?.push(information);
+				message: getInvalidTypeMessage(key.full, types, value)
+			}];
+			if (parameters.reporting.throw) throw new ValidationError(information);
 			if (parameters.reporting.all) {
-				allInformation.push(information);
+				allInformation.push(...information);
 				continue;
 			}
-			return parameters.reporting.none ? void 0 : [information];
-		}
-		const prefixedKey = join([parameters.prefix, key], ".");
-		const typesLength = types.length;
-		const information = [];
-		for (let typeIndex = 0; typeIndex < typesLength; typeIndex += 1) {
-			const type = types[typeIndex];
-			if (validateValue(type, value, {
-				information,
-				output,
-				origin: property,
-				prefix: prefixedKey,
-				reporting: parameters.reporting,
-				strict: parameters.strict
-			}, get)) {
-				if (get) output[key] = clone(value);
-				continue outer;
-			}
+			return information;
 		}
-		if (information.length === 0) information.push({
-			value,
-			key: {
-				full: prefixedKey,
-				short: key
-			},
-			message: getInvalidTypeMessage(prefixedKey, property.types, value)
-		});
-		if (parameters.reporting.throw) throw new ValidationError(information);
-		parameters?.information?.push(...information);
-		if (parameters.reporting.all) {
-			allInformation.push(...information);
-			continue;
-		}
-		return parameters.reporting.none ? void 0 : information;
-	}
-	if (get) if (parameters.origin == null) parameters.output = output;
-	else parameters.output[parameters.origin.key] = output;
-	return parameters.reporting.none || allInformation.length === 0 ? parameters.output : allInformation;
+		if (get) if (origin == null) parameters.output = output;
+		else parameters.output[origin.short] = output;
+		return parameters.reporting.none || allInformation.length === 0 ? true : allInformation;
+	};
+}
+function getRequired(key, obj) {
+	if (!("$required" in obj)) return;
+	if (typeof obj["$required"] !== "boolean") throw new SchematicError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED.replace("<>", key));
+	return obj[PROPERTY_REQUIRED];
 }
-function validateSchematic(schematic, value, parameters, get) {
-	const result = validateObject(value, schematicProperties.get(schematic), parameters, get);
-	return result == null || Array.isArray(result) ? false : true;
+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 validateValue(type, value, parameters, get) {
-	switch (true) {
-		case typeof type === "function": return type(value);
-		case Array.isArray(type): {
-			const result = validateObject(value, type, parameters, get);
-			return result == null || Array.isArray(result) ? false : true;
+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);
 		}
-		case isSchematic(type): return validateSchematic(type, value, parameters, get);
-		default: return validateNamed(type, value, parameters);
-	}
+		return allInformation;
+	};
 }
-const validators = {
+const namedValidators = {
 	array: Array.isArray,
 	bigint: (value) => typeof value === "bigint",
 	boolean: (value) => typeof value === "boolean",
@@ -442,32 +440,30 @@ const validators = {
 * A schematic for validating objects
 */
 var Schematic = class {
-	#properties;
-	constructor(properties) {
+	#validator;
+	constructor(validator) {
 		Object.defineProperty(this, PROPERTY_SCHEMATIC, { value: true });
-		this.#properties = properties;
-		schematicProperties.set(this, properties);
+		this.#validator = validator;
+		schematicValidator.set(this, validator);
 	}
 	get(value, options) {
 		const parameters = getParameters(options);
-		const result = validateObject(value, this.#properties, parameters, true);
-		if (result == null) return;
-		if (!Array.isArray(result)) return parameters.reporting.none ? result : ok(result);
+		const result = this.#validator(value, parameters, true);
+		if (typeof result === "boolean") return parameters.reporting.none ? result ? parameters.output : void 0 : ok(parameters.output);
 		return error(parameters.reporting.all ? result : result[0]);
 	}
 	is(value, options) {
 		const parameters = getParameters(options);
-		const result = validateObject(value, this.#properties, parameters, false);
-		if (result == null) return false;
-		if (!Array.isArray(result)) return parameters.reporting.none ? true : ok(true);
+		const result = this.#validator(value, parameters, false);
+		if (typeof result === "boolean") return parameters.reporting.none ? result : ok(result);
 		return error(parameters.reporting.all ? result : result[0]);
 	}
 };
 function schematic(schema) {
 	if (isSchematic(schema)) return schema;
 	if (!isPlainObject(schema)) throw new SchematicError(SCHEMATIC_MESSAGE_SCHEMA_INVALID_TYPE);
-	return new Schematic(getProperties(schema));
+	return new Schematic(getObjectValidator(schema));
 }
-const schematicProperties = /* @__PURE__ */ new WeakMap();
+const schematicValidator = /* @__PURE__ */ new WeakMap();
 //#endregion
 export { SchematicError, ValidationError, instanceOf, isSchematic, schematic };