feat(forms): add support for Validator

Currently, the only way for a directive to export a validator is by providing a function. This makes it ackward to write validators that depend on directive inputs. In addition to supporting functions as validators, classes implementing the Validator interface are supported too.
This commit is contained in:
vsavkin
2015-10-28 16:54:27 -07:00
committed by Victor Savkin
parent 9c63a471bb
commit 547e011abe
12 changed files with 123 additions and 64 deletions
@@ -32,11 +32,12 @@ import {
DefaultValueAccessor,
CheckboxControlValueAccessor,
SelectControlValueAccessor,
QueryList
QueryList,
Validator
} from 'angular2/core';
import {selectValueAccessor} from 'angular2/src/core/forms/directives/shared';
import {selectValueAccessor, composeValidators} from 'angular2/src/core/forms/directives/shared';
import {SimpleChange} from 'angular2/src/core/change_detection';
@@ -49,6 +50,10 @@ class DummyControlValueAccessor implements ControlValueAccessor {
writeValue(obj: any): void { this.writtenValue = obj; }
}
class CustomValidatorDirective implements Validator {
validate(c: Control): {[key: string]: any} { return {"custom": true}; }
}
export function main() {
describe("Form Directives", () => {
var defaultAccessor;
@@ -97,6 +102,21 @@ export function main() {
expect(() => selectValueAccessor(dir, [customAccessor, customAccessor])).toThrowError();
});
});
describe("composeValidators", () => {
it("should compose functions", () => {
var dummy1 = (_) => ({"dummy1": true});
var dummy2 = (_) => ({"dummy2": true});
var v = composeValidators([dummy1, dummy2]);
expect(v(new Control(""))).toEqual({"dummy1": true, "dummy2": true});
});
it("should compose validator directives", () => {
var dummy1 = (_) => ({"dummy1": true});
var v = composeValidators([dummy1, new CustomValidatorDirective()]);
expect(v(new Control(""))).toEqual({"dummy1": true, "custom": true});
});
});
});
describe("NgFormModel", () => {
@@ -113,7 +133,7 @@ export function main() {
});
form.form = formModel;
loginControlDir = new NgControlName(form, [], [defaultAccessor]);
loginControlDir = new NgControlName(form, [Validators.required], [defaultAccessor]);
loginControlDir.name = "login";
loginControlDir.valueAccessor = new DummyControlValueAccessor();
});
@@ -147,8 +167,6 @@ export function main() {
});
it("should set up validator", () => {
loginControlDir.validators = [Validators.required];
expect(formModel.find(["login"]).valid).toBe(true);
// this will add the required validator and recalculate the validity
@@ -335,7 +353,7 @@ export function main() {
};
beforeEach(() => {
controlDir = new NgFormControl([], [defaultAccessor]);
controlDir = new NgFormControl([Validators.required], [defaultAccessor]);
controlDir.valueAccessor = new DummyControlValueAccessor();
control = new Control(null);
@@ -353,8 +371,6 @@ export function main() {
});
it("should set up validator", () => {
controlDir.validators = [Validators.required];
expect(control.valid).toBe(true);
// this will add the required validator and recalculate the validity
@@ -368,7 +384,7 @@ export function main() {
var ngModel;
beforeEach(() => {
ngModel = new NgModel([], [defaultAccessor]);
ngModel = new NgModel([Validators.required], [defaultAccessor]);
ngModel.valueAccessor = new DummyControlValueAccessor();
});
@@ -385,8 +401,6 @@ export function main() {
});
it("should set up validator", () => {
ngModel.validators = [Validators.required];
expect(ngModel.control.valid).toBe(true);
// this will add the required validator and recalculate the validity
@@ -31,10 +31,13 @@ import {
NgFor,
NgForm,
Validators,
forwardRef,
Validator
} from 'angular2/core';
import {By} from 'angular2/src/core/debug';
import {ListWrapper} from 'angular2/src/core/facade/collection';
import {ObservableWrapper} from 'angular2/src/core/facade/async';
import {CONST_EXPR} from 'angular2/src/core/facade/lang';
export function main() {
describe("integration tests", () => {
+3 -10
View File
@@ -414,11 +414,10 @@ var NG_API = [
'DecimalPipe.transform()',
'RequiredValidator',
'MinLengthValidator',
'MinLengthValidator.minLength',
'MinLengthValidator.minLength=',
'MinLengthValidator.validate()',
'MaxLengthValidator',
'MaxLengthValidator.maxLength',
'MaxLengthValidator.maxLength=',
'MaxLengthValidator.validate()',
'Validator:dart',
'DefaultValueAccessor',
'DefaultValueAccessor.onChange',
'DefaultValueAccessor.onChange=',
@@ -686,8 +685,6 @@ var NG_API = [
'NgControlName.update=',
'NgControlName.valid',
'NgControlName.validator',
'NgControlName.validators',
'NgControlName.validators=',
'NgControlName.value',
'NgControlName.valueAccessor',
'NgControlName.valueAccessor=',
@@ -745,8 +742,6 @@ var NG_API = [
'NgFormControl.update=',
'NgFormControl.valid',
'NgFormControl.validator',
'NgFormControl.validators',
'NgFormControl.validators=',
'NgFormControl.value',
'NgFormControl.valueAccessor',
'NgFormControl.valueAccessor=',
@@ -802,8 +797,6 @@ var NG_API = [
'NgModel.update=',
'NgModel.valid',
'NgModel.validator',
'NgModel.validators',
'NgModel.validators=',
'NgModel.value',
'NgModel.valueAccessor',
'NgModel.valueAccessor=',