@@ -13,13 +13,13 @@ interface RouterHistoryState {
13
13
/**
14
14
* The history of all navigations.
15
15
*/
16
- readonly history : NavigationHistory ;
16
+ readonly history : RouterNavigationHistory ;
17
17
}
18
18
19
- type CompleteNavigation = readonly [ NavigationStart , NavigationEnd ] ;
20
- type NavigationHistory = Record < number , NavigationSequence > ;
21
- type NavigationSequence = PendingNavigation | CompleteNavigation ;
22
- type PendingNavigation = readonly [ NavigationStart ] ;
19
+ type RouterNavigatedSequence = readonly [ NavigationStart , NavigationEnd ] ;
20
+ type RouterNavigationHistory = Record < number , RouterNavigationSequence > ;
21
+ type RouterNavigationSequence = RouterRequestSequence | RouterNavigatedSequence ;
22
+ type RouterRequestSequence = readonly [ NavigationStart ] ;
23
23
24
24
/**
25
25
* Provide and initialize the `RouterHistoryStore`.
@@ -81,7 +81,7 @@ export class RouterHistoryStore extends ComponentStore<RouterHistoryState> {
81
81
this . #maxCompletedNavigationId$,
82
82
this . #history$,
83
83
( maxCompletedNavigationId , history ) =>
84
- history [ maxCompletedNavigationId ] as CompleteNavigation ,
84
+ history [ maxCompletedNavigationId ] as RouterNavigatedSequence ,
85
85
{
86
86
debounce : true ,
87
87
}
@@ -175,8 +175,8 @@ export class RouterHistoryStore extends ComponentStore<RouterHistoryState> {
175
175
*/
176
176
#getNavigationSource(
177
177
navigationId : number ,
178
- history : NavigationHistory
179
- ) : CompleteNavigation {
178
+ history : RouterNavigationHistory
179
+ ) : RouterNavigatedSequence {
180
180
let navigation = history [ navigationId ] ;
181
181
182
182
while ( navigation [ 0 ] . navigationTrigger === 'popstate' ) {
@@ -189,7 +189,7 @@ export class RouterHistoryStore extends ComponentStore<RouterHistoryState> {
189
189
] ;
190
190
}
191
191
192
- return navigation as CompleteNavigation ;
192
+ return navigation as RouterNavigatedSequence ;
193
193
}
194
194
}
195
195
0 commit comments