Reordered methods

Author: crsanti

lib/src/baseFormValidation.ts

@@ -38,14 +38,12 @@ export class BaseFormValidation implements FormValidation {
     }
   }
 
-  private parseFieldValidations(constraint: string, fieldValidationConstraints: FieldValidationConstraint[]) {
-    if (fieldValidationConstraints instanceof Array) {
-      fieldValidationConstraints.forEach((fieldValidationConstraint) => {
-        if (fieldValidationConstraint && typeof fieldValidationConstraint === 'object') {
-          this.addFieldValidation(constraint, fieldValidationConstraint);
-        }
-      });
-    }
+  private parseFormValidations(validationFunctions: FormValidationFunction[]) {
+    validationFunctions.forEach((validationFunction: FormValidationFunction) => {
+      if (typeof validationFunction === 'function') {
+        this.validationEngine.addFormValidation(validationFunction);
+      }
+    });
   }
 
   private parseAllFieldsValidations(fields: { [key: string]: FieldValidationConstraint[] }) {
@@ -54,12 +52,14 @@ export class BaseFormValidation implements FormValidation {
     }
   }
 
-  private parseFormValidations(validationFunctions: FormValidationFunction[]) {
-    validationFunctions.forEach((validationFunction: FormValidationFunction) => {
-      if (typeof validationFunction === 'function') {
-        this.validationEngine.addFormValidation(validationFunction);
-      }
-    });
+  private parseFieldValidations(constraint: string, fieldValidationConstraints: FieldValidationConstraint[]) {
+    if (fieldValidationConstraints instanceof Array) {
+      fieldValidationConstraints.forEach((fieldValidationConstraint) => {
+        if (fieldValidationConstraint && typeof fieldValidationConstraint === 'object') {
+          this.addFieldValidation(constraint, fieldValidationConstraint);
+        }
+      });
+    }
   }
 
   private addFieldValidation(field: string, validationConstraint: FieldValidationConstraint): FormValidation {

lib/src/validationEngine.ts

@@ -82,12 +82,6 @@ export class ValidationEngine implements IValidationEngine {
     return fullFormValidatedPromise;
   }
 
-  triggerFieldValidation(vm: any, key: string, value: any, filters: ValidationEventsFilter = consts.defaultFilter): Promise<FieldValidationResult> {
-    // updated dirty flag and perform validation
-    this.isFormChanged = false;
-    return this.validateSingleField(vm, key, value, filters);
-  }
-
   private validateGlobalFormValidations(vm: any): ValidationResult[] {
     this.asyncValidationInProgressCount++;
 
@@ -104,6 +98,12 @@ export class ValidationEngine implements IValidationEngine {
     return globalFieldResultValidations;
   }
 
+  triggerFieldValidation(vm: any, key: string, value: any, filters: ValidationEventsFilter = consts.defaultFilter): Promise<FieldValidationResult> {
+    // updated dirty flag and perform validation
+    this.isFormChanged = false;
+    return this.validateSingleField(vm, key, value, filters);
+  }
+
   // if filter is null all validations are returned (fullform validation case)
   private validateSingleField(vm: any, key: string, value: any, filters: ValidationEventsFilter = null): Promise<FieldValidationResult> {
     this.asyncValidationInProgressCount++;
@@ -137,11 +137,6 @@ export class ValidationEngine implements IValidationEngine {
     return fieldValidationResultPromise;
   }
 
-  isFieldKeyMappingDefined(key: string): boolean {
-    return this.validationsPerField[key] !== undefined &&
-      this.validationsPerField[key] !== null;
-  }
-
   addFieldValidation(
     key: string,
     validation: FieldValidationFunction,
@@ -160,15 +155,20 @@ export class ValidationEngine implements IValidationEngine {
     return this;
   }
 
+  isFieldKeyMappingDefined(key: string): boolean {
+    return this.validationsPerField[key] !== undefined &&
+      this.validationsPerField[key] !== null;
+  }
+
   addFormValidation(validation: FormValidationFunction): void {
     const validationAsync = (vm): Promise<FieldValidationResult> => {
       return Promise.resolve(validation(vm));
     }
 
-    this.validationsGlobalForm.push(validation);
+    this.validationsGlobalForm.push(validationAsync);
   }
 
   isValidationInProgress(): boolean {
-    return (this.asyncValidationInProgressCount > 0)
+    return (this.asyncValidationInProgressCount > 0);
   }
 }

lib/src/validationsDispatcher.ts

@@ -60,6 +60,11 @@ export class ValidationDispatcher {
       this.isLastElement(index, numberOfItems);
   }
 
+  //TODO: Extract to bussines?
+  private isLastElement(index: number, length: number) {
+    return index === (length - 1);
+  }
+
   fireAllFieldsValidations(
     vm: any,
     fieldsToValidate: string[],
@@ -96,11 +101,6 @@ export class ValidationDispatcher {
     return validationResultsPromises;
   }
 
-  //TODO: Extract to bussines?
-  private isLastElement(index: number, length: number) {
-    return index === (length - 1);
-  }
-
   //TODO: Extract to bussines?
   private areParametersDefined(...parameters) {
     return parameters.every(parameter => parameter);