@angular/router 16.0.0-next.3 → 16.0.0-next.5
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/apply_redirects.mjs +112 -0
- package/{esm2020 → esm2022}/src/components/empty_outlet.mjs +4 -4
- package/esm2022/src/create_url_tree.mjs +418 -0
- package/{esm2020 → esm2022}/src/directives/router_link.mjs +4 -4
- package/{esm2020 → esm2022}/src/directives/router_link_active.mjs +4 -4
- package/esm2022/src/directives/router_outlet.mjs +259 -0
- package/esm2022/src/index.mjs +30 -0
- package/esm2022/src/models_deprecated.mjs +9 -0
- package/esm2022/src/navigation_transition.mjs +391 -0
- package/esm2022/src/operators/activate_routes.mjs +180 -0
- package/esm2022/src/operators/recognize.mjs +16 -0
- package/{esm2020 → esm2022}/src/page_title_strategy.mjs +7 -7
- package/esm2022/src/provide_router.mjs +478 -0
- package/esm2022/src/recognize.mjs +360 -0
- package/{esm2020 → esm2022}/src/route_reuse_strategy.mjs +7 -7
- package/esm2022/src/router.mjs +719 -0
- package/esm2022/src/router_config.mjs +18 -0
- package/esm2022/src/router_config_loader.mjs +132 -0
- package/esm2022/src/router_module.mjs +219 -0
- package/{esm2020 → esm2022}/src/router_outlet_context.mjs +4 -4
- package/esm2022/src/router_preloader.mjs +167 -0
- package/{esm2020 → esm2022}/src/router_scroller.mjs +4 -4
- package/esm2022/src/router_state.mjs +408 -0
- package/{esm2020 → esm2022}/src/url_handling_strategy.mjs +7 -7
- package/esm2022/src/url_tree.mjs +642 -0
- package/esm2022/src/utils/config_matching.mjs +141 -0
- package/esm2022/src/utils/navigations.mjs +42 -0
- package/{esm2020 → esm2022}/src/version.mjs +1 -1
- package/{esm2020 → esm2022}/testing/src/router_testing_harness.mjs +7 -7
- package/{esm2020 → esm2022}/testing/src/router_testing_module.mjs +10 -10
- package/{fesm2020 → fesm2022}/router.mjs +481 -726
- package/fesm2022/router.mjs.map +1 -0
- package/{fesm2020 → fesm2022}/testing.mjs +16 -16
- package/{fesm2020 → fesm2022}/testing.mjs.map +1 -1
- package/{fesm2020 → fesm2022}/upgrade.mjs +1 -1
- package/index.d.ts +9 -10
- package/package.json +14 -24
- package/testing/index.d.ts +1 -1
- package/upgrade/index.d.ts +1 -1
- package/esm2020/src/apply_redirects.mjs +0 -331
- package/esm2020/src/create_url_tree.mjs +0 -454
- package/esm2020/src/create_url_tree_strategy.mjs +0 -78
- package/esm2020/src/deprecated_load_children.mjs +0 -13
- package/esm2020/src/directives/router_outlet.mjs +0 -259
- package/esm2020/src/index.mjs +0 -29
- package/esm2020/src/navigation_transition.mjs +0 -399
- package/esm2020/src/operators/activate_routes.mjs +0 -177
- package/esm2020/src/operators/apply_redirects.mjs +0 -14
- package/esm2020/src/operators/recognize.mjs +0 -14
- package/esm2020/src/provide_router.mjs +0 -477
- package/esm2020/src/recognize.mjs +0 -297
- package/esm2020/src/router.mjs +0 -689
- package/esm2020/src/router_config.mjs +0 -19
- package/esm2020/src/router_config_loader.mjs +0 -137
- package/esm2020/src/router_module.mjs +0 -216
- package/esm2020/src/router_preloader.mjs +0 -167
- package/esm2020/src/router_state.mjs +0 -411
- package/esm2020/src/url_tree.mjs +0 -631
- package/esm2020/src/utils/config_matching.mjs +0 -153
- package/esm2020/src/utils/navigations.mjs +0 -42
- package/fesm2015/router.mjs +0 -7138
- package/fesm2015/router.mjs.map +0 -1
- package/fesm2015/testing.mjs +0 -270
- package/fesm2015/testing.mjs.map +0 -1
- package/fesm2015/upgrade.mjs +0 -146
- package/fesm2015/upgrade.mjs.map +0 -1
- package/fesm2020/router.mjs.map +0 -1
- /package/{esm2020 → esm2022}/index.mjs +0 -0
- /package/{esm2020 → esm2022}/public_api.mjs +0 -0
- /package/{esm2020 → esm2022}/router.mjs +0 -0
- /package/{esm2020 → esm2022}/src/create_router_state.mjs +0 -0
- /package/{esm2020 → esm2022}/src/errors.mjs +0 -0
- /package/{esm2020 → esm2022}/src/events.mjs +0 -0
- /package/{esm2020 → esm2022}/src/models.mjs +0 -0
- /package/{esm2020 → esm2022}/src/navigation_canceling_error.mjs +0 -0
- /package/{esm2020 → esm2022}/src/operators/check_guards.mjs +0 -0
- /package/{esm2020 → esm2022}/src/operators/prioritized_guard_value.mjs +0 -0
- /package/{esm2020 → esm2022}/src/operators/resolve_data.mjs +0 -0
- /package/{esm2020 → esm2022}/src/operators/switch_tap.mjs +0 -0
- /package/{esm2020 → esm2022}/src/private_export.mjs +0 -0
- /package/{esm2020 → esm2022}/src/shared.mjs +0 -0
- /package/{esm2020 → esm2022}/src/utils/collection.mjs +0 -0
- /package/{esm2020 → esm2022}/src/utils/config.mjs +0 -0
- /package/{esm2020 → esm2022}/src/utils/functional_guards.mjs +0 -0
- /package/{esm2020 → esm2022}/src/utils/preactivation.mjs +0 -0
- /package/{esm2020 → esm2022}/src/utils/tree.mjs +0 -0
- /package/{esm2020 → esm2022}/src/utils/type_guards.mjs +0 -0
- /package/{esm2020 → esm2022}/testing/index.mjs +0 -0
- /package/{esm2020 → esm2022}/testing/public_api.mjs +0 -0
- /package/{esm2020 → esm2022}/testing/src/testing.mjs +0 -0
- /package/{esm2020 → esm2022}/testing/testing.mjs +0 -0
- /package/{esm2020 → esm2022}/upgrade/index.mjs +0 -0
- /package/{esm2020 → esm2022}/upgrade/public_api.mjs +0 -0
- /package/{esm2020 → esm2022}/upgrade/src/upgrade.mjs +0 -0
- /package/{esm2020 → esm2022}/upgrade/upgrade.mjs +0 -0
- /package/{fesm2020 → fesm2022}/upgrade.mjs.map +0 -0
|
@@ -1,167 +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 { Compiler, createEnvironmentInjector, EnvironmentInjector, Injectable } from '@angular/core';
|
|
9
|
-
import { from, of } from 'rxjs';
|
|
10
|
-
import { catchError, concatMap, filter, mergeAll, mergeMap } from 'rxjs/operators';
|
|
11
|
-
import { NavigationEnd } from './events';
|
|
12
|
-
import { Router } from './router';
|
|
13
|
-
import { RouterConfigLoader } from './router_config_loader';
|
|
14
|
-
import * as i0 from "@angular/core";
|
|
15
|
-
import * as i1 from "./router";
|
|
16
|
-
import * as i2 from "./router_config_loader";
|
|
17
|
-
/**
|
|
18
|
-
* @description
|
|
19
|
-
*
|
|
20
|
-
* Provides a preloading strategy.
|
|
21
|
-
*
|
|
22
|
-
* @publicApi
|
|
23
|
-
*/
|
|
24
|
-
export class PreloadingStrategy {
|
|
25
|
-
}
|
|
26
|
-
/**
|
|
27
|
-
* @description
|
|
28
|
-
*
|
|
29
|
-
* Provides a preloading strategy that preloads all modules as quickly as possible.
|
|
30
|
-
*
|
|
31
|
-
* ```
|
|
32
|
-
* RouterModule.forRoot(ROUTES, {preloadingStrategy: PreloadAllModules})
|
|
33
|
-
* ```
|
|
34
|
-
*
|
|
35
|
-
* @publicApi
|
|
36
|
-
*/
|
|
37
|
-
class PreloadAllModules {
|
|
38
|
-
preload(route, fn) {
|
|
39
|
-
return fn().pipe(catchError(() => of(null)));
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
PreloadAllModules.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.0-next.3", ngImport: i0, type: PreloadAllModules, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
43
|
-
PreloadAllModules.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.0-next.3", ngImport: i0, type: PreloadAllModules, providedIn: 'root' });
|
|
44
|
-
export { PreloadAllModules };
|
|
45
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0-next.3", ngImport: i0, type: PreloadAllModules, decorators: [{
|
|
46
|
-
type: Injectable,
|
|
47
|
-
args: [{ providedIn: 'root' }]
|
|
48
|
-
}] });
|
|
49
|
-
/**
|
|
50
|
-
* @description
|
|
51
|
-
*
|
|
52
|
-
* Provides a preloading strategy that does not preload any modules.
|
|
53
|
-
*
|
|
54
|
-
* This strategy is enabled by default.
|
|
55
|
-
*
|
|
56
|
-
* @publicApi
|
|
57
|
-
*/
|
|
58
|
-
class NoPreloading {
|
|
59
|
-
preload(route, fn) {
|
|
60
|
-
return of(null);
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
NoPreloading.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.0-next.3", ngImport: i0, type: NoPreloading, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
64
|
-
NoPreloading.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.0-next.3", ngImport: i0, type: NoPreloading, providedIn: 'root' });
|
|
65
|
-
export { NoPreloading };
|
|
66
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0-next.3", ngImport: i0, type: NoPreloading, decorators: [{
|
|
67
|
-
type: Injectable,
|
|
68
|
-
args: [{ providedIn: 'root' }]
|
|
69
|
-
}] });
|
|
70
|
-
/**
|
|
71
|
-
* The preloader optimistically loads all router configurations to
|
|
72
|
-
* make navigations into lazily-loaded sections of the application faster.
|
|
73
|
-
*
|
|
74
|
-
* The preloader runs in the background. When the router bootstraps, the preloader
|
|
75
|
-
* starts listening to all navigation events. After every such event, the preloader
|
|
76
|
-
* will check if any configurations can be loaded lazily.
|
|
77
|
-
*
|
|
78
|
-
* If a route is protected by `canLoad` guards, the preloaded will not load it.
|
|
79
|
-
*
|
|
80
|
-
* @publicApi
|
|
81
|
-
*/
|
|
82
|
-
class RouterPreloader {
|
|
83
|
-
constructor(router, compiler, injector, preloadingStrategy, loader) {
|
|
84
|
-
this.router = router;
|
|
85
|
-
this.injector = injector;
|
|
86
|
-
this.preloadingStrategy = preloadingStrategy;
|
|
87
|
-
this.loader = loader;
|
|
88
|
-
}
|
|
89
|
-
setUpPreloading() {
|
|
90
|
-
this.subscription =
|
|
91
|
-
this.router.events
|
|
92
|
-
.pipe(filter((e) => e instanceof NavigationEnd), concatMap(() => this.preload()))
|
|
93
|
-
.subscribe(() => { });
|
|
94
|
-
}
|
|
95
|
-
preload() {
|
|
96
|
-
return this.processRoutes(this.injector, this.router.config);
|
|
97
|
-
}
|
|
98
|
-
/** @nodoc */
|
|
99
|
-
ngOnDestroy() {
|
|
100
|
-
if (this.subscription) {
|
|
101
|
-
this.subscription.unsubscribe();
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
processRoutes(injector, routes) {
|
|
105
|
-
const res = [];
|
|
106
|
-
for (const route of routes) {
|
|
107
|
-
if (route.providers && !route._injector) {
|
|
108
|
-
route._injector =
|
|
109
|
-
createEnvironmentInjector(route.providers, injector, `Route: ${route.path}`);
|
|
110
|
-
}
|
|
111
|
-
const injectorForCurrentRoute = route._injector ?? injector;
|
|
112
|
-
const injectorForChildren = route._loadedInjector ?? injectorForCurrentRoute;
|
|
113
|
-
// Note that `canLoad` is only checked as a condition that prevents `loadChildren` and not
|
|
114
|
-
// `loadComponent`. `canLoad` guards only block loading of child routes by design. This
|
|
115
|
-
// happens as a consequence of needing to descend into children for route matching immediately
|
|
116
|
-
// while component loading is deferred until route activation. Because `canLoad` guards can
|
|
117
|
-
// have side effects, we cannot execute them here so we instead skip preloading altogether
|
|
118
|
-
// when present. Lastly, it remains to be decided whether `canLoad` should behave this way
|
|
119
|
-
// at all. Code splitting and lazy loading is separate from client-side authorization checks
|
|
120
|
-
// and should not be used as a security measure to prevent loading of code.
|
|
121
|
-
if ((route.loadChildren && !route._loadedRoutes && route.canLoad === undefined) ||
|
|
122
|
-
(route.loadComponent && !route._loadedComponent)) {
|
|
123
|
-
res.push(this.preloadConfig(injectorForCurrentRoute, route));
|
|
124
|
-
}
|
|
125
|
-
else if (route.children || route._loadedRoutes) {
|
|
126
|
-
res.push(this.processRoutes(injectorForChildren, (route.children ?? route._loadedRoutes)));
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
return from(res).pipe(mergeAll());
|
|
130
|
-
}
|
|
131
|
-
preloadConfig(injector, route) {
|
|
132
|
-
return this.preloadingStrategy.preload(route, () => {
|
|
133
|
-
let loadedChildren$;
|
|
134
|
-
if (route.loadChildren && route.canLoad === undefined) {
|
|
135
|
-
loadedChildren$ = this.loader.loadChildren(injector, route);
|
|
136
|
-
}
|
|
137
|
-
else {
|
|
138
|
-
loadedChildren$ = of(null);
|
|
139
|
-
}
|
|
140
|
-
const recursiveLoadChildren$ = loadedChildren$.pipe(mergeMap((config) => {
|
|
141
|
-
if (config === null) {
|
|
142
|
-
return of(void 0);
|
|
143
|
-
}
|
|
144
|
-
route._loadedRoutes = config.routes;
|
|
145
|
-
route._loadedInjector = config.injector;
|
|
146
|
-
// If the loaded config was a module, use that as the module/module injector going
|
|
147
|
-
// forward. Otherwise, continue using the current module/module injector.
|
|
148
|
-
return this.processRoutes(config.injector ?? injector, config.routes);
|
|
149
|
-
}));
|
|
150
|
-
if (route.loadComponent && !route._loadedComponent) {
|
|
151
|
-
const loadComponent$ = this.loader.loadComponent(route);
|
|
152
|
-
return from([recursiveLoadChildren$, loadComponent$]).pipe(mergeAll());
|
|
153
|
-
}
|
|
154
|
-
else {
|
|
155
|
-
return recursiveLoadChildren$;
|
|
156
|
-
}
|
|
157
|
-
});
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
RouterPreloader.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.0-next.3", ngImport: i0, type: RouterPreloader, deps: [{ token: i1.Router }, { token: i0.Compiler }, { token: i0.EnvironmentInjector }, { token: PreloadingStrategy }, { token: i2.RouterConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
161
|
-
RouterPreloader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.0-next.3", ngImport: i0, type: RouterPreloader, providedIn: 'root' });
|
|
162
|
-
export { RouterPreloader };
|
|
163
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0-next.3", ngImport: i0, type: RouterPreloader, decorators: [{
|
|
164
|
-
type: Injectable,
|
|
165
|
-
args: [{ providedIn: 'root' }]
|
|
166
|
-
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i0.Compiler }, { type: i0.EnvironmentInjector }, { type: PreloadingStrategy }, { type: i2.RouterConfigLoader }]; } });
|
|
167
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"router_preloader.js","sourceRoot":"","sources":["../../../../../../packages/router/src/router_preloader.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 {Compiler, createEnvironmentInjector, EnvironmentInjector, Injectable, OnDestroy} from '@angular/core';\nimport {from, Observable, of, Subscription} from 'rxjs';\nimport {catchError, concatMap, filter, mergeAll, mergeMap} from 'rxjs/operators';\n\nimport {Event, NavigationEnd} from './events';\nimport {LoadedRouterConfig, Route, Routes} from './models';\nimport {Router} from './router';\nimport {RouterConfigLoader} from './router_config_loader';\n\n\n/**\n * @description\n *\n * Provides a preloading strategy.\n *\n * @publicApi\n */\nexport abstract class PreloadingStrategy {\n  abstract preload(route: Route, fn: () => Observable<any>): Observable<any>;\n}\n\n/**\n * @description\n *\n * Provides a preloading strategy that preloads all modules as quickly as possible.\n *\n * ```\n * RouterModule.forRoot(ROUTES, {preloadingStrategy: PreloadAllModules})\n * ```\n *\n * @publicApi\n */\n@Injectable({providedIn: 'root'})\nexport class PreloadAllModules implements PreloadingStrategy {\n  preload(route: Route, fn: () => Observable<any>): Observable<any> {\n    return fn().pipe(catchError(() => of(null)));\n  }\n}\n\n/**\n * @description\n *\n * Provides a preloading strategy that does not preload any modules.\n *\n * This strategy is enabled by default.\n *\n * @publicApi\n */\n@Injectable({providedIn: 'root'})\nexport class NoPreloading implements PreloadingStrategy {\n  preload(route: Route, fn: () => Observable<any>): Observable<any> {\n    return of(null);\n  }\n}\n\n/**\n * The preloader optimistically loads all router configurations to\n * make navigations into lazily-loaded sections of the application faster.\n *\n * The preloader runs in the background. When the router bootstraps, the preloader\n * starts listening to all navigation events. After every such event, the preloader\n * will check if any configurations can be loaded lazily.\n *\n * If a route is protected by `canLoad` guards, the preloaded will not load it.\n *\n * @publicApi\n */\n@Injectable({providedIn: 'root'})\nexport class RouterPreloader implements OnDestroy {\n  private subscription?: Subscription;\n\n  constructor(\n      private router: Router, compiler: Compiler, private injector: EnvironmentInjector,\n      private preloadingStrategy: PreloadingStrategy, private loader: RouterConfigLoader) {}\n\n  setUpPreloading(): void {\n    this.subscription =\n        this.router.events\n            .pipe(filter((e: Event) => e instanceof NavigationEnd), concatMap(() => this.preload()))\n            .subscribe(() => {});\n  }\n\n  preload(): Observable<any> {\n    return this.processRoutes(this.injector, this.router.config);\n  }\n\n  /** @nodoc */\n  ngOnDestroy(): void {\n    if (this.subscription) {\n      this.subscription.unsubscribe();\n    }\n  }\n\n  private processRoutes(injector: EnvironmentInjector, routes: Routes): Observable<void> {\n    const res: Observable<any>[] = [];\n    for (const route of routes) {\n      if (route.providers && !route._injector) {\n        route._injector =\n            createEnvironmentInjector(route.providers, injector, `Route: ${route.path}`);\n      }\n\n      const injectorForCurrentRoute = route._injector ?? injector;\n      const injectorForChildren = route._loadedInjector ?? injectorForCurrentRoute;\n\n      // Note that `canLoad` is only checked as a condition that prevents `loadChildren` and not\n      // `loadComponent`. `canLoad` guards only block loading of child routes by design. This\n      // happens as a consequence of needing to descend into children for route matching immediately\n      // while component loading is deferred until route activation. Because `canLoad` guards can\n      // have side effects, we cannot execute them here so we instead skip preloading altogether\n      // when present. Lastly, it remains to be decided whether `canLoad` should behave this way\n      // at all. Code splitting and lazy loading is separate from client-side authorization checks\n      // and should not be used as a security measure to prevent loading of code.\n      if ((route.loadChildren && !route._loadedRoutes && route.canLoad === undefined) ||\n          (route.loadComponent && !route._loadedComponent)) {\n        res.push(this.preloadConfig(injectorForCurrentRoute, route));\n      } else if (route.children || route._loadedRoutes) {\n        res.push(this.processRoutes(injectorForChildren, (route.children ?? route._loadedRoutes)!));\n      }\n    }\n    return from(res).pipe(mergeAll());\n  }\n\n  private preloadConfig(injector: EnvironmentInjector, route: Route): Observable<void> {\n    return this.preloadingStrategy.preload(route, () => {\n      let loadedChildren$: Observable<LoadedRouterConfig|null>;\n      if (route.loadChildren && route.canLoad === undefined) {\n        loadedChildren$ = this.loader.loadChildren(injector, route);\n      } else {\n        loadedChildren$ = of(null);\n      }\n\n      const recursiveLoadChildren$ =\n          loadedChildren$.pipe(mergeMap((config: LoadedRouterConfig|null) => {\n            if (config === null) {\n              return of(void 0);\n            }\n            route._loadedRoutes = config.routes;\n            route._loadedInjector = config.injector;\n            // If the loaded config was a module, use that as the module/module injector going\n            // forward. Otherwise, continue using the current module/module injector.\n            return this.processRoutes(config.injector ?? injector, config.routes);\n          }));\n      if (route.loadComponent && !route._loadedComponent) {\n        const loadComponent$ = this.loader.loadComponent(route);\n        return from([recursiveLoadChildren$, loadComponent$]).pipe(mergeAll());\n      } else {\n        return recursiveLoadChildren$;\n      }\n    });\n  }\n}\n"]}
|