diff --git a/packages/animations/browser/src/render/transition_animation_engine.ts b/packages/animations/browser/src/render/transition_animation_engine.ts index 565504f025..c7859fb475 100644 --- a/packages/animations/browser/src/render/transition_animation_engine.ts +++ b/packages/animations/browser/src/render/transition_animation_engine.ts @@ -1389,9 +1389,9 @@ export class TransitionAnimationPlayer implements AnimationPlayer { public markedForDestroy: boolean = false; - constructor(public namespaceId: string, public triggerName: string, public element: any) {} + readonly queued: boolean = true; - get queued() { return this._containsRealPlayer == false; } + constructor(public namespaceId: string, public triggerName: string, public element: any) {} setRealPlayer(player: AnimationPlayer) { if (this._containsRealPlayer) return; @@ -1403,6 +1403,7 @@ export class TransitionAnimationPlayer implements AnimationPlayer { }); this._queuedCallbacks = {}; this._containsRealPlayer = true; + (this as{queued: boolean}).queued = false; } getRealPlayer() { return this._player; } diff --git a/packages/common/http/test/jsonp_mock.ts b/packages/common/http/test/jsonp_mock.ts index c631e0c8fa..2e7d58c0c0 100644 --- a/packages/common/http/test/jsonp_mock.ts +++ b/packages/common/http/test/jsonp_mock.ts @@ -23,13 +23,12 @@ export class MockScriptElement { export class MockDocument { mock: MockScriptElement|null; + readonly body: any = this; createElement(tag: 'script'): HTMLScriptElement { return new MockScriptElement() as any as HTMLScriptElement; } - get body(): any { return this; } - appendChild(node: any): void { this.mock = node; } removeNode(node: any): void { @@ -41,4 +40,4 @@ export class MockDocument { mockLoad(): void { this.mock !.listeners.load !(null as any); } mockError(err: Error) { this.mock !.listeners.error !(err); } -} \ No newline at end of file +} diff --git a/packages/core/src/di/reflective_provider.ts b/packages/core/src/di/reflective_provider.ts index 1243d8c024..1def0e83c0 100644 --- a/packages/core/src/di/reflective_provider.ts +++ b/packages/core/src/di/reflective_provider.ts @@ -71,11 +71,13 @@ export interface ResolvedReflectiveProvider { } export class ResolvedReflectiveProvider_ implements ResolvedReflectiveProvider { + readonly resolvedFactory: ResolvedReflectiveFactory; + constructor( public key: ReflectiveKey, public resolvedFactories: ResolvedReflectiveFactory[], - public multiProvider: boolean) {} - - get resolvedFactory(): ResolvedReflectiveFactory { return this.resolvedFactories[0]; } + public multiProvider: boolean) { + this.resolvedFactory = this.resolvedFactories[0]; + } } /** diff --git a/packages/core/src/linker/component_factory_resolver.ts b/packages/core/src/linker/component_factory_resolver.ts index 32c3a8467c..2ebb7fe369 100644 --- a/packages/core/src/linker/component_factory_resolver.ts +++ b/packages/core/src/linker/component_factory_resolver.ts @@ -66,13 +66,20 @@ export class CodegenComponentFactoryResolver implements ComponentFactoryResolver } export class ComponentFactoryBoundToModule extends ComponentFactory { - constructor(private factory: ComponentFactory, private ngModule: NgModuleRef) { super(); } + readonly selector: string; + readonly componentType: Type; + readonly ngContentSelectors: string[]; + readonly inputs: {propName: string, templateName: string}[]; + readonly outputs: {propName: string, templateName: string}[]; - get selector() { return this.factory.selector; } - get componentType() { return this.factory.componentType; } - get ngContentSelectors() { return this.factory.ngContentSelectors; } - get inputs() { return this.factory.inputs; } - get outputs() { return this.factory.outputs; } + constructor(private factory: ComponentFactory, private ngModule: NgModuleRef) { + super(); + this.selector = factory.selector; + this.componentType = factory.componentType; + this.ngContentSelectors = factory.ngContentSelectors; + this.inputs = factory.inputs; + this.outputs = factory.outputs; + } create( injector: Injector, projectableNodes?: any[][], rootSelectorOrNode?: string|any, diff --git a/packages/core/src/linker/query_list.ts b/packages/core/src/linker/query_list.ts index 34fc10d5b2..07edc590e9 100644 --- a/packages/core/src/linker/query_list.ts +++ b/packages/core/src/linker/query_list.ts @@ -41,9 +41,9 @@ export class QueryList/* implements Iterable */ { private _results: Array = []; public readonly changes: Observable = new EventEmitter(); - get length(): number { return this._results.length; } - get first(): T { return this._results[0]; } - get last(): T { return this._results[this.length - 1]; } + readonly length: number; + readonly first: T; + readonly last: T; /** * See @@ -98,6 +98,9 @@ export class QueryList/* implements Iterable */ { reset(res: Array): void { this._results = flatten(res); (this as{dirty: boolean}).dirty = false; + (this as{length: number}).length = this._results.length; + (this as{last: T}).last = this._results[this.length - 1]; + (this as{first: T}).first = this._results[0]; } notifyOnChanges(): void { (this.changes as EventEmitter).emit(this); } diff --git a/packages/core/src/view/refs.ts b/packages/core/src/view/refs.ts index 5359a46ce7..72651b7d14 100644 --- a/packages/core/src/view/refs.ts +++ b/packages/core/src/view/refs.ts @@ -481,6 +481,8 @@ class NgModuleRef_ implements NgModuleData, InternalNgModuleRef { /** @internal */ _providers: any[]; + readonly injector: Injector = this; + constructor( private _moduleType: Type, public _parent: Injector, public _bootstrapComponents: Type[], public _def: NgModuleDefinition) { @@ -496,8 +498,6 @@ class NgModuleRef_ implements NgModuleData, InternalNgModuleRef { get componentFactoryResolver() { return this.get(ComponentFactoryResolver); } - get injector(): Injector { return this; } - destroy(): void { if (this._destroyed) { throw new Error( diff --git a/packages/core/src/view/services.ts b/packages/core/src/view/services.ts index 8ae5e30bc1..394d732065 100644 --- a/packages/core/src/view/services.ts +++ b/packages/core/src/view/services.ts @@ -649,9 +649,8 @@ class DebugRendererFactory2 implements RendererFactory2 { class DebugRenderer2 implements Renderer2 { - constructor(private delegate: Renderer2) {} - - get data() { return this.delegate.data; } + readonly data: {[key: string]: any}; + constructor(private delegate: Renderer2) { this.data = this.delegate.data; } destroyNode(node: any) { removeDebugNodeFromIndex(getDebugNode(node) !); diff --git a/packages/router/src/pre_activation.ts b/packages/router/src/pre_activation.ts index b247d58ed8..bad6aa8dbf 100644 --- a/packages/router/src/pre_activation.ts +++ b/packages/router/src/pre_activation.ts @@ -26,8 +26,10 @@ import {andObservables, forEach, shallowEqual, wrapIntoObservable} from './utils import {TreeNode, nodeChildrenAsMap} from './utils/tree'; class CanActivate { - constructor(public path: ActivatedRouteSnapshot[]) {} - get route(): ActivatedRouteSnapshot { return this.path[this.path.length - 1]; } + readonly route: ActivatedRouteSnapshot; + constructor(public path: ActivatedRouteSnapshot[]) { + this.route = this.path[this.path.length - 1]; + } } class CanDeactivate {