refactor(forms): made directive names consistent

Author: vsavkin

modules/angular2/angular2.api.ts

@@ -18,8 +18,8 @@ export * from './src/core/compiler/element_injector';
 // We export the Directive *annotation* instead of the *decorator*.
 // But it breaks the build.
 export {Directive, LifecycleEvent} from './src/core/annotations_impl/annotations';
-export {FormDirective} from './src/forms/directives/form_directive';
-export {ControlContainerDirective} from './src/forms/directives/control_container_directive';
+export {Form} from './src/forms/directives/form_interface';
+export {ControlContainer} from './src/forms/directives/control_container';
 export {Injectable} from './src/di/annotations_impl';
 export {BaseQueryList} from './src/core/compiler/base_query_list';
 export {AppProtoView, AppView, AppViewContainer} from './src/core/compiler/view';

modules/angular2/forms.ts

@@ -16,7 +16,7 @@
 export * from './src/forms/model';
 export * from './src/forms/directives';
 export * from './src/forms/validators';
-export * from './src/forms/validator_directives';
+export * from './src/forms/directives/validators';
 export * from './src/forms/form_builder';
 
 import {FormBuilder} from './src/forms/form_builder';

modules/angular2/src/forms/directives.ts

@@ -1,27 +1,27 @@
 import {Type, CONST_EXPR} from 'angular2/src/facade/lang';
-import {ControlNameDirective} from './directives/control_name_directive';
-import {FormControlDirective} from './directives/form_control_directive';
-import {NgModelDirective} from './directives/ng_model_directive';
-import {ControlGroupDirective} from './directives/control_group_directive';
-import {FormModelDirective} from './directives/form_model_directive';
-import {TemplateDrivenFormDirective} from './directives/template_driven_form_directive';
+import {NgControlName} from './directives/ng_control_name';
+import {NgFormControl} from './directives/ng_form_control';
+import {NgModel} from './directives/ng_model';
+import {NgControlGroup} from './directives/ng_control_group';
+import {NgFormModel} from './directives/ng_form_model';
+import {NgForm} from './directives/ng_form';
 import {DefaultValueAccessor} from './directives/default_value_accessor';
 import {CheckboxControlValueAccessor} from './directives/checkbox_value_accessor';
 import {SelectControlValueAccessor} from './directives/select_control_value_accessor';
-import {RequiredValidatorDirective} from './validator_directives';
+import {NgRequiredValidator} from './directives/validators';
 
-export {ControlNameDirective} from './directives/control_name_directive';
-export {FormControlDirective} from './directives/form_control_directive';
-export {NgModelDirective} from './directives/ng_model_directive';
-export {ControlDirective} from './directives/control_directive';
-export {ControlGroupDirective} from './directives/control_group_directive';
-export {FormModelDirective} from './directives/form_model_directive';
-export {TemplateDrivenFormDirective} from './directives/template_driven_form_directive';
+export {NgControlName} from './directives/ng_control_name';
+export {NgFormControl} from './directives/ng_form_control';
+export {NgModel} from './directives/ng_model';
+export {NgControl} from './directives/ng_control';
+export {NgControlGroup} from './directives/ng_control_group';
+export {NgFormModel} from './directives/ng_form_model';
+export {NgForm} from './directives/ng_form';
 export {ControlValueAccessor} from './directives/control_value_accessor';
 export {DefaultValueAccessor} from './directives/default_value_accessor';
 export {CheckboxControlValueAccessor} from './directives/checkbox_value_accessor';
 export {SelectControlValueAccessor} from './directives/select_control_value_accessor';
-export {RequiredValidatorDirective} from './validator_directives';
+export {NgRequiredValidator} from './directives/validators';
 
 /**
  *
@@ -32,17 +32,17 @@ export {RequiredValidatorDirective} from './validator_directives';
  * @exportedAs angular2/forms
  */
 export const formDirectives: List<Type> = CONST_EXPR([
-  ControlNameDirective,
-  ControlGroupDirective,
+  NgControlName,
+  NgControlGroup,
 
-  FormControlDirective,
-  NgModelDirective,
-  FormModelDirective,
-  TemplateDrivenFormDirective,
+  NgFormControl,
+  NgModel,
+  NgFormModel,
+  NgForm,
 
   DefaultValueAccessor,
   CheckboxControlValueAccessor,
   SelectControlValueAccessor,
 
-  RequiredValidatorDirective
+  NgRequiredValidator
 ]);

modules/angular2/src/forms/directives/checkbox_value_accessor.ts

@@ -1,5 +1,5 @@
 import {Directive} from 'angular2/angular2';
-import {ControlDirective} from './control_directive';
+import {NgControl} from './ng_control';
 import {ControlValueAccessor} from './control_value_accessor';
 
 /**
@@ -33,7 +33,7 @@ export class CheckboxControlValueAccessor implements ControlValueAccessor {
   onChange: Function;
   onTouched: Function;
 
-  constructor(private cd: ControlDirective) {
+  constructor(private cd: NgControl) {
     this.onChange = (_) => {};
     this.onTouched = (_) => {};
     cd.valueAccessor = this;

modules/angular2/src/forms/directives/control_container.ts

@@ -0,0 +1,13 @@
+import {Form} from './form_interface';
+import {List} from 'angular2/src/facade/collection';
+
+/**
+ * A directive that contains a group of [NgControl].
+ *
+ * @exportedAs angular2/forms
+ */
+export class ControlContainer {
+  name: string;
+  get formDirective(): Form { return null; }
+  get path(): List<string> { return null; }
+}

modules/angular2/src/forms/directives/control_container_directive.ts

@@ -1,5 +1,5 @@
 import {Directive} from 'angular2/angular2';
-import {ControlDirective} from './control_directive';
+import {NgControl} from './ng_control';
 import {ControlValueAccessor} from './control_value_accessor';
 import {isBlank} from 'angular2/src/facade/lang';
 
@@ -37,7 +37,7 @@ export class DefaultValueAccessor implements ControlValueAccessor {
   onChange: Function;
   onTouched: Function;
 
-  constructor(private cd: ControlDirective) {
+  constructor(private cd: NgControl) {
     this.onChange = (_) => {};
     this.onTouched = (_) => {};
     cd.valueAccessor = this;

modules/angular2/src/forms/directives/default_value_accessor.ts

@@ -0,0 +1,12 @@
+import {NgControl} from './ng_control';
+import {NgControlGroup} from './ng_control_group';
+import {Control} from '../model';
+
+export interface Form {
+  addControl(dir: NgControl): void;
+  removeControl(dir: NgControl): void;
+  getControl(dir: NgControl): Control;
+  addControlGroup(dir: NgControlGroup): void;
+  removeControlGroup(dir: NgControlGroup): void;
+  updateModel(dir: NgControl, value: any): void;
+}

modules/angular2/src/forms/directives/form_directive.ts

@@ -7,7 +7,7 @@ import {Control} from '../model';
  *
  * @exportedAs angular2/forms
  */
-export class ControlDirective {
+export class NgControl {
   name: string = null;
   valueAccessor: ControlValueAccessor = null;
   validator: Function;