@oscarpalmer/jhunal 0.11.0 → 0.12.0

package/dist/constants.js

@@ -1,7 +1,8 @@
 const ERROR_NAME = "SchematicError";
-const EXPRESSION_HAS_NUMBER = /\d+/;
 const EXPRESSION_INDEX = /\.\d+$/;
-const EXPRESSION_PROPERTY = /\.\$(required|type|validators)(\.|$)/;
+const EXPRESSION_KEY_PREFIX = /\.\w+$/;
+const EXPRESSION_KEY_VALUE = /^.*\.(\w+)$/;
+const EXPRESSION_PROPERTY = /(^|\.)\$(required|type|validators)(\.|$)/;
 const MESSAGE_CONSTRUCTOR = "Expected a constructor function";
 const MESSAGE_SCHEMA_INVALID_EMPTY = "Schema must have at least one property";
 const MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED = "'<>.$required' property must be a boolean";
@@ -33,4 +34,4 @@ const TYPE_ALL = new Set([
 	"null",
 	TYPE_UNDEFINED
 ]);
-export { ERROR_NAME, EXPRESSION_HAS_NUMBER, EXPRESSION_INDEX, EXPRESSION_PROPERTY, MESSAGE_CONSTRUCTOR, MESSAGE_SCHEMA_INVALID_EMPTY, MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED, MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE, MESSAGE_SCHEMA_INVALID_TYPE, MESSAGE_VALIDATOR_INVALID_KEY, MESSAGE_VALIDATOR_INVALID_TYPE, MESSAGE_VALIDATOR_INVALID_VALUE, PROPERTY_REQUIRED, PROPERTY_TYPE, PROPERTY_VALIDATORS, SCHEMATIC_NAME, TEMPLATE_PATTERN, TYPE_ALL, TYPE_OBJECT, TYPE_UNDEFINED, VALIDATABLE_TYPES };
+export { ERROR_NAME, EXPRESSION_INDEX, EXPRESSION_KEY_PREFIX, EXPRESSION_KEY_VALUE, EXPRESSION_PROPERTY, MESSAGE_CONSTRUCTOR, MESSAGE_SCHEMA_INVALID_EMPTY, MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED, MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE, MESSAGE_SCHEMA_INVALID_TYPE, MESSAGE_VALIDATOR_INVALID_KEY, MESSAGE_VALIDATOR_INVALID_TYPE, MESSAGE_VALIDATOR_INVALID_VALUE, PROPERTY_REQUIRED, PROPERTY_TYPE, PROPERTY_VALIDATORS, SCHEMATIC_NAME, TEMPLATE_PATTERN, TYPE_ALL, TYPE_OBJECT, TYPE_UNDEFINED, VALIDATABLE_TYPES };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { isInstance } from "./is.js";
+import { instanceOf } from "./is.js";
 import { SchematicError } from "./models.js";
 import { schematic } from "./schematic.js";
-export { SchematicError, isInstance, schematic };
+export { SchematicError, instanceOf, schematic };

package/dist/is.js

@@ -1,6 +1,6 @@
 import { MESSAGE_CONSTRUCTOR } from "./constants.js";
 import { isConstructor } from "@oscarpalmer/atoms/is";
-function isInstance(constructor) {
+function instanceOf(constructor) {
 	if (!isConstructor(constructor)) throw new TypeError(MESSAGE_CONSTRUCTOR);
 	return (value) => {
 		return value instanceof constructor;
@@ -9,4 +9,4 @@ function isInstance(constructor) {
 function isSchematic(value) {
 	return typeof value === "object" && value !== null && "$schematic" in value && value["$schematic"] === true;
 }
-export { isInstance, isSchematic };
+export { instanceOf, isSchematic };

package/dist/jhunal.full.js

@@ -59,9 +59,10 @@ function join(value, delimiter) {
 	return compact(value).map(getString).join(typeof delimiter === "string" ? delimiter : "");
 }
 const ERROR_NAME = "SchematicError";
-const EXPRESSION_HAS_NUMBER = /\d+/;
 const EXPRESSION_INDEX = /\.\d+$/;
-const EXPRESSION_PROPERTY = /\.\$(required|type|validators)(\.|$)/;
+const EXPRESSION_KEY_PREFIX = /\.\w+$/;
+const EXPRESSION_KEY_VALUE = /^.*\.(\w+)$/;
+const EXPRESSION_PROPERTY = /(^|\.)\$(required|type|validators)(\.|$)/;
 const MESSAGE_CONSTRUCTOR = "Expected a constructor function";
 const MESSAGE_SCHEMA_INVALID_EMPTY = "Schema must have at least one property";
 const MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED = "'<>.$required' property must be a boolean";
@@ -93,7 +94,7 @@ const TYPE_ALL = new Set([
 	"null",
 	TYPE_UNDEFINED
 ]);
-function isInstance(constructor) {
+function instanceOf(constructor) {
 	if (!isConstructor(constructor)) throw new TypeError(MESSAGE_CONSTRUCTOR);
 	return (value) => {
 		return value instanceof constructor;
@@ -141,87 +142,77 @@ function smush(value) {
 	return typeof value === "object" && value !== null ? flattenObject(value, 0, /* @__PURE__ */ new WeakMap()) : {};
 }
 var MAX_DEPTH = 100;
-function addPropertyType(to, key, values, validators, required) {
-	if (to.keys.set.has(key)) {
-		const property = to.properties[key];
-		for (const type of values) property.types.push(type);
-	} else {
-		to.keys.array.push(key);
-		to.keys.set.add(key);
-		to.properties[key] = {
-			required,
-			types: values,
-			validators: {}
-		};
-	}
-	if (!required && !to.properties[key].types.includes(TYPE_UNDEFINED)) to.properties[key].types.push(TYPE_UNDEFINED);
-	to.properties[key].validators = validators;
+function getKeyPrefix(key) {
+	const prefix = key.replace(EXPRESSION_KEY_PREFIX, "");
+	return prefix === key ? void 0 : prefix;
 }
-function getSchema(schema) {
-	return getValidatedSchema(schema, {
-		keys: {
-			array: [],
-			set: /* @__PURE__ */ new Set()
-		},
-		properties: {}
-	});
+function getKeyValue(key) {
+	return key.replace(EXPRESSION_KEY_VALUE, "$1");
 }
-function getTypes(value, validated, prefix) {
-	const propertyTypes = [];
-	const values = Array.isArray(value) ? value : [value];
-	const { length } = values;
-	for (let index = 0; index < length; index += 1) {
-		const type = values[index];
-		if (isSchematic(type) || TYPE_ALL.has(type)) {
-			propertyTypes.push(type);
-			continue;
-		}
-		if (typeof type === "function") {
-			propertyTypes.push(isConstructor(type) ? isInstance(type) : type);
-			continue;
-		}
-		if (!isPlainObject(type)) throw new SchematicError(MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE.replace(TEMPLATE_PATTERN, prefix));
-		if (PROPERTY_TYPE in type) {
-			propertyTypes.push(...getTypes(type[PROPERTY_TYPE], validated, prefix));
-			continue;
-		}
-		const { [PROPERTY_REQUIRED]: required, ...nested } = type;
-		if (PROPERTY_REQUIRED in type && typeof required !== "boolean") throw new SchematicError(MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED.replace(TEMPLATE_PATTERN, prefix));
-		addPropertyType(validated, prefix, [TYPE_OBJECT], {}, required !== false);
-		propertyTypes.push(TYPE_OBJECT);
-		getValidatedSchema(nested, validated, prefix);
-	}
-	return propertyTypes;
-}
-function getValidatedSchema(schema, validated, prefix) {
-	const smushed = smush(schema);
+function getProperties(original) {
+	if (Object.keys(original).length === 0) throw new SchematicError(MESSAGE_SCHEMA_INVALID_EMPTY);
+	const smushed = smush(original);
 	const keys = Object.keys(smushed);
-	const { length } = keys;
-	const arrayKeys = /* @__PURE__ */ new Set();
-	const noPrefix = prefix == null;
-	prefix = noPrefix ? "" : `${prefix}.`;
-	for (let index = 0; index < length; index += 1) {
-		const key = keys[index];
+	const keysLength = keys.length;
+	const properties = [];
+	for (let keyIndex = 0; keyIndex < keysLength; keyIndex += 1) {
+		const key = keys[keyIndex];
+		if (EXPRESSION_INDEX.test(key) || EXPRESSION_PROPERTY.test(key)) continue;
+		const keyPrefix = getKeyPrefix(key);
+		const keyValue = getKeyValue(key);
 		const value = smushed[key];
-		if (Array.isArray(value)) arrayKeys.add(key);
-		if (EXPRESSION_PROPERTY.test(key)) continue;
-		if (EXPRESSION_HAS_NUMBER.test(key) && arrayKeys.has(key.replace(EXPRESSION_INDEX, ""))) continue;
+		const types = [];
 		let required = true;
 		let validators = {};
-		const isObject = isPlainObject(value);
-		if (isObject && PROPERTY_REQUIRED in value) {
-			if (typeof value[PROPERTY_REQUIRED] !== "boolean") throw new SchematicError(MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED.replace(TEMPLATE_PATTERN, key));
-			required = value[PROPERTY_REQUIRED] === true;
+		if (isPlainObject(value)) {
+			required = getRequired(key, value) ?? required;
+			validators = getValidators(value[PROPERTY_VALIDATORS]);
+			if (PROPERTY_TYPE in value) types.push(...getTypes(key, value[PROPERTY_TYPE]));
+			else types.push(TYPE_OBJECT);
+		} else types.push(...getTypes(key, value));
+		if (!required && !types.includes(TYPE_UNDEFINED)) types.push(TYPE_UNDEFINED);
+		properties.push({
+			types,
+			validators,
+			key: {
+				full: key,
+				prefix: keyPrefix,
+				value: keyValue
+			},
+			required: required && !types.includes(TYPE_UNDEFINED)
+		});
+	}
+	return properties;
+}
+function getRequired(key, value) {
+	if (!(PROPERTY_REQUIRED in value)) return;
+	if (typeof value[PROPERTY_REQUIRED] !== "boolean") throw new SchematicError(MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED.replace(TEMPLATE_PATTERN, key));
+	return value[PROPERTY_REQUIRED];
+}
+function getTypes(key, original) {
+	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(schematic(value));
+				break;
+			case isSchematic(value):
+				types.push(value);
+				break;
+			case TYPE_ALL.has(value):
+				types.push(value);
+				break;
+			default: throw new SchematicError(MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE.replace(TEMPLATE_PATTERN, key));
 		}
-		if (isObject && PROPERTY_VALIDATORS in value) validators = getValidators(value[PROPERTY_VALIDATORS]);
-		const prefixedKey = `${prefix}${key}`;
-		const types = getTypes(value, validated, prefixedKey);
-		if (types.length === 0) throw new SchematicError(MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE.replace(TEMPLATE_PATTERN, key));
-		addPropertyType(validated, prefixedKey, types, validators, required);
 	}
-	if (noPrefix) validated.keys.array.sort();
-	if (noPrefix && validated.keys.array.length === 0) throw new SchematicError(MESSAGE_SCHEMA_INVALID_EMPTY);
-	return validated;
+	if (types.length === 0) throw new SchematicError(MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE.replace(TEMPLATE_PATTERN, key));
+	return types;
 }
 function getValidators(original) {
 	const validators = {};
@@ -240,35 +231,27 @@ function getValidators(original) {
 	}
 	return validators;
 }
-function validateType(type, property, value) {
-	switch (true) {
-		case typeof type === "function": return type(value);
-		case typeof type === "string": return validators[type](value) && (property.validators[type]?.every((validator) => validator(value)) ?? true);
-		default: return type.is(value);
-	}
-}
-function validateValue(validated, obj) {
-	if (typeof obj !== "object" || obj === null) return false;
-	const { keys, properties } = validated;
-	const keysLength = keys.array.length;
-	const ignore = /* @__PURE__ */ new Set();
-	const smushed = smush(obj);
-	outer: for (let keyIndex = 0; keyIndex < keysLength; keyIndex += 1) {
-		const key = keys.array[keyIndex];
-		const prefix = key.replace(EXPRESSION_SUFFIX, "");
-		if (ignore.has(prefix)) continue;
-		const property = properties[key];
-		const value = smushed[key];
-		if (value === void 0 && property.required && !property.types.includes(TYPE_UNDEFINED)) return false;
-		const typesLength = property.types.length;
-		if (typesLength === 1) {
-			if (!validateType(property.types[0], property, value)) return false;
+function validateObject(obj, properties) {
+	if (!isPlainObject(obj)) return false;
+	const ignoredKeys = /* @__PURE__ */ new Set();
+	const propertiesLength = properties.length;
+	let key;
+	let value;
+	outer: for (let propertyIndex = 0; propertyIndex < propertiesLength; propertyIndex += 1) {
+		const property = properties[propertyIndex];
+		if (ignoredKeys.has(property.key.prefix)) {
+			key = void 0;
+			ignoredKeys.add(property.key.full);
 			continue;
 		}
+		key = property.key.full;
+		value = obj[key];
+		if (value === void 0 && property.required) return false;
+		const typesLength = property.types.length;
 		for (let typeIndex = 0; typeIndex < typesLength; typeIndex += 1) {
 			const type = property.types[typeIndex];
-			if (validateType(type, property, value)) {
-				if (type !== "object") ignore.add(key);
+			if (validateValue(type, property, value)) {
+				ignoredKeys.add(property.key.full);
 				continue outer;
 			}
 		}
@@ -276,7 +259,13 @@ function validateValue(validated, obj) {
 	}
 	return true;
 }
-const EXPRESSION_SUFFIX = /\.\w+$/;
+function validateValue(type, property, value) {
+	switch (true) {
+		case typeof type === "function": return type(value);
+		case isSchematic(type): return type.is(value);
+		default: return validators[type](value) && (property.validators[type]?.every((validator) => validator(value)) ?? true);
+	}
+}
 const validators = {
 	array: Array.isArray,
 	bigint: (value) => typeof value === "bigint",
@@ -284,7 +273,7 @@ const validators = {
 	date: (value) => value instanceof Date,
 	function: (value) => typeof value === "function",
 	null: (value) => value === null,
-	number: (value) => typeof value === "number" && !Number.isNaN(value),
+	number: (value) => typeof value === "number",
 	object: (value) => typeof value === "object" && value !== null,
 	string: (value) => typeof value === "string",
 	symbol: (value) => typeof value === "symbol",
@@ -294,20 +283,21 @@ const validators = {
 * A schematic for validating objects
 */
 var Schematic = class {
-	#schema;
-	constructor(schema) {
+	#properties;
+	constructor(properties) {
 		Object.defineProperty(this, SCHEMATIC_NAME, { value: true });
-		this.#schema = schema;
+		this.#properties = properties;
 	}
 	/**
 	* Does the value match the schema?
 	*/
 	is(value) {
-		return validateValue(this.#schema, value);
+		return validateObject(value, this.#properties);
 	}
 };
 function schematic(schema) {
+	if (isSchematic(schema)) return schema;
 	if (!isPlainObject(schema)) throw new SchematicError(MESSAGE_SCHEMA_INVALID_TYPE);
-	return new Schematic(getSchema(schema));
+	return new Schematic(getProperties(schema));
 }
-export { SchematicError, isInstance, schematic };
+export { SchematicError, instanceOf, schematic };

package/dist/schematic.js

@@ -1,26 +1,28 @@
 import { MESSAGE_SCHEMA_INVALID_TYPE, SCHEMATIC_NAME } from "./constants.js";
+import { isSchematic } from "./is.js";
 import { SchematicError } from "./models.js";
-import { getSchema } from "./validation/schema.validation.js";
-import { validateValue } from "./validation/value.validation.js";
+import { getProperties } from "./validation/property.validation.js";
+import { validateObject } from "./validation/value.validation.js";
 import { isPlainObject } from "@oscarpalmer/atoms/is";
 /**
 * A schematic for validating objects
 */
 var Schematic = class {
-	#schema;
-	constructor(schema) {
+	#properties;
+	constructor(properties) {
 		Object.defineProperty(this, SCHEMATIC_NAME, { value: true });
-		this.#schema = schema;
+		this.#properties = properties;
 	}
 	/**
 	* Does the value match the schema?
 	*/
 	is(value) {
-		return validateValue(this.#schema, value);
+		return validateObject(value, this.#properties);
 	}
 };
 function schematic(schema) {
+	if (isSchematic(schema)) return schema;
 	if (!isPlainObject(schema)) throw new SchematicError(MESSAGE_SCHEMA_INVALID_TYPE);
-	return new Schematic(getSchema(schema));
+	return new Schematic(getProperties(schema));
 }
 export { Schematic, schematic };

package/dist/validation/property.validation.js

@@ -0,0 +1,96 @@
+import { EXPRESSION_INDEX, EXPRESSION_KEY_PREFIX, EXPRESSION_KEY_VALUE, EXPRESSION_PROPERTY, MESSAGE_SCHEMA_INVALID_EMPTY, MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED, MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE, MESSAGE_VALIDATOR_INVALID_KEY, MESSAGE_VALIDATOR_INVALID_TYPE, MESSAGE_VALIDATOR_INVALID_VALUE, PROPERTY_REQUIRED, PROPERTY_TYPE, PROPERTY_VALIDATORS, TYPE_ALL, TYPE_OBJECT, TYPE_UNDEFINED, VALIDATABLE_TYPES } from "../constants.js";
+import { instanceOf, isSchematic } from "../is.js";
+import { SchematicError } from "../models.js";
+import { schematic } from "../schematic.js";
+import { isConstructor, isPlainObject } from "@oscarpalmer/atoms/is";
+import { smush } from "@oscarpalmer/atoms/value/misc";
+function getKeyPrefix(key) {
+	const prefix = key.replace(EXPRESSION_KEY_PREFIX, "");
+	return prefix === key ? void 0 : prefix;
+}
+function getKeyValue(key) {
+	return key.replace(EXPRESSION_KEY_VALUE, "$1");
+}
+function getProperties(original) {
+	if (Object.keys(original).length === 0) throw new SchematicError(MESSAGE_SCHEMA_INVALID_EMPTY);
+	const smushed = smush(original);
+	const keys = Object.keys(smushed);
+	const keysLength = keys.length;
+	const properties = [];
+	for (let keyIndex = 0; keyIndex < keysLength; keyIndex += 1) {
+		const key = keys[keyIndex];
+		if (EXPRESSION_INDEX.test(key) || EXPRESSION_PROPERTY.test(key)) continue;
+		const keyPrefix = getKeyPrefix(key);
+		const keyValue = getKeyValue(key);
+		const value = smushed[key];
+		const types = [];
+		let required = true;
+		let validators = {};
+		if (isPlainObject(value)) {
+			required = getRequired(key, value) ?? required;
+			validators = getValidators(value[PROPERTY_VALIDATORS]);
+			if ("$type" in value) types.push(...getTypes(key, value[PROPERTY_TYPE]));
+			else types.push(TYPE_OBJECT);
+		} else types.push(...getTypes(key, value));
+		if (!required && !types.includes("undefined")) types.push(TYPE_UNDEFINED);
+		properties.push({
+			types,
+			validators,
+			key: {
+				full: key,
+				prefix: keyPrefix,
+				value: keyValue
+			},
+			required: required && !types.includes("undefined")
+		});
+	}
+	return properties;
+}
+function getRequired(key, value) {
+	if (!("$required" in value)) return;
+	if (typeof value["$required"] !== "boolean") throw new SchematicError(MESSAGE_SCHEMA_INVALID_PROPERTY_REQUIRED.replace("<>", key));
+	return value[PROPERTY_REQUIRED];
+}
+function getTypes(key, original) {
+	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(schematic(value));
+				break;
+			case isSchematic(value):
+				types.push(value);
+				break;
+			case TYPE_ALL.has(value):
+				types.push(value);
+				break;
+			default: throw new SchematicError(MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE.replace("<>", key));
+		}
+	}
+	if (types.length === 0) throw new SchematicError(MESSAGE_SCHEMA_INVALID_PROPERTY_TYPE.replace("<>", key));
+	return types;
+}
+function getValidators(original) {
+	const validators = {};
+	if (original == null) return validators;
+	if (!isPlainObject(original)) throw new TypeError(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(MESSAGE_VALIDATOR_INVALID_KEY.replace("<>", key));
+		const value = original[key];
+		validators[key] = (Array.isArray(value) ? value : [value]).filter((item) => {
+			if (typeof item !== "function") throw new TypeError(MESSAGE_VALIDATOR_INVALID_VALUE.replace("<>", key));
+			return true;
+		});
+	}
+	return validators;
+}
+export { getProperties };

package/dist/validation/value.validation.js

@@ -1,34 +1,26 @@
-import "../constants.js";
-import { smush } from "@oscarpalmer/atoms/value/misc";
-function validateType(type, property, value) {
-	switch (true) {
-		case typeof type === "function": return type(value);
-		case typeof type === "string": return validators[type](value) && (property.validators[type]?.every((validator) => validator(value)) ?? true);
-		default: return type.is(value);
-	}
-}
-function validateValue(validated, obj) {
-	if (typeof obj !== "object" || obj === null) return false;
-	const { keys, properties } = validated;
-	const keysLength = keys.array.length;
-	const ignore = /* @__PURE__ */ new Set();
-	const smushed = smush(obj);
-	outer: for (let keyIndex = 0; keyIndex < keysLength; keyIndex += 1) {
-		const key = keys.array[keyIndex];
-		const prefix = key.replace(EXPRESSION_SUFFIX, "");
-		if (ignore.has(prefix)) continue;
-		const property = properties[key];
-		const value = smushed[key];
-		if (value === void 0 && property.required && !property.types.includes("undefined")) return false;
-		const typesLength = property.types.length;
-		if (typesLength === 1) {
-			if (!validateType(property.types[0], property, value)) return false;
+import { isSchematic } from "../is.js";
+import { isPlainObject } from "@oscarpalmer/atoms/is";
+function validateObject(obj, properties) {
+	if (!isPlainObject(obj)) return false;
+	const ignoredKeys = /* @__PURE__ */ new Set();
+	const propertiesLength = properties.length;
+	let key;
+	let value;
+	outer: for (let propertyIndex = 0; propertyIndex < propertiesLength; propertyIndex += 1) {
+		const property = properties[propertyIndex];
+		if (ignoredKeys.has(property.key.prefix)) {
+			key = void 0;
+			ignoredKeys.add(property.key.full);
 			continue;
 		}
+		key = property.key.full;
+		value = obj[key];
+		if (value === void 0 && property.required) return false;
+		const typesLength = property.types.length;
 		for (let typeIndex = 0; typeIndex < typesLength; typeIndex += 1) {
 			const type = property.types[typeIndex];
-			if (validateType(type, property, value)) {
-				if (type !== "object") ignore.add(key);
+			if (validateValue(type, property, value)) {
+				ignoredKeys.add(property.key.full);
 				continue outer;
 			}
 		}
@@ -36,7 +28,13 @@ function validateValue(validated, obj) {
 	}
 	return true;
 }
-var EXPRESSION_SUFFIX = /\.\w+$/;
+function validateValue(type, property, value) {
+	switch (true) {
+		case typeof type === "function": return type(value);
+		case isSchematic(type): return type.is(value);
+		default: return validators[type](value) && (property.validators[type]?.every((validator) => validator(value)) ?? true);
+	}
+}
 var validators = {
 	array: Array.isArray,
 	bigint: (value) => typeof value === "bigint",
@@ -44,10 +42,10 @@ var validators = {
 	date: (value) => value instanceof Date,
 	function: (value) => typeof value === "function",
 	null: (value) => value === null,
-	number: (value) => typeof value === "number" && !Number.isNaN(value),
+	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
 };
-export { validateType, validateValue };
+export { validateObject };

package/package.json

@@ -45,5 +45,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.ts",
-	"version": "0.11.0"
+	"version": "0.12.0"
 }

package/src/constants.ts

@@ -2,11 +2,13 @@ import type {ValueName} from './models';
 
 export const ERROR_NAME = 'SchematicError';
 
-export const EXPRESSION_HAS_NUMBER = /\d+/;
-
 export const EXPRESSION_INDEX = /\.\d+$/;
 
-export const EXPRESSION_PROPERTY = /\.\$(required|type|validators)(\.|$)/;
+export const EXPRESSION_KEY_PREFIX = /\.\w+$/;
+
+export const EXPRESSION_KEY_VALUE = /^.*\.(\w+)$/;
+
+export const EXPRESSION_PROPERTY = /(^|\.)\$(required|type|validators)(\.|$)/;
 
 export const MESSAGE_CONSTRUCTOR = 'Expected a constructor function';
 

package/src/index.ts

@@ -1,3 +1,3 @@
-export {isInstance} from './is';
+export {instanceOf} from './is';
 export {SchematicError, type Schema, type TypedSchema} from './models';
 export {schematic, type Schematic} from './schematic';

package/src/is.ts

@@ -3,7 +3,7 @@ import {MESSAGE_CONSTRUCTOR, SCHEMATIC_NAME} from './constants';
 import type {Constructor} from './models';
 import type {Schematic} from './schematic';
 
-export function isInstance<Instance>(
+export function instanceOf<Instance>(
 	constructor: Constructor<Instance>,
 ): (value: unknown) => value is Instance {
 	if (!isConstructor(constructor)) {

package/src/models.ts

@@ -1,4 +1,4 @@
-import type {PlainObject, Simplify} from '@oscarpalmer/atoms/models';
+import type {GenericCallback, PlainObject, Simplify} from '@oscarpalmer/atoms/models';
 import {ERROR_NAME} from './constants';
 import type {Schematic} from './schematic';
 
@@ -122,10 +122,16 @@ type RequiredKeys<Value> = Exclude<keyof Value, OptionalKeys<Value>>;
  */
 export type Schema = SchemaIndex;
 
-type SchemaEntry = Constructor | SchemaProperty | Schematic<unknown> | ValueName | NestedSchema;
+type SchemaEntry =
+	| Constructor
+	| Schema
+	| SchemaProperty
+	| Schematic<unknown>
+	| ValueName
+	| ((value: unknown) => boolean);
 
 interface SchemaIndex {
-	[key: string]: SchemaEntry | SchemaEntry[];
+	[key: string]: NestedSchema | SchemaEntry | SchemaEntry[];
 }
 
 /**
@@ -137,7 +143,12 @@ export type SchemaProperty = {
 	$validators?: PropertyValidators<SchemaPropertyType | SchemaPropertyType[]>;
 };
 
-type SchemaPropertyType = Constructor | Schema | Schematic<unknown> | ValueName;
+type SchemaPropertyType =
+	| Constructor
+	| Schema
+	| Schematic<unknown>
+	| ValueName
+	| ((value: unknown) => boolean);
 
 export class SchematicError extends Error {
 	constructor(message: string) {
@@ -279,25 +290,24 @@ type UnwrapSingle<Value extends unknown[]> = Value extends [infer Only]
 		: Value;
 
 export type ValidatedProperty = {
+	key: ValidatedPropertyKey;
 	required: boolean;
 	types: ValidatedPropertyType[];
 	validators: ValidatedPropertyValidators;
 };
 
-export type ValidatedPropertyType = Schematic<unknown> | ValueName;
+export type ValidatedPropertyKey = {
+	full: string;
+	prefix: string | undefined;
+	value: string;
+};
+
+export type ValidatedPropertyType = GenericCallback | Schematic<unknown> | ValueName;
 
 export type ValidatedPropertyValidators = {
 	[Key in ValueName]?: Array<(value: unknown) => boolean>;
 };
 
-export type ValidatedSchema = {
-	keys: {
-		array: string[];
-		set: Set<string>;
-	};
-	properties: Record<string, ValidatedProperty>;
-};
-
 /**
  * Valid type name strings
  */