From d42e37b21541c379970d9f9fa0d4597a055960e5 Mon Sep 17 00:00:00 2001
From: Hristo Deshev <hristo@deshev.com>
Date: Mon, 21 Nov 2016 18:38:51 +0200
Subject: [PATCH 1/2] Enable TypeScript checks for unused locals and
 parameters.

---
 nativescript-angular/animation-driver.ts      |  2 +-
 nativescript-angular/animation-player.ts      |  4 +-
 nativescript-angular/collection-facade.ts     | 63 -------------------
 .../common/detached-loader.ts                 |  6 --
 nativescript-angular/directives/action-bar.ts |  2 +-
 nativescript-angular/directives/dialogs.ts    |  2 +-
 .../directives/list-view-comp.ts              |  4 +-
 nativescript-angular/directives/tab-view.ts   | 10 +--
 nativescript-angular/dom-adapter.ts           | 18 +++---
 nativescript-angular/http/ns-http.ts          |  4 +-
 nativescript-angular/parse5_adapter.ts        | 40 ++++++------
 nativescript-angular/platform-common.ts       | 16 ++---
 nativescript-angular/platform-providers.ts    | 14 ++++-
 nativescript-angular/platform.ts              | 10 ++-
 nativescript-angular/renderer.ts              | 16 ++---
 .../router/ns-platform-location.ts            |  4 +-
 .../router/ns-router-link-active.ts           |  4 +-
 nativescript-angular/router/ns-router-link.ts |  2 +-
 .../router/page-router-outlet.ts              |  3 +-
 nativescript-angular/tsconfig.json            |  4 +-
 .../value-accessors/base-value-accessor.ts    |  5 +-
 .../value-accessors/checked-value-accessor.ts |  2 +-
 .../value-accessors/date-value-accessor.ts    |  2 +-
 .../value-accessors/number-value-accessor.ts  |  2 +-
 .../selectedIndex-value-accessor.ts           |  3 +-
 .../value-accessors/text-value-accessor.ts    |  2 +-
 .../value-accessors/time-value-accessor.ts    |  2 +-
 nativescript-angular/view-util.ts             |  6 +-
 28 files changed, 99 insertions(+), 153 deletions(-)

diff --git a/nativescript-angular/animation-driver.ts b/nativescript-angular/animation-driver.ts
index afc881db1..fbc1f74f2 100644
--- a/nativescript-angular/animation-driver.ts
+++ b/nativescript-angular/animation-driver.ts
@@ -16,7 +16,7 @@ export class NativeScriptAnimationDriver implements AnimationDriver {
         return (<View>element).style._getValue(getPropertyByCssName(prop));
     }
 
-    animate(element: any, startingStyles: AnimationStyles, keyframes: AnimationKeyframe[], duration: number, delay: number, easing: string): AnimationPlayer {
+    animate(element: any, _startingStyles: AnimationStyles, keyframes: AnimationKeyframe[], duration: number, delay: number, easing: string): AnimationPlayer {
         return new NativeScriptAnimationPlayer(element, keyframes, duration, delay, easing);
     }
 }
diff --git a/nativescript-angular/animation-player.ts b/nativescript-angular/animation-player.ts
index b30e0b6ab..bcba52474 100644
--- a/nativescript-angular/animation-player.ts
+++ b/nativescript-angular/animation-player.ts
@@ -98,7 +98,7 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
             this._onStart();
             this.animation.play(this.target)
                 .then(() => { this._onFinish(); })
-                .catch((e) => { });
+                .catch((_e) => { });
         }
     }
 
@@ -126,7 +126,7 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
         this._onFinish();
     }
 
-    setPosition(p: any): void {
+    setPosition(_p: any): void {
         throw new Error("AnimationPlayer.setPosition method is not supported!");
     }
 
diff --git a/nativescript-angular/collection-facade.ts b/nativescript-angular/collection-facade.ts
index 03d3b56b0..b573dd639 100644
--- a/nativescript-angular/collection-facade.ts
+++ b/nativescript-angular/collection-facade.ts
@@ -131,66 +131,3 @@ function _flattenArray(source: any[], target: any[]): any[] {
   }
   return target;
 }
-
-export class StringMapWrapper {
-  static create(): {[k: /*any*/ string]: any} {
-    // Note: We are not using Object.create(null) here due to
-    // performance!
-    // http://jsperf.com/ng2-object-create-null
-    return {};
-  }
-  static contains(map: {[key: string]: any}, key: string): boolean {
-    return map.hasOwnProperty(key);
-  }
-  static get<V>(map: {[key: string]: V}, key: string): V {
-    return map.hasOwnProperty(key) ? map[key] : undefined;
-  }
-  static set<V>(map: {[key: string]: V}, key: string, value: V) { map[key] = value; }
-
-  static keys(map: {[key: string]: any}): string[] { return Object.keys(map); }
-  static values<T>(map: {[key: string]: T}): T[] {
-    return Object.keys(map).map((k: string): T => map[k]);
-  }
-  static isEmpty(map: {[key: string]: any}): boolean {
-    for (var prop in map) {
-      return false;
-    }
-    return true;
-  }
-  static delete (map: {[key: string]: any}, key: string) { delete map[key]; }
-  static forEach<K, V>(map: {[key: string]: V}, callback: (v: V, K: string) => void) {
-    for (let k of Object.keys(map)) {
-      callback(map[k], k);
-    }
-  }
-
-  static merge<V>(m1: {[key: string]: V}, m2: {[key: string]: V}): {[key: string]: V} {
-    var m: {[key: string]: V} = {};
-
-    for (let k of Object.keys(m1)) {
-      m[k] = m1[k];
-    }
-
-    for (let k of Object.keys(m2)) {
-      m[k] = m2[k];
-    }
-
-    return m;
-  }
-
-  static equals<V>(m1: {[key: string]: V}, m2: {[key: string]: V}): boolean {
-    var k1 = Object.keys(m1);
-    var k2 = Object.keys(m2);
-    if (k1.length != k2.length) {
-      return false;
-    }
-    var key: any /** TODO #???? */;
-    for (var i = 0; i < k1.length; i++) {
-      key = k1[i];
-      if (m1[key] !== m2[key]) {
-        return false;
-      }
-    }
-    return true;
-  }
-}
diff --git a/nativescript-angular/common/detached-loader.ts b/nativescript-angular/common/detached-loader.ts
index 5501d59b0..0f9a3d4b8 100644
--- a/nativescript-angular/common/detached-loader.ts
+++ b/nativescript-angular/common/detached-loader.ts
@@ -4,12 +4,6 @@ import {
 } from '@angular/core';
 import * as trace from "trace";
 
-type AnyComponentRef = ComponentRef<any>;
-interface PendingLoadEntry {
-    componentType: Type<any>;
-    resolveCallback: (AnyComponentRef) => void;
-}
-
 export const CATEGORY = "detached-loader";
 function log(message: string) {
     trace.write(message, CATEGORY);
diff --git a/nativescript-angular/directives/action-bar.ts b/nativescript-angular/directives/action-bar.ts
index 28b7a835c..47ba7d356 100644
--- a/nativescript-angular/directives/action-bar.ts
+++ b/nativescript-angular/directives/action-bar.ts
@@ -7,7 +7,7 @@ import { registerElement, ViewClassMeta, NgView } from '../element-registry';
 
 var actionBarMeta: ViewClassMeta = {
     skipAddToDom: true,
-    insertChild: (parent: NgView, child: NgView, atIndex: number) => {
+    insertChild: (parent: NgView, child: NgView, _atIndex: number) => {
         const bar = <ActionBar>(<any>parent);
         const childView = <any>child;
 
diff --git a/nativescript-angular/directives/dialogs.ts b/nativescript-angular/directives/dialogs.ts
index 892b0e9be..b54c85534 100644
--- a/nativescript-angular/directives/dialogs.ts
+++ b/nativescript-angular/directives/dialogs.ts
@@ -39,7 +39,7 @@ export class ModalDialogService {
         const resolver: ComponentFactoryResolver = viewContainerRef.injector.get(ComponentFactoryResolver);
         const pageFactory: PageFactory = viewContainerRef.injector.get(PAGE_FACTORY);
 
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
             setTimeout(() => ModalDialogService.showDialog(type, options, resolve, viewContainerRef, resolver, parentPage, pageFactory), 10);
         });
     }
diff --git a/nativescript-angular/directives/list-view-comp.ts b/nativescript-angular/directives/list-view-comp.ts
index de133b17f..47fb8cd0d 100644
--- a/nativescript-angular/directives/list-view-comp.ts
+++ b/nativescript-angular/directives/list-view-comp.ts
@@ -79,13 +79,13 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
             needDiffer = false;
         }
         if (needDiffer && !this._differ && isListLikeIterable(value)) {
-            this._differ = this._iterableDiffers.find(this._items).create(this._cdr, (index, item) => { return item; });
+            this._differ = this._iterableDiffers.find(this._items).create(this._cdr, (_index, item) => { return item; });
         }
 
         this.listView.items = this._items;
     }
 
-    constructor(private _elementRef: ElementRef,
+    constructor(_elementRef: ElementRef,
         private _iterableDiffers: IterableDiffers,
         private _cdr: ChangeDetectorRef) {
         this.listView = _elementRef.nativeElement;
diff --git a/nativescript-angular/directives/tab-view.ts b/nativescript-angular/directives/tab-view.ts
index 2f8689841..44a6a1d0c 100644
--- a/nativescript-angular/directives/tab-view.ts
+++ b/nativescript-angular/directives/tab-view.ts
@@ -1,8 +1,8 @@
-import {ElementRef, Directive, Input, TemplateRef, ViewContainerRef} from "@angular/core";
-import {TabView, TabViewItem} from "ui/tab-view";
+import { ElementRef, Directive, Input, TemplateRef, ViewContainerRef } from "@angular/core";
+import { TabView, TabViewItem } from "ui/tab-view";
 import * as utils from '../common/utils';
-import {rendererLog, rendererError} from "../trace";
-import {isBlank} from "../lang-facade";
+import { rendererLog } from "../trace";
+import { isBlank } from "../lang-facade";
 
 @Directive({
     selector: 'TabView',
@@ -24,7 +24,7 @@ export class TabViewDirective {
         }
     }
 
-    constructor(private element: ElementRef) {
+    constructor(element: ElementRef) {
         this.tabView = element.nativeElement;
     }
     
diff --git a/nativescript-angular/dom-adapter.ts b/nativescript-angular/dom-adapter.ts
index fff7c605a..1c248f8b4 100644
--- a/nativescript-angular/dom-adapter.ts
+++ b/nativescript-angular/dom-adapter.ts
@@ -1,8 +1,8 @@
 import { ElementSchemaRegistry } from '@angular/compiler';
-import { Sanitizer, SchemaMetadata } from '@angular/core';
+import { SchemaMetadata } from '@angular/core';
 import { Parse5DomAdapter } from "./parse5_adapter";
 import { setRootDomAdapter } from './private_import_platform-browser';
-import { rendererLog, rendererError } from "./trace";
+import { rendererLog } from "./trace";
 import { print } from "./lang-facade";
 
 export enum SecurityContext {
@@ -15,11 +15,11 @@ export enum SecurityContext {
 }
 
 export class NativeScriptElementSchemaRegistry extends ElementSchemaRegistry {
-  hasProperty(tagName: string, propName: string): boolean {
+  hasProperty(_tagName: string, _propName: string): boolean {
     return true;
   }
 
-  hasElement(tagName: string, schemaMetas: SchemaMetadata[]): boolean {
+  hasElement(_tagName: string, _schemaMetas: SchemaMetadata[]): boolean {
     return true;
   }
 
@@ -32,15 +32,15 @@ export class NativeScriptElementSchemaRegistry extends ElementSchemaRegistry {
     return 'ng-component';
   }
 
-  securityContext(tagName: string, propName: string): any {
+  securityContext(_tagName: string, _propName: string): any {
     return SecurityContext.NONE;
   }
 
-  validateProperty(name: string): { error: boolean, msg?: string } {
+  validateProperty(_name: string): { error: boolean, msg?: string } {
     return { error: false };
   }
 
-  validateAttribute(name: string): { error: boolean, msg?: string } {
+  validateAttribute(_name: string): { error: boolean, msg?: string } {
     return { error: false };
   }
 
@@ -52,7 +52,7 @@ export class NativeScriptElementSchemaRegistry extends ElementSchemaRegistry {
     return propName;
   }
 
-  normalizeAnimationStyleValue(camelCaseProp: string, userProvidedProp: string, val: string | number):
+  normalizeAnimationStyleValue(_camelCaseProp: string, _userProvidedProp: string, val: string | number):
     { error: string, value: string } {
     return { error: null, value: val.toString() };
   }
@@ -64,7 +64,7 @@ export class NativeScriptDomAdapter extends Parse5DomAdapter {
     setRootDomAdapter(new NativeScriptDomAdapter());
   }
 
-  hasProperty(element, name: string) {
+  hasProperty(_element: any, _name: string) {
     //TODO: actually check if the property exists.
     return true;
   }
diff --git a/nativescript-angular/http/ns-http.ts b/nativescript-angular/http/ns-http.ts
index ef542a5e9..5c504dcff 100644
--- a/nativescript-angular/http/ns-http.ts
+++ b/nativescript-angular/http/ns-http.ts
@@ -1,11 +1,11 @@
 import {Injectable} from '@angular/core';
-import {Http, XHRBackend, ConnectionBackend, RequestOptions, RequestOptionsArgs, ResponseOptions, ResponseType, Response, XSRFStrategy} from '@angular/http';
+import {Http, ConnectionBackend, RequestOptionsArgs, ResponseOptions, ResponseType, Response} from '@angular/http';
 import {Observable} from 'rxjs/Observable';
 import 'rxjs/add/observable/fromPromise';
 import {NSFileSystem} from '../file-system/ns-file-system';
 
 export class NSXSRFStrategy {
-  public configureRequest(req: any) {
+  public configureRequest(_req: any) {
     // noop
   }
 }
diff --git a/nativescript-angular/parse5_adapter.ts b/nativescript-angular/parse5_adapter.ts
index 07907ab95..3c4782940 100644
--- a/nativescript-angular/parse5_adapter.ts
+++ b/nativescript-angular/parse5_adapter.ts
@@ -47,7 +47,7 @@ export class Parse5DomAdapter extends DomAdapter {
     setRootDomAdapter(new Parse5DomAdapter());
   }
 
-  hasProperty(element: any, name: string): boolean {
+  hasProperty(_element: any, name: string): boolean {
     return _HTMLElementPropertyList.indexOf(name) > -1;
   }
   // TODO(tbosch): don't even call this method when we run the tests on server side
@@ -75,7 +75,7 @@ export class Parse5DomAdapter extends DomAdapter {
 
   get attrToPropMap() { return _attrToPropMap; }
 
-  query(selector: any) { throw _notImplemented('query'); }
+  query(_selector: any) { throw _notImplemented('query'); }
   querySelector(el: any, selector: string): any { return this.querySelectorAll(el, selector)[0]; }
   querySelectorAll(el: any, selector: string): any[] {
     const res: any[] = [];
@@ -121,7 +121,7 @@ export class Parse5DomAdapter extends DomAdapter {
         cssSelector.addClassName(classList[i]);
       }
 
-      matcher.match(cssSelector, function(selector: any, cb: any) { result = true; });
+      matcher.match(cssSelector, function(_selector: any, _cb: any) { result = true; });
     }
     return result;
   }
@@ -171,7 +171,7 @@ export class Parse5DomAdapter extends DomAdapter {
   getInnerHTML(el: any): string {
     return parse5.serialize(this.templateAwareRoot(el), {treeAdapter});
   }
-  getTemplateContent(el: any): Node { return null; }
+  getTemplateContent(_el: any): Node { return null; }
   getOuterHTML(el: any): string {
     const fragment = treeAdapter.createDocumentFragment();
     this.appendChild(fragment, el);
@@ -179,7 +179,7 @@ export class Parse5DomAdapter extends DomAdapter {
   }
   nodeName(node: any): string { return node.tagName; }
   nodeValue(node: any): string { return node.nodeValue; }
-  type(node: any): string { throw _notImplemented('type'); }
+  type(_node: any): string { throw _notImplemented('type'); }
   content(node: any): string { return node.childNodes[0]; }
   firstChild(el: any): Node { return el.firstChild; }
   nextSibling(el: any): Node { return el.nextSibling; }
@@ -313,7 +313,7 @@ export class Parse5DomAdapter extends DomAdapter {
   }
   getShadowRoot(el: any): Element { return el.shadowRoot; }
   getHost(el: any): string { return el.host; }
-  getDistributedNodes(el: any): Node[] { throw _notImplemented('getDistributedNodes'); }
+  getDistributedNodes(_el: any): Node[] { throw _notImplemented('getDistributedNodes'); }
   clone(node: Node): Node {
     const _recursive = (node: any) => {
       const nodeClone = Object.create(Object.getPrototypeOf(node));
@@ -358,7 +358,7 @@ export class Parse5DomAdapter extends DomAdapter {
   getElementsByClassName(element: any, name: string): HTMLElement[] {
     return this.querySelectorAll(element, '.' + name);
   }
-  getElementsByTagName(element: any, name: string): HTMLElement[] {
+  getElementsByTagName(_element: any, _name: string): HTMLElement[] {
     throw _notImplemented('getElementsByTagName');
   }
   classList(element: any): string[] {
@@ -442,13 +442,13 @@ export class Parse5DomAdapter extends DomAdapter {
   hasAttribute(element: any, attribute: string): boolean {
     return element.attribs && element.attribs.hasOwnProperty(attribute);
   }
-  hasAttributeNS(element: any, ns: string, attribute: string): boolean { throw 'not implemented'; }
+  hasAttributeNS(_element: any, _ns: string, _attribute: string): boolean { throw 'not implemented'; }
   getAttribute(element: any, attribute: string): string {
     return element.attribs && element.attribs.hasOwnProperty(attribute) ?
         element.attribs[attribute] :
         null;
   }
-  getAttributeNS(element: any, ns: string, attribute: string): string { throw 'not implemented'; }
+  getAttributeNS(_element: any, _ns: string, _attribute: string): string { throw 'not implemented'; }
   setAttribute(element: any, attribute: string, value: string) {
     if (attribute) {
       element.attribs[attribute] = value;
@@ -457,7 +457,7 @@ export class Parse5DomAdapter extends DomAdapter {
       }
     }
   }
-  setAttributeNS(element: any, ns: string, attribute: string, value: string) {
+  setAttributeNS(_element: any, _ns: string, _attribute: string, _value: string) {
     throw 'not implemented';
   }
   removeAttribute(element: any, attribute: string) {
@@ -465,7 +465,7 @@ export class Parse5DomAdapter extends DomAdapter {
       delete element.attribs[attribute];
     }
   }
-  removeAttributeNS(element: any, ns: string, name: string) { throw 'not implemented'; }
+  removeAttributeNS(_element: any, _ns: string, _name: string) { throw 'not implemented'; }
   templateAwareRoot(el: any): any {
     return this.isTemplateElement(el) ? treeAdapter.getTemplateContent(el) : el;
   }
@@ -482,7 +482,7 @@ export class Parse5DomAdapter extends DomAdapter {
     return newDoc;
   }
   defaultDoc(): Document { return defDoc = defDoc || this.createHtmlDocument(); }
-  getBoundingClientRect(el: any): any { return {left: 0, top: 0, width: 0, height: 0}; }
+  getBoundingClientRect(_el: any): any { return {left: 0, top: 0, width: 0, height: 0}; }
   getTitle(): string { return this.defaultDoc().title || ''; }
   setTitle(newTitle: string) { this.defaultDoc().title = newTitle; }
   isTemplateElement(el: any): boolean {
@@ -556,7 +556,7 @@ export class Parse5DomAdapter extends DomAdapter {
   getLocation(): Location { throw 'not implemented'; }
   getUserAgent(): string { return 'Fake user agent'; }
   getData(el: any, name: string): string { return this.getAttribute(el, 'data-' + name); }
-  getComputedStyle(el: any): any { throw 'not implemented'; }
+  getComputedStyle(_el: any): any { throw 'not implemented'; }
   setData(el: any, name: string, value: string) { this.setAttribute(el, 'data-' + name, value); }
   // TODO(tbosch): move this into a separate environment class once we have it
   setGlobalVar(path: string, value: any) { setValueOnPath(global, path, value); }
@@ -566,15 +566,15 @@ export class Parse5DomAdapter extends DomAdapter {
   getTransitionEnd(): string { return 'transitionend'; }
   supportsAnimation(): boolean { return true; }
 
-  replaceChild(el: any, newNode: any, oldNode: any) { throw new Error('not implemented'); }
-  parse(templateHtml: string) { throw new Error('not implemented'); }
-  invoke(el: Element, methodName: string, args: any[]): any { throw new Error('not implemented'); }
-  getEventKey(event: any): string { throw new Error('not implemented'); }
+  replaceChild(_el: any, _newNode: any, _oldNode: any) { throw new Error('not implemented'); }
+  parse(_templateHtml: string) { throw new Error('not implemented'); }
+  invoke(_el: Element, _methodName: string, _args: any[]): any { throw new Error('not implemented'); }
+  getEventKey(_event: any): string { throw new Error('not implemented'); }
 
   supportsCookies(): boolean { return false; }
-  getCookie(name: string): string { throw new Error('not implemented'); }
-  setCookie(name: string, value: string) { throw new Error('not implemented'); }
-  animate(element: any, keyframes: any[], options: any): any { throw new Error('not implemented'); }
+  getCookie(_name: string): string { throw new Error('not implemented'); }
+  setCookie(_name: string, _value: string) { throw new Error('not implemented'); }
+  animate(_element: any, _keyframes: any[], _options: any): any { throw new Error('not implemented'); }
 }
 
 // TODO: build a proper list, this one is all the keys of a HTMLInputElement
diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts
index 5b01c149e..4598083a7 100644
--- a/nativescript-angular/platform-common.ts
+++ b/nativescript-angular/platform-common.ts
@@ -18,6 +18,13 @@ import {
   OpaqueToken,
 } from '@angular/core';
 
+//Work around a TS bug requiring an import of OpaqueToken without using it
+if (global.___TS_UNUSED) {
+    () => {
+        return OpaqueToken;
+    }
+}
+
 import { rendererLog, rendererError } from "./trace";
 import { PAGE_FACTORY, PageFactory, defaultPageFactoryProvider } from './platform-providers';
 
@@ -34,11 +41,6 @@ export const onAfterLivesync = new EventEmitter<NgModuleRef<any>>();
 let lastBootstrappedModule: WeakRef<NgModuleRef<any>>;
 type BootstrapperAction = () => Promise<NgModuleRef<any>>;
 
-interface BootstrapParams {
-  appModuleType: Type<any>;
-  appOptions?: AppOptions;
-}
-
 export interface AppOptions {
   bootInExistingPage: boolean;
   cssFile?: string;
@@ -48,7 +50,7 @@ export interface AppOptions {
 export type PlatformFactory = (extraProviders?: Provider[]) => PlatformRef;
 
 export class NativeScriptSanitizer extends Sanitizer {
-  sanitize(context: any, value: string): string {
+  sanitize(_context: any, value: string): string {
     return value;
   }
 }
@@ -144,7 +146,7 @@ export class NativeScriptPlatformRef extends PlatformRef {
           page.actionBarHidden = this.appOptions.startPageActionBarHidden;
         }
 
-        let onLoadedHandler = function (args) {
+        let onLoadedHandler = function () {
           page.off('loaded', onLoadedHandler);
           //profiling.stop('application-start');
           rendererLog('Page loaded');
diff --git a/nativescript-angular/platform-providers.ts b/nativescript-angular/platform-providers.ts
index 4635de4df..98fbb374c 100644
--- a/nativescript-angular/platform-providers.ts
+++ b/nativescript-angular/platform-providers.ts
@@ -1,12 +1,20 @@
 import { topmost, Frame } from 'ui/frame';
 import { Page } from 'ui/page';
-import { OpaqueToken, Type } from '@angular/core';
-import { device, Device } from "platform";
+import { OpaqueToken } from '@angular/core';
+import { device } from "platform";
+import * as platform from "platform";
 
 export const APP_ROOT_VIEW = new OpaqueToken('App Root View');
 export const DEVICE = new OpaqueToken('platfrom device');
 export const PAGE_FACTORY = new OpaqueToken('page factory');
 
+//Work around a TS bug requiring an import of platform.Device without using it
+if (global.___TS_UNUSED) {
+    () => {
+        return platform;
+    }
+}
+
 export function getDefaultPage(): Page {
     const frame = topmost();
     if (frame) {
@@ -29,7 +37,7 @@ export interface PageFactoryOptions {
     isNavigation?: boolean,
     componentType?: any
 }
-export const defaultPageFactory: PageFactory = function (opts: PageFactoryOptions) {
+export const defaultPageFactory: PageFactory = function (_opts: PageFactoryOptions) {
     return new Page();
 }
 export const defaultPageFactoryProvider = { provide: PAGE_FACTORY, useValue: defaultPageFactory };
diff --git a/nativescript-angular/platform.ts b/nativescript-angular/platform.ts
index 25fb55b5c..60d3fbdc5 100644
--- a/nativescript-angular/platform.ts
+++ b/nativescript-angular/platform.ts
@@ -10,12 +10,18 @@ import {
 
 import {
     COMPILER_OPTIONS,
-    Sanitizer,
     PlatformRef,
     OpaqueToken,
     createPlatformFactory
 } from '@angular/core';
 
+//Work around a TS bug requiring an import of OpaqueToken without using it
+if (global.___TS_UNUSED) {
+    () => {
+        return OpaqueToken;
+    }
+}
+
 import { NativeScriptElementSchemaRegistry } from './dom-adapter';
 import { FileSystemResourceLoader } from './resource-loader';
 
@@ -46,4 +52,4 @@ export function platformNativeScriptDynamic(options?: AppOptions, extraProviders
     } else {
         return new NativeScriptPlatformRef(_platformNativeScriptDynamic(extraProviders), options);
     }
-}
\ No newline at end of file
+}
diff --git a/nativescript-angular/renderer.ts b/nativescript-angular/renderer.ts
index 18147ebd0..728edf378 100644
--- a/nativescript-angular/renderer.ts
+++ b/nativescript-angular/renderer.ts
@@ -88,7 +88,7 @@ export class NativeScriptRenderer extends Renderer {
 
     constructor(
         private rootRenderer: NativeScriptRootRenderer,
-        private componentProto: RenderComponentType,
+        componentProto: RenderComponentType,
         private animationDriver: nsAnimationDriver.NativeScriptAnimationDriver,
         private zone: NgZone) {
 
@@ -154,7 +154,7 @@ export class NativeScriptRenderer extends Renderer {
         }
     }
 
-    public destroyView(hostElement: NgView, viewAllNodes: NgView[]) {
+    public destroyView(_hostElement: NgView, _viewAllNodes: NgView[]) {
         traceLog("NativeScriptRenderer.destroyView");
         // Seems to be called on component dispose only (router outlet)
         //TODO: handle this when we resolve routing and navigation.
@@ -192,18 +192,18 @@ export class NativeScriptRenderer extends Renderer {
         traceLog('NativeScriptRenderer.setBindingDebugInfo: ' + renderElement + ', ' + propertyName + ' = ' + propertyValue);
     }
 
-    setElementDebugInfo(renderElement: any, info: any /*RenderDebugInfo*/): void {
+    setElementDebugInfo(renderElement: any, _info: any /*RenderDebugInfo*/): void {
         traceLog('NativeScriptRenderer.setElementDebugInfo: ' + renderElement);
     }
 
     /**
     * Calls a method on an element.
     */
-    invokeElementMethod(renderElement: NgView, methodName: string, args: Array<any>) {
+    invokeElementMethod(_renderElement: NgView, methodName: string, args: Array<any>) {
         traceLog("NativeScriptRenderer.invokeElementMethod " + methodName + " " + args);
     }
 
-    setText(renderNode: any, text: string) {
+    setText(_renderNode: any, _text: string) {
         traceLog("NativeScriptRenderer.setText");
     }
 
@@ -224,9 +224,9 @@ export class NativeScriptRenderer extends Renderer {
         });
     }
 
-    public createText(parentElement: NgView, value: string): NgView {
+    public createText(_parentElement: NgView, _value: string): NgView {
         traceLog('NativeScriptRenderer.createText');
-        return this.viewUtil.createText(value);
+        return this.viewUtil.createText();
     }
 
     public listen(renderElement: NgView, eventName: string, callback: Function): Function {
@@ -246,7 +246,7 @@ export class NativeScriptRenderer extends Renderer {
         return () => renderElement.off(eventName, zonedCallback);
     }
 
-    public listenGlobal(target: string, eventName: string, callback: Function): Function {
+    public listenGlobal(_target: string, _eventName: string, _callback: Function): Function {
         throw new Error('NativeScriptRenderer.listenGlobal() - Not implemented.');
     }
 
diff --git a/nativescript-angular/router/ns-platform-location.ts b/nativescript-angular/router/ns-platform-location.ts
index 777f0bc73..297396988 100644
--- a/nativescript-angular/router/ns-platform-location.ts
+++ b/nativescript-angular/router/ns-platform-location.ts
@@ -20,7 +20,7 @@ export class NativescriptPlatformLocation extends PlatformLocation {
         this.locationStartegy.onPopState(fn);
     }
 
-    onHashChange(fn: LocationChangeListener): void {
+    onHashChange(_fn: LocationChangeListener): void {
     }
 
     get search(): string {
@@ -32,7 +32,7 @@ export class NativescriptPlatformLocation extends PlatformLocation {
     get pathname(): string {
         return this.locationStartegy.path();
     }
-    set pathname(newPath: string) {
+    set pathname(_newPath: string) {
         throw new Error("NativescriptPlatformLocation set pathname - not implemented")
     }
 
diff --git a/nativescript-angular/router/ns-router-link-active.ts b/nativescript-angular/router/ns-router-link-active.ts
index 94af17ce5..926b129e4 100644
--- a/nativescript-angular/router/ns-router-link-active.ts
+++ b/nativescript-angular/router/ns-router-link-active.ts
@@ -67,7 +67,7 @@ export class NSRouterLinkActive implements OnChanges, OnDestroy, AfterContentIni
     }
 
     ngAfterContentInit(): void {
-        this.links.changes.subscribe(s => this.update());
+        this.links.changes.subscribe(() => this.update());
         this.update();
     }
 
@@ -80,7 +80,7 @@ export class NSRouterLinkActive implements OnChanges, OnDestroy, AfterContentIni
         }
     }
 
-    ngOnChanges(changes: {}): any { this.update(); }
+    ngOnChanges(_: {}): any { this.update(); }
     ngOnDestroy(): any { this.subscription.unsubscribe(); }
 
     private update(): void {
diff --git a/nativescript-angular/router/ns-router-link.ts b/nativescript-angular/router/ns-router-link.ts
index b8322465a..161e71d18 100644
--- a/nativescript-angular/router/ns-router-link.ts
+++ b/nativescript-angular/router/ns-router-link.ts
@@ -105,7 +105,7 @@ export class NSRouterLink implements OnChanges {
     }
   }
 
-  ngOnChanges(changes: {}): any {
+  ngOnChanges(_: {}): any {
     this.updateUrlTree();
   }
 
diff --git a/nativescript-angular/router/page-router-outlet.ts b/nativescript-angular/router/page-router-outlet.ts
index a99075d44..bfbdeaf56 100644
--- a/nativescript-angular/router/page-router-outlet.ts
+++ b/nativescript-angular/router/page-router-outlet.ts
@@ -152,7 +152,7 @@ export class PageRouterOutlet {
         this.currentActivatedRoute = activatedRoute;
 
         if (this.locationStrategy._isPageNavigatingBack()) {
-            this.activateOnGoBack(activatedRoute, providers, outletMap);
+            this.activateOnGoBack(activatedRoute, outletMap);
         } else {
             this.activateOnGoForward(activatedRoute, providers, outletMap, resolver, injector);
         }
@@ -194,7 +194,6 @@ export class PageRouterOutlet {
 
     private activateOnGoBack(
         activatedRoute: ActivatedRoute,
-        providers: ResolvedReflectiveProvider[],
         outletMap: RouterOutletMap): void {
         log("PageRouterOutlet.activate() - Back navigation, so load from cache");
 
diff --git a/nativescript-angular/tsconfig.json b/nativescript-angular/tsconfig.json
index 1041e1a0e..0515ad379 100644
--- a/nativescript-angular/tsconfig.json
+++ b/nativescript-angular/tsconfig.json
@@ -10,6 +10,8 @@
     "declaration": true,
     "removeComments": false,
     "noEmitOnError": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
     "noImplicitAny": false
   },
   "angularCompilerOptions": {
@@ -18,4 +20,4 @@
     "skipTemplateCodegen": true,
     "debug": true
   }
-}
\ No newline at end of file
+}
diff --git a/nativescript-angular/value-accessors/base-value-accessor.ts b/nativescript-angular/value-accessors/base-value-accessor.ts
index a0ccea8da..6e5b63e78 100644
--- a/nativescript-angular/value-accessors/base-value-accessor.ts
+++ b/nativescript-angular/value-accessors/base-value-accessor.ts
@@ -1,4 +1,3 @@
-import {View} from "ui/core/view";
 import {ControlValueAccessor} from "@angular/forms";
 
 export class BaseValueAccessor<TView> implements ControlValueAccessor {
@@ -19,11 +18,11 @@ export class BaseValueAccessor<TView> implements ControlValueAccessor {
         }
     }
     
-    writeValue(value: any) {
+    writeValue(_: any) {
         //
     }
     
-    registerOnTouched(fn: () => void): void {
+    registerOnTouched(_: () => void): void {
         // 
     }
 }
diff --git a/nativescript-angular/value-accessors/checked-value-accessor.ts b/nativescript-angular/value-accessors/checked-value-accessor.ts
index b93fc9cc2..3b434d7f8 100644
--- a/nativescript-angular/value-accessors/checked-value-accessor.ts
+++ b/nativescript-angular/value-accessors/checked-value-accessor.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, Renderer, Self, forwardRef } from '@angular/core';
+import {Directive, ElementRef, forwardRef } from '@angular/core';
 import {NG_VALUE_ACCESSOR} from "@angular/forms";
 import {isBlank} from "../lang-facade";
 import {BaseValueAccessor} from './base-value-accessor';
diff --git a/nativescript-angular/value-accessors/date-value-accessor.ts b/nativescript-angular/value-accessors/date-value-accessor.ts
index f052db7fc..c94094dc7 100644
--- a/nativescript-angular/value-accessors/date-value-accessor.ts
+++ b/nativescript-angular/value-accessors/date-value-accessor.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, Renderer, Self, forwardRef } from '@angular/core';
+import {Directive, ElementRef, forwardRef } from '@angular/core';
 import {NG_VALUE_ACCESSOR} from '@angular/forms';
 import {isBlank, isDate} from "../lang-facade";
 import {BaseValueAccessor} from './base-value-accessor';
diff --git a/nativescript-angular/value-accessors/number-value-accessor.ts b/nativescript-angular/value-accessors/number-value-accessor.ts
index 6b067d520..76e59fbbb 100644
--- a/nativescript-angular/value-accessors/number-value-accessor.ts
+++ b/nativescript-angular/value-accessors/number-value-accessor.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, Renderer, Self, forwardRef } from '@angular/core';
+import {Directive, ElementRef, forwardRef } from '@angular/core';
 import {NG_VALUE_ACCESSOR} from "@angular/forms";
 import {isBlank, isNumber} from "../lang-facade";
 import {BaseValueAccessor} from './base-value-accessor';
diff --git a/nativescript-angular/value-accessors/selectedIndex-value-accessor.ts b/nativescript-angular/value-accessors/selectedIndex-value-accessor.ts
index ecca988e0..40d99445b 100644
--- a/nativescript-angular/value-accessors/selectedIndex-value-accessor.ts
+++ b/nativescript-angular/value-accessors/selectedIndex-value-accessor.ts
@@ -1,6 +1,5 @@
-import {Directive, ElementRef, Renderer, Self, forwardRef } from '@angular/core';
+import {Directive, ElementRef, forwardRef } from '@angular/core';
 import {NG_VALUE_ACCESSOR} from "@angular/forms";
-import {isBlank, isNumber} from "../lang-facade";
 import {BaseValueAccessor} from './base-value-accessor';
 import {View} from "ui/core/view";
 import * as utils from '../common/utils';
diff --git a/nativescript-angular/value-accessors/text-value-accessor.ts b/nativescript-angular/value-accessors/text-value-accessor.ts
index d141652c6..dc99a9cde 100644
--- a/nativescript-angular/value-accessors/text-value-accessor.ts
+++ b/nativescript-angular/value-accessors/text-value-accessor.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, Renderer, Self, forwardRef } from '@angular/core';
+import {Directive, ElementRef, forwardRef } from '@angular/core';
 import {NG_VALUE_ACCESSOR} from "@angular/forms";
 import {isBlank} from "../lang-facade";
 import {BaseValueAccessor} from './base-value-accessor'
diff --git a/nativescript-angular/value-accessors/time-value-accessor.ts b/nativescript-angular/value-accessors/time-value-accessor.ts
index 36d081c1b..d1242a690 100644
--- a/nativescript-angular/value-accessors/time-value-accessor.ts
+++ b/nativescript-angular/value-accessors/time-value-accessor.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, Renderer, Self, forwardRef } from '@angular/core';
+import {Directive, ElementRef, forwardRef } from '@angular/core';
 import {NG_VALUE_ACCESSOR} from '@angular/forms';
 import {isBlank, isDate} from "../lang-facade";
 import {BaseValueAccessor} from './base-value-accessor';
diff --git a/nativescript-angular/view-util.ts b/nativescript-angular/view-util.ts
index e604d81d8..45b0cda85 100644
--- a/nativescript-angular/view-util.ts
+++ b/nativescript-angular/view-util.ts
@@ -119,11 +119,11 @@ export class ViewUtil {
             const viewClass = getViewClass(name);
             return this.createAndAttach(name, viewClass, parent, beforeAttach);
         } else {
-            return this.createViewContainer(name, parent, beforeAttach);
+            return this.createViewContainer(parent, beforeAttach);
         }
     }
 
-    public createText(value: string): NgView {
+    public createText(): NgView {
         const text = <NgView>new Placeholder();
         text.nodeName = "#text";
         text.visibility = "collapse";
@@ -131,7 +131,7 @@ export class ViewUtil {
         return text;
     }
 
-    public createViewContainer(name: string, parentElement: NgView, beforeAttach: BeforeAttachAction) {
+    public createViewContainer(parentElement: NgView, beforeAttach: BeforeAttachAction) {
         traceLog('Creating view container in:' + parentElement);
 
         const layout = this.createView('ProxyViewContainer', parentElement, beforeAttach);

From a19fdc1a33867f81787d6f3b3dacb6f213400f26 Mon Sep 17 00:00:00 2001
From: Hristo Deshev <hristo@deshev.com>
Date: Tue, 22 Nov 2016 15:12:13 +0200
Subject: [PATCH 2/2] Enable tslint and fix complaints.

---
 .travis.yml                                   |   1 +
 nativescript-angular/.npmignore               |   3 +-
 nativescript-angular/animation-driver.ts      |  13 +-
 nativescript-angular/animation-player.ts      |  82 ++++++++----
 nativescript-angular/collection-facade.ts     |  33 ++---
 .../common/detached-loader.ts                 |  23 ++--
 nativescript-angular/common/utils.ts          |   2 +-
 nativescript-angular/directives.ts            |  42 ++++---
 nativescript-angular/directives/action-bar.ts |  13 +-
 nativescript-angular/directives/dialogs.ts    |  34 +++--
 .../directives/list-view-comp.ts              |  51 ++++----
 .../directives/platform-filters.ts            |   2 +-
 nativescript-angular/directives/tab-view.ts   |  22 ++--
 nativescript-angular/dom-adapter.ts           |  16 ++-
 nativescript-angular/element-registry.ts      |  20 +--
 .../file-system/ns-file-system.ts             |   6 +-
 nativescript-angular/forms.ts                 |  12 +-
 nativescript-angular/http.ts                  |   7 +-
 nativescript-angular/http/ns-http.ts          |  25 ++--
 nativescript-angular/index.ts                 |   2 +-
 nativescript-angular/lang-facade.ts           |  15 +--
 nativescript-angular/nativescript.module.ts   |  18 +--
 nativescript-angular/package.json             |  10 +-
 nativescript-angular/parse5_adapter.ts        |   7 +-
 nativescript-angular/platform-common.ts       |  51 ++++----
 nativescript-angular/platform-providers.ts    |  30 ++---
 nativescript-angular/platform-static.ts       |  13 +-
 nativescript-angular/platform.ts              |  30 +++--
 nativescript-angular/polyfills/array.ts       |  40 +++---
 nativescript-angular/polyfills/console.ts     |   2 +-
 nativescript-angular/private_import_core.ts   |  30 ++---
 .../private_import_platform-browser.ts        |   8 +-
 nativescript-angular/renderer.ts              |  76 ++++++-----
 nativescript-angular/resource-loader.ts       |   4 +-
 nativescript-angular/router-url-tree.ts       |  59 ++++++---
 nativescript-angular/router.ts                |  20 +--
 .../router/ns-location-strategy.ts            |  35 +++---
 .../router/ns-platform-location.ts            |   8 +-
 .../router/ns-router-link-active.ts           |  45 ++++---
 nativescript-angular/router/ns-router-link.ts |  21 ++--
 .../router/page-router-outlet.ts              |  54 ++++----
 .../router/router-extensions.ts               |   6 +-
 nativescript-angular/tslint.json              | 118 ++++++++++++++++++
 .../value-accessors/base-value-accessor.ts    |   8 +-
 .../value-accessors/checked-value-accessor.ts |  17 +--
 .../value-accessors/date-value-accessor.ts    |  21 ++--
 .../value-accessors/number-value-accessor.ts  |  13 +-
 .../selectedIndex-value-accessor.ts           |  20 +--
 .../value-accessors/text-value-accessor.ts    |  16 +--
 .../value-accessors/time-value-accessor.ts    |  21 ++--
 nativescript-angular/view-util.ts             |  50 +++++---
 51 files changed, 790 insertions(+), 485 deletions(-)
 create mode 100644 nativescript-angular/tslint.json

diff --git a/.travis.yml b/.travis.yml
index 5aa4b1735..3163a2b44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,7 @@ install:
 - tns error-reporting disable
 - cd nativescript-angular
 - npm install
+- npm run tslint
 - cd ../tests
 - npm install
 - tns platform add android
diff --git a/nativescript-angular/.npmignore b/nativescript-angular/.npmignore
index 7375cfceb..3eb3853e2 100644
--- a/nativescript-angular/.npmignore
+++ b/nativescript-angular/.npmignore
@@ -8,4 +8,5 @@
 tsconfig.json
 global.d.ts
 .npmignore
-gulpfile.js
\ No newline at end of file
+gulpfile.js
+tslint.json
diff --git a/nativescript-angular/animation-driver.ts b/nativescript-angular/animation-driver.ts
index fbc1f74f2..c381e0bae 100644
--- a/nativescript-angular/animation-driver.ts
+++ b/nativescript-angular/animation-driver.ts
@@ -1,8 +1,8 @@
 import { AnimationPlayer } from "@angular/core";
 import { AnimationStyles, AnimationKeyframe } from "./private_import_core";
-import { NativeScriptAnimationPlayer } from './animation-player';
+import { NativeScriptAnimationPlayer } from "./animation-player";
 import { View } from "ui/core/view";
-import { getPropertyByCssName } from 'ui/styling/style-property';
+import { getPropertyByCssName } from "ui/styling/style-property";
 
 export abstract class AnimationDriver {
     abstract animate(
@@ -16,7 +16,14 @@ export class NativeScriptAnimationDriver implements AnimationDriver {
         return (<View>element).style._getValue(getPropertyByCssName(prop));
     }
 
-    animate(element: any, _startingStyles: AnimationStyles, keyframes: AnimationKeyframe[], duration: number, delay: number, easing: string): AnimationPlayer {
+    animate(
+        element: any,
+        _startingStyles: AnimationStyles,
+        keyframes: AnimationKeyframe[],
+        duration: number,
+        delay: number,
+        easing: string
+    ): AnimationPlayer {
         return new NativeScriptAnimationPlayer(element, keyframes, duration, delay, easing);
     }
 }
diff --git a/nativescript-angular/animation-player.ts b/nativescript-angular/animation-player.ts
index bcba52474..5fec24bb0 100644
--- a/nativescript-angular/animation-player.ts
+++ b/nativescript-angular/animation-player.ts
@@ -1,11 +1,16 @@
 import { AnimationPlayer } from "@angular/core";
 import { AnimationKeyframe } from "./private_import_core";
-import { KeyframeAnimation, KeyframeAnimationInfo, KeyframeInfo, KeyframeDeclaration } from 'ui/animation/keyframe-animation';
+import {
+    KeyframeAnimation,
+    KeyframeAnimationInfo,
+    KeyframeInfo,
+    KeyframeDeclaration
+} from "ui/animation/keyframe-animation";
 import { View } from "ui/core/view";
 import { AnimationCurve } from "ui/enums";
-import { ValueSource } from 'ui/core/dependency-observable';
+import { ValueSource } from "ui/core/dependency-observable";
 import { isString } from "utils/types";
-import * as styleProperty from 'ui/styling/style-property';
+import * as styleProperty from "ui/styling/style-property";
 
 export class NativeScriptAnimationPlayer implements AnimationPlayer {
 
@@ -18,7 +23,13 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
     private animation: KeyframeAnimation;
     private target: View;
 
-    constructor(element: Node, keyframes: AnimationKeyframe[], duration: number, delay: number, easing: string) {
+    constructor(
+        element: Node,
+        keyframes: AnimationKeyframe[],
+        duration: number,
+        delay: number,
+        easing: string
+    ) {
 
         this.parentPlayer = null;
 
@@ -36,7 +47,9 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
         keyframeAnimationInfo.duration = duration;
         keyframeAnimationInfo.delay = delay;
         keyframeAnimationInfo.iterations = 1;
-        keyframeAnimationInfo.curve = easing ? NativeScriptAnimationPlayer.animationTimingFunctionConverter(easing) : AnimationCurve.ease;
+        keyframeAnimationInfo.curve = easing ?
+            NativeScriptAnimationPlayer.animationTimingFunctionConverter(easing) :
+            AnimationCurve.ease;
         keyframeAnimationInfo.keyframes = new Array<KeyframeInfo>();
         keyframeAnimationInfo.isForwards = true;
 
@@ -53,8 +66,7 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
                             value = property.valueConverter(<string>value);
                         }
                         keyframeInfo.declarations.push({ property: property.name, value: value });
-                    }
-                    else if (typeof value === "string" && substyle === "transform") {
+                    } else if (typeof value === "string" && substyle === "transform") {
                         NativeScriptAnimationPlayer.parseTransform(<string>value, keyframeInfo);
                     }
                 }
@@ -62,7 +74,8 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
             keyframeAnimationInfo.keyframes.push(keyframeInfo);
         }
 
-        this.animation = KeyframeAnimation.keyframeAnimationFromInfo(keyframeAnimationInfo, ValueSource.VisualState);
+        this.animation = KeyframeAnimation.keyframeAnimationFromInfo(
+            keyframeAnimationInfo, ValueSource.VisualState);
     }
 
     init(): void {
@@ -159,8 +172,7 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
                         NativeScriptAnimationPlayer.bezieArgumentConverter(bezierArr[1]),
                         NativeScriptAnimationPlayer.bezieArgumentConverter(bezierArr[2]),
                         NativeScriptAnimationPlayer.bezieArgumentConverter(bezierArr[3]));
-                }
-                else {
+                } else {
                     throw new Error("Invalid value for animation: " + value);
                 }
         }
@@ -178,16 +190,14 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
             let operations = {};
             operations[value] = value;
             return operations;
-        }
-        else if (isString(value)) {
+        } else if (isString(value)) {
             let operations = {};
             let operator = "";
             let pos = 0;
             while (pos < value.length) {
                 if (value[pos] === " " || value[pos] === ",") {
                     pos++;
-                }
-                else if (value[pos] === "(") {
+                } else if (value[pos] === "(") {
                     let start = pos + 1;
                     while (pos < value.length && value[pos] !== ")") {
                         pos++;
@@ -196,14 +206,12 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
                     operations[operator] = operand.trim();
                     operator = "";
                     pos++;
-                }
-                else {
+                } else {
                     operator += value[pos++];
                 }
             }
             return operations;
-        }
-        else {
+        } else {
             return undefined;
         }
     }
@@ -215,29 +223,50 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
         for (let transform in newTransform) {
             switch (transform) {
                 case "scaleX":
-                    animationInfo.declarations.push({ property: "scale", value: { x: parseFloat(newTransform[transform]), y: 1 } });
+                    animationInfo.declarations.push({
+                        property: "scale",
+                        value: { x: parseFloat(newTransform[transform]), y: 1 }
+                    });
                     break;
                 case "scaleY":
-                    animationInfo.declarations.push({ property: "scale", value: { x: 1, y: parseFloat(newTransform[transform]) } });
+                    animationInfo.declarations.push({
+                        property: "scale",
+                        value: { x: 1, y: parseFloat(newTransform[transform]) }
+                    });
                     break;
                 case "scale":
                 case "scale3d":
                     values = newTransform[transform].split(",");
                     if (values.length === 2 || values.length === 3) {
-                        animationInfo.declarations.push({ property: "scale", value: { x: parseFloat(values[0]), y: parseFloat(values[1]) } });
+                        animationInfo.declarations.push({
+                            property: "scale",
+                            value: { x: parseFloat(values[0]), y: parseFloat(values[1]) }
+                        });
                     }
                     break;
                 case "translateX":
-                    animationInfo.declarations.push({ property: "translate", value: { x: parseFloat(newTransform[transform]), y: 0 } });
+                    animationInfo.declarations.push({
+                        property: "translate",
+                        value: { x: parseFloat(newTransform[transform]), y: 0 }
+                    });
                     break;
                 case "translateY":
-                    animationInfo.declarations.push({ property: "translate", value: { x: 0, y: parseFloat(newTransform[transform]) } });
+                    animationInfo.declarations.push({
+                        property: "translate",
+                        value: { x: 0, y: parseFloat(newTransform[transform]) }
+                    });
                     break;
                 case "translate":
                 case "translate3d":
                     values = newTransform[transform].split(",");
                     if (values.length === 2 || values.length === 3) {
-                        animationInfo.declarations.push({ property: "translate", value: { x: parseFloat(values[0]), y: parseFloat(values[1]) } });
+                        animationInfo.declarations.push({
+                            property: "translate",
+                            value: {
+                                x: parseFloat(values[0]),
+                                y: parseFloat(values[1])
+                            }
+                        });
                     }
                     break;
                 case "rotate":
@@ -250,9 +279,12 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
                     break;
                 case "none":
                     animationInfo.declarations.push({ property: "scale", value: { x: 1, y: 1 } });
-                    animationInfo.declarations.push({ property: "translate", value: { x: 0, y: 0 } });
+                    animationInfo.declarations.push(
+                        { property: "translate", value: { x: 0, y: 0 } });
                     animationInfo.declarations.push({ property: "rotate", value: 0 });
                     break;
+                default:
+                    throw new Error("Unsupported transform: " + transform);
             }
         }
         return array;
diff --git a/nativescript-angular/collection-facade.ts b/nativescript-angular/collection-facade.ts
index b573dd639..08c2f6742 100644
--- a/nativescript-angular/collection-facade.ts
+++ b/nativescript-angular/collection-facade.ts
@@ -1,3 +1,4 @@
+/* tslint:disable */
 //Copied unexported functions from @angular/core/src/facade/collection
 import {
     isJsObject, isArray, getSymbolIterator,
@@ -18,7 +19,7 @@ export class ListWrapper {
   static createGrowableSize(size: number): any[] { return new Array(size); }
   static clone<T>(array: T[]): T[] { return array.slice(0); }
   static forEachWithIndex<T>(array: T[], fn: (t: T, n: number) => void) {
-    for (var i = 0; i < array.length; i++) {
+    for (let i = 0; i < array.length; i++) {
       fn(array[i], i);
     }
   }
@@ -35,24 +36,24 @@ export class ListWrapper {
   }
   static contains<T>(list: T[], el: T): boolean { return list.indexOf(el) !== -1; }
   static reversed<T>(array: T[]): T[] {
-    var a = ListWrapper.clone(array);
+    let a = ListWrapper.clone(array);
     return a.reverse();
   }
   static concat(a: any[], b: any[]): any[] { return a.concat(b); }
   static insert<T>(list: T[], index: number, value: T) { list.splice(index, 0, value); }
   static removeAt<T>(list: T[], index: number): T {
-    var res = list[index];
+    let res = list[index];
     list.splice(index, 1);
     return res;
   }
   static removeAll<T>(list: T[], items: T[]) {
-    for (var i = 0; i < items.length; ++i) {
-      var index = list.indexOf(items[i]);
+    for (let i = 0; i < items.length; ++i) {
+      let index = list.indexOf(items[i]);
       list.splice(index, 1);
     }
   }
   static remove<T>(list: T[], el: T): boolean {
-    var index = list.indexOf(el);
+    let index = list.indexOf(el);
     if (index > -1) {
       list.splice(index, 1);
       return true;
@@ -66,7 +67,7 @@ export class ListWrapper {
   }
   static equals(a: any[], b: any[]): boolean {
     if (a.length != b.length) return false;
-    for (var i = 0; i < a.length; ++i) {
+    for (let i = 0; i < a.length; ++i) {
       if (a[i] !== b[i]) return false;
     }
     return true;
@@ -89,14 +90,14 @@ export class ListWrapper {
     if (list.length == 0) {
       return null;
     }
-    var solution: any /** TODO #???? */ = null;
-    var maxValue = -Infinity;
-    for (var index = 0; index < list.length; index++) {
-      var candidate = list[index];
+    let solution: any /** TODO #???? */ = null;
+    let maxValue = -Infinity;
+    for (let index = 0; index < list.length; index++) {
+      let candidate = list[index];
       if (isBlank(candidate)) {
         continue;
       }
-      var candidateValue = predicate(candidate);
+      let candidateValue = predicate(candidate);
       if (candidateValue > maxValue) {
         solution = candidate;
         maxValue = candidateValue;
@@ -106,13 +107,13 @@ export class ListWrapper {
   }
 
   static flatten<T>(list: Array<T|T[]>): T[] {
-    var target: any[] = [];
+    let target: any[] = [];
     _flattenArray(list, target);
     return target;
   }
 
   static addAll<T>(list: Array<T>, source: Array<T>): void {
-    for (var i = 0; i < source.length; i++) {
+    for (let i = 0; i < source.length; i++) {
       list.push(source[i]);
     }
   }
@@ -120,8 +121,8 @@ export class ListWrapper {
 
 function _flattenArray(source: any[], target: any[]): any[] {
   if (isPresent(source)) {
-    for (var i = 0; i < source.length; i++) {
-      var item = source[i];
+    for (let i = 0; i < source.length; i++) {
+      let item = source[i];
       if (isArray(item)) {
         _flattenArray(item, target);
       } else {
diff --git a/nativescript-angular/common/detached-loader.ts b/nativescript-angular/common/detached-loader.ts
index 0f9a3d4b8..927a3ca38 100644
--- a/nativescript-angular/common/detached-loader.ts
+++ b/nativescript-angular/common/detached-loader.ts
@@ -1,7 +1,7 @@
 import {
     ComponentRef, ComponentFactory, ViewContainerRef,
     Component, Type, ComponentFactoryResolver, ChangeDetectorRef
-} from '@angular/core';
+} from "@angular/core";
 import * as trace from "trace";
 
 export const CATEGORY = "detached-loader";
@@ -12,36 +12,43 @@ function log(message: string) {
 
 /**
  * Wrapper component used for loading components when navigating
- * It uses DetachedContainer as selector so that it is containerRef is not attached to the visual tree.
+ * It uses DetachedContainer as selector so that it is containerRef is not attached to
+ * the visual tree.
  */
 @Component({
-    selector: 'DetachedContainer',
+    selector: "DetachedContainer",
     template: `<Placeholder #loader></Placeholder>`
 })
 export class DetachedLoader {
-    constructor(private resolver: ComponentFactoryResolver, private changeDetector: ChangeDetectorRef, private containerRef: ViewContainerRef) { }
+    constructor(
+        private resolver: ComponentFactoryResolver,
+        private changeDetector: ChangeDetectorRef,
+        private containerRef: ViewContainerRef
+    ) { }
 
     private loadInLocation(componentType: Type<any>): Promise<ComponentRef<any>> {
-        const factory = this.resolver.resolveComponentFactory(componentType)
+        const factory = this.resolver.resolveComponentFactory(componentType);
         const componentRef = this.containerRef.createComponent(
             factory, this.containerRef.length, this.containerRef.parentInjector);
 
         // Component is created, buit may not be checked if we are loading 
         // inside component with OnPush CD strategy. Mark us for check to be sure CD will reach us.
-        // We are inside a promise here so no need for setTimeout - CD should trigger after the promise.
+        // We are inside a promise here so no need for setTimeout - CD should trigger
+        // after the promise.
         log("DetachedLoader.loadInLocation component loaded -> markForCheck");
         this.changeDetector.markForCheck();
 
         return Promise.resolve(componentRef);
     }
 
-    //TODO: change this API -- async promises not needed here anymore.
+    // TODO: change this API -- async promises not needed here anymore.
     public loadComponent(componentType: Type<any>): Promise<ComponentRef<any>> {
         log("DetachedLoader.loadComponent");
         return this.loadInLocation(componentType);
     }
 
     public loadWithFactory<T>(factory: ComponentFactory<T>): ComponentRef<T> {
-        return this.containerRef.createComponent(factory, this.containerRef.length, this.containerRef.parentInjector, null);
+        return this.containerRef.createComponent(factory,
+            this.containerRef.length, this.containerRef.parentInjector, null);
     }
 }
diff --git a/nativescript-angular/common/utils.ts b/nativescript-angular/common/utils.ts
index 82d05ec9e..d357145a5 100644
--- a/nativescript-angular/common/utils.ts
+++ b/nativescript-angular/common/utils.ts
@@ -8,7 +8,7 @@ export function convertToInt(value): number {
             if (isNumber(value)) {
                 normalizedValue = value;
             } else {
-                let parsedValue = parseInt(value.toString());
+                let parsedValue = parseInt(value.toString(), 10);
                 normalizedValue = isNaN(parsedValue) ? 0 : parsedValue;
             }
         }
diff --git a/nativescript-angular/directives.ts b/nativescript-angular/directives.ts
index 9c13a56ae..2e07c59d5 100644
--- a/nativescript-angular/directives.ts
+++ b/nativescript-angular/directives.ts
@@ -1,7 +1,12 @@
-import { ListViewComponent, TemplateKeyDirective } from './directives/list-view-comp';
-import { TabViewDirective, TabViewItemDirective } from './directives/tab-view';
-import { ActionBarComponent, ActionBarScope, ActionItemDirective, NavigationButtonDirective } from './directives/action-bar';
-import { AndroidFilterComponent, IosFilterComponent } from './directives/platform-filters';
+import { ListViewComponent, TemplateKeyDirective } from "./directives/list-view-comp";
+import { TabViewDirective, TabViewItemDirective } from "./directives/tab-view";
+import {
+    ActionBarComponent,
+    ActionBarScope,
+    ActionItemDirective,
+    NavigationButtonDirective
+} from "./directives/action-bar";
+import { AndroidFilterComponent, IosFilterComponent } from "./directives/platform-filters";
 
 export const NS_DIRECTIVES = [
     ListViewComponent,
@@ -16,13 +21,22 @@ export const NS_DIRECTIVES = [
     IosFilterComponent,
 ];
 
-export { ListViewComponent, SetupItemViewArgs, TemplateKeyDirective } from './directives/list-view-comp';
-export { TextValueAccessor } from './value-accessors/text-value-accessor';
-export { CheckedValueAccessor } from './value-accessors/checked-value-accessor';
-export { DateValueAccessor } from './value-accessors/date-value-accessor';
-export { TimeValueAccessor } from './value-accessors/time-value-accessor';
-export { NumberValueAccessor } from './value-accessors/number-value-accessor';
-export { SelectedIndexValueAccessor } from './value-accessors/selectedIndex-value-accessor';
-export { TabViewDirective, TabViewItemDirective } from './directives/tab-view';
-export { ActionBarComponent, ActionBarScope, ActionItemDirective, NavigationButtonDirective } from './directives/action-bar';
-export { AndroidFilterComponent, IosFilterComponent } from './directives/platform-filters';
+export {
+    ListViewComponent,
+    SetupItemViewArgs,
+    TemplateKeyDirective
+} from "./directives/list-view-comp";
+export { TextValueAccessor } from "./value-accessors/text-value-accessor";
+export { CheckedValueAccessor } from "./value-accessors/checked-value-accessor";
+export { DateValueAccessor } from "./value-accessors/date-value-accessor";
+export { TimeValueAccessor } from "./value-accessors/time-value-accessor";
+export { NumberValueAccessor } from "./value-accessors/number-value-accessor";
+export { SelectedIndexValueAccessor } from "./value-accessors/selectedIndex-value-accessor";
+export { TabViewDirective, TabViewItemDirective } from "./directives/tab-view";
+export {
+    ActionBarComponent,
+    ActionBarScope,
+    ActionItemDirective,
+    NavigationButtonDirective
+} from "./directives/action-bar";
+export { AndroidFilterComponent, IosFilterComponent } from "./directives/platform-filters";
diff --git a/nativescript-angular/directives/action-bar.ts b/nativescript-angular/directives/action-bar.ts
index 47ba7d356..5452e4dd5 100644
--- a/nativescript-angular/directives/action-bar.ts
+++ b/nativescript-angular/directives/action-bar.ts
@@ -1,11 +1,11 @@
-import { Directive, Component, ElementRef, Optional } from '@angular/core';
+import { Directive, Component, ElementRef, Optional } from "@angular/core";
 import { ActionItem, ActionBar, NavigationButton } from "ui/action-bar";
 import { isBlank } from "../lang-facade";
 import {Page} from "ui/page";
-import { View } from 'ui/core/view';
-import { registerElement, ViewClassMeta, NgView } from '../element-registry';
+import { View } from "ui/core/view";
+import { registerElement, ViewClassMeta, NgView } from "../element-registry";
 
-var actionBarMeta: ViewClassMeta = {
+let actionBarMeta: ViewClassMeta = {
     skipAddToDom: true,
     insertChild: (parent: NgView, child: NgView, _atIndex: number) => {
         const bar = <ActionBar>(<any>parent);
@@ -34,11 +34,12 @@ var actionBarMeta: ViewClassMeta = {
         } else if (child instanceof ActionItem) {
             bar.actionItems.removeItem(childView);
             childView.parent = null;
-        } else if (child.nodeName !== "template" && child instanceof View && bar.titleView && bar.titleView === childView) {
+        } else if (child.nodeName !== "template" && child instanceof View &&
+                bar.titleView && bar.titleView === childView) {
             bar.titleView = null;
         }
     },
-}
+};
 
 registerElement("ActionBar", () => require("ui/action-bar").ActionBar, actionBarMeta);
 registerElement("ActionItem", () => require("ui/action-bar").ActionItem);
diff --git a/nativescript-angular/directives/dialogs.ts b/nativescript-angular/directives/dialogs.ts
index b54c85534..493768b73 100644
--- a/nativescript-angular/directives/dialogs.ts
+++ b/nativescript-angular/directives/dialogs.ts
@@ -1,11 +1,11 @@
 import {
     ReflectiveInjector, ComponentFactoryResolver, ViewContainerRef,
     Type, Injectable, ComponentRef, Directive
-} from '@angular/core';
-import { Page } from 'ui/page';
-import { View } from 'ui/core/view';
-import { DetachedLoader } from '../common/detached-loader';
-import { PageFactory, PAGE_FACTORY } from '../platform-providers';
+} from "@angular/core";
+import { Page } from "ui/page";
+import { View } from "ui/core/view";
+import { DetachedLoader } from "../common/detached-loader";
+import { PageFactory, PAGE_FACTORY } from "../platform-providers";
 
 export interface ModalDialogOptions {
     context?: any;
@@ -32,15 +32,25 @@ export class ModalDialogService {
         let viewContainerRef = options.viewContainerRef || this.containerRef;
 
         if (!viewContainerRef) {
-            throw new Error("No viewContainerRef: Make sure you pass viewContainerRef in ModalDialogOptions.");
+            throw new Error(
+                "No viewContainerRef: Make sure you pass viewContainerRef in ModalDialogOptions.");
         }
 
         const parentPage: Page = viewContainerRef.injector.get(Page);
-        const resolver: ComponentFactoryResolver = viewContainerRef.injector.get(ComponentFactoryResolver);
+        const resolver: ComponentFactoryResolver = viewContainerRef.injector.get(
+            ComponentFactoryResolver);
         const pageFactory: PageFactory = viewContainerRef.injector.get(PAGE_FACTORY);
 
         return new Promise((resolve) => {
-            setTimeout(() => ModalDialogService.showDialog(type, options, resolve, viewContainerRef, resolver, parentPage, pageFactory), 10);
+            setTimeout(() => ModalDialogService.showDialog(
+                type,
+                options,
+                resolve,
+                viewContainerRef,
+                resolver,
+                parentPage,
+                pageFactory
+            ), 10);
         });
     }
 
@@ -69,7 +79,8 @@ export class ModalDialogService {
             { provide: ModalDialogParams, useValue: modalParams },
         ]);
 
-        const childInjector = ReflectiveInjector.fromResolvedProviders(providers, containerRef.parentInjector);
+        const childInjector = ReflectiveInjector.fromResolvedProviders(
+            providers, containerRef.parentInjector);
         const detachedFactory = resolver.resolveComponentFactory(DetachedLoader);
         detachedLoaderRef = containerRef.createComponent(detachedFactory, -1, childInjector, null);
         detachedLoaderRef.instance.loadComponent(type).then((compRef) => {
@@ -91,8 +102,9 @@ export class ModalDialogService {
 })
 export class ModalDialogHost {
     constructor(containerRef: ViewContainerRef, modalService: ModalDialogService) {
-        console.log("ModalDialogHost is deprecated. Call ModalDialogService.showModal() by passing ViewContainerRef in the options instead.")
+        console.log("ModalDialogHost is deprecated. Call ModalDialogService.showModal() " +
+            "by passing ViewContainerRef in the options instead.");
 
         modalService.registerViewContainerRef(containerRef);
     }
-} 
+}
diff --git a/nativescript-angular/directives/list-view-comp.ts b/nativescript-angular/directives/list-view-comp.ts
index 47fb8cd0d..0b9613c1c 100644
--- a/nativescript-angular/directives/list-view-comp.ts
+++ b/nativescript-angular/directives/list-view-comp.ts
@@ -18,13 +18,13 @@ import {
     Output,
     Host,
     ChangeDetectionStrategy
-} from '@angular/core';
+} from "@angular/core";
 import { isBlank } from "../lang-facade";
 import { isListLikeIterable } from "../collection-facade";
-import { ListView } from 'ui/list-view';
-import { View, KeyedTemplate } from 'ui/core/view';
-import { ObservableArray } from 'data/observable-array';
-import { LayoutBase } from 'ui/layouts/layout-base';
+import { ListView } from "ui/list-view";
+import { View, KeyedTemplate } from "ui/core/view";
+import { ObservableArray } from "data/observable-array";
+import { LayoutBase } from "ui/layouts/layout-base";
 import { listViewLog } from "../trace";
 
 const NG_VIEW = "_ngViewRef";
@@ -48,12 +48,12 @@ export interface SetupItemViewArgs {
 }
 
 @Component({
-    selector: 'ListView',
+    selector: "ListView",
     template: `
         <DetachedContainer>
             <Placeholder #loader></Placeholder>
         </DetachedContainer>`,
-    inputs: ['items'],
+    inputs: ["items"],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
@@ -66,9 +66,9 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
     private _differ: IterableDiffer;
     private _templateMap: Map<string, KeyedTemplate>;
 
-    @ViewChild('loader', { read: ViewContainerRef }) loader: ViewContainerRef;
+    @ViewChild("loader", { read: ViewContainerRef }) loader: ViewContainerRef;
 
-    @Output() public setupItemView: EventEmitter<SetupItemViewArgs> = new EventEmitter<SetupItemViewArgs>();
+    @Output() public setupItemView = new EventEmitter<SetupItemViewArgs>();
 
     @ContentChild(TemplateRef) itemTemplate: TemplateRef<ListItemContext>;
 
@@ -79,7 +79,8 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
             needDiffer = false;
         }
         if (needDiffer && !this._differ && isListLikeIterable(value)) {
-            this._differ = this._iterableDiffers.find(this._items).create(this._cdr, (_index, item) => { return item; });
+            this._differ = this._iterableDiffers.find(this._items)
+                .create(this._cdr, (_index, item) => { return item; });
         }
 
         this.listView.items = this._items;
@@ -143,18 +144,20 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
 
         let index = args.index;
         let items = args.object.items;
-        let currentItem = typeof (items.getItem) === "function" ? items.getItem(index) : items[index];
+        let currentItem = typeof (items.getItem) === "function" ?
+            items.getItem(index) : items[index];
         let viewRef: EmbeddedViewRef<ListItemContext>;
 
         if (args.view) {
             listViewLog("onItemLoading: " + index + " - Reusing existing view");
             viewRef = args.view[NG_VIEW];
-            // getting angular view from original element (in cases when ProxyViewContainer is used NativeScript internally wraps it in a StackLayout)
+            // getting angular view from original element (in cases when ProxyViewContainer
+            // is used NativeScript internally wraps it in a StackLayout)
             if (!viewRef) {
-                viewRef = (args.view._subViews && args.view._subViews.length > 0) ? args.view._subViews[0][NG_VIEW] : undefined;
+                viewRef = (args.view._subViews && args.view._subViews.length > 0) ?
+                    args.view._subViews[0][NG_VIEW] : undefined;
             }
-        }
-        else {
+        } else {
             listViewLog("onItemLoading: " + index + " - Creating view from template");
             viewRef = this.loader.createEmbeddedView(this.itemTemplate, new ListItemContext(), 0);
             args.view = getSingleViewFromViewRef(viewRef);
@@ -182,7 +185,7 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
 
     private detectChangesOnChild(viewRef: EmbeddedViewRef<ListItemContext>, index: number) {
         // Manually detect changes in child view ref
-        // TODO: Is there a better way of getting viewRef's change detector
+        // TODO: Is there a better way of getting viewRef"s change detector
         const childChangeDetector = <ChangeDetectorRef>(<any>viewRef);
 
         listViewLog("Manually detect changes in child: " + index);
@@ -207,19 +210,16 @@ function getSingleViewRecursive(nodes: Array<any>, nestLevel: number) {
 
     if (actualNodes.length === 0) {
         throw new Error("No suitable views found in list template! Nesting level: " + nestLevel);
-    }
-    else if (actualNodes.length > 1) {
+    } else if (actualNodes.length > 1) {
         throw new Error("More than one view found in list template! Nesting level: " + nestLevel);
-    }
-    else {
+    } else {
         if (actualNodes[0]) {
             let parentLayout = actualNodes[0].parent;
             if (parentLayout instanceof LayoutBase) {
                 parentLayout.removeChild(actualNodes[0]);
             }
             return actualNodes[0];
-        }
-        else {
+        } else {
             return getSingleViewRecursive(actualNodes[0].children, nestLevel + 1);
         }
     }
@@ -243,10 +243,3 @@ export class TemplateKeyDirective {
         }
     }
 }
-
-// Debug helpers:
-// const changeDetectorMode = ["CheckOnce", "Checked", "CheckAlways", "Detached", "OnPush", "Default"];
-// const changeDetectorStates = ["Never", "CheckedBefore", "Error"];
-// function getChangeDetectorState(cdr: any) {
-//     return "Mode: " + changeDetectorMode[parseInt(cdr.cdMode)] + " State: " + changeDetectorStates[parseInt(cdr.cdState)];
-// }
diff --git a/nativescript-angular/directives/platform-filters.ts b/nativescript-angular/directives/platform-filters.ts
index 797bba2b0..47fcb5c8d 100644
--- a/nativescript-angular/directives/platform-filters.ts
+++ b/nativescript-angular/directives/platform-filters.ts
@@ -1,4 +1,4 @@
-import {Component, Inject} from '@angular/core';
+import {Component, Inject} from "@angular/core";
 import {Device, platformNames} from "platform";
 import {DEVICE} from "../platform-providers";
 
diff --git a/nativescript-angular/directives/tab-view.ts b/nativescript-angular/directives/tab-view.ts
index 44a6a1d0c..7b60330b9 100644
--- a/nativescript-angular/directives/tab-view.ts
+++ b/nativescript-angular/directives/tab-view.ts
@@ -1,22 +1,22 @@
 import { ElementRef, Directive, Input, TemplateRef, ViewContainerRef } from "@angular/core";
 import { TabView, TabViewItem } from "ui/tab-view";
-import * as utils from '../common/utils';
+import * as utils from "../common/utils";
 import { rendererLog } from "../trace";
 import { isBlank } from "../lang-facade";
 
 @Directive({
-    selector: 'TabView',
-    inputs: ['selectedIndex']
+    selector: "TabView",
+    inputs: ["selectedIndex"]
 })
 export class TabViewDirective {
     public tabView: TabView;
     private _selectedIndex: number;
     private viewInitialized: boolean;
-    
+
     get selectedIndex(): number {
         return this._selectedIndex;
     }
-    
+
     set selectedIndex(value) {
         this._selectedIndex = utils.convertToInt(value);
         if (this.viewInitialized) {
@@ -27,7 +27,7 @@ export class TabViewDirective {
     constructor(element: ElementRef) {
         this.tabView = element.nativeElement;
     }
-    
+
     ngAfterViewInit() {
         this.viewInitialized = true;
         rendererLog("this._selectedIndex: " + this._selectedIndex);
@@ -38,8 +38,8 @@ export class TabViewDirective {
 }
 
 @Directive({
-    selector: '[tabItem]',
-    inputs: ['title', 'iconSource']
+    selector: "[tabItem]",
+    inputs: ["title", "iconSource"]
 })
 export class TabViewItemDirective {
     private item: TabViewItem;
@@ -53,7 +53,7 @@ export class TabViewItemDirective {
     ) {
     }
 
-    @Input('tabItem') config: any;
+    @Input("tabItem") config: any;
 
     set title(value: string) {
         if (this._title !== value) {
@@ -85,9 +85,9 @@ export class TabViewItemDirective {
         }
 
         const viewRef = this.viewContainer.createEmbeddedView(this.templateRef);
-        //Filter out text nodes, etc
+        // Filter out text nodes, etc
         const realViews = viewRef.rootNodes.filter((node) =>
-                            node.nodeName && node.nodeName !== '#text')
+                            node.nodeName && node.nodeName !== "#text");
 
         if (realViews.length > 0) {
             this.item.view = realViews[0];
diff --git a/nativescript-angular/dom-adapter.ts b/nativescript-angular/dom-adapter.ts
index 1c248f8b4..f80986637 100644
--- a/nativescript-angular/dom-adapter.ts
+++ b/nativescript-angular/dom-adapter.ts
@@ -1,7 +1,7 @@
-import { ElementSchemaRegistry } from '@angular/compiler';
-import { SchemaMetadata } from '@angular/core';
+import { ElementSchemaRegistry } from "@angular/compiler";
+import { SchemaMetadata } from "@angular/core";
 import { Parse5DomAdapter } from "./parse5_adapter";
-import { setRootDomAdapter } from './private_import_platform-browser';
+import { setRootDomAdapter } from "./private_import_platform-browser";
 import { rendererLog } from "./trace";
 import { print } from "./lang-facade";
 
@@ -29,7 +29,7 @@ export class NativeScriptElementSchemaRegistry extends ElementSchemaRegistry {
   }
 
   getDefaultComponentElementName(): string {
-    return 'ng-component';
+    return "ng-component";
   }
 
   securityContext(_tagName: string, _propName: string): any {
@@ -52,7 +52,11 @@ export class NativeScriptElementSchemaRegistry extends ElementSchemaRegistry {
     return propName;
   }
 
-  normalizeAnimationStyleValue(_camelCaseProp: string, _userProvidedProp: string, val: string | number):
+  normalizeAnimationStyleValue(
+      _camelCaseProp: string,
+      _userProvidedProp: string,
+      val: string | number
+  ):
     { error: string, value: string } {
     return { error: null, value: val.toString() };
   }
@@ -65,7 +69,7 @@ export class NativeScriptDomAdapter extends Parse5DomAdapter {
   }
 
   hasProperty(_element: any, _name: string) {
-    //TODO: actually check if the property exists.
+    // TODO: actually check if the property exists.
     return true;
   }
 
diff --git a/nativescript-angular/element-registry.ts b/nativescript-angular/element-registry.ts
index dff81eb01..948db15f1 100644
--- a/nativescript-angular/element-registry.ts
+++ b/nativescript-angular/element-registry.ts
@@ -1,4 +1,4 @@
-import {View} from 'ui/core/view';
+import {View} from "ui/core/view";
 
 export type ViewResolver = () => ViewClass;
 export type NgView = View & ViewExtensions;
@@ -17,17 +17,21 @@ export interface ViewExtensions {
 }
 
 export interface ViewClass {
-    new (): View
+    new (): View;
 }
 
 const defaultViewMeta: ViewClassMeta = {
     skipAddToDom: false,
 };
 
-const elementMap: Map<string, { resolver: ViewResolver, meta?: ViewClassMeta }> = new Map<string, { resolver: ViewResolver, meta?: ViewClassMeta }>();
+const elementMap  = new Map<string, { resolver: ViewResolver, meta?: ViewClassMeta }>();
 const camelCaseSplit = /([a-z0-9])([A-Z])/g;
 
-export function registerElement(elementName: string, resolver: ViewResolver, meta?: ViewClassMeta): void {
+export function registerElement(
+    elementName: string,
+    resolver: ViewResolver,
+    meta?: ViewClassMeta
+): void {
     if (elementMap.has(elementName)) {
         throw new Error(`Element for ${elementName} already registered.`);
     } else {
@@ -66,9 +70,8 @@ export function isKnownView(elementName: string): boolean {
 }
 
 
-
-//Register default NativeScript components
-//Note: ActionBar related components are registerd together with action-bar directives.
+// Register default NativeScript components
+// Note: ActionBar related components are registerd together with action-bar directives.
 registerElement("AbsoluteLayout", () => require("ui/layouts/absolute-layout").AbsoluteLayout);
 registerElement("ActivityIndicator", () => require("ui/activity-indicator").ActivityIndicator);
 registerElement("Border", () => require("ui/border").Border);
@@ -106,4 +109,5 @@ registerElement("WrapLayout", () => require("ui/layouts/wrap-layout").WrapLayout
 registerElement("FormattedString", () => require("text/formatted-string").FormattedString);
 registerElement("Span", () => require("text/span").Span);
 
-registerElement("DetachedContainer", () => require("ui/proxy-view-container").ProxyViewContainer, { skipAddToDom: true });
\ No newline at end of file
+registerElement("DetachedContainer", () => require("ui/proxy-view-container").ProxyViewContainer,
+    { skipAddToDom: true });
diff --git a/nativescript-angular/file-system/ns-file-system.ts b/nativescript-angular/file-system/ns-file-system.ts
index 704ae45e4..f70381494 100644
--- a/nativescript-angular/file-system/ns-file-system.ts
+++ b/nativescript-angular/file-system/ns-file-system.ts
@@ -1,5 +1,5 @@
-import {Injectable} from '@angular/core';
-import {knownFolders, Folder} from 'file-system';
+import {Injectable} from "@angular/core";
+import {knownFolders, Folder} from "file-system";
 
 // Allows greater flexibility with `file-system` and Angular
 // Also provides a way for `file-system` to be mocked for testing
@@ -9,4 +9,4 @@ export class NSFileSystem {
   public currentApp(): Folder {
     return knownFolders.currentApp();
   }
-}
\ No newline at end of file
+}
diff --git a/nativescript-angular/forms.ts b/nativescript-angular/forms.ts
index aa5204ff8..e449fc79f 100644
--- a/nativescript-angular/forms.ts
+++ b/nativescript-angular/forms.ts
@@ -1,11 +1,11 @@
 import { NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";
-import { TextValueAccessor } from './value-accessors/text-value-accessor';
-import { CheckedValueAccessor } from './value-accessors/checked-value-accessor';
-import { DateValueAccessor } from './value-accessors/date-value-accessor';
-import { TimeValueAccessor } from './value-accessors/time-value-accessor';
-import { NumberValueAccessor } from './value-accessors/number-value-accessor';
-import { SelectedIndexValueAccessor } from './value-accessors/selectedIndex-value-accessor';
+import { TextValueAccessor } from "./value-accessors/text-value-accessor";
+import { CheckedValueAccessor } from "./value-accessors/checked-value-accessor";
+import { DateValueAccessor } from "./value-accessors/date-value-accessor";
+import { TimeValueAccessor } from "./value-accessors/time-value-accessor";
+import { NumberValueAccessor } from "./value-accessors/number-value-accessor";
+import { SelectedIndexValueAccessor } from "./value-accessors/selectedIndex-value-accessor";
 
 export const FORMS_DIRECTIVES = [
     TextValueAccessor,
diff --git a/nativescript-angular/http.ts b/nativescript-angular/http.ts
index 11cd2c1f6..ac5d8631a 100644
--- a/nativescript-angular/http.ts
+++ b/nativescript-angular/http.ts
@@ -1,6 +1,6 @@
 import {
     Http, XHRBackend, RequestOptions
-} from '@angular/http';
+} from "@angular/http";
 import { NSXSRFStrategy, NSHttp } from "./http/ns-http";
 import { NSFileSystem } from "./file-system/ns-file-system";
 
@@ -17,9 +17,10 @@ export function nsXSRFStrategyFactory() {
 
 @NgModule({
     providers: [
-        { provide: XSRFStrategy, useFactory: nsXSRFStrategyFactory },
+        {provide: XSRFStrategy, useFactory: nsXSRFStrategyFactory},
         NSFileSystem,
-        { provide: Http, useFactory: nsHttpFactory, deps: [XHRBackend, RequestOptions, NSFileSystem] }
+        {provide: Http, useFactory: nsHttpFactory,
+            deps: [XHRBackend, RequestOptions, NSFileSystem]}
     ],
     imports: [
         HttpModule,
diff --git a/nativescript-angular/http/ns-http.ts b/nativescript-angular/http/ns-http.ts
index 5c504dcff..8e9b8e1fa 100644
--- a/nativescript-angular/http/ns-http.ts
+++ b/nativescript-angular/http/ns-http.ts
@@ -1,8 +1,15 @@
-import {Injectable} from '@angular/core';
-import {Http, ConnectionBackend, RequestOptionsArgs, ResponseOptions, ResponseType, Response} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/observable/fromPromise';
-import {NSFileSystem} from '../file-system/ns-file-system';
+import {Injectable} from "@angular/core";
+import {
+    Http,
+    ConnectionBackend,
+    RequestOptionsArgs,
+    ResponseOptions,
+    ResponseType,
+    Response
+} from "@angular/http";
+import {Observable} from "rxjs/Observable";
+import "rxjs/add/observable/fromPromise";
+import {NSFileSystem} from "../file-system/ns-file-system";
 
 export class NSXSRFStrategy {
   public configureRequest(_req: any) {
@@ -21,9 +28,9 @@ export class NSHttp extends Http {
    * Uses a local file if `~/` resource is requested.
    */
   get(url: string, options?: RequestOptionsArgs): Observable<Response> {
-    if (url.indexOf('~') === 0 || url.indexOf('/') === 0) {
+    if (url.indexOf("~") === 0 || url.indexOf("/") === 0) {
       // normalize url
-      url = url.replace('~', '').replace('/', '');
+      url = url.replace("~", "").replace("/", "");
       // request from local app resources
       return Observable.fromPromise<Response>(new Promise((resolve, reject) => {
         let app = this.nsFileSystem.currentApp();
@@ -35,7 +42,7 @@ export class NSHttp extends Http {
             reject(responseOptions(err, 400, url));
           });
         } else {
-          reject(responseOptions('Not Found', 404, url));
+          reject(responseOptions("Not Found", 404, url));
         }
       }));
     } else {
@@ -48,7 +55,7 @@ function responseOptions(body: string | Object, status: number, url: string): Re
   return new Response(new ResponseOptions({
     body: body,
     status: status,
-    statusText: 'OK',
+    statusText: "OK",
     type: status === 200 ? ResponseType.Default : ResponseType.Error,
     url: url
   }));
diff --git a/nativescript-angular/index.ts b/nativescript-angular/index.ts
index ef3f466dc..e146bd674 100644
--- a/nativescript-angular/index.ts
+++ b/nativescript-angular/index.ts
@@ -4,4 +4,4 @@ export * from "./router";
 export * from "./forms";
 export * from "./http";
 export * from "./directives";
-export * from "./common/detached-loader";
\ No newline at end of file
+export * from "./common/detached-loader";
diff --git a/nativescript-angular/lang-facade.ts b/nativescript-angular/lang-facade.ts
index fabf8883d..883c3662f 100644
--- a/nativescript-angular/lang-facade.ts
+++ b/nativescript-angular/lang-facade.ts
@@ -1,3 +1,4 @@
+/* tslint:disable */
 //Copied unexported functions from @angular/core/src/facade/lang
 var globalScope = global;
 export var global = globalScope;
@@ -32,16 +33,16 @@ export function isArray(obj: any): boolean {
 
 // When Symbol.iterator doesn't exist, retrieves the key used in es6-shim
 declare var Symbol: any;
-var _symbolIterator: any = null;
+let _symbolIterator: any = null;
 export function getSymbolIterator(): string|symbol {
   if (isBlank(_symbolIterator)) {
     if (isPresent((<any>globalScope).Symbol) && isPresent(Symbol.iterator)) {
       _symbolIterator = Symbol.iterator;
     } else {
       // es6-shim specific logic
-      var keys = Object.getOwnPropertyNames(Map.prototype);
-      for (var i = 0; i < keys.length; ++i) {
-        var key = keys[i];
+      let keys = Object.getOwnPropertyNames(Map.prototype);
+      for (let i = 0; i < keys.length; ++i) {
+        let key = keys[i];
         if (key !== 'entries' && key !== 'size' &&
             (Map as any).prototype[key] === Map.prototype['entries']) {
           _symbolIterator = key;
@@ -66,10 +67,10 @@ export class DateWrapper {
 }
 
 export function setValueOnPath(global: any, path: string, value: any) {
-  var parts = path.split('.');
-  var obj: any = global;
+  let parts = path.split('.');
+  let obj: any = global;
   while (parts.length > 1) {
-    var name = parts.shift();
+    let name = parts.shift();
     if (obj.hasOwnProperty(name) && isPresent(obj[name])) {
       obj = obj[name];
     } else {
diff --git a/nativescript-angular/nativescript.module.ts b/nativescript-angular/nativescript.module.ts
index 4f5e7a93a..a1fa97fac 100644
--- a/nativescript-angular/nativescript.module.ts
+++ b/nativescript-angular/nativescript.module.ts
@@ -1,12 +1,12 @@
-import 'globals';
-import './zone.js/dist/zone-nativescript';
+import "globals";
+import "./zone.js/dist/zone-nativescript";
 
-import 'reflect-metadata';
-import './polyfills/array';
-import './polyfills/console';
+import "reflect-metadata";
+import "./polyfills/array";
+import "./polyfills/console";
 
-import { CommonModule } from '@angular/common';
-import { NativeScriptRootRenderer, NativeScriptRenderer } from './renderer';
+import { CommonModule } from "@angular/common";
+import { NativeScriptRootRenderer, NativeScriptRenderer } from "./renderer";
 import { DetachedLoader } from "./common/detached-loader";
 import { ModalDialogHost, ModalDialogService } from "./directives/dialogs";
 import {
@@ -15,11 +15,11 @@ import {
     Renderer,
     RootRenderer,
     NgModule, NO_ERRORS_SCHEMA,
-} from '@angular/core';
+} from "@angular/core";
 import {
     defaultPageProvider, defaultFrameProvider, defaultDeviceProvider
 } from "./platform-providers";
-import { NS_DIRECTIVES } from './directives';
+import { NS_DIRECTIVES } from "./directives";
 
 import * as nativescriptIntl from "nativescript-intl";
 global.Intl = nativescriptIntl;
diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index 3a908783f..1e66972eb 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -14,10 +14,11 @@
     "url": "https://github.com/NativeScript/nativescript-angular.git"
   },
   "scripts": {
-    "postinstall": "node postinstall.js",
-    "ngc": "ngc -p tsconfig.json",
-    "tsc": "tsc -p tsconfig.json",
-    "prepublish": "npm run tsc && npm run ngc"
+      "tslint": "tslint --project tsconfig.json --config tslint.json",
+      "postinstall": "node postinstall.js",
+      "ngc": "ngc -p tsconfig.json",
+      "tsc": "tsc -p tsconfig.json",
+      "prepublish": "npm run tsc && npm run ngc"
   },
   "dependencies": {
     "nativescript-intl": "~0.0.4",
@@ -40,6 +41,7 @@
     "tns-core-modules": ">=2.4.0 || >=2.4.0-2016",
     "zone.js": "^0.6.21",
     "typescript": "^2.0.2",
+    "tslint": "~4.0.1",
     "@angular/compiler-cli": "~2.2.1"
   },
   "nativescript": {}
diff --git a/nativescript-angular/parse5_adapter.ts b/nativescript-angular/parse5_adapter.ts
index 3c4782940..c6a5f2b3a 100644
--- a/nativescript-angular/parse5_adapter.ts
+++ b/nativescript-angular/parse5_adapter.ts
@@ -1,3 +1,4 @@
+/* tslint:disable */
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -13,9 +14,9 @@ import {DomAdapter, setRootDomAdapter} from './private_import_platform-browser';
 import {isPresent, isBlank, setValueOnPath} from "./lang-facade";
 import {SelectorMatcher, CssSelector} from '@angular/compiler';
 
-var parser: any /** TODO #9100 */ = null;
-var serializer: any /** TODO #9100 */ = null;
-var treeAdapter: any /** TODO #9100 */ = null;
+let parser: any /** TODO #9100 */ = null;
+let serializer: any /** TODO #9100 */ = null;
+let treeAdapter: any /** TODO #9100 */ = null;
 
 const _attrToPropMap: {[key: string]: string} = {
   'class': 'className',
diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts
index 4598083a7..df1f43171 100644
--- a/nativescript-angular/platform-common.ts
+++ b/nativescript-angular/platform-common.ts
@@ -1,9 +1,9 @@
 // Initial imports and polyfills
-import 'globals';
-import './zone.js/dist/zone-nativescript';
-import 'reflect-metadata';
-import './polyfills/array';
-import './polyfills/console';
+import "globals";
+import "./zone.js/dist/zone-nativescript";
+import "reflect-metadata";
+import "./polyfills/array";
+import "./polyfills/console";
 
 import {
   Type,
@@ -16,22 +16,22 @@ import {
   Provider,
   Sanitizer,
   OpaqueToken,
-} from '@angular/core';
+} from "@angular/core";
 
-//Work around a TS bug requiring an import of OpaqueToken without using it
+// Work around a TS bug requiring an import of OpaqueToken without using it
 if (global.___TS_UNUSED) {
-    () => {
+    (() => {
         return OpaqueToken;
-    }
+    })();
 }
 
 import { rendererLog, rendererError } from "./trace";
-import { PAGE_FACTORY, PageFactory, defaultPageFactoryProvider } from './platform-providers';
+import { PAGE_FACTORY, PageFactory, defaultPageFactoryProvider } from "./platform-providers";
 
 import * as application from "application";
 import { topmost, NavigationEntry } from "ui/frame";
-import { Page } from 'ui/page';
-import { TextView } from 'ui/text-view';
+import { Page } from "ui/page";
+import { TextView } from "ui/text-view";
 
 import * as nativescriptIntl from "nativescript-intl";
 global.Intl = nativescriptIntl;
@@ -72,15 +72,18 @@ export class NativeScriptPlatformRef extends PlatformRef {
 
     this.bootstrapApp();
 
-    return null; //Make the compiler happy
+    return null; // Make the compiler happy
   }
 
-  bootstrapModule<M>(moduleType: Type<M>, compilerOptions: CompilerOptions | CompilerOptions[] = []): Promise<NgModuleRef<M>> {
+  bootstrapModule<M>(
+      moduleType: Type<M>,
+      compilerOptions: CompilerOptions | CompilerOptions[] = []
+  ): Promise<NgModuleRef<M>> {
     this._bootstrapper = () => this.platform.bootstrapModule(moduleType, compilerOptions);
 
     this.bootstrapApp();
 
-    return null; //Make the compiler happy
+    return null; // Make the compiler happy
   }
 
   private bootstrapApp() {
@@ -147,15 +150,15 @@ export class NativeScriptPlatformRef extends PlatformRef {
         }
 
         let onLoadedHandler = function () {
-          page.off('loaded', onLoadedHandler);
-          //profiling.stop('application-start');
-          rendererLog('Page loaded');
+          page.off("loaded", onLoadedHandler);
+          // profiling.stop("application-start");
+          rendererLog("Page loaded");
 
-          //profiling.start('ng-bootstrap');
-          rendererLog('BOOTSTRAPPING...');
+          // profiling.start("ng-bootstrap");
+          rendererLog("BOOTSTRAPPING...");
           bootstrapAction().then((moduleRef) => {
-            //profiling.stop('ng-bootstrap');
-            rendererLog('ANGULAR BOOTSTRAP DONE.');
+            // profiling.stop("ng-bootstrap");
+            rendererLog("ANGULAR BOOTSTRAP DONE.");
             lastBootstrappedModule = new WeakRef(moduleRef);
 
             if (resolve) {
@@ -163,7 +166,7 @@ export class NativeScriptPlatformRef extends PlatformRef {
             }
             return moduleRef;
           }, (err) => {
-            rendererError('ERROR BOOTSTRAPPING ANGULAR');
+            rendererError("ERROR BOOTSTRAPPING ANGULAR");
             let errorMessage = err.message + "\n\n" + err.stack;
             rendererError(errorMessage);
 
@@ -177,7 +180,7 @@ export class NativeScriptPlatformRef extends PlatformRef {
           });
         };
 
-        page.on('loaded', onLoadedHandler);
+        page.on("loaded", onLoadedHandler);
 
         return page;
       }
diff --git a/nativescript-angular/platform-providers.ts b/nativescript-angular/platform-providers.ts
index 98fbb374c..ff47f2800 100644
--- a/nativescript-angular/platform-providers.ts
+++ b/nativescript-angular/platform-providers.ts
@@ -1,18 +1,18 @@
-import { topmost, Frame } from 'ui/frame';
-import { Page } from 'ui/page';
-import { OpaqueToken } from '@angular/core';
+import { topmost, Frame } from "ui/frame";
+import { Page } from "ui/page";
+import { OpaqueToken } from "@angular/core";
 import { device } from "platform";
 import * as platform from "platform";
 
-export const APP_ROOT_VIEW = new OpaqueToken('App Root View');
-export const DEVICE = new OpaqueToken('platfrom device');
-export const PAGE_FACTORY = new OpaqueToken('page factory');
+export const APP_ROOT_VIEW = new OpaqueToken("App Root View");
+export const DEVICE = new OpaqueToken("platfrom device");
+export const PAGE_FACTORY = new OpaqueToken("page factory");
 
-//Work around a TS bug requiring an import of platform.Device without using it
+// Work around a TS bug requiring an import of platform.Device without using it
 if (global.___TS_UNUSED) {
-    () => {
+    (() => {
         return platform;
-    }
+    })();
 }
 
 export function getDefaultPage(): Page {
@@ -31,13 +31,13 @@ export const defaultDeviceProvider = { provide: DEVICE, useValue: device };
 
 export type PageFactory = (options: PageFactoryOptions) => Page;
 export interface PageFactoryOptions {
-    isBootstrap?: boolean,
-    isLivesync?:boolean,
-    isModal?: boolean,
-    isNavigation?: boolean,
-    componentType?: any
+    isBootstrap?: boolean;
+    isLivesync?: boolean;
+    isModal?: boolean;
+    isNavigation?: boolean;
+    componentType?: any;
 }
 export const defaultPageFactory: PageFactory = function (_opts: PageFactoryOptions) {
     return new Page();
-}
+};
 export const defaultPageFactoryProvider = { provide: PAGE_FACTORY, useValue: defaultPageFactory };
diff --git a/nativescript-angular/platform-static.ts b/nativescript-angular/platform-static.ts
index 9c9d7c32e..b6a3c65fb 100644
--- a/nativescript-angular/platform-static.ts
+++ b/nativescript-angular/platform-static.ts
@@ -1,14 +1,19 @@
 // Always import platform-common first - because polyfills 
-import { NativeScriptPlatformRef, AppOptions, COMMON_PROVIDERS, PlatformFactory } from "./platform-common";
+import {
+    NativeScriptPlatformRef,
+    AppOptions,
+    COMMON_PROVIDERS,
+    PlatformFactory
+} from "./platform-common";
 
-import { platformCore, PlatformRef, createPlatformFactory } from '@angular/core';
+import { platformCore, PlatformRef, createPlatformFactory } from "@angular/core";
 
 // "Static" platform
 const _platformNativeScript: PlatformFactory = createPlatformFactory(
-  platformCore, 'nativeScript', [...COMMON_PROVIDERS]);
+  platformCore, "nativeScript", [...COMMON_PROVIDERS]);
 
 export function platformNativeScript(options?: AppOptions, extraProviders?: any[]): PlatformRef {
-  //Return raw platform to advanced users only if explicitly requested
+  // Return raw platform to advanced users only if explicitly requested
   if (options && options.bootInExistingPage === true) {
     return _platformNativeScript(extraProviders);
   } else {
diff --git a/nativescript-angular/platform.ts b/nativescript-angular/platform.ts
index 60d3fbdc5..809d6a486 100644
--- a/nativescript-angular/platform.ts
+++ b/nativescript-angular/platform.ts
@@ -1,29 +1,34 @@
 // Always import platform-common first - because polyfills 
-import { NativeScriptPlatformRef, AppOptions, PlatformFactory, COMMON_PROVIDERS } from "./platform-common";
+import {
+    NativeScriptPlatformRef,
+    AppOptions,
+    PlatformFactory,
+    COMMON_PROVIDERS
+} from "./platform-common";
 
 import {
     ElementSchemaRegistry,
     ResourceLoader,
     COMPILER_PROVIDERS,
     platformCoreDynamic
-} from '@angular/compiler';
+} from "@angular/compiler";
 
 import {
     COMPILER_OPTIONS,
     PlatformRef,
     OpaqueToken,
     createPlatformFactory
-} from '@angular/core';
+} from "@angular/core";
 
-//Work around a TS bug requiring an import of OpaqueToken without using it
+// Work around a TS bug requiring an import of OpaqueToken without using it
 if (global.___TS_UNUSED) {
-    () => {
+    (() => {
         return OpaqueToken;
-    }
+    })();
 }
 
-import { NativeScriptElementSchemaRegistry } from './dom-adapter';
-import { FileSystemResourceLoader } from './resource-loader';
+import { NativeScriptElementSchemaRegistry } from "./dom-adapter";
+import { FileSystemResourceLoader } from "./resource-loader";
 
 export { NativeScriptModule } from "./nativescript.module";
 
@@ -43,10 +48,13 @@ export const NS_COMPILER_PROVIDERS = [
 
 // Dynamic platform 
 const _platformNativeScriptDynamic: PlatformFactory = createPlatformFactory(
-    platformCoreDynamic, 'nativeScriptDynamic', [...COMMON_PROVIDERS, ...NS_COMPILER_PROVIDERS]);
+    platformCoreDynamic, "nativeScriptDynamic", [...COMMON_PROVIDERS, ...NS_COMPILER_PROVIDERS]);
 
-export function platformNativeScriptDynamic(options?: AppOptions, extraProviders?: any[]): PlatformRef {
-    //Return raw platform to advanced users only if explicitly requested
+export function platformNativeScriptDynamic(
+    options?: AppOptions,
+    extraProviders?: any[]
+): PlatformRef {
+    // Return raw platform to advanced users only if explicitly requested
     if (options && options.bootInExistingPage === true) {
         return _platformNativeScriptDynamic(extraProviders);
     } else {
diff --git a/nativescript-angular/polyfills/array.ts b/nativescript-angular/polyfills/array.ts
index 20f86c833..a08882398 100644
--- a/nativescript-angular/polyfills/array.ts
+++ b/nativescript-angular/polyfills/array.ts
@@ -1,25 +1,25 @@
 if (!(<any>Array.prototype).fill)  {
   (<any>Array.prototype).fill = function(value) {
- 
-    var O = Object(this);
-    var len = parseInt(O.length, 10);
-    var start = arguments[1];
-    var relativeStart = parseInt(start, 10) || 0;
-    var k = relativeStart < 0
-            ? Math.max( len + relativeStart, 0) 
+
+    let O = Object(this);
+    let len = parseInt(O.length, 10);
+    let start = arguments[1];
+    let relativeStart = parseInt(start, 10) || 0;
+    let k = relativeStart < 0
+            ? Math.max( len + relativeStart, 0)
             : Math.min( relativeStart, len );
-    var end = arguments[2];
-    var relativeEnd = end === undefined
-                      ? len 
-                      : (parseInt( end) || 0) ;
-    var final = relativeEnd < 0
+    let end = arguments[2];
+    let relativeEnd = end === undefined
+                      ? len
+                      : (parseInt(end, 10) || 0) ;
+    let final = relativeEnd < 0
                 ? Math.max(len + relativeEnd, 0)
                 : Math.min(relativeEnd, len);
- 
+
     for (; k < final; k++) {
         O[k] = value;
     }
- 
+
     return O;
   };
 }
@@ -29,16 +29,16 @@ if (!(<any>Array).from) {
         let results: Array<any> = [];
 
         if (iterable.next) {
-            //Iterator objects
-            let step = null;
-            while (step = iterable.next()) {
-                if (step.done)
+            // Iterator objects
+            for (let step = null; ; step = iterable.next()) {
+                if (step.done) {
                     break;
-                else
+                } else {
                     results.push(step.value);
+                }
             }
         } else {
-            //Array-like objects
+            // Array-like objects
             results = [].slice.call(iterable);
         }
 
diff --git a/nativescript-angular/polyfills/console.ts b/nativescript-angular/polyfills/console.ts
index 2bdd97dda..383ae203e 100644
--- a/nativescript-angular/polyfills/console.ts
+++ b/nativescript-angular/polyfills/console.ts
@@ -4,4 +4,4 @@ if (!console.group) {
 
 if (!console.groupEnd) {
     console.groupEnd = () => {};
-}
\ No newline at end of file
+}
diff --git a/nativescript-angular/private_import_core.ts b/nativescript-angular/private_import_core.ts
index f2512b86f..b629c7c8c 100644
--- a/nativescript-angular/private_import_core.ts
+++ b/nativescript-angular/private_import_core.ts
@@ -6,32 +6,32 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {__core_private__ as r} from '@angular/core';
+import {__core_private__ as r} from "@angular/core";
 
 export type RenderDebugInfo = typeof r._RenderDebugInfo;
-export var RenderDebugInfo: typeof r.RenderDebugInfo = r.RenderDebugInfo;
+export let RenderDebugInfo: typeof r.RenderDebugInfo = r.RenderDebugInfo;
 
-export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities;
+export let ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities;
 
 export type DebugDomRootRenderer = typeof r._DebugDomRootRenderer;
-export var DebugDomRootRenderer: typeof r.DebugDomRootRenderer = r.DebugDomRootRenderer;
-export var reflector: typeof r.reflector = r.reflector;
+export let DebugDomRootRenderer: typeof r.DebugDomRootRenderer = r.DebugDomRootRenderer;
+export let reflector: typeof r.reflector = r.reflector;
 
 export type NoOpAnimationPlayer = typeof r._NoOpAnimationPlayer;
-export var NoOpAnimationPlayer: typeof r.NoOpAnimationPlayer = r.NoOpAnimationPlayer;
+export let NoOpAnimationPlayer: typeof r.NoOpAnimationPlayer = r.NoOpAnimationPlayer;
 export type AnimationPlayer = typeof r._AnimationPlayer;
-export var AnimationPlayer: typeof r.AnimationPlayer = r.AnimationPlayer;
+export let AnimationPlayer: typeof r.AnimationPlayer = r.AnimationPlayer;
 export type AnimationSequencePlayer = typeof r._AnimationSequencePlayer;
-export var AnimationSequencePlayer: typeof r.AnimationSequencePlayer = r.AnimationSequencePlayer;
+export let AnimationSequencePlayer: typeof r.AnimationSequencePlayer = r.AnimationSequencePlayer;
 export type AnimationGroupPlayer = typeof r._AnimationGroupPlayer;
-export var AnimationGroupPlayer: typeof r.AnimationGroupPlayer = r.AnimationGroupPlayer;
+export let AnimationGroupPlayer: typeof r.AnimationGroupPlayer = r.AnimationGroupPlayer;
 export type AnimationKeyframe = typeof r._AnimationKeyframe;
-export var AnimationKeyframe: typeof r.AnimationKeyframe = r.AnimationKeyframe;
+export let AnimationKeyframe: typeof r.AnimationKeyframe = r.AnimationKeyframe;
 export type AnimationStyles = typeof r._AnimationStyles;
-export var AnimationStyles: typeof r.AnimationStyles = r.AnimationStyles;
-export var prepareFinalAnimationStyles: typeof r.prepareFinalAnimationStyles =
+export let AnimationStyles: typeof r.AnimationStyles = r.AnimationStyles;
+export let prepareFinalAnimationStyles: typeof r.prepareFinalAnimationStyles =
     r.prepareFinalAnimationStyles;
-export var balanceAnimationKeyframes: typeof r.balanceAnimationKeyframes =
+export let balanceAnimationKeyframes: typeof r.balanceAnimationKeyframes =
     r.balanceAnimationKeyframes;
-export var clearStyles: typeof r.clearStyles = r.clearStyles;
-export var collectAndResolveStyles: typeof r.collectAndResolveStyles = r.collectAndResolveStyles;
+export let clearStyles: typeof r.clearStyles = r.clearStyles;
+export let collectAndResolveStyles: typeof r.collectAndResolveStyles = r.collectAndResolveStyles;
diff --git a/nativescript-angular/private_import_platform-browser.ts b/nativescript-angular/private_import_platform-browser.ts
index d15eed339..946ea58c0 100644
--- a/nativescript-angular/private_import_platform-browser.ts
+++ b/nativescript-angular/private_import_platform-browser.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {__platform_browser_private__ as _} from '@angular/platform-browser';
+import {__platform_browser_private__ as _} from "@angular/platform-browser";
 
 export type DomAdapter = typeof _._DomAdapter;
-export var DomAdapter: typeof _.DomAdapter = _.DomAdapter;
-export var setRootDomAdapter: typeof _.setRootDomAdapter = _.setRootDomAdapter;
-export var getDOM: typeof _.getDOM = _.getDOM;
+export let DomAdapter: typeof _.DomAdapter = _.DomAdapter;
+export let setRootDomAdapter: typeof _.setRootDomAdapter = _.setRootDomAdapter;
+export let getDOM: typeof _.getDOM = _.getDOM;
diff --git a/nativescript-angular/renderer.ts b/nativescript-angular/renderer.ts
index 728edf378..98403e836 100644
--- a/nativescript-angular/renderer.ts
+++ b/nativescript-angular/renderer.ts
@@ -1,22 +1,22 @@
 import {
     Inject, Injectable, Optional, NgZone,
     Renderer, RootRenderer, RenderComponentType,
-} from '@angular/core';
+} from "@angular/core";
 import { AnimationPlayer } from "@angular/core";
 import { AnimationStyles, AnimationKeyframe } from "./private_import_core";
 import {APP_ROOT_VIEW, DEVICE} from "./platform-providers";
 import {isBlank} from "./lang-facade";
 import {View} from "ui/core/view";
 import * as application from "application";
-import {topmost} from 'ui/frame';
-import {Page} from 'ui/page';
+import {topmost} from "ui/frame";
+import {Page} from "ui/page";
 import {ViewUtil, NgView} from "./view-util";
 import {rendererLog as traceLog} from "./trace";
 import {escapeRegexSymbols} from "utils/utils";
 import { Device } from "platform";
 
 import * as nsAnimationDriver from "./animation-driver";
-var nsAnimationDriverModule: typeof nsAnimationDriver;
+let nsAnimationDriverModule: typeof nsAnimationDriver;
 
 function ensureAnimationDriverModule() {
     if (!nsAnimationDriverModule) {
@@ -24,8 +24,8 @@ function ensureAnimationDriverModule() {
     }
 }
 
-//CONTENT_ATTR not exported from dom_renderer - we need it for styles application.
-export const COMPONENT_VARIABLE = '%COMP%';
+// CONTENT_ATTR not exported from dom_renderer - we need it for styles application.
+export const COMPONENT_VARIABLE = "%COMP%";
 export const CONTENT_ATTR = `_ngcontent-${COMPONENT_VARIABLE}`;
 
 
@@ -50,7 +50,7 @@ export class NativeScriptRootRenderer implements RootRenderer {
         this._viewUtil = new ViewUtil(device);
     }
 
-    private _registeredComponents: Map<string, NativeScriptRenderer> = new Map<string, NativeScriptRenderer>();
+    private _registeredComponents = new Map<string, NativeScriptRenderer>();
 
     public get rootView(): View {
         if (!this._rootView) {
@@ -70,7 +70,8 @@ export class NativeScriptRootRenderer implements RootRenderer {
     renderComponent(componentProto: RenderComponentType): Renderer {
         let renderer = this._registeredComponents.get(componentProto.id);
         if (isBlank(renderer)) {
-            renderer = new NativeScriptRenderer(this, componentProto, this.animationDriver, this._zone);
+            renderer = new NativeScriptRenderer(this, componentProto,
+                this.animationDriver, this._zone);
             this._registeredComponents.set(componentProto.id, renderer);
         }
         return renderer;
@@ -101,7 +102,7 @@ export class NativeScriptRenderer extends Renderer {
             const realCSS = this.replaceNgAttribute(cssString, this.componentProtoId);
             application.addCss(realCSS);
         }
-        traceLog('NativeScriptRenderer created');
+        traceLog("NativeScriptRenderer created");
     }
 
     private attrReplacer = new RegExp(escapeRegexSymbols(CONTENT_ATTR), "g");
@@ -117,26 +118,26 @@ export class NativeScriptRenderer extends Renderer {
     }
 
     selectRootElement(selector: string): NgView {
-        traceLog('selectRootElement: ' + selector);
+        traceLog("selectRootElement: " + selector);
         const rootView = <NgView><any>this.rootRenderer.rootView;
-        rootView.nodeName = 'ROOT';
+        rootView.nodeName = "ROOT";
         return rootView;
     }
 
     createViewRoot(hostElement: NgView): NgView {
-        traceLog('CREATE VIEW ROOT: ' + hostElement.nodeName);
+        traceLog("CREATE VIEW ROOT: " + hostElement.nodeName);
         return hostElement;
     }
 
     projectNodes(parentElement: NgView, nodes: NgView[]): void {
-        traceLog('NativeScriptRenderer.projectNodes');
+        traceLog("NativeScriptRenderer.projectNodes");
         nodes.forEach((node) => {
             this.viewUtil.insertChild(parentElement, node);
         });
     }
 
     attachViewAfter(anchorNode: NgView, viewRootNodes: NgView[]) {
-        traceLog('NativeScriptRenderer.attachViewAfter: ' + anchorNode.nodeName + ' ' + anchorNode);
+        traceLog("NativeScriptRenderer.attachViewAfter: " + anchorNode.nodeName + " " + anchorNode);
         const parent = (<NgView>anchorNode.parent || anchorNode.templateParent);
         const insertPosition = this.viewUtil.getChildIndex(parent, anchorNode);
 
@@ -147,7 +148,7 @@ export class NativeScriptRenderer extends Renderer {
     }
 
     detachView(viewRootNodes: NgView[]) {
-        traceLog('NativeScriptRenderer.detachView');
+        traceLog("NativeScriptRenderer.detachView");
         for (let i = 0; i < viewRootNodes.length; i++) {
             let node = viewRootNodes[i];
             this.viewUtil.removeChild(<NgView>node.parent, node);
@@ -157,16 +158,18 @@ export class NativeScriptRenderer extends Renderer {
     public destroyView(_hostElement: NgView, _viewAllNodes: NgView[]) {
         traceLog("NativeScriptRenderer.destroyView");
         // Seems to be called on component dispose only (router outlet)
-        //TODO: handle this when we resolve routing and navigation.
+        // TODO: handle this when we resolve routing and navigation.
     }
 
     setElementProperty(renderElement: NgView, propertyName: string, propertyValue: any) {
-        traceLog("NativeScriptRenderer.setElementProperty " + renderElement + ': ' + propertyName + " = " + propertyValue);
+        traceLog("NativeScriptRenderer.setElementProperty " + renderElement + ": " +
+            propertyName + " = " + propertyValue);
         this.viewUtil.setProperty(renderElement, propertyName, propertyValue);
     }
 
     setElementAttribute(renderElement: NgView, attributeName: string, attributeValue: string) {
-        traceLog("NativeScriptRenderer.setElementAttribute " + renderElement + ': ' + attributeName + " = " + attributeValue);
+        traceLog("NativeScriptRenderer.setElementAttribute " + renderElement + ": " +
+            attributeName + " = " + attributeValue);
         return this.setElementProperty(renderElement, attributeName, attributeValue);
     }
 
@@ -184,21 +187,17 @@ export class NativeScriptRenderer extends Renderer {
         this.viewUtil.setStyleProperty(renderElement, styleName, styleValue);
     }
 
-    /**
-    * Used only in debug mode to serialize property changes to comment nodes,
-    * such as <template> placeholders.
-    */
+    // Used only in debug mode to serialize property changes to comment nodes,
+    // such as <template> placeholders.
     setBindingDebugInfo(renderElement: NgView, propertyName: string, propertyValue: string): void {
-        traceLog('NativeScriptRenderer.setBindingDebugInfo: ' + renderElement + ', ' + propertyName + ' = ' + propertyValue);
+        traceLog("NativeScriptRenderer.setBindingDebugInfo: " + renderElement + ", " +
+            propertyName + " = " + propertyValue);
     }
 
     setElementDebugInfo(renderElement: any, _info: any /*RenderDebugInfo*/): void {
-        traceLog('NativeScriptRenderer.setElementDebugInfo: ' + renderElement);
+        traceLog("NativeScriptRenderer.setElementDebugInfo: " + renderElement);
     }
 
-    /**
-    * Calls a method on an element.
-    */
     invokeElementMethod(_renderElement: NgView, methodName: string, args: Array<any>) {
         traceLog("NativeScriptRenderer.invokeElementMethod " + methodName + " " + args);
     }
@@ -208,12 +207,13 @@ export class NativeScriptRenderer extends Renderer {
     }
 
     public createTemplateAnchor(parentElement: NgView): NgView {
-        traceLog('NativeScriptRenderer.createTemplateAnchor');
+        traceLog("NativeScriptRenderer.createTemplateAnchor");
         return this.viewUtil.createTemplateAnchor(parentElement);
     }
 
     public createElement(parentElement: NgView, name: string): NgView {
-        traceLog('NativeScriptRenderer.createElement: ' + name + ' parent: ' + parentElement + ', ' + (parentElement ? parentElement.nodeName : 'null'));
+        traceLog("NativeScriptRenderer.createElement: " + name + " parent: " +
+            parentElement + ", " + (parentElement ? parentElement.nodeName : "null"));
         return this.viewUtil.createView(name, parentElement, (view) => {
             // Set an attribute to the view to scope component-specific css.
             // The property name is pre-generated by Angular.
@@ -225,12 +225,12 @@ export class NativeScriptRenderer extends Renderer {
     }
 
     public createText(_parentElement: NgView, _value: string): NgView {
-        traceLog('NativeScriptRenderer.createText');
+        traceLog("NativeScriptRenderer.createText");
         return this.viewUtil.createText();
     }
 
     public listen(renderElement: NgView, eventName: string, callback: Function): Function {
-        traceLog('NativeScriptRenderer.listen: ' + eventName);
+        traceLog("NativeScriptRenderer.listen: " + eventName);
         // Explicitly wrap in zone
         let zonedCallback = (...args) => {
             this.zone.run(() => {
@@ -247,11 +247,19 @@ export class NativeScriptRenderer extends Renderer {
     }
 
     public listenGlobal(_target: string, _eventName: string, _callback: Function): Function {
-        throw new Error('NativeScriptRenderer.listenGlobal() - Not implemented.');
+        throw new Error("NativeScriptRenderer.listenGlobal() - Not implemented.");
     }
 
-    public animate(element: any, startingStyles: AnimationStyles, keyframes: AnimationKeyframe[], duration: number, delay: number, easing: string): AnimationPlayer {
-        let player = this.animationDriver.animate(element, startingStyles, keyframes, duration, delay, easing);
+    public animate(
+        element: any,
+        startingStyles: AnimationStyles,
+        keyframes: AnimationKeyframe[],
+        duration: number,
+        delay: number,
+        easing: string
+    ): AnimationPlayer {
+        let player = this.animationDriver.animate(
+            element, startingStyles, keyframes, duration, delay, easing);
         return player;
     }
 }
diff --git a/nativescript-angular/resource-loader.ts b/nativescript-angular/resource-loader.ts
index 61a642e95..73b517245 100644
--- a/nativescript-angular/resource-loader.ts
+++ b/nativescript-angular/resource-loader.ts
@@ -3,9 +3,9 @@ import {ResourceLoader} from "@angular/compiler";
 
 export class FileSystemResourceLoader extends ResourceLoader {
     resolve(url: string, baseUrl: string): string {
-        //Angular assembles absolute URL's and prefixes them with //
+        // Angular assembles absolute URL's and prefixes them with //
         if (url.indexOf("/") !== 0) {
-            //Resolve relative URL's based on the app root.
+            // Resolve relative URL's based on the app root.
             return path.join(baseUrl, url);
         } else {
             return url;
diff --git a/nativescript-angular/router-url-tree.ts b/nativescript-angular/router-url-tree.ts
index d939ec336..b351991de 100644
--- a/nativescript-angular/router-url-tree.ts
+++ b/nativescript-angular/router-url-tree.ts
@@ -1,6 +1,7 @@
-//Copied unexported functions from @angular/router/src/url_tree
-import { UrlTree, UrlSegment, PRIMARY_OUTLET } from '@angular/router';
-//UrlSegmentGroup not exported, just use any.
+/* tslint:disable:forin */
+// Copied unexported functions from @angular/router/src/url_tree
+import { UrlTree, UrlSegment, PRIMARY_OUTLET } from "@angular/router";
+// UrlSegmentGroup not exported, just use any.
 type UrlSegmentGroup = any;
 
 export function containsTree(container: UrlTree, containee: UrlTree, exact: boolean): boolean {
@@ -12,11 +13,19 @@ export function containsTree(container: UrlTree, containee: UrlTree, exact: bool
 }
 
 function equalSegmentGroups(container: UrlSegmentGroup, containee: UrlSegmentGroup): boolean {
-  if (!equalPath(container.segments, containee.segments)) return false;
-  if (container.numberOfChildren !== containee.numberOfChildren) return false;
+  if (!equalPath(container.segments, containee.segments)) {
+      return false;
+  }
+  if (container.numberOfChildren !== containee.numberOfChildren) {
+      return false;
+  }
   for (let c in containee.children) {
-    if (!container.children[c]) return false;
-    if (!equalSegmentGroups(container.children[c], containee.children[c])) return false;
+    if (!container.children[c]) {
+        return false;
+    }
+    if (!equalSegmentGroups(container.children[c], containee.children[c])) {
+        return false;
+    }
   }
   return true;
 }
@@ -29,31 +38,49 @@ function containsSegmentGroupHelper(
     container: UrlSegmentGroup, containee: UrlSegmentGroup, containeePaths: UrlSegment[]): boolean {
   if (container.segments.length > containeePaths.length) {
     const current = container.segments.slice(0, containeePaths.length);
-    if (!equalPath(current, containeePaths)) return false;
-    if (containee.hasChildren()) return false;
+    if (!equalPath(current, containeePaths)) {
+        return false;
+    }
+    if (containee.hasChildren()) {
+        return false;
+    }
     return true;
 
   } else if (container.segments.length === containeePaths.length) {
-    if (!equalPath(container.segments, containeePaths)) return false;
+    if (!equalPath(container.segments, containeePaths)) {
+        return false;
+    }
     for (let c in containee.children) {
-      if (!container.children[c]) return false;
-      if (!containsSegmentGroup(container.children[c], containee.children[c])) return false;
+      if (!container.children[c]) {
+          return false;
+      }
+      if (!containsSegmentGroup(container.children[c], containee.children[c])) {
+          return false;
+      }
     }
     return true;
 
   } else {
     const current = containeePaths.slice(0, container.segments.length);
     const next = containeePaths.slice(container.segments.length);
-    if (!equalPath(container.segments, current)) return false;
-    if (!container.children[PRIMARY_OUTLET]) return false;
+    if (!equalPath(container.segments, current)) {
+        return false;
+    }
+    if (!container.children[PRIMARY_OUTLET]) {
+        return false;
+    }
     return containsSegmentGroupHelper(container.children[PRIMARY_OUTLET], containee, next);
   }
 }
 
 export function equalPath(a: UrlSegment[], b: UrlSegment[]): boolean {
-  if (a.length !== b.length) return false;
+  if (a.length !== b.length) {
+      return false;
+  }
   for (let i = 0; i < a.length; ++i) {
-    if (a[i].path !== b[i].path) return false;
+    if (a[i].path !== b[i].path) {
+        return false;
+    }
   }
   return true;
 }
diff --git a/nativescript-angular/router.ts b/nativescript-angular/router.ts
index 9d44bc613..2a8c10c47 100644
--- a/nativescript-angular/router.ts
+++ b/nativescript-angular/router.ts
@@ -1,15 +1,15 @@
 import { NgModule, ModuleWithProviders, NO_ERRORS_SCHEMA } from "@angular/core";
-import { RouterModule, Routes, ExtraOptions } from '@angular/router';
-import { LocationStrategy, PlatformLocation } from '@angular/common';
-import { NSRouterLink } from './router/ns-router-link';
-import { NSRouterLinkActive } from './router/ns-router-link-active';
-import { PageRouterOutlet } from './router/page-router-outlet';
-import { NSLocationStrategy } from './router/ns-location-strategy';
-import { NativescriptPlatformLocation } from './router/ns-platform-location';
-import { RouterExtensions } from './router/router-extensions';
+import { RouterModule, Routes, ExtraOptions } from "@angular/router";
+import { LocationStrategy, PlatformLocation } from "@angular/common";
+import { NSRouterLink } from "./router/ns-router-link";
+import { NSRouterLinkActive } from "./router/ns-router-link-active";
+import { PageRouterOutlet } from "./router/page-router-outlet";
+import { NSLocationStrategy } from "./router/ns-location-strategy";
+import { NativescriptPlatformLocation } from "./router/ns-platform-location";
+import { RouterExtensions } from "./router/router-extensions";
 export { routerTraceCategory } from "./trace";
-export { PageRoute } from './router/page-router-outlet';
-export { RouterExtensions } from './router/router-extensions';
+export { PageRoute } from "./router/page-router-outlet";
+export { RouterExtensions } from "./router/router-extensions";
 import { NativeScriptModule } from "./nativescript.module";
 
 @NgModule({
diff --git a/nativescript-angular/router/ns-location-strategy.ts b/nativescript-angular/router/ns-location-strategy.ts
index 160e1d4ef..995cf736e 100644
--- a/nativescript-angular/router/ns-location-strategy.ts
+++ b/nativescript-angular/router/ns-location-strategy.ts
@@ -1,5 +1,5 @@
-import { Injectable } from '@angular/core';
-import { LocationStrategy } from '@angular/common';
+import { Injectable } from "@angular/core";
+import { LocationStrategy } from "@angular/common";
 import { routerLog } from "../trace";
 import { Frame, NavigationTransition } from "ui/frame";
 import { isPresent } from "../lang-facade";
@@ -16,11 +16,11 @@ const defaultNavOptions: NavigationOptions = {
 };
 
 export interface LocationState {
-    state: any,
-    title: string,
-    url: string,
-    queryParams: string,
-    isPageNavigation: boolean
+    state: any;
+    title: string;
+    url: string;
+    queryParams: string;
+    isPageNavigation: boolean;
 }
 
 @Injectable()
@@ -49,7 +49,8 @@ export class NSLocationStrategy extends LocationStrategy {
     }
 
     pushState(state: any, title: string, url: string, queryParams: string): void {
-        routerLog(`NSLocationStrategy.pushState state: ${state}, title: ${title}, url: ${url}, queryParams: ${queryParams}`);
+        routerLog("NSLocationStrategy.pushState state: " +
+            `${state}, title: ${title}, url: ${url}, queryParams: ${queryParams}`);
         this.pushStateInternal(state, title, url, queryParams);
     }
 
@@ -66,15 +67,16 @@ export class NSLocationStrategy extends LocationStrategy {
 
     replaceState(state: any, title: string, url: string, queryParams: string): void {
         if (this.states.length > 0) {
-            routerLog(`NSLocationStrategy.replaceState changing exisitng state: ${state}, title: ${title}, url: ${url}, queryParams: ${queryParams}`);
+            routerLog("NSLocationStrategy.replaceState changing exisitng state: " +
+                `${state}, title: ${title}, url: ${url}, queryParams: ${queryParams}`);
             const topState = this.peekState();
             topState.state = state;
             topState.title = title;
             topState.url = url;
             topState.queryParams = queryParams;
-        }
-        else {
-            routerLog(`NSLocationStrategy.replaceState pushing new state: ${state}, title: ${title}, url: ${url}, queryParams: ${queryParams}`);
+        } else {
+            routerLog("NSLocationStrategy.replaceState pushing new state: " +
+                `${state}, title: ${title}, url: ${url}, queryParams: ${queryParams}`);
             this.pushStateInternal(state, title, url, queryParams);
         }
     }
@@ -101,11 +103,13 @@ export class NSLocationStrategy extends LocationStrategy {
             let state = this.peekState();
             if (state.isPageNavigation) {
                 // This was a page navigation - so navigate through frame.
-                routerLog("NSLocationStrategy.back() while not navigating back but top state is page - will call frame.goback()");
+                routerLog("NSLocationStrategy.back() while not navigating back but top" +
+                    " state is page - will call frame.goback()");
                 this.frame.goBack();
             } else {
                 // Nested navigation - just pop the state
-                routerLog("NSLocationStrategy.back() while not navigating back but top state is not page - just pop");
+                routerLog("NSLocationStrategy.back() while not navigating back but top" +
+                    " state is not page - just pop");
                 this.callPopState(this.states.pop(), true);
             }
         }
@@ -191,7 +195,8 @@ export class NSLocationStrategy extends LocationStrategy {
             animated: isPresent(options.animated) ? options.animated : true,
             transition: options.transition
         };
-        routerLog(`NSLocationStrategy._setNavigationOptions(${JSON.stringify(this._currentNavigationOptions)})`);
+        routerLog("NSLocationStrategy._setNavigationOptions(" +
+            `${JSON.stringify(this._currentNavigationOptions)})`);
     }
 
     public _getSatates(): Array<LocationState> {
diff --git a/nativescript-angular/router/ns-platform-location.ts b/nativescript-angular/router/ns-platform-location.ts
index 297396988..f4cc9513b 100644
--- a/nativescript-angular/router/ns-platform-location.ts
+++ b/nativescript-angular/router/ns-platform-location.ts
@@ -1,6 +1,6 @@
-import {NSLocationStrategy} from './ns-location-strategy';
-import {PlatformLocation, LocationChangeListener} from '@angular/common';
-import {Injectable} from '@angular/core';
+import {NSLocationStrategy} from "./ns-location-strategy";
+import {PlatformLocation, LocationChangeListener} from "@angular/common";
+import {Injectable} from "@angular/core";
 import {routerLog} from "../trace";
 
 
@@ -33,7 +33,7 @@ export class NativescriptPlatformLocation extends PlatformLocation {
         return this.locationStartegy.path();
     }
     set pathname(_newPath: string) {
-        throw new Error("NativescriptPlatformLocation set pathname - not implemented")
+        throw new Error("NativescriptPlatformLocation set pathname - not implemented");
     }
 
     pushState(state: any, title: string, url: string): void {
diff --git a/nativescript-angular/router/ns-router-link-active.ts b/nativescript-angular/router/ns-router-link-active.ts
index 926b129e4..8d434805b 100644
--- a/nativescript-angular/router/ns-router-link-active.ts
+++ b/nativescript-angular/router/ns-router-link-active.ts
@@ -1,14 +1,18 @@
-import {AfterContentInit, ContentChildren, Directive, ElementRef, Input, OnChanges, OnDestroy, QueryList, Renderer} from '@angular/core';
-import {Subscription} from 'rxjs/Subscription';
+import {
+    AfterContentInit, ContentChildren, Directive,
+    ElementRef, Input, OnChanges, OnDestroy,
+    QueryList, Renderer
+} from "@angular/core";
+import {Subscription} from "rxjs/Subscription";
 
-import {NavigationEnd, Router, UrlTree} from '@angular/router';
+import {NavigationEnd, Router, UrlTree} from "@angular/router";
 import {containsTree} from "../router-url-tree";
 
-import {NSRouterLink} from './ns-router-link';
+import {NSRouterLink} from "./ns-router-link";
 
 
 /**
- * The NSRouterLinkActive directive lets you add a CSS class to an element when the link's route
+ * The NSRouterLinkActive directive lets you add a CSS class to an element when the link"s route
  * becomes active.
  *
  * Consider the following example:
@@ -17,22 +21,22 @@ import {NSRouterLink} from './ns-router-link';
  * <a [nsRouterLink]="/user/bob" [nsRouterLinkActive]="active-link">Bob</a>
  * ```
  *
- * When the url is either '/user' or '/user/bob', the active-link class will
+ * When the url is either "/user" or "/user/bob", the active-link class will
  * be added to the component. If the url changes, the class will be removed.
  *
  * You can set more than one class, as follows:
  *
  * ```
  * <a [nsRouterLink]="/user/bob" [nsRouterLinkActive]="class1 class2">Bob</a>
- * <a [nsRouterLink]="/user/bob" [nsRouterLinkActive]="['class1', 'class2']">Bob</a>
+ * <a [nsRouterLink]="/user/bob" [nsRouterLinkActive]="["class1", "class2"]">Bob</a>
  * ```
  *
- * You can configure NSRouterLinkActive by passing `exact: true`. This will add the classes
- * only when the url matches the link exactly.
+ * You can configure NSRouterLinkActive by passing `exact: true`. This will add the
+ * classes only when the url matches the link exactly.
  *
  * ```
- * <a [nsRouterLink]="/user/bob" [nsRouterLinkActive]="active-link" [nsRouterLinkActiveOptions]="{exact:
- * true}">Bob</a>
+ * <a [nsRouterLink]="/user/bob" [nsRouterLinkActive]="active-link"
+ * [nsRouterLinkActiveOptions]="{exact: true}">Bob</a>
  * ```
  *
  * Finally, you can apply the NSRouterLinkActive directive to an ancestor of a RouterLink.
@@ -44,12 +48,12 @@ import {NSRouterLink} from './ns-router-link';
  * </div>
  * ```
  *
- * This will set the active-link class on the div tag if the url is either '/user/jim' or
- * '/user/bob'.
+ * This will set the active-link class on the div tag if the url is either "/user/jim" or
+ * "/user/bob".
  *
  * @stable
  */
-@Directive({ selector: '[nsRouterLinkActive]' })
+@Directive({ selector: "[nsRouterLinkActive]" })
 export class NSRouterLinkActive implements OnChanges, OnDestroy, AfterContentInit {
     @ContentChildren(NSRouterLink) links: QueryList<NSRouterLink>;
 
@@ -76,7 +80,7 @@ export class NSRouterLinkActive implements OnChanges, OnDestroy, AfterContentIni
         if (Array.isArray(data)) {
             this.classes = <any>data;
         } else {
-            this.classes = data.split(' ');
+            this.classes = data.split(" ");
         }
     }
 
@@ -84,7 +88,9 @@ export class NSRouterLinkActive implements OnChanges, OnDestroy, AfterContentIni
     ngOnDestroy(): any { this.subscription.unsubscribe(); }
 
     private update(): void {
-        if (!this.links) return;
+        if (!this.links) {
+            return;
+        }
 
         const currentUrlTree = this.router.parseUrl(this.router.url);
         const isActiveLinks = this.reduceList(currentUrlTree, this.links);
@@ -95,8 +101,9 @@ export class NSRouterLinkActive implements OnChanges, OnDestroy, AfterContentIni
 
     private reduceList(currentUrlTree: UrlTree, q: QueryList<any>): boolean {
         return q.reduce(
-            (res: boolean, link: NSRouterLink) =>
-                res || containsTree(currentUrlTree, link.urlTree, this.nsRouterLinkActiveOptions.exact),
-            false);
+            (res: boolean, link: NSRouterLink) => {
+                return res || containsTree(currentUrlTree, link.urlTree,
+                    this.nsRouterLinkActiveOptions.exact);
+            }, false);
     }
 }
diff --git a/nativescript-angular/router/ns-router-link.ts b/nativescript-angular/router/ns-router-link.ts
index 161e71d18..f986d2ddd 100644
--- a/nativescript-angular/router/ns-router-link.ts
+++ b/nativescript-angular/router/ns-router-link.ts
@@ -1,6 +1,6 @@
-import {Directive, HostListener, Input, Optional, OnChanges} from '@angular/core';
+import {Directive, HostListener, Input, Optional, OnChanges} from "@angular/core";
 import {NavigationExtras} from "@angular/router";
-import {ActivatedRoute, Router, UrlTree} from '@angular/router';
+import {ActivatedRoute, Router, UrlTree} from "@angular/router";
 import {routerLog} from "../trace";
 import {PageRoute} from "./page-router-outlet";
 import {RouterExtensions} from "./router-extensions";
@@ -12,28 +12,27 @@ import {isString} from "utils/types";
  * The nsRouterLink directive lets you link to specific parts of your app.
  *
  * Consider the following route configuration:
-
  * ```
- * [{ path: '/user', component: UserCmp }]
+ * [{ path: "/user", component: UserCmp }]
  * ```
  *
  * When linking to this `User` route, you can write:
  *
  * ```
- * <a [nsRouterLink]="['/user']">link to user component</a>
+ * <a [nsRouterLink]="["/user"]">link to user component</a>
  * ```
  *
  * NSRouterLink expects the value to be an array of path segments, followed by the params
- * for that level of routing. For instance `['/team', {teamId: 1}, 'user', {userId: 2}]`
+ * for that level of routing. For instance `["/team", {teamId: 1}, "user", {userId: 2}]`
  * means that we want to generate a link to `/team;teamId=1/user;userId=2`.
  *
  * The first segment name can be prepended with `/`, `./`, or `../`.
  * If the segment begins with `/`, the router will look up the route from the root of the app.
- * If the segment begins with `./`, or doesn't begin with a slash, the router will
- * instead look in the current component's children for the route.
+ * If the segment begins with `./`, or doesn"t begin with a slash, the router will
+ * instead look in the current component"s children for the route.
  * And if the segment begins with `../`, the router will go up one level.
  */
-@Directive({ selector: '[nsRouterLink]' })
+@Directive({ selector: "[nsRouterLink]" })
 export class NSRouterLink implements OnChanges {
   private commands: any[] = [];
   @Input() target: string;
@@ -72,7 +71,9 @@ export class NSRouterLink implements OnChanges {
 
   @HostListener("tap")
   onTap() {
-    routerLog("nsRouterLink.tapped: " + this.commands + " usePageRoute: " + this.usePageRoute + " clearHistory: " + this.clearHistory + " transition: " + JSON.stringify(this.pageTransition));
+    routerLog("nsRouterLink.tapped: " + this.commands + " usePageRoute: " +
+        this.usePageRoute + " clearHistory: " + this.clearHistory + " transition: " +
+        JSON.stringify(this.pageTransition));
 
     const transition = this.getTransition();
 
diff --git a/nativescript-angular/router/page-router-outlet.ts b/nativescript-angular/router/page-router-outlet.ts
index bfbdeaf56..0cce290d5 100644
--- a/nativescript-angular/router/page-router-outlet.ts
+++ b/nativescript-angular/router/page-router-outlet.ts
@@ -2,9 +2,9 @@ import {
     Attribute, ComponentFactory, ComponentRef, Directive,
     ReflectiveInjector, ResolvedReflectiveProvider, ViewContainerRef,
     Inject, ComponentFactoryResolver, Injector
-} from '@angular/core';
+} from "@angular/core";
 import { isPresent } from "../lang-facade";
-import { RouterOutletMap, ActivatedRoute, PRIMARY_OUTLET } from '@angular/router';
+import { RouterOutletMap, ActivatedRoute, PRIMARY_OUTLET } from "@angular/router";
 import { NSLocationStrategy } from "./ns-location-strategy";
 import { DEVICE, PAGE_FACTORY, PageFactory } from "../platform-providers";
 import { Device } from "platform";
@@ -56,7 +56,7 @@ class RefCache {
     }
 }
 
-@Directive({ selector: 'page-router-outlet' })
+@Directive({ selector: "page-router-outlet" })
 export class PageRouterOutlet {
     private viewUtil: ViewUtil;
     private refCache: RefCache = new RefCache();
@@ -77,14 +77,14 @@ export class PageRouterOutlet {
 
     get component(): Object {
         if (!this.currentActivatedComp) {
-            throw new Error('Outlet is not activated');
+            throw new Error("Outlet is not activated");
         }
 
         return this.currentActivatedComp.instance;
     }
     get activatedRoute(): ActivatedRoute {
         if (!this.currentActivatedComp) {
-            throw new Error('Outlet is not activated');
+            throw new Error("Outlet is not activated");
         }
 
         return this.currentActivatedRoute;
@@ -93,7 +93,7 @@ export class PageRouterOutlet {
     constructor(
         parentOutletMap: RouterOutletMap,
         private containerRef: ViewContainerRef,
-        @Attribute('name') name: string,
+        @Attribute("name") name: string,
         private locationStrategy: NSLocationStrategy,
         private componentFactoryResolver: ComponentFactoryResolver,
         private resolver: ComponentFactoryResolver,
@@ -167,24 +167,32 @@ export class PageRouterOutlet {
         const factory = this.getComponentFactory(activatedRoute, loadedResolver);
 
         const pageRoute = new PageRoute(activatedRoute);
-        providers = [...providers, ...ReflectiveInjector.resolve([{ provide: PageRoute, useValue: pageRoute }])];
+        providers = [...providers, ...ReflectiveInjector.resolve(
+            [{ provide: PageRoute, useValue: pageRoute }])];
 
         if (this.isInitialPage) {
             log("PageRouterOutlet.activate() initial page - just load component");
             this.isInitialPage = false;
             const inj = ReflectiveInjector.fromResolvedProviders(providers, injector);
-            this.currentActivatedComp = this.containerRef.createComponent(factory, this.containerRef.length, inj, []);
+            this.currentActivatedComp = this.containerRef.createComponent(
+                factory, this.containerRef.length, inj, []);
             this.refCache.push(this.currentActivatedComp, pageRoute, outletMap, null);
 
         } else {
-            log("PageRouterOutlet.activate() forward navigation - create detached loader in the loader container");
+            log("PageRouterOutlet.activate() forward navigation - " +
+                "create detached loader in the loader container");
 
-            const page = this.pageFactory({ isNavigation: true, componentType: factory.componentType });
+            const page = this.pageFactory({
+                isNavigation: true,
+                componentType: factory.componentType
+            });
             const pageResolvedProvider = ReflectiveInjector.resolve([
                 { provide: Page, useValue: page }
             ]);
-            const childInjector = ReflectiveInjector.fromResolvedProviders([...providers, ...pageResolvedProvider], injector);
-            const loaderRef = this.containerRef.createComponent(this.detachedLoaderFactory, this.containerRef.length, childInjector, []);
+            const childInjector = ReflectiveInjector.fromResolvedProviders(
+                [...providers, ...pageResolvedProvider], injector);
+            const loaderRef = this.containerRef.createComponent(
+                this.detachedLoaderFactory, this.containerRef.length, childInjector, []);
 
             this.currentActivatedComp = loaderRef.instance.loadWithFactory(factory);
             this.loadComponentInPage(page, this.currentActivatedComp);
@@ -204,25 +212,24 @@ export class PageRouterOutlet {
 
         this.outletMap = cacheItem.outletMap;
 
-        // HACK: Fill the outlet map provided by the router, with the outlets that we have cached.
-        // This is needed because the component is taken form the cache and not created - so it will not register
-        // its child router-outlets to the newly created outlet map.
+        // HACK: Fill the outlet map provided by the router, with the outlets that we have
+        // cached. This is needed because the component is taken from the cache and not
+        // created - so it will not register its child router-outlets to the newly created
+        // outlet map.
         (<any>Object).assign(outletMap, cacheItem.outletMap);
 
         this.currentActivatedComp = cacheItem.componentRef;
     }
 
     private loadComponentInPage(page: Page, componentRef: ComponentRef<any>): void {
-        //Component loaded. Find its root native view.
+        // Component loaded. Find its root native view.
         const componentView = componentRef.location.nativeElement;
-        //Remove it from original native parent.
+        // Remove it from original native parent.
         this.viewUtil.removeChild(componentView.parent, componentView);
-        //Add it to the new page
+        // Add it to the new page
         page.content = componentView;
 
-        page.on('navigatedFrom', (<any>global).Zone.current.wrap((args: NavigatedData) => {
-            // console.log("page.navigatedFrom: " + page + " args.isBackNavigation:" + args.isBackNavigation);
-
+        page.on("navigatedFrom", (<any>global).Zone.current.wrap((args: NavigatedData) => {
             if (args.isBackNavigation) {
                 this.locationStrategy._beginBackPageNavigation();
                 this.locationStrategy.back();
@@ -244,7 +251,10 @@ export class PageRouterOutlet {
     }
 
     // NOTE: Using private APIs - potential break point!
-    private getComponentFactory(activatedRoute: any, loadedResolver: ComponentFactoryResolver): ComponentFactory<any> {
+    private getComponentFactory(
+        activatedRoute: any,
+        loadedResolver: ComponentFactoryResolver
+    ): ComponentFactory<any> {
         const snapshot = activatedRoute._futureSnapshot;
         const component = <any>snapshot._routeConfig.component;
         let factory: ComponentFactory<any>;
diff --git a/nativescript-angular/router/router-extensions.ts b/nativescript-angular/router/router-extensions.ts
index 6e7182bfe..6719571f1 100644
--- a/nativescript-angular/router/router-extensions.ts
+++ b/nativescript-angular/router/router-extensions.ts
@@ -8,7 +8,11 @@ export type ExtendedNavigationExtras = NavigationExtras & NavigationOptions;
 @Injectable()
 export class RouterExtensions {
 
-    constructor(public router: Router, public locationStrategy: NSLocationStrategy, public frame: Frame) { }
+    constructor(
+        public router: Router,
+        public locationStrategy: NSLocationStrategy,
+        public frame: Frame
+    ) { }
 
     public navigate(commands: any[], extras?: ExtendedNavigationExtras): Promise<boolean> {
         if (extras) {
diff --git a/nativescript-angular/tslint.json b/nativescript-angular/tslint.json
new file mode 100644
index 000000000..e2b7eca87
--- /dev/null
+++ b/nativescript-angular/tslint.json
@@ -0,0 +1,118 @@
+{
+  "rules": {
+    "member-access": false,
+    "no-any": false,
+    "no-inferrable-types": false,
+    "no-internal-module": true,
+    "no-var-requires": false,
+    "typedef": false,
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      },
+      {
+        "call-signature": "space",
+        "index-signature": "space",
+        "parameter": "space",
+        "property-declaration": "space",
+        "variable-declaration": "space"
+      }
+    ],
+
+    "ban": false,
+    "curly": true,
+    "no-arg": true,
+    "no-bitwise": true,
+    "no-conditional-assignment": true,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-debugger": true,
+    "no-duplicate-variable": true,
+    "no-empty": false,
+    "no-eval": true,
+    "no-null-keyword": false,
+    "no-shadowed-variable": true,
+    "no-string-literal": false,
+    "no-switch-case-fall-through": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": true,
+    "no-var-keyword": true,
+    "radix": false,
+    "switch-default": true,
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "eofline": true,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "max-line-length": [
+      true,
+      120
+    ],
+    "no-require-imports": false,
+    "no-trailing-whitespace": true,
+    "object-literal-sort-keys": false,
+    "trailing-comma": [
+      true,
+      {
+        "multiline": false,
+        "singleline": "never"
+      }
+    ],
+
+    "align": false,
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space"
+    ],
+    "interface-name": false,
+    "jsdoc-format": true,
+    "no-consecutive-blank-lines": [
+        true, 2
+    ],
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-finally",
+      "check-whitespace"
+    ],
+    "quotemark": [
+      true,
+      "double",
+      "avoid-escape"
+    ],
+    "semicolon": [true, "always"],
+    "variable-name": [
+      true,
+      "check-format",
+      "allow-leading-underscore",
+      "ban-keywords"
+    ],
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ]
+  }
+}
diff --git a/nativescript-angular/value-accessors/base-value-accessor.ts b/nativescript-angular/value-accessors/base-value-accessor.ts
index 6e5b63e78..844415b81 100644
--- a/nativescript-angular/value-accessors/base-value-accessor.ts
+++ b/nativescript-angular/value-accessors/base-value-accessor.ts
@@ -5,7 +5,7 @@ export class BaseValueAccessor<TView> implements ControlValueAccessor {
 
     onChange = (_) => { };
     private pendingChangeNotification: number = 0;
-    
+
     registerOnChange(fn: (_: any) => void): void {
         this.onChange = (arg) => {
             if (this.pendingChangeNotification) {
@@ -15,13 +15,13 @@ export class BaseValueAccessor<TView> implements ControlValueAccessor {
                 this.pendingChangeNotification = 0;
                 fn(arg);
             }, 20);
-        }
+        };
     }
-    
+
     writeValue(_: any) {
         //
     }
-    
+
     registerOnTouched(_: () => void): void {
         // 
     }
diff --git a/nativescript-angular/value-accessors/checked-value-accessor.ts b/nativescript-angular/value-accessors/checked-value-accessor.ts
index 3b434d7f8..8d7ac1b01 100644
--- a/nativescript-angular/value-accessors/checked-value-accessor.ts
+++ b/nativescript-angular/value-accessors/checked-value-accessor.ts
@@ -1,10 +1,11 @@
-import {Directive, ElementRef, forwardRef } from '@angular/core';
+import {Directive, ElementRef, forwardRef } from "@angular/core";
 import {NG_VALUE_ACCESSOR} from "@angular/forms";
 import {isBlank} from "../lang-facade";
-import {BaseValueAccessor} from './base-value-accessor';
+import {BaseValueAccessor} from "./base-value-accessor";
 import {Switch} from "ui/switch";
 
-const CHECKED_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => CheckedValueAccessor), multi: true};
+const CHECKED_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => CheckedValueAccessor), multi: true};
 
 /**
  * The accessor for setting a checked property and listening to changes that is used by the
@@ -12,12 +13,12 @@ const CHECKED_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR, useExisting: forward
  *
  *  ### Example
  *  ```
- *  <Switch [(ngModel)]='model.test'>
+ *  <Switch [(ngModel)]="model.test">
  *  ```
  */
 @Directive({
-    selector: 'Switch[ngModel], switch[ngModel]',
-    host: { '(checkedChange)': 'onChange($event.value)' },
+    selector: "Switch[ngModel], switch[ngModel]",
+    host: { "(checkedChange)": "onChange($event.value)" },
     providers: [CHECKED_VALUE_ACCESSOR]
 })
 export class CheckedValueAccessor extends BaseValueAccessor<Switch> {
@@ -30,8 +31,8 @@ export class CheckedValueAccessor extends BaseValueAccessor<Switch> {
     writeValue(value: any): void {
         let normalizedValue = false;
         if (!isBlank(value)) {
-            if (typeof value === 'string') {
-                normalizedValue = value.toLowerCase() === 'true' ? true : false;
+            if (typeof value === "string") {
+                normalizedValue = value.toLowerCase() === "true" ? true : false;
             } else {
                 normalizedValue = !!value;
             }
diff --git a/nativescript-angular/value-accessors/date-value-accessor.ts b/nativescript-angular/value-accessors/date-value-accessor.ts
index c94094dc7..b37ac3481 100644
--- a/nativescript-angular/value-accessors/date-value-accessor.ts
+++ b/nativescript-angular/value-accessors/date-value-accessor.ts
@@ -1,10 +1,11 @@
-import {Directive, ElementRef, forwardRef } from '@angular/core';
-import {NG_VALUE_ACCESSOR} from '@angular/forms';
+import {Directive, ElementRef, forwardRef } from "@angular/core";
+import {NG_VALUE_ACCESSOR} from "@angular/forms";
 import {isBlank, isDate} from "../lang-facade";
-import {BaseValueAccessor} from './base-value-accessor';
+import {BaseValueAccessor} from "./base-value-accessor";
 import {DatePicker} from "ui/date-picker";
 
-const DATE_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => DateValueAccessor), multi: true};
+const DATE_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => DateValueAccessor), multi: true};
 
 /**
  * The accessor for setting a date and listening to changes that is used by the
@@ -12,12 +13,12 @@ const DATE_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR, useExisting: forwardRef
  *
  *  ### Example
  *  ```
- *  <DatePicker [(ngModel)]='model.test'>
+ *  <DatePicker [(ngModel)]="model.test">
  *  ```
  */
 @Directive({
-    selector: 'DatePicker[ngModel], datePicker[ngModel], date-picker[ngModel]',
-    host: { '(dateChange)': 'onChange($event.value)' },
+    selector: "DatePicker[ngModel], datePicker[ngModel], date-picker[ngModel]",
+    host: { "(dateChange)": "onChange($event.value)" },
     providers: [DATE_VALUE_ACCESSOR]
 })
 export class DateValueAccessor extends BaseValueAccessor<DatePicker> {
@@ -28,11 +29,11 @@ export class DateValueAccessor extends BaseValueAccessor<DatePicker> {
     }
 
     writeValue(value: any): void {
-        var normalizedValue = isBlank(value) ? new Date() : value;
+        let normalizedValue = isBlank(value) ? new Date() : value;
         if (!isDate(normalizedValue)) {
-            if (typeof normalizedValue === 'string') {
+            if (typeof normalizedValue === "string") {
                 normalizedValue = new Date(normalizedValue);
-            } else if (typeof normalizedValue === 'number') {
+            } else if (typeof normalizedValue === "number") {
                 normalizedValue = new Date(normalizedValue);
             }
 
diff --git a/nativescript-angular/value-accessors/number-value-accessor.ts b/nativescript-angular/value-accessors/number-value-accessor.ts
index 76e59fbbb..10d29e720 100644
--- a/nativescript-angular/value-accessors/number-value-accessor.ts
+++ b/nativescript-angular/value-accessors/number-value-accessor.ts
@@ -1,10 +1,11 @@
-import {Directive, ElementRef, forwardRef } from '@angular/core';
+import {Directive, ElementRef, forwardRef } from "@angular/core";
 import {NG_VALUE_ACCESSOR} from "@angular/forms";
 import {isBlank, isNumber} from "../lang-facade";
-import {BaseValueAccessor} from './base-value-accessor';
+import {BaseValueAccessor} from "./base-value-accessor";
 import {Slider} from "ui/slider";
 
-const NUMBER_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => NumberValueAccessor), multi: true};
+const NUMBER_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => NumberValueAccessor), multi: true};
 
 /**
  * The accessor for setting a value and listening to changes that is used by the
@@ -12,12 +13,12 @@ const NUMBER_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR, useExisting: forwardR
  *
  *  ### Example
  *  ```
- *  <Slider [(ngModel)]='model.test'>
+ *  <Slider [(ngModel)]="model.test">
  *  ```
  */
 @Directive({
-    selector: 'Slider[ngModel], slider[ngModel]',
-    host: { '(valueChange)': 'onChange($event.value)' },
+    selector: "Slider[ngModel], slider[ngModel]",
+    host: { "(valueChange)": "onChange($event.value)" },
     providers: [NUMBER_VALUE_ACCESSOR]
 })
 export class NumberValueAccessor extends BaseValueAccessor<Slider> {
diff --git a/nativescript-angular/value-accessors/selectedIndex-value-accessor.ts b/nativescript-angular/value-accessors/selectedIndex-value-accessor.ts
index 40d99445b..dda51016c 100644
--- a/nativescript-angular/value-accessors/selectedIndex-value-accessor.ts
+++ b/nativescript-angular/value-accessors/selectedIndex-value-accessor.ts
@@ -1,10 +1,11 @@
-import {Directive, ElementRef, forwardRef } from '@angular/core';
+import {Directive, ElementRef, forwardRef } from "@angular/core";
 import {NG_VALUE_ACCESSOR} from "@angular/forms";
-import {BaseValueAccessor} from './base-value-accessor';
+import {BaseValueAccessor} from "./base-value-accessor";
 import {View} from "ui/core/view";
-import * as utils from '../common/utils';
+import * as utils from "../common/utils";
 
-const SELECTED_INDEX_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => SelectedIndexValueAccessor), multi: true};
+const SELECTED_INDEX_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => SelectedIndexValueAccessor), multi: true};
 
 export type SelectableView = {selectedIndex: number} & View;
 
@@ -14,12 +15,13 @@ export type SelectableView = {selectedIndex: number} & View;
  *
  *  ### Example
  *  ```
- *  <SegmentedBar [(ngModel)]='model.test'>
+ *  <SegmentedBar [(ngModel)]="model.test">
  *  ```
  */
 @Directive({
-    selector: 'SegmentedBar[ngModel], segmentedBar[ngModel], segmented-bar[ngModel], ListPicker[ngModel], listPicker[ngModel], list-picker[ngModel], TabView[ngModel] tabView[ngModel], tab-view[ngModel]',
-    host: { '(selectedIndexChange)': 'onChange($event.value)' },
+    // tslint:disable:max-line-length
+    selector: "SegmentedBar[ngModel], segmentedBar[ngModel], segmented-bar[ngModel], ListPicker[ngModel], listPicker[ngModel], list-picker[ngModel], TabView[ngModel] tabView[ngModel], tab-view[ngModel]",
+    host: { "(selectedIndexChange)": "onChange($event.value)" },
     providers: [SELECTED_INDEX_VALUE_ACCESSOR]
 })
 export class SelectedIndexValueAccessor extends BaseValueAccessor<SelectableView> {
@@ -28,7 +30,7 @@ export class SelectedIndexValueAccessor extends BaseValueAccessor<SelectableView
     constructor(elementRef: ElementRef) {
         super(elementRef.nativeElement);
     }
-    
+
     private _normalizedValue: number;
     private viewInitialized: boolean;
 
@@ -38,7 +40,7 @@ export class SelectedIndexValueAccessor extends BaseValueAccessor<SelectableView
             this.view.selectedIndex = this._normalizedValue;
         }
     }
-    
+
     ngAfterViewInit() {
         this.viewInitialized = true;
         this.view.selectedIndex = this._normalizedValue;
diff --git a/nativescript-angular/value-accessors/text-value-accessor.ts b/nativescript-angular/value-accessors/text-value-accessor.ts
index dc99a9cde..e1c5bdfc7 100644
--- a/nativescript-angular/value-accessors/text-value-accessor.ts
+++ b/nativescript-angular/value-accessors/text-value-accessor.ts
@@ -1,10 +1,11 @@
-import {Directive, ElementRef, forwardRef } from '@angular/core';
+import {Directive, ElementRef, forwardRef } from "@angular/core";
 import {NG_VALUE_ACCESSOR} from "@angular/forms";
 import {isBlank} from "../lang-facade";
-import {BaseValueAccessor} from './base-value-accessor'
+import {BaseValueAccessor} from "./base-value-accessor";
 import {View} from "ui/core/view";
 
-const TEXT_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => TextValueAccessor), multi: true};
+const TEXT_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => TextValueAccessor), multi: true};
 
 export type TextView = {text: string} & View;
 
@@ -14,12 +15,13 @@ export type TextView = {text: string} & View;
  *
  *  ### Example
  *  ```
- *  <TextField [(ngModel)]='model.test'>
+ *  <TextField [(ngModel)]="model.test">
  *  ```
  */
 @Directive({
-    selector: 'TextField[ngModel], textField[ngModel], text-field[ngModel], TextView[ngModel], textView[ngModel], text-view[ngModel], SearchBar[ngModel], search-bar[ngModel], searchBar[ngModel]',
-    host: { '(textChange)': 'onChange($event.value)' },
+    // tslint:disable:max-line-length
+    selector: "TextField[ngModel], textField[ngModel], text-field[ngModel], TextView[ngModel], textView[ngModel], text-view[ngModel], SearchBar[ngModel], search-bar[ngModel], searchBar[ngModel]",
+    host: { "(textChange)": "onChange($event.value)" },
     providers: [TEXT_VALUE_ACCESSOR]
 })
 export class TextValueAccessor extends BaseValueAccessor<TextView> {
@@ -30,7 +32,7 @@ export class TextValueAccessor extends BaseValueAccessor<TextView> {
     }
 
     writeValue(value: any): void {
-        var normalizedValue = isBlank(value) ? '' : value.toString();
+        let normalizedValue = isBlank(value) ? "" : value.toString();
         this.view.text = normalizedValue;
     }
 
diff --git a/nativescript-angular/value-accessors/time-value-accessor.ts b/nativescript-angular/value-accessors/time-value-accessor.ts
index d1242a690..c66f46a9d 100644
--- a/nativescript-angular/value-accessors/time-value-accessor.ts
+++ b/nativescript-angular/value-accessors/time-value-accessor.ts
@@ -1,10 +1,11 @@
-import {Directive, ElementRef, forwardRef } from '@angular/core';
-import {NG_VALUE_ACCESSOR} from '@angular/forms';
+import {Directive, ElementRef, forwardRef } from "@angular/core";
+import {NG_VALUE_ACCESSOR} from "@angular/forms";
 import {isBlank, isDate} from "../lang-facade";
-import {BaseValueAccessor} from './base-value-accessor';
+import {BaseValueAccessor} from "./base-value-accessor";
 import {TimePicker} from "ui/time-picker";
 
-const TIME_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => TimeValueAccessor), multi: true};
+const TIME_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => TimeValueAccessor), multi: true};
 
 /**
  * The accessor for setting a time and listening to changes that is used by the
@@ -12,12 +13,12 @@ const TIME_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR, useExisting: forwardRef
  *
  *  ### Example
  *  ```
- *  <TimePicker [(ngModel)]='model.test'>
+ *  <TimePicker [(ngModel)]="model.test">
  *  ```
  */
 @Directive({
-    selector: 'TimePicker[ngModel], timePicker[ngModel], time-picker[ngModel]',
-    host: { '(timeChange)': 'onChange($event.value)' },
+    selector: "TimePicker[ngModel], timePicker[ngModel], time-picker[ngModel]",
+    host: { "(timeChange)": "onChange($event.value)" },
     providers: [TIME_VALUE_ACCESSOR]
 })
 export class TimeValueAccessor extends BaseValueAccessor<TimePicker> {
@@ -28,11 +29,11 @@ export class TimeValueAccessor extends BaseValueAccessor<TimePicker> {
     }
 
     writeValue(value: any): void {
-        var normalizedValue = isBlank(value) ? new Date() : value;
+        let normalizedValue = isBlank(value) ? new Date() : value;
         if (!isDate(normalizedValue)) {
-            if (typeof normalizedValue === 'string') {
+            if (typeof normalizedValue === "string") {
                 normalizedValue = new Date(normalizedValue);
-            } else if (typeof normalizedValue === 'number') {
+            } else if (typeof normalizedValue === "number") {
                 normalizedValue = new Date(normalizedValue);
             }
             if (!isDate(normalizedValue)) {
diff --git a/nativescript-angular/view-util.ts b/nativescript-angular/view-util.ts
index 45b0cda85..978449f2b 100644
--- a/nativescript-angular/view-util.ts
+++ b/nativescript-angular/view-util.ts
@@ -1,9 +1,16 @@
 import {isString, isDefined} from "utils/types";
 import {View} from "ui/core/view";
 import {Placeholder} from "ui/placeholder";
-import {ContentView} from 'ui/content-view';
-import {LayoutBase} from 'ui/layouts/layout-base';
-import {ViewClass, getViewClass, getViewMeta, isKnownView, ViewExtensions, NgView} from './element-registry';
+import {ContentView} from "ui/content-view";
+import {LayoutBase} from "ui/layouts/layout-base";
+import {
+    ViewClass,
+    getViewClass,
+    getViewMeta,
+    isKnownView,
+    ViewExtensions,
+    NgView
+} from "./element-registry";
 import {getSpecialPropertySetter} from "ui/builder/special-properties";
 import {StyleProperty, getPropertyByName, withStyleProperty} from "ui/styling/style-property";
 import {ValueSource} from "ui/core/dependency-observable";
@@ -67,7 +74,7 @@ export class ViewUtil {
         } else if (parent && parent._addChildFromBuilder) {
             parent._addChildFromBuilder(child.nodeName, child);
         } else {
-            //throw new Error("Parent can't contain children: " + parent.nodeName + ', ' + parent);
+            // throw new Error("Parent can"t contain children: " + parent.nodeName + ", " + parent);
         }
     }
 
@@ -87,7 +94,7 @@ export class ViewUtil {
         } else if (isView(parent)) {
             parent._removeView(child);
         } else {
-            //throw new Error('Unknown parent type: ' + parent);
+            // throw new Error("Unknown parent type: " + parent);
         }
     }
 
@@ -97,11 +104,16 @@ export class ViewUtil {
         } else if (isContentView(parent)) {
             return child === parent.content ? 0 : -1;
         } else {
-            //throw new Error("Parent can't contain children: " + parent);
+            // throw new Error("Parent can"t contain children: " + parent);
         }
     }
 
-    private createAndAttach(name: string, viewClass: ViewClass, parent: NgView, beforeAttach?: BeforeAttachAction): NgView {
+    private createAndAttach(
+        name: string,
+        viewClass: ViewClass,
+        parent: NgView,
+        beforeAttach?: BeforeAttachAction
+    ): NgView {
         const view = <NgView>new viewClass();
         view.nodeName = name;
         view.meta = getViewMeta(name);
@@ -132,16 +144,16 @@ export class ViewUtil {
     }
 
     public createViewContainer(parentElement: NgView, beforeAttach: BeforeAttachAction) {
-        traceLog('Creating view container in:' + parentElement);
+        traceLog("Creating view container in:" + parentElement);
 
-        const layout = this.createView('ProxyViewContainer', parentElement, beforeAttach);
-        layout.nodeName = 'ProxyViewContainer';
+        const layout = this.createView("ProxyViewContainer", parentElement, beforeAttach);
+        layout.nodeName = "ProxyViewContainer";
         return layout;
     }
 
     public createTemplateAnchor(parentElement: NgView) {
-        //HACK: Using a ContentView here, so that it creates a native View object
-        const anchor = this.createAndAttach('template', ContentView, parentElement);
+        // HACK: Using a ContentView here, so that it creates a native View object
+        const anchor = this.createAndAttach("template", ContentView, parentElement);
         anchor.visibility = "collapse";
         anchor.templateParent = parentElement;
         return anchor;
@@ -209,7 +221,7 @@ export class ViewUtil {
     }
 
     private setPropertyInternal(view: NgView, attributeName: string, value: any): void {
-        traceLog('Setting attribute: ' + attributeName);
+        traceLog("Setting attribute: " + attributeName);
 
         let specialSetter = getSpecialPropertySetter(attributeName);
         let propMap = this.getProperties(view);
@@ -253,7 +265,7 @@ export class ViewUtil {
 
         if (!propertyMaps.has(type)) {
             let propMap = new Map<string, string>();
-            for (let propName in instance) {
+            for (let propName in instance) { // tslint:disable:forin
                 propMap.set(propName.toLowerCase(), propName);
             }
             propertyMaps.set(type, propMap);
@@ -286,7 +298,7 @@ export class ViewUtil {
     }
 
     private syncClasses(view: NgView): void {
-        let classValue = (<any>Array).from(this.cssClasses(view).keys()).join(' ');
+        let classValue = (<any>Array).from(this.cssClasses(view).keys()).join(" ");
         view.cssClass = classValue;
     }
 
@@ -298,12 +310,12 @@ export class ViewUtil {
         try {
             if (value === null) {
                 view.style._resetValue(property, ValueSource.Local);
-            }
-            else {
+            } else {
                 view.style._setValue(property, value, ValueSource.Local);
             }
         } catch (ex) {
-            styleError("Error setting property: " + property.name + " view: " + view + " value: " + value + " " + ex);
+            styleError("Error setting property: " + property.name + " view: " + view +
+                " value: " + value + " " + ex);
         }
     }
 
@@ -314,7 +326,7 @@ export class ViewUtil {
         let resolvedValue = this.resolveCssValue(styleValue);
         withStyleProperty(name, resolvedValue, (property, value) => {
             if (isString(property)) {
-                //Fall back to resolving property by name.
+                // Fall back to resolving property by name.
                 const resolvedProperty = getPropertyByName(name);
                 if (resolvedProperty) {
                     this.setStyleValue(view, resolvedProperty, resolvedValue);