@angular/router 21.0.1 → 21.1.0-next.0

package/fesm2022/_router_module-chunk.mjs

@@ -1,14 +1,14 @@
 /**
- * @license Angular v21.0.1
+ * @license Angular v21.1.0-next.0
  * (c) 2010-2025 Google LLC. https://angular.dev/
  * License: MIT
  */
 
 import * as i3 from '@angular/common';
-import { PlatformNavigation, Location, ɵNavigationAdapterForLocation as _NavigationAdapterForLocation, LOCATION_INITIALIZED, ViewportScroller, LocationStrategy, HashLocationStrategy, PathLocationStrategy } from '@angular/common';
+import { ViewportScroller, PlatformNavigation, PlatformLocation, Location, ɵNavigationAdapterForLocation as _NavigationAdapterForLocation, LOCATION_INITIALIZED, LocationStrategy, HashLocationStrategy, PathLocationStrategy } from '@angular/common';
 import * as i0 from '@angular/core';
-import { signal, untracked, inject, ɵINTERNAL_APPLICATION_ERROR_HANDLER as _INTERNAL_APPLICATION_ERROR_HANDLER, HostAttributeToken, ɵRuntimeError as _RuntimeError, booleanAttribute, Directive, Attribute, HostBinding, Input, HostListener, EventEmitter, ContentChildren, Output, Injectable, createEnvironmentInjector, InjectionToken, ɵpublishExternalGlobalUtil as _publishExternalGlobalUtil, makeEnvironmentProviders, APP_BOOTSTRAP_LISTENER, provideEnvironmentInitializer, Injector, ApplicationRef, ɵIS_ENABLED_BLOCKING_INITIAL_NAVIGATION as _IS_ENABLED_BLOCKING_INITIAL_NAVIGATION, provideAppInitializer, ɵperformanceMarkFeature as _performanceMarkFeature, ENVIRONMENT_INITIALIZER, NgZone, NgModule } from '@angular/core';
-import { ROUTER_CONFIGURATION, NavigationEnd, isUrlTree, Router, ActivatedRoute, RouterConfigLoader, IMPERATIVE_NAVIGATION, NavigationStart, NavigationSkipped, NavigationSkippedCode, Scroll, UrlSerializer, NavigationTransitions, HistoryStateManager, ROUTES, afterNextNavigation, StateManager, stringifyEvent, NAVIGATION_ERROR_HANDLER, RoutedComponentInputBinder, INPUT_BINDER, CREATE_VIEW_TRANSITION, createViewTransition, VIEW_TRANSITION_OPTIONS, DefaultUrlSerializer, ChildrenOutletContexts, RouterOutlet, ɵEmptyOutletComponent as _EmptyOutletComponent } from './_router-chunk.mjs';
+import { signal, untracked, inject, ɵINTERNAL_APPLICATION_ERROR_HANDLER as _INTERNAL_APPLICATION_ERROR_HANDLER, HostAttributeToken, ɵRuntimeError as _RuntimeError, booleanAttribute, Directive, Attribute, HostBinding, Input, HostListener, EventEmitter, ContentChildren, Output, Injectable, createEnvironmentInjector, InjectionToken, NgZone, EnvironmentInjector, DestroyRef, afterNextRender, ɵpromiseWithResolvers as _promiseWithResolvers, ɵpublishExternalGlobalUtil as _publishExternalGlobalUtil, makeEnvironmentProviders, APP_BOOTSTRAP_LISTENER, provideEnvironmentInitializer, Injector, ApplicationRef, ɵIS_ENABLED_BLOCKING_INITIAL_NAVIGATION as _IS_ENABLED_BLOCKING_INITIAL_NAVIGATION, provideAppInitializer, ɵperformanceMarkFeature as _performanceMarkFeature, ENVIRONMENT_INITIALIZER, NgModule } from '@angular/core';
+import { ROUTER_CONFIGURATION, NavigationEnd, isUrlTree, Router, ActivatedRoute, RouterConfigLoader, IMPERATIVE_NAVIGATION, UrlSerializer, NavigationTransitions, NavigationStart, NavigationSkipped, NavigationSkippedCode, Scroll, StateManager, RoutesRecognized, BeforeActivateRoutes, NavigationCancel, NavigationError, NavigationCancellationCode, ROUTES, afterNextNavigation, stringifyEvent, NAVIGATION_ERROR_HANDLER, RoutedComponentInputBinder, INPUT_BINDER, CREATE_VIEW_TRANSITION, createViewTransition, VIEW_TRANSITION_OPTIONS, DefaultUrlSerializer, ChildrenOutletContexts, RouterOutlet, ɵEmptyOutletComponent as _EmptyOutletComponent } from './_router-chunk.mjs';
 import { Subject, of, from } from 'rxjs';
 import { mergeAll, catchError, filter, concatMap, mergeMap } from 'rxjs/operators';
 
@@ -168,7 +168,7 @@ class RouterLink {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterLink,
     deps: [{
@@ -189,7 +189,7 @@ class RouterLink {
   });
   static ɵdir = i0.ɵɵngDeclareDirective({
     minVersion: "16.1.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     type: RouterLink,
     isStandalone: true,
     selector: "[routerLink]",
@@ -221,7 +221,7 @@ class RouterLink {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.1",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: RouterLink,
   decorators: [{
@@ -397,7 +397,7 @@ class RouterLinkActive {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterLinkActive,
     deps: [{
@@ -413,7 +413,7 @@ class RouterLinkActive {
   });
   static ɵdir = i0.ɵɵngDeclareDirective({
     minVersion: "14.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     type: RouterLinkActive,
     isStandalone: true,
     selector: "[routerLinkActive]",
@@ -437,7 +437,7 @@ class RouterLinkActive {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.1",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: RouterLinkActive,
   decorators: [{
@@ -488,7 +488,7 @@ class PreloadAllModules {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: PreloadAllModules,
     deps: [],
@@ -496,7 +496,7 @@ class PreloadAllModules {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: PreloadAllModules,
     providedIn: 'root'
@@ -504,7 +504,7 @@ class PreloadAllModules {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.1",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: PreloadAllModules,
   decorators: [{
@@ -520,7 +520,7 @@ class NoPreloading {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: NoPreloading,
     deps: [],
@@ -528,7 +528,7 @@ class NoPreloading {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: NoPreloading,
     providedIn: 'root'
@@ -536,7 +536,7 @@ class NoPreloading {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.1",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: NoPreloading,
   decorators: [{
@@ -612,7 +612,7 @@ class RouterPreloader {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterPreloader,
     deps: [{
@@ -628,7 +628,7 @@ class RouterPreloader {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterPreloader,
     providedIn: 'root'
@@ -636,7 +636,7 @@ class RouterPreloader {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.1",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: RouterPreloader,
   decorators: [{
@@ -658,10 +658,6 @@ i0.ɵɵngDeclareClassMetadata({
 
 const ROUTER_SCROLLER = new InjectionToken(typeof ngDevMode !== 'undefined' && ngDevMode ? 'Router Scroller' : '');
 class RouterScroller {
-  urlSerializer;
-  transitions;
-  viewportScroller;
-  zone;
   options;
   routerEventsSubscription;
   scrollEventsSubscription;
@@ -669,14 +665,14 @@ class RouterScroller {
   lastSource = IMPERATIVE_NAVIGATION;
   restoredId = 0;
   store = {};
-  constructor(urlSerializer, transitions, viewportScroller, zone, options = {}) {
-    this.urlSerializer = urlSerializer;
-    this.transitions = transitions;
-    this.viewportScroller = viewportScroller;
-    this.zone = zone;
+  urlSerializer = inject(UrlSerializer);
+  zone = inject(NgZone);
+  viewportScroller = inject(ViewportScroller);
+  transitions = inject(NavigationTransitions);
+  constructor(options) {
     this.options = options;
-    options.scrollPositionRestoration ||= 'disabled';
-    options.anchorScrolling ||= 'disabled';
+    this.options.scrollPositionRestoration ||= 'disabled';
+    this.options.anchorScrolling ||= 'disabled';
   }
   init() {
     if (this.options.scrollPositionRestoration !== 'disabled') {
@@ -703,7 +699,7 @@ class RouterScroller {
   }
   consumeScrollEvents() {
     return this.transitions.events.subscribe(e => {
-      if (!(e instanceof Scroll)) return;
+      if (!(e instanceof Scroll) || e.scrollBehavior === 'manual') return;
       const instantScroll = {
         behavior: 'instant'
       };
@@ -723,6 +719,7 @@ class RouterScroller {
     });
   }
   scheduleScrollEvent(routerEvent, anchor) {
+    const scroll = untracked(this.transitions.currentNavigation)?.extras.scroll;
     this.zone.runOutsideAngular(async () => {
       await new Promise(resolve => {
         setTimeout(resolve);
@@ -731,7 +728,7 @@ class RouterScroller {
         }
       });
       this.zone.run(() => {
-        this.transitions.events.next(new Scroll(routerEvent, this.lastSource === 'popstate' ? this.store[this.restoredId] : null, anchor));
+        this.transitions.events.next(new Scroll(routerEvent, this.lastSource === 'popstate' ? this.store[this.restoredId] : null, anchor, scroll));
       });
     });
   }
@@ -741,7 +738,7 @@ class RouterScroller {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterScroller,
     deps: "invalid",
@@ -749,28 +746,20 @@ class RouterScroller {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterScroller
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.1",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: RouterScroller,
   decorators: [{
     type: Injectable
   }],
   ctorParameters: () => [{
-    type: UrlSerializer
-  }, {
-    type: NavigationTransitions
-  }, {
-    type: i3.ViewportScroller
-  }, {
-    type: i0.NgZone
-  }, {
     type: undefined
   }]
 });
@@ -790,27 +779,214 @@ function navigateByUrl(router, url) {
   return router.navigateByUrl(url);
 }
 
-class NavigationStateManager extends HistoryStateManager {
+class NavigationStateManager extends StateManager {
+  injector = inject(EnvironmentInjector);
   navigation = inject(PlatformNavigation);
+  inMemoryScrollingEnabled = inject(ROUTER_SCROLLER, {
+    optional: true
+  }) !== null;
+  base = new URL(inject(PlatformLocation).href).origin;
+  appRootURL = new URL(this.location.prepareExternalUrl?.('/') ?? '/', this.base).href;
+  activeHistoryEntry = this.navigation.currentEntry;
+  currentNavigation = {};
+  nonRouterCurrentEntryChangeSubject = new Subject();
+  nonRouterEntryChangeListener;
+  get registered() {
+    return this.nonRouterEntryChangeListener !== undefined && !this.nonRouterEntryChangeListener.closed;
+  }
+  constructor() {
+    super();
+    const navigateListener = event => {
+      this.handleNavigate(event);
+    };
+    this.navigation.addEventListener('navigate', navigateListener);
+    inject(DestroyRef).onDestroy(() => this.navigation.removeEventListener('navigate', navigateListener));
+  }
   registerNonRouterCurrentEntryChangeListener(listener) {
-    return this.location.subscribe(event => {
-      if (event['type'] === 'popstate') {
-        const state = this.navigation.currentEntry?.getState();
-        listener(event['url'], state, 'popstate');
+    this.activeHistoryEntry = this.navigation.currentEntry;
+    this.nonRouterEntryChangeListener = this.nonRouterCurrentEntryChangeSubject.subscribe(({
+      path,
+      state
+    }) => {
+      listener(path, state, 'popstate');
+    });
+    return this.nonRouterEntryChangeListener;
+  }
+  async handleRouterEvent(e, transition) {
+    this.currentNavigation = {
+      ...this.currentNavigation,
+      routerTransition: transition
+    };
+    if (e instanceof NavigationStart) {
+      this.updateStateMemento();
+    } else if (e instanceof NavigationSkipped) {
+      this.finishNavigation();
+      this.commitTransition(transition);
+    } else if (e instanceof RoutesRecognized) {
+      if (this.urlUpdateStrategy === 'eager' && !transition.extras.skipLocationChange) {
+        this.createNavigationForTransition(transition);
+      }
+    } else if (e instanceof BeforeActivateRoutes) {
+      this.commitTransition(transition);
+      if (this.urlUpdateStrategy === 'deferred' && !transition.extras.skipLocationChange) {
+        this.createNavigationForTransition(transition);
+      }
+    } else if (e instanceof NavigationCancel || e instanceof NavigationError) {
+      void this.cancel(transition, e);
+    } else if (e instanceof NavigationEnd) {
+      const {
+        resolveHandler,
+        removeAbortListener
+      } = this.currentNavigation;
+      this.currentNavigation = {};
+      removeAbortListener?.();
+      this.activeHistoryEntry = this.navigation.currentEntry;
+      afterNextRender({
+        read: () => resolveHandler?.()
+      }, {
+        injector: this.injector
+      });
+    }
+  }
+  createNavigationForTransition(transition) {
+    this.currentNavigation.removeAbortListener?.();
+    const path = this.createBrowserPath(transition);
+    this.navigate(path, transition);
+  }
+  navigate(internalPath, transition) {
+    const path = transition.extras.skipLocationChange ? this.navigation.currentEntry.url : this.location.prepareExternalUrl(internalPath);
+    const state = {
+      ...transition.extras.state,
+      navigationId: transition.id
+    };
+    const info = {
+      ɵrouterInfo: {
+        intercept: true
+      }
+    };
+    const history = this.location.isCurrentPathEqualTo(path) || transition.extras.replaceUrl || transition.extras.skipLocationChange ? 'replace' : 'push';
+    handleResultRejections(this.navigation.navigate(path, {
+      state,
+      history,
+      info
+    }));
+  }
+  finishNavigation() {
+    this.currentNavigation?.resolveHandler?.();
+    this.currentNavigation = {};
+  }
+  async cancel(transition, cause) {
+    this.currentNavigation.rejectNavigateEvent?.();
+    const clearedState = {};
+    this.currentNavigation = clearedState;
+    if (cause instanceof NavigationCancel && (cause.code === NavigationCancellationCode.SupersededByNewNavigation || cause.code === NavigationCancellationCode.Redirect)) {
+      return;
+    }
+    const isTraversalReset = this.canceledNavigationResolution === 'computed' && this.navigation.currentEntry.key !== this.activeHistoryEntry.key;
+    this.resetInternalState(transition.finalUrl, isTraversalReset);
+    if (this.navigation.currentEntry.id === this.activeHistoryEntry.id) {
+      return;
+    }
+    if (cause instanceof NavigationCancel && cause.code !== NavigationCancellationCode.GuardRejected && cause.code !== NavigationCancellationCode.NoDataFromResolver) {
+      await Promise.resolve();
+      if (this.currentNavigation !== clearedState) {
+        return;
+      }
+    }
+    if (isTraversalReset) {
+      handleResultRejections(this.navigation.traverseTo(this.activeHistoryEntry.key, {
+        info: {
+          ɵrouterInfo: {
+            intercept: false
+          }
+        }
+      }));
+    } else {
+      const internalPath = this.urlSerializer.serialize(this.getCurrentUrlTree());
+      const pathOrUrl = this.location.prepareExternalUrl(internalPath);
+      handleResultRejections(this.navigation.navigate(pathOrUrl, {
+        state: this.activeHistoryEntry.getState(),
+        history: 'replace',
+        info: {
+          ɵrouterInfo: {
+            intercept: false
+          }
+        }
+      }));
+    }
+  }
+  resetInternalState(finalUrl, traversalReset) {
+    this.routerState = this.stateMemento.routerState;
+    this.currentUrlTree = this.stateMemento.currentUrlTree;
+    this.rawUrlTree = traversalReset ? this.stateMemento.rawUrlTree : this.urlHandlingStrategy.merge(this.currentUrlTree, finalUrl ?? this.rawUrlTree);
+  }
+  handleNavigate(event) {
+    if (!event.canIntercept) {
+      return;
+    }
+    const routerInfo = event?.info?.ɵrouterInfo;
+    if (routerInfo && !routerInfo.intercept) {
+      return;
+    }
+    const isTriggeredByRouterTransition = !!routerInfo;
+    if (!isTriggeredByRouterTransition) {
+      this.currentNavigation.routerTransition?.abort();
+      if (!this.registered) {
+        this.finishNavigation();
+        return;
       }
+    }
+    this.currentNavigation = {
+      ...this.currentNavigation
+    };
+    const abortHandler = () => {
+      this.currentNavigation.routerTransition?.abort();
+    };
+    event.signal.addEventListener('abort', abortHandler);
+    this.currentNavigation.removeAbortListener = () => event.signal.removeEventListener('abort', abortHandler);
+    let scroll = this.inMemoryScrollingEnabled ? 'manual' : this.currentNavigation.routerTransition?.extras.scroll ?? 'after-transition';
+    const interceptOptions = {
+      scroll
+    };
+    const {
+      promise: handlerPromise,
+      resolve: resolveHandler,
+      reject: rejectHandler
+    } = _promiseWithResolvers();
+    this.currentNavigation.resolveHandler = () => {
+      this.currentNavigation.removeAbortListener?.();
+      resolveHandler();
+    };
+    this.currentNavigation.rejectNavigateEvent = () => {
+      this.currentNavigation.removeAbortListener?.();
+      rejectHandler();
+    };
+    handlerPromise.catch(() => {});
+    interceptOptions.handler = () => handlerPromise;
+    event.intercept(interceptOptions);
+    if (!isTriggeredByRouterTransition) {
+      this.handleNavigateEventTriggeredOutsideRouterAPIs(event);
+    }
+  }
+  handleNavigateEventTriggeredOutsideRouterAPIs(event) {
+    const path = event.destination.url.substring(this.appRootURL.length - 1);
+    const state = event.destination.getState();
+    this.nonRouterCurrentEntryChangeSubject.next({
+      path,
+      state
     });
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: NavigationStateManager,
-    deps: null,
+    deps: [],
     target: i0.ɵɵFactoryTarget.Injectable
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: NavigationStateManager,
     providedIn: 'root'
@@ -818,7 +994,7 @@ class NavigationStateManager extends HistoryStateManager {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.1",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: NavigationStateManager,
   decorators: [{
@@ -826,8 +1002,14 @@ i0.ɵɵngDeclareClassMetadata({
     args: [{
       providedIn: 'root'
     }]
-  }]
+  }],
+  ctorParameters: () => []
 });
+function handleResultRejections(result) {
+  result.finished.catch(() => {});
+  result.committed.catch(() => {});
+  return result;
+}
 
 function provideRouter(routes, ...features) {
   if (typeof ngDevMode === 'undefined' || ngDevMode) {
@@ -884,13 +1066,7 @@ function provideRoutes(routes) {
 function withInMemoryScrolling(options = {}) {
   const providers = [{
     provide: ROUTER_SCROLLER,
-    useFactory: () => {
-      const viewportScroller = inject(ViewportScroller);
-      const zone = inject(NgZone);
-      const transitions = inject(NavigationTransitions);
-      const urlSerializer = inject(UrlSerializer);
-      return new RouterScroller(urlSerializer, transitions, viewportScroller, zone, options);
-    }
+    useFactory: () => new RouterScroller(options)
   }];
   return routerFeature(4, providers);
 }
@@ -1111,7 +1287,7 @@ class RouterModule {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterModule,
     deps: [],
@@ -1119,7 +1295,7 @@ class RouterModule {
   });
   static ɵmod = i0.ɵɵngDeclareNgModule({
     minVersion: "14.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterModule,
     imports: [RouterOutlet, RouterLink, RouterLinkActive, _EmptyOutletComponent],
@@ -1127,14 +1303,14 @@ class RouterModule {
   });
   static ɵinj = i0.ɵɵngDeclareInjector({
     minVersion: "12.0.0",
-    version: "21.0.1",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterModule
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.1",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: RouterModule,
   decorators: [{
@@ -1151,14 +1327,11 @@ function provideRouterScroller() {
     provide: ROUTER_SCROLLER,
     useFactory: () => {
       const viewportScroller = inject(ViewportScroller);
-      const zone = inject(NgZone);
       const config = inject(ROUTER_CONFIGURATION);
-      const transitions = inject(NavigationTransitions);
-      const urlSerializer = inject(UrlSerializer);
       if (config.scrollOffset) {
         viewportScroller.setOffset(config.scrollOffset);
       }
-      return new RouterScroller(urlSerializer, transitions, viewportScroller, zone, config);
+      return new RouterScroller(config);
     }
   };
 }