Renamed some methods and parameters.

Added some missing semicolon.

Author: crsanti

lib/lcformvalidation.d.ts

@@ -11,12 +11,12 @@ export class FormValidationResult {
   formGlobalErrors: Array<FieldValidationResult>;
 }
 
-export interface ValidationFilters {
+export interface ValidationEventsFilter {
   [key: string]: boolean;
 }
 
 interface FormValidation {
-  validateField(vm: any, key: string, value: any, filter?: ValidationFilters): Promise<FieldValidationResult>;
+  validateField(vm: any, key: string, value: any, eventsFilter?: ValidationEventsFilter): Promise<FieldValidationResult>;
   validateForm(vm: any): Promise<FormValidationResult>;
   isValidationInProgress(): boolean;
   isFormDirty(): boolean;
@@ -33,13 +33,13 @@ export interface FieldValidationFunction {
   (value: any, vm: any, customParams: any): ValidationResult;
 }
 
-export interface FieldValidationConstraint extends Object {
+export interface FieldValidationConstraint{
   validator: FieldValidationFunction;
-  eventFilters?: ValidationFilters,
-  customParams?: Object
+  eventFilters?: ValidationEventsFilter;
+  customParams?: any;
 }
 
-export interface ValidationConstraints extends Object {
+export interface ValidationConstraints{
   global?: FormValidationFunction[];
   fields?: { [key: string]: FieldValidationConstraint[] }
 }

lib/src/baseFormValidation.ts

@@ -6,12 +6,12 @@ import {
   FieldValidationResult,
   FormValidationResult,
   FieldValidationConstraint,
-  ValidationFilters,
+  ValidationEventsFilter,
 } from './entities';
 import { consts } from './consts';
 
 interface FormValidation {
-  validateField(vm: any, key: string, value: any, filter?: any): Promise<FieldValidationResult>;
+  validateField(vm: any, key: string, value: any, eventsFilter?: any): Promise<FieldValidationResult>;
   validateForm(vm: any): Promise<FormValidationResult>;
   isValidationInProgress(): boolean;
   isFormDirty(): boolean;
@@ -66,14 +66,14 @@ export class BaseFormValidation implements FormValidation {
     this.validationEngine.addFieldValidation(
       constraint,
       validationConstraint.validator,
-      validationConstraint.eventFilters,
+      validationConstraint.eventsFilter,
       validationConstraint.customParams
     );
     return this;
   }
 
-  validateField(vm: any, key: string, value: any, filter?: ValidationFilters): Promise<FieldValidationResult> {
-    return this.validationEngine.triggerFieldValidation(vm, key, value, filter);
+  validateField(vm: any, key: string, value: any, eventsFilter?: ValidationEventsFilter): Promise<FieldValidationResult> {
+    return this.validationEngine.triggerFieldValidation(vm, key, value, eventsFilter);
   }
 
   validateForm(vm: any): Promise<FormValidationResult> {

lib/src/entities.ts

@@ -1,10 +1,10 @@
-export interface ValidationFilters {
+export interface ValidationEventsFilter {
   [key: string]: boolean;
 }
 
 export class FieldValidation {
   validationFn: (value, vm, customParams) => Promise<FieldValidationResult>;
-  filters: ValidationFilters;
+  eventsFilter: ValidationEventsFilter;
   customParams: any;
 }
 
@@ -51,7 +51,7 @@ export type FieldValidationFunction = SyncValidationFunction | AsyncFieldValidat
 
 export interface FieldValidationConstraint {
   validator: FieldValidationFunction;
-  eventFilters?: ValidationFilters;
+  eventsFilter?: ValidationEventsFilter;
   customParams?: any;
 }
 

lib/src/fieldValidationEventFilter.ts

@@ -1,13 +1,13 @@
-import { FieldValidation, ValidationFilters } from './entities';
+import { FieldValidation, ValidationEventsFilter } from './entities';
 
 class FieldValidationEventFilter {
 
-  public filter(fieldValidations: FieldValidation[], filters: ValidationFilters): FieldValidation[] {
+  public filter(fieldValidations: FieldValidation[], eventsFilter: ValidationEventsFilter): FieldValidation[] {
     let result: FieldValidation[] = [];
 
-    if (filters) {
+    if (eventsFilter) {
       result = fieldValidations.filter((fieldValidation) =>
-        this.matchsAnyFilter(fieldValidation, filters)
+        this.hasAnyFilter(fieldValidation, eventsFilter)
       );
     } else {
       result = fieldValidations;
@@ -16,9 +16,9 @@ class FieldValidationEventFilter {
     return result;
   }
 
-  private matchsAnyFilter(fieldValidation: FieldValidation, filters: ValidationFilters) {
-    return Object.keys(filters).some(filter =>
-      filters[filter] === fieldValidation.filters[filter]
+  private hasAnyFilter(fieldValidation: FieldValidation, eventsFilter: ValidationEventsFilter) {
+    return Object.keys(eventsFilter).some(filter =>
+      eventsFilter[filter] === fieldValidation.eventsFilter[filter]
     );
   }
 }

lib/src/spec/baseFormValidation.spec.ts

@@ -42,11 +42,11 @@ describe('formValidation tests', () => {
       const viewModel = {};
       const key = 'fullname';
       const value = '';
-      const filter = undefined;
+      const eventsFilter = undefined;
 
       // Act
       const formValidation = new BaseFormValidation(validationConstraints);
-      formValidation.validateField(viewModel, key, value, filter);
+      formValidation.validateField(viewModel, key, value, eventsFilter);
 
       // Assert
       expect(validateSingleField.calledOnce).to.be.true;
@@ -299,7 +299,7 @@ describe('formValidation tests', () => {
       const addFieldValidation = sinon.stub(ValidationEngine.prototype, 'addFieldValidation', () => { });
       const validation1 = () => new FieldValidationResult();
       const validation2 = () => new FieldValidationResult();
-      const filters = undefined;
+      const eventsFilter = undefined;
       const customParams = undefined;
       const validationConstraints: ValidationConstraints = {
         fields: {
@@ -317,8 +317,8 @@ describe('formValidation tests', () => {
 
       // Assert
       expect(addFieldValidation.calledTwice).to.be.true;
-      expect(addFieldValidation.calledWithExactly('property1', validation1, filters, customParams)).to.be.true;
-      expect(addFieldValidation.calledWithExactly('property2', validation2, filters, customParams)).to.be.true;
+      expect(addFieldValidation.calledWithExactly('property1', validation1, eventsFilter, customParams)).to.be.true;
+      expect(addFieldValidation.calledWithExactly('property2', validation2, eventsFilter, customParams)).to.be.true;
     }));
 
     it('should add multiple validations given a property haveing multiple FieldValidationConstraints', sinon.test(function () {
@@ -327,7 +327,7 @@ describe('formValidation tests', () => {
       const addFieldValidation = sinon.stub(ValidationEngine.prototype, 'addFieldValidation', () => { });
       const validation1 = () => new FieldValidationResult();
       const validation2 = () => new FieldValidationResult();
-      const filters = undefined;
+      const eventsFilter = undefined;
       const customParams = undefined;
       const validationConstraints: ValidationConstraints = {
         fields: {
@@ -343,8 +343,8 @@ describe('formValidation tests', () => {
 
       // Assert
       expect(addFieldValidation.calledTwice).to.be.true;
-      expect(addFieldValidation.calledWithExactly('property1', validation1, filters, customParams)).to.be.true;
-      expect(addFieldValidation.calledWithExactly('property1', validation2, filters, customParams)).to.be.true;
+      expect(addFieldValidation.calledWithExactly('property1', validation1, eventsFilter, customParams)).to.be.true;
+      expect(addFieldValidation.calledWithExactly('property1', validation2, eventsFilter, customParams)).to.be.true;
     }));
 
     it('should pass FieldValidationConstraints to ValidationEngine', sinon.test(function () {
@@ -353,13 +353,13 @@ describe('formValidation tests', () => {
       const addFieldValidation = sinon.stub(ValidationEngine.prototype, 'addFieldValidation', () => { });
       const validation1 = () => new FieldValidationResult();
       const customParams = { foo: 'bar' };
-      const eventFilters = { OnBlur: true };
+      const eventsFilter = { OnBlur: true };
       const validationConstraints: ValidationConstraints = {
         fields: {
           property1: [
             {
               validator: validation1,
-              eventFilters,
+              eventsFilter,
               customParams,
             },
           ]
@@ -370,7 +370,7 @@ describe('formValidation tests', () => {
       const formValidation = createFormValidation(validationConstraints);
 
       // Assert
-      expect(addFieldValidation.calledWithExactly('property1', validation1, eventFilters, customParams)).to.be.true;
+      expect(addFieldValidation.calledWithExactly('property1', validation1, eventsFilter, customParams)).to.be.true;
     }));
 
   });