@angular/router 12.2.3 → 12.2.7

package/esm2015/src/version.js

@@ -14,5 +14,5 @@ import { Version } from '@angular/core';
 /**
  * @publicApi
  */
-export const VERSION = new Version('12.2.3');
+export const VERSION = new Version('12.2.7');
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3JvdXRlci9zcmMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSDs7OztHQUlHO0FBRUgsT0FBTyxFQUFDLE9BQU8sRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUV0Qzs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbi8qKlxuICogQG1vZHVsZVxuICogQGRlc2NyaXB0aW9uXG4gKiBFbnRyeSBwb2ludCBmb3IgYWxsIHB1YmxpYyBBUElzIG9mIHRoZSByb3V0ZXIgcGFja2FnZS5cbiAqL1xuXG5pbXBvcnQge1ZlcnNpb259IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG4vKipcbiAqIEBwdWJsaWNBcGlcbiAqL1xuZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbiJdfQ==

package/fesm2015/router.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v12.2.3
+ * @license Angular v12.2.7
  * (c) 2010-2021 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -3827,7 +3827,7 @@ function defaultRouterHook(snapshot, runExtras) {
     return of(null);
 }
 /**
- * The equivalent `IsActiveUrlTreeOptions` options for `Router.isActive` is called with `true`
+ * The equivalent `IsActiveMatchOptions` options for `Router.isActive` is called with `true`
  * (exact = true).
  */
 const exactMatchOptions = {
@@ -3837,7 +3837,7 @@ const exactMatchOptions = {
     queryParams: 'exact'
 };
 /**
- * The equivalent `IsActiveUrlTreeOptions` options for `Router.isActive` is called with `false`
+ * The equivalent `IsActiveMatchOptions` options for `Router.isActive` is called with `false`
  * (exact = false).
  */
 const subsetMatchOptions = {
@@ -4048,16 +4048,22 @@ class Router {
                         null
                 };
             }), switchMap(t => {
+                const browserUrlTree = this.browserUrlTree.toString();
                 const urlTransition = !this.navigated ||
-                    t.extractedUrl.toString() !== this.browserUrlTree.toString();
+                    t.extractedUrl.toString() !== browserUrlTree ||
+                    // Navigations which succeed or ones which fail and are cleaned up
+                    // correctly should result in `browserUrlTree` and `currentUrlTree`
+                    // matching. If this is not the case, assume something went wrong and try
+                    // processing the URL again.
+                    browserUrlTree !== this.currentUrlTree.toString();
                 const processCurrentUrl = (this.onSameUrlNavigation === 'reload' ? true : urlTransition) &&
                     this.urlHandlingStrategy.shouldProcessUrl(t.rawUrl);
-                // If the source of the navigation is from a browser event, the URL is
-                // already updated. We already need to sync the internal state.
-                if (isBrowserTriggeredNavigation(t.source)) {
-                    this.browserUrlTree = t.rawUrl;
-                }
                 if (processCurrentUrl) {
+                    // If the source of the navigation is from a browser event, the URL is
+                    // already updated. We already need to sync the internal state.
+                    if (isBrowserTriggeredNavigation(t.source)) {
+                        this.browserUrlTree = t.extractedUrl;
+                    }
                     return of(t).pipe(
                     // Fire NavigationStart event
                     switchMap(t => {
@@ -4083,6 +4089,13 @@ class Router {
                         if (this.urlUpdateStrategy === 'eager') {
                             if (!t.extras.skipLocationChange) {
                                 this.setBrowserUrl(t.urlAfterRedirects, t);
+                                // TODO(atscott): The above line is incorrect. It sets the url to
+                                // only the part that is handled by the router. It should merge
+                                // that with the rawUrl so the url includes segments not handled
+                                // by the router:
+                                //  const rawUrl = this.urlHandlingStrategy.merge(
+                                //      t.urlAfterRedirects, t.rawUrl);
+                                //  this.setBrowserUrl(rawUrl, t);
                             }
                             this.browserUrlTree = t.urlAfterRedirects;
                         }
@@ -4194,7 +4207,7 @@ class Router {
             tap((t) => {
                 this.currentUrlTree = t.urlAfterRedirects;
                 this.rawUrlTree =
-                    this.urlHandlingStrategy.merge(this.currentUrlTree, t.rawUrl);
+                    this.urlHandlingStrategy.merge(t.urlAfterRedirects, t.rawUrl);
                 this.routerState = t.targetRouterState;
                 if (this.urlUpdateStrategy === 'deferred') {
                     if (!t.extras.skipLocationChange) {
@@ -4329,6 +4342,12 @@ class Router {
     }
     getTransition() {
         const transition = this.transitions.value;
+        // TODO(atscott): This comment doesn't make it clear why this value needs to be set. In the case
+        // described below (where we don't handle previous or current url), the `browserUrlTree` is set
+        // to the `urlAfterRedirects` value. However, these values *are already the same* because of the
+        // line below. So it seems that we should be able to remove the line below and the line where
+        // `browserUrlTree` is updated when we aren't handling any part of the navigation url.
+        // Run TGP to confirm that this can be done.
         // This value needs to be set. Other values such as extractedUrl are set on initial navigation
         // but the urlAfterRedirects may not get set if we aren't processing the new URL *and* not
         // processing the previous URL.
@@ -4650,7 +4669,7 @@ class Router {
             this.lastSuccessfulNavigation = this.currentNavigation;
             t.resolve(true);
         }, e => {
-            this.console.warn(`Unhandled Navigation Error: `);
+            this.console.warn(`Unhandled Navigation Error: ${e}`);
         });
     }
     scheduleNavigation(rawUrl, source, restoredState, extras, priorPromise) {
@@ -6074,7 +6093,7 @@ function provideRouterInitializer() {
 /**
  * @publicApi
  */
-const VERSION = new Version('12.2.3');
+const VERSION = new Version('12.2.7');
 
 /**
  * @license