Skip to content

Commit 5cfee85

Browse files
authored
refactor: replace constructor-injected dependencies with inject (#297)
# Refactors - Replace constructor-injected dependencies with `inject` to normalize codebase.
1 parent 383a0c5 commit 5cfee85

File tree

2 files changed

+27
-18
lines changed

2 files changed

+27
-18
lines changed

packages/router-component-store/src/lib/global-router-store/global-router-store.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable } from '@angular/core';
1+
import { inject, Injectable } from '@angular/core';
22
import { Data, Params, Router } from '@angular/router';
33
import { ComponentStore } from '@ngrx/component-store';
44
import { map, Observable } from 'rxjs';
@@ -16,6 +16,9 @@ export class GlobalRouterStore
1616
extends ComponentStore<GlobalRouterState>
1717
implements RouterStore
1818
{
19+
#router = inject(Router);
20+
#serializer = inject(MinimalRouterStateSerializer);
21+
1922
#routerState$: Observable<MinimalRouterStateSnapshot> = this.select(
2023
(state) => state.routerState
2124
);
@@ -59,14 +62,17 @@ export class GlobalRouterStore
5962
(routerState) => routerState.url
6063
);
6164

62-
constructor(router: Router, serializer: MinimalRouterStateSerializer) {
63-
super({
64-
routerState: serializer.serialize(router.routerState.snapshot),
65+
constructor() {
66+
super();
67+
this.setState({
68+
routerState: this.#serializer.serialize(
69+
this.#router.routerState.snapshot
70+
),
6571
});
6672

6773
this.#updateRouterState(
68-
router.events.pipe(
69-
map(() => serializer.serialize(router.routerState.snapshot))
74+
this.#router.events.pipe(
75+
map(() => this.#serializer.serialize(this.#router.routerState.snapshot))
7076
)
7177
);
7278
}

packages/router-component-store/src/lib/local-router-store/local-router-store.ts

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable } from '@angular/core';
1+
import { inject, Injectable } from '@angular/core';
22
import { ActivatedRoute, Data, Params, Router } from '@angular/router';
33
import { ComponentStore } from '@ngrx/component-store';
44
import { map, Observable } from 'rxjs';
@@ -16,6 +16,10 @@ export class LocalRouterStore
1616
extends ComponentStore<LocalRouterState>
1717
implements RouterStore
1818
{
19+
#route = inject(ActivatedRoute);
20+
#router = inject(Router);
21+
#serializer = inject(MinimalRouterStateSerializer);
22+
1923
#routerState$: Observable<MinimalRouterStateSnapshot> = this.select(
2024
(state) => state.routerState
2125
);
@@ -44,25 +48,24 @@ export class LocalRouterStore
4448
(routerState) => routerState.url
4549
);
4650

47-
constructor(
48-
route: ActivatedRoute,
49-
router: Router,
50-
serializer: MinimalRouterStateSerializer
51-
) {
52-
super({
53-
routerState: serializer.serialize(router.routerState.snapshot),
54-
});
51+
constructor() {
52+
super();
5553
({
5654
fragment: this.fragment$,
5755
queryParams: this.queryParams$,
5856
data: this.routeData$,
5957
params: this.routeParams$,
6058
title: this.title$,
61-
} = route);
59+
} = this.#route);
60+
this.setState({
61+
routerState: this.#serializer.serialize(
62+
this.#router.routerState.snapshot
63+
),
64+
});
6265

6366
this.#updateRouterState(
64-
router.events.pipe(
65-
map(() => serializer.serialize(router.routerState.snapshot))
67+
this.#router.events.pipe(
68+
map(() => this.#serializer.serialize(this.#router.routerState.snapshot))
6669
)
6770
);
6871
}

0 commit comments

Comments
 (0)