feat: Pass propertyName to ValidateIf condition function

typestack · Feb 17, 2024 · 6929a4a · 6929a4a
1 parent 6de99ff
commit 6929a4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/decorator/common/ValidateIf.ts b/src/decorator/common/ValidateIf.ts
@@ -8,7 +8,7 @@ import { getMetadataStorage } from '../../metadata/MetadataStorage';
  * Ignores the other validators on a property when the provided condition function returns false.
  */
 export function ValidateIf(
-  condition: (object: any, value: any) => boolean,
+  condition: (object: any, value: any, propertyName: string) => boolean,
   validationOptions?: ValidationOptions
 ): PropertyDecorator {
   return function (object: object, propertyName: string): void {

diff --git a/src/validation/ValidationExecutor.ts b/src/validation/ValidationExecutor.ts
@@ -184,7 +184,7 @@ export class ValidationExecutor {
     const validationError = this.generateValidationError(object, value, propertyName);
     validationErrors.push(validationError);
 
-    const canValidate = this.conditionalValidations(object, value, conditionalValidationMetadatas);
+    const canValidate = this.conditionalValidations(object, value, propertyName, conditionalValidationMetadatas);
     if (!canValidate) {
       return;
     }
@@ -242,9 +242,14 @@ export class ValidationExecutor {
     return validationError;
   }
 
-  private conditionalValidations(object: object, value: any, metadatas: ValidationMetadata[]): ValidationMetadata[] {
+  private conditionalValidations(
+    object: object,
+    value: any,
+    propertyName: string,
+    metadatas: ValidationMetadata[]
+  ): ValidationMetadata[] {
     return metadatas
-      .map(metadata => metadata.constraints[0](object, value))
+      .map(metadata => metadata.constraints[0](object, value, propertyName))
       .reduce((resultA, resultB) => resultA && resultB, true);
   }