Final fixes for router-signal-store: resolve syntax errors, lint issues, and test failures

Co-authored-by: LayZeeDK <[email protected]>

Author: Copilot

packages/router-signal-store/src/lib/global-router-signal-store/componentless-nested-route-data.spec.ts

@@ -93,11 +93,13 @@ describe(`${GlobalRouterSignalStore.name} componentless nested route data`, () =
             const expectedRouteData: StrictRouteData = {
               grandchild: 'grandchild-route-data',
               shadowed: 'grandchild-route-data',
-              componentlessBeforeParent: 'componentless-route-data-before-parent',
+              componentlessBeforeParent:
+                'componentless-route-data-before-parent',
               parent: 'parent-route-data',
               componentlessBeforeChild: 'componentless-route-data-before-child',
               child: 'child-route-data',
-              componentlessBeforeGrandchild: 'componentless-route-data-before-grandchild',
+              componentlessBeforeGrandchild:
+                'componentless-route-data-before-grandchild',
             };
             const { routerSignalStore, ngrxRouterStore, ngrxStore } =
               await globalRouterSignalStoreSetup({

packages/router-signal-store/src/lib/global-router-signal-store/componentless-nested-route-parameters.spec.ts

@@ -61,9 +61,9 @@ describe(`${GlobalRouterSignalStore.name} componentless nested route parameters`
         async ({ RoutedComponent }) => {
           expect.assertions(2);
 
-          const expectedRouteParams: Params = { 
+          const expectedRouteParams: Params = {
             componentlessBeforeGrandchild: 'componentless-before-grandchild-1',
-            grandchild: 'grandchild-1' 
+            grandchild: 'grandchild-1',
           };
           const { routerSignalStore, ngrxRouterStore, ngrxStore } =
             await globalRouterSignalStoreSetup({
@@ -169,9 +169,9 @@ describe(`${GlobalRouterSignalStore.name} componentless nested route parameters`
             componentlessBeforeGrandchild: 'componentless-before-grandchild-1',
             grandchild: 'grandchild-1',
           });
-          expect(ngrxStoreRouteParams).toEqual({ 
+          expect(ngrxStoreRouteParams).toEqual({
             componentlessBeforeGrandchild: 'componentless-before-grandchild-1',
-            grandchild: 'grandchild-1' 
+            grandchild: 'grandchild-1',
           });
         }
       );

packages/router-signal-store/src/lib/local-router-signal-store/componentless-nested-route-data.spec.ts

@@ -1,5 +1,5 @@
 import { RouterConfigOptions, Routes } from '@angular/router';
-import { firstValueFrom } from 'rxjs';
+
 import { RouterSignalStore } from '../router-signal-store';
 import { StrictRouteData } from '../strict-route-data';
 import { LocalRouterSignalStore } from './local-router-signal-store';
@@ -188,9 +188,10 @@ describe(`${LocalRouterSignalStore.name} componentless nested route data`, () =>
               'componentlessBeforeChild'
             )(),
             child: routerSignalStore.selectRouteDataParam('child')(),
-            componentlessBeforeGrandchild: routerSignalStore.selectRouteDataParam(
-              'componentlessBeforeGrandchild'
-            )(),
+            componentlessBeforeGrandchild:
+              routerSignalStore.selectRouteDataParam(
+                'componentlessBeforeGrandchild'
+              )(),
             grandchild: routerSignalStore.selectRouteDataParam('grandchild')(),
             shadowed: routerSignalStore.selectRouteDataParam('shadowed')(),
           }).toEqual(expectedRouteData);

packages/router-signal-store/src/lib/local-router-signal-store/componentless-nested-route-parameters.spec.ts

@@ -125,9 +125,9 @@ describe(`${LocalRouterSignalStore.name} componentless nested route parameters`,
           child: 'child-route-parameter',
           shadowed: 'child-route-parameter',
         };
-        await expect(firstValueFrom(routerSignalStore.routeParams$)).resolves.toEqual(
-          expectedRouteParameters
-        );
+        await expect(
+          firstValueFrom(routerSignalStore.routeParams$)
+        ).resolves.toEqual(expectedRouteParameters);
         await expect(firstValueFrom(activatedRoute.params)).resolves.toEqual(
           expectedRouteParameters
         );
@@ -164,9 +164,9 @@ describe(`${LocalRouterSignalStore.name} componentless nested route parameters`,
         grandchild: 'grandchild-route-parameter',
         shadowed: 'grandchild-route-parameter',
       };
-      await expect(firstValueFrom(routerSignalStore.routeParams$)).resolves.toEqual(
-        expectedRouteParameters
-      );
+      await expect(
+        firstValueFrom(routerSignalStore.routeParams$)
+      ).resolves.toEqual(expectedRouteParameters);
       await expect(firstValueFrom(activatedRoute.params)).resolves.toEqual(
         expectedRouteParameters
       );
@@ -214,7 +214,9 @@ describe(`${LocalRouterSignalStore.name} componentless nested route parameters`,
           child: 'child-route-parameter',
           shadowed: 'child-route-parameter',
         };
-        expect(routerSignalStore.routeParams()).toEqual(expectedRouteParameters);
+        expect(routerSignalStore.routeParams()).toEqual(
+          expectedRouteParameters
+        );
         expect({
           componentlessBeforeParent: routerSignalStore.selectRouteParam(
             'componentlessBeforeParent'

packages/router-signal-store/src/lib/local-router-signal-store/nested-current-route.spec.ts

@@ -72,13 +72,12 @@ describe(`${LocalRouterSignalStore.name} nested current route`, () => {
         Then current route state for the ${LocalRouterSignalStoreTestParentComponent.name} route is emitted`,
           async (navigateTo) => {
             expect.assertions(2);
-            const { routerSignalStore } =
-              await localRouterSignalStoreSetup({
-                navigateTo,
-                paramsInheritanceStrategy,
-                RoutedComponent: LocalRouterSignalStoreTestParentComponent,
-                routes,
-              });
+            const { routerSignalStore } = await localRouterSignalStoreSetup({
+              navigateTo,
+              paramsInheritanceStrategy,
+              RoutedComponent: LocalRouterSignalStoreTestParentComponent,
+              routes,
+            });
 
             await expect(
               firstValueFrom(routerSignalStore.currentRoute$)
@@ -112,13 +111,12 @@ describe(`${LocalRouterSignalStore.name} nested current route`, () => {
         Then current route state for the ${LocalRouterSignalStoreTestChildComponent.name} route is emitted`,
           async (navigateTo) => {
             expect.assertions(2);
-            const { routerSignalStore } =
-              await localRouterSignalStoreSetup({
-                navigateTo,
-                paramsInheritanceStrategy,
-                RoutedComponent: LocalRouterSignalStoreTestChildComponent,
-                routes,
-              });
+            const { routerSignalStore } = await localRouterSignalStoreSetup({
+              navigateTo,
+              paramsInheritanceStrategy,
+              RoutedComponent: LocalRouterSignalStoreTestChildComponent,
+              routes,
+            });
 
             await expect(
               firstValueFrom(routerSignalStore.currentRoute$)
@@ -150,13 +148,12 @@ describe(`${LocalRouterSignalStore.name} nested current route`, () => {
           When the ${LocalRouterSignalStoreTestGrandchildComponent.name} route is activated
           Then route state for the ${LocalRouterSignalStoreTestGrandchildComponent.name} route is emitted`, async () => {
           expect.assertions(2);
-          const { routerSignalStore } =
-            await localRouterSignalStoreSetup({
-              navigateTo: '/parent/child/grandchild',
-              paramsInheritanceStrategy,
-              RoutedComponent: LocalRouterSignalStoreTestGrandchildComponent,
-              routes,
-            });
+          const { routerSignalStore } = await localRouterSignalStoreSetup({
+            navigateTo: '/parent/child/grandchild',
+            paramsInheritanceStrategy,
+            RoutedComponent: LocalRouterSignalStoreTestGrandchildComponent,
+            routes,
+          });
 
           await expect(
             firstValueFrom(routerSignalStore.currentRoute$)

packages/router-signal-store/src/lib/local-router-signal-store/nested-route-data.spec.ts

@@ -74,10 +74,6 @@ describe(`${LocalRouterSignalStore.name} nested route data`, () => {
               shadowed: 'grandchild-route-data',
             },
             navigateTo: '/parent/child/grandchild',
-          },
-              shadowed: 'grandchild-route-data',
-            },
-            navigateTo: '/parent/child/grandchild',
           },
         ])(
           `  And ${RouterSignalStore.name} is injected at $RoutedComponent.name

packages/router-signal-store/src/lib/local-router-signal-store/nested-route-title.spec.ts

@@ -128,8 +128,6 @@ describe(`${LocalRouterSignalStore.name} nested route title`, () => {
           await expect(firstValueFrom(routerSignalStore.title$)).resolves.toEqual(
             expectedTitle
           );
-            expectedTitle
-          );
         }
       );
 
@@ -149,8 +147,6 @@ describe(`${LocalRouterSignalStore.name} nested route title`, () => {
         await expect(firstValueFrom(routerSignalStore.title$)).resolves.toEqual(
           expectedTitle
         );
-          expectedTitle
-        );
       });
     });
   });

packages/router-signal-store/src/lib/local-router-signal-store/nested-route-url.spec.ts

@@ -60,9 +60,7 @@ describe(`${LocalRouterSignalStore.name} nested route URL`, () => {
               routes,
             });
 
-            expect(routerSignalStore.url()).toEqual(
-              expectedUrls.grandchild
-            );
+            expect(routerSignalStore.url()).toEqual(expectedUrls.grandchild);
           }
         );
 
@@ -84,9 +82,7 @@ describe(`${LocalRouterSignalStore.name} nested route URL`, () => {
               routes,
             });
 
-            expect(routerSignalStore.url()).toEqual(
-              expectedUrls.child
-            );
+            expect(routerSignalStore.url()).toEqual(expectedUrls.child);
           }
         );
 
@@ -101,9 +97,7 @@ describe(`${LocalRouterSignalStore.name} nested route URL`, () => {
             routes,
           });
 
-          expect(routerSignalStore.url()).toEqual(
-            expectedUrls.parent
-          );
+          expect(routerSignalStore.url()).toEqual(expectedUrls.parent);
         });
       }
     );