test: add public api golden files

Includes a few style fixes on "* as foo" imports.

Author: Jason Choi

gulpfile.js

@@ -43,7 +43,9 @@ const entrypoints = [
   'dist/packages-dist/platform-server/index.d.ts',
   'dist/packages-dist/platform-server/testing.d.ts',
   'dist/packages-dist/http/index.d.ts',
-  'dist/packages-dist/http/testing.d.ts'
+  'dist/packages-dist/http/testing.d.ts',
+  'dist/packages-dist/forms/index.d.ts',
+  'dist/packages-dist/router/index.d.ts'
 ];
 const publicApiDir = 'tools/public_api_guard';
 const publicApiArgs = [

modules/@angular/common/src/forms-deprecated/form_builder.ts

@@ -12,7 +12,7 @@ import {StringMapWrapper} from '../facade/collection';
 import {isArray, isPresent} from '../facade/lang';
 
 import {AsyncValidatorFn, ValidatorFn} from './directives/validators';
-import * as modelModule from './model';
+import {AbstractControl, Control, ControlArray, ControlGroup} from './model';
 
 
 
@@ -67,22 +67,21 @@ export class FormBuilder {
    *
    * See the {@link ControlGroup} constructor for more details.
    */
-  group(controlsConfig: {[key: string]: any}, extra: {[key: string]: any} = null):
-      modelModule.ControlGroup {
+  group(controlsConfig: {[key: string]: any}, extra: {[key: string]: any} = null): ControlGroup {
     var controls = this._reduceControls(controlsConfig);
     var optionals = <{[key: string]: boolean}>(
         isPresent(extra) ? StringMapWrapper.get(extra, 'optionals') : null);
     var validator: ValidatorFn = isPresent(extra) ? StringMapWrapper.get(extra, 'validator') : null;
     var asyncValidator: AsyncValidatorFn =
         isPresent(extra) ? StringMapWrapper.get(extra, 'asyncValidator') : null;
-    return new modelModule.ControlGroup(controls, optionals, validator, asyncValidator);
+    return new ControlGroup(controls, optionals, validator, asyncValidator);
   }
   /**
    * Construct a new {@link Control} with the given `value`,`validator`, and `asyncValidator`.
    */
   control(value: Object, validator: ValidatorFn = null, asyncValidator: AsyncValidatorFn = null):
-      modelModule.Control {
-    return new modelModule.Control(value, validator, asyncValidator);
+      Control {
+    return new Control(value, validator, asyncValidator);
   }
 
   /**
@@ -91,26 +90,24 @@ export class FormBuilder {
    */
   array(
       controlsConfig: any[], validator: ValidatorFn = null,
-      asyncValidator: AsyncValidatorFn = null): modelModule.ControlArray {
+      asyncValidator: AsyncValidatorFn = null): ControlArray {
     var controls = controlsConfig.map(c => this._createControl(c));
-    return new modelModule.ControlArray(controls, validator, asyncValidator);
+    return new ControlArray(controls, validator, asyncValidator);
   }
 
   /** @internal */
-  _reduceControls(controlsConfig: {[k: string]: any}):
-      {[key: string]: modelModule.AbstractControl} {
-    var controls: {[key: string]: modelModule.AbstractControl} = {};
+  _reduceControls(controlsConfig: {[k: string]: any}): {[key: string]: AbstractControl} {
+    var controls: {[key: string]: AbstractControl} = {};
     StringMapWrapper.forEach(controlsConfig, (controlConfig: any, controlName: string) => {
       controls[controlName] = this._createControl(controlConfig);
     });
     return controls;
   }
 
   /** @internal */
-  _createControl(controlConfig: any): modelModule.AbstractControl {
-    if (controlConfig instanceof modelModule.Control ||
-        controlConfig instanceof modelModule.ControlGroup ||
-        controlConfig instanceof modelModule.ControlArray) {
+  _createControl(controlConfig: any): AbstractControl {
+    if (controlConfig instanceof Control || controlConfig instanceof ControlGroup ||
+        controlConfig instanceof ControlArray) {
       return controlConfig;
 
     } else if (isArray(controlConfig)) {

modules/@angular/common/src/forms-deprecated/validators.ts

@@ -12,7 +12,7 @@ import {StringMapWrapper} from '../facade/collection';
 import {isBlank, isPresent, isPromise, isString} from '../facade/lang';
 import {PromiseWrapper} from '../facade/promise';
 import {AsyncValidatorFn, ValidatorFn} from './directives/validators';
-import * as modelModule from './model';
+import {AbstractControl} from './model';
 
 /**
  * Providers for validators to be used for {@link Control}s in a form.
@@ -57,7 +57,7 @@ export class Validators {
   /**
    * Validator that requires controls to have a non-empty value.
    */
-  static required(control: modelModule.AbstractControl): {[key: string]: boolean} {
+  static required(control: AbstractControl): {[key: string]: boolean} {
     return isBlank(control.value) || (isString(control.value) && control.value == '') ?
         {'required': true} :
         null;
@@ -67,7 +67,7 @@ export class Validators {
    * Validator that requires controls to have a value of a minimum length.
    */
   static minLength(minLength: number): ValidatorFn {
-    return (control: modelModule.AbstractControl): {[key: string]: any} => {
+    return (control: AbstractControl): {[key: string]: any} => {
       if (isPresent(Validators.required(control))) return null;
       var v: string = control.value;
       return v.length < minLength ?
@@ -80,7 +80,7 @@ export class Validators {
    * Validator that requires controls to have a value of a maximum length.
    */
   static maxLength(maxLength: number): ValidatorFn {
-    return (control: modelModule.AbstractControl): {[key: string]: any} => {
+    return (control: AbstractControl): {[key: string]: any} => {
       if (isPresent(Validators.required(control))) return null;
       var v: string = control.value;
       return v.length > maxLength ?
@@ -93,7 +93,7 @@ export class Validators {
    * Validator that requires a control to match a regex to its value.
    */
   static pattern(pattern: string): ValidatorFn {
-    return (control: modelModule.AbstractControl): {[key: string]: any} => {
+    return (control: AbstractControl): {[key: string]: any} => {
       if (isPresent(Validators.required(control))) return null;
       let regex = new RegExp(`^${pattern}$`);
       let v: string = control.value;
@@ -105,7 +105,7 @@ export class Validators {
   /**
    * No-op validator.
    */
-  static nullValidator(c: modelModule.AbstractControl): {[key: string]: boolean} { return null; }
+  static nullValidator(c: AbstractControl): {[key: string]: boolean} { return null; }
 
   /**
    * Compose multiple validators into a single function that returns the union
@@ -116,7 +116,7 @@ export class Validators {
     var presentValidators = validators.filter(isPresent);
     if (presentValidators.length == 0) return null;
 
-    return function(control: modelModule.AbstractControl) {
+    return function(control: AbstractControl) {
       return _mergeErrors(_executeValidators(control, presentValidators));
     };
   }
@@ -126,7 +126,7 @@ export class Validators {
     var presentValidators = validators.filter(isPresent);
     if (presentValidators.length == 0) return null;
 
-    return function(control: modelModule.AbstractControl) {
+    return function(control: AbstractControl) {
       let promises = _executeAsyncValidators(control, presentValidators).map(_convertToPromise);
       return PromiseWrapper.all(promises).then(_mergeErrors);
     };
@@ -137,13 +137,11 @@ function _convertToPromise(obj: any): Promise<any> {
   return isPromise(obj) ? obj : ObservableWrapper.toPromise(obj);
 }
 
-function _executeValidators(
-    control: modelModule.AbstractControl, validators: ValidatorFn[]): any[] {
+function _executeValidators(control: AbstractControl, validators: ValidatorFn[]): any[] {
   return validators.map(v => v(control));
 }
 
-function _executeAsyncValidators(
-    control: modelModule.AbstractControl, validators: AsyncValidatorFn[]): any[] {
+function _executeAsyncValidators(control: AbstractControl, validators: AsyncValidatorFn[]): any[] {
   return validators.map(v => v(control));
 }
 

modules/@angular/core/src/profile/profile.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as impl from './wtf_impl';
+import {WtfScopeFn, createScope, detectWTF, endTimeRange, leave, startTimeRange} from './wtf_impl';
 
 export {WtfScopeFn} from './wtf_impl';
 
@@ -16,7 +16,7 @@ export {WtfScopeFn} from './wtf_impl';
 /**
  * True if WTF is enabled.
  */
-export var wtfEnabled = impl.detectWTF();
+export var wtfEnabled = detectWTF();
 
 function noopScope(arg0?: any, arg1?: any): any {
   return null;
@@ -52,8 +52,8 @@ function noopScope(arg0?: any, arg1?: any): any {
  *
  * @experimental
  */
-export var wtfCreateScope: (signature: string, flags?: any) => impl.WtfScopeFn =
-    wtfEnabled ? impl.createScope : (signature: string, flags?: any) => noopScope;
+export var wtfCreateScope: (signature: string, flags?: any) => WtfScopeFn =
+    wtfEnabled ? createScope : (signature: string, flags?: any) => noopScope;
 
 /**
  * Used to mark end of Scope.
@@ -65,7 +65,7 @@ export var wtfCreateScope: (signature: string, flags?: any) => impl.WtfScopeFn =
  * @experimental
  */
 export var wtfLeave: <T>(scope: any, returnValue?: T) => T =
-    wtfEnabled ? impl.leave : (s: any, r?: any) => r;
+    wtfEnabled ? leave : (s: any, r?: any) => r;
 
 /**
  * Used to mark Async start. Async are similar to scope but they don't have to be strictly nested.
@@ -81,13 +81,12 @@ export var wtfLeave: <T>(scope: any, returnValue?: T) => T =
  * @experimental
  */
 export var wtfStartTimeRange: (rangeType: string, action: string) => any =
-    wtfEnabled ? impl.startTimeRange : (rangeType: string, action: string) => null;
+    wtfEnabled ? startTimeRange : (rangeType: string, action: string) => null;
 
 /**
  * Ends a async time range operation.
  * [range] is the return value from [wtfStartTimeRange] Async ranges only work if WTF has been
  * enabled.
  * @experimental
  */
-export var wtfEndTimeRange: (range: any) => void =
-    wtfEnabled ? impl.endTimeRange : (r: any) => null;
+export var wtfEndTimeRange: (range: any) => void = wtfEnabled ? endTimeRange : (r: any) => null;

modules/@angular/forms/src/form_builder.ts

@@ -11,7 +11,7 @@ import {Injectable} from '@angular/core';
 import {AsyncValidatorFn, ValidatorFn} from './directives/validators';
 import {StringMapWrapper} from './facade/collection';
 import {isArray, isPresent} from './facade/lang';
-import * as modelModule from './model';
+import {AbstractControl, FormArray, FormControl, FormGroup} from './model';
 
 
 
@@ -63,23 +63,22 @@ export class FormBuilder {
    *
    * See the {@link FormGroup} constructor for more details.
    */
-  group(controlsConfig: {[key: string]: any}, extra: {[key: string]: any} = null):
-      modelModule.FormGroup {
+  group(controlsConfig: {[key: string]: any}, extra: {[key: string]: any} = null): FormGroup {
     var controls = this._reduceControls(controlsConfig);
     var optionals = <{[key: string]: boolean}>(
         isPresent(extra) ? StringMapWrapper.get(extra, 'optionals') : null);
     var validator: ValidatorFn = isPresent(extra) ? StringMapWrapper.get(extra, 'validator') : null;
     var asyncValidator: AsyncValidatorFn =
         isPresent(extra) ? StringMapWrapper.get(extra, 'asyncValidator') : null;
-    return new modelModule.FormGroup(controls, optionals, validator, asyncValidator);
+    return new FormGroup(controls, optionals, validator, asyncValidator);
   }
   /**
    * Construct a new {@link FormControl} with the given `value`,`validator`, and `asyncValidator`.
    */
   control(
       value: Object, validator: ValidatorFn|ValidatorFn[] = null,
-      asyncValidator: AsyncValidatorFn|AsyncValidatorFn[] = null): modelModule.FormControl {
-    return new modelModule.FormControl(value, validator, asyncValidator);
+      asyncValidator: AsyncValidatorFn|AsyncValidatorFn[] = null): FormControl {
+    return new FormControl(value, validator, asyncValidator);
   }
 
   /**
@@ -88,26 +87,24 @@ export class FormBuilder {
    */
   array(
       controlsConfig: any[], validator: ValidatorFn = null,
-      asyncValidator: AsyncValidatorFn = null): modelModule.FormArray {
+      asyncValidator: AsyncValidatorFn = null): FormArray {
     var controls = controlsConfig.map(c => this._createControl(c));
-    return new modelModule.FormArray(controls, validator, asyncValidator);
+    return new FormArray(controls, validator, asyncValidator);
   }
 
   /** @internal */
-  _reduceControls(controlsConfig: {[k: string]: any}):
-      {[key: string]: modelModule.AbstractControl} {
-    var controls: {[key: string]: modelModule.AbstractControl} = {};
+  _reduceControls(controlsConfig: {[k: string]: any}): {[key: string]: AbstractControl} {
+    var controls: {[key: string]: AbstractControl} = {};
     StringMapWrapper.forEach(controlsConfig, (controlConfig: any, controlName: string) => {
       controls[controlName] = this._createControl(controlConfig);
     });
     return controls;
   }
 
   /** @internal */
-  _createControl(controlConfig: any): modelModule.AbstractControl {
-    if (controlConfig instanceof modelModule.FormControl ||
-        controlConfig instanceof modelModule.FormGroup ||
-        controlConfig instanceof modelModule.FormArray) {
+  _createControl(controlConfig: any): AbstractControl {
+    if (controlConfig instanceof FormControl || controlConfig instanceof FormGroup ||
+        controlConfig instanceof FormArray) {
       return controlConfig;
 
     } else if (isArray(controlConfig)) {

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

@@ -12,7 +12,7 @@ import {ObservableWrapper} from './facade/async';
 import {StringMapWrapper} from './facade/collection';
 import {isBlank, isPresent, isPromise, isString} from './facade/lang';
 import {PromiseWrapper} from './facade/promise';
-import * as modelModule from './model';
+import {AbstractControl} from './model';
 
 /**
  * Providers for validators to be used for {@link FormControl}s in a form.
@@ -57,7 +57,7 @@ export class Validators {
   /**
    * Validator that requires controls to have a non-empty value.
    */
-  static required(control: modelModule.AbstractControl): {[key: string]: boolean} {
+  static required(control: AbstractControl): {[key: string]: boolean} {
     return isBlank(control.value) || (isString(control.value) && control.value == '') ?
         {'required': true} :
         null;
@@ -67,7 +67,7 @@ export class Validators {
    * Validator that requires controls to have a value of a minimum length.
    */
   static minLength(minLength: number): ValidatorFn {
-    return (control: modelModule.AbstractControl): {[key: string]: any} => {
+    return (control: AbstractControl): {[key: string]: any} => {
       if (isPresent(Validators.required(control))) return null;
       var v: string = control.value;
       return v.length < minLength ?
@@ -80,7 +80,7 @@ export class Validators {
    * Validator that requires controls to have a value of a maximum length.
    */
   static maxLength(maxLength: number): ValidatorFn {
-    return (control: modelModule.AbstractControl): {[key: string]: any} => {
+    return (control: AbstractControl): {[key: string]: any} => {
       if (isPresent(Validators.required(control))) return null;
       var v: string = control.value;
       return v.length > maxLength ?
@@ -93,7 +93,7 @@ export class Validators {
    * Validator that requires a control to match a regex to its value.
    */
   static pattern(pattern: string): ValidatorFn {
-    return (control: modelModule.AbstractControl): {[key: string]: any} => {
+    return (control: AbstractControl): {[key: string]: any} => {
       if (isPresent(Validators.required(control))) return null;
       let regex = new RegExp(`^${pattern}$`);
       let v: string = control.value;
@@ -105,7 +105,7 @@ export class Validators {
   /**
    * No-op validator.
    */
-  static nullValidator(c: modelModule.AbstractControl): {[key: string]: boolean} { return null; }
+  static nullValidator(c: AbstractControl): {[key: string]: boolean} { return null; }
 
   /**
    * Compose multiple validators into a single function that returns the union
@@ -116,7 +116,7 @@ export class Validators {
     var presentValidators = validators.filter(isPresent);
     if (presentValidators.length == 0) return null;
 
-    return function(control: modelModule.AbstractControl) {
+    return function(control: AbstractControl) {
       return _mergeErrors(_executeValidators(control, presentValidators));
     };
   }
@@ -126,7 +126,7 @@ export class Validators {
     var presentValidators = validators.filter(isPresent);
     if (presentValidators.length == 0) return null;
 
-    return function(control: modelModule.AbstractControl) {
+    return function(control: AbstractControl) {
       let promises = _executeAsyncValidators(control, presentValidators).map(_convertToPromise);
       return PromiseWrapper.all(promises).then(_mergeErrors);
     };
@@ -137,13 +137,11 @@ function _convertToPromise(obj: any): Promise<any> {
   return isPromise(obj) ? obj : ObservableWrapper.toPromise(obj);
 }
 
-function _executeValidators(
-    control: modelModule.AbstractControl, validators: ValidatorFn[]): any[] {
+function _executeValidators(control: AbstractControl, validators: ValidatorFn[]): any[] {
   return validators.map(v => v(control));
 }
 
-function _executeAsyncValidators(
-    control: modelModule.AbstractControl, validators: AsyncValidatorFn[]): any[] {
+function _executeAsyncValidators(control: AbstractControl, validators: AsyncValidatorFn[]): any[] {
   return validators.map(v => v(control));
 }