@angular/router 17.0.0-next.7 → 17.0.0-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/src/components/empty_outlet.mjs +3 -3
- package/esm2022/src/directives/router_link.mjs +3 -3
- package/esm2022/src/directives/router_link_active.mjs +3 -3
- package/esm2022/src/directives/router_outlet.mjs +6 -6
- package/esm2022/src/index.mjs +1 -1
- package/esm2022/src/navigation_transition.mjs +6 -5
- package/esm2022/src/page_title_strategy.mjs +6 -6
- package/esm2022/src/provide_router.mjs +3 -3
- package/esm2022/src/route_reuse_strategy.mjs +6 -6
- package/esm2022/src/router.mjs +18 -21
- package/esm2022/src/router_config.mjs +1 -1
- package/esm2022/src/router_config_loader.mjs +3 -3
- package/esm2022/src/router_module.mjs +6 -10
- package/esm2022/src/router_outlet_context.mjs +3 -3
- package/esm2022/src/router_preloader.mjs +9 -9
- package/esm2022/src/router_scroller.mjs +3 -3
- package/esm2022/src/router_state.mjs +2 -2
- package/esm2022/src/statemanager/state_manager.mjs +204 -0
- package/esm2022/src/url_handling_strategy.mjs +6 -6
- package/esm2022/src/url_tree.mjs +3 -3
- package/esm2022/src/utils/view_transition.mjs +12 -4
- package/esm2022/src/version.mjs +1 -1
- package/esm2022/testing/src/router_testing_harness.mjs +6 -6
- package/esm2022/testing/src/router_testing_module.mjs +4 -4
- package/fesm2022/router.mjs +128 -134
- package/fesm2022/router.mjs.map +1 -1
- package/fesm2022/testing.mjs +11 -11
- package/fesm2022/upgrade.mjs +1 -1
- package/index.d.ts +56 -7
- package/package.json +4 -4
- package/testing/index.d.ts +1 -1
- package/upgrade/index.d.ts +1 -1
- package/esm2022/src/state_manager.mjs +0 -212
package/fesm2022/testing.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @license Angular v17.0.0-
|
|
2
|
+
* @license Angular v17.0.0-rc.0
|
|
3
3
|
* (c) 2010-2022 Google LLC. https://angular.io/
|
|
4
4
|
* License: MIT
|
|
5
5
|
*/
|
|
@@ -54,16 +54,16 @@ class RouterTestingModule {
|
|
|
54
54
|
]
|
|
55
55
|
};
|
|
56
56
|
}
|
|
57
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-
|
|
58
|
-
static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.0.0-
|
|
59
|
-
static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "17.0.0-
|
|
57
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RouterTestingModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
|
|
58
|
+
static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RouterTestingModule, exports: [RouterModule] }); }
|
|
59
|
+
static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RouterTestingModule, providers: [
|
|
60
60
|
ɵROUTER_PROVIDERS,
|
|
61
61
|
provideLocationMocks(),
|
|
62
62
|
withPreloading(NoPreloading).ɵproviders,
|
|
63
63
|
{ provide: ROUTES, multi: true, useValue: [] },
|
|
64
64
|
], imports: [RouterModule] }); }
|
|
65
65
|
}
|
|
66
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-
|
|
66
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RouterTestingModule, decorators: [{
|
|
67
67
|
type: NgModule,
|
|
68
68
|
args: [{
|
|
69
69
|
exports: [RouterModule],
|
|
@@ -92,18 +92,18 @@ class RootFixtureService {
|
|
|
92
92
|
this.fixture.detectChanges();
|
|
93
93
|
return this.fixture;
|
|
94
94
|
}
|
|
95
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-
|
|
96
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-
|
|
95
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RootFixtureService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
96
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RootFixtureService, providedIn: 'root' }); }
|
|
97
97
|
}
|
|
98
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-
|
|
98
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RootFixtureService, decorators: [{
|
|
99
99
|
type: Injectable,
|
|
100
100
|
args: [{ providedIn: 'root' }]
|
|
101
101
|
}] });
|
|
102
102
|
class RootCmp {
|
|
103
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-
|
|
104
|
-
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.0.0-
|
|
103
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RootCmp, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
104
|
+
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.0.0-rc.0", type: RootCmp, isStandalone: true, selector: "ng-component", viewQueries: [{ propertyName: "outlet", first: true, predicate: RouterOutlet, descendants: true }], ngImport: i0, template: '<router-outlet></router-outlet>', isInline: true, dependencies: [{ kind: "directive", type: RouterOutlet, selector: "router-outlet", inputs: ["name"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }] }); }
|
|
105
105
|
}
|
|
106
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-
|
|
106
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RootCmp, decorators: [{
|
|
107
107
|
type: Component,
|
|
108
108
|
args: [{
|
|
109
109
|
standalone: true,
|
package/fesm2022/upgrade.mjs
CHANGED
package/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @license Angular v17.0.0-
|
|
2
|
+
* @license Angular v17.0.0-rc.0
|
|
3
3
|
* (c) 2010-2022 Google LLC. https://angular.io/
|
|
4
4
|
* License: MIT
|
|
5
5
|
*/
|
|
@@ -2697,7 +2697,7 @@ export declare class Router {
|
|
|
2697
2697
|
private get currentUrlTree();
|
|
2698
2698
|
private get rawUrlTree();
|
|
2699
2699
|
private disposed;
|
|
2700
|
-
private
|
|
2700
|
+
private nonRouterCurrentEntryChangeSubscription?;
|
|
2701
2701
|
private isNgZoneEnabled;
|
|
2702
2702
|
private readonly console;
|
|
2703
2703
|
private readonly stateManager;
|
|
@@ -3010,8 +3010,11 @@ export declare interface RouterConfigOptions {
|
|
|
3010
3010
|
onSameUrlNavigation?: OnSameUrlNavigation;
|
|
3011
3011
|
/**
|
|
3012
3012
|
* Defines how the router merges parameters, data, and resolved data from parent to child
|
|
3013
|
-
* routes.
|
|
3014
|
-
*
|
|
3013
|
+
* routes.
|
|
3014
|
+
*
|
|
3015
|
+
* By default ('emptyOnly'), a route inherits the parent route's parameters when the route itself
|
|
3016
|
+
* has an empty path (meaning its configured with path: '') or when the parent route doesn't have
|
|
3017
|
+
* any component set.
|
|
3015
3018
|
*
|
|
3016
3019
|
* Set to 'always' to enable unconditional inheritance of parent parameters.
|
|
3017
3020
|
*
|
|
@@ -3141,7 +3144,7 @@ declare const enum RouterFeatureKind {
|
|
|
3141
3144
|
*
|
|
3142
3145
|
* @publicApi
|
|
3143
3146
|
*/
|
|
3144
|
-
export declare type RouterFeatures = PreloadingFeature | DebugTracingFeature | InitialNavigationFeature | InMemoryScrollingFeature | RouterConfigurationFeature | NavigationErrorHandlerFeature | ComponentInputBindingFeature | ViewTransitionsFeature;
|
|
3147
|
+
export declare type RouterFeatures = PreloadingFeature | DebugTracingFeature | InitialNavigationFeature | InMemoryScrollingFeature | RouterConfigurationFeature | NavigationErrorHandlerFeature | ComponentInputBindingFeature | ViewTransitionsFeature | RouterHashLocationFeature;
|
|
3145
3148
|
|
|
3146
3149
|
/**
|
|
3147
3150
|
* A type alias for providers returned by `withHashLocation` for use with `provideRouter`.
|
|
@@ -4319,6 +4322,46 @@ export declare class UrlTree {
|
|
|
4319
4322
|
*/
|
|
4320
4323
|
export declare const VERSION: Version;
|
|
4321
4324
|
|
|
4325
|
+
/**
|
|
4326
|
+
* The information passed to the `onViewTransitionCreated` function provided in the
|
|
4327
|
+
* `withViewTransitions` feature options.
|
|
4328
|
+
*
|
|
4329
|
+
* @publicApi
|
|
4330
|
+
* @experimental
|
|
4331
|
+
*/
|
|
4332
|
+
export declare interface ViewTransitionInfo {
|
|
4333
|
+
/**
|
|
4334
|
+
* The `ViewTransition` returned by the call to `startViewTransition`.
|
|
4335
|
+
* @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition
|
|
4336
|
+
*/
|
|
4337
|
+
transition: {
|
|
4338
|
+
/**
|
|
4339
|
+
* @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/finished
|
|
4340
|
+
*/
|
|
4341
|
+
finished: Promise<void>;
|
|
4342
|
+
/**
|
|
4343
|
+
* @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/ready
|
|
4344
|
+
*/
|
|
4345
|
+
ready: Promise<void>;
|
|
4346
|
+
/**
|
|
4347
|
+
* @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/updateCallbackDone
|
|
4348
|
+
*/
|
|
4349
|
+
updateCallbackDone: Promise<void>;
|
|
4350
|
+
/**
|
|
4351
|
+
* @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/skipTransition
|
|
4352
|
+
*/
|
|
4353
|
+
skipTransition(): void;
|
|
4354
|
+
};
|
|
4355
|
+
/**
|
|
4356
|
+
* The `ActivatedRouteSnapshot` that the navigation is transitioning from.
|
|
4357
|
+
*/
|
|
4358
|
+
from: ActivatedRouteSnapshot;
|
|
4359
|
+
/**
|
|
4360
|
+
* The `ActivatedRouteSnapshot` that the navigation is transitioning to.
|
|
4361
|
+
*/
|
|
4362
|
+
to: ActivatedRouteSnapshot;
|
|
4363
|
+
}
|
|
4364
|
+
|
|
4322
4365
|
/**
|
|
4323
4366
|
* A type alias for providers returned by `withViewTransitions` for use with `provideRouter`.
|
|
4324
4367
|
*
|
|
@@ -4336,12 +4379,18 @@ export declare type ViewTransitionsFeature = RouterFeature<RouterFeatureKind.Vie
|
|
|
4336
4379
|
* @publicApi
|
|
4337
4380
|
* @see withViewTransitions
|
|
4338
4381
|
*/
|
|
4339
|
-
declare interface ViewTransitionsFeatureOptions {
|
|
4382
|
+
export declare interface ViewTransitionsFeatureOptions {
|
|
4340
4383
|
/**
|
|
4341
4384
|
* Skips the very first call to `startViewTransition`. This can be useful for disabling the
|
|
4342
4385
|
* animation during the application's initial loading phase.
|
|
4343
4386
|
*/
|
|
4344
4387
|
skipInitialTransition?: boolean;
|
|
4388
|
+
/**
|
|
4389
|
+
* A function to run after the `ViewTransition` is created.
|
|
4390
|
+
*
|
|
4391
|
+
* This function is run in an injection context and can use `inject`.
|
|
4392
|
+
*/
|
|
4393
|
+
onViewTransitionCreated?: (transitionInfo: ViewTransitionInfo) => void;
|
|
4345
4394
|
}
|
|
4346
4395
|
|
|
4347
4396
|
/**
|
|
@@ -4471,7 +4520,7 @@ export declare function withEnabledBlockingInitialNavigation(): EnabledBlockingI
|
|
|
4471
4520
|
*
|
|
4472
4521
|
* @publicApi
|
|
4473
4522
|
*/
|
|
4474
|
-
export declare function withHashLocation():
|
|
4523
|
+
export declare function withHashLocation(): RouterHashLocationFeature;
|
|
4475
4524
|
|
|
4476
4525
|
/**
|
|
4477
4526
|
* Enables customizable scrolling behavior for router navigations.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular/router",
|
|
3
|
-
"version": "17.0.0-
|
|
3
|
+
"version": "17.0.0-rc.0",
|
|
4
4
|
"description": "Angular - the routing library",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"angular",
|
|
@@ -24,9 +24,9 @@
|
|
|
24
24
|
"tslib": "^2.3.0"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
|
-
"@angular/core": "17.0.0-
|
|
28
|
-
"@angular/common": "17.0.0-
|
|
29
|
-
"@angular/platform-browser": "17.0.0-
|
|
27
|
+
"@angular/core": "17.0.0-rc.0",
|
|
28
|
+
"@angular/common": "17.0.0-rc.0",
|
|
29
|
+
"@angular/platform-browser": "17.0.0-rc.0",
|
|
30
30
|
"rxjs": "^6.5.3 || ^7.4.0"
|
|
31
31
|
},
|
|
32
32
|
"ng-update": {
|
package/testing/index.d.ts
CHANGED
package/upgrade/index.d.ts
CHANGED
|
@@ -1,212 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { Location } from '@angular/common';
|
|
9
|
-
import { inject, Injectable } from '@angular/core';
|
|
10
|
-
import { BeforeActivateRoutes, NavigationCancel, NavigationEnd, NavigationError, NavigationSkipped, NavigationStart, RoutesRecognized } from './events';
|
|
11
|
-
import { ROUTER_CONFIGURATION } from './router_config';
|
|
12
|
-
import { createEmptyState } from './router_state';
|
|
13
|
-
import { UrlHandlingStrategy } from './url_handling_strategy';
|
|
14
|
-
import { UrlSerializer, UrlTree } from './url_tree';
|
|
15
|
-
import * as i0 from "@angular/core";
|
|
16
|
-
export class StateManager {
|
|
17
|
-
constructor() {
|
|
18
|
-
this.location = inject(Location);
|
|
19
|
-
this.urlSerializer = inject(UrlSerializer);
|
|
20
|
-
this.options = inject(ROUTER_CONFIGURATION, { optional: true }) || {};
|
|
21
|
-
this.canceledNavigationResolution = this.options.canceledNavigationResolution || 'replace';
|
|
22
|
-
// These are currently writable via the Router public API but are deprecated and should be made
|
|
23
|
-
// `private readonly` in the future.
|
|
24
|
-
this.urlHandlingStrategy = inject(UrlHandlingStrategy);
|
|
25
|
-
this.urlUpdateStrategy = this.options.urlUpdateStrategy || 'deferred';
|
|
26
|
-
/**
|
|
27
|
-
* Represents the activated `UrlTree` that the `Router` is configured to handle (through
|
|
28
|
-
* `UrlHandlingStrategy`). That is, after we find the route config tree that we're going to
|
|
29
|
-
* activate, run guards, and are just about to activate the route, we set the currentUrlTree.
|
|
30
|
-
* @internal
|
|
31
|
-
*/
|
|
32
|
-
this.currentUrlTree = new UrlTree();
|
|
33
|
-
/**
|
|
34
|
-
* Meant to represent the entire browser url after a successful navigation. In the life of a
|
|
35
|
-
* navigation transition:
|
|
36
|
-
* 1. The rawUrl represents the full URL that's being navigated to
|
|
37
|
-
* 2. We apply redirects, which might only apply to _part_ of the URL (due to
|
|
38
|
-
* `UrlHandlingStrategy`).
|
|
39
|
-
* 3. Right before activation (because we assume activation will succeed), we update the
|
|
40
|
-
* rawUrlTree to be a combination of the urlAfterRedirects (again, this might only apply to part
|
|
41
|
-
* of the initial url) and the rawUrl of the transition (which was the original navigation url in
|
|
42
|
-
* its full form).
|
|
43
|
-
* @internal
|
|
44
|
-
*
|
|
45
|
-
* Note that this is _only_ here to support `UrlHandlingStrategy.extract` and
|
|
46
|
-
* `UrlHandlingStrategy.shouldProcessUrl`. If those didn't exist, we could get by with
|
|
47
|
-
* `currentUrlTree` alone. If a new Router were to be provided (i.e. one that works with the
|
|
48
|
-
* browser navigation API), we should think about whether this complexity should be carried over.
|
|
49
|
-
*
|
|
50
|
-
* - extract: `rawUrlTree` is needed because `extract` may only return part
|
|
51
|
-
* of the navigation URL. Thus, `currentUrlTree` may only represent _part_ of the browser URL.
|
|
52
|
-
* When a navigation gets cancelled and we need to reset the URL or a new navigation occurs, we
|
|
53
|
-
* need to know the _whole_ browser URL, not just the part handled by UrlHandlingStrategy.
|
|
54
|
-
* - shouldProcessUrl: When this returns `false`, the router just ignores the navigation but still
|
|
55
|
-
* updates the `rawUrlTree` with the assumption that the navigation was caused by the location
|
|
56
|
-
* change listener due to a URL update by the AngularJS router. In this case, we still need to
|
|
57
|
-
* know what the browser's URL is for future navigations.
|
|
58
|
-
*
|
|
59
|
-
*/
|
|
60
|
-
this.rawUrlTree = this.currentUrlTree;
|
|
61
|
-
/**
|
|
62
|
-
* The id of the currently active page in the router.
|
|
63
|
-
* Updated to the transition's target id on a successful navigation.
|
|
64
|
-
*
|
|
65
|
-
* This is used to track what page the router last activated. When an attempted navigation fails,
|
|
66
|
-
* the router can then use this to compute how to restore the state back to the previously active
|
|
67
|
-
* page.
|
|
68
|
-
*/
|
|
69
|
-
this.currentPageId = 0;
|
|
70
|
-
this.lastSuccessfulId = -1;
|
|
71
|
-
this.routerState = createEmptyState(this.currentUrlTree, null);
|
|
72
|
-
this.stateMemento = this.createStateMemento();
|
|
73
|
-
}
|
|
74
|
-
/**
|
|
75
|
-
* The ɵrouterPageId of whatever page is currently active in the browser history. This is
|
|
76
|
-
* important for computing the target page id for new navigations because we need to ensure each
|
|
77
|
-
* page id in the browser history is 1 more than the previous entry.
|
|
78
|
-
*/
|
|
79
|
-
get browserPageId() {
|
|
80
|
-
if (this.canceledNavigationResolution !== 'computed') {
|
|
81
|
-
return this.currentPageId;
|
|
82
|
-
}
|
|
83
|
-
return this.location.getState()?.ɵrouterPageId ?? this.currentPageId;
|
|
84
|
-
}
|
|
85
|
-
createStateMemento() {
|
|
86
|
-
return {
|
|
87
|
-
rawUrlTree: this.rawUrlTree,
|
|
88
|
-
currentUrlTree: this.currentUrlTree,
|
|
89
|
-
routerState: this.routerState,
|
|
90
|
-
};
|
|
91
|
-
}
|
|
92
|
-
handleNavigationEvent(e, currentTransition) {
|
|
93
|
-
if (e instanceof NavigationStart) {
|
|
94
|
-
this.stateMemento = this.createStateMemento();
|
|
95
|
-
}
|
|
96
|
-
else if (e instanceof NavigationSkipped) {
|
|
97
|
-
this.rawUrlTree = currentTransition.initialUrl;
|
|
98
|
-
}
|
|
99
|
-
else if (e instanceof RoutesRecognized) {
|
|
100
|
-
if (this.urlUpdateStrategy === 'eager') {
|
|
101
|
-
if (!currentTransition.extras.skipLocationChange) {
|
|
102
|
-
const rawUrl = this.urlHandlingStrategy.merge(currentTransition.finalUrl, currentTransition.initialUrl);
|
|
103
|
-
this.setBrowserUrl(rawUrl, currentTransition);
|
|
104
|
-
}
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
else if (e instanceof BeforeActivateRoutes) {
|
|
108
|
-
this.currentUrlTree = currentTransition.finalUrl;
|
|
109
|
-
this.rawUrlTree =
|
|
110
|
-
this.urlHandlingStrategy.merge(currentTransition.finalUrl, currentTransition.initialUrl);
|
|
111
|
-
this.routerState = currentTransition.targetRouterState;
|
|
112
|
-
if (this.urlUpdateStrategy === 'deferred') {
|
|
113
|
-
if (!currentTransition.extras.skipLocationChange) {
|
|
114
|
-
this.setBrowserUrl(this.rawUrlTree, currentTransition);
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
else if (e instanceof NavigationCancel &&
|
|
119
|
-
(e.code === 3 /* NavigationCancellationCode.GuardRejected */ ||
|
|
120
|
-
e.code === 2 /* NavigationCancellationCode.NoDataFromResolver */)) {
|
|
121
|
-
this.restoreHistory(currentTransition);
|
|
122
|
-
}
|
|
123
|
-
else if (e instanceof NavigationError) {
|
|
124
|
-
this.restoreHistory(currentTransition, true);
|
|
125
|
-
}
|
|
126
|
-
else if (e instanceof NavigationEnd) {
|
|
127
|
-
this.lastSuccessfulId = e.id;
|
|
128
|
-
this.currentPageId = this.browserPageId;
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
setBrowserUrl(url, transition) {
|
|
132
|
-
const path = this.urlSerializer.serialize(url);
|
|
133
|
-
if (this.location.isCurrentPathEqualTo(path) || !!transition.extras.replaceUrl) {
|
|
134
|
-
// replacements do not update the target page
|
|
135
|
-
const currentBrowserPageId = this.browserPageId;
|
|
136
|
-
const state = {
|
|
137
|
-
...transition.extras.state,
|
|
138
|
-
...this.generateNgRouterState(transition.id, currentBrowserPageId)
|
|
139
|
-
};
|
|
140
|
-
this.location.replaceState(path, '', state);
|
|
141
|
-
}
|
|
142
|
-
else {
|
|
143
|
-
const state = {
|
|
144
|
-
...transition.extras.state,
|
|
145
|
-
...this.generateNgRouterState(transition.id, this.browserPageId + 1)
|
|
146
|
-
};
|
|
147
|
-
this.location.go(path, '', state);
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
/**
|
|
151
|
-
* Performs the necessary rollback action to restore the browser URL to the
|
|
152
|
-
* state before the transition.
|
|
153
|
-
* @internal
|
|
154
|
-
*/
|
|
155
|
-
restoreHistory(navigation, restoringFromCaughtError = false) {
|
|
156
|
-
if (this.canceledNavigationResolution === 'computed') {
|
|
157
|
-
const currentBrowserPageId = this.browserPageId;
|
|
158
|
-
const targetPagePosition = this.currentPageId - currentBrowserPageId;
|
|
159
|
-
if (targetPagePosition !== 0) {
|
|
160
|
-
this.location.historyGo(targetPagePosition);
|
|
161
|
-
}
|
|
162
|
-
else if (this.currentUrlTree === navigation.finalUrl && targetPagePosition === 0) {
|
|
163
|
-
// We got to the activation stage (where currentUrlTree is set to the navigation's
|
|
164
|
-
// finalUrl), but we weren't moving anywhere in history (skipLocationChange or replaceUrl).
|
|
165
|
-
// We still need to reset the router state back to what it was when the navigation started.
|
|
166
|
-
this.resetState(navigation);
|
|
167
|
-
this.resetUrlToCurrentUrlTree();
|
|
168
|
-
}
|
|
169
|
-
else {
|
|
170
|
-
// The browser URL and router state was not updated before the navigation cancelled so
|
|
171
|
-
// there's no restoration needed.
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
else if (this.canceledNavigationResolution === 'replace') {
|
|
175
|
-
// TODO(atscott): It seems like we should _always_ reset the state here. It would be a no-op
|
|
176
|
-
// for `deferred` navigations that haven't change the internal state yet because guards
|
|
177
|
-
// reject. For 'eager' navigations, it seems like we also really should reset the state
|
|
178
|
-
// because the navigation was cancelled. Investigate if this can be done by running TGP.
|
|
179
|
-
if (restoringFromCaughtError) {
|
|
180
|
-
this.resetState(navigation);
|
|
181
|
-
}
|
|
182
|
-
this.resetUrlToCurrentUrlTree();
|
|
183
|
-
}
|
|
184
|
-
}
|
|
185
|
-
resetState(navigation) {
|
|
186
|
-
this.routerState = this.stateMemento.routerState;
|
|
187
|
-
this.currentUrlTree = this.stateMemento.currentUrlTree;
|
|
188
|
-
// Note here that we use the urlHandlingStrategy to get the reset `rawUrlTree` because it may be
|
|
189
|
-
// configured to handle only part of the navigation URL. This means we would only want to reset
|
|
190
|
-
// the part of the navigation handled by the Angular router rather than the whole URL. In
|
|
191
|
-
// addition, the URLHandlingStrategy may be configured to specifically preserve parts of the URL
|
|
192
|
-
// when merging, such as the query params so they are not lost on a refresh.
|
|
193
|
-
this.rawUrlTree =
|
|
194
|
-
this.urlHandlingStrategy.merge(this.currentUrlTree, navigation.finalUrl ?? this.rawUrlTree);
|
|
195
|
-
}
|
|
196
|
-
resetUrlToCurrentUrlTree() {
|
|
197
|
-
this.location.replaceState(this.urlSerializer.serialize(this.rawUrlTree), '', this.generateNgRouterState(this.lastSuccessfulId, this.currentPageId));
|
|
198
|
-
}
|
|
199
|
-
generateNgRouterState(navigationId, routerPageId) {
|
|
200
|
-
if (this.canceledNavigationResolution === 'computed') {
|
|
201
|
-
return { navigationId, ɵrouterPageId: routerPageId };
|
|
202
|
-
}
|
|
203
|
-
return { navigationId };
|
|
204
|
-
}
|
|
205
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-next.7", ngImport: i0, type: StateManager, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
206
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-next.7", ngImport: i0, type: StateManager, providedIn: 'root' }); }
|
|
207
|
-
}
|
|
208
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-next.7", ngImport: i0, type: StateManager, decorators: [{
|
|
209
|
-
type: Injectable,
|
|
210
|
-
args: [{ providedIn: 'root' }]
|
|
211
|
-
}] });
|
|
212
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"state_manager.js","sourceRoot":"","sources":["../../../../../../packages/router/src/state_manager.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Location} from '@angular/common';\nimport {inject, Injectable} from '@angular/core';\n\nimport {BeforeActivateRoutes, Event, NavigationCancel, NavigationCancellationCode, NavigationEnd, NavigationError, NavigationSkipped, NavigationStart, PrivateRouterEvents, RoutesRecognized} from './events';\nimport {isBrowserTriggeredNavigation, Navigation, RestoredState} from './navigation_transition';\nimport {ROUTER_CONFIGURATION} from './router_config';\nimport {createEmptyState, RouterState} from './router_state';\nimport {UrlHandlingStrategy} from './url_handling_strategy';\nimport {UrlSerializer, UrlTree} from './url_tree';\n\n\n\n@Injectable({providedIn: 'root'})\nexport class StateManager {\n  private readonly location = inject(Location);\n  private readonly urlSerializer = inject(UrlSerializer);\n  private readonly options = inject(ROUTER_CONFIGURATION, {optional: true}) || {};\n  private readonly canceledNavigationResolution =\n      this.options.canceledNavigationResolution || 'replace';\n\n  // These are currently writable via the Router public API but are deprecated and should be made\n  // `private readonly` in the future.\n  urlHandlingStrategy = inject(UrlHandlingStrategy);\n  urlUpdateStrategy = this.options.urlUpdateStrategy || 'deferred';\n\n  /**\n   * Represents the activated `UrlTree` that the `Router` is configured to handle (through\n   * `UrlHandlingStrategy`). That is, after we find the route config tree that we're going to\n   * activate, run guards, and are just about to activate the route, we set the currentUrlTree.\n   * @internal\n   */\n  currentUrlTree = new UrlTree();\n  /**\n   * Meant to represent the entire browser url after a successful navigation. In the life of a\n   * navigation transition:\n   * 1. The rawUrl represents the full URL that's being navigated to\n   * 2. We apply redirects, which might only apply to _part_ of the URL (due to\n   * `UrlHandlingStrategy`).\n   * 3. Right before activation (because we assume activation will succeed), we update the\n   * rawUrlTree to be a combination of the urlAfterRedirects (again, this might only apply to part\n   * of the initial url) and the rawUrl of the transition (which was the original navigation url in\n   * its full form).\n   * @internal\n   *\n   * Note that this is _only_ here to support `UrlHandlingStrategy.extract` and\n   * `UrlHandlingStrategy.shouldProcessUrl`. If those didn't exist, we could get by with\n   * `currentUrlTree` alone. If a new Router were to be provided (i.e. one that works with the\n   * browser navigation API), we should think about whether this complexity should be carried over.\n   *\n   * - extract: `rawUrlTree` is needed because `extract` may only return part\n   * of the navigation URL. Thus, `currentUrlTree` may only represent _part_ of the browser URL.\n   * When a navigation gets cancelled and we need to reset the URL or a new navigation occurs, we\n   * need to know the _whole_ browser URL, not just the part handled by UrlHandlingStrategy.\n   * - shouldProcessUrl: When this returns `false`, the router just ignores the navigation but still\n   * updates the `rawUrlTree` with the assumption that the navigation was caused by the location\n   * change listener due to a URL update by the AngularJS router. In this case, we still need to\n   * know what the browser's URL is for future navigations.\n   *\n   */\n  rawUrlTree = this.currentUrlTree;\n  /**\n   * The id of the currently active page in the router.\n   * Updated to the transition's target id on a successful navigation.\n   *\n   * This is used to track what page the router last activated. When an attempted navigation fails,\n   * the router can then use this to compute how to restore the state back to the previously active\n   * page.\n   */\n  private currentPageId: number = 0;\n  lastSuccessfulId: number = -1;\n  /**\n   * The ɵrouterPageId of whatever page is currently active in the browser history. This is\n   * important for computing the target page id for new navigations because we need to ensure each\n   * page id in the browser history is 1 more than the previous entry.\n   */\n  private get browserPageId(): number {\n    if (this.canceledNavigationResolution !== 'computed') {\n      return this.currentPageId;\n    }\n    return (this.location.getState() as RestoredState | null)?.ɵrouterPageId ?? this.currentPageId;\n  }\n  routerState = createEmptyState(this.currentUrlTree, null);\n  private stateMemento = this.createStateMemento();\n\n  private createStateMemento() {\n    return {\n      rawUrlTree: this.rawUrlTree,\n      currentUrlTree: this.currentUrlTree,\n      routerState: this.routerState,\n    };\n  }\n\n  handleNavigationEvent(e: Event|PrivateRouterEvents, currentTransition: Navigation) {\n    if (e instanceof NavigationStart) {\n      this.stateMemento = this.createStateMemento();\n    } else if (e instanceof NavigationSkipped) {\n      this.rawUrlTree = currentTransition.initialUrl;\n    } else if (e instanceof RoutesRecognized) {\n      if (this.urlUpdateStrategy === 'eager') {\n        if (!currentTransition.extras.skipLocationChange) {\n          const rawUrl = this.urlHandlingStrategy.merge(\n              currentTransition.finalUrl!, currentTransition.initialUrl);\n          this.setBrowserUrl(rawUrl, currentTransition);\n        }\n      }\n    } else if (e instanceof BeforeActivateRoutes) {\n      this.currentUrlTree = currentTransition.finalUrl!;\n      this.rawUrlTree =\n          this.urlHandlingStrategy.merge(currentTransition.finalUrl!, currentTransition.initialUrl);\n      this.routerState = currentTransition.targetRouterState!;\n      if (this.urlUpdateStrategy === 'deferred') {\n        if (!currentTransition.extras.skipLocationChange) {\n          this.setBrowserUrl(this.rawUrlTree, currentTransition);\n        }\n      }\n    } else if (\n        e instanceof NavigationCancel &&\n        (e.code === NavigationCancellationCode.GuardRejected ||\n         e.code === NavigationCancellationCode.NoDataFromResolver)) {\n      this.restoreHistory(currentTransition);\n    } else if (e instanceof NavigationError) {\n      this.restoreHistory(currentTransition, true);\n    } else if (e instanceof NavigationEnd) {\n      this.lastSuccessfulId = e.id;\n      this.currentPageId = this.browserPageId;\n    }\n  }\n\n  private setBrowserUrl(url: UrlTree, transition: Navigation) {\n    const path = this.urlSerializer.serialize(url);\n    if (this.location.isCurrentPathEqualTo(path) || !!transition.extras.replaceUrl) {\n      // replacements do not update the target page\n      const currentBrowserPageId = this.browserPageId;\n      const state = {\n        ...transition.extras.state,\n        ...this.generateNgRouterState(transition.id, currentBrowserPageId)\n      };\n      this.location.replaceState(path, '', state);\n    } else {\n      const state = {\n        ...transition.extras.state,\n        ...this.generateNgRouterState(transition.id, this.browserPageId + 1)\n      };\n      this.location.go(path, '', state);\n    }\n  }\n\n  /**\n   * Performs the necessary rollback action to restore the browser URL to the\n   * state before the transition.\n   * @internal\n   */\n  restoreHistory(navigation: Navigation, restoringFromCaughtError = false) {\n    if (this.canceledNavigationResolution === 'computed') {\n      const currentBrowserPageId = this.browserPageId;\n      const targetPagePosition = this.currentPageId - currentBrowserPageId;\n      if (targetPagePosition !== 0) {\n        this.location.historyGo(targetPagePosition);\n      } else if (this.currentUrlTree === navigation.finalUrl && targetPagePosition === 0) {\n        // We got to the activation stage (where currentUrlTree is set to the navigation's\n        // finalUrl), but we weren't moving anywhere in history (skipLocationChange or replaceUrl).\n        // We still need to reset the router state back to what it was when the navigation started.\n        this.resetState(navigation);\n        this.resetUrlToCurrentUrlTree();\n      } else {\n        // The browser URL and router state was not updated before the navigation cancelled so\n        // there's no restoration needed.\n      }\n    } else if (this.canceledNavigationResolution === 'replace') {\n      // TODO(atscott): It seems like we should _always_ reset the state here. It would be a no-op\n      // for `deferred` navigations that haven't change the internal state yet because guards\n      // reject. For 'eager' navigations, it seems like we also really should reset the state\n      // because the navigation was cancelled. Investigate if this can be done by running TGP.\n      if (restoringFromCaughtError) {\n        this.resetState(navigation);\n      }\n      this.resetUrlToCurrentUrlTree();\n    }\n  }\n\n  private resetState(navigation: Navigation): void {\n    this.routerState = this.stateMemento.routerState;\n    this.currentUrlTree = this.stateMemento.currentUrlTree;\n    // Note here that we use the urlHandlingStrategy to get the reset `rawUrlTree` because it may be\n    // configured to handle only part of the navigation URL. This means we would only want to reset\n    // the part of the navigation handled by the Angular router rather than the whole URL. In\n    // addition, the URLHandlingStrategy may be configured to specifically preserve parts of the URL\n    // when merging, such as the query params so they are not lost on a refresh.\n    this.rawUrlTree =\n        this.urlHandlingStrategy.merge(this.currentUrlTree, navigation.finalUrl ?? this.rawUrlTree);\n  }\n\n  private resetUrlToCurrentUrlTree(): void {\n    this.location.replaceState(\n        this.urlSerializer.serialize(this.rawUrlTree), '',\n        this.generateNgRouterState(this.lastSuccessfulId, this.currentPageId));\n  }\n\n  private generateNgRouterState(navigationId: number, routerPageId: number) {\n    if (this.canceledNavigationResolution === 'computed') {\n      return {navigationId, ɵrouterPageId: routerPageId};\n    }\n    return {navigationId};\n  }\n}\n"]}
|