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

package/src/recognize.js

@@ -1,22 +1,22 @@
 "use strict";
-var segments_1 = require('./segments');
-var metadata_1 = require('./metadata/metadata');
-var lang_1 = require('./facade/lang');
-var collection_1 = require('./facade/collection');
-var promise_1 = require('./facade/promise');
 var core_1 = require('@angular/core');
 var constants_1 = require('./constants');
-var core_2 = require('@angular/core');
-// TODO: vsavkin: recognize should take the old tree and merge it
-function recognize(componentResolver, type, url) {
-    var matched = new _MatchResult(type, [url.root], {}, segments_1.rootNode(url).children, []);
-    return _constructSegment(componentResolver, matched).then(function (roots) { return new segments_1.RouteTree(roots[0]); });
+var core_private_1 = require('./core_private');
+var collection_1 = require('./facade/collection');
+var lang_1 = require('./facade/lang');
+var promise_1 = require('./facade/promise');
+var metadata_1 = require('./metadata/metadata');
+var segments_1 = require('./segments');
+function recognize(componentResolver, rootComponent, url, existingTree) {
+    var matched = new _MatchResult(rootComponent, [url.root], {}, segments_1.rootNode(url).children, []);
+    return _constructSegment(componentResolver, matched, segments_1.rootNode(existingTree))
+        .then(function (roots) { return new segments_1.RouteTree(roots[0]); });
 }
 exports.recognize = recognize;
-function _recognize(componentResolver, parentType, url) {
-    var metadata = _readMetadata(parentType); // should read from the factory instead
+function _recognize(componentResolver, parentComponent, url, existingSegments) {
+    var metadata = _readMetadata(parentComponent); // should read from the factory instead
     if (lang_1.isBlank(metadata)) {
-        throw new core_1.BaseException("Component '" + lang_1.stringify(parentType) + "' does not have route configuration");
+        throw new core_1.BaseException("Component '" + lang_1.stringify(parentComponent) + "' does not have route configuration");
     }
     var match;
     try {
@@ -25,49 +25,60 @@ function _recognize(componentResolver, parentType, url) {
     catch (e) {
         return promise_1.PromiseWrapper.reject(e, null);
     }
-    var main = _constructSegment(componentResolver, match);
-    var aux = _recognizeMany(componentResolver, parentType, match.aux).then(_checkOutletNameUniqueness);
+    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 promise_1.PromiseWrapper.all([main, aux]).then(collection_1.ListWrapper.flatten);
 }
-function _recognizeMany(componentResolver, parentType, urls) {
-    var recognized = urls.map(function (u) { return _recognize(componentResolver, parentType, u); });
+function _recognizeMany(componentResolver, parentComponent, urls, existingSegments) {
+    var recognized = urls.map(function (u) { return _recognize(componentResolver, parentComponent, u, existingSegments); });
     return promise_1.PromiseWrapper.all(recognized).then(collection_1.ListWrapper.flatten);
 }
-function _constructSegment(componentResolver, matched) {
-    return componentResolver.resolveComponent(matched.component)
-        .then(function (factory) {
-        var urlOutlet = matched.consumedUrlSegments.length === 0 ||
-            lang_1.isBlank(matched.consumedUrlSegments[0].outlet) ?
-            constants_1.DEFAULT_OUTLET_NAME :
-            matched.consumedUrlSegments[0].outlet;
-        var segment = new segments_1.RouteSegment(matched.consumedUrlSegments, matched.parameters, urlOutlet, matched.component, factory);
+function _constructSegment(componentResolver, matched, existingSegment) {
+    return componentResolver.resolveComponent(matched.component).then(function (factory) {
+        var segment = _createOrReuseSegment(matched, factory, existingSegment);
+        var existingChildren = lang_1.isPresent(existingSegment) ? existingSegment.children : [];
         if (matched.leftOverUrl.length > 0) {
-            return _recognizeMany(componentResolver, matched.component, matched.leftOverUrl)
+            return _recognizeMany(componentResolver, factory.componentType, matched.leftOverUrl, existingChildren)
                 .then(function (children) { return [new segments_1.TreeNode(segment, children)]; });
         }
         else {
-            return _recognizeLeftOvers(componentResolver, matched.component)
+            return _recognizeLeftOvers(componentResolver, factory.componentType, existingChildren)
                 .then(function (children) { return [new segments_1.TreeNode(segment, children)]; });
         }
     });
 }
-function _recognizeLeftOvers(componentResolver, parentType) {
-    return componentResolver.resolveComponent(parentType)
-        .then(function (factory) {
-        var metadata = _readMetadata(parentType);
+function _createOrReuseSegment(matched, factory, segmentNode) {
+    var segment = lang_1.isPresent(segmentNode) ? segmentNode.value : null;
+    if (lang_1.isPresent(segment) && segments_1.equalUrlSegments(segment.urlSegments, matched.consumedUrlSegments) &&
+        collection_1.StringMapWrapper.equals(segment.parameters, matched.parameters) &&
+        segment.outlet == matched.outlet && factory.componentType == segment.type) {
+        return segment;
+    }
+    else {
+        return new segments_1.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 (lang_1.isBlank(metadata)) {
             return [];
         }
-        var r = metadata.routes.filter(function (r) { return r.path == "" || r.path == "/"; });
+        var r = metadata.routes.filter(function (r) { return r.path == '' || r.path == '/'; });
         if (r.length === 0) {
             return promise_1.PromiseWrapper.resolve([]);
         }
         else {
-            return _recognizeLeftOvers(componentResolver, r[0].component)
+            var segmentsWithMatchingOutlet = existingSegments.filter(function (r) { return r.value.outlet == constants_1.DEFAULT_OUTLET_NAME; });
+            var segmentWithMatchingOutlet_1 = segmentsWithMatchingOutlet.length > 0 ? segmentsWithMatchingOutlet[0] : null;
+            var existingChildren = lang_1.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 = new segments_1.RouteSegment([], {}, constants_1.DEFAULT_OUTLET_NAME, r[0].component, factory);
+                return componentResolver.resolveComponent(r[0].component).then(function (factory) {
+                    var segment = _createOrReuseSegment(new _MatchResult(r[0].component, [], {}, [], []), factory, segmentWithMatchingOutlet_1);
                     return [new segments_1.TreeNode(segment, children)];
                 });
             });
@@ -82,15 +93,15 @@ function _match(metadata, url) {
             return matchingResult;
         }
     }
-    var availableRoutes = metadata.routes.map(function (r) { return ("'" + r.path + "'"); }).join(", ");
+    var availableRoutes = metadata.routes.map(function (r) { return ("'" + r.path + "'"); }).join(', ');
     throw new core_1.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 == "*") {
+    var path = route.path.startsWith('/') ? route.path.substring(1) : route.path;
+    if (path == '*') {
         return new _MatchResult(route.component, [], null, [], []);
     }
-    var parts = path.split("/");
+    var parts = path.split('/');
     var positionalParams = {};
     var consumedUrlSegments = [];
     var lastParent = null;
@@ -102,7 +113,7 @@ function _matchWithParts(route, url) {
         var p_1 = parts[i];
         var isLastSegment = i === parts.length - 1;
         var isLastParent = i === parts.length - 2;
-        var isPosParam = p_1.startsWith(":");
+        var isPosParam = p_1.startsWith(':');
         if (!isPosParam && p_1 != current.value.segment)
             return null;
         if (isLastSegment) {
@@ -143,10 +154,19 @@ var _MatchResult = (function () {
         this.leftOverUrl = leftOverUrl;
         this.aux = aux;
     }
+    Object.defineProperty(_MatchResult.prototype, "outlet", {
+        get: function () {
+            return this.consumedUrlSegments.length === 0 || lang_1.isBlank(this.consumedUrlSegments[0].outlet) ?
+                constants_1.DEFAULT_OUTLET_NAME :
+                this.consumedUrlSegments[0].outlet;
+        },
+        enumerable: true,
+        configurable: true
+    });
     return _MatchResult;
 }());
 function _readMetadata(componentType) {
-    var metadata = core_2.reflector.annotations(componentType).filter(function (f) { return f instanceof metadata_1.RoutesMetadata; });
+    var metadata = core_private_1.reflector.annotations(componentType).filter(function (f) { return f instanceof metadata_1.RoutesMetadata; });
     return collection_1.ListWrapper.first(metadata);
 }
 //# sourceMappingURL=recognize.js.map

package/src/recognize.js.map

@@ -1 +1 @@
-{"version":3,"file":"recognize.js","sourceRoot":"","sources":["../../../../modules/@angular/router/src/recognize.ts"],"names":[],"mappings":"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","sourcesContent":["interface DecoratorInvocation {\n    type: Function;\n    args?: any[];\n  }\n  import {RouteSegment, UrlSegment, Tree, TreeNode, rootNode, UrlTree, RouteTree} from './segments';\nimport {RoutesMetadata, RouteMetadata} from './metadata/metadata';\nimport {Type, isBlank, isPresent, stringify} from './facade/lang';\nimport {ListWrapper, StringMapWrapper} from './facade/collection';\nimport {PromiseWrapper} from './facade/promise';\nimport {BaseException} from '@angular/core';\nimport {ComponentResolver} from '@angular/core';\nimport {DEFAULT_OUTLET_NAME} from './constants';\nimport {reflector} from '@angular/core';\n\n// TODO: vsavkin: recognize should take the old tree and merge it\nexport function recognize(componentResolver: ComponentResolver, type: Type,\n                          url: UrlTree): Promise<RouteTree> {\n  let matched = new _MatchResult(type, [url.root], {}, rootNode(url).children, []);\n  return _constructSegment(componentResolver, matched).then(roots => new RouteTree(roots[0]));\n}\n\nfunction _recognize(componentResolver: ComponentResolver, parentType: Type,\n                    url: TreeNode<UrlSegment>): Promise<TreeNode<RouteSegment>[]> {\n  let metadata = _readMetadata(parentType);  // should read from the factory instead\n  if (isBlank(metadata)) {\n    throw new BaseException(\n        `Component '${stringify(parentType)}' does not have route configuration`);\n  }\n\n  let match;\n  try {\n    match = _match(metadata, url);\n  } catch (e) {\n    return PromiseWrapper.reject(e, null);\n  }\n\n  let main = _constructSegment(componentResolver, match);\n  let aux =\n      _recognizeMany(componentResolver, parentType, match.aux).then(_checkOutletNameUniqueness);\n  return PromiseWrapper.all([main, aux]).then(ListWrapper.flatten);\n}\n\nfunction _recognizeMany(componentResolver: ComponentResolver, parentType: Type,\n                        urls: TreeNode<UrlSegment>[]): Promise<TreeNode<RouteSegment>[]> {\n  let recognized = urls.map(u => _recognize(componentResolver, parentType, u));\n  return PromiseWrapper.all(recognized).then(ListWrapper.flatten);\n}\n\nfunction _constructSegment(componentResolver: ComponentResolver,\n                           matched: _MatchResult): Promise<TreeNode<RouteSegment>[]> {\n  return componentResolver.resolveComponent(matched.component)\n      .then(factory => {\n        let urlOutlet = matched.consumedUrlSegments.length === 0 ||\n                                isBlank(matched.consumedUrlSegments[0].outlet) ?\n                            DEFAULT_OUTLET_NAME :\n                            matched.consumedUrlSegments[0].outlet;\n\n        let segment = new RouteSegment(matched.consumedUrlSegments, matched.parameters, urlOutlet,\n                                       matched.component, factory);\n\n        if (matched.leftOverUrl.length > 0) {\n          return _recognizeMany(componentResolver, matched.component, matched.leftOverUrl)\n              .then(children => [new TreeNode<RouteSegment>(segment, children)]);\n        } else {\n          return _recognizeLeftOvers(componentResolver, matched.component)\n              .then(children => [new TreeNode<RouteSegment>(segment, children)]);\n        }\n      });\n}\n\nfunction _recognizeLeftOvers(componentResolver: ComponentResolver,\n                             parentType: Type): Promise<TreeNode<RouteSegment>[]> {\n  return componentResolver.resolveComponent(parentType)\n      .then(factory => {\n        let metadata = _readMetadata(parentType);\n        if (isBlank(metadata)) {\n          return [];\n        }\n\n        let r = (<any[]>metadata.routes).filter(r => r.path == \"\" || r.path == \"/\");\n        if (r.length === 0) {\n          return PromiseWrapper.resolve([]);\n        } else {\n          return _recognizeLeftOvers(componentResolver, r[0].component)\n              .then(children => {\n                return componentResolver.resolveComponent(r[0].component)\n                    .then(factory => {\n                      let segment =\n                          new RouteSegment([], {}, DEFAULT_OUTLET_NAME, r[0].component, factory);\n                      return [new TreeNode<RouteSegment>(segment, children)];\n                    });\n              });\n        }\n      });\n}\n\nfunction _match(metadata: RoutesMetadata, url: TreeNode<UrlSegment>): _MatchResult {\n  for (let r of metadata.routes) {\n    let matchingResult = _matchWithParts(r, url);\n    if (isPresent(matchingResult)) {\n      return matchingResult;\n    }\n  }\n  let availableRoutes = metadata.routes.map(r => `'${r.path}'`).join(\", \");\n  throw new BaseException(\n      `Cannot match any routes. Current segment: '${url.value}'. Available routes: [${availableRoutes}].`);\n}\n\nfunction _matchWithParts(route: RouteMetadata, url: TreeNode<UrlSegment>): _MatchResult {\n  let path = route.path.startsWith(\"/\") ? route.path.substring(1) : route.path;\n\n  if (path == \"*\") {\n    return new _MatchResult(route.component, [], null, [], []);\n  }\n\n  let parts = path.split(\"/\");\n  let positionalParams = {};\n  let consumedUrlSegments = [];\n\n  let lastParent: TreeNode<UrlSegment> = null;\n  let lastSegment: TreeNode<UrlSegment> = null;\n\n  let current = url;\n  for (let i = 0; i < parts.length; ++i) {\n    if (isBlank(current)) return null;\n\n    let p = parts[i];\n    let isLastSegment = i === parts.length - 1;\n    let isLastParent = i === parts.length - 2;\n    let isPosParam = p.startsWith(\":\");\n\n    if (!isPosParam && p != current.value.segment) return null;\n    if (isLastSegment) {\n      lastSegment = current;\n    }\n    if (isLastParent) {\n      lastParent = current;\n    }\n\n    if (isPosParam) {\n      positionalParams[p.substring(1)] = current.value.segment;\n    }\n\n    consumedUrlSegments.push(current.value);\n\n    current = ListWrapper.first(current.children);\n  }\n\n  let p = lastSegment.value.parameters;\n  let parameters =\n      <{[key: string]: string}>StringMapWrapper.merge(p, positionalParams);\n  let axuUrlSubtrees = isPresent(lastParent) ? lastParent.children.slice(1) : [];\n\n  return new _MatchResult(route.component, consumedUrlSegments, parameters, lastSegment.children,\n                          axuUrlSubtrees);\n}\n\nfunction _checkOutletNameUniqueness(nodes: TreeNode<RouteSegment>[]): TreeNode<RouteSegment>[] {\n  let names = {};\n  nodes.forEach(n => {\n    let segmentWithSameOutletName = names[n.value.outlet];\n    if (isPresent(segmentWithSameOutletName)) {\n      let p = segmentWithSameOutletName.stringifiedUrlSegments;\n      let c = n.value.stringifiedUrlSegments;\n      throw new BaseException(`Two segments cannot have the same outlet name: '${p}' and '${c}'.`);\n    }\n    names[n.value.outlet] = n.value;\n  });\n  return nodes;\n}\n\nclass _MatchResult {\n  constructor(public component: Type, public consumedUrlSegments: UrlSegment[],\n              public parameters: {[key: string]: string},\n              public leftOverUrl: TreeNode<UrlSegment>[], public aux: TreeNode<UrlSegment>[]) {}\n}\n\nfunction _readMetadata(componentType: Type) {\n  let metadata = reflector.annotations(componentType).filter(f => f instanceof RoutesMetadata);\n  return ListWrapper.first(metadata);\n}\n"]}
+{"version":3,"file":"recognize.js","sourceRoot":"","sources":["../../../../modules/@angular/router/src/recognize.ts"],"names":[],"mappings":"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","sourcesContent":["import {BaseException, ComponentFactory, ComponentResolver} from '@angular/core';\n\nimport {DEFAULT_OUTLET_NAME} from './constants';\nimport {reflector} from './core_private';\nimport {ListWrapper, StringMapWrapper} from './facade/collection';\nimport {Type, isBlank, isPresent, stringify} from './facade/lang';\nimport {PromiseWrapper} from './facade/promise';\nimport {RouteMetadata, RoutesMetadata} from './metadata/metadata';\nimport {RouteSegment, RouteTree, Tree, TreeNode, UrlSegment, UrlTree, equalUrlSegments, rootNode} from './segments';\n\nexport function recognize(\n    componentResolver: ComponentResolver, rootComponent: Type, url: UrlTree,\n    existingTree: RouteTree): Promise<RouteTree> {\n  let matched = new _MatchResult(rootComponent, [url.root], {}, rootNode(url).children, []);\n  return _constructSegment(componentResolver, matched, rootNode(existingTree))\n      .then(roots => new RouteTree(roots[0]));\n}\n\nfunction _recognize(\n    componentResolver: ComponentResolver, parentComponent: Type, url: TreeNode<UrlSegment>,\n    existingSegments: TreeNode<RouteSegment>[]): Promise<TreeNode<RouteSegment>[]> {\n  let metadata = _readMetadata(parentComponent);  // should read from the factory instead\n  if (isBlank(metadata)) {\n    throw new BaseException(\n        `Component '${stringify(parentComponent)}' does not have route configuration`);\n  }\n\n  let match: any /** TODO #9100 */;\n  try {\n    match = _match(metadata, url);\n  } catch (e) {\n    return PromiseWrapper.reject(e, null);\n  }\n\n  let segmentsWithRightOutlet = existingSegments.filter(r => r.value.outlet == match.outlet);\n  let segmentWithRightOutlet =\n      segmentsWithRightOutlet.length > 0 ? segmentsWithRightOutlet[0] : null;\n\n  let main = _constructSegment(componentResolver, match, segmentWithRightOutlet);\n  let aux = _recognizeMany(componentResolver, parentComponent, match.aux, existingSegments)\n                .then(_checkOutletNameUniqueness);\n  return PromiseWrapper.all([main, aux]).then(ListWrapper.flatten);\n}\n\nfunction _recognizeMany(\n    componentResolver: ComponentResolver, parentComponent: Type, urls: TreeNode<UrlSegment>[],\n    existingSegments: TreeNode<RouteSegment>[]): Promise<TreeNode<RouteSegment>[]> {\n  let recognized =\n      urls.map(u => _recognize(componentResolver, parentComponent, u, existingSegments));\n  return PromiseWrapper.all(recognized).then(ListWrapper.flatten);\n}\n\nfunction _constructSegment(\n    componentResolver: ComponentResolver, matched: _MatchResult,\n    existingSegment: TreeNode<RouteSegment>): Promise<TreeNode<RouteSegment>[]> {\n  return componentResolver.resolveComponent(matched.component).then(factory => {\n    let segment = _createOrReuseSegment(matched, factory, existingSegment);\n    let existingChildren = isPresent(existingSegment) ? existingSegment.children : [];\n\n    if (matched.leftOverUrl.length > 0) {\n      return _recognizeMany(\n                 componentResolver, factory.componentType, matched.leftOverUrl, existingChildren)\n          .then(children => [new TreeNode<RouteSegment>(segment, children)]);\n    } else {\n      return _recognizeLeftOvers(componentResolver, factory.componentType, existingChildren)\n          .then(children => [new TreeNode<RouteSegment>(segment, children)]);\n    }\n  });\n}\n\nfunction _createOrReuseSegment(\n    matched: _MatchResult, factory: ComponentFactory<any>,\n    segmentNode: TreeNode<RouteSegment>): RouteSegment {\n  let segment = isPresent(segmentNode) ? segmentNode.value : null;\n\n  if (isPresent(segment) && equalUrlSegments(segment.urlSegments, matched.consumedUrlSegments) &&\n      StringMapWrapper.equals(segment.parameters, matched.parameters) &&\n      segment.outlet == matched.outlet && factory.componentType == segment.type) {\n    return segment;\n  } else {\n    return new RouteSegment(\n        matched.consumedUrlSegments, matched.parameters, matched.outlet, factory.componentType,\n        factory);\n  }\n}\n\nfunction _recognizeLeftOvers(\n    componentResolver: ComponentResolver, parentComponent: Type,\n    existingSegments: TreeNode<RouteSegment>[]): Promise<TreeNode<RouteSegment>[]> {\n  return componentResolver.resolveComponent(parentComponent).then(factory => {\n    let metadata = _readMetadata(factory.componentType);\n    if (isBlank(metadata)) {\n      return [];\n    }\n\n    let r = (<any[]>metadata.routes).filter(r => r.path == '' || r.path == '/');\n    if (r.length === 0) {\n      return PromiseWrapper.resolve([]);\n    } else {\n      let segmentsWithMatchingOutlet =\n          existingSegments.filter(r => r.value.outlet == DEFAULT_OUTLET_NAME);\n      let segmentWithMatchingOutlet =\n          segmentsWithMatchingOutlet.length > 0 ? segmentsWithMatchingOutlet[0] : null;\n      let existingChildren =\n          isPresent(segmentWithMatchingOutlet) ? segmentWithMatchingOutlet.children : [];\n\n      return _recognizeLeftOvers(componentResolver, r[0].component, existingChildren)\n          .then(children => {\n            return componentResolver.resolveComponent(r[0].component).then(factory => {\n              let segment = _createOrReuseSegment(\n                  new _MatchResult(r[0].component, [], {}, [], []), factory,\n                  segmentWithMatchingOutlet);\n              return [new TreeNode<RouteSegment>(segment, children)];\n            });\n          });\n    }\n  });\n}\n\nfunction _match(metadata: RoutesMetadata, url: TreeNode<UrlSegment>): _MatchResult {\n  for (let r of metadata.routes) {\n    let matchingResult = _matchWithParts(r, url);\n    if (isPresent(matchingResult)) {\n      return matchingResult;\n    }\n  }\n  let availableRoutes = metadata.routes.map(r => `'${r.path}'`).join(', ');\n  throw new BaseException(\n      `Cannot match any routes. Current segment: '${url.value}'. Available routes: [${availableRoutes}].`);\n}\n\nfunction _matchWithParts(route: RouteMetadata, url: TreeNode<UrlSegment>): _MatchResult {\n  let path = route.path.startsWith('/') ? route.path.substring(1) : route.path;\n\n  if (path == '*') {\n    return new _MatchResult(route.component, [], null, [], []);\n  }\n\n  let parts = path.split('/');\n  let positionalParams = {};\n  let consumedUrlSegments: any[] /** TODO #9100 */ = [];\n\n  let lastParent: TreeNode<UrlSegment> = null;\n  let lastSegment: TreeNode<UrlSegment> = null;\n\n  let current = url;\n  for (let i = 0; i < parts.length; ++i) {\n    if (isBlank(current)) return null;\n\n    let p = parts[i];\n    let isLastSegment = i === parts.length - 1;\n    let isLastParent = i === parts.length - 2;\n    let isPosParam = p.startsWith(':');\n\n    if (!isPosParam && p != current.value.segment) return null;\n    if (isLastSegment) {\n      lastSegment = current;\n    }\n    if (isLastParent) {\n      lastParent = current;\n    }\n\n    if (isPosParam) {\n      (positionalParams as any /** TODO #9100 */)[p.substring(1)] = current.value.segment;\n    }\n\n    consumedUrlSegments.push(current.value);\n\n    current = ListWrapper.first(current.children);\n  }\n\n  let p = lastSegment.value.parameters;\n  let parameters = <{[key: string]: string}>StringMapWrapper.merge(p, positionalParams);\n  let axuUrlSubtrees = isPresent(lastParent) ? lastParent.children.slice(1) : [];\n\n  return new _MatchResult(\n      route.component, consumedUrlSegments, parameters, lastSegment.children, axuUrlSubtrees);\n}\n\nfunction _checkOutletNameUniqueness(nodes: TreeNode<RouteSegment>[]): TreeNode<RouteSegment>[] {\n  let names = {};\n  nodes.forEach(n => {\n    let segmentWithSameOutletName = (names as any /** TODO #9100 */)[n.value.outlet];\n    if (isPresent(segmentWithSameOutletName)) {\n      let p = segmentWithSameOutletName.stringifiedUrlSegments;\n      let c = n.value.stringifiedUrlSegments;\n      throw new BaseException(`Two segments cannot have the same outlet name: '${p}' and '${c}'.`);\n    }\n    (names as any /** TODO #9100 */)[n.value.outlet] = n.value;\n  });\n  return nodes;\n}\n\nclass _MatchResult {\n  constructor(\n      public component: Type|string, public consumedUrlSegments: UrlSegment[],\n      public parameters: {[key: string]: string}, public leftOverUrl: TreeNode<UrlSegment>[],\n      public aux: TreeNode<UrlSegment>[]) {}\n\n  get outlet(): string {\n    return this.consumedUrlSegments.length === 0 || isBlank(this.consumedUrlSegments[0].outlet) ?\n        DEFAULT_OUTLET_NAME :\n        this.consumedUrlSegments[0].outlet;\n  }\n}\n\nfunction _readMetadata(componentType: Type) {\n  let metadata = reflector.annotations(componentType).filter(f => f instanceof RoutesMetadata);\n  return ListWrapper.first(metadata);\n}\n\ninterface DecoratorInvocation {\n  type: Function;\n  args?: any[];\n}\n"]}

package/src/router.d.ts

@@ -1,18 +1,7 @@
-import { ComponentResolver } from '@angular/core';
 import { RouterOutlet } from './directives/router_outlet';
-import { Type } from './facade/lang';
 import { Observable } from './facade/async';
-import { RouterUrlSerializer } from './router_url_serializer';
-import { Location } from '@angular/common';
-import { RouteSegment, UrlTree, RouteTree } from './segments';
-/**
- * @internal
- */
+import { RouteSegment, RouteTree, UrlTree } from './segments';
 export declare class RouterOutletMap {
-    /** @internal */
-    _outlets: {
-        [name: string]: RouterOutlet;
-    };
     registerOutlet(name: string, outlet: RouterOutlet): void;
 }
 /**
@@ -28,14 +17,10 @@ export declare class Router {
     private _urlSerializer;
     private _routerOutletMap;
     private _location;
-    private _prevTree;
+    private _routeTree;
     private _urlTree;
     private _locationSubscription;
     private _changes;
-    /**
-     * @internal
-     */
-    constructor(_rootComponent: Object, _rootComponentType: Type, _componentResolver: ComponentResolver, _urlSerializer: RouterUrlSerializer, _routerOutletMap: RouterOutletMap, _location: Location);
     /**
      * Returns the current url tree.
      */
@@ -69,10 +54,6 @@ export declare class Router {
      * ```
      */
     navigate(commands: any[], segment?: RouteSegment): Promise<void>;
-    /**
-     * @internal
-     */
-    dispose(): void;
     /**
      * Applies an array of commands to the current url tree and creates
      * a new url tree.
@@ -109,7 +90,6 @@ export declare class Router {
      * Serializes a {@link UrlTree} into a string.
      */
     serializeUrl(url: UrlTree): string;
-    private _createInitialTree();
     private _setUpLocationChangeListener();
-    private _navigate(url);
+    private _navigate(url, preventPushState?);
 }

package/src/router.js

@@ -1,18 +1,13 @@
 "use strict";
 var core_1 = require('@angular/core');
-var lang_1 = require('./facade/lang');
-var collection_1 = require('./facade/collection');
+var constants_1 = require('./constants');
 var async_1 = require('./facade/async');
-var collection_2 = require('./facade/collection');
-var core_2 = require('@angular/core');
-var recognize_1 = require('./recognize');
+var collection_1 = require('./facade/collection');
+var lang_1 = require('./facade/lang');
+var lifecycle_reflector_1 = require('./lifecycle_reflector');
 var link_1 = require('./link');
+var recognize_1 = require('./recognize');
 var segments_1 = require('./segments');
-var lifecycle_reflector_1 = require('./lifecycle_reflector');
-var constants_1 = require('./constants');
-/**
- * @internal
- */
 var RouterOutletMap = (function () {
     function RouterOutletMap() {
         /** @internal */
@@ -40,7 +35,7 @@ var Router = (function () {
         this._routerOutletMap = _routerOutletMap;
         this._location = _location;
         this._changes = new async_1.EventEmitter();
-        this._prevTree = this._createInitialTree();
+        this._routeTree = segments_1.createEmptyRouteTree(this._rootComponentType);
         this._setUpLocationChangeListener();
         this.navigateByUrl(this._location.path());
     }
@@ -56,7 +51,7 @@ var Router = (function () {
         /**
          * Returns the current route tree.
          */
-        get: function () { return this._prevTree; },
+        get: function () { return this._routeTree; },
         enumerable: true,
         configurable: true
     });
@@ -129,32 +124,36 @@ var Router = (function () {
      * ```
      */
     Router.prototype.createUrlTree = function (commands, segment) {
-        var s = lang_1.isPresent(segment) ? segment : this._prevTree.root;
-        return link_1.link(s, this._prevTree, this.urlTree, commands);
+        var s = lang_1.isPresent(segment) ? segment : this._routeTree.root;
+        return link_1.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 segments_1.RouteSegment([new segments_1.UrlSegment("", {}, null)], {}, constants_1.DEFAULT_OUTLET_NAME, this._rootComponentType, null);
-        return new segments_1.RouteTree(new segments_1.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_1.recognize(this._componentResolver, this._rootComponentType, url)
+        return recognize_1.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 (lang_1.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);
                 }
             });
@@ -163,39 +162,38 @@ var Router = (function () {
     return Router;
 }());
 exports.Router = 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 = lang_1.isPresent(this.prevTree) ? segments_1.rootNode(this.prevTree) : null;
         var currRoot = segments_1.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 = async_1.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 = async_1.PromiseWrapper.resolve(true);
         var _loop_1 = function(p) {
             curr = curr.then(function (_) {
-                if (lifecycle_reflector_1.hasLifecycleHook("routerCanDeactivate", p)) {
+                if (lifecycle_reflector_1.hasLifecycleHook('routerCanDeactivate', p)) {
                     return p.routerCanDeactivate(_this.prevTree, _this.currTree);
                 }
                 else {
@@ -209,68 +207,70 @@ var _LoadSegments = (function () {
         }
         return curr;
     };
-    _LoadSegments.prototype.loadChildSegments = function (currNode, prevNode, outletMap, components) {
+    _ActivateSegments.prototype.activateChildSegments = function (currNode, prevNode, outletMap, components) {
         var _this = this;
-        var prevChildren = lang_1.isPresent(prevNode) ?
-            prevNode.children.reduce(function (m, c) {
-                m[c.value.outlet] = c;
-                return m;
-            }, {}) :
-            {};
+        var prevChildren = lang_1.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);
-            collection_2.StringMapWrapper.delete(prevChildren, c.value.outlet);
+            _this.activateSegments(c, prevChildren[c.value.outlet], outletMap, components);
+            collection_1.StringMapWrapper.delete(prevChildren, c.value.outlet);
+        });
+        collection_1.StringMapWrapper.forEach(prevChildren, function (v /** TODO #9100 */, k /** TODO #9100 */) {
+            return _this.deactivateOutlet(outletMap._outlets[k], components);
         });
-        collection_2.StringMapWrapper.forEach(prevChildren, function (v, k) { return _this.unloadOutlet(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 = lang_1.isPresent(prevNode) ? prevNode.value : null;
         var outlet = this.getOutlet(parentOutletMap, currNode.value);
-        if (segments_1.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 = core_1.ReflectiveInjector.resolve([core_1.provide(RouterOutletMap, { useValue: outletMap }), core_1.provide(segments_1.RouteSegment, { useValue: curr })]);
-        var ref = outlet.load(segments_1.routeSegmentComponentFactory(curr), resolved, outletMap);
-        if (lifecycle_reflector_1.hasLifecycleHook("routerOnActivate", ref.instance)) {
+    _ActivateSegments.prototype.activateNewSegments = function (outletMap, curr, prev, outlet) {
+        var resolved = core_1.ReflectiveInjector.resolve([{ provide: RouterOutletMap, useValue: outletMap }, { provide: segments_1.RouteSegment, useValue: curr }]);
+        var ref = outlet.activate(segments_1.routeSegmentComponentFactory(curr), resolved, outletMap);
+        if (lifecycle_reflector_1.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 (lang_1.isBlank(outlet)) {
             if (segment.outlet == constants_1.DEFAULT_OUTLET_NAME) {
-                throw new core_2.BaseException("Cannot find default outlet");
+                throw new core_1.BaseException("Cannot find default outlet");
             }
             else {
-                throw new core_2.BaseException("Cannot find the outlet " + segment.outlet);
+                throw new core_1.BaseException("Cannot find the outlet " + segment.outlet);
             }
         }
         return outlet;
     };
-    _LoadSegments.prototype.unloadOutlet = function (outlet, components) {
+    _ActivateSegments.prototype.deactivateOutlet = function (outlet, components) {
         var _this = this;
-        if (lang_1.isPresent(outlet) && outlet.isLoaded) {
-            collection_2.StringMapWrapper.forEach(outlet.outletMap._outlets, function (v, k) { return _this.unloadOutlet(v, components); });
+        if (lang_1.isPresent(outlet) && outlet.isActivated) {
+            collection_1.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;
 }());
 //# sourceMappingURL=router.js.map