Elgato_dark/angular
1
0
Fork 0
mirror of https://github.com/angular/angular synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(router): Update to use early return to reduce nesting (#60377)

Browse source 
Updates a switchTap body to use early return to reduce nesting

PR Close #60377
This commit is contained in:
Andrew Scott 2025-03-13 11:24:37 -07:00 committed by Pawel Kozlowski
parent d79c57d9d7
commit c054d620dd
1 changed files with 43 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
packages/router/src/navigation_transition.ts
View file

@ -664,49 +664,50 @@ export class NavigationTransitions {
// --- RESOLVE ---
switchTap((t) => {
if (t.guards.canActivateChecks.length) {
return of(t).pipe(
tap((t) => {
const resolveStart = new ResolveStart(
t.id,
this.urlSerializer.serialize(t.extractedUrl),
this.urlSerializer.serialize(t.urlAfterRedirects!),
t.targetSnapshot!,
);
this.events.next(resolveStart);
}),
switchMap((t) => {
let dataResolved = false;
return of(t).pipe(
resolveData(this.paramsInheritanceStrategy, this.environmentInjector),
tap({
next: () => (dataResolved = true),
complete: () => {
if (!dataResolved) {
this.cancelNavigationTransition(
t,
typeof ngDevMode === 'undefined' || ngDevMode
? `At least one route resolver didn't emit any value.`
: '',
NavigationCancellationCode.NoDataFromResolver,
);
}
},
}),
);
}),
tap((t) => {
const resolveEnd = new ResolveEnd(
t.id,
this.urlSerializer.serialize(t.extractedUrl),
this.urlSerializer.serialize(t.urlAfterRedirects!),
t.targetSnapshot!,
);
this.events.next(resolveEnd);
}),
);
if (t.guards.canActivateChecks.length === 0) {
return undefined;
}
return undefined;
return of(t).pipe(
tap((t) => {
const resolveStart = new ResolveStart(
t.id,
this.urlSerializer.serialize(t.extractedUrl),
this.urlSerializer.serialize(t.urlAfterRedirects!),
t.targetSnapshot!,
);
this.events.next(resolveStart);
}),
switchMap((t) => {
let dataResolved = false;
return of(t).pipe(
resolveData(this.paramsInheritanceStrategy, this.environmentInjector),
tap({
next: () => (dataResolved = true),
complete: () => {
if (!dataResolved) {
this.cancelNavigationTransition(
t,
typeof ngDevMode === 'undefined' || ngDevMode
? `At least one route resolver didn't emit any value.`
: '',
NavigationCancellationCode.NoDataFromResolver,
);
}
},
}),
);
}),
tap((t) => {
const resolveEnd = new ResolveEnd(
t.id,
this.urlSerializer.serialize(t.extractedUrl),
this.urlSerializer.serialize(t.urlAfterRedirects!),
t.targetSnapshot!,
);
this.events.next(resolveEnd);
}),
);
}),
// --- LOAD COMPONENTS ---