Skip to content

Commit bee8176

Browse files
committed
Updated return types for some methods
1 parent f0edbd0 commit bee8176

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

lib/src/baseFormValidation.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,32 @@ export class BaseFormValidation implements FormValidation {
4040
});
4141
}
4242

43-
validateField(vm: any, key: string, value: any, filter?: any) {
43+
validateField(vm: any, key: string, value: any, filter?: any): Promise<FieldValidationResult> {
4444
return this.validationEngine.validateSingleField(vm, key, value, filter);
4545
}
4646

47-
validateForm(vm: any) {
47+
validateForm(vm: any): Promise<FormValidationResult> {
4848
return this.validationEngine.validateForm(vm);
4949
}
5050

51-
isValidationInProgress() {
51+
isValidationInProgress(): boolean {
5252
return this.validationEngine.isValidationInProgress();
5353
}
5454

55-
isFormDirty() {
55+
isFormDirty(): boolean {
5656
return this.validationEngine.isFormDirty();
5757
}
5858

59-
isFormPristine() {
59+
isFormPristine(): boolean {
6060
return this.validationEngine.isFormPristine();
6161
}
6262

63-
addFieldValidation(key: string, validationFunction: (value: string, vm: any) => FieldValidationResult) {
63+
addFieldValidation(key: string, validationFunction: (value: string, vm: any) => FieldValidationResult): FormValidation {
6464
this.validationEngine.addFieldValidation(key, validationFunction);
6565
return this;
6666
}
6767

68-
addFieldValidationAsync(key: string, validationFunction: (value: string, vm: any) => Promise<FieldValidationResult>) {
68+
addFieldValidationAsync(key: string, validationFunction: (value: string, vm: any) => Promise<FieldValidationResult>): FormValidation {
6969
this.validationEngine.addFieldValidationAsync(key, validationFunction);
7070
return this;
7171
}

lib/src/validationEngine.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ export interface IValidationEngine {
1818
validateForm(vm: any): Promise<FormValidationResult>;
1919
triggerFieldValidation(vm: any, key: string, value: any, filter?: any): Promise<FieldValidationResult>;
2020
// TODO: Implement Issue #15
21-
addFieldValidation(key: string, validation: (value, vm) => FieldValidationResult, filter?: any);
22-
addFieldValidationAsync(key: string, validation: (value, vm) => Promise<FieldValidationResult>, filter?: any);
23-
addFormValidation(validation: FormValidationFunction);
21+
addFieldValidation(key: string, validation: (value, vm) => FieldValidationResult, filter?: any): void;
22+
addFieldValidationAsync(key: string, validation: (value, vm) => Promise<FieldValidationResult>, filter?: any): void;
23+
addFormValidation(validation: FormValidationFunction): void;
2424
isValidationInProgress(): boolean;
2525
}
2626

@@ -88,7 +88,7 @@ export class ValidationEngine implements IValidationEngine {
8888
return this.validateSingleField(vm, key, value, filter);
8989
}
9090

91-
validateGlobalFormValidations(vm: any) {
91+
validateGlobalFormValidations(vm: any): ValidationResult[] {
9292
this._asyncValidationInProgressCount++;
9393

9494
let globalFieldResultValidations: ValidationResult[] = [];
@@ -138,12 +138,12 @@ export class ValidationEngine implements IValidationEngine {
138138
return fieldValidationResultPromise;
139139
}
140140

141-
isFieldKeyMappingDefined(key: string) {
141+
isFieldKeyMappingDefined(key: string): boolean {
142142
return this._validationsPerField[key] !== undefined &&
143143
this._validationsPerField[key] !== null;
144144
}
145145

146-
addFieldValidation(key: string, validation: (value, vm) => FieldValidationResult, filter: any = consts.defaultFilter) {
146+
addFieldValidation(key: string, validation: (value, vm) => FieldValidationResult, filter: any = consts.defaultFilter): IValidationEngine {
147147
const validationAsync = (value, vm): Promise<FieldValidationResult> => {
148148
return Promise.resolve(validation(value, vm));
149149
}
@@ -152,7 +152,7 @@ export class ValidationEngine implements IValidationEngine {
152152
return this;
153153
}
154154

155-
addFieldValidationAsync(key: string, validation: (value, vm) => Promise<FieldValidationResult>, filter: any = consts.defaultFilter) {
155+
addFieldValidationAsync(key: string, validation: (value, vm) => Promise<FieldValidationResult>, filter: any = consts.defaultFilter): IValidationEngine {
156156
if (!this.isFieldKeyMappingDefined(key)) {
157157
this._validationsPerField[key] = [];
158158
}
@@ -161,7 +161,7 @@ export class ValidationEngine implements IValidationEngine {
161161
return this;
162162
}
163163

164-
addFormValidation(validation: FormValidationFunction) {
164+
addFormValidation(validation: FormValidationFunction): void {
165165
const validationAsync = (vm): Promise<FieldValidationResult> => {
166166
return Promise.resolve(validation(vm));
167167
}

0 commit comments

Comments
 (0)