style(ChangeDetection): idiomatic TS

Author: vicb

modules/angular2/src/change_detection/abstract_change_detector.ts

@@ -5,41 +5,38 @@ import {ChangeDetector} from './interfaces';
 import {CHECK_ALWAYS, CHECK_ONCE, CHECKED, DETACHED, ON_PUSH} from './constants';
 
 export class AbstractChangeDetector extends ChangeDetector {
-  lightDomChildren: List<any>;
-  shadowDomChildren: List<any>;
+  lightDomChildren: List<any> = [];
+  shadowDomChildren: List<any> = [];
   parent: ChangeDetector;
-  mode: string;
+  mode: string = null;
   ref: ChangeDetectorRef;
 
   constructor() {
     super();
-    this.lightDomChildren = [];
-    this.shadowDomChildren = [];
     this.ref = new ChangeDetectorRef(this);
-    this.mode = null;
   }
 
-  addChild(cd: ChangeDetector) {
+  addChild(cd: ChangeDetector): void {
     ListWrapper.push(this.lightDomChildren, cd);
     cd.parent = this;
   }
 
-  removeChild(cd: ChangeDetector) { ListWrapper.remove(this.lightDomChildren, cd); }
+  removeChild(cd: ChangeDetector): void { ListWrapper.remove(this.lightDomChildren, cd); }
 
-  addShadowDomChild(cd: ChangeDetector) {
+  addShadowDomChild(cd: ChangeDetector): void {
     ListWrapper.push(this.shadowDomChildren, cd);
     cd.parent = this;
   }
 
-  removeShadowDomChild(cd: ChangeDetector) { ListWrapper.remove(this.shadowDomChildren, cd); }
+  removeShadowDomChild(cd: ChangeDetector): void { ListWrapper.remove(this.shadowDomChildren, cd); }
 
-  remove() { this.parent.removeChild(this); }
+  remove(): void { this.parent.removeChild(this); }
 
-  detectChanges() { this._detectChanges(false); }
+  detectChanges(): void { this._detectChanges(false); }
 
-  checkNoChanges() { this._detectChanges(true); }
+  checkNoChanges(): void { this._detectChanges(true); }
 
-  _detectChanges(throwOnChange: boolean) {
+  _detectChanges(throwOnChange: boolean): void {
     if (this.mode === DETACHED || this.mode === CHECKED) return;
 
     this.detectChangesInRecords(throwOnChange);
@@ -53,26 +50,26 @@ export class AbstractChangeDetector extends ChangeDetector {
     if (this.mode === CHECK_ONCE) this.mode = CHECKED;
   }
 
-  detectChangesInRecords(throwOnChange: boolean) {}
-  callOnAllChangesDone() {}
+  detectChangesInRecords(throwOnChange: boolean): void {}
+  callOnAllChangesDone(): void {}
 
-  _detectChangesInLightDomChildren(throwOnChange: boolean) {
+  _detectChangesInLightDomChildren(throwOnChange: boolean): void {
     var c = this.lightDomChildren;
     for (var i = 0; i < c.length; ++i) {
       c[i]._detectChanges(throwOnChange);
     }
   }
 
-  _detectChangesInShadowDomChildren(throwOnChange: boolean) {
+  _detectChangesInShadowDomChildren(throwOnChange: boolean): void {
     var c = this.shadowDomChildren;
     for (var i = 0; i < c.length; ++i) {
       c[i]._detectChanges(throwOnChange);
     }
   }
 
-  markAsCheckOnce() { this.mode = CHECK_ONCE; }
+  markAsCheckOnce(): void { this.mode = CHECK_ONCE; }
 
-  markPathToRootAsCheckOnce() {
+  markPathToRootAsCheckOnce(): void {
     var c: ChangeDetector = this;
     while (isPresent(c) && c.mode != DETACHED) {
       if (c.mode === CHECKED) c.mode = CHECK_ONCE;

modules/angular2/src/change_detection/binding_record.ts

@@ -13,50 +13,53 @@ export class BindingRecord {
               public elementIndex: number, public propertyName: string, public setter: SetterFn,
               public lifecycleEvent: string, public directiveRecord: DirectiveRecord) {}
 
-  callOnChange() { return isPresent(this.directiveRecord) && this.directiveRecord.callOnChange; }
+  callOnChange(): boolean {
+    return isPresent(this.directiveRecord) && this.directiveRecord.callOnChange;
+  }
 
-  isOnPushChangeDetection() {
+  isOnPushChangeDetection(): boolean {
     return isPresent(this.directiveRecord) && this.directiveRecord.isOnPushChangeDetection();
   }
 
-  isDirective() { return this.mode === DIRECTIVE; }
+  isDirective(): boolean { return this.mode === DIRECTIVE; }
 
-  isDirectiveLifecycle() { return this.mode === DIRECTIVE_LIFECYCLE; }
+  isDirectiveLifecycle(): boolean { return this.mode === DIRECTIVE_LIFECYCLE; }
 
-  isElement() { return this.mode === ELEMENT; }
+  isElement(): boolean { return this.mode === ELEMENT; }
 
-  isTextNode() { return this.mode === TEXT_NODE; }
+  isTextNode(): boolean { return this.mode === TEXT_NODE; }
 
   static createForDirective(ast: AST, propertyName: string, setter: SetterFn,
-                            directiveRecord: DirectiveRecord) {
+                            directiveRecord: DirectiveRecord): BindingRecord {
     return new BindingRecord(DIRECTIVE, 0, ast, 0, propertyName, setter, null, directiveRecord);
   }
 
-  static createDirectiveOnCheck(directiveRecord: DirectiveRecord) {
+  static createDirectiveOnCheck(directiveRecord: DirectiveRecord): BindingRecord {
     return new BindingRecord(DIRECTIVE_LIFECYCLE, 0, null, 0, null, null, "onCheck",
                              directiveRecord);
   }
 
-  static createDirectiveOnInit(directiveRecord: DirectiveRecord) {
+  static createDirectiveOnInit(directiveRecord: DirectiveRecord): BindingRecord {
     return new BindingRecord(DIRECTIVE_LIFECYCLE, 0, null, 0, null, null, "onInit",
                              directiveRecord);
   }
 
-  static createDirectiveOnChange(directiveRecord: DirectiveRecord) {
+  static createDirectiveOnChange(directiveRecord: DirectiveRecord): BindingRecord {
     return new BindingRecord(DIRECTIVE_LIFECYCLE, 0, null, 0, null, null, "onChange",
                              directiveRecord);
   }
 
-  static createForElement(ast: AST, elementIndex: number, propertyName: string) {
+  static createForElement(ast: AST, elementIndex: number, propertyName: string): BindingRecord {
     return new BindingRecord(ELEMENT, 0, ast, elementIndex, propertyName, null, null, null);
   }
 
-  static createForHostProperty(directiveIndex: DirectiveIndex, ast: AST, propertyName: string) {
+  static createForHostProperty(directiveIndex: DirectiveIndex, ast: AST,
+                               propertyName: string): BindingRecord {
     return new BindingRecord(ELEMENT, directiveIndex, ast, directiveIndex.elementIndex,
                              propertyName, null, null, null);
   }
 
-  static createForTextNode(ast: AST, elementIndex: number) {
+  static createForTextNode(ast: AST, elementIndex: number): BindingRecord {
     return new BindingRecord(TEXT_NODE, 0, ast, elementIndex, null, null, null, null);
   }
-}
+}

modules/angular2/src/change_detection/change_detector_ref.ts

@@ -16,14 +16,14 @@ export class ChangeDetectorRef {
   /**
    * Request to check all ON_PUSH ancestors.
    */
-  requestCheck() { this._cd.markPathToRootAsCheckOnce(); }
+  requestCheck(): void { this._cd.markPathToRootAsCheckOnce(); }
 
   /**
    * Detaches the change detector from the change detector tree.
    *
    * The detached change detector will not be checked until it is reattached.
    */
-  detach() { this._cd.mode = DETACHED; }
+  detach(): void { this._cd.mode = DETACHED; }
 
   /**
    * Reattach the change detector to the change detector tree.
@@ -32,7 +32,7 @@ export class ChangeDetectorRef {
    *checked during the
    * next change detection run.
    */
-  reattach() {
+  reattach(): void {
     this._cd.mode = CHECK_ALWAYS;
     this.requestCheck();
   }

modules/angular2/src/change_detection/coalesce.ts

@@ -13,8 +13,8 @@ import {RecordType, ProtoRecord} from './proto_record';
  * replaced with very cheap SELF records.
  */
 export function coalesce(records: List<ProtoRecord>): List<ProtoRecord> {
-  var res = ListWrapper.create();
-  var indexMap = MapWrapper.create();
+  var res: List<ProtoRecord> = ListWrapper.create();
+  var indexMap: Map<number, number> = MapWrapper.create();
 
   for (var i = 0; i < records.length; ++i) {
     var r = records[i];

modules/angular2/src/change_detection/exceptions.ts

@@ -16,12 +16,10 @@ export class ExpressionChangedAfterItHasBeenChecked extends BaseException {
 
 export class ChangeDetectionError extends BaseException {
   message: string;
-  originalException: any;
   location: string;
 
-  constructor(proto: ProtoRecord, originalException: any) {
+  constructor(proto: ProtoRecord, public originalException: any) {
     super();
-    this.originalException = originalException;
     this.location = proto.expressionAsString;
     this.message = `${this.originalException} in [${this.location}]`;
   }

modules/angular2/src/change_detection/interfaces.ts

@@ -47,17 +47,17 @@ export class ChangeDetector {
   parent: ChangeDetector;
   mode: string;
 
-  addChild(cd: ChangeDetector) {}
-  addShadowDomChild(cd: ChangeDetector) {}
-  removeChild(cd: ChangeDetector) {}
-  removeShadowDomChild(cd: ChangeDetector) {}
-  remove() {}
-  hydrate(context: any, locals: Locals, directives: any) {}
-  dehydrate() {}
-  markPathToRootAsCheckOnce() {}
+  addChild(cd: ChangeDetector): void {}
+  addShadowDomChild(cd: ChangeDetector): void {}
+  removeChild(cd: ChangeDetector): void {}
+  removeShadowDomChild(cd: ChangeDetector): void {}
+  remove(): void {}
+  hydrate(context: any, locals: Locals, directives: any): void {}
+  dehydrate(): void {}
+  markPathToRootAsCheckOnce(): void {}
 
-  detectChanges() {}
-  checkNoChanges() {}
+  detectChanges(): void {}
+  checkNoChanges(): void {}
 }
 
 export class ChangeDetectorDefinition {

modules/angular2/src/change_detection/parser/lexer.ts

@@ -8,12 +8,12 @@ import {
   isPresent
 } from "angular2/src/facade/lang";
 
-export const TOKEN_TYPE_CHARACTER = 1;
-export const TOKEN_TYPE_IDENTIFIER = 2;
-export const TOKEN_TYPE_KEYWORD = 3;
-export const TOKEN_TYPE_STRING = 4;
-export const TOKEN_TYPE_OPERATOR = 5;
-export const TOKEN_TYPE_NUMBER = 6;
+const TOKEN_TYPE_CHARACTER = 1;
+const TOKEN_TYPE_IDENTIFIER = 2;
+const TOKEN_TYPE_KEYWORD = 3;
+const TOKEN_TYPE_STRING = 4;
+const TOKEN_TYPE_OPERATOR = 5;
+const TOKEN_TYPE_NUMBER = 6;
 
 @Injectable()
 export class Lexer {
@@ -160,24 +160,18 @@ const $NBSP = 160;
 
 
 export class ScannerError extends BaseException {
-  message: string;
-  constructor(message) {
-    super();
-    this.message = message;
-  }
+  constructor(public message) { super(); }
 
-  toString() { return this.message; }
+  toString(): string { return this.message; }
 }
 
 class _Scanner {
   length: number;
-  peek: number;
-  index: number;
+  peek: number = 0;
+  index: number = -1;
 
   constructor(public input: string) {
     this.length = input.length;
-    this.peek = 0;
-    this.index = -1;
     this.advance();
   }
 

modules/angular2/src/change_detection/parser/parser.ts

@@ -55,10 +55,9 @@ var INTERPOLATION_REGEXP = RegExpWrapper.create('\\{\\{(.*?)\\}\\}');
 
 @Injectable()
 export class Parser {
-  _lexer: Lexer;
   _reflector: Reflector;
-  constructor(lexer: Lexer, providedReflector: Reflector = null) {
-    this._lexer = lexer;
+
+  constructor(public _lexer: Lexer, providedReflector: Reflector = null) {
     this._reflector = isPresent(providedReflector) ? providedReflector : reflector;
   }
 
@@ -116,11 +115,9 @@ export class Parser {
 }
 
 class _ParseAST {
-  index: int;
+  index: int = 0;
   constructor(public input: string, public location: any, public tokens: List<any>,
-              public reflector: Reflector, public parseAction: boolean) {
-    this.index = 0;
-  }
+              public reflector: Reflector, public parseAction: boolean) {}
 
   peek(offset: int): Token {
     var i = this.index + offset;