From 1914847e72e5b76ebb70f5ed0d9de00a242fd081 Mon Sep 17 00:00:00 2001 From: vsavkin Date: Thu, 2 Jun 2016 11:40:47 -0700 Subject: [PATCH] cleanup(router): make strictNullChecks happy --- modules/@angular/router/src/create_router_state.ts | 2 +- modules/@angular/router/src/recognize.ts | 2 +- modules/@angular/router/src/router.ts | 8 ++++---- modules/@angular/router/src/router_state.ts | 6 +++--- modules/@angular/router/test/create_url_tree.spec.ts | 2 +- modules/@angular/router/test/recognize.spec.ts | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/@angular/router/src/create_router_state.ts b/modules/@angular/router/src/create_router_state.ts index 837c55f35d..25900f3ae6 100644 --- a/modules/@angular/router/src/create_router_state.ts +++ b/modules/@angular/router/src/create_router_state.ts @@ -3,7 +3,7 @@ import { TreeNode } from './utils/tree'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; export function createRouterState(curr: RouterStateSnapshot, prevState: RouterState): RouterState { - const root = createNode(curr._root, prevState ? prevState._root : null); + const root = createNode(curr._root, prevState ? prevState._root : undefined); const queryParams = prevState ? prevState.queryParams : new BehaviorSubject(curr.queryParams); const fragment = prevState ? prevState.fragment : new BehaviorSubject(curr.fragment); return new RouterState(root, queryParams, fragment, curr); diff --git a/modules/@angular/router/src/recognize.ts b/modules/@angular/router/src/recognize.ts index 8a8eff4b06..d95878caef 100644 --- a/modules/@angular/router/src/recognize.ts +++ b/modules/@angular/router/src/recognize.ts @@ -174,7 +174,7 @@ class MatchResult { public leftOverUrl: TreeNode[], public secondary: TreeNode[], public outlet: string, - public route: Route, + public route: Route | null, public lastUrlSegment: UrlSegment ) {} } \ No newline at end of file diff --git a/modules/@angular/router/src/router.ts b/modules/@angular/router/src/router.ts index 3ba1335192..e7b4a6af21 100644 --- a/modules/@angular/router/src/router.ts +++ b/modules/@angular/router/src/router.ts @@ -218,15 +218,15 @@ class GuardChecks { const future = futureNode.value; const curr = currNode ? currNode.value : null; - if (future === curr) { + if (curr && future === curr) { if (!shallowEqual(future.params, curr.params)) { this.checks.push(future); } - this.traverseChildRoutes(futureNode, currNode, null); + this.traverseChildRoutes(futureNode, currNode, null); } else { - this.deactivateOutletAndItChildren(null); + this.deactivateOutletAndItChildren(null); this.checks.push(future); - this.traverseChildRoutes(futureNode, null, null); + this.traverseChildRoutes(futureNode, null, null); } } diff --git a/modules/@angular/router/src/router_state.ts b/modules/@angular/router/src/router_state.ts index 84e04e7468..324e1c8abb 100644 --- a/modules/@angular/router/src/router_state.ts +++ b/modules/@angular/router/src/router_state.ts @@ -90,7 +90,7 @@ export class ActivatedRouteSnapshot { _resolvedComponentFactory: ComponentFactory; /** @internal **/ - _routeConfig: Route; + _routeConfig: Route | null; /** @internal **/ _lastUrlSegment: UrlSegment; @@ -99,7 +99,7 @@ export class ActivatedRouteSnapshot { public params: Params, public outlet: string, public component: Type | string, - routeConfig: Route, + routeConfig: Route | null, lastUrlSegment: UrlSegment) { this._routeConfig = routeConfig; this._lastUrlSegment = lastUrlSegment; @@ -120,7 +120,7 @@ export class ActivatedRouteSnapshot { * ``` */ export class RouterStateSnapshot extends Tree { - constructor(root: TreeNode, public queryParams: Params, public fragment: string) { + constructor(root: TreeNode, public queryParams: Params, public fragment: string | null) { super(root); } } \ No newline at end of file diff --git a/modules/@angular/router/test/create_url_tree.spec.ts b/modules/@angular/router/test/create_url_tree.spec.ts index c468ae3e7e..01bdf628fe 100644 --- a/modules/@angular/router/test/create_url_tree.spec.ts +++ b/modules/@angular/router/test/create_url_tree.spec.ts @@ -174,7 +174,7 @@ function create(start: UrlSegment | null, tree: UrlTree, commands: any[], queryP if (!start) { expect(start).toBeDefined(); } - const s = new ActivatedRouteSnapshot([], null, PRIMARY_OUTLET, "someComponent", null, start); + const s = new ActivatedRouteSnapshot([], null, PRIMARY_OUTLET, "someComponent", null, start); const a = new ActivatedRoute(null, null, PRIMARY_OUTLET, "someComponent", s); return createUrlTree(a, tree, commands, queryParameters, fragment); } \ No newline at end of file diff --git a/modules/@angular/router/test/recognize.spec.ts b/modules/@angular/router/test/recognize.spec.ts index f4a2b5fe4e..04a1078790 100644 --- a/modules/@angular/router/test/recognize.spec.ts +++ b/modules/@angular/router/test/recognize.spec.ts @@ -202,7 +202,7 @@ describe('recognize', () => { { path: 'a', component: ComponentA }, { path: 'b', component: ComponentB, outlet: 'aux' }, { path: 'c', component: ComponentC, outlet: 'aux' } - ], tree("a(aux:b//aux:c)")).subscribe(null, s => { + ], tree("a(aux:b//aux:c)")).subscribe((_) => {}, s => { expect(s.toString()).toContain("Two segments cannot have the same outlet name: 'aux:b' and 'aux:c'."); }); }); @@ -210,7 +210,7 @@ describe('recognize', () => { it("should error when no matching routes", () => { recognize(RootComponent, [ { path: 'a', component: ComponentA } - ], tree("invalid")).subscribe(null, s => { + ], tree("invalid")).subscribe((_) => {}, s => { expect(s.toString()).toContain("Cannot match any routes"); }); }); @@ -218,7 +218,7 @@ describe('recognize', () => { it("should error when no matching routes (too short)", () => { recognize(RootComponent, [ { path: 'a/:id', component: ComponentA } - ], tree("a")).subscribe(null, s => { + ], tree("a")).subscribe((_) => {}, s => { expect(s.toString()).toContain("Cannot match any routes"); }); });