@angular/router 2.0.0-rc.1 → 2.0.0-rc.2

package/{router.umd.js → bundles/router.umd.js}

@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v2.0.0-rc.1
+ * @license AngularJS v0.0.0-PLACEHOLDER
  * (c) 2010-2016 Google, Inc. https://angular.io/
  * License: MIT
  */
@@ -9,10 +9,10 @@ var __extends = (this && this.__extends) || function (d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('rxjs/Subject'), require('rxjs/observable/PromiseObservable'), require('rxjs/operator/toPromise'), require('rxjs/Observable'), require('@angular/common'), require('@angular/platform-browser')) :
-        typeof define === 'function' && define.amd ? define(['exports', '@angular/core', 'rxjs/Subject', 'rxjs/observable/PromiseObservable', 'rxjs/operator/toPromise', 'rxjs/Observable', '@angular/common', '@angular/platform-browser'], factory) :
-            (factory((global.ng = global.ng || {}, global.ng.router = global.ng.router || {}), global.ng.core, global.Rx, global.Rx, global.Rx.Observable.prototype, global.Rx, global.ng.common, global.ng.platformBrowser));
-}(this, function (exports, _angular_core, rxjs_Subject, rxjs_observable_PromiseObservable, rxjs_operator_toPromise, rxjs_Observable, _angular_common, _angular_platformBrowser) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/common'), require('@angular/core'), require('rxjs/Subject'), require('rxjs/observable/PromiseObservable'), require('rxjs/operator/toPromise'), require('rxjs/Observable')) :
+        typeof define === 'function' && define.amd ? define(['exports', '@angular/common', '@angular/core', 'rxjs/Subject', 'rxjs/observable/PromiseObservable', 'rxjs/operator/toPromise', 'rxjs/Observable'], factory) :
+            (factory((global.ng = global.ng || {}, global.ng.router = global.ng.router || {}), global.ng.common, global.ng.core, global.Rx, global.Rx, global.Rx.Observable.prototype, global.Rx));
+}(this, function (exports, _angular_common, _angular_core, rxjs_Subject, rxjs_observable_PromiseObservable, rxjs_operator_toPromise, rxjs_Observable) {
     'use strict';
     var globalScope;
     if (typeof window === 'undefined') {
@@ -44,7 +44,7 @@ var __extends = (this && this.__extends) || function (d, b) {
         return obj === undefined || obj === null;
     }
     function isString(obj) {
-        return typeof obj === "string";
+        return typeof obj === 'string';
     }
     function isStringMap(obj) {
         return typeof obj === 'object' && obj !== null;
@@ -67,9 +67,60 @@ var __extends = (this && this.__extends) || function (d, b) {
             return token.overriddenName;
         }
         var res = token.toString();
-        var newLineIndex = res.indexOf("\n");
+        var newLineIndex = res.indexOf('\n');
         return (newLineIndex === -1) ? res : res.substring(0, newLineIndex);
     }
+    var NumberParseError = (function (_super) {
+        __extends(NumberParseError, _super);
+        function NumberParseError(message) {
+            _super.call(this);
+            this.message = message;
+        }
+        NumberParseError.prototype.toString = function () { return this.message; };
+        return NumberParseError;
+    }(Error));
+    var NumberWrapper = (function () {
+        function NumberWrapper() {
+        }
+        NumberWrapper.toFixed = function (n, fractionDigits) { return n.toFixed(fractionDigits); };
+        NumberWrapper.equal = function (a, b) { return a === b; };
+        NumberWrapper.parseIntAutoRadix = function (text) {
+            var result = parseInt(text);
+            if (isNaN(result)) {
+                throw new NumberParseError('Invalid integer literal when parsing ' + text);
+            }
+            return result;
+        };
+        NumberWrapper.parseInt = function (text, radix) {
+            if (radix == 10) {
+                if (/^(\-|\+)?[0-9]+$/.test(text)) {
+                    return parseInt(text, radix);
+                }
+            }
+            else if (radix == 16) {
+                if (/^(\-|\+)?[0-9ABCDEFabcdef]+$/.test(text)) {
+                    return parseInt(text, radix);
+                }
+            }
+            else {
+                var result = parseInt(text, radix);
+                if (!isNaN(result)) {
+                    return result;
+                }
+            }
+            throw new NumberParseError('Invalid integer literal when parsing ' + text + ' in base ' + radix);
+        };
+        // TODO: NaN is a valid literal but is returned by parseFloat to indicate an error.
+        NumberWrapper.parseFloat = function (text) { return parseFloat(text); };
+        Object.defineProperty(NumberWrapper, "NaN", {
+            get: function () { return NaN; },
+            enumerable: true,
+            configurable: true
+        });
+        NumberWrapper.isNaN = function (value) { return isNaN(value); };
+        NumberWrapper.isInteger = function (value) { return Number.isInteger(value); };
+        return NumberWrapper;
+    }());
     var RegExpWrapper = (function () {
         function RegExpWrapper() {
         }
@@ -111,6 +162,182 @@ var __extends = (this && this.__extends) || function (d, b) {
         };
         return RegExpWrapper;
     }());
+    var PromiseCompleter = (function () {
+        function PromiseCompleter() {
+            var _this = this;
+            this.promise = new Promise(function (res, rej) {
+                _this.resolve = res;
+                _this.reject = rej;
+            });
+        }
+        return PromiseCompleter;
+    }());
+    var PromiseWrapper = (function () {
+        function PromiseWrapper() {
+        }
+        PromiseWrapper.resolve = function (obj) { return Promise.resolve(obj); };
+        PromiseWrapper.reject = function (obj, _) { return Promise.reject(obj); };
+        // Note: We can't rename this method into `catch`, as this is not a valid
+        // method name in Dart.
+        PromiseWrapper.catchError = function (promise, onError) {
+            return promise.catch(onError);
+        };
+        PromiseWrapper.all = function (promises) {
+            if (promises.length == 0)
+                return Promise.resolve([]);
+            return Promise.all(promises);
+        };
+        PromiseWrapper.then = function (promise, success, rejection) {
+            return promise.then(success, rejection);
+        };
+        PromiseWrapper.wrap = function (computation) {
+            return new Promise(function (res, rej) {
+                try {
+                    res(computation());
+                }
+                catch (e) {
+                    rej(e);
+                }
+            });
+        };
+        PromiseWrapper.scheduleMicrotask = function (computation) {
+            PromiseWrapper.then(PromiseWrapper.resolve(null), computation, function (_) { });
+        };
+        PromiseWrapper.isPromise = function (obj) { return obj instanceof Promise; };
+        PromiseWrapper.completer = function () { return new PromiseCompleter(); };
+        return PromiseWrapper;
+    }());
+    var ObservableWrapper = (function () {
+        function ObservableWrapper() {
+        }
+        // TODO(vsavkin): when we use rxnext, try inferring the generic type from the first arg
+        ObservableWrapper.subscribe = function (emitter, onNext, onError, onComplete) {
+            if (onComplete === void 0) { onComplete = function () { }; }
+            onError = (typeof onError === 'function') && onError || noop;
+            onComplete = (typeof onComplete === 'function') && onComplete || noop;
+            return emitter.subscribe({ next: onNext, error: onError, complete: onComplete });
+        };
+        ObservableWrapper.isObservable = function (obs) { return !!obs.subscribe; };
+        /**
+         * Returns whether `obs` has any subscribers listening to events.
+         */
+        ObservableWrapper.hasSubscribers = function (obs) { return obs.observers.length > 0; };
+        ObservableWrapper.dispose = function (subscription) { subscription.unsubscribe(); };
+        /**
+         * @deprecated - use callEmit() instead
+         */
+        ObservableWrapper.callNext = function (emitter, value) { emitter.next(value); };
+        ObservableWrapper.callEmit = function (emitter, value) { emitter.emit(value); };
+        ObservableWrapper.callError = function (emitter, error) { emitter.error(error); };
+        ObservableWrapper.callComplete = function (emitter) { emitter.complete(); };
+        ObservableWrapper.fromPromise = function (promise) {
+            return rxjs_observable_PromiseObservable.PromiseObservable.create(promise);
+        };
+        ObservableWrapper.toPromise = function (obj) { return rxjs_operator_toPromise.toPromise.call(obj); };
+        return ObservableWrapper;
+    }());
+    /**
+     * Use by directives and components to emit custom Events.
+     *
+     * ### Examples
+     *
+     * In the following example, `Zippy` alternatively emits `open` and `close` events when its
+     * title gets clicked:
+     *
+     * ```
+     * @Component({
+     *   selector: 'zippy',
+     *   template: `
+     *   <div class="zippy">
+     *     <div (click)="toggle()">Toggle</div>
+     *     <div [hidden]="!visible">
+     *       <ng-content></ng-content>
+     *     </div>
+     *  </div>`})
+     * export class Zippy {
+     *   visible: boolean = true;
+     *   @Output() open: EventEmitter<any> = new EventEmitter();
+     *   @Output() close: EventEmitter<any> = new EventEmitter();
+     *
+     *   toggle() {
+     *     this.visible = !this.visible;
+     *     if (this.visible) {
+     *       this.open.emit(null);
+     *     } else {
+     *       this.close.emit(null);
+     *     }
+     *   }
+     * }
+     * ```
+     *
+     * The events payload can be accessed by the parameter `$event` on the components output event
+     * handler:
+     *
+     * ```
+     * <zippy (open)="onOpen($event)" (close)="onClose($event)"></zippy>
+     * ```
+     *
+     * Uses Rx.Observable but provides an adapter to make it work as specified here:
+     * https://github.com/jhusain/observable-spec
+     *
+     * Once a reference implementation of the spec is available, switch to it.
+     * @stable
+     */
+    var EventEmitter = (function (_super) {
+        __extends(EventEmitter, _super);
+        /**
+         * Creates an instance of [EventEmitter], which depending on [isAsync],
+         * delivers events synchronously or asynchronously.
+         */
+        function EventEmitter(isAsync) {
+            if (isAsync === void 0) { isAsync = false; }
+            _super.call(this);
+            this.__isAsync = isAsync;
+        }
+        EventEmitter.prototype.emit = function (value) { _super.prototype.next.call(this, value); };
+        /**
+         * @deprecated - use .emit(value) instead
+         */
+        EventEmitter.prototype.next = function (value) { _super.prototype.next.call(this, value); };
+        EventEmitter.prototype.subscribe = function (generatorOrNext, error, complete) {
+            var schedulerFn;
+            var errorFn = function (err) { return null; };
+            var completeFn = function () { return null; };
+            if (generatorOrNext && typeof generatorOrNext === 'object') {
+                schedulerFn = this.__isAsync ? function (value /** TODO #9100 */) {
+                    setTimeout(function () { return generatorOrNext.next(value); });
+                } : function (value /** TODO #9100 */) { generatorOrNext.next(value); };
+                if (generatorOrNext.error) {
+                    errorFn = this.__isAsync ? function (err) { setTimeout(function () { return generatorOrNext.error(err); }); } :
+                        function (err) { generatorOrNext.error(err); };
+                }
+                if (generatorOrNext.complete) {
+                    completeFn = this.__isAsync ? function () { setTimeout(function () { return generatorOrNext.complete(); }); } :
+                        function () { generatorOrNext.complete(); };
+                }
+            }
+            else {
+                schedulerFn = this.__isAsync ? function (value /** TODO #9100 */) {
+                    setTimeout(function () { return generatorOrNext(value); });
+                } : function (value /** TODO #9100 */) { generatorOrNext(value); };
+                if (error) {
+                    errorFn =
+                        this.__isAsync ? function (err) { setTimeout(function () { return error(err); }); } : function (err) { error(err); };
+                }
+                if (complete) {
+                    completeFn =
+                        this.__isAsync ? function () { setTimeout(function () { return complete(); }); } : function () { complete(); };
+                }
+            }
+            return _super.prototype.subscribe.call(this, schedulerFn, errorFn, completeFn);
+        };
+        return EventEmitter;
+    }(rxjs_Subject.Subject));
+    /**
+     * Name of the default outlet outlet.
+     * @type {string}
+     */
+    var DEFAULT_OUTLET_NAME = '__DEFAULT';
     var Map$1 = global$1.Map;
     var Set = global$1.Set;
     // Safari and Internet Explorer do not support the iterable parameter to the
@@ -403,196 +630,57 @@ var __extends = (this && this.__extends) || function (d, b) {
             };
         }
     })();
-    var PromiseCompleter = (function () {
-        function PromiseCompleter() {
-            var _this = this;
-            this.promise = new Promise(function (res, rej) {
-                _this.resolve = res;
-                _this.reject = rej;
-            });
+    function hasLifecycleHook(name, obj) {
+        if (isBlank(obj))
+            return false;
+        var type = obj.constructor;
+        if (!(type instanceof Type))
+            return false;
+        return name in type.prototype;
+    }
+    /**
+     * @stable
+     */
+    var BaseException$1 = (function (_super) {
+        __extends(BaseException$1, _super);
+        function BaseException$1(message) {
+            if (message === void 0) { message = '--'; }
+            _super.call(this, message);
+            this.message = message;
+            this.stack = (new Error(message)).stack;
         }
-        return PromiseCompleter;
-    }());
-    var PromiseWrapper = (function () {
-        function PromiseWrapper() {
+        BaseException$1.prototype.toString = function () { return this.message; };
+        return BaseException$1;
+    }(Error));
+    var Tree = (function () {
+        function Tree(root) {
+            this._root = root;
         }
-        PromiseWrapper.resolve = function (obj) { return Promise.resolve(obj); };
-        PromiseWrapper.reject = function (obj, _) { return Promise.reject(obj); };
-        // Note: We can't rename this method into `catch`, as this is not a valid
-        // method name in Dart.
-        PromiseWrapper.catchError = function (promise, onError) {
-            return promise.catch(onError);
-        };
-        PromiseWrapper.all = function (promises) {
-            if (promises.length == 0)
-                return Promise.resolve([]);
-            return Promise.all(promises);
-        };
-        PromiseWrapper.then = function (promise, success, rejection) {
-            return promise.then(success, rejection);
+        Object.defineProperty(Tree.prototype, "root", {
+            get: function () { return this._root.value; },
+            enumerable: true,
+            configurable: true
+        });
+        Tree.prototype.parent = function (t) {
+            var p = this.pathFromRoot(t);
+            return p.length > 1 ? p[p.length - 2] : null;
         };
-        PromiseWrapper.wrap = function (computation) {
-            return new Promise(function (res, rej) {
-                try {
-                    res(computation());
-                }
-                catch (e) {
-                    rej(e);
-                }
-            });
+        Tree.prototype.children = function (t) {
+            var n = _findNode(t, this._root);
+            return isPresent(n) ? n.children.map(function (t) { return t.value; }) : null;
         };
-        PromiseWrapper.scheduleMicrotask = function (computation) {
-            PromiseWrapper.then(PromiseWrapper.resolve(null), computation, function (_) { });
+        Tree.prototype.firstChild = function (t) {
+            var n = _findNode(t, this._root);
+            return isPresent(n) && n.children.length > 0 ? n.children[0].value : null;
         };
-        PromiseWrapper.isPromise = function (obj) { return obj instanceof Promise; };
-        PromiseWrapper.completer = function () { return new PromiseCompleter(); };
-        return PromiseWrapper;
+        Tree.prototype.pathFromRoot = function (t) { return _findPath(t, this._root, []).map(function (s) { return s.value; }); };
+        Tree.prototype.contains = function (tree) { return _contains(this._root, tree._root); };
+        return Tree;
     }());
-    var ObservableWrapper = (function () {
-        function ObservableWrapper() {
-        }
-        // TODO(vsavkin): when we use rxnext, try inferring the generic type from the first arg
-        ObservableWrapper.subscribe = function (emitter, onNext, onError, onComplete) {
-            if (onComplete === void 0) { onComplete = function () { }; }
-            onError = (typeof onError === "function") && onError || noop;
-            onComplete = (typeof onComplete === "function") && onComplete || noop;
-            return emitter.subscribe({ next: onNext, error: onError, complete: onComplete });
-        };
-        ObservableWrapper.isObservable = function (obs) { return !!obs.subscribe; };
-        /**
-         * Returns whether `obs` has any subscribers listening to events.
-         */
-        ObservableWrapper.hasSubscribers = function (obs) { return obs.observers.length > 0; };
-        ObservableWrapper.dispose = function (subscription) { subscription.unsubscribe(); };
-        /**
-         * @deprecated - use callEmit() instead
-         */
-        ObservableWrapper.callNext = function (emitter, value) { emitter.next(value); };
-        ObservableWrapper.callEmit = function (emitter, value) { emitter.emit(value); };
-        ObservableWrapper.callError = function (emitter, error) { emitter.error(error); };
-        ObservableWrapper.callComplete = function (emitter) { emitter.complete(); };
-        ObservableWrapper.fromPromise = function (promise) {
-            return rxjs_observable_PromiseObservable.PromiseObservable.create(promise);
-        };
-        ObservableWrapper.toPromise = function (obj) { return rxjs_operator_toPromise.toPromise.call(obj); };
-        return ObservableWrapper;
-    }());
-    /**
-     * Use by directives and components to emit custom Events.
-     *
-     * ### Examples
-     *
-     * In the following example, `Zippy` alternatively emits `open` and `close` events when its
-     * title gets clicked:
-     *
-     * ```
-     * @Component({
-     *   selector: 'zippy',
-     *   template: `
-     *   <div class="zippy">
-     *     <div (click)="toggle()">Toggle</div>
-     *     <div [hidden]="!visible">
-     *       <ng-content></ng-content>
-     *     </div>
-     *  </div>`})
-     * export class Zippy {
-     *   visible: boolean = true;
-     *   @Output() open: EventEmitter<any> = new EventEmitter();
-     *   @Output() close: EventEmitter<any> = new EventEmitter();
-     *
-     *   toggle() {
-     *     this.visible = !this.visible;
-     *     if (this.visible) {
-     *       this.open.emit(null);
-     *     } else {
-     *       this.close.emit(null);
-     *     }
-     *   }
-     * }
-     * ```
-     *
-     * Use Rx.Observable but provides an adapter to make it work as specified here:
-     * https://github.com/jhusain/observable-spec
-     *
-     * Once a reference implementation of the spec is available, switch to it.
-     */
-    var EventEmitter = (function (_super) {
-        __extends(EventEmitter, _super);
-        /**
-         * Creates an instance of [EventEmitter], which depending on [isAsync],
-         * delivers events synchronously or asynchronously.
-         */
-        function EventEmitter(isAsync) {
-            if (isAsync === void 0) { isAsync = true; }
-            _super.call(this);
-            this._isAsync = isAsync;
-        }
-        EventEmitter.prototype.emit = function (value) { _super.prototype.next.call(this, value); };
-        /**
-         * @deprecated - use .emit(value) instead
-         */
-        EventEmitter.prototype.next = function (value) { _super.prototype.next.call(this, value); };
-        EventEmitter.prototype.subscribe = function (generatorOrNext, error, complete) {
-            var schedulerFn;
-            var errorFn = function (err) { return null; };
-            var completeFn = function () { return null; };
-            if (generatorOrNext && typeof generatorOrNext === 'object') {
-                schedulerFn = this._isAsync ? function (value) { setTimeout(function () { return generatorOrNext.next(value); }); } :
-                    function (value) { generatorOrNext.next(value); };
-                if (generatorOrNext.error) {
-                    errorFn = this._isAsync ? function (err) { setTimeout(function () { return generatorOrNext.error(err); }); } :
-                        function (err) { generatorOrNext.error(err); };
-                }
-                if (generatorOrNext.complete) {
-                    completeFn = this._isAsync ? function () { setTimeout(function () { return generatorOrNext.complete(); }); } :
-                        function () { generatorOrNext.complete(); };
-                }
-            }
-            else {
-                schedulerFn = this._isAsync ? function (value) { setTimeout(function () { return generatorOrNext(value); }); } :
-                    function (value) { generatorOrNext(value); };
-                if (error) {
-                    errorFn =
-                        this._isAsync ? function (err) { setTimeout(function () { return error(err); }); } : function (err) { error(err); };
-                }
-                if (complete) {
-                    completeFn =
-                        this._isAsync ? function () { setTimeout(function () { return complete(); }); } : function () { complete(); };
-                }
-            }
-            return _super.prototype.subscribe.call(this, schedulerFn, errorFn, completeFn);
-        };
-        return EventEmitter;
-    }(rxjs_Subject.Subject));
-    var Tree = (function () {
-        function Tree(root) {
-            this._root = root;
-        }
-        Object.defineProperty(Tree.prototype, "root", {
-            get: function () { return this._root.value; },
-            enumerable: true,
-            configurable: true
-        });
-        Tree.prototype.parent = function (t) {
-            var p = this.pathFromRoot(t);
-            return p.length > 1 ? p[p.length - 2] : null;
-        };
-        Tree.prototype.children = function (t) {
-            var n = _findNode(t, this._root);
-            return isPresent(n) ? n.children.map(function (t) { return t.value; }) : null;
-        };
-        Tree.prototype.firstChild = function (t) {
-            var n = _findNode(t, this._root);
-            return isPresent(n) && n.children.length > 0 ? n.children[0].value : null;
-        };
-        Tree.prototype.pathFromRoot = function (t) { return _findPath(t, this._root, []).map(function (s) { return s.value; }); };
-        Tree.prototype.contains = function (tree) { return _contains(this._root, tree._root); };
-        return Tree;
-    }());
-    var UrlTree = (function (_super) {
-        __extends(UrlTree, _super);
-        function UrlTree(root) {
-            _super.call(this, root);
+    var UrlTree = (function (_super) {
+        __extends(UrlTree, _super);
+        function UrlTree(root) {
+            _super.call(this, root);
         }
         return UrlTree;
     }(Tree));
@@ -607,9 +695,6 @@ var __extends = (this && this.__extends) || function (d, b) {
         return tree._root;
     }
     function _findNode(expected, c) {
-        // TODO: vsavkin remove it once recognize is fixed
-        if (expected instanceof RouteSegment && equalSegments(expected, c.value))
-            return c;
         if (expected === c.value)
             return c;
         for (var _i = 0, _a = c.children; _i < _a.length; _i++) {
@@ -622,8 +707,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     }
     function _findPath(expected, c, collected) {
         collected.push(c);
-        // TODO: vsavkin remove it once recognize is fixed
-        if (_equalValues(expected, c.value))
+        if (expected === c.value)
             return collected;
         for (var _i = 0, _a = c.children; _i < _a.length; _i++) {
             var cc = _a[_i];
@@ -634,10 +718,10 @@ var __extends = (this && this.__extends) || function (d, b) {
         return null;
     }
     function _contains(tree, subtree) {
-        if (!_equalValues(tree.value, subtree.value))
+        if (tree.value !== subtree.value)
             return false;
         var _loop_1 = function(subtreeNode) {
-            var s = tree.children.filter(function (child) { return _equalValues(child.value, subtreeNode.value); });
+            var s = tree.children.filter(function (child) { return child.value === subtreeNode.value; });
             if (s.length === 0)
                 return { value: false };
             if (!_contains(s[0], subtreeNode))
@@ -650,13 +734,6 @@ var __extends = (this && this.__extends) || function (d, b) {
         }
         return true;
     }
-    function _equalValues(a, b) {
-        if (a instanceof RouteSegment)
-            return equalSegments(a, b);
-        if (a instanceof UrlSegment)
-            return equalUrlSegments(a, b);
-        return a === b;
-    }
     var TreeNode = (function () {
         function TreeNode(value, children) {
             this.value = value;
@@ -671,14 +748,14 @@ var __extends = (this && this.__extends) || function (d, b) {
             this.outlet = outlet;
         }
         UrlSegment.prototype.toString = function () {
-            var outletPrefix = isBlank(this.outlet) ? "" : this.outlet + ":";
+            var outletPrefix = isBlank(this.outlet) ? '' : this.outlet + ":";
             return "" + outletPrefix + this.segment + _serializeParams(this.parameters);
         };
         return UrlSegment;
     }());
     function _serializeParams(params) {
-        var res = "";
-        StringMapWrapper.forEach(params, function (v, k) { return res += ";" + k + "=" + v; });
+        var res = '';
+        StringMapWrapper.forEach(params, function (v /** TODO #9100 */, k /** TODO #9100 */) { return res += ";" + k + "=" + v; });
         return res;
     }
     var RouteSegment = (function () {
@@ -692,233 +769,41 @@ var __extends = (this && this.__extends) || function (d, b) {
         RouteSegment.prototype.getParam = function (param) {
             return isPresent(this.parameters) ? this.parameters[param] : null;
         };
+        RouteSegment.prototype.getParamAsNumber = function (param) {
+            return isPresent(this.parameters) ? NumberWrapper.parseFloat(this.parameters[param]) : null;
+        };
         Object.defineProperty(RouteSegment.prototype, "type", {
             get: function () { return this._type; },
             enumerable: true,
             configurable: true
         });
         Object.defineProperty(RouteSegment.prototype, "stringifiedUrlSegments", {
-            get: function () { return this.urlSegments.map(function (s) { return s.toString(); }).join("/"); },
+            get: function () { return this.urlSegments.map(function (s) { return s.toString(); }).join('/'); },
             enumerable: true,
             configurable: true
         });
         return RouteSegment;
     }());
-    function equalSegments(a, b) {
-        if (isBlank(a) && !isBlank(b))
-            return false;
-        if (!isBlank(a) && isBlank(b))
-            return false;
-        if (a._type !== b._type)
-            return false;
-        if (a.outlet != b.outlet)
-            return false;
-        return StringMapWrapper.equals(a.parameters, b.parameters);
+    function createEmptyRouteTree(type) {
+        var root = new RouteSegment([new UrlSegment('', {}, null)], {}, DEFAULT_OUTLET_NAME, type, null);
+        return new RouteTree(new TreeNode(root, []));
     }
     function equalUrlSegments(a, b) {
-        if (isBlank(a) && !isBlank(b))
-            return false;
-        if (!isBlank(a) && isBlank(b))
-            return false;
-        if (a.segment != b.segment)
+        if (a.length !== b.length)
             return false;
-        if (a.outlet != b.outlet)
-            return false;
-        if (isBlank(a.parameters)) {
-            console.log("a", a);
-        }
-        if (isBlank(b.parameters)) {
-            console.log("b", b);
+        for (var i = 0; i < a.length; ++i) {
+            if (a[i].segment != b[i].segment)
+                return false;
+            if (a[i].outlet != b[i].outlet)
+                return false;
+            if (!StringMapWrapper.equals(a[i].parameters, b[i].parameters))
+                return false;
         }
-        return StringMapWrapper.equals(a.parameters, b.parameters);
+        return true;
     }
     function routeSegmentComponentFactory(a) {
         return a._componentFactory;
     }
-    /**
-     * See {@link RouteMetadata} for more information.
-     * @ts2dart_const
-     */
-    var Route = (function () {
-        function Route(_a) {
-            var _b = _a === void 0 ? {} : _a, path = _b.path, component = _b.component;
-            this.path = path;
-            this.component = component;
-        }
-        Route.prototype.toString = function () { return "@Route(" + this.path + ", " + stringify(this.component) + ")"; };
-        return Route;
-    }());
-    /**
-     * Defines routes for a given component.
-     *
-     * It takes an array of {@link RouteMetadata}s.
-     * @ts2dart_const
-     */
-    var RoutesMetadata = (function () {
-        function RoutesMetadata(routes) {
-            this.routes = routes;
-        }
-        RoutesMetadata.prototype.toString = function () { return "@Routes(" + this.routes + ")"; };
-        return RoutesMetadata;
-    }());
-    /**
-    * Name of the default outlet outlet.
-    * @type {string}
-    */
-    var DEFAULT_OUTLET_NAME = "__DEFAULT";
-    // TODO: vsavkin: recognize should take the old tree and merge it
-    function recognize(componentResolver, type, url) {
-        var matched = new _MatchResult(type, [url.root], {}, rootNode(url).children, []);
-        return _constructSegment(componentResolver, matched).then(function (roots) { return new RouteTree(roots[0]); });
-    }
-    function _recognize(componentResolver, parentType, url) {
-        var metadata = _readMetadata(parentType); // should read from the factory instead
-        if (isBlank(metadata)) {
-            throw new _angular_core.BaseException("Component '" + stringify(parentType) + "' does not have route configuration");
-        }
-        var match;
-        try {
-            match = _match(metadata, url);
-        }
-        catch (e) {
-            return PromiseWrapper.reject(e, null);
-        }
-        var main = _constructSegment(componentResolver, match);
-        var aux = _recognizeMany(componentResolver, parentType, match.aux).then(_checkOutletNameUniqueness);
-        return PromiseWrapper.all([main, aux]).then(ListWrapper.flatten);
-    }
-    function _recognizeMany(componentResolver, parentType, urls) {
-        var recognized = urls.map(function (u) { return _recognize(componentResolver, parentType, u); });
-        return PromiseWrapper.all(recognized).then(ListWrapper.flatten);
-    }
-    function _constructSegment(componentResolver, matched) {
-        return componentResolver.resolveComponent(matched.component)
-            .then(function (factory) {
-            var urlOutlet = matched.consumedUrlSegments.length === 0 ||
-                isBlank(matched.consumedUrlSegments[0].outlet) ?
-                DEFAULT_OUTLET_NAME :
-                matched.consumedUrlSegments[0].outlet;
-            var segment = new RouteSegment(matched.consumedUrlSegments, matched.parameters, urlOutlet, matched.component, factory);
-            if (matched.leftOverUrl.length > 0) {
-                return _recognizeMany(componentResolver, matched.component, matched.leftOverUrl)
-                    .then(function (children) { return [new TreeNode(segment, children)]; });
-            }
-            else {
-                return _recognizeLeftOvers(componentResolver, matched.component)
-                    .then(function (children) { return [new TreeNode(segment, children)]; });
-            }
-        });
-    }
-    function _recognizeLeftOvers(componentResolver, parentType) {
-        return componentResolver.resolveComponent(parentType)
-            .then(function (factory) {
-            var metadata = _readMetadata(parentType);
-            if (isBlank(metadata)) {
-                return [];
-            }
-            var r = metadata.routes.filter(function (r) { return r.path == "" || r.path == "/"; });
-            if (r.length === 0) {
-                return PromiseWrapper.resolve([]);
-            }
-            else {
-                return _recognizeLeftOvers(componentResolver, r[0].component)
-                    .then(function (children) {
-                    return componentResolver.resolveComponent(r[0].component)
-                        .then(function (factory) {
-                        var segment = new RouteSegment([], {}, DEFAULT_OUTLET_NAME, r[0].component, factory);
-                        return [new TreeNode(segment, children)];
-                    });
-                });
-            }
-        });
-    }
-    function _match(metadata, url) {
-        for (var _i = 0, _a = metadata.routes; _i < _a.length; _i++) {
-            var r = _a[_i];
-            var matchingResult = _matchWithParts(r, url);
-            if (isPresent(matchingResult)) {
-                return matchingResult;
-            }
-        }
-        var availableRoutes = metadata.routes.map(function (r) { return ("'" + r.path + "'"); }).join(", ");
-        throw new _angular_core.BaseException("Cannot match any routes. Current segment: '" + url.value + "'. Available routes: [" + availableRoutes + "].");
-    }
-    function _matchWithParts(route, url) {
-        var path = route.path.startsWith("/") ? route.path.substring(1) : route.path;
-        if (path == "*") {
-            return new _MatchResult(route.component, [], null, [], []);
-        }
-        var parts = path.split("/");
-        var positionalParams = {};
-        var consumedUrlSegments = [];
-        var lastParent = null;
-        var lastSegment = null;
-        var current = url;
-        for (var i = 0; i < parts.length; ++i) {
-            if (isBlank(current))
-                return null;
-            var p_1 = parts[i];
-            var isLastSegment = i === parts.length - 1;
-            var isLastParent = i === parts.length - 2;
-            var isPosParam = p_1.startsWith(":");
-            if (!isPosParam && p_1 != current.value.segment)
-                return null;
-            if (isLastSegment) {
-                lastSegment = current;
-            }
-            if (isLastParent) {
-                lastParent = current;
-            }
-            if (isPosParam) {
-                positionalParams[p_1.substring(1)] = current.value.segment;
-            }
-            consumedUrlSegments.push(current.value);
-            current = ListWrapper.first(current.children);
-        }
-        var p = lastSegment.value.parameters;
-        var parameters = StringMapWrapper.merge(p, positionalParams);
-        var axuUrlSubtrees = isPresent(lastParent) ? lastParent.children.slice(1) : [];
-        return new _MatchResult(route.component, consumedUrlSegments, parameters, lastSegment.children, axuUrlSubtrees);
-    }
-    function _checkOutletNameUniqueness(nodes) {
-        var names = {};
-        nodes.forEach(function (n) {
-            var segmentWithSameOutletName = names[n.value.outlet];
-            if (isPresent(segmentWithSameOutletName)) {
-                var p = segmentWithSameOutletName.stringifiedUrlSegments;
-                var c = n.value.stringifiedUrlSegments;
-                throw new _angular_core.BaseException("Two segments cannot have the same outlet name: '" + p + "' and '" + c + "'.");
-            }
-            names[n.value.outlet] = n.value;
-        });
-        return nodes;
-    }
-    var _MatchResult = (function () {
-        function _MatchResult(component, consumedUrlSegments, parameters, leftOverUrl, aux) {
-            this.component = component;
-            this.consumedUrlSegments = consumedUrlSegments;
-            this.parameters = parameters;
-            this.leftOverUrl = leftOverUrl;
-            this.aux = aux;
-        }
-        return _MatchResult;
-    }());
-    function _readMetadata(componentType) {
-        var metadata = _angular_core.reflector.annotations(componentType).filter(function (f) { return f instanceof RoutesMetadata; });
-        return ListWrapper.first(metadata);
-    }
-    var BaseException$1 = (function (_super) {
-        __extends(BaseException$1, _super);
-        function BaseException$1(message) {
-            if (message === void 0) { message = "--"; }
-            _super.call(this, message);
-            this.message = message;
-            this.stack = (new Error(message)).stack;
-        }
-        BaseException$1.prototype.toString = function () { return this.message; };
-        return BaseException$1;
-    }(Error));
-    // TODO: vsavkin: should reuse segments
     function link(segment, routeTree, urlTree, commands) {
         if (commands.length === 0)
             return urlTree;
@@ -928,12 +813,14 @@ var __extends = (this && this.__extends) || function (d, b) {
         }
         var startingNode = _findStartingNode(normalizedCommands, urlTree, segment, routeTree);
         var updated = normalizedCommands.commands.length > 0 ?
-            _updateMany(ListWrapper.clone(startingNode.children), normalizedCommands.commands) : [];
+            _updateMany(ListWrapper.clone(startingNode.children), normalizedCommands.commands) :
+            [];
         var newRoot = _constructNewTree(rootNode(urlTree), startingNode, updated);
         return new UrlTree(newRoot);
     }
     function _navigateToRoot(normalizedChange) {
-        return normalizedChange.isAbsolute && normalizedChange.commands.length === 1 && normalizedChange.commands[0] == "/";
+        return normalizedChange.isAbsolute && normalizedChange.commands.length === 1 &&
+            normalizedChange.commands[0] == '/';
     }
     var _NormalizedNavigationCommands = (function () {
         function _NormalizedNavigationCommands(isAbsolute, numberOfDoubleDots, commands) {
@@ -944,9 +831,7 @@ var __extends = (this && this.__extends) || function (d, b) {
         return _NormalizedNavigationCommands;
     }());
     function _normalizeCommands(commands) {
-        ;
-        '';
-        if (isString(commands[0]) && commands.length === 1 && commands[0] == "/") {
+        if (isString(commands[0]) && commands.length === 1 && commands[0] == '/') {
             return new _NormalizedNavigationCommands(true, 0, commands);
         }
         var numberOfDoubleDots = 0;
@@ -963,12 +848,12 @@ var __extends = (this && this.__extends) || function (d, b) {
                 var cc = parts[j];
                 // first exp is treated in a special way
                 if (i == 0) {
-                    if (j == 0 && cc == ".") {
+                    if (j == 0 && cc == '.') {
                     }
-                    else if (j == 0 && cc == "") {
+                    else if (j == 0 && cc == '') {
                         isAbsolute = true;
                     }
-                    else if (cc == "..") {
+                    else if (cc == '..') {
                         numberOfDoubleDots++;
                     }
                     else if (cc != '') {
@@ -992,7 +877,7 @@ var __extends = (this && this.__extends) || function (d, b) {
         var urlSegment = ListWrapper.last(s.urlSegments);
         var path = urlTree.pathFromRoot(urlSegment);
         if (path.length <= numberOfDoubleDots) {
-            throw new BaseException$1("Invalid number of '../'");
+            throw new BaseException$1('Invalid number of \'../\'');
         }
         return path[path.length - 1 - numberOfDoubleDots];
     }
@@ -1036,25 +921,39 @@ var __extends = (this && this.__extends) || function (d, b) {
             return new TreeNode(urlSegment, children);
         }
         else if (isBlank(node) && isStringMap(next)) {
-            var urlSegment = new UrlSegment(segment, next, outlet);
+            var urlSegment = new UrlSegment(segment, _stringify(next), outlet);
             return _recurse(urlSegment, node, rest.slice(1));
         }
         else if (outlet != node.value.outlet) {
             return node;
         }
         else if (isStringMap(segment)) {
-            var newSegment = new UrlSegment(node.value.segment, segment, node.value.outlet);
+            var newSegment = new UrlSegment(node.value.segment, _stringify(segment), node.value.outlet);
             return _recurse(newSegment, node, rest);
         }
+        else if (isStringMap(next) && _compare(segment, _stringify(next), node.value)) {
+            return _recurse(node.value, node, rest.slice(1));
+        }
         else if (isStringMap(next)) {
-            var urlSegment = new UrlSegment(segment, next, outlet);
+            var urlSegment = new UrlSegment(segment, _stringify(next), outlet);
             return _recurse(urlSegment, node, rest.slice(1));
         }
+        else if (_compare(segment, {}, node.value)) {
+            return _recurse(node.value, node, rest);
+        }
         else {
             var urlSegment = new UrlSegment(segment, {}, outlet);
             return _recurse(urlSegment, node, rest);
         }
     }
+    function _stringify(params) {
+        var res = {};
+        StringMapWrapper.forEach(params, function (v /** TODO #9100 */, k /** TODO #9100 */) { return res[k] = v.toString(); });
+        return res;
+    }
+    function _compare(path, params, segment) {
+        return path == segment.segment && StringMapWrapper.equals(params, segment.parameters);
+    }
     function _recurse(urlSegment, node, rest) {
         if (rest.length === 0) {
             return new TreeNode(urlSegment, []);
@@ -1076,26 +975,204 @@ var __extends = (this && this.__extends) || function (d, b) {
     function _segment(commands) {
         if (!isString(commands[0]))
             return commands[0];
-        var parts = commands[0].toString().split(":");
+        var parts = commands[0].toString().split(':');
         return parts.length > 1 ? parts[1] : commands[0];
     }
     function _outlet(commands) {
         if (!isString(commands[0]))
             return null;
-        var parts = commands[0].toString().split(":");
+        var parts = commands[0].toString().split(':');
         return parts.length > 1 ? parts[0] : null;
     }
-    function hasLifecycleHook(name, obj) {
-        if (isBlank(obj))
-            return false;
-        var type = obj.constructor;
-        if (!(type instanceof Type))
-            return false;
-        return name in type.prototype;
+    var makeDecorator = _angular_core.__core_private__.makeDecorator;
+    var reflector = _angular_core.__core_private__.reflector;
+    /**
+     * See {@link RouteMetadata} for more information.
+     * @ts2dart_const
+     */
+    var Route = (function () {
+        function Route(_a) {
+            var _b = _a === void 0 ? {} : _a, path = _b.path, component = _b.component;
+            this.path = path;
+            this.component = component;
+        }
+        Route.prototype.toString = function () { return "@Route(" + this.path + ", " + stringify(this.component) + ")"; };
+        return Route;
+    }());
+    /**
+     * Defines routes for a given component.
+     *
+     * It takes an array of {@link RouteMetadata}s.
+     * @ts2dart_const
+     */
+    var RoutesMetadata = (function () {
+        function RoutesMetadata(routes) {
+            this.routes = routes;
+        }
+        RoutesMetadata.prototype.toString = function () { return "@Routes(" + this.routes + ")"; };
+        return RoutesMetadata;
+    }());
+    function recognize(componentResolver, rootComponent, url, existingTree) {
+        var matched = new _MatchResult(rootComponent, [url.root], {}, rootNode(url).children, []);
+        return _constructSegment(componentResolver, matched, rootNode(existingTree))
+            .then(function (roots) { return new RouteTree(roots[0]); });
+    }
+    function _recognize(componentResolver, parentComponent, url, existingSegments) {
+        var metadata = _readMetadata(parentComponent); // should read from the factory instead
+        if (isBlank(metadata)) {
+            throw new _angular_core.BaseException("Component '" + stringify(parentComponent) + "' does not have route configuration");
+        }
+        var match;
+        try {
+            match = _match(metadata, url);
+        }
+        catch (e) {
+            return PromiseWrapper.reject(e, null);
+        }
+        var segmentsWithRightOutlet = existingSegments.filter(function (r) { return r.value.outlet == match.outlet; });
+        var segmentWithRightOutlet = segmentsWithRightOutlet.length > 0 ? segmentsWithRightOutlet[0] : null;
+        var main = _constructSegment(componentResolver, match, segmentWithRightOutlet);
+        var aux = _recognizeMany(componentResolver, parentComponent, match.aux, existingSegments)
+            .then(_checkOutletNameUniqueness);
+        return PromiseWrapper.all([main, aux]).then(ListWrapper.flatten);
+    }
+    function _recognizeMany(componentResolver, parentComponent, urls, existingSegments) {
+        var recognized = urls.map(function (u) { return _recognize(componentResolver, parentComponent, u, existingSegments); });
+        return PromiseWrapper.all(recognized).then(ListWrapper.flatten);
+    }
+    function _constructSegment(componentResolver, matched, existingSegment) {
+        return componentResolver.resolveComponent(matched.component).then(function (factory) {
+            var segment = _createOrReuseSegment(matched, factory, existingSegment);
+            var existingChildren = isPresent(existingSegment) ? existingSegment.children : [];
+            if (matched.leftOverUrl.length > 0) {
+                return _recognizeMany(componentResolver, factory.componentType, matched.leftOverUrl, existingChildren)
+                    .then(function (children) { return [new TreeNode(segment, children)]; });
+            }
+            else {
+                return _recognizeLeftOvers(componentResolver, factory.componentType, existingChildren)
+                    .then(function (children) { return [new TreeNode(segment, children)]; });
+            }
+        });
+    }
+    function _createOrReuseSegment(matched, factory, segmentNode) {
+        var segment = isPresent(segmentNode) ? segmentNode.value : null;
+        if (isPresent(segment) && equalUrlSegments(segment.urlSegments, matched.consumedUrlSegments) &&
+            StringMapWrapper.equals(segment.parameters, matched.parameters) &&
+            segment.outlet == matched.outlet && factory.componentType == segment.type) {
+            return segment;
+        }
+        else {
+            return new RouteSegment(matched.consumedUrlSegments, matched.parameters, matched.outlet, factory.componentType, factory);
+        }
+    }
+    function _recognizeLeftOvers(componentResolver, parentComponent, existingSegments) {
+        return componentResolver.resolveComponent(parentComponent).then(function (factory) {
+            var metadata = _readMetadata(factory.componentType);
+            if (isBlank(metadata)) {
+                return [];
+            }
+            var r = metadata.routes.filter(function (r) { return r.path == '' || r.path == '/'; });
+            if (r.length === 0) {
+                return PromiseWrapper.resolve([]);
+            }
+            else {
+                var segmentsWithMatchingOutlet = existingSegments.filter(function (r) { return r.value.outlet == DEFAULT_OUTLET_NAME; });
+                var segmentWithMatchingOutlet_1 = segmentsWithMatchingOutlet.length > 0 ? segmentsWithMatchingOutlet[0] : null;
+                var existingChildren = isPresent(segmentWithMatchingOutlet_1) ? segmentWithMatchingOutlet_1.children : [];
+                return _recognizeLeftOvers(componentResolver, r[0].component, existingChildren)
+                    .then(function (children) {
+                    return componentResolver.resolveComponent(r[0].component).then(function (factory) {
+                        var segment = _createOrReuseSegment(new _MatchResult(r[0].component, [], {}, [], []), factory, segmentWithMatchingOutlet_1);
+                        return [new TreeNode(segment, children)];
+                    });
+                });
+            }
+        });
+    }
+    function _match(metadata, url) {
+        for (var _i = 0, _a = metadata.routes; _i < _a.length; _i++) {
+            var r = _a[_i];
+            var matchingResult = _matchWithParts(r, url);
+            if (isPresent(matchingResult)) {
+                return matchingResult;
+            }
+        }
+        var availableRoutes = metadata.routes.map(function (r) { return ("'" + r.path + "'"); }).join(', ');
+        throw new _angular_core.BaseException("Cannot match any routes. Current segment: '" + url.value + "'. Available routes: [" + availableRoutes + "].");
+    }
+    function _matchWithParts(route, url) {
+        var path = route.path.startsWith('/') ? route.path.substring(1) : route.path;
+        if (path == '*') {
+            return new _MatchResult(route.component, [], null, [], []);
+        }
+        var parts = path.split('/');
+        var positionalParams = {};
+        var consumedUrlSegments = [];
+        var lastParent = null;
+        var lastSegment = null;
+        var current = url;
+        for (var i = 0; i < parts.length; ++i) {
+            if (isBlank(current))
+                return null;
+            var p_1 = parts[i];
+            var isLastSegment = i === parts.length - 1;
+            var isLastParent = i === parts.length - 2;
+            var isPosParam = p_1.startsWith(':');
+            if (!isPosParam && p_1 != current.value.segment)
+                return null;
+            if (isLastSegment) {
+                lastSegment = current;
+            }
+            if (isLastParent) {
+                lastParent = current;
+            }
+            if (isPosParam) {
+                positionalParams[p_1.substring(1)] = current.value.segment;
+            }
+            consumedUrlSegments.push(current.value);
+            current = ListWrapper.first(current.children);
+        }
+        var p = lastSegment.value.parameters;
+        var parameters = StringMapWrapper.merge(p, positionalParams);
+        var axuUrlSubtrees = isPresent(lastParent) ? lastParent.children.slice(1) : [];
+        return new _MatchResult(route.component, consumedUrlSegments, parameters, lastSegment.children, axuUrlSubtrees);
+    }
+    function _checkOutletNameUniqueness(nodes) {
+        var names = {};
+        nodes.forEach(function (n) {
+            var segmentWithSameOutletName = names[n.value.outlet];
+            if (isPresent(segmentWithSameOutletName)) {
+                var p = segmentWithSameOutletName.stringifiedUrlSegments;
+                var c = n.value.stringifiedUrlSegments;
+                throw new _angular_core.BaseException("Two segments cannot have the same outlet name: '" + p + "' and '" + c + "'.");
+            }
+            names[n.value.outlet] = n.value;
+        });
+        return nodes;
+    }
+    var _MatchResult = (function () {
+        function _MatchResult(component, consumedUrlSegments, parameters, leftOverUrl, aux) {
+            this.component = component;
+            this.consumedUrlSegments = consumedUrlSegments;
+            this.parameters = parameters;
+            this.leftOverUrl = leftOverUrl;
+            this.aux = aux;
+        }
+        Object.defineProperty(_MatchResult.prototype, "outlet", {
+            get: function () {
+                return this.consumedUrlSegments.length === 0 || isBlank(this.consumedUrlSegments[0].outlet) ?
+                    DEFAULT_OUTLET_NAME :
+                    this.consumedUrlSegments[0].outlet;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return _MatchResult;
+    }());
+    function _readMetadata(componentType) {
+        var metadata = reflector.annotations(componentType).filter(function (f) { return f instanceof RoutesMetadata; });
+        return ListWrapper.first(metadata);
     }
-    /**
-     * @internal
-     */
     var RouterOutletMap = (function () {
         function RouterOutletMap() {
             /** @internal */
@@ -1122,7 +1199,7 @@ var __extends = (this && this.__extends) || function (d, b) {
             this._routerOutletMap = _routerOutletMap;
             this._location = _location;
             this._changes = new EventEmitter();
-            this._prevTree = this._createInitialTree();
+            this._routeTree = createEmptyRouteTree(this._rootComponentType);
             this._setUpLocationChangeListener();
             this.navigateByUrl(this._location.path());
         }
@@ -1138,7 +1215,7 @@ var __extends = (this && this.__extends) || function (d, b) {
             /**
              * Returns the current route tree.
              */
-            get: function () { return this._prevTree; },
+            get: function () { return this._routeTree; },
             enumerable: true,
             configurable: true
         });
@@ -1211,32 +1288,36 @@ var __extends = (this && this.__extends) || function (d, b) {
          * ```
          */
         Router.prototype.createUrlTree = function (commands, segment) {
-            var s = isPresent(segment) ? segment : this._prevTree.root;
-            return link(s, this._prevTree, this.urlTree, commands);
+            var s = isPresent(segment) ? segment : this._routeTree.root;
+            return link(s, this._routeTree, this.urlTree, commands);
         };
         /**
          * Serializes a {@link UrlTree} into a string.
          */
         Router.prototype.serializeUrl = function (url) { return this._urlSerializer.serialize(url); };
-        Router.prototype._createInitialTree = function () {
-            var root = new RouteSegment([new UrlSegment("", {}, null)], {}, DEFAULT_OUTLET_NAME, this._rootComponentType, null);
-            return new RouteTree(new TreeNode(root, []));
-        };
         Router.prototype._setUpLocationChangeListener = function () {
             var _this = this;
-            this._locationSubscription = this._location.subscribe(function (change) { _this._navigate(_this._urlSerializer.parse(change['url'])); });
+            this._locationSubscription = this._location.subscribe(function (change) { _this._navigate(_this._urlSerializer.parse(change['url']), change['pop']); });
         };
-        Router.prototype._navigate = function (url) {
+        Router.prototype._navigate = function (url, preventPushState) {
             var _this = this;
             this._urlTree = url;
-            return recognize(this._componentResolver, this._rootComponentType, url)
+            return recognize(this._componentResolver, this._rootComponentType, url, this._routeTree)
                 .then(function (currTree) {
-                return new _LoadSegments(currTree, _this._prevTree)
-                    .load(_this._routerOutletMap, _this._rootComponent)
+                return new _ActivateSegments(currTree, _this._routeTree)
+                    .activate(_this._routerOutletMap, _this._rootComponent)
                     .then(function (updated) {
                     if (updated) {
-                        _this._prevTree = currTree;
-                        _this._location.go(_this._urlSerializer.serialize(_this._urlTree));
+                        _this._routeTree = currTree;
+                        if (isBlank(preventPushState) || !preventPushState) {
+                            var path = _this._urlSerializer.serialize(_this._urlTree);
+                            if (_this._location.isCurrentPathEqualTo(path)) {
+                                _this._location.replaceState(path);
+                            }
+                            else {
+                                _this._location.go(path);
+                            }
+                        }
                         _this._changes.emit(null);
                     }
                 });
@@ -1244,39 +1325,38 @@ var __extends = (this && this.__extends) || function (d, b) {
         };
         return Router;
     }());
-    var _LoadSegments = (function () {
-        function _LoadSegments(currTree, prevTree) {
+    var _ActivateSegments = (function () {
+        function _ActivateSegments(currTree, prevTree) {
             this.currTree = currTree;
             this.prevTree = prevTree;
             this.deactivations = [];
             this.performMutation = true;
         }
-        _LoadSegments.prototype.load = function (parentOutletMap, rootComponent) {
+        _ActivateSegments.prototype.activate = function (parentOutletMap, rootComponent) {
             var _this = this;
             var prevRoot = isPresent(this.prevTree) ? rootNode(this.prevTree) : null;
             var currRoot = rootNode(this.currTree);
-            return this.canDeactivate(currRoot, prevRoot, parentOutletMap, rootComponent)
-                .then(function (res) {
+            return this.canDeactivate(currRoot, prevRoot, parentOutletMap, rootComponent).then(function (res) {
                 _this.performMutation = true;
                 if (res) {
-                    _this.loadChildSegments(currRoot, prevRoot, parentOutletMap, [rootComponent]);
+                    _this.activateChildSegments(currRoot, prevRoot, parentOutletMap, [rootComponent]);
                 }
                 return res;
             });
         };
-        _LoadSegments.prototype.canDeactivate = function (currRoot, prevRoot, outletMap, rootComponent) {
+        _ActivateSegments.prototype.canDeactivate = function (currRoot, prevRoot, outletMap, rootComponent) {
             var _this = this;
             this.performMutation = false;
-            this.loadChildSegments(currRoot, prevRoot, outletMap, [rootComponent]);
+            this.activateChildSegments(currRoot, prevRoot, outletMap, [rootComponent]);
             var allPaths = PromiseWrapper.all(this.deactivations.map(function (r) { return _this.checkCanDeactivatePath(r); }));
             return allPaths.then(function (values) { return values.filter(function (v) { return v; }).length === values.length; });
         };
-        _LoadSegments.prototype.checkCanDeactivatePath = function (path) {
+        _ActivateSegments.prototype.checkCanDeactivatePath = function (path) {
             var _this = this;
             var curr = PromiseWrapper.resolve(true);
             var _loop_2 = function(p) {
                 curr = curr.then(function (_) {
-                    if (hasLifecycleHook("routerCanDeactivate", p)) {
+                    if (hasLifecycleHook('routerCanDeactivate', p)) {
                         return p.routerCanDeactivate(_this.prevTree, _this.currTree);
                     }
                     else {
@@ -1290,45 +1370,43 @@ var __extends = (this && this.__extends) || function (d, b) {
             }
             return curr;
         };
-        _LoadSegments.prototype.loadChildSegments = function (currNode, prevNode, outletMap, components) {
+        _ActivateSegments.prototype.activateChildSegments = function (currNode, prevNode, outletMap, components) {
             var _this = this;
-            var prevChildren = isPresent(prevNode) ?
-                prevNode.children.reduce(function (m, c) {
-                    m[c.value.outlet] = c;
-                    return m;
-                }, {}) :
-                {};
+            var prevChildren = isPresent(prevNode) ? prevNode.children.reduce(function (m, c) {
+                m[c.value.outlet] = c;
+                return m;
+            }, {}) : {};
             currNode.children.forEach(function (c) {
-                _this.loadSegments(c, prevChildren[c.value.outlet], outletMap, components);
+                _this.activateSegments(c, prevChildren[c.value.outlet], outletMap, components);
                 StringMapWrapper.delete(prevChildren, c.value.outlet);
             });
-            StringMapWrapper.forEach(prevChildren, function (v, k) { return _this.unloadOutlet(outletMap._outlets[k], components); });
+            StringMapWrapper.forEach(prevChildren, function (v /** TODO #9100 */, k /** TODO #9100 */) { return _this.deactivateOutlet(outletMap._outlets[k], components); });
         };
-        _LoadSegments.prototype.loadSegments = function (currNode, prevNode, parentOutletMap, components) {
+        _ActivateSegments.prototype.activateSegments = function (currNode, prevNode, parentOutletMap, components) {
             var curr = currNode.value;
             var prev = isPresent(prevNode) ? prevNode.value : null;
             var outlet = this.getOutlet(parentOutletMap, currNode.value);
-            if (equalSegments(curr, prev)) {
-                this.loadChildSegments(currNode, prevNode, outlet.outletMap, components.concat([outlet.loadedComponent]));
+            if (curr === prev) {
+                this.activateChildSegments(currNode, prevNode, outlet.outletMap, components.concat([outlet.component]));
             }
             else {
-                this.unloadOutlet(outlet, components);
+                this.deactivateOutlet(outlet, components);
                 if (this.performMutation) {
                     var outletMap = new RouterOutletMap();
-                    var loadedComponent = this.loadNewSegment(outletMap, curr, prev, outlet);
-                    this.loadChildSegments(currNode, prevNode, outletMap, components.concat([loadedComponent]));
+                    var component = this.activateNewSegments(outletMap, curr, prev, outlet);
+                    this.activateChildSegments(currNode, prevNode, outletMap, components.concat([component]));
                 }
             }
         };
-        _LoadSegments.prototype.loadNewSegment = function (outletMap, curr, prev, outlet) {
-            var resolved = _angular_core.ReflectiveInjector.resolve([_angular_core.provide(RouterOutletMap, { useValue: outletMap }), _angular_core.provide(RouteSegment, { useValue: curr })]);
-            var ref = outlet.load(routeSegmentComponentFactory(curr), resolved, outletMap);
-            if (hasLifecycleHook("routerOnActivate", ref.instance)) {
+        _ActivateSegments.prototype.activateNewSegments = function (outletMap, curr, prev, outlet) {
+            var resolved = _angular_core.ReflectiveInjector.resolve([{ provide: RouterOutletMap, useValue: outletMap }, { provide: RouteSegment, useValue: curr }]);
+            var ref = outlet.activate(routeSegmentComponentFactory(curr), resolved, outletMap);
+            if (hasLifecycleHook('routerOnActivate', ref.instance)) {
                 ref.instance.routerOnActivate(curr, prev, this.currTree, this.prevTree);
             }
             return ref.instance;
         };
-        _LoadSegments.prototype.getOutlet = function (outletMap, segment) {
+        _ActivateSegments.prototype.getOutlet = function (outletMap, segment) {
             var outlet = outletMap._outlets[segment.outlet];
             if (isBlank(outlet)) {
                 if (segment.outlet == DEFAULT_OUTLET_NAME) {
@@ -1340,21 +1418,154 @@ var __extends = (this && this.__extends) || function (d, b) {
             }
             return outlet;
         };
-        _LoadSegments.prototype.unloadOutlet = function (outlet, components) {
+        _ActivateSegments.prototype.deactivateOutlet = function (outlet, components) {
             var _this = this;
-            if (isPresent(outlet) && outlet.isLoaded) {
-                StringMapWrapper.forEach(outlet.outletMap._outlets, function (v, k) { return _this.unloadOutlet(v, components); });
+            if (isPresent(outlet) && outlet.isActivated) {
+                StringMapWrapper.forEach(outlet.outletMap._outlets, function (v /** TODO #9100 */, k /** TODO #9100 */) { return _this.deactivateOutlet(v, components); });
                 if (this.performMutation) {
-                    outlet.unload();
+                    outlet.deactivate();
                 }
                 else {
-                    this.deactivations.push(components.concat([outlet.loadedComponent]));
+                    this.deactivations.push(components.concat([outlet.component]));
                 }
             }
         };
-        return _LoadSegments;
+        return _ActivateSegments;
     }());
-    var makeDecorator = _angular_core.__core_private__.makeDecorator;
+    var RouterLink = (function () {
+        function RouterLink(_routeSegment, _router, _locationStrategy) {
+            var _this = this;
+            this._routeSegment = _routeSegment;
+            this._router = _router;
+            this._locationStrategy = _locationStrategy;
+            this._commands = [];
+            this.isActive = false;
+            // because auxiliary links take existing primary and auxiliary routes into account,
+            // we need to update the link whenever params or other routes change.
+            this._subscription =
+                ObservableWrapper.subscribe(_router.changes, function (_) { _this._updateTargetUrlAndHref(); });
+        }
+        RouterLink.prototype.ngOnDestroy = function () { ObservableWrapper.dispose(this._subscription); };
+        Object.defineProperty(RouterLink.prototype, "routerLink", {
+            set: function (data) {
+                if (isArray(data)) {
+                    this._commands = data;
+                }
+                else {
+                    this._commands = [data];
+                }
+                this._updateTargetUrlAndHref();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        RouterLink.prototype.onClick = function (button, ctrlKey, metaKey) {
+            if (button != 0 || ctrlKey || metaKey) {
+                return true;
+            }
+            if (isString(this.target) && this.target != '_self') {
+                return true;
+            }
+            this._router.navigate(this._commands, this._routeSegment);
+            return false;
+        };
+        RouterLink.prototype._updateTargetUrlAndHref = function () {
+            var tree = this._router.createUrlTree(this._commands, this._routeSegment);
+            if (isPresent(tree)) {
+                this.href = this._locationStrategy.prepareExternalUrl(this._router.serializeUrl(tree));
+                this.isActive = this._router.urlTree.contains(tree);
+            }
+            else {
+                this.isActive = false;
+            }
+        };
+        return RouterLink;
+    }());
+    /** @nocollapse */
+    RouterLink.decorators = [
+        { type: _angular_core.Directive, args: [{ selector: '[routerLink]' },] },
+    ];
+    /** @nocollapse */
+    RouterLink.ctorParameters = [
+        { type: RouteSegment, },
+        { type: Router, },
+        { type: _angular_common.LocationStrategy, },
+    ];
+    /** @nocollapse */
+    RouterLink.propDecorators = {
+        'target': [{ type: _angular_core.Input },],
+        'href': [{ type: _angular_core.HostBinding },],
+        'isActive': [{ type: _angular_core.HostBinding, args: ['class.router-link-active',] },],
+        'routerLink': [{ type: _angular_core.Input },],
+        'onClick': [{ type: _angular_core.HostListener, args: ['click', ['$event.button', '$event.ctrlKey', '$event.metaKey'],] },],
+    };
+    var RouterOutlet = (function () {
+        function RouterOutlet(parentOutletMap, _location, name) {
+            this._location = _location;
+            parentOutletMap.registerOutlet(isBlank(name) ? DEFAULT_OUTLET_NAME : name, this);
+        }
+        RouterOutlet.prototype.deactivate = function () {
+            this._activated.destroy();
+            this._activated = null;
+        };
+        Object.defineProperty(RouterOutlet.prototype, "component", {
+            /**
+             * Returns the loaded component.
+             */
+            get: function () { return isPresent(this._activated) ? this._activated.instance : null; },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(RouterOutlet.prototype, "isActivated", {
+            /**
+             * Returns true is the outlet is not empty.
+             */
+            get: function () { return isPresent(this._activated); },
+            enumerable: true,
+            configurable: true
+        });
+        /**
+         * Called by the Router to instantiate a new component.
+         */
+        RouterOutlet.prototype.activate = function (factory, providers, outletMap) {
+            this.outletMap = outletMap;
+            var inj = _angular_core.ReflectiveInjector.fromResolvedProviders(providers, this._location.parentInjector);
+            this._activated = this._location.createComponent(factory, this._location.length, inj, []);
+            return this._activated;
+        };
+        return RouterOutlet;
+    }());
+    /** @nocollapse */
+    RouterOutlet.decorators = [
+        { type: _angular_core.Directive, args: [{ selector: 'router-outlet' },] },
+    ];
+    /** @nocollapse */
+    RouterOutlet.ctorParameters = [
+        { type: RouterOutletMap, },
+        { type: _angular_core.ViewContainerRef, },
+        { type: undefined, decorators: [{ type: _angular_core.Attribute, args: ['name',] },] },
+    ];
+    /**
+     * A list of directives. To use the router directives like {@link RouterOutlet} and
+     * {@link RouterLink}, add this to your `directives` array in the {@link View} decorator of your
+     * component.
+     *
+     * ```
+     * import {Component} from '@angular/core';
+     * import {ROUTER_DIRECTIVES, Routes} from '@angular/router';
+     *
+     * @Component({directives: [ROUTER_DIRECTIVES]})
+     * @Routes([
+     *  {...},
+     * ])
+     * class AppCmp {
+     *    // ...
+     * }
+     *
+     * bootstrap(AppCmp);
+     * ```
+     */
+    var ROUTER_DIRECTIVES = [RouterOutlet, RouterLink];
     /**
      * Defines routes for a given component.
      *
@@ -1390,7 +1601,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function _serializeUrlTreeNodes(nodes) {
         var main = nodes[0].value.toString();
         var auxNodes = nodes.slice(1);
-        var aux = auxNodes.length > 0 ? "(" + auxNodes.map(_serializeUrlTreeNode).join("//") + ")" : "";
+        var aux = auxNodes.length > 0 ? "(" + auxNodes.map(_serializeUrlTreeNode).join("//") + ")" : '';
         var children = _serializeChildren(nodes[0]);
         return "" + main + aux + children;
     }
@@ -1399,7 +1610,7 @@ var __extends = (this && this.__extends) || function (d, b) {
             return "/" + _serializeUrlTreeNodes(node.children);
         }
         else {
-            return "";
+            return '';
         }
     }
     var SEGMENT_RE = RegExpWrapper.create('^[^\\/\\(\\)\\?;=&#]+');
@@ -1445,8 +1656,8 @@ var __extends = (this && this.__extends) || function (d, b) {
             }
             var path = matchUrlSegment(this._remaining);
             this.capture(path);
-            if (path.indexOf(":") > -1) {
-                var parts = path.split(":");
+            if (path.indexOf(':') > -1) {
+                var parts = path.split(':');
                 outletName = parts[0];
                 path = parts[1];
             }
@@ -1491,7 +1702,7 @@ var __extends = (this && this.__extends) || function (d, b) {
                 return;
             }
             this.capture(key);
-            var value = "true";
+            var value = 'true';
             if (this.peekStartsWith('=')) {
                 this.capture('=');
                 var valueMatch = matchUrlSegment(this._remaining);
@@ -1508,7 +1719,7 @@ var __extends = (this && this.__extends) || function (d, b) {
                 return;
             }
             this.capture(key);
-            var value = "true";
+            var value = 'true';
             if (this.peekStartsWith('=')) {
                 this.capture('=');
                 var valueMatch = matchUrlQueryParamValue(this._remaining);
@@ -1523,7 +1734,7 @@ var __extends = (this && this.__extends) || function (d, b) {
             var segments = [];
             this.capture('(');
             while (!this.peekStartsWith(')') && this._remaining.length > 0) {
-                segments = segments.concat(this.parseSegments("aux"));
+                segments = segments.concat(this.parseSegments('aux'));
                 if (this.peekStartsWith('//')) {
                     this.capture('//');
                 }
@@ -1545,18 +1756,22 @@ var __extends = (this && this.__extends) || function (d, b) {
             useFactory: routerFactory,
             deps: /*@ts2dart_const*/ [_angular_core.ApplicationRef, _angular_core.ComponentResolver, RouterUrlSerializer, RouterOutletMap, _angular_common.Location],
         },
+        /*@ts2dart_Provider*/ { provide: RouteSegment, useFactory: routeSegmentFactory, deps: [Router] }
     ];
     function routerFactory(app, componentResolver, urlSerializer, routerOutletMap, location) {
         if (app.componentTypes.length == 0) {
-            throw new _angular_core.BaseException("Bootstrap at least one component before injecting Router.");
+            throw new _angular_core.BaseException('Bootstrap at least one component before injecting Router.');
         }
         // TODO: vsavkin this should not be null
         var router = new Router(null, app.componentTypes[0], componentResolver, urlSerializer, routerOutletMap, location);
         app.registerDisposeListener(function () { return router.dispose(); });
         return router;
     }
+    function routeSegmentFactory(router) {
+        return router.routeTree.root;
+    }
     /**
-     * A list of {@link Provider}s. To use the router, you must add this to your application.
+     * A list of providers. To use the router, you must add this to your application.
      *
      * ```
      * import {Component} from '@angular/core';
@@ -1577,146 +1792,21 @@ var __extends = (this && this.__extends) || function (d, b) {
      * bootstrap(AppCmp, [ROUTER_PROVIDERS]);
      * ```
      */
-    var ROUTER_PROVIDERS = [
-        ROUTER_PROVIDERS_COMMON,
-        /*@ts2dart_Provider*/ { provide: _angular_common.PlatformLocation, useClass: _angular_platformBrowser.BrowserPlatformLocation },
-    ];
-    var RouterOutlet = (function () {
-        function RouterOutlet(parentOutletMap, _location, name) {
-            this._location = _location;
-            parentOutletMap.registerOutlet(isBlank(name) ? DEFAULT_OUTLET_NAME : name, this);
-        }
-        RouterOutlet.prototype.unload = function () {
-            this._loaded.destroy();
-            this._loaded = null;
-        };
-        Object.defineProperty(RouterOutlet.prototype, "loadedComponent", {
-            /**
-             * Returns the loaded component.
-             */
-            get: function () { return isPresent(this._loaded) ? this._loaded.instance : null; },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(RouterOutlet.prototype, "isLoaded", {
-            /**
-             * Returns true is the outlet is not empty.
-             */
-            get: function () { return isPresent(this._loaded); },
-            enumerable: true,
-            configurable: true
-        });
-        /**
-         * Called by the Router to instantiate a new component.
-         */
-        RouterOutlet.prototype.load = function (factory, providers, outletMap) {
-            this.outletMap = outletMap;
-            var inj = _angular_core.ReflectiveInjector.fromResolvedProviders(providers, this._location.parentInjector);
-            this._loaded = this._location.createComponent(factory, this._location.length, inj, []);
-            return this._loaded;
-        };
-        return RouterOutlet;
-    }());
-    RouterOutlet.decorators = [
-        { type: _angular_core.Directive, args: [{ selector: 'router-outlet' },] },
-    ];
-    RouterOutlet.ctorParameters = [
-        { type: RouterOutletMap, },
-        { type: _angular_core.ViewContainerRef, },
-        { type: undefined, decorators: [{ type: _angular_core.Attribute, args: ['name',] },] },
-    ];
-    var RouterLink = (function () {
-        function RouterLink(_routeSegment, _router) {
-            var _this = this;
-            this._routeSegment = _routeSegment;
-            this._router = _router;
-            this._commands = [];
-            this.isActive = false;
-            // because auxiliary links take existing primary and auxiliary routes into account,
-            // we need to update the link whenever params or other routes change.
-            this._subscription =
-                ObservableWrapper.subscribe(_router.changes, function (_) { _this._updateTargetUrlAndHref(); });
-        }
-        RouterLink.prototype.ngOnDestroy = function () { ObservableWrapper.dispose(this._subscription); };
-        Object.defineProperty(RouterLink.prototype, "routerLink", {
-            set: function (data) {
-                if (isArray(data)) {
-                    this._commands = data;
-                }
-                else {
-                    this._commands = [data];
-                }
-                this._updateTargetUrlAndHref();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        RouterLink.prototype.onClick = function () {
-            // If no target, or if target is _self, prevent default browser behavior
-            if (!isString(this.target) || this.target == '_self') {
-                this._router.navigate(this._commands, this._routeSegment);
-                return false;
-            }
-            return true;
-        };
-        RouterLink.prototype._updateTargetUrlAndHref = function () {
-            var tree = this._router.createUrlTree(this._commands, this._routeSegment);
-            if (isPresent(tree)) {
-                this.href = this._router.serializeUrl(tree);
-                this.isActive = this._router.urlTree.contains(tree);
-            }
-            else {
-                this.isActive = false;
-            }
-        };
-        return RouterLink;
-    }());
-    RouterLink.decorators = [
-        { type: _angular_core.Directive, args: [{ selector: '[routerLink]' },] },
-    ];
-    RouterLink.ctorParameters = [
-        { type: RouteSegment, decorators: [{ type: _angular_core.Optional },] },
-        { type: Router, },
-    ];
-    RouterLink.propDecorators = {
-        'target': [{ type: _angular_core.Input },],
-        'href': [{ type: _angular_core.HostBinding },],
-        'isActive': [{ type: _angular_core.HostBinding, args: ['class.router-link-active',] },],
-        'routerLink': [{ type: _angular_core.Input },],
-        'onClick': [{ type: _angular_core.HostListener, args: ["click",] },],
-    };
-    /**
-     * A list of directives. To use the router directives like {@link RouterOutlet} and
-     * {@link RouterLink}, add this to your `directives` array in the {@link View} decorator of your
-     * component.
-     *
-     * ```
-     * import {Component} from '@angular/core';
-     * import {ROUTER_DIRECTIVES, Routes} from '@angular/router-deprecated';
-     *
-     * @Component({directives: [ROUTER_DIRECTIVES]})
-     * @RouteConfig([
-     *  {...},
-     * ])
-     * class AppCmp {
-     *    // ...
-     * }
-     *
-     * bootstrap(AppCmp);
-     * ```
-     */
-    var ROUTER_DIRECTIVES = [RouterOutlet, RouterLink];
+    // TODO: merge with router_providers_common.ts
+    var ROUTER_PROVIDERS = [ROUTER_PROVIDERS_COMMON];
     exports.ROUTER_DIRECTIVES = ROUTER_DIRECTIVES;
+    exports.RouterLink = RouterLink;
+    exports.RouterOutlet = RouterOutlet;
+    exports.Routes = Routes;
+    exports.Route = Route;
     exports.Router = Router;
     exports.RouterOutletMap = RouterOutletMap;
+    exports.ROUTER_PROVIDERS = ROUTER_PROVIDERS;
+    exports.DefaultRouterUrlSerializer = DefaultRouterUrlSerializer;
+    exports.RouterUrlSerializer = RouterUrlSerializer;
     exports.RouteSegment = RouteSegment;
-    exports.UrlSegment = UrlSegment;
+    exports.RouteTree = RouteTree;
     exports.Tree = Tree;
+    exports.UrlSegment = UrlSegment;
     exports.UrlTree = UrlTree;
-    exports.RouteTree = RouteTree;
-    exports.Routes = Routes;
-    exports.Route = Route;
-    exports.RouterUrlSerializer = RouterUrlSerializer;
-    exports.DefaultRouterUrlSerializer = DefaultRouterUrlSerializer;
-    exports.ROUTER_PROVIDERS = ROUTER_PROVIDERS;
 }));