refactor(forms) : Change interface AsyncValidatorFn

modules/@angular/forms/src/directives/normalize_validator.ts

@@ -8,7 +8,7 @@
 
 import {AbstractControl} from '../model';
 
-import {AsyncValidatorFn, Validator, ValidatorFn} from './validators';
+import {AsyncValidatorFn, Validator, ValidatorFn, AsyncValidator} from './validators';
 
 export function normalizeValidator(validator: ValidatorFn | Validator): ValidatorFn {
   if ((<Validator>validator).validate) {
@@ -18,9 +18,9 @@ export function normalizeValidator(validator: ValidatorFn | Validator): Validato
   }
 }
 
-export function normalizeAsyncValidator(validator: AsyncValidatorFn | Validator): AsyncValidatorFn {
-  if ((<Validator>validator).validate) {
-    return (c: AbstractControl) => (<Validator>validator).validate(c);
+export function normalizeAsyncValidator(validator: AsyncValidatorFn | AsyncValidator): AsyncValidatorFn {
+  if ((<AsyncValidator>validator).validate) {
+    return (c: AbstractControl) => (<AsyncValidator>validator).validate(c);
   } else {
     return <AsyncValidatorFn>validator;
   }

modules/@angular/forms/src/directives/validators.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {Directive, Input, OnChanges, Provider, SimpleChanges, forwardRef} from '@angular/core';
+import {Observable} from 'rxjs/Observable';
 import {AbstractControl} from '../model';
 import {NG_VALIDATORS, Validators} from '../validators';
 
@@ -33,6 +34,30 @@ export interface Validator {
   registerOnValidatorChange?(fn: () => void): void;
 }
 
+/**
+ * An interface that can be implemented by classes that can act as AsyncValidators.
+ *
+ * ## Usage
+ *
+ * ```typescript
+ * @Directive({
+ *   selector: '[custom-async-validator]',
+ *   providers: [{provide: NG_ASYNC_VALIDATORS, useExisting: CustomAsyncValidatorDirective, multi: true}]
+ * })
+ * class CustomAsyncValidatorDirective implements AsyncValidator {
+ *   validate(c: Control): Observable<{[key: string]: any}> {
+ *    return Observable.of({custom: true});
+ *   }
+ * }
+ * ```
+ *
+ * @stable
+ */
+export interface AsyncValidator {
+  validate(c: AbstractControl): Promise<{[key: string]: any}> | Observable<{[key: string]: any}>;
+  registerOnValidatorChange?(fn: () => void): void;
+}
+
 export const REQUIRED_VALIDATOR: Provider = {
   provide: NG_VALIDATORS,
   useExisting: forwardRef(() => RequiredValidator),
@@ -159,7 +184,7 @@ export interface ValidatorFn { (c: AbstractControl): {[key: string]: any}; }
  * @stable
  */
 export interface AsyncValidatorFn {
-  (c: AbstractControl): any /*Promise<{[key: string]: any}>|Observable<{[key: string]: any}>*/;
+  (c: AbstractControl): Promise<{[key: string]: any}>|Observable<{[key: string]: any}>;
 }
 
 /**

modules/@angular/forms/test/validators_spec.ts

@@ -26,7 +26,7 @@ export function main() {
   class AsyncValidatorDirective {
     constructor(private expected: string, private error: any) {}
 
-    validate(c: any): {[key: string]: any;} {
+    validate(c: any): Observable<{[key: string]: any;}> {
       return Observable.create((obs: any) => {
         const error = this.expected !== c.value ? this.error : null;
         obs.next(error);
@@ -271,7 +271,7 @@ export function main() {
            ]);
 
            let value: any /** TODO #9100 */ = null;
-           (<Promise<any>>c(new FormControl('invalid'))).then(v => value = v);
+           (<Promise<{[key: string]: any}>>c(new FormControl('invalid'))).then(v => value = v);
 
            tick(1);
 
@@ -283,7 +283,7 @@ export function main() {
                [normalizeAsyncValidator(new AsyncValidatorDirective('expected', {'one': true}))]);
 
            let value: any = null;
-           c(new FormControl()).then((v: any) => value = v);
+           (<Promise<{[key: string]: any}>>c(new FormControl())).then((v: any) => value = v);
            tick(1);
 
            expect(value).toEqual({'one': true});

tools/public_api_guard/forms/index.d.ts

@@ -103,7 +103,11 @@ export declare class AbstractFormGroupDirective extends ControlContainer impleme
 
 /** @stable */
 export interface AsyncValidatorFn {
-    (c: AbstractControl): any;
+    (c: AbstractControl): Promise<{
+        [key: string]: any;
+    }> | Observable<{
+        [key: string]: any;
+    }>;
 }
 
 /** @stable */