2016-06-23 12:47:54 -04:00
|
|
|
/**
|
|
|
|
* @license
|
|
|
|
* Copyright Google Inc. All Rights Reserved.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by an MIT-style license that can be
|
|
|
|
* found in the LICENSE file at https://angular.io/license
|
|
|
|
*/
|
|
|
|
|
2016-06-08 14:13:41 -04:00
|
|
|
import {Location} from '@angular/common';
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
import {Compiler, Injector, NgModuleFactoryLoader, NgModuleRef, NgZone, Type, isDevMode, ɵConsole as Console} from '@angular/core';
|
2018-10-17 12:30:45 -04:00
|
|
|
import {BehaviorSubject, EMPTY, Observable, Subject, Subscription, defer, of } from 'rxjs';
|
2018-09-17 17:37:30 -04:00
|
|
|
import {catchError, filter, finalize, map, switchMap, tap} from 'rxjs/operators';
|
2016-06-08 14:13:41 -04:00
|
|
|
|
2018-09-17 17:37:30 -04:00
|
|
|
import {QueryParamsHandling, Route, Routes, standardizeConfig, validateConfig} from './config';
|
2016-06-08 14:13:41 -04:00
|
|
|
import {createRouterState} from './create_router_state';
|
|
|
|
import {createUrlTree} from './create_url_tree';
|
2018-09-17 17:37:30 -04:00
|
|
|
import {Event, GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, NavigationTrigger, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RoutesRecognized} from './events';
|
|
|
|
import {activateRoutes} from './operators/activate_routes';
|
2018-07-25 20:33:47 -04:00
|
|
|
import {applyRedirects} from './operators/apply_redirects';
|
2018-10-02 17:58:16 -04:00
|
|
|
import {checkGuards} from './operators/check_guards';
|
2018-07-25 20:19:58 -04:00
|
|
|
import {recognize} from './operators/recognize';
|
2018-08-14 14:36:52 -04:00
|
|
|
import {resolveData} from './operators/resolve_data';
|
2018-09-17 17:37:30 -04:00
|
|
|
import {switchTap} from './operators/switch_tap';
|
|
|
|
import {DefaultRouteReuseStrategy, RouteReuseStrategy} from './route_reuse_strategy';
|
2017-04-04 19:00:40 -04:00
|
|
|
import {RouterConfigLoader} from './router_config_loader';
|
2017-07-25 14:13:15 -04:00
|
|
|
import {ChildrenOutletContexts} from './router_outlet_context';
|
2018-09-17 17:37:30 -04:00
|
|
|
import {ActivatedRoute, RouterState, RouterStateSnapshot, createEmptyState} from './router_state';
|
2018-10-17 12:30:45 -04:00
|
|
|
import {Params, isNavigationCancelingError, navigationCancelingError} from './shared';
|
2016-10-20 13:44:44 -04:00
|
|
|
import {DefaultUrlHandlingStrategy, UrlHandlingStrategy} from './url_handling_strategy';
|
2016-07-28 20:59:05 -04:00
|
|
|
import {UrlSerializer, UrlTree, containsTree, createEmptyUrlTree} from './url_tree';
|
2018-10-03 14:47:46 -04:00
|
|
|
import {Checks, getAllRouteGuards} from './utils/preactivation';
|
2018-10-17 12:30:45 -04:00
|
|
|
import {isUrlTree} from './utils/type_guards';
|
2018-10-02 17:58:16 -04:00
|
|
|
|
2018-07-25 20:33:47 -04:00
|
|
|
|
2018-07-25 20:33:47 -04:00
|
|
|
|
2016-07-18 19:42:33 -04:00
|
|
|
/**
|
2018-04-05 06:51:21 -04:00
|
|
|
* @description
|
|
|
|
*
|
|
|
|
* Represents the extra options used during navigation.
|
2016-09-10 19:51:27 -04:00
|
|
|
*
|
2018-10-19 13:25:11 -04:00
|
|
|
* @publicApi
|
2016-07-18 19:42:33 -04:00
|
|
|
*/
|
2016-06-08 14:13:41 -04:00
|
|
|
export interface NavigationExtras {
|
2016-08-19 18:48:09 -04:00
|
|
|
/**
|
2017-10-06 13:22:02 -04:00
|
|
|
* Enables relative navigation from the current ActivatedRoute.
|
|
|
|
*
|
|
|
|
* Configuration:
|
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* [{
|
2016-08-19 18:48:09 -04:00
|
|
|
* path: 'parent',
|
|
|
|
* component: ParentComponent,
|
2016-12-02 18:34:28 -05:00
|
|
|
* children: [{
|
|
|
|
* path: 'list',
|
|
|
|
* component: ListComponent
|
|
|
|
* },{
|
|
|
|
* path: 'child',
|
|
|
|
* component: ChildComponent
|
|
|
|
* }]
|
2016-08-19 18:48:09 -04:00
|
|
|
* }]
|
2017-10-06 13:22:02 -04:00
|
|
|
* ```
|
|
|
|
*
|
|
|
|
* Navigate to list route from child route:
|
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* @Component({...})
|
|
|
|
* class ChildComponent {
|
2016-08-19 18:48:09 -04:00
|
|
|
* constructor(private router: Router, private route: ActivatedRoute) {}
|
|
|
|
*
|
|
|
|
* go() {
|
2016-09-02 16:42:51 -04:00
|
|
|
* this.router.navigate(['../list'], { relativeTo: this.route });
|
2016-08-19 18:48:09 -04:00
|
|
|
* }
|
|
|
|
* }
|
2017-10-06 13:22:02 -04:00
|
|
|
* ```
|
|
|
|
*/
|
2017-04-14 19:01:48 -04:00
|
|
|
relativeTo?: ActivatedRoute|null;
|
2016-09-10 19:51:27 -04:00
|
|
|
|
2016-08-19 18:48:09 -04:00
|
|
|
/**
|
2017-10-06 13:22:02 -04:00
|
|
|
* Sets query parameters to the URL.
|
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* // Navigate to /results?page=1
|
|
|
|
* this.router.navigate(['/results'], { queryParams: { page: 1 } });
|
|
|
|
* ```
|
|
|
|
*/
|
2017-04-14 19:01:48 -04:00
|
|
|
queryParams?: Params|null;
|
2016-09-10 19:51:27 -04:00
|
|
|
|
2016-08-19 18:48:09 -04:00
|
|
|
/**
|
2017-10-06 13:22:02 -04:00
|
|
|
* Sets the hash fragment for the URL.
|
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* // Navigate to /results#top
|
|
|
|
* this.router.navigate(['/results'], { fragment: 'top' });
|
|
|
|
* ```
|
|
|
|
*/
|
2016-06-08 14:13:41 -04:00
|
|
|
fragment?: string;
|
2016-09-10 19:51:27 -04:00
|
|
|
|
2016-08-19 18:48:09 -04:00
|
|
|
/**
|
2017-10-06 13:22:02 -04:00
|
|
|
* Preserves the query parameters for the next navigation.
|
|
|
|
*
|
|
|
|
* deprecated, use `queryParamsHandling` instead
|
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* // Preserve query params from /results?page=1 to /view?page=1
|
|
|
|
* this.router.navigate(['/view'], { preserveQueryParams: true });
|
|
|
|
* ```
|
|
|
|
*
|
|
|
|
* @deprecated since v4
|
|
|
|
*/
|
2016-07-20 17:30:04 -04:00
|
|
|
preserveQueryParams?: boolean;
|
2017-01-25 04:33:13 -05:00
|
|
|
|
|
|
|
/**
|
2017-10-06 13:22:02 -04:00
|
|
|
* config strategy to handle the query parameters for the next navigation.
|
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* // from /results?page=1 to /view?page=1&page=2
|
|
|
|
* this.router.navigate(['/view'], { queryParams: { page: 2 }, queryParamsHandling: "merge" });
|
|
|
|
* ```
|
|
|
|
*/
|
2017-04-14 19:01:48 -04:00
|
|
|
queryParamsHandling?: QueryParamsHandling|null;
|
2016-08-19 18:48:09 -04:00
|
|
|
/**
|
2017-10-06 13:22:02 -04:00
|
|
|
* Preserves the fragment for the next navigation
|
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* // Preserve fragment from /results#top to /view#top
|
|
|
|
* this.router.navigate(['/view'], { preserveFragment: true });
|
|
|
|
* ```
|
|
|
|
*/
|
2016-07-20 17:30:04 -04:00
|
|
|
preserveFragment?: boolean;
|
2016-08-19 18:48:09 -04:00
|
|
|
/**
|
2017-10-06 13:22:02 -04:00
|
|
|
* Navigates without pushing a new state into history.
|
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* // Navigate silently to /view
|
|
|
|
* this.router.navigate(['/view'], { skipLocationChange: true });
|
|
|
|
* ```
|
|
|
|
*/
|
2016-08-04 14:46:09 -04:00
|
|
|
skipLocationChange?: boolean;
|
2016-08-19 18:48:09 -04:00
|
|
|
/**
|
2017-10-06 13:22:02 -04:00
|
|
|
* Navigates while replacing the current state in history.
|
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* // Navigate to /view
|
|
|
|
* this.router.navigate(['/view'], { replaceUrl: true });
|
|
|
|
* ```
|
|
|
|
*/
|
2016-08-12 17:30:51 -04:00
|
|
|
replaceUrl?: boolean;
|
2018-11-28 19:18:22 -05:00
|
|
|
/**
|
|
|
|
* State passed to any navigation. This value will be accessible through the `extras` object
|
|
|
|
* returned from `router.getCurrentTransition()` while a navigation is executing. Once a
|
|
|
|
* navigation completes, this value will be written to `history.state` when the `location.go`
|
|
|
|
* or `location.replaceState` method is called before activating of this route. Note that
|
|
|
|
* `history.state` will not pass an object equality test because the `navigationId` will be
|
|
|
|
* added to the state before being written.
|
|
|
|
*
|
|
|
|
* While `history.state` can accept any type of value, because the router adds the `navigationId`
|
|
|
|
* on each navigation, the `state` must always be an object.
|
|
|
|
*/
|
|
|
|
state?: {[k: string]: any};
|
2016-06-08 14:13:41 -04:00
|
|
|
}
|
2016-05-24 16:23:27 -04:00
|
|
|
|
2016-08-25 10:56:30 -04:00
|
|
|
/**
|
2016-09-10 19:51:27 -04:00
|
|
|
* @description
|
2018-04-05 06:51:21 -04:00
|
|
|
*
|
|
|
|
* Error handler that is invoked when a navigation errors.
|
|
|
|
*
|
2016-09-10 19:51:27 -04:00
|
|
|
* If the handler returns a value, the navigation promise will be resolved with this value.
|
2016-08-25 10:56:30 -04:00
|
|
|
* If the handler throws an exception, the navigation promise will be rejected with
|
|
|
|
* the exception.
|
|
|
|
*
|
2018-10-19 13:25:11 -04:00
|
|
|
* @publicApi
|
2016-08-25 10:56:30 -04:00
|
|
|
*/
|
|
|
|
export type ErrorHandler = (error: any) => any;
|
|
|
|
|
|
|
|
function defaultErrorHandler(error: any): any {
|
|
|
|
throw error;
|
|
|
|
}
|
|
|
|
|
2018-04-10 06:01:07 -04:00
|
|
|
function defaultMalformedUriErrorHandler(
|
|
|
|
error: URIError, urlSerializer: UrlSerializer, url: string): UrlTree {
|
|
|
|
return urlSerializer.parse('/');
|
|
|
|
}
|
|
|
|
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
export type NavigationTransition = {
|
2016-10-28 17:56:08 -04:00
|
|
|
id: number,
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
currentUrlTree: UrlTree,
|
|
|
|
currentRawUrl: UrlTree,
|
|
|
|
extractedUrl: UrlTree,
|
|
|
|
urlAfterRedirects: UrlTree,
|
2016-10-28 17:56:08 -04:00
|
|
|
rawUrl: UrlTree,
|
|
|
|
extras: NavigationExtras,
|
|
|
|
resolve: any,
|
|
|
|
reject: any,
|
2016-12-02 18:19:00 -05:00
|
|
|
promise: Promise<boolean>,
|
2018-01-24 12:19:59 -05:00
|
|
|
source: NavigationTrigger,
|
2018-11-14 18:24:40 -05:00
|
|
|
restoredState: {navigationId: number} | null,
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
currentSnapshot: RouterStateSnapshot,
|
|
|
|
targetSnapshot: RouterStateSnapshot | null,
|
|
|
|
currentRouterState: RouterState,
|
|
|
|
targetRouterState: RouterState | null,
|
2018-10-03 14:47:46 -04:00
|
|
|
guards: Checks,
|
2018-10-16 22:50:48 -04:00
|
|
|
guardsResult: boolean | UrlTree | null,
|
2016-10-28 17:56:08 -04:00
|
|
|
};
|
|
|
|
|
2017-03-07 17:27:20 -05:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
2018-05-30 14:20:48 -04:00
|
|
|
export type RouterHook = (snapshot: RouterStateSnapshot, runExtras: {
|
|
|
|
appliedUrlTree: UrlTree,
|
|
|
|
rawUrlTree: UrlTree,
|
|
|
|
skipLocationChange: boolean,
|
|
|
|
replaceUrl: boolean,
|
|
|
|
navigationId: number
|
|
|
|
}) => Observable<void>;
|
2017-03-07 17:27:20 -05:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
2018-05-30 14:20:48 -04:00
|
|
|
function defaultRouterHook(snapshot: RouterStateSnapshot, runExtras: {
|
|
|
|
appliedUrlTree: UrlTree,
|
|
|
|
rawUrlTree: UrlTree,
|
|
|
|
skipLocationChange: boolean,
|
|
|
|
replaceUrl: boolean,
|
|
|
|
navigationId: number
|
|
|
|
}): Observable<void> {
|
2017-04-17 14:13:13 -04:00
|
|
|
return of (null) as any;
|
2017-03-07 17:27:20 -05:00
|
|
|
}
|
|
|
|
|
2016-05-24 16:41:37 -04:00
|
|
|
/**
|
2018-04-05 06:51:21 -04:00
|
|
|
* @description
|
|
|
|
*
|
|
|
|
* Provides the navigation and url manipulation capabilities.
|
2016-06-27 15:27:23 -04:00
|
|
|
*
|
2018-04-05 06:53:57 -04:00
|
|
|
* See `Routes` for more details and examples.
|
2016-06-28 17:49:29 -04:00
|
|
|
*
|
2016-09-10 19:51:27 -04:00
|
|
|
* @ngModule RouterModule
|
|
|
|
*
|
2018-10-19 13:25:11 -04:00
|
|
|
* @publicApi
|
2016-05-24 16:41:37 -04:00
|
|
|
*/
|
2016-05-24 16:23:27 -04:00
|
|
|
export class Router {
|
2016-05-26 19:51:56 -04:00
|
|
|
private currentUrlTree: UrlTree;
|
2016-10-20 13:44:44 -04:00
|
|
|
private rawUrlTree: UrlTree;
|
2018-09-17 17:37:30 -04:00
|
|
|
private readonly transitions: BehaviorSubject<NavigationTransition>;
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
private navigations: Observable<NavigationTransition>;
|
2016-10-20 13:44:44 -04:00
|
|
|
|
2018-06-18 19:38:33 -04:00
|
|
|
// TODO(issue/24571): remove '!'.
|
|
|
|
private locationSubscription !: Subscription;
|
2016-06-03 17:07:01 -04:00
|
|
|
private navigationId: number = 0;
|
2016-07-06 14:02:16 -04:00
|
|
|
private configLoader: RouterConfigLoader;
|
2017-03-14 19:26:17 -04:00
|
|
|
private ngModule: NgModuleRef<any>;
|
2018-08-09 02:45:15 -04:00
|
|
|
private console: Console;
|
|
|
|
private isNgZoneEnabled: boolean = false;
|
2016-05-24 16:23:27 -04:00
|
|
|
|
2017-09-11 15:39:44 -04:00
|
|
|
public readonly events: Observable<Event> = new Subject<Event>();
|
|
|
|
public readonly routerState: RouterState;
|
|
|
|
|
2016-09-10 19:51:27 -04:00
|
|
|
/**
|
|
|
|
* Error handler that is invoked when a navigation errors.
|
|
|
|
*
|
2018-04-05 06:53:57 -04:00
|
|
|
* See `ErrorHandler` for more information.
|
2016-09-10 19:51:27 -04:00
|
|
|
*/
|
2016-08-25 10:56:30 -04:00
|
|
|
errorHandler: ErrorHandler = defaultErrorHandler;
|
|
|
|
|
2018-04-10 06:01:07 -04:00
|
|
|
/**
|
|
|
|
* Malformed uri error handler is invoked when `Router.parseUrl(url)` throws an
|
|
|
|
* error due to containing an invalid character. The most common case would be a `%` sign
|
|
|
|
* that's not encoded and is not part of a percent encoded sequence.
|
|
|
|
*/
|
|
|
|
malformedUriErrorHandler:
|
|
|
|
(error: URIError, urlSerializer: UrlSerializer,
|
|
|
|
url: string) => UrlTree = defaultMalformedUriErrorHandler;
|
2017-03-07 17:27:20 -05:00
|
|
|
|
2016-07-20 20:51:21 -04:00
|
|
|
/**
|
|
|
|
* Indicates if at least one navigation happened.
|
|
|
|
*/
|
|
|
|
navigated: boolean = false;
|
2018-01-24 12:19:59 -05:00
|
|
|
private lastSuccessfulId: number = -1;
|
2016-07-20 20:51:21 -04:00
|
|
|
|
2017-03-07 17:27:20 -05:00
|
|
|
/**
|
|
|
|
* Used by RouterModule. This allows us to
|
|
|
|
* pause the navigation either before preactivation or after it.
|
|
|
|
* @internal
|
|
|
|
*/
|
|
|
|
hooks: {beforePreactivation: RouterHook, afterPreactivation: RouterHook} = {
|
|
|
|
beforePreactivation: defaultRouterHook,
|
|
|
|
afterPreactivation: defaultRouterHook
|
|
|
|
};
|
|
|
|
|
2016-10-20 13:44:44 -04:00
|
|
|
/**
|
2017-01-27 01:30:42 -05:00
|
|
|
* Extracts and merges URLs. Used for AngularJS to Angular migrations.
|
2016-10-20 13:44:44 -04:00
|
|
|
*/
|
|
|
|
urlHandlingStrategy: UrlHandlingStrategy = new DefaultUrlHandlingStrategy();
|
|
|
|
|
2016-11-30 02:21:41 -05:00
|
|
|
routeReuseStrategy: RouteReuseStrategy = new DefaultRouteReuseStrategy();
|
|
|
|
|
2017-10-19 18:32:50 -04:00
|
|
|
/**
|
|
|
|
* Define what the router should do if it receives a navigation request to the current URL.
|
|
|
|
* By default, the router will ignore this navigation. However, this prevents features such
|
|
|
|
* as a "refresh" button. Use this option to configure the behavior when navigating to the
|
|
|
|
* current URL. Default is 'ignore'.
|
|
|
|
*/
|
|
|
|
onSameUrlNavigation: 'reload'|'ignore' = 'ignore';
|
|
|
|
|
2017-11-28 19:57:10 -05:00
|
|
|
/**
|
|
|
|
* Defines how the router merges params, data and resolved data from parent to child
|
|
|
|
* routes. Available options are:
|
|
|
|
*
|
|
|
|
* - `'emptyOnly'`, the default, only inherits parent params for path-less or component-less
|
|
|
|
* routes.
|
|
|
|
* - `'always'`, enables unconditional inheritance of parent params.
|
|
|
|
*/
|
|
|
|
paramsInheritanceStrategy: 'emptyOnly'|'always' = 'emptyOnly';
|
|
|
|
|
2018-07-10 12:44:15 -04:00
|
|
|
/**
|
|
|
|
* Defines when the router updates the browser URL. The default behavior is to update after
|
|
|
|
* successful navigation. However, some applications may prefer a mode where the URL gets
|
|
|
|
* updated at the beginning of navigation. The most common use case would be updating the
|
|
|
|
* URL early so if navigation fails, you can show an error message with the URL that failed.
|
|
|
|
* Available options are:
|
|
|
|
*
|
|
|
|
* - `'deferred'`, the default, updates the browser URL after navigation has finished.
|
|
|
|
* - `'eager'`, updates browser URL at the beginning of navigation.
|
|
|
|
*/
|
|
|
|
urlUpdateStrategy: 'deferred'|'eager' = 'deferred';
|
|
|
|
|
2018-02-23 04:24:51 -05:00
|
|
|
/**
|
|
|
|
* See {@link RouterModule} for more information.
|
|
|
|
*/
|
|
|
|
relativeLinkResolution: 'legacy'|'corrected' = 'legacy';
|
|
|
|
|
2016-05-24 16:41:37 -04:00
|
|
|
/**
|
2016-06-28 19:53:54 -04:00
|
|
|
* Creates the router service.
|
2016-05-24 16:41:37 -04:00
|
|
|
*/
|
2016-09-10 19:51:27 -04:00
|
|
|
// TODO: vsavkin make internal after the final is out.
|
2016-06-08 14:13:41 -04:00
|
|
|
constructor(
|
2017-04-17 14:13:13 -04:00
|
|
|
private rootComponentType: Type<any>|null, private urlSerializer: UrlSerializer,
|
2017-05-17 20:47:34 -04:00
|
|
|
private rootContexts: ChildrenOutletContexts, private location: Location, injector: Injector,
|
2016-08-16 16:40:28 -04:00
|
|
|
loader: NgModuleFactoryLoader, compiler: Compiler, public config: Routes) {
|
2017-02-15 13:57:03 -05:00
|
|
|
const onLoadStart = (r: Route) => this.triggerEvent(new RouteConfigLoadStart(r));
|
|
|
|
const onLoadEnd = (r: Route) => this.triggerEvent(new RouteConfigLoadEnd(r));
|
|
|
|
|
2017-03-14 19:26:17 -04:00
|
|
|
this.ngModule = injector.get(NgModuleRef);
|
2018-08-09 02:45:15 -04:00
|
|
|
this.console = injector.get(Console);
|
|
|
|
const ngZone = injector.get(NgZone);
|
|
|
|
this.isNgZoneEnabled = ngZone instanceof NgZone;
|
2017-03-14 19:26:17 -04:00
|
|
|
|
2016-06-16 17:36:51 -04:00
|
|
|
this.resetConfig(config);
|
2016-06-07 12:50:35 -04:00
|
|
|
this.currentUrlTree = createEmptyUrlTree();
|
2016-10-20 13:44:44 -04:00
|
|
|
this.rawUrlTree = this.currentUrlTree;
|
2017-02-15 13:57:03 -05:00
|
|
|
|
|
|
|
this.configLoader = new RouterConfigLoader(loader, compiler, onLoadStart, onLoadEnd);
|
2017-09-11 15:39:44 -04:00
|
|
|
this.routerState = createEmptyState(this.currentUrlTree, this.rootComponentType);
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
|
|
|
|
this.transitions = new BehaviorSubject<NavigationTransition>({
|
|
|
|
id: 0,
|
|
|
|
currentUrlTree: this.currentUrlTree,
|
|
|
|
currentRawUrl: this.currentUrlTree,
|
|
|
|
extractedUrl: this.urlHandlingStrategy.extract(this.currentUrlTree),
|
|
|
|
urlAfterRedirects: this.urlHandlingStrategy.extract(this.currentUrlTree),
|
|
|
|
rawUrl: this.currentUrlTree,
|
|
|
|
extras: {},
|
|
|
|
resolve: null,
|
|
|
|
reject: null,
|
|
|
|
promise: Promise.resolve(true),
|
|
|
|
source: 'imperative',
|
2018-11-14 18:24:40 -05:00
|
|
|
restoredState: null,
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
currentSnapshot: this.routerState.snapshot,
|
|
|
|
targetSnapshot: null,
|
|
|
|
currentRouterState: this.routerState,
|
|
|
|
targetRouterState: null,
|
2018-10-03 14:47:46 -04:00
|
|
|
guards: {canActivateChecks: [], canDeactivateChecks: []},
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
guardsResult: null,
|
|
|
|
});
|
|
|
|
this.navigations = this.setupNavigations(this.transitions);
|
|
|
|
|
2016-10-28 17:56:08 -04:00
|
|
|
this.processNavigations();
|
2016-06-06 17:05:57 -04:00
|
|
|
}
|
|
|
|
|
2018-09-11 22:12:57 -04:00
|
|
|
private setupNavigations(transitions: Observable<NavigationTransition>):
|
|
|
|
Observable<NavigationTransition> {
|
2018-09-17 17:37:30 -04:00
|
|
|
const eventsSubject = (this.events as Subject<Event>);
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
return transitions.pipe(
|
2018-09-17 17:37:30 -04:00
|
|
|
filter(t => t.id !== 0),
|
|
|
|
|
|
|
|
// Extract URL
|
|
|
|
map(t => ({
|
|
|
|
...t, extractedUrl: this.urlHandlingStrategy.extract(t.rawUrl)
|
|
|
|
} as NavigationTransition)),
|
|
|
|
|
|
|
|
// Using switchMap so we cancel executing navigations when a new one comes in
|
|
|
|
switchMap(t => {
|
|
|
|
let completed = false;
|
|
|
|
let errored = false;
|
|
|
|
return of (t).pipe(
|
|
|
|
switchMap(t => {
|
|
|
|
const urlTransition =
|
|
|
|
!this.navigated || t.extractedUrl.toString() !== this.currentUrlTree.toString();
|
|
|
|
const processCurrentUrl =
|
|
|
|
(this.onSameUrlNavigation === 'reload' ? true : urlTransition) &&
|
|
|
|
this.urlHandlingStrategy.shouldProcessUrl(t.rawUrl);
|
|
|
|
|
|
|
|
if (processCurrentUrl) {
|
|
|
|
return of (t).pipe(
|
|
|
|
// Fire NavigationStart event
|
|
|
|
switchMap(t => {
|
|
|
|
const transition = this.transitions.getValue();
|
|
|
|
eventsSubject.next(new NavigationStart(
|
2018-11-14 18:24:40 -05:00
|
|
|
t.id, this.serializeUrl(t.extractedUrl), t.source, t.restoredState));
|
2018-09-17 17:37:30 -04:00
|
|
|
if (transition !== this.transitions.getValue()) {
|
|
|
|
return EMPTY;
|
|
|
|
}
|
|
|
|
return [t];
|
|
|
|
}),
|
|
|
|
|
|
|
|
// This delay is required to match old behavior that forced navigation to
|
|
|
|
// always be async
|
|
|
|
switchMap(t => Promise.resolve(t)),
|
|
|
|
|
|
|
|
// ApplyRedirects
|
|
|
|
applyRedirects(
|
|
|
|
this.ngModule.injector, this.configLoader, this.urlSerializer,
|
|
|
|
this.config),
|
|
|
|
// Recognize
|
|
|
|
recognize(
|
|
|
|
this.rootComponentType, this.config, (url) => this.serializeUrl(url),
|
2018-11-07 16:18:08 -05:00
|
|
|
this.paramsInheritanceStrategy, this.relativeLinkResolution),
|
2018-09-17 17:37:30 -04:00
|
|
|
|
2018-11-29 16:35:26 -05:00
|
|
|
// Update URL if in `eager` update mode
|
|
|
|
tap(t => this.urlUpdateStrategy === 'eager' && !t.extras.skipLocationChange &&
|
|
|
|
this.setBrowserUrl(t.urlAfterRedirects, !!t.extras.replaceUrl, t.id)),
|
|
|
|
|
2018-09-17 17:37:30 -04:00
|
|
|
// Fire RoutesRecognized
|
|
|
|
tap(t => {
|
|
|
|
const routesRecognized = new RoutesRecognized(
|
|
|
|
t.id, this.serializeUrl(t.extractedUrl),
|
|
|
|
this.serializeUrl(t.urlAfterRedirects), t.targetSnapshot !);
|
|
|
|
eventsSubject.next(routesRecognized);
|
|
|
|
}), );
|
|
|
|
} else {
|
|
|
|
const processPreviousUrl = urlTransition && this.rawUrlTree &&
|
|
|
|
this.urlHandlingStrategy.shouldProcessUrl(this.rawUrlTree);
|
|
|
|
/* When the current URL shouldn't be processed, but the previous one was, we
|
|
|
|
* handle this "error condition" by navigating to the previously successful URL,
|
|
|
|
* but leaving the URL intact.*/
|
|
|
|
if (processPreviousUrl) {
|
2018-11-14 18:24:40 -05:00
|
|
|
const {id, extractedUrl, source, restoredState, extras} = t;
|
|
|
|
const navStart = new NavigationStart(
|
|
|
|
id, this.serializeUrl(extractedUrl), source, restoredState);
|
2018-09-17 17:37:30 -04:00
|
|
|
eventsSubject.next(navStart);
|
|
|
|
const targetSnapshot =
|
|
|
|
createEmptyState(extractedUrl, this.rootComponentType).snapshot;
|
|
|
|
|
|
|
|
return of ({
|
|
|
|
...t,
|
|
|
|
targetSnapshot,
|
|
|
|
urlAfterRedirects: extractedUrl,
|
|
|
|
extras: {...extras, skipLocationChange: false, replaceUrl: false},
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
/* When neither the current or previous URL can be processed, do nothing other
|
|
|
|
* than update router's internal reference to the current "settled" URL. This
|
|
|
|
* way the next navigation will be coming from the current URL in the browser.
|
|
|
|
*/
|
|
|
|
this.rawUrlTree = t.rawUrl;
|
|
|
|
t.resolve(null);
|
|
|
|
return EMPTY;
|
|
|
|
}
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
}
|
|
|
|
}),
|
|
|
|
|
2018-09-17 17:37:30 -04:00
|
|
|
// Before Preactivation
|
|
|
|
switchTap(t => {
|
|
|
|
const {
|
|
|
|
targetSnapshot,
|
|
|
|
id: navigationId,
|
|
|
|
extractedUrl: appliedUrlTree,
|
|
|
|
rawUrl: rawUrlTree,
|
|
|
|
extras: {skipLocationChange, replaceUrl}
|
|
|
|
} = t;
|
|
|
|
return this.hooks.beforePreactivation(targetSnapshot !, {
|
|
|
|
navigationId,
|
|
|
|
appliedUrlTree,
|
|
|
|
rawUrlTree,
|
|
|
|
skipLocationChange: !!skipLocationChange,
|
|
|
|
replaceUrl: !!replaceUrl,
|
|
|
|
});
|
|
|
|
}),
|
|
|
|
|
|
|
|
// --- GUARDS ---
|
|
|
|
tap(t => {
|
|
|
|
const guardsStart = new GuardsCheckStart(
|
|
|
|
t.id, this.serializeUrl(t.extractedUrl), this.serializeUrl(t.urlAfterRedirects),
|
|
|
|
t.targetSnapshot !);
|
|
|
|
this.triggerEvent(guardsStart);
|
|
|
|
}),
|
|
|
|
|
2018-10-03 14:47:46 -04:00
|
|
|
map(t => ({
|
|
|
|
...t,
|
|
|
|
guards:
|
|
|
|
getAllRouteGuards(t.targetSnapshot !, t.currentSnapshot, this.rootContexts)
|
|
|
|
})),
|
|
|
|
|
|
|
|
checkGuards(this.ngModule.injector, (evt: Event) => this.triggerEvent(evt)),
|
2018-10-17 12:30:45 -04:00
|
|
|
tap(t => {
|
|
|
|
if (isUrlTree(t.guardsResult)) {
|
|
|
|
const error: Error&{url?: UrlTree} = navigationCancelingError(
|
|
|
|
`Redirecting to "${this.serializeUrl(t.guardsResult)}"`);
|
|
|
|
error.url = t.guardsResult;
|
|
|
|
throw error;
|
|
|
|
}
|
|
|
|
}),
|
2018-09-17 17:37:30 -04:00
|
|
|
|
|
|
|
tap(t => {
|
|
|
|
const guardsEnd = new GuardsCheckEnd(
|
|
|
|
t.id, this.serializeUrl(t.extractedUrl), this.serializeUrl(t.urlAfterRedirects),
|
|
|
|
t.targetSnapshot !, !!t.guardsResult);
|
|
|
|
this.triggerEvent(guardsEnd);
|
|
|
|
}),
|
|
|
|
|
|
|
|
filter(t => {
|
|
|
|
if (!t.guardsResult) {
|
|
|
|
this.resetUrlToCurrentUrlTree();
|
|
|
|
const navCancel =
|
|
|
|
new NavigationCancel(t.id, this.serializeUrl(t.extractedUrl), '');
|
|
|
|
eventsSubject.next(navCancel);
|
|
|
|
t.resolve(false);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}),
|
|
|
|
|
|
|
|
// --- RESOLVE ---
|
|
|
|
switchTap(t => {
|
2018-10-03 14:47:46 -04:00
|
|
|
if (t.guards.canActivateChecks.length) {
|
2018-09-17 17:37:30 -04:00
|
|
|
return of (t).pipe(
|
|
|
|
tap(t => {
|
|
|
|
const resolveStart = new ResolveStart(
|
|
|
|
t.id, this.serializeUrl(t.extractedUrl),
|
|
|
|
this.serializeUrl(t.urlAfterRedirects), t.targetSnapshot !);
|
|
|
|
this.triggerEvent(resolveStart);
|
|
|
|
}),
|
2018-10-02 17:39:23 -04:00
|
|
|
resolveData(
|
2018-10-03 14:47:46 -04:00
|
|
|
this.paramsInheritanceStrategy,
|
2018-10-02 17:39:23 -04:00
|
|
|
this.ngModule.injector), //
|
2018-09-17 17:37:30 -04:00
|
|
|
tap(t => {
|
|
|
|
const resolveEnd = new ResolveEnd(
|
|
|
|
t.id, this.serializeUrl(t.extractedUrl),
|
|
|
|
this.serializeUrl(t.urlAfterRedirects), t.targetSnapshot !);
|
|
|
|
this.triggerEvent(resolveEnd);
|
|
|
|
}), );
|
|
|
|
}
|
|
|
|
return undefined;
|
|
|
|
}),
|
|
|
|
|
|
|
|
// --- AFTER PREACTIVATION ---
|
2018-11-28 19:18:22 -05:00
|
|
|
switchTap((t: NavigationTransition) => {
|
2018-09-17 17:37:30 -04:00
|
|
|
const {
|
|
|
|
targetSnapshot,
|
|
|
|
id: navigationId,
|
|
|
|
extractedUrl: appliedUrlTree,
|
|
|
|
rawUrl: rawUrlTree,
|
|
|
|
extras: {skipLocationChange, replaceUrl}
|
|
|
|
} = t;
|
|
|
|
return this.hooks.afterPreactivation(targetSnapshot !, {
|
|
|
|
navigationId,
|
|
|
|
appliedUrlTree,
|
|
|
|
rawUrlTree,
|
|
|
|
skipLocationChange: !!skipLocationChange,
|
|
|
|
replaceUrl: !!replaceUrl,
|
|
|
|
});
|
|
|
|
}),
|
|
|
|
|
2018-11-28 19:18:22 -05:00
|
|
|
map((t: NavigationTransition) => {
|
2018-09-17 17:37:30 -04:00
|
|
|
const targetRouterState = createRouterState(
|
|
|
|
this.routeReuseStrategy, t.targetSnapshot !, t.currentRouterState);
|
|
|
|
return ({...t, targetRouterState});
|
|
|
|
}),
|
|
|
|
|
|
|
|
/* Once here, we are about to activate syncronously. The assumption is this will
|
|
|
|
succeed, and user code may read from the Router service. Therefore before
|
|
|
|
activation, we need to update router properties storing the current URL and the
|
|
|
|
RouterState, as well as updated the browser URL. All this should happen *before*
|
|
|
|
activating. */
|
2018-11-28 19:18:22 -05:00
|
|
|
tap((t: NavigationTransition) => {
|
2018-09-17 17:37:30 -04:00
|
|
|
this.currentUrlTree = t.urlAfterRedirects;
|
|
|
|
this.rawUrlTree = this.urlHandlingStrategy.merge(this.currentUrlTree, t.rawUrl);
|
|
|
|
|
|
|
|
(this as{routerState: RouterState}).routerState = t.targetRouterState !;
|
|
|
|
|
|
|
|
if (this.urlUpdateStrategy === 'deferred' && !t.extras.skipLocationChange) {
|
2018-11-28 19:18:22 -05:00
|
|
|
this.setBrowserUrl(this.rawUrlTree, !!t.extras.replaceUrl, t.id, t.extras.state);
|
2018-09-17 17:37:30 -04:00
|
|
|
}
|
|
|
|
}),
|
|
|
|
|
|
|
|
activateRoutes(
|
|
|
|
this.rootContexts, this.routeReuseStrategy,
|
|
|
|
(evt: Event) => this.triggerEvent(evt)),
|
|
|
|
|
|
|
|
tap({next() { completed = true; }, complete() { completed = true; }}),
|
|
|
|
finalize(() => {
|
|
|
|
/* When the navigation stream finishes either through error or success, we set the
|
|
|
|
* `completed` or `errored` flag. However, there are some situations where we could
|
|
|
|
* get here without either of those being set. For instance, a redirect during
|
|
|
|
* NavigationStart. Therefore, this is a catch-all to make sure the NavigationCancel
|
|
|
|
* event is fired when a navigation gets cancelled but not caught by other means. */
|
|
|
|
if (!completed && !errored) {
|
|
|
|
// Must reset to current URL tree here to ensure history.state is set. On a fresh
|
|
|
|
// page load, if a new navigation comes in before a successful navigation
|
|
|
|
// completes, there will be nothing in history.state.navigationId. This can cause
|
|
|
|
// sync problems with AngularJS sync code which looks for a value here in order
|
|
|
|
// to determine whether or not to handle a given popstate event or to leave it
|
|
|
|
// to the Angualr router.
|
|
|
|
this.resetUrlToCurrentUrlTree();
|
|
|
|
const navCancel = new NavigationCancel(
|
|
|
|
t.id, this.serializeUrl(t.extractedUrl),
|
|
|
|
`Navigation ID ${t.id} is not equal to the current navigation id ${this.navigationId}`);
|
|
|
|
eventsSubject.next(navCancel);
|
|
|
|
t.resolve(false);
|
|
|
|
}
|
|
|
|
}),
|
|
|
|
catchError((e) => {
|
|
|
|
errored = true;
|
|
|
|
/* This error type is issued during Redirect, and is handled as a cancellation
|
|
|
|
* rather than an error. */
|
|
|
|
if (isNavigationCancelingError(e)) {
|
|
|
|
this.navigated = true;
|
2018-10-17 12:30:45 -04:00
|
|
|
const redirecting = isUrlTree(e.url);
|
|
|
|
if (!redirecting) {
|
|
|
|
this.resetStateAndUrl(t.currentRouterState, t.currentUrlTree, t.rawUrl);
|
|
|
|
}
|
2018-09-17 17:37:30 -04:00
|
|
|
const navCancel =
|
|
|
|
new NavigationCancel(t.id, this.serializeUrl(t.extractedUrl), e.message);
|
|
|
|
eventsSubject.next(navCancel);
|
2018-10-15 14:18:52 -04:00
|
|
|
t.resolve(false);
|
2018-10-17 12:30:45 -04:00
|
|
|
|
|
|
|
if (redirecting) {
|
|
|
|
this.navigateByUrl(e.url);
|
|
|
|
}
|
|
|
|
|
2018-09-17 17:37:30 -04:00
|
|
|
/* All other errors should reset to the router's internal URL reference to the
|
|
|
|
* pre-error state. */
|
|
|
|
} else {
|
|
|
|
this.resetStateAndUrl(t.currentRouterState, t.currentUrlTree, t.rawUrl);
|
|
|
|
const navError = new NavigationError(t.id, this.serializeUrl(t.extractedUrl), e);
|
|
|
|
eventsSubject.next(navError);
|
|
|
|
try {
|
|
|
|
t.resolve(this.errorHandler(e));
|
|
|
|
} catch (ee) {
|
|
|
|
t.reject(ee);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return EMPTY;
|
|
|
|
}), );
|
|
|
|
// TODO(jasonaden): remove cast once g3 is on updated TypeScript
|
|
|
|
})) as any as Observable<NavigationTransition>;
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
}
|
|
|
|
|
2016-09-16 18:08:15 -04:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* TODO: this should be removed once the constructor of the router made internal
|
|
|
|
*/
|
|
|
|
resetRootComponentType(rootComponentType: Type<any>): void {
|
|
|
|
this.rootComponentType = rootComponentType;
|
2016-09-21 14:37:43 -04:00
|
|
|
// TODO: vsavkin router 4.0 should make the root component set to null
|
|
|
|
// this will simplify the lifecycle of the router.
|
2017-09-11 15:39:44 -04:00
|
|
|
this.routerState.root.component = this.rootComponentType;
|
2016-09-16 18:08:15 -04:00
|
|
|
}
|
|
|
|
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
private getTransition(): NavigationTransition { return this.transitions.value; }
|
|
|
|
|
|
|
|
private setTransition(t: Partial<NavigationTransition>): void {
|
|
|
|
this.transitions.next({...this.getTransition(), ...t});
|
|
|
|
}
|
|
|
|
|
2016-06-06 17:05:57 -04:00
|
|
|
/**
|
2016-09-10 19:51:27 -04:00
|
|
|
* Sets up the location change listener and performs the initial navigation.
|
2016-06-06 17:05:57 -04:00
|
|
|
*/
|
2016-06-08 14:13:41 -04:00
|
|
|
initialNavigation(): void {
|
2016-05-24 16:23:27 -04:00
|
|
|
this.setUpLocationChangeListener();
|
2017-01-14 17:05:24 -05:00
|
|
|
if (this.navigationId === 0) {
|
|
|
|
this.navigateByUrl(this.location.path(true), {replaceUrl: true});
|
|
|
|
}
|
2016-05-24 16:23:27 -04:00
|
|
|
}
|
|
|
|
|
2016-08-25 11:48:31 -04:00
|
|
|
/**
|
2016-09-10 19:51:27 -04:00
|
|
|
* Sets up the location change listener.
|
2016-08-25 11:48:31 -04:00
|
|
|
*/
|
|
|
|
setUpLocationChangeListener(): void {
|
2017-11-28 01:27:19 -05:00
|
|
|
// Don't need to use Zone.wrap any more, because zone.js
|
|
|
|
// already patch onPopState, so location change callback will
|
|
|
|
// run into ngZone
|
2016-11-22 17:50:52 -05:00
|
|
|
if (!this.locationSubscription) {
|
2017-11-28 01:27:19 -05:00
|
|
|
this.locationSubscription = <any>this.location.subscribe((change: any) => {
|
2018-04-10 06:01:07 -04:00
|
|
|
let rawUrlTree = this.parseUrl(change['url']);
|
2018-01-24 12:19:59 -05:00
|
|
|
const source: NavigationTrigger = change['type'] === 'popstate' ? 'popstate' : 'hashchange';
|
2018-11-14 18:24:40 -05:00
|
|
|
// Navigations coming from Angular router have a navigationId state property. When this
|
|
|
|
// exists, restore the state.
|
|
|
|
const state = change.state && change.state.navigationId ? change.state : null;
|
2018-11-28 19:18:22 -05:00
|
|
|
setTimeout(() => {
|
|
|
|
this.scheduleNavigation(rawUrlTree, source, state, null, {replaceUrl: true});
|
|
|
|
}, 0);
|
2017-11-28 01:27:19 -05:00
|
|
|
});
|
2016-11-22 17:50:52 -05:00
|
|
|
}
|
2016-08-25 11:48:31 -04:00
|
|
|
}
|
|
|
|
|
2016-12-09 13:44:46 -05:00
|
|
|
/** The current url */
|
2016-06-14 17:55:59 -04:00
|
|
|
get url(): string { return this.serializeUrl(this.currentUrlTree); }
|
2016-05-24 16:41:37 -04:00
|
|
|
|
2017-02-15 13:57:03 -05:00
|
|
|
/** @internal */
|
2018-09-20 09:50:32 -04:00
|
|
|
triggerEvent(event: Event): void { (this.events as Subject<Event>).next(event); }
|
2017-02-15 13:57:03 -05:00
|
|
|
|
2016-05-24 16:41:37 -04:00
|
|
|
/**
|
|
|
|
* Resets the configuration used for navigation and generating links.
|
|
|
|
*
|
2018-09-20 09:50:32 -04:00
|
|
|
* @usageNotes
|
|
|
|
*
|
|
|
|
* ### Example
|
2016-05-24 16:41:37 -04:00
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* router.resetConfig([
|
2016-05-26 19:51:56 -04:00
|
|
|
* { path: 'team/:id', component: TeamCmp, children: [
|
|
|
|
* { path: 'simple', component: SimpleCmp },
|
|
|
|
* { path: 'user/:name', component: UserCmp }
|
2016-12-09 13:44:46 -05:00
|
|
|
* ]}
|
2016-05-24 16:41:37 -04:00
|
|
|
* ]);
|
|
|
|
* ```
|
|
|
|
*/
|
2016-07-06 19:19:52 -04:00
|
|
|
resetConfig(config: Routes): void {
|
2016-06-16 17:36:51 -04:00
|
|
|
validateConfig(config);
|
2018-04-06 18:56:36 -04:00
|
|
|
this.config = config.map(standardizeConfig);
|
2017-03-28 15:11:44 -04:00
|
|
|
this.navigated = false;
|
2018-01-24 12:19:59 -05:00
|
|
|
this.lastSuccessfulId = -1;
|
2016-06-16 17:36:51 -04:00
|
|
|
}
|
2016-05-26 19:51:56 -04:00
|
|
|
|
2016-12-09 13:44:46 -05:00
|
|
|
/** @docsNotRequired */
|
2017-03-28 15:11:44 -04:00
|
|
|
ngOnDestroy(): void { this.dispose(); }
|
2016-08-02 05:32:27 -04:00
|
|
|
|
2016-12-09 13:44:46 -05:00
|
|
|
/** Disposes of the router */
|
2016-11-22 17:50:52 -05:00
|
|
|
dispose(): void {
|
|
|
|
if (this.locationSubscription) {
|
|
|
|
this.locationSubscription.unsubscribe();
|
2017-04-17 14:13:13 -04:00
|
|
|
this.locationSubscription = null !;
|
2016-11-22 17:50:52 -05:00
|
|
|
}
|
|
|
|
}
|
2016-05-24 16:23:27 -04:00
|
|
|
|
2016-05-26 19:51:56 -04:00
|
|
|
/**
|
2016-09-10 19:51:27 -04:00
|
|
|
* Applies an array of commands to the current url tree and creates a new url tree.
|
2016-05-26 19:51:56 -04:00
|
|
|
*
|
|
|
|
* When given an activate route, applies the given commands starting from the route.
|
|
|
|
* When not given a route, applies the given command starting from the root.
|
|
|
|
*
|
2018-09-20 09:50:32 -04:00
|
|
|
* @usageNotes
|
|
|
|
*
|
|
|
|
* ### Example
|
2016-05-26 19:51:56 -04:00
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* // create /team/33/user/11
|
|
|
|
* router.createUrlTree(['/team', 33, 'user', 11]);
|
|
|
|
*
|
|
|
|
* // create /team/33;expand=true/user/11
|
|
|
|
* router.createUrlTree(['/team', 33, {expand: true}, 'user', 11]);
|
|
|
|
*
|
2016-08-04 20:19:23 -04:00
|
|
|
* // you can collapse static segments like this (this works only with the first passed-in value):
|
2016-05-26 19:51:56 -04:00
|
|
|
* router.createUrlTree(['/team/33/user', userId]);
|
|
|
|
*
|
2016-08-16 22:38:23 -04:00
|
|
|
* // If the first segment can contain slashes, and you do not want the router to split it, you
|
|
|
|
* // can do the following:
|
2016-08-04 20:19:23 -04:00
|
|
|
*
|
|
|
|
* router.createUrlTree([{segmentPath: '/one/two'}]);
|
|
|
|
*
|
2016-08-16 22:37:53 -04:00
|
|
|
* // create /team/33/(user/11//right:chat)
|
2016-07-22 16:25:48 -04:00
|
|
|
* router.createUrlTree(['/team', 33, {outlets: {primary: 'user/11', right: 'chat'}}]);
|
|
|
|
*
|
|
|
|
* // remove the right secondary node
|
|
|
|
* router.createUrlTree(['/team', 33, {outlets: {primary: 'user/11', right: null}}]);
|
2016-07-12 12:49:55 -04:00
|
|
|
*
|
2016-05-26 19:51:56 -04:00
|
|
|
* // assuming the current url is `/team/33/user/11` and the route points to `user/11`
|
|
|
|
*
|
|
|
|
* // navigate to /team/33/user/11/details
|
|
|
|
* router.createUrlTree(['details'], {relativeTo: route});
|
|
|
|
*
|
|
|
|
* // navigate to /team/33/user/22
|
|
|
|
* router.createUrlTree(['../22'], {relativeTo: route});
|
|
|
|
*
|
|
|
|
* // navigate to /team/44/user/22
|
|
|
|
* router.createUrlTree(['../../team/44/user/22'], {relativeTo: route});
|
|
|
|
* ```
|
|
|
|
*/
|
2017-06-12 13:59:29 -04:00
|
|
|
createUrlTree(commands: any[], navigationExtras: NavigationExtras = {}): UrlTree {
|
|
|
|
const {relativeTo, queryParams, fragment,
|
|
|
|
preserveQueryParams, queryParamsHandling, preserveFragment} = navigationExtras;
|
2017-01-25 04:33:13 -05:00
|
|
|
if (isDevMode() && preserveQueryParams && <any>console && <any>console.warn) {
|
|
|
|
console.warn('preserveQueryParams is deprecated, use queryParamsHandling instead.');
|
|
|
|
}
|
2016-12-09 13:44:46 -05:00
|
|
|
const a = relativeTo || this.routerState.root;
|
2016-07-20 17:30:04 -04:00
|
|
|
const f = preserveFragment ? this.currentUrlTree.fragment : fragment;
|
2017-04-17 14:13:13 -04:00
|
|
|
let q: Params|null = null;
|
2017-01-25 04:33:13 -05:00
|
|
|
if (queryParamsHandling) {
|
|
|
|
switch (queryParamsHandling) {
|
|
|
|
case 'merge':
|
2017-03-26 10:15:10 -04:00
|
|
|
q = {...this.currentUrlTree.queryParams, ...queryParams};
|
2017-01-25 04:33:13 -05:00
|
|
|
break;
|
|
|
|
case 'preserve':
|
|
|
|
q = this.currentUrlTree.queryParams;
|
|
|
|
break;
|
|
|
|
default:
|
2017-04-17 14:13:13 -04:00
|
|
|
q = queryParams || null;
|
2017-01-25 04:33:13 -05:00
|
|
|
}
|
|
|
|
} else {
|
2017-04-17 14:13:13 -04:00
|
|
|
q = preserveQueryParams ? this.currentUrlTree.queryParams : queryParams || null;
|
2017-01-25 04:33:13 -05:00
|
|
|
}
|
2017-10-15 15:48:20 -04:00
|
|
|
if (q !== null) {
|
|
|
|
q = this.removeEmptyProps(q);
|
|
|
|
}
|
2017-04-17 14:13:13 -04:00
|
|
|
return createUrlTree(a, this.currentUrlTree, commands, q !, f !);
|
2016-05-26 19:51:56 -04:00
|
|
|
}
|
|
|
|
|
2016-06-15 11:30:49 -04:00
|
|
|
/**
|
|
|
|
* Navigate based on the provided url. This navigation is always absolute.
|
|
|
|
*
|
|
|
|
* Returns a promise that:
|
2016-12-09 13:44:46 -05:00
|
|
|
* - resolves to 'true' when navigation succeeds,
|
|
|
|
* - resolves to 'false' when navigation fails,
|
|
|
|
* - is rejected when an error happens.
|
2016-06-15 11:30:49 -04:00
|
|
|
*
|
2018-09-20 09:50:32 -04:00
|
|
|
* @usageNotes
|
|
|
|
*
|
|
|
|
* ### Example
|
2016-06-15 11:30:49 -04:00
|
|
|
*
|
|
|
|
* ```
|
|
|
|
* router.navigateByUrl("/team/33/user/11");
|
2016-08-04 14:46:09 -04:00
|
|
|
*
|
|
|
|
* // Navigate without updating the URL
|
|
|
|
* router.navigateByUrl("/team/33/user/11", { skipLocationChange: true });
|
2016-06-15 11:30:49 -04:00
|
|
|
* ```
|
2016-07-22 16:25:48 -04:00
|
|
|
*
|
2018-01-28 11:27:20 -05:00
|
|
|
* Since `navigateByUrl()` takes an absolute URL as the first parameter,
|
|
|
|
* it will not apply any delta to the current URL and ignores any properties
|
|
|
|
* in the second parameter (the `NavigationExtras`) that would change the
|
|
|
|
* provided URL.
|
2016-06-15 11:30:49 -04:00
|
|
|
*/
|
2016-08-04 14:46:09 -04:00
|
|
|
navigateByUrl(url: string|UrlTree, extras: NavigationExtras = {skipLocationChange: false}):
|
|
|
|
Promise<boolean> {
|
2018-08-09 02:45:15 -04:00
|
|
|
if (isDevMode() && this.isNgZoneEnabled && !NgZone.isInAngularZone()) {
|
|
|
|
this.console.warn(
|
|
|
|
`Navigation triggered outside Angular zone, did you forget to call 'ngZone.run()'?`);
|
|
|
|
}
|
|
|
|
|
2018-10-17 12:30:45 -04:00
|
|
|
const urlTree = isUrlTree(url) ? url : this.parseUrl(url);
|
2017-02-15 14:32:15 -05:00
|
|
|
const mergedTree = this.urlHandlingStrategy.merge(urlTree, this.rawUrlTree);
|
2016-12-09 13:44:46 -05:00
|
|
|
|
2018-11-28 19:18:22 -05:00
|
|
|
return this.scheduleNavigation(mergedTree, 'imperative', null, extras.state || null, extras);
|
2016-06-15 11:30:49 -04:00
|
|
|
}
|
|
|
|
|
2016-05-26 19:51:56 -04:00
|
|
|
/**
|
|
|
|
* Navigate based on the provided array of commands and a starting point.
|
|
|
|
* If no starting route is provided, the navigation is absolute.
|
|
|
|
*
|
2016-06-03 17:28:41 -04:00
|
|
|
* Returns a promise that:
|
2016-12-09 13:44:46 -05:00
|
|
|
* - resolves to 'true' when navigation succeeds,
|
|
|
|
* - resolves to 'false' when navigation fails,
|
|
|
|
* - is rejected when an error happens.
|
2016-06-03 17:28:41 -04:00
|
|
|
*
|
2018-09-20 09:50:32 -04:00
|
|
|
* @usageNotes
|
|
|
|
*
|
|
|
|
* ### Example
|
2016-05-26 19:51:56 -04:00
|
|
|
*
|
|
|
|
* ```
|
2016-09-07 17:10:19 -04:00
|
|
|
* router.navigate(['team', 33, 'user', 11], {relativeTo: route});
|
2016-08-04 14:46:09 -04:00
|
|
|
*
|
|
|
|
* // Navigate without updating the URL
|
2016-12-09 13:44:46 -05:00
|
|
|
* router.navigate(['team', 33, 'user', 11], {relativeTo: route, skipLocationChange: true});
|
2016-05-26 19:51:56 -04:00
|
|
|
* ```
|
2016-07-22 16:25:48 -04:00
|
|
|
*
|
2018-01-28 11:27:20 -05:00
|
|
|
* The first parameter of `navigate()` is a delta to be applied to the current URL
|
|
|
|
* or the one provided in the `relativeTo` property of the second parameter (the
|
|
|
|
* `NavigationExtras`).
|
2018-11-28 19:18:22 -05:00
|
|
|
*
|
|
|
|
* In order to affect this browser's `history.state` entry, the `state`
|
|
|
|
* parameter can be passed. This must be an object because the router
|
|
|
|
* will add the `navigationId` property to this object before creating
|
|
|
|
* the new history item.
|
2016-05-26 19:51:56 -04:00
|
|
|
*/
|
2016-08-04 14:46:09 -04:00
|
|
|
navigate(commands: any[], extras: NavigationExtras = {skipLocationChange: false}):
|
|
|
|
Promise<boolean> {
|
2016-12-11 17:33:21 -05:00
|
|
|
validateCommands(commands);
|
2016-10-28 17:56:08 -04:00
|
|
|
return this.navigateByUrl(this.createUrlTree(commands, extras), extras);
|
2016-05-26 19:51:56 -04:00
|
|
|
}
|
2016-06-06 19:34:48 -04:00
|
|
|
|
2018-04-05 06:53:57 -04:00
|
|
|
/** Serializes a `UrlTree` into a string */
|
2016-05-26 19:51:56 -04:00
|
|
|
serializeUrl(url: UrlTree): string { return this.urlSerializer.serialize(url); }
|
|
|
|
|
2018-04-05 06:53:57 -04:00
|
|
|
/** Parses a string into a `UrlTree` */
|
2018-04-10 06:01:07 -04:00
|
|
|
parseUrl(url: string): UrlTree {
|
|
|
|
let urlTree: UrlTree;
|
|
|
|
try {
|
|
|
|
urlTree = this.urlSerializer.parse(url);
|
|
|
|
} catch (e) {
|
|
|
|
urlTree = this.malformedUriErrorHandler(e, this.urlSerializer, url);
|
|
|
|
}
|
|
|
|
return urlTree;
|
|
|
|
}
|
2016-05-26 19:51:56 -04:00
|
|
|
|
2016-12-09 13:44:46 -05:00
|
|
|
/** Returns whether the url is activated */
|
2016-07-28 20:59:05 -04:00
|
|
|
isActive(url: string|UrlTree, exact: boolean): boolean {
|
2018-10-17 12:30:45 -04:00
|
|
|
if (isUrlTree(url)) {
|
2016-07-28 20:59:05 -04:00
|
|
|
return containsTree(this.currentUrlTree, url, exact);
|
|
|
|
}
|
2017-05-03 05:17:27 -04:00
|
|
|
|
2018-04-10 06:01:07 -04:00
|
|
|
const urlTree = this.parseUrl(url);
|
2017-05-03 05:17:27 -04:00
|
|
|
return containsTree(this.currentUrlTree, urlTree, exact);
|
2016-07-28 20:59:05 -04:00
|
|
|
}
|
|
|
|
|
2016-11-10 17:41:19 -05:00
|
|
|
private removeEmptyProps(params: Params): Params {
|
|
|
|
return Object.keys(params).reduce((result: Params, key: string) => {
|
|
|
|
const value: any = params[key];
|
|
|
|
if (value !== null && value !== undefined) {
|
|
|
|
result[key] = value;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}, {});
|
|
|
|
}
|
|
|
|
|
2016-10-28 17:56:08 -04:00
|
|
|
private processNavigations(): void {
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
this.navigations.subscribe(
|
|
|
|
t => {
|
|
|
|
this.navigated = true;
|
|
|
|
this.lastSuccessfulId = t.id;
|
|
|
|
(this.events as Subject<Event>)
|
|
|
|
.next(new NavigationEnd(
|
|
|
|
t.id, this.serializeUrl(t.extractedUrl), this.serializeUrl(this.currentUrlTree)));
|
|
|
|
t.resolve(true);
|
|
|
|
},
|
2018-09-17 17:37:30 -04:00
|
|
|
e => { this.console.warn(`Unhandled Navigation Error: `); });
|
2016-10-28 17:56:08 -04:00
|
|
|
}
|
|
|
|
|
2018-01-24 12:19:59 -05:00
|
|
|
private scheduleNavigation(
|
2018-11-14 18:24:40 -05:00
|
|
|
rawUrl: UrlTree, source: NavigationTrigger, restoredState: {navigationId: number}|null,
|
2018-11-28 19:18:22 -05:00
|
|
|
futureState: {[key: string]: any}|null, extras: NavigationExtras): Promise<boolean> {
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
const lastNavigation = this.getTransition();
|
2016-12-21 15:47:58 -05:00
|
|
|
// If the user triggers a navigation imperatively (e.g., by using navigateByUrl),
|
|
|
|
// and that navigation results in 'replaceState' that leads to the same URL,
|
|
|
|
// we should skip those.
|
|
|
|
if (lastNavigation && source !== 'imperative' && lastNavigation.source === 'imperative' &&
|
|
|
|
lastNavigation.rawUrl.toString() === rawUrl.toString()) {
|
2017-04-17 14:13:13 -04:00
|
|
|
return Promise.resolve(true); // return value is not used
|
2016-12-21 15:47:58 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Because of a bug in IE and Edge, the location class fires two events (popstate and
|
2017-02-15 14:32:15 -05:00
|
|
|
// hashchange) every single time. The second one should be ignored. Otherwise, the URL will
|
2017-10-06 13:22:02 -04:00
|
|
|
// flicker. Handles the case when a popstate was emitted first.
|
2016-12-21 15:47:58 -05:00
|
|
|
if (lastNavigation && source == 'hashchange' && lastNavigation.source === 'popstate' &&
|
|
|
|
lastNavigation.rawUrl.toString() === rawUrl.toString()) {
|
2017-04-17 14:13:13 -04:00
|
|
|
return Promise.resolve(true); // return value is not used
|
2016-12-21 15:47:58 -05:00
|
|
|
}
|
2017-10-06 13:22:02 -04:00
|
|
|
// Because of a bug in IE and Edge, the location class fires two events (popstate and
|
|
|
|
// hashchange) every single time. The second one should be ignored. Otherwise, the URL will
|
|
|
|
// flicker. Handles the case when a hashchange was emitted first.
|
|
|
|
if (lastNavigation && source == 'popstate' && lastNavigation.source === 'hashchange' &&
|
|
|
|
lastNavigation.rawUrl.toString() === rawUrl.toString()) {
|
|
|
|
return Promise.resolve(true); // return value is not used
|
|
|
|
}
|
2016-12-21 15:47:58 -05:00
|
|
|
|
2016-10-28 17:56:08 -04:00
|
|
|
let resolve: any = null;
|
|
|
|
let reject: any = null;
|
|
|
|
|
2017-08-02 20:32:02 -04:00
|
|
|
const promise = new Promise<boolean>((res, rej) => {
|
2016-10-28 17:56:08 -04:00
|
|
|
resolve = res;
|
|
|
|
reject = rej;
|
|
|
|
});
|
|
|
|
|
|
|
|
const id = ++this.navigationId;
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
this.setTransition({
|
|
|
|
id,
|
|
|
|
source,
|
2018-11-14 18:24:40 -05:00
|
|
|
restoredState,
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
currentUrlTree: this.currentUrlTree,
|
|
|
|
currentRawUrl: this.rawUrlTree, rawUrl, extras, resolve, reject, promise,
|
|
|
|
currentSnapshot: this.routerState.snapshot,
|
|
|
|
currentRouterState: this.routerState
|
|
|
|
});
|
2016-10-28 17:56:08 -04:00
|
|
|
|
2016-11-10 18:26:32 -05:00
|
|
|
// Make sure that the error is propagated even though `processNavigations` catch
|
|
|
|
// handler does not rethrow
|
refactor(router): move routing into a single Observable stream (#25740)
This is a major refactor of how the router previously worked. There are a couple major advantages of this refactor, and future work will be built on top of it.
First, we will no longer have multiple navigations running at the same time. Previously, a new navigation wouldn't cause the old navigation to be cancelled and cleaned up. Instead, multiple navigations could be going at once, and we imperatively checked that we were operating on the most current `router.navigationId` as we progressed through the Observable streams. This had some major faults, the biggest of which was async races where an ongoing async action could result in a redirect once the async action completed, but there was no way to guarantee there weren't also other redirects that would be queued up by other async actions. After this refactor, there's a single Observable stream that will get cleaned up each time a new navigation is requested.
Additionally, the individual pieces of routing have been pulled out into their own operators. While this was needed in order to create one continuous stream, it also will allow future improvements to the testing APIs as things such as Guards or Resolvers should now be able to be tested in much more isolation.
* Add the new `router.transitions` observable of the new `NavigationTransition` type to contain the transition information
* Update `router.navigations` to pipe off of `router.transitions`
* Re-write navigation Observable flow to a single configured stream
* Refactor `switchMap` instead of the previous `mergeMap` to ensure new navigations cause a cancellation and cleanup of already running navigations
* Wire in existing error and cancellation logic so cancellation matches previous behavior
PR Close #25740
2018-08-15 18:27:18 -04:00
|
|
|
return promise.catch((e: any) => { return Promise.reject(e); });
|
2016-05-24 16:23:27 -04:00
|
|
|
}
|
2016-11-02 14:30:00 -04:00
|
|
|
|
2018-11-28 19:18:22 -05:00
|
|
|
private setBrowserUrl(
|
|
|
|
url: UrlTree, replaceUrl: boolean, id: number, state?: {[key: string]: any}) {
|
2018-07-10 12:44:15 -04:00
|
|
|
const path = this.urlSerializer.serialize(url);
|
2018-11-28 19:18:22 -05:00
|
|
|
state = state || {};
|
2018-07-10 12:44:15 -04:00
|
|
|
if (this.location.isCurrentPathEqualTo(path) || replaceUrl) {
|
2018-11-28 19:18:22 -05:00
|
|
|
this.location.replaceState(path, '', {...state, navigationId: id});
|
2018-07-10 12:44:15 -04:00
|
|
|
} else {
|
2018-11-28 19:18:22 -05:00
|
|
|
this.location.go(path, '', {...state, navigationId: id});
|
2018-07-10 12:44:15 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-05 11:34:34 -05:00
|
|
|
private resetStateAndUrl(storedState: RouterState, storedUrl: UrlTree, rawUrl: UrlTree): void {
|
|
|
|
(this as{routerState: RouterState}).routerState = storedState;
|
|
|
|
this.currentUrlTree = storedUrl;
|
|
|
|
this.rawUrlTree = this.urlHandlingStrategy.merge(this.currentUrlTree, rawUrl);
|
|
|
|
this.resetUrlToCurrentUrlTree();
|
|
|
|
}
|
|
|
|
|
2016-11-02 14:30:00 -04:00
|
|
|
private resetUrlToCurrentUrlTree(): void {
|
2018-01-24 12:19:59 -05:00
|
|
|
this.location.replaceState(
|
|
|
|
this.urlSerializer.serialize(this.rawUrlTree), '', {navigationId: this.lastSuccessfulId});
|
2016-11-02 14:30:00 -04:00
|
|
|
}
|
2016-05-24 16:23:27 -04:00
|
|
|
}
|
|
|
|
|
2016-12-11 17:33:21 -05:00
|
|
|
function validateCommands(commands: string[]): void {
|
|
|
|
for (let i = 0; i < commands.length; i++) {
|
|
|
|
const cmd = commands[i];
|
|
|
|
if (cmd == null) {
|
|
|
|
throw new Error(`The requested path contains ${cmd} segment at index ${i}`);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|