From dc64e90ab9b862a877cbe939088045dda684225d Mon Sep 17 00:00:00 2001 From: vsavkin Date: Mon, 27 Jun 2016 16:45:21 -0700 Subject: [PATCH] feat(router): use componentFactoryResolver --- .../router/src/directives/router_outlet.ts | 26 ++- modules/@angular/router/src/resolve.ts | 1 + modules/@angular/router/src/router.ts | 2 +- modules/@angular/router/test/router.spec.ts | 165 ++++++++---------- 4 files changed, 96 insertions(+), 98 deletions(-) diff --git a/modules/@angular/router/src/directives/router_outlet.ts b/modules/@angular/router/src/directives/router_outlet.ts index 6ca96ac6a8..291750f903 100644 --- a/modules/@angular/router/src/directives/router_outlet.ts +++ b/modules/@angular/router/src/directives/router_outlet.ts @@ -6,7 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {Attribute, ComponentFactory, ComponentRef, Directive, ReflectiveInjector, ResolvedReflectiveProvider, ViewContainerRef} from '@angular/core'; +import {Attribute, ComponentFactory, ComponentFactoryResolver, ComponentRef, Directive, NoComponentFactoryError, ReflectiveInjector, ResolvedReflectiveProvider, ViewContainerRef} from '@angular/core'; + import {RouterOutletMap} from '../router_outlet_map'; import {ActivatedRoute} from '../router_state'; import {PRIMARY_OUTLET} from '../shared'; @@ -22,7 +23,7 @@ export class RouterOutlet { */ constructor( parentOutletMap: RouterOutletMap, private location: ViewContainerRef, - @Attribute('name') name: string) { + private componentFactoryResolver: ComponentFactoryResolver, @Attribute('name') name: string) { parentOutletMap.registerOutlet(name ? name : PRIMARY_OUTLET, this); } @@ -44,10 +45,27 @@ export class RouterOutlet { } activate( - factory: ComponentFactory, activatedRoute: ActivatedRoute, - providers: ResolvedReflectiveProvider[], outletMap: RouterOutletMap): void { + activatedRoute: ActivatedRoute, providers: ResolvedReflectiveProvider[], + outletMap: RouterOutletMap): void { this.outletMap = outletMap; this._activatedRoute = activatedRoute; + + const snapshot = activatedRoute._futureSnapshot; + const component: any = snapshot._routeConfig.component; + + let factory; + try { + factory = typeof component === 'string' ? + snapshot._resolvedComponentFactory : + this.componentFactoryResolver.resolveComponentFactory(component); + } catch (e) { + if (!(e instanceof NoComponentFactoryError)) throw e; + const componentName = component ? component.name : null; + console.warn( + `No component factory found for '${componentName}'. Add '${componentName}' to the 'precompile' list of your application component. This will be required in a future release of the router.`); + factory = snapshot._resolvedComponentFactory; + } + const inj = ReflectiveInjector.fromResolvedProviders(providers, this.location.parentInjector); this.activated = this.location.createComponent(factory, this.location.length, inj, []); } diff --git a/modules/@angular/router/src/resolve.ts b/modules/@angular/router/src/resolve.ts index 3661484d0c..c47cf80767 100644 --- a/modules/@angular/router/src/resolve.ts +++ b/modules/@angular/router/src/resolve.ts @@ -41,6 +41,7 @@ function resolveNode( function resolveComponent( resolver: ComponentResolver, snapshot: ActivatedRouteSnapshot): Promise { + // TODO: vsavkin change to typeof snapshot.component === 'string' in beta2 if (snapshot.component && snapshot._routeConfig) { return resolver.resolveComponent(snapshot.component); } else { diff --git a/modules/@angular/router/src/router.ts b/modules/@angular/router/src/router.ts index f45ad73961..3a77d566f5 100644 --- a/modules/@angular/router/src/router.ts +++ b/modules/@angular/router/src/router.ts @@ -619,7 +619,7 @@ class ActivateRoutes { {provide: ActivatedRoute, useValue: future}, {provide: RouterOutletMap, useValue: outletMap} ]); - outlet.activate(future._futureSnapshot._resolvedComponentFactory, future, resolved, outletMap); + outlet.activate(future, resolved, outletMap); } private deactivateOutletAndItChildren(outlet: RouterOutlet): void { diff --git a/modules/@angular/router/test/router.spec.ts b/modules/@angular/router/test/router.spec.ts index db05b87f40..2092c33588 100644 --- a/modules/@angular/router/test/router.spec.ts +++ b/modules/@angular/router/test/router.spec.ts @@ -28,10 +28,8 @@ describe('Integration', () => { provide: Router, useFactory: (resolver: ComponentResolver, urlSerializer: UrlSerializer, outletMap: RouterOutletMap, location: Location, injector: Injector) => { - const r = - new Router(RootCmp, resolver, urlSerializer, outletMap, location, injector, config); - r.initialNavigation(); - return r; + return new Router( + RootCmp, resolver, urlSerializer, outletMap, location, injector, config); }, deps: [ComponentResolver, UrlSerializer, RouterOutletMap, Location, Injector] }, @@ -39,26 +37,24 @@ describe('Integration', () => { ]; }); - it('should navigate with a provided config', - fakeAsync(inject( - [Router, TestComponentBuilder, Location], - (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + fit('should navigate with a provided config', + fakeAsync(inject( + [Router, TestComponentBuilder, Location], + (router: Router, tcb: TestComponentBuilder, location: Location) => { + const fixture = createRoot(tcb, router, RootCmp); - router.navigateByUrl('/simple'); - advance(fixture); + router.navigateByUrl('/simple'); + advance(fixture); - expect(location.path()).toEqual('/simple'); - }))); + expect(location.path()).toEqual('/simple'); + }))); it('should update location when navigating', fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{path: 'team/:id', component: TeamCmp}]); @@ -76,8 +72,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -108,8 +103,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -130,8 +124,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{path: '**', component: CollectParamsCmp}]); @@ -153,8 +146,7 @@ describe('Integration', () => { it('should support secondary routes', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -175,8 +167,7 @@ describe('Integration', () => { it('should deactivate outlets', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -200,8 +191,7 @@ describe('Integration', () => { it('should deactivate nested outlets', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([ { @@ -227,8 +217,7 @@ describe('Integration', () => { it('should set query params and fragment', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{path: 'query', component: QueryParamsAndFragmentCmp}]); @@ -244,8 +233,7 @@ describe('Integration', () => { it('should push params only when they change', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -271,8 +259,7 @@ describe('Integration', () => { it('should work when navigating to /', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([ {path: '', terminal: true, component: SimpleCmp}, @@ -293,8 +280,7 @@ describe('Integration', () => { it('should cancel in-flight navigations', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{path: 'user/:name', component: UserCmp}]); @@ -331,8 +317,7 @@ describe('Integration', () => { it('should handle failed navigations gracefully', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{path: 'user/:name', component: UserCmp}]); @@ -361,8 +346,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -390,8 +374,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmpWithTwoOutlets); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmpWithTwoOutlets); router.resetConfig([ { @@ -448,8 +431,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmpWithTwoOutlets); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmpWithTwoOutlets); router.resetConfig([{ path: 'parent/:id', @@ -499,8 +481,7 @@ describe('Integration', () => { it('should support string router links', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -526,8 +507,7 @@ describe('Integration', () => { it('should support absolute router links', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -553,8 +533,7 @@ describe('Integration', () => { it('should support relative router links', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -580,7 +559,7 @@ describe('Integration', () => { it('should support top-level link', fakeAsync( inject([Router, TestComponentBuilder], (router: Router, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RelativeLinkInIfCmp); + const fixture = createRoot(tcb, router, RelativeLinkInIfCmp); advance(fixture); router.resetConfig( @@ -608,8 +587,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, Location, TestComponentBuilder], (router: Router, location: Location, tcb: TestComponentBuilder) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -638,8 +616,7 @@ describe('Integration', () => { it('should work', fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([ {path: 'old/team/:id', redirectTo: 'team/:id'}, @@ -662,8 +639,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig( [{path: 'team/:id', component: TeamCmp, canActivate: ['alwaysFalse']}]); @@ -684,8 +660,7 @@ describe('Integration', () => { it('works', fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'parent', @@ -710,8 +685,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig( [{path: 'team/:id', component: TeamCmp, canActivate: ['alwaysTrue']}]); @@ -735,8 +709,7 @@ describe('Integration', () => { it('works', fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig( [{path: 'team/:id', component: TeamCmp, canActivate: [AlwaysTrue]}]); @@ -760,8 +733,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig( [{path: 'team/:id', component: TeamCmp, canActivate: ['CanActivate']}]); @@ -800,8 +772,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([ {path: 'team/:id', component: TeamCmp, canDeactivate: ['CanDeactivateTeam']} @@ -828,8 +799,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'parent/:id', @@ -854,8 +824,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -902,8 +871,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig( [{path: 'team/:id', component: TeamCmp, canDeactivate: [AlwaysTrue]}]); @@ -930,8 +898,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig( [{path: 'team/:id', component: TeamCmp, canDeactivate: ['CanDeactivate']}]); @@ -952,8 +919,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -983,8 +949,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -1014,8 +979,7 @@ describe('Integration', () => { fakeAsync(inject( [Router, TestComponentBuilder, Location], (router: Router, tcb: TestComponentBuilder, location: Location) => { - const fixture = tcb.createFakeAsync(RootCmp); - advance(fixture); + const fixture = createRoot(tcb, router, RootCmp); router.resetConfig([{ path: 'team/:id', @@ -1097,16 +1061,6 @@ class DummyLinkWithParentCmp { class RelativeLinkCmp { } -@Component({ - selector: 'link-cmp', - template: - ` `, - directives: ROUTER_DIRECTIVES -}) -class RelativeLinkInIfCmp { - show: boolean = false; -} - @Component({ selector: 'link-cmp', template: `link`, @@ -1187,10 +1141,26 @@ class RouteCmp { constructor(public route: ActivatedRoute) {} } +@Component({ + selector: 'link-cmp', + template: + ` `, + directives: ROUTER_DIRECTIVES, + precompile: [BlankCmp, SimpleCmp] +}) +class RelativeLinkInIfCmp { + show: boolean = false; +} + @Component({ selector: 'root-cmp', template: ``, - directives: [ROUTER_DIRECTIVES] + directives: [ROUTER_DIRECTIVES], + precompile: [ + BlankCmp, SimpleCmp, TeamCmp, UserCmp, StringLinkCmp, DummyLinkCmp, AbsoluteLinkCmp, + RelativeLinkCmp, DummyLinkWithParentCmp, LinkWithQueryParamsAndFragment, CollectParamsCmp, + QueryParamsAndFragmentCmp + ] }) class RootCmp { } @@ -1199,7 +1169,8 @@ class RootCmp { selector: 'root-cmp', template: `primary {} right {}`, - directives: [ROUTER_DIRECTIVES] + directives: [ROUTER_DIRECTIVES], + precompile: [BlankCmp, SimpleCmp, RouteCmp, UserCmp] }) class RootCmpWithTwoOutlets { } @@ -1208,3 +1179,11 @@ function advance(fixture: ComponentFixture): void { tick(); fixture.detectChanges(); } + +function createRoot(tcb: TestComponentBuilder, router: Router, type: any): ComponentFixture { + const f = tcb.createFakeAsync(type); + advance(f); + router.initialNavigation(); + advance(f); + return f; +} \ No newline at end of file