@angular/router 6.0.0-rc.3 → 6.0.0

package/fesm2015/router.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v6.0.0-rc.3
+ * @license Angular v6.0.0
  * (c) 2010-2018 Google, Inc. https://angular.io/
  * License: MIT
  */
@@ -56,7 +56,7 @@ class RouterEvent {
  *
  * Represents an event triggered when a navigation starts.
  *
- * \@stable
+ *
  */
 class NavigationStart extends RouterEvent {
     /**
@@ -89,7 +89,7 @@ class NavigationStart extends RouterEvent {
  *
  * Represents an event triggered when a navigation ends successfully.
  *
- * \@stable
+ *
  */
 class NavigationEnd extends RouterEvent {
     /**
@@ -118,7 +118,7 @@ class NavigationEnd extends RouterEvent {
  *
  * Represents an event triggered when a navigation is canceled.
  *
- * \@stable
+ *
  */
 class NavigationCancel extends RouterEvent {
     /**
@@ -145,7 +145,7 @@ class NavigationCancel extends RouterEvent {
  *
  * Represents an event triggered when a navigation fails due to an unexpected error.
  *
- * \@stable
+ *
  */
 class NavigationError extends RouterEvent {
     /**
@@ -174,7 +174,7 @@ class NavigationError extends RouterEvent {
  *
  * Represents an event triggered when routes are recognized.
  *
- * \@stable
+ *
  */
 class RoutesRecognized extends RouterEvent {
     /**
@@ -473,7 +473,7 @@ class ActivationEnd {
  *
  * Name of the primary outlet.
  *
- * \@stable
+ *
  */
 const PRIMARY_OUTLET = 'primary';
 /**
@@ -486,7 +486,7 @@ const PRIMARY_OUTLET = 'primary';
  * The API is inspired by the URLSearchParams interface.
  * see https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams
  *
- * \@stable
+ *
  * @record
  */
 
@@ -530,7 +530,7 @@ class ParamsAsMap {
 /**
  * Convert a `Params` instance to a `ParamMap`.
  *
- * \@stable
+ *
  * @param {?} params
  * @return {?}
  */
@@ -601,7 +601,7 @@ function defaultUrlMatcher(segments, segmentGroup, route) {
  */
 /**
  * See `Routes` for more details.
- * \@stable
+ *
  * @record
  */
 
@@ -990,7 +990,7 @@ function containsSegmentGroupHelper(container, containee, containeePaths) {
  * }
  * ```
  *
- * \@stable
+ *
  */
 class UrlTree {
     /**
@@ -1026,7 +1026,7 @@ class UrlTree {
  *
  * See `UrlTree` for more information.
  *
- * \@stable
+ *
  */
 class UrlSegmentGroup {
     /**
@@ -1081,7 +1081,7 @@ class UrlSegmentGroup {
  * }
  * ```
  *
- * \@stable
+ *
  */
 class UrlSegment {
     /**
@@ -1155,7 +1155,7 @@ function mapChildrenIntoArray(segment, fn) {
  *
  * See `DefaultUrlSerializer` for an example of a URL serializer.
  *
- * \@stable
+ *
  * @abstract
  */
 class UrlSerializer {
@@ -1176,7 +1176,7 @@ class UrlSerializer {
  * colon syntax to specify the outlet, and the ';parameter=value' syntax (e.g., open=true) to
  * specify route specific parameters.
  *
- * \@stable
+ *
  */
 class DefaultUrlSerializer {
     /**
@@ -2323,7 +2323,7 @@ function nodeChildrenAsMap(node) {
  *
  * See `ActivatedRoute` for more information.
  *
- * \@stable
+ *
  */
 class RouterState extends Tree {
     /**
@@ -2388,7 +2388,7 @@ function createEmptyStateSnapshot(urlTree, rootComponent) {
  * }
  * ```
  *
- * \@stable
+ *
  */
 class ActivatedRoute {
     /**
@@ -2530,7 +2530,7 @@ function flattenInherited(pathFromRoot) {
  * }
  * ```
  *
- * \@stable
+ *
  */
 class ActivatedRouteSnapshot {
     /**
@@ -2636,7 +2636,7 @@ class ActivatedRouteSnapshot {
  * }
  * ```
  *
- * \@stable
+ *
  */
 class RouterStateSnapshot extends Tree {
     /**
@@ -2754,15 +2754,18 @@ function createNode(routeReuseStrategy, curr, prevState) {
         return new TreeNode(value, children);
         // retrieve an activated route that is used to be displayed, but is not currently displayed
     }
-    else if (routeReuseStrategy.retrieve(curr.value)) {
-        const /** @type {?} */ tree = (/** @type {?} */ (routeReuseStrategy.retrieve(curr.value))).route;
-        setFutureSnapshotsOfActivatedRoutes(curr, tree);
-        return tree;
-    }
     else {
-        const /** @type {?} */ value = createActivatedRoute(curr.value);
-        const /** @type {?} */ children = curr.children.map(c => createNode(routeReuseStrategy, c));
-        return new TreeNode(value, children);
+        const /** @type {?} */ detachedRouteHandle = /** @type {?} */ (routeReuseStrategy.retrieve(curr.value));
+        if (detachedRouteHandle) {
+            const /** @type {?} */ tree = detachedRouteHandle.route;
+            setFutureSnapshotsOfActivatedRoutes(curr, tree);
+            return tree;
+        }
+        else {
+            const /** @type {?} */ value = createActivatedRoute(curr.value);
+            const /** @type {?} */ children = curr.children.map(c => createNode(routeReuseStrategy, c));
+            return new TreeNode(value, children);
+        }
     }
 }
 /**
@@ -4146,7 +4149,7 @@ class DefaultUrlHandlingStrategy {
  *
  * Represents the extra options used during navigation.
  *
- * \@stable
+ *
  * @record
  */
 
@@ -4174,7 +4177,7 @@ function defaultRouterHook(snapshot) {
  *
  * \@ngModule RouterModule
  *
- * \@stable
+ *
  */
 class Router {
     /**
@@ -5095,7 +5098,7 @@ function validateCommands(commands) {
  *
  * \@ngModule RouterModule
  *
- * \@stable
+ *
  */
 class RouterLink {
     /**
@@ -5192,7 +5195,7 @@ RouterLink.propDecorators = {
  *
  * \@ngModule RouterModule
  *
- * \@stable
+ *
  */
 class RouterLinkWithHref {
     /**
@@ -5379,7 +5382,7 @@ function attrBoolValue(s) {
  *
  * \@ngModule RouterModule
  *
- * \@stable
+ *
  */
 class RouterLinkActive {
     /**
@@ -5497,7 +5500,7 @@ RouterLinkActive.propDecorators = {
 /**
  * Store contextual information about a `RouterOutlet`
  *
- * \@stable
+ *
  */
 class OutletContext {
     constructor() {
@@ -5511,7 +5514,7 @@ class OutletContext {
 /**
  * Store contextual information about the children (= nested) `RouterOutlet`
  *
- * \@stable
+ *
  */
 class ChildrenOutletContexts {
     constructor() {
@@ -5607,7 +5610,7 @@ class ChildrenOutletContexts {
  * ```
  * \@ngModule RouterModule
  *
- * \@stable
+ *
  */
 class RouterOutlet {
     /**
@@ -5852,7 +5855,7 @@ class NoPreloading {
  *
  * If a route is protected by `canLoad` guards, the preloaded will not load it.
  *
- * \@stable
+ *
  */
 class RouterPreloader {
     /**
@@ -5957,7 +5960,7 @@ RouterPreloader.ctorParameters = () => [
  *
  * Contains a list of directives
  *
- * \@stable
+ *
  */
 const ROUTER_DIRECTIVES = [RouterOutlet, RouterLink, RouterLinkWithHref, RouterLinkActive];
 /**
@@ -5965,7 +5968,7 @@ const ROUTER_DIRECTIVES = [RouterOutlet, RouterLink, RouterLinkWithHref, RouterL
  *
  * Is used in DI to configure the router.
  *
- * \@stable
+ *
  */
 const ROUTER_CONFIGURATION = new InjectionToken('ROUTER_CONFIGURATION');
 /**
@@ -6047,7 +6050,7 @@ function routerNgProbeToken() {
  * [Read this developer guide](https://angular.io/docs/ts/latest/guide/router.html) to get an
  * overview of how the router should be used.
  *
- * \@stable
+ *
  */
 class RouterModule {
     /**
@@ -6153,7 +6156,7 @@ function provideForRootGuard(router) {
  * class MyNgModule {}
  * ```
  *
- * \@stable
+ *
  * @param {?} routes
  * @return {?}
  */
@@ -6168,7 +6171,7 @@ function provideRoutes(routes) {
  *
  * Represents options to configure the router.
  *
- * \@stable
+ *
  * @record
  */
 
@@ -6374,9 +6377,9 @@ function provideRouterInitializer() {
  * found in the LICENSE file at https://angular.io/license
  */
 /**
- * \@stable
+ *
  */
-const VERSION = new Version('6.0.0-rc.3');
+const VERSION = new Version('6.0.0');
 
 /**
  * @fileoverview added by tsickle