pols-validator 2.0.0 → 2.1.1

package/dist/rules.d.ts

@@ -15,8 +15,7 @@ export declare class PRules extends PRulesEngine {
     minLength(limit: number): this;
     hasFixedLength(limit: number): this;
     left(limit: number): this;
-    isArray(): this;
-    isArrayOfObjects(schema?: (index: number) => Record<string, PRules>, prefix?: (index: number) => string): this;
+    isArray(rulesGenerator?: (index: number) => PRules): this;
     isIn(...elements: unknown[]): this;
     isNotIn(...elements: unknown[]): this;
     hasElements(): this;
@@ -36,5 +35,7 @@ export declare class PRules extends PRulesEngine {
     replace(search: string | RegExp, replace: string | ((substring: string, ...args: any[]) => string)): this;
     capitalize(): this;
     split(separator: string | RegExp): this;
+    floor(): this;
+    ceil(): this;
 }
 //# sourceMappingURL=rules.d.ts.map

package/dist/rules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../src/rules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAiB,MAAM,eAAe,CAAA;AA0C3D,qBAAa,MAAO,SAAQ,YAAY;IACvC,cAAc;IAWd,cAAc;IAQd,UAAU;IAcV,MAAM;IAMN,MAAM;IA4BN,KAAK,CAAC,OAAO,EAAE,MAAM;IAQrB,QAAQ;IAUR,SAAS;IAQT,SAAS;IAIT,eAAe;IAIf,WAAW;IAQX,SAAS,CAAC,KAAK,EAAE,MAAM;IAYvB,SAAS,CAAC,KAAK,EAAE,MAAM;IAYvB,cAAc,CAAC,KAAK,EAAE,MAAM;IAY5B,IAAI,CAAC,KAAK,EAAE,MAAM;IAMlB,OAAO;IAiBP,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM;IAoBvG,IAAI,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAa3B,OAAO,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAO9B,WAAW;IAMX,EAAE,CAAC,KAAK,EAAE,MAAM;IAMhB,GAAG,CAAC,KAAK,EAAE,MAAM;IAMjB,EAAE,CAAC,KAAK,EAAE,MAAM;IAMhB,GAAG,CAAC,KAAK,EAAE,MAAM;IAMjB,iBAAiB;IAOjB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMxC,SAAS;IA+CT,KAAK;IAQL,KAAK;IAQL,SAAS;IAQT,KAAK,CAAC,QAAQ,EAAE,MAAM;IAStB,iBAAiB;IAQjB,QAAQ;IASR,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC;IAMlG,UAAU;IAQV,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAKhC"}
+{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../src/rules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAiB,MAAM,eAAe,CAAA;AA0C3D,qBAAa,MAAO,SAAQ,YAAY;IACvC,cAAc;IAWd,cAAc;IAQd,UAAU;IAcV,MAAM;IAMN,MAAM;IA4BN,KAAK,CAAC,OAAO,EAAE,MAAM;IAQrB,QAAQ;IAUR,SAAS;IAQT,SAAS;IAIT,eAAe;IAIf,WAAW;IAQX,SAAS,CAAC,KAAK,EAAE,MAAM;IAYvB,SAAS,CAAC,KAAK,EAAE,MAAM;IAYvB,cAAc,CAAC,KAAK,EAAE,MAAM;IAY5B,IAAI,CAAC,KAAK,EAAE,MAAM;IAMlB,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM;IA+BlD,IAAI,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAY3B,OAAO,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAM9B,WAAW;IAMX,EAAE,CAAC,KAAK,EAAE,MAAM;IAMhB,GAAG,CAAC,KAAK,EAAE,MAAM;IAMjB,EAAE,CAAC,KAAK,EAAE,MAAM;IAMhB,GAAG,CAAC,KAAK,EAAE,MAAM;IAMjB,iBAAiB;IAOjB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMxC,SAAS;IA+CT,KAAK;IAQL,KAAK;IAQL,SAAS;IAQT,KAAK,CAAC,QAAQ,EAAE,MAAM;IAStB,iBAAiB;IAQjB,QAAQ;IASR,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC;IAMlG,UAAU;IAQV,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAMhC,KAAK;IAML,IAAI;CAKJ"}

package/dist/rules.js

@@ -197,7 +197,7 @@ class PRules extends rulesEngine_1.PRulesEngine {
             wrapper.value = wrapper.value.substring(0, limit);
         });
     }
-    isArray() {
+    isArray(rulesGenerator) {
         return this.add(this.isArray.name, (wrapper) => {
             const message = `'${wrapper.label}' debe ser una lista de elementos`;
             if (typeof wrapper.value == 'string') {
@@ -215,23 +215,17 @@ class PRules extends rulesEngine_1.PRulesEngine {
                 if (!(wrapper.value instanceof Array))
                     return message;
             }
-        });
-    }
-    isArrayOfObjects(schema, prefix) {
-        return this.isArray().add(this.isArrayOfObjects.name, (wrapper) => {
+            /* Si se ha definido un generador de reglas, se itera cada elemento */
             const messages = [];
-            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);
-                    }
+            for (const [i, element] of wrapper.value.entries()) {
+                const rules = rulesGenerator(i);
+                rules.label = `${this.label ? `${this.label}${rules.label ? this.separator : ''}` : ''}${rules.label ?? ''}`;
+                const result = rules.validate(element);
+                if (result.error == true) {
+                    messages.push(...result.messages);
+                }
+                else {
+                    wrapper.value[i] = result.result;
                 }
             }
             if (messages.length)
@@ -239,7 +233,7 @@ class PRules extends rulesEngine_1.PRulesEngine {
         });
     }
     isIn(...elements) {
-        this.add(this.isIn.name, (wrapper) => {
+        return this.add(this.isIn.name, (wrapper) => {
             if (wrapper.value instanceof Array) {
                 for (const v of wrapper.value) {
                     if (!elements.includes(v))
@@ -251,14 +245,12 @@ class PRules extends rulesEngine_1.PRulesEngine {
                     return `'${wrapper.label}' no tiene un valor válido`;
             }
         });
-        return this;
     }
     isNotIn(...elements) {
-        this.add(this.isNotIn.name, (wrapper) => {
+        return this.add(this.isNotIn.name, (wrapper) => {
             if (elements.includes(wrapper.value))
                 return `'${wrapper.label}' no tiene un valor válido`;
         });
-        return this;
     }
     hasElements() {
         return this.isArray().add(this.hasElements.name, (wrapper) => {
@@ -413,5 +405,15 @@ class PRules extends rulesEngine_1.PRulesEngine {
             wrapper.value = wrapper.value.split(separator);
         });
     }
+    floor() {
+        return this.isNumber().add(this.floor.name, (wrapper) => {
+            wrapper.value = Math.floor(wrapper.value);
+        });
+    }
+    ceil() {
+        return this.isNumber().add(this.ceil.name, (wrapper) => {
+            wrapper.value = Math.ceil(wrapper.value);
+        });
+    }
 }
 exports.PRules = PRules;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pols-validator",
-	"version": "2.0.0",
+	"version": "2.1.1",
 	"main": "dist/index.js",
 	"module": "dist/index.js",
 	"types": "dist/index.d.ts",

package/src/rules.ts

@@ -193,8 +193,8 @@ export class PRules extends PRulesEngine {
 		})
 	}
 
-	isArray() {
-		return this.add(this.isArray.name, (wrapper: PRulesWrapper) => {
+	isArray(rulesGenerator?: (index: number) => PRules) {
+		return this.add(this.isArray.name, (wrapper: PRulesWrapper<unknown[]>) => {
 			const message = `'${wrapper.label}' debe ser una lista de elementos`
 			if (typeof wrapper.value == 'string') {
 				try {
@@ -207,23 +207,17 @@ export class PRules extends PRulesEngine {
 			} 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[]>) => {
+			/* Si se ha definido un generador de reglas, se itera cada elemento */
 			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)
-					}
+			for (const [i, element] of wrapper.value.entries()) {
+				const rules = rulesGenerator(i)
+				rules.label = `${this.label ? `${this.label}${rules.label ? this.separator : ''}` : ''}${rules.label ?? ''}`
+				const result = rules.validate(element)
+				if (result.error == true) {
+					messages.push(...result.messages)
+				} else {
+					wrapper.value[i] = result.result
 				}
 			}
 			if (messages.length) return messages
@@ -231,7 +225,7 @@ export class PRules extends PRulesEngine {
 	}
 
 	isIn(...elements: unknown[]) {
-		this.add(this.isIn.name, (wrapper: PRulesWrapper) => {
+		return 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`
@@ -240,14 +234,12 @@ export class PRules extends PRulesEngine {
 				if (!elements.includes(wrapper.value)) return `'${wrapper.label}' no tiene un valor válido`
 			}
 		})
-		return this
 	}
 
 	isNotIn(...elements: unknown[]) {
-		this.add(this.isNotIn.name, (wrapper: PRulesWrapper) => {
+		return this.add(this.isNotIn.name, (wrapper: PRulesWrapper) => {
 			if (elements.includes(wrapper.value)) return `'${wrapper.label}' no tiene un valor válido`
 		})
-		return this
 	}
 
 	hasElements() {
@@ -405,8 +397,20 @@ export class PRules extends PRulesEngine {
 	}
 
 	split(separator: string | RegExp) {
-		return this.isAlphanumeric().add(this.split.name, (wrapper: PRulesWrapper) => {
-			wrapper.value = (wrapper.value as any).split(separator)
+		return this.isAlphanumeric().add(this.split.name, (wrapper: PRulesWrapper<string>) => {
+			wrapper.value = wrapper.value.split(separator) as any
+		})
+	}
+
+	floor() {
+		return this.isNumber().add(this.floor.name, (wrapper: PRulesWrapper<number>) => {
+			wrapper.value = Math.floor(wrapper.value)
+		})
+	}
+
+	ceil() {
+		return this.isNumber().add(this.ceil.name, (wrapper: PRulesWrapper<number>) => {
+			wrapper.value = Math.ceil(wrapper.value)
 		})
 	}
 }

package/test/validaciones.ts

@@ -7,7 +7,10 @@ const original = {
 	cuatro: {
 		aaa: '2024-10-28 23:56:00',
 		bbb: 'fgh'
-	}
+	},
+	cinco: [23, {
+		ccc: 'asd'
+	}]
 }
 
 const otro = 56
@@ -18,7 +21,10 @@ const resultados = rules({ label: 'Body' }).isObject({
 	tres: rules({ required: true }).isNaturalNoZero(),
 	cuatro: rules({ label: 'Cuatro', default: {} }).isObject({
 		aaa: rules().isDateTime()
-	})
-}).validate(original)
+	}),
+	cinco: rules().isArray(i => rules({ label: `Elem ${i + 1}` }).isObject({
+		ccc: rules().isNumber()
+	}))
+}).validate<typeof original>(original)
 
 console.log(original, resultados)