pols-validator 1.0.1 → 2.0.0

package/dist/validate.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validate = void 0;
+const pols_utils_1 = require("pols-utils");
+const validate = (target, rules) => {
+    const errorMessages = [];
+    if (typeof target == 'string')
+        target = target.trim();
+    const isEmpty = target == null || (typeof target == 'string' && !target);
+    const label = rules.label ?? 'Este valor';
+    if (rules.required && isEmpty) {
+        return {
+            error: true,
+            success: false,
+            messages: [`'${label}' es requerido`]
+        };
+    }
+    if (isEmpty) {
+        return {
+            error: false,
+            success: true,
+            result: rules.default
+        };
+    }
+    const wrapper = {
+        value: pols_utils_1.PUtils.clone(target),
+        label
+    };
+    for (const validationFunction of rules.collection) {
+        const result = validationFunction(wrapper);
+        if (!result)
+            continue;
+        if (typeof result == 'string') {
+            errorMessages.push(result);
+            break;
+        }
+        else {
+            errorMessages.push(...result);
+        }
+    }
+    if (errorMessages.length) {
+        return {
+            error: true,
+            success: false,
+            messages: errorMessages
+        };
+    }
+    else {
+        return {
+            error: false,
+            success: true,
+            result: wrapper.value
+        };
+    }
+};
+exports.validate = validate;

package/package.json

@@ -1,12 +1,13 @@
 {
 	"name": "pols-validator",
-	"version": "1.0.1",
+	"version": "2.0.0",
 	"main": "dist/index.js",
 	"module": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"scripts": {
 		"build": "npx tsc",
-		"test": "npx ts-node-dev -r tsconfig-paths/register --project tsconfig.json"
+		"test": "npx ts-node-dev -r tsconfig-paths/register --project tsconfig.json",
+		"export": "npm run build && npm publish"
 	},
 	"author": "Jean Paul Sánchez mendoza",
 	"license": "ISC",
@@ -21,6 +22,6 @@
 		"typescript-eslint": "^8.11.0"
 	},
 	"dependencies": {
-		"pols-utils": "^1.1.2"
+		"pols-utils": "^1.3.5"
 	}
 }

package/src/index.ts

@@ -1,87 +1,4 @@
-import { PUtils } from "pols-utils"
-import { Rules } from "./rules"
-import { RulesEngine, RulesParams, Wrapper } from "./rulesEngine"
-export { RulesEngine } from './rulesEngine'
+import { PRules } from "./rules"
+import { PRulesParams } from "./rulesEngine"
 
-export type EvaluateResponse<T> = {
-	error: false
-	success: true
-	result: T
-} | {
-	error: true
-	success: false
-	messages: string[]
-}
-
-export const validate = <T>(target: unknown, rules: RulesEngine): EvaluateResponse<T> => {
-	const errorMessages: string[] = []
-
-	if (typeof target == 'string') target = target.trim()
-
-	const isEmpty = target == null || (typeof target == 'string' && !target)
-	const label = rules.label ?? 'Este valor'
-
-	if (rules.required && isEmpty) {
-		return {
-			error: true,
-			success: false,
-			messages: [`'${label}' es requerido`]
-		}
-	}
-
-	if (isEmpty) {
-		return {
-			error: false,
-			success: true,
-			result: rules.default as T
-		}
-	}
-
-	const wrapper: Wrapper<T> = {
-		value: PUtils.clone(target) as T,
-		label
-	}
-	for (const validationFunction of Object.values(rules.collection)) {
-		const result = validationFunction(wrapper)
-		if (!result) continue
-		if (typeof result == 'string') {
-			errorMessages.push(result)
-			break
-		} else {
-			if (wrapper.value == null || typeof wrapper.value != 'object') throw new Error(`El valor no es un objeto para ser validado contra un esquema: ${wrapper.value}`)
-
-			const newResult: Record<string, unknown> = {}
-			for (const key in result.schema) {
-				const rulesInside = result.schema[key]
-				const labelIndise = rulesInside.label ?? key
-				rulesInside.label = `${result.prefix ? `${result.prefix} ` : ''}${labelIndise}`
-
-				newResult[key] = wrapper.value[key]
-
-				const result2 = validate(newResult[key], rulesInside)
-				if (result2.error == true) {
-					errorMessages.push(...result2.messages)
-				} else {
-					newResult[key] = result2.result
-				}
-			}
-			wrapper.value = newResult as T
-		}
-	}
-
-	if (errorMessages.length) {
-		return {
-			error: true,
-			success: false,
-			messages: errorMessages
-		}
-	} else {
-		return {
-			error: false,
-			success: true,
-			result: wrapper.value
-		}
-	}
-}
-
-export const rules = (params?: RulesParams) => new Rules(params)
+export const rules = (params?: PRulesParams) => new PRules(params)

package/src/rules.ts

@@ -1,9 +1,49 @@
 import { PDate, PUtils } from "pols-utils"
-import { RulesEngine, Wrapper } from "./rulesEngine"
+import { PRulesEngine, PRulesWrapper } from "./rulesEngine"
 
-export class Rules extends RulesEngine {
+const isObject = (context: PRules, wrapper: PRulesWrapper, schema?: Record<string, PRules>) => {
+	const message = `'${wrapper.label}' debe ser un objeto`
+
+	if (typeof wrapper.value == 'string') {
+		try {
+			wrapper.value = JSON.parse(wrapper.value)
+		} catch {
+			return message
+		}
+		if (PUtils.getType(wrapper.value) != 'Object') return message
+	} else {
+		if (PUtils.getType(wrapper.value) != 'Object') {
+			return message
+		}
+	}
+
+	/* Realiza la validación de cada propiedad */
+	const newWrapperValue: Record<string, unknown> = {}
+	const errorMessages: string[] = []
+	for (const key in schema) {
+		const rulesInside = schema[key]
+		const labelIndise = rulesInside.label ?? key
+		rulesInside.label = `${context.label ? `${context.label}${context.separator}` : ''}${labelIndise}`
+
+		newWrapperValue[key] = wrapper.value[key]
+
+		const result2 = rulesInside.validate(newWrapperValue[key])
+		if (result2.error == true) {
+			errorMessages.push(...result2.messages)
+		} else {
+			newWrapperValue[key] = result2.result
+		}
+	}
+	if (errorMessages.length) {
+		return errorMessages
+	} else {
+		wrapper.value = newWrapperValue
+	}
+}
+
+export class PRules extends PRulesEngine {
 	isAlphanumeric() {
-		this.add(this.isAlphanumeric.name, (wrapper: Wrapper) => {
+		this.add(this.isAlphanumeric.name, (wrapper: PRulesWrapper) => {
 			if (typeof wrapper.value == 'number') {
 				wrapper.value = wrapper.value.toString()
 			} else if (typeof wrapper.value != 'string') {
@@ -15,14 +55,14 @@ export class Rules extends RulesEngine {
 
 	isEmailAddress() {
 		this.isAlphanumeric()
-		this.add(this.isEmailAddress.name, (wrapper: Wrapper) => {
+		this.add(this.isEmailAddress.name, (wrapper: PRulesWrapper) => {
 			if (!(wrapper.value as string).match(/^[^\s@]+@[^\s@]+\.[^\s@]{2,}$/)) return `'${wrapper.label}' debe ser una dirección de correo`
 		})
 		return this
 	}
 
 	isDateTime() {
-		this.add(this.isDateTime.name, (wrapper: Wrapper) => {
+		this.add(this.isDateTime.name, (wrapper: PRulesWrapper) => {
 			const message = `'${wrapper.label}' tiene un formato de fecha y hora no válido`
 			if (typeof wrapper.value == 'string' || typeof wrapper.value == 'number' || wrapper.value instanceof Date || wrapper.value instanceof PDate) {
 				const newDate = new PDate(wrapper.value)
@@ -36,13 +76,13 @@ export class Rules extends RulesEngine {
 	}
 
 	isDate() {
-		return this.isDateTime().add(this.isDate.name, (wrapper: Wrapper<PDate>) => {
+		return this.isDateTime().add(this.isDate.name, (wrapper: PRulesWrapper<PDate>) => {
 			wrapper.value.clearTime()
 		})
 	}
 
 	isTime() {
-		this.add(this.isTime.name, (wrapper: Wrapper) => {
+		this.add(this.isTime.name, (wrapper: PRulesWrapper) => {
 			const message = `'${wrapper.label}' contiene un formato de hora no válido`
 			const value = wrapper.value.toString()
 			const parts = value.replace(/[.,]/g, ':').replace('m', '').match(/^([0-2]?[0-9])(:?)([0-5]?[0-9]?)(:?)([0-5]?[0-9]?)([ap]?)\.?m?\.?$/)
@@ -71,14 +111,14 @@ export class Rules extends RulesEngine {
 
 	match(pattern: RegExp) {
 		this.isAlphanumeric()
-		this.add(this.match.name, (wrapper: Wrapper) => {
+		this.add(this.match.name, (wrapper: PRulesWrapper) => {
 			if (!(wrapper.value as string).match(pattern)) return `'${wrapper.label}' no cumple con el formato de texto deseado`
 		})
 		return this
 	}
 
 	isNumber() {
-		this.add(this.isNumber.name, (wrapper: Wrapper) => {
+		this.add(this.isNumber.name, (wrapper: PRulesWrapper) => {
 			const message = `'${wrapper.label}' debe ser un número`
 			const value = Number(wrapper.value)
 			if (isNaN(value) || value == Infinity) return message
@@ -89,7 +129,7 @@ export class Rules extends RulesEngine {
 
 	isInteger() {
 		this.isNumber()
-		this.add(this.isInteger.name, (wrapper: Wrapper) => {
+		this.add(this.isInteger.name, (wrapper: PRulesWrapper) => {
 			if (wrapper.value != Math.floor(wrapper.value as number)) return `'${wrapper.label}' debe ser un número entero`
 		})
 		return this
@@ -105,120 +145,93 @@ export class Rules extends RulesEngine {
 
 	onlyNumbers() {
 		this.isAlphanumeric()
-		this.add(this.onlyNumbers.name, (wrapper: Wrapper) => {
+		this.add(this.onlyNumbers.name, (wrapper: PRulesWrapper) => {
 			if (!(wrapper.value as string).match(/^[0-9]+$/)) return `'${wrapper.label}' debe contener sólo números`
 		})
 		return this
 	}
 
 	maxLength(limit: number) {
-		this.isAlphanumeric()
-		this.add(this.maxLength.name, (wrapper: Wrapper) => {
-			if ((wrapper.value as string).length > limit) return `'${wrapper.label}' debe contener '${limit} ${limit == 1 ? 'caracter' : 'caracteres'}' como máximo`
+		return this.add(this.maxLength.name, (wrapper: PRulesWrapper) => {
+			if (wrapper.value instanceof Array) {
+				return wrapper.value.length > limit ? `'${wrapper.label}' debe contener '${limit} ${limit == 1 ? 'elementos' : 'elementos'}' como máximo` : null
+			} else if (typeof wrapper.value == 'string') {
+				return wrapper.value.length > limit ? `'${wrapper.label}' debe contener '${limit} ${limit == 1 ? 'caracter' : 'caracteres'}' como máximo` : null
+			} else {
+				return `'${wrapper.label}' no es de un tipo válido`
+			}
 		})
-		return this
 	}
 
-	// maxCount(limit: number) {
-	// 	this.isArray()
-	// 	this.add(this.maxLength.name, (wrapper: Wrapper<unknown[]>) => {
-	// 		if (wrapper.value.length > limit) return `'${wrapper.label}' debe contener '${limit} ${limit == 1 ? 'elemento' : 'elementos'}' como máximo`
-	// 	})
-	// 	return this
-	// }
-
 	minLength(limit: number) {
-		this.isAlphanumeric()
-		this.add(this.minLength.name, (wrapper: Wrapper) => {
-			if ((wrapper.value as string).length < limit) return `'${wrapper.label}' debe contener '${limit} ${limit == 1 ? 'caracter' : 'caracteres'}' como mínimo`
+		return this.add(this.minLength.name, (wrapper: PRulesWrapper) => {
+			if (wrapper.value instanceof Array) {
+				return wrapper.value.length < limit ? `'${wrapper.label}' debe contener '${limit} ${limit == 1 ? 'elementos' : 'elementos'}' como mínimo` : null
+			} else if (typeof wrapper.value == 'string') {
+				return wrapper.value.length < limit ? `'${wrapper.label}' debe contener '${limit} ${limit == 1 ? 'caracter' : 'caracteres'}' como mínimo` : null
+			} else {
+				return `'${wrapper.label}' no es de un tipo válido`
+			}
 		})
-		return this
 	}
 
-	length(limit: number) {
-		this.isAlphanumeric()
-		this.add(this.length.name, (wrapper: Wrapper) => {
-			if ((wrapper.value as string).length != limit) return `'${wrapper.label}' debe contener sólo '${limit} ${limit == 1 ? 'caracter' : 'caracteres'}'`
+	hasFixedLength(limit: number) {
+		return this.add(this.hasFixedLength.name, (wrapper: PRulesWrapper) => {
+			if (wrapper.value instanceof Array) {
+				return wrapper.value.length < limit ? `'${wrapper.label}' debe contener sólo '${limit} ${limit == 1 ? 'elementos' : 'elementos'}'` : null
+			} else if (typeof wrapper.value == 'string') {
+				return wrapper.value.length < limit ? `'${wrapper.label}' debe contener sólo '${limit} ${limit == 1 ? 'caracter' : 'caracteres'}'` : null
+			} else {
+				return `'${wrapper.label}' no es de un tipo válido`
+			}
 		})
-		return this
 	}
 
 	left(limit: number) {
-		this.isAlphanumeric()
-		this.add(this.length.name, (wrapper: Wrapper) => {
+		return this.isAlphanumeric().add(this.left.name, (wrapper: PRulesWrapper) => {
 			(wrapper.value as string) = (wrapper.value as string).substring(0, limit)
 		})
-		return this
 	}
 
-	// isArray(checkingElements?: (i: number) => RulesEngine) {
-	// 	this.add(this.isArray.name, (wrapper: Wrapper) => {
-	// 		const message = `'${wrapper.label}' debe ser una lista de elementos`
-	// 		if (typeof wrapper.value == 'string') {
-	// 			try {
-	// 				const value = JSON.parse(wrapper.value)
-	// 				if (!(value instanceof Array)) return message
-	// 				wrapper.value = value
-	// 			} catch (err) {
-	// 				return message
-	// 			}
-	// 		} else {
-	// 			if (!(wrapper.value instanceof Array)) return message
-	// 		}
-	// 		if (checkingElements) {
-	// 			const value = wrapper.value as unknown[]
-	// 			const messageErrors: string[] = []
-	// 			const result: unknown[] = []
-	// 			for (const [i, t] of value.entries()) {
-	// 				const p = wrapper.validator({
-	// 					value: t
-	// 				}, {
-	// 					value: {
-	// 						...checkingElements(i),
-	// 						to: undefined,
-	// 					}
-	// 				})
-	// 				if (p.error == true) {
-	// 					messageErrors.push(...p.messages)
-	// 				} else {
-	// 					result.push(p.result['value'])
-	// 				}
-	// 			}
-	// 			if (messageErrors.length) {
-	// 				return messageErrors
-	// 			} else {
-	// 				wrapper.value = result
-	// 			}
-	// 		}
-	// 	})
-	// 	return this
-	// }
-
-	// isArrayOfObjects(checkingElements?: (i: number) => FieldsStructure, prefixString?: (i: number) => string) {
-	// 	this.isArray()
-	// 	this.add(this.isArrayOfObjects.name, (wrapper: Wrapper<unknown[]>) => {
-	// 		const message = `'${wrapper.label}' debe ser una lista de objetos`
-	// 		const messages: string[] = []
-	// 		for (const [i, v] of wrapper.value.entries()) {
-	// 			const result = isObject(v)
-	// 			if (result.error == true) return message
-	// 			wrapper.value[i] = result.result
-	// 			if (checkingElements) {
-	// 				const v = wrapper.validator(wrapper.value[i], checkingElements(i), prefixString?.(i))
-	// 				if (v.error == true) {
-	// 					messages.push(...v.messages)
-	// 				} else {
-	// 					wrapper.value[i] = v.result
-	// 				}
-	// 			}
-	// 		}
-	// 		if (messages.length) return messages
-	// 	})
-	// 	return this
-	// }
+	isArray() {
+		return this.add(this.isArray.name, (wrapper: PRulesWrapper) => {
+			const message = `'${wrapper.label}' debe ser una lista de elementos`
+			if (typeof wrapper.value == 'string') {
+				try {
+					const value = JSON.parse(wrapper.value)
+					if (!(value instanceof Array)) return message
+					wrapper.value = value
+				} catch (err) {
+					return message
+				}
+			} else {
+				if (!(wrapper.value instanceof Array)) return message
+			}
+		})
+	}
+
+	isArrayOfObjects(schema?: (index: number) => Record<string, PRules>, prefix?: (index: number) => string) {
+		return this.isArray().add(this.isArrayOfObjects.name, (wrapper: PRulesWrapper<unknown[]>) => {
+			const messages: string[] = []
+			for (const [i, value] of wrapper.value.entries()) {
+				const v = isObject(this, {
+					label: prefix?.(i) ?? `Item ${i}`,
+					value
+				}, schema?.(i))
+				if (v) {
+					if (v instanceof Array) {
+						messages.push(...v)
+					} else {
+						messages.push(v)
+					}
+				}
+			}
+			if (messages.length) return messages
+		})
+	}
 
 	isIn(...elements: unknown[]) {
-		this.add(this.isIn.name, (wrapper: Wrapper) => {
+		this.add(this.isIn.name, (wrapper: PRulesWrapper) => {
 			if (wrapper.value instanceof Array) {
 				for (const v of wrapper.value) {
 					if (!elements.includes(v)) return `'${wrapper.label}' no contiene valores válidos`
@@ -231,84 +244,57 @@ export class Rules extends RulesEngine {
 	}
 
 	isNotIn(...elements: unknown[]) {
-		this.add(this.isNotIn.name, (wrapper: Wrapper) => {
+		this.add(this.isNotIn.name, (wrapper: PRulesWrapper) => {
 			if (elements.includes(wrapper.value)) return `'${wrapper.label}' no tiene un valor válido`
 		})
 		return this
 	}
 
-	// hasElements(checkingElements?: (i: number) => FieldStructure) {
-	// 	this.isArray(checkingElements)
-	// 	this.add(this.hasElements.name, (wrapper: Wrapper) => {
-	// 		if (!(wrapper.value as unknown[]).length) return `'${wrapper.label}' debe ser una lista con al menos un elemento`
-	// 	})
-	// 	return this
-	// }
+	hasElements() {
+		return this.isArray().add(this.hasElements.name, (wrapper: PRulesWrapper<unknown[]>) => {
+			if (!wrapper.value.length) return `'${wrapper.label}' debe contenedor al menos un elemento`
+		})
+	}
 
 	gt(limit: number) {
-		this.isNumber()
-		this.add(this.gt.name, (wrapper: Wrapper) => {
+		return this.isNumber().add(this.gt.name, (wrapper: PRulesWrapper) => {
 			if (wrapper.value as number <= limit) return `'${wrapper.label}' debe ser mayor a '${limit}'`
 		})
-		return this
 	}
 
 	gte(limit: number) {
-		this.isNumber()
-		this.add(this.gte.name, (wrapper: Wrapper) => {
+		return this.isNumber().add(this.gte.name, (wrapper: PRulesWrapper) => {
 			if (wrapper.value as number < limit) return `'${wrapper.label}' debe ser mayor o igual a '${limit}'`
 		})
-		return this
 	}
 
 	lt(limit: number) {
-		this.isNumber()
-		this.add(this.lt.name, (wrapper: Wrapper) => {
+		return this.isNumber().add(this.lt.name, (wrapper: PRulesWrapper) => {
 			if (wrapper.value as number >= limit) return `'${wrapper.label}' debe ser menor a '${limit}'`
 		})
-		return this
 	}
 
 	lte(limit: number) {
-		return this
-			.isNumber()
-			.add(this.lte.name, (wrapper: Wrapper) => {
-				if (wrapper.value as number > limit) return `'${wrapper.label}' debe ser menor o igual a '${limit}'`
-			})
+		return this.isNumber().add(this.lte.name, (wrapper: PRulesWrapper) => {
+			if (wrapper.value as number > limit) return `'${wrapper.label}' debe ser menor o igual a '${limit}'`
+		})
 	}
 
 	beforeOrSameAsNow() {
-		return this
-			.isDateTime()
-			.add(this.beforeOrSameAsNow.name, (wrapper: Wrapper<PDate>) => {
-				const now = new PDate
-				if (wrapper.value.time > now.time) return `'${wrapper.label}' debe ser anterior o igual a 'ahora'`
-			})
+		return this.isDateTime().add(this.beforeOrSameAsNow.name, (wrapper: PRulesWrapper<PDate>) => {
+			const now = new PDate
+			if (wrapper.value.time > now.time) return `'${wrapper.label}' debe ser anterior o igual a 'ahora'`
+		})
 	}
 
-	isObject(schema?: Record<string, RulesEngine>, prefix?: string) {
-		return this.add(this.isObject.name, (wrapper: Wrapper) => {
-			const message = `'${wrapper.label}' debe ser un objeto`
-
-			if (typeof wrapper.value == 'string') {
-				try {
-					wrapper.value = JSON.parse(wrapper.value)
-				} catch {
-					return message
-				}
-				if (PUtils.getType(wrapper.value) != 'Object') return message
-			} else {
-				if (PUtils.getType(wrapper.value) != 'Object') {
-					return message
-				}
-			}
-
-			return { schema, prefix }
+	isObject(schema?: Record<string, PRules>) {
+		return this.add(this.isObject.name, (wrapper: PRulesWrapper) => {
+			return isObject(this, wrapper, schema)
 		})
 	}
 
 	isBoolean() {
-		this.add(this.isBoolean.name, (wrapper: Wrapper) => {
+		return this.add(this.isBoolean.name, (wrapper: PRulesWrapper) => {
 			const message = `'${wrapper.label}' debe ser de tipo booleano`
 			if (typeof wrapper.value == 'string') {
 				const value = wrapper.value.trim().toUpperCase()
@@ -352,12 +338,11 @@ export class Rules extends RulesEngine {
 				return typeof wrapper.value == 'boolean' ? null : message
 			}
 		})
-		return this
 	}
 
 	upper() {
 		this.isAlphanumeric()
-		this.add(this.upper.name, (wrapper: Wrapper) => {
+		this.add(this.upper.name, (wrapper: PRulesWrapper) => {
 			wrapper.value = (wrapper.value as string).toUpperCase()
 		})
 		return this
@@ -365,7 +350,7 @@ export class Rules extends RulesEngine {
 
 	lower() {
 		this.isAlphanumeric()
-		this.add(this.lower.name, (wrapper: Wrapper) => {
+		this.add(this.lower.name, (wrapper: PRulesWrapper) => {
 			wrapper.value = (wrapper.value as string).toLowerCase()
 		})
 		return this
@@ -373,7 +358,7 @@ export class Rules extends RulesEngine {
 
 	decodeURI() {
 		this.isAlphanumeric()
-		this.add(this.decodeURI.name, (wrapper: Wrapper) => {
+		this.add(this.decodeURI.name, (wrapper: PRulesWrapper) => {
 			wrapper.value = decodeURI(wrapper.value as string)
 		})
 		return this
@@ -381,7 +366,7 @@ export class Rules extends RulesEngine {
 
 	round(decimals: number) {
 		this.isNumber()
-		this.add(this.round.name, (wrapper: Wrapper) => {
+		this.add(this.round.name, (wrapper: PRulesWrapper) => {
 			wrapper.value = PUtils.Number.round(wrapper.value as number, decimals)
 		})
 		return this
@@ -390,7 +375,7 @@ export class Rules extends RulesEngine {
 	/* Reemplaza todos los dobles (o más) espacios juntos por uno simple */
 	cleanDoubleSpaces() {
 		this.isAlphanumeric()
-		this.add(this.cleanDoubleSpaces.name, (wrapper: Wrapper) => {
+		this.add(this.cleanDoubleSpaces.name, (wrapper: PRulesWrapper) => {
 			wrapper.value = (wrapper.value as string).replace(/\s{2,}/g, ' ')
 		})
 		return this
@@ -398,7 +383,7 @@ export class Rules extends RulesEngine {
 
 	noSpaces() {
 		this.isAlphanumeric()
-		this.add(this.noSpaces.name, (wrapper: Wrapper) => {
+		this.add(this.noSpaces.name, (wrapper: PRulesWrapper) => {
 			if ((wrapper.value as string).match(/\s/)) return `'${wrapper.label}' no debe contener 'espacios'`
 		})
 		return this
@@ -406,21 +391,21 @@ export class Rules extends RulesEngine {
 
 
 	replace(search: string | RegExp, replace: string | ((substring: string, ...args: any[]) => string)) {
-		return this.isAlphanumeric().add(this.replace.name, (wrapper: Wrapper) => {
+		return this.isAlphanumeric().add(this.replace.name, (wrapper: PRulesWrapper) => {
 			wrapper.value = (wrapper.value as string).replace(search, replace as any)
 		})
 	}
 
 	capitalize() {
 		this.isAlphanumeric()
-		this.add(this.capitalize.name, (wrapper: Wrapper) => {
+		this.add(this.capitalize.name, (wrapper: PRulesWrapper) => {
 			wrapper.value = PUtils.String.capitalize(wrapper.value as string)
 		})
 		return this
 	}
 
 	split(separator: string | RegExp) {
-		return this.isAlphanumeric().add(this.split.name, (wrapper: Wrapper) => {
+		return this.isAlphanumeric().add(this.split.name, (wrapper: PRulesWrapper) => {
 			wrapper.value = (wrapper.value as any).split(separator)
 		})
 	}