feat(router): add generic to router data (#2951)

Author: griest024

libs/router/src/data/helpers/collect-data.ts

@@ -9,7 +9,7 @@ import { collect } from '@daffodil/core';
  * Collects data defined in the entire tree of routes.
  * Shallow merges data, preferring fields of more deeply nested routes.
  */
-export const daffRouterDataCollect = (route: ActivatedRouteSnapshot): Route['data'] => {
+export const daffRouterDataCollect = <T extends Route['data'] = Route['data']>(route: ActivatedRouteSnapshot): T => {
   const ary = collect(route, (r) => r.children);
   const ret = ary.reduce(
     (acc, r) => r.data
@@ -18,7 +18,7 @@ export const daffRouterDataCollect = (route: ActivatedRouteSnapshot): Route['dat
         ...r.data,
       }
       : acc,
-    {},
+    <T>{},
   );
   return ret;
 };

libs/router/src/data/service/data.service.ts

@@ -17,12 +17,12 @@ import { daffRouterDataCollect } from '../helpers/collect-data';
 @Injectable({
   providedIn: 'root',
 })
-export class DaffRouterDataService {
+export class DaffRouterDataService<T extends Route['data'] = Route['data']> {
   /**
    * A collection of all the route data defined in any part of the currently activated route's tree.
    * Child route's data takes precendence over parent data.
    */
-  public data$: Observable<Route['data']>;
+  public data$: Observable<T>;
 
   constructor(
     private route: ActivatedRoute,
@@ -46,7 +46,7 @@ export class DaffRouterDataService {
       this.route.url,
     ).pipe(
       map(() => this.route.snapshot),
-      map(daffRouterDataCollect),
+      map(daffRouterDataCollect<T>),
     );
   }
 }