feat(router): extend paramters of RedirectFunction to include paramMap and queryParamMap

adds paramMap and queryParamMap to the partial ActivatedRoute of the
RedirectFn

fixes #angular#60842

Author: endlacer

goldens/public-api/router/index.api.md

@@ -612,7 +612,7 @@ export class RedirectCommand {
 }
 
 // @public
-export type RedirectFunction = (redirectData: Pick<ActivatedRouteSnapshot, 'routeConfig' | 'url' | 'params' | 'queryParams' | 'fragment' | 'data' | 'outlet' | 'title'>) => MaybeAsync<string | UrlTree>;
+export type RedirectFunction = (redirectData: Pick<ActivatedRouteSnapshot, 'routeConfig' | 'url' | 'params' | 'queryParams' | 'fragment' | 'data' | 'outlet' | 'title' | 'paramMap' | 'queryParamMap'>) => MaybeAsync<string | UrlTree>;
 
 // @public
 export interface Resolve<T> {

packages/router/src/apply_redirects.ts

@@ -201,11 +201,33 @@ function getRedirectResult(
     return Promise.resolve(redirectTo);
   }
   const redirectToFn = redirectTo;
-  const {queryParams, fragment, routeConfig, url, outlet, params, data, title} = currentSnapshot;
+  const {
+    queryParams,
+    fragment,
+    routeConfig,
+    url,
+    outlet,
+    params,
+    data,
+    title,
+    paramMap,
+    queryParamMap,
+  } = currentSnapshot;
   return firstValueFrom(
     wrapIntoObservable(
       runInInjectionContext(injector, () =>
-        redirectToFn({params, data, queryParams, fragment, routeConfig, url, outlet, title}),
+        redirectToFn({
+          params,
+          data,
+          queryParams,
+          fragment,
+          routeConfig,
+          url,
+          outlet,
+          title,
+          paramMap,
+          queryParamMap,
+        }),
       ),
     ),
   );

packages/router/src/models.ts

@@ -315,7 +315,16 @@ export type QueryParamsHandling = 'merge' | 'preserve' | 'replace' | '';
 export type RedirectFunction = (
   redirectData: Pick<
     ActivatedRouteSnapshot,
-    'routeConfig' | 'url' | 'params' | 'queryParams' | 'fragment' | 'data' | 'outlet' | 'title'
+    | 'routeConfig'
+    | 'url'
+    | 'params'
+    | 'queryParams'
+    | 'fragment'
+    | 'data'
+    | 'outlet'
+    | 'title'
+    | 'paramMap'
+    | 'queryParamMap'
   >,
 ) => MaybeAsync<string | UrlTree>;
 

packages/router/test/apply_redirects.spec.ts

@@ -1655,6 +1655,26 @@ describe('redirects', () => {
       );
     });
 
+    it('can access queryParamMap and paramMap and redirect using them', async () => {
+      await checkRedirect(
+        [
+          {
+            path: 'a/b',
+            redirectTo: ({queryParamMap, paramMap}) => {
+              const tree = TestBed.inject(Router).parseUrl(`other;id=${paramMap.get('id')}`);
+              tree.queryParams = {hl: queryParamMap.get('hl')};
+              return Promise.resolve(tree);
+            },
+          },
+          {path: '**', component: ComponentC},
+        ],
+        '/a/b;id=123?hl=en&q=hello',
+        (t: UrlTree) => {
+          expectTreeToBe(t, 'other;id=123?hl=en');
+        },
+      );
+    });
+
     it('with a function using inject and returning a UrlTree with params', async () => {
       await checkRedirect(
         [