Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(core): add bootstrapped modules into platform modules list #13740

Closed
wants to merge 2 commits into from
Closed

fix(core): add bootstrapped modules into platform modules list #13740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbeb9b3
refactor(core): remove facade and clean up
Jan 1, 2017
db07de6
fix(core): add bootstrapped modules into platform modules list
Jan 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 24 additions & 19 deletions modules/@angular/core/src/application_ref.ts
View file
Open in desktop
Expand Up @@ -7,16 +7,14 @@
*/

import {ErrorHandler} from '../src/error_handler';
import {ListWrapper} from '../src/facade/collection';
import {unimplemented} from '../src/facade/errors';
import {stringify} from '../src/facade/lang';
import {isPromise} from '../src/util/lang';

import {ApplicationInitStatus} from './application_init';
import {APP_BOOTSTRAP_LISTENER, PLATFORM_INITIALIZER} from './application_tokens';
import {ChangeDetectorRef} from './change_detection/change_detector_ref';
import {Console} from './console';
import {Injectable, Injector, OpaqueToken, Optional, Provider, ReflectiveInjector} from './di';
import {Injectable, Injector, OpaqueToken, Provider, ReflectiveInjector} from './di';
import {CompilerFactory, CompilerOptions} from './linker/compiler';
import {ComponentFactory, ComponentRef} from './linker/component_factory';
import {ComponentFactoryResolver} from './linker/component_factory_resolver';
Expand Down Expand Up @@ -260,9 +258,9 @@ export class PlatformRef_ extends PlatformRef {

get injector(): Injector { return this._injector; }

get destroyed() { return this._destroyed; }
get destroyed(): boolean { return this._destroyed; }

destroy() {
destroy(): void {
if (this._destroyed) {
throw new Error('The platform has already been destroyed!');
}
Expand Down Expand Up @@ -292,7 +290,12 @@ export class PlatformRef_ extends PlatformRef {
if (!exceptionHandler) {
throw new Error('No ErrorHandler. Is platform module (BrowserModule) included?');
}
moduleRef.onDestroy(() => ListWrapper.remove(this._modules, moduleRef));
moduleRef.onDestroy(() => {
const index: number = this._modules.indexOf(moduleRef);
if (index > -1) {
this._modules.splice(index, 1);
}
});
ngZone.onError.subscribe({next: (error: any) => { exceptionHandler.handleError(error); }});
return _callAndReportToErrorHandler(exceptionHandler, () => {
const initStatus: ApplicationInitStatus = moduleRef.injector.get(ApplicationInitStatus);
Expand Down Expand Up @@ -331,7 +334,7 @@ export class PlatformRef_ extends PlatformRef {
.then((moduleFactory) => this._bootstrapModuleFactoryWithZone(moduleFactory, ngZone));
}

private _moduleDoBootstrap(moduleRef: NgModuleInjector<any>) {
private _moduleDoBootstrap(moduleRef: NgModuleInjector<any>): void {
const appRef = moduleRef.injector.get(ApplicationRef);
if (moduleRef.bootstrapFactories.length > 0) {
moduleRef.bootstrapFactories.forEach((compFactory) => appRef.bootstrap(compFactory));
Expand All @@ -342,6 +345,7 @@ export class PlatformRef_ extends PlatformRef {
`The module ${stringify(moduleRef.instance.constructor)} was bootstrapped, but it does not declare "@NgModule.bootstrap" components nor a "ngDoBootstrap" method. ` +
`Please define one of these.`);
}
this._modules.push(moduleRef);
}
}

Expand Down Expand Up @@ -422,16 +426,11 @@ export class ApplicationRef_ extends ApplicationRef {

constructor(
private _zone: NgZone, private _console: Console, private _injector: Injector,
private _exceptionHandler: ErrorHandler,
private _componentFactoryResolver: ComponentFactoryResolver,
private _initStatus: ApplicationInitStatus,
@Optional() private _testabilityRegistry: TestabilityRegistry,
@Optional() private _testability: Testability) {
private _initStatus: ApplicationInitStatus) {
super();
this._enforceNoNewChanges = isDevMode();

this._zone.onMicrotaskEmpty.subscribe(
{next: () => { this._zone.run(() => { this.tick(); }); }});
this._zone.onMicrotaskEmpty.subscribe({next: () => this._zone.run(() => this.tick())});
}

attachView(viewRef: ViewRef): void {
Expand All @@ -442,7 +441,10 @@ export class ApplicationRef_ extends ApplicationRef {

detachView(viewRef: ViewRef): void {
const view = (viewRef as ViewRef_<any>).internalView;
ListWrapper.remove(this._views, view);
const index: number = this._views.indexOf(view);
if (index > -1) {
this._views.splice(index, 1);
}
view.detach();
}

Expand All @@ -459,7 +461,7 @@ export class ApplicationRef_ extends ApplicationRef {
}
this._rootComponentTypes.push(componentFactory.componentType);
const compRef = componentFactory.create(this._injector, [], componentFactory.selector);
compRef.onDestroy(() => { this._unloadComponent(compRef); });
compRef.onDestroy(() => this._unloadComponent(compRef));
const testability = compRef.injector.get(Testability, null);
if (testability) {
compRef.injector.get(TestabilityRegistry)
Expand Down Expand Up @@ -487,7 +489,10 @@ export class ApplicationRef_ extends ApplicationRef {

private _unloadComponent(componentRef: ComponentRef<any>): void {
this.detachView(componentRef.hostView);
ListWrapper.remove(this._rootComponents, componentRef);
const index: number = this._rootComponents.indexOf(componentRef);
if (index > -1) {
this._rootComponents.splice(index, 1);
}
}

tick(): void {
Expand All @@ -508,12 +513,12 @@ export class ApplicationRef_ extends ApplicationRef {
}
}

ngOnDestroy() {
ngOnDestroy(): void {
// TODO(alxhub): Dispose of the NgZone.
this._views.slice().forEach((view) => view.destroy());
}

get viewCount() { return this._views.length; }
get viewCount(): number { return this._views.length; }

get componentTypes(): Type<any>[] { return this._rootComponentTypes; }

Expand Down
5 changes: 5 additions & 0 deletions modules/@angular/core/test/application_ref_spec.ts
View file
Open in desktop
Expand Up @@ -212,6 +212,11 @@ export function main() {
expect(mockConsole.res[0]).toEqual('EXCEPTION: ' + expectedErrMsg);
});
}));

it('should add bootstrapped module into platform modules list', async(() => {
defaultPlatform.bootstrapModule(createModule({bootstrap: [SomeComponent]}))
.then(module => expect((<any>defaultPlatform)._modules).toContain(module));
}));
});

describe('bootstrapModuleFactory', () => {
Expand Down
5 changes: 2 additions & 3 deletions modules/benchmarks/src/tree/ng2_ftl/app.ngfactory.ts
View file
Open in desktop
Expand Up @@ -227,9 +227,8 @@ class AppModuleInjector extends import0.NgModuleInjector<import1.AppModule> {
new import6.ApplicationInitStatus(this.parent.get(import6.APP_INITIALIZER, (null as any)));
this._Testability_8 = new import7.Testability(this.parent.get(import22.NgZone));
this._ApplicationRef__9 = new import8.ApplicationRef_(
this.parent.get(import22.NgZone), this.parent.get(import24.Console), this,
this._ErrorHandler_6, this, this._ApplicationInitStatus_7,
this.parent.get(import7.TestabilityRegistry, (null as any)), this._Testability_8);
this.parent.get(import22.NgZone), this.parent.get(import24.Console), this, this,
this._ApplicationInitStatus_7);
return this._AppModule_3;
}
getInternal(token: any, notFoundResult: any): any {
Expand Down
5 changes: 2 additions & 3 deletions modules/benchmarks/src/tree/ng2_static_ftl/app.ngfactory.ts
View file
Open in desktop
Expand Up @@ -227,9 +227,8 @@ class AppModuleInjector extends import0.NgModuleInjector<import1.AppModule> {
new import6.ApplicationInitStatus(this.parent.get(import6.APP_INITIALIZER, (null as any)));
this._Testability_8 = new import7.Testability(this.parent.get(import22.NgZone));
this._ApplicationRef__9 = new import8.ApplicationRef_(
this.parent.get(import22.NgZone), this.parent.get(import24.Console), this,
this._ErrorHandler_6, this, this._ApplicationInitStatus_7,
this.parent.get(import7.TestabilityRegistry, (null as any)), this._Testability_8);
this.parent.get(import22.NgZone), this.parent.get(import24.Console), this, this,
this._ApplicationInitStatus_7);
return this._AppModule_3;
}
getInternal(token: any, notFoundResult: any): any {
Expand Down