Skip to content

Commit 8510637

Browse files
vicbbenlesh
authored andcommitted
refactor(ivy): misc cleanup (angular#25369)
PR Close angular#25369
1 parent ecb5dc0 commit 8510637

File tree

12 files changed

+23
-19
lines changed

12 files changed

+23
-19
lines changed

packages/core/src/render3/component.ts

-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ export function renderComponent<T>(
123123
// Create directive instance with factory() and store at index 0 in directives array
124124
component = baseDirectiveCreate(0, componentDef.factory() as T, componentDef);
125125
rootContext.components.push(component);
126-
127126
(elementNode.data as LViewData)[CONTEXT] = component;
128127
initChangeDetectorIfExisting(elementNode.nodeInjector, component, elementNode.data !);
129128

packages/core/src/render3/definition.ts

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {Type} from '../type';
1616
import {BaseDef, ComponentDefFeature, ComponentDefInternal, ComponentQuery, ComponentTemplate, ComponentType, DirectiveDefFeature, DirectiveDefInternal, DirectiveType, DirectiveTypesOrFactory, PipeDefInternal, PipeType, PipeTypesOrFactory} from './interfaces/definition';
1717
import {CssSelectorList, SelectorFlags} from './interfaces/projection';
1818

19-
2019
const EMPTY: {} = {};
2120
const EMPTY_ARRAY: any[] = [];
2221
if (typeof ngDevMode !== 'undefined' && ngDevMode) {

packages/core/src/render3/interfaces/renderer.ts

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
* it will be easy to implement such API.
1616
*/
1717

18-
import {ViewEncapsulation} from '../../metadata/view';
1918
import {RendererStyleFlags2, RendererType2} from '../../render/api';
2019

2120

packages/core/src/render3/jit/module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export function patchComponentDefWithScope<C, M>(
104104
* on modules with components that have not fully compiled yet, but the result should not be used
105105
* until they have.
106106
*/
107-
export function transitiveScopesFor<T>(moduleType: Type<T>): NgModuleTransitiveScopes {
107+
function transitiveScopesFor<T>(moduleType: Type<T>): NgModuleTransitiveScopes {
108108
if (!isNgModule(moduleType)) {
109109
throw new Error(`${moduleType.name} does not have an ngModuleDef`);
110110
}
@@ -139,7 +139,7 @@ export function transitiveScopesFor<T>(moduleType: Type<T>): NgModuleTransitiveS
139139
});
140140

141141
def.imports.forEach(<I>(imported: Type<I>) => {
142-
let importedTyped = imported as Type<I>& {
142+
const importedTyped = imported as Type<I>& {
143143
// If imported is an @NgModule:
144144
ngModuleDef?: NgModuleDefInternal<I>;
145145
};

packages/core/src/view/services.ts

+11-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {isViewDebugError, viewDestroyedError, viewWrappedDebugError} from './err
2222
import {resolveDep} from './provider';
2323
import {dirtyParentQueries, getQueryValue} from './query';
2424
import {createInjector, createNgModuleRef, getComponentViewDefinitionFactory} from './refs';
25-
import {ArgumentType, BindingFlags, CheckType, DebugContext, DepDef, ElementData, NgModuleDefinition, NgModuleProviderDef, NodeDef, NodeFlags, NodeLogger, ProviderOverride, RootData, Services, ViewData, ViewDefinition, ViewState, asElementData, asPureExpressionData} from './types';
25+
import {ArgumentType, BindingFlags, CheckType, DebugContext, ElementData, NgModuleDefinition, NodeDef, NodeFlags, NodeLogger, ProviderOverride, RootData, Services, ViewData, ViewDefinition, ViewState, asElementData, asPureExpressionData} from './types';
2626
import {NOOP, isComponentView, renderNode, resolveDefinition, splitDepsDsl, viewParentEl} from './util';
2727
import {checkAndUpdateNode, checkAndUpdateView, checkNoChangesNode, checkNoChangesView, createComponentView, createEmbeddedView, createRootView, destroyView} from './view';
2828

@@ -509,6 +509,7 @@ class DebugContext_ implements DebugContext {
509509
private nodeDef: NodeDef;
510510
private elView: ViewData;
511511
private elDef: NodeDef;
512+
512513
constructor(public view: ViewData, public nodeIndex: number|null) {
513514
if (nodeIndex == null) {
514515
this.nodeIndex = nodeIndex = 0;
@@ -528,13 +529,18 @@ class DebugContext_ implements DebugContext {
528529
this.elDef = elDef;
529530
this.elView = elView;
530531
}
532+
531533
private get elOrCompView() {
532534
// Has to be done lazily as we use the DebugContext also during creation of elements...
533535
return asElementData(this.elView, this.elDef.nodeIndex).componentView || this.view;
534536
}
537+
535538
get injector(): Injector { return createInjector(this.elView, this.elDef); }
539+
536540
get component(): any { return this.elOrCompView.component; }
541+
537542
get context(): any { return this.elOrCompView.context; }
543+
538544
get providerTokens(): any[] {
539545
const tokens: any[] = [];
540546
if (this.elDef) {
@@ -549,6 +555,7 @@ class DebugContext_ implements DebugContext {
549555
}
550556
return tokens;
551557
}
558+
552559
get references(): {[key: string]: any} {
553560
const references: {[key: string]: any} = {};
554561
if (this.elDef) {
@@ -565,14 +572,17 @@ class DebugContext_ implements DebugContext {
565572
}
566573
return references;
567574
}
575+
568576
get componentRenderElement() {
569577
const elData = findHostElement(this.elOrCompView);
570578
return elData ? elData.renderElement : undefined;
571579
}
580+
572581
get renderNode(): any {
573582
return this.nodeDef.flags & NodeFlags.TypeText ? renderNode(this.view, this.nodeDef) :
574583
renderNode(this.elView, this.elDef);
575584
}
585+
576586
logError(console: Console, ...values: any[]) {
577587
let logViewDef: ViewDefinition;
578588
let logNodeIndex: number;

packages/core/test/render3/imported_renderer2.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
import {ɵAnimationEngine, ɵNoopAnimationStyleNormalizer} from '@angular/animations/browser';
1010
import {MockAnimationDriver} from '@angular/animations/browser/testing';
1111
import {NgZone, RendererFactory2} from '@angular/core';
12+
import {NoopNgZone} from '@angular/core/src/zone/ng_zone';
1213
import {EventManager, ɵDomRendererFactory2, ɵDomSharedStylesHost} from '@angular/platform-browser';
1314
import {ɵAnimationRendererFactory} from '@angular/platform-browser/animations';
1415
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
1516
import {EventManagerPlugin} from '@angular/platform-browser/src/dom/events/event_manager';
1617

17-
import {NoopNgZone} from '../../src/zone/ng_zone';
18-
1918
export class SimpleDomEventsPlugin extends EventManagerPlugin {
2019
constructor(doc: any) { super(doc); }
2120

packages/core/test/render3/render_util.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {CreateComponentOptions} from '../../src/render3/component';
1313
import {extractDirectiveDef, extractPipeDef} from '../../src/render3/definition';
1414
import {ComponentTemplate, ComponentType, DirectiveDefInternal, DirectiveType, PublicFeature, RenderFlags, defineComponent, defineDirective, renderComponent as _renderComponent, tick} from '../../src/render3/index';
1515
import {NG_HOST_SYMBOL, renderTemplate} from '../../src/render3/instructions';
16-
import {DirectiveDefList, DirectiveDefListOrFactory, DirectiveTypesOrFactory, PipeDefInternal, PipeDefList, PipeDefListOrFactory, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
16+
import {DirectiveDefList, DirectiveTypesOrFactory, PipeDefInternal, PipeDefList, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
1717
import {LElementNode} from '../../src/render3/interfaces/node';
1818
import {RElement, RText, Renderer3, RendererFactory3, domRendererFactory3} from '../../src/render3/interfaces/renderer';
1919
import {Sanitizer} from '../../src/sanitization/security';

packages/core/testing/src/test_bed.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {ApplicationInitStatus, CompilerOptions, Component, Directive, InjectionToken, Injector, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgModuleRef, NgZone, Optional, Pipe, PlatformRef, Provider, SchemaMetadata, SkipSelf, StaticProvider, Type, ɵAPP_ROOT as APP_ROOT, ɵDepFlags as DepFlags, ɵNodeFlags as NodeFlags, ɵclearOverrides as clearOverrides, ɵgetComponentViewDefinitionFactory as getComponentViewDefinitionFactory, ɵoverrideComponentView as overrideComponentView, ɵoverrideProvider as overrideProvider, ɵstringify as stringify} from '@angular/core';
9+
import {ApplicationInitStatus, CompilerOptions, Component, Directive, InjectionToken, Injector, NgModule, NgModuleFactory, NgModuleRef, NgZone, Optional, Pipe, PlatformRef, Provider, SchemaMetadata, SkipSelf, StaticProvider, Type, ɵAPP_ROOT as APP_ROOT, ɵDepFlags as DepFlags, ɵNodeFlags as NodeFlags, ɵclearOverrides as clearOverrides, ɵgetComponentViewDefinitionFactory as getComponentViewDefinitionFactory, ɵoverrideComponentView as overrideComponentView, ɵoverrideProvider as overrideProvider, ɵstringify as stringify} from '@angular/core';
1010

1111
import {AsyncTestCompleter} from './async_test_completer';
1212
import {ComponentFixture} from './component_fixture';
@@ -54,8 +54,6 @@ export type TestModuleMetadata = {
5454
* creating components and services in unit tests.
5555
*
5656
* TestBed is the primary api for writing unit tests for Angular applications and libraries.
57-
*
58-
*
5957
*/
6058
export class TestBed implements Injector {
6159
/**
@@ -581,7 +579,7 @@ let _testBed: TestBed = null !;
581579
/**
582580
* @experimental
583581
*/
584-
export function getTestBed() {
582+
export function getTestBed(): TestBed {
585583
return _testBed = _testBed || new TestBed();
586584
}
587585

packages/platform-browser-dynamic/src/compiler_reflector.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const MODULE_SUFFIX = '';
1313
const builtinExternalReferences = createBuiltinExternalReferencesMap();
1414

1515
export class JitReflector implements CompileReflector {
16-
private reflectionCapabilities: ReflectionCapabilities = new ReflectionCapabilities();
16+
private reflectionCapabilities = new ReflectionCapabilities();
1717

1818
componentModuleUrl(type: any, cmpMetadata: Component): string {
1919
const moduleId = cmpMetadata.moduleId;

packages/platform-browser-dynamic/testing/src/compiler_factory.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
import {CompileReflector, DirectiveResolver, ERROR_COMPONENT_TYPE, NgModuleResolver, PipeResolver} from '@angular/compiler';
1010
import {MockDirectiveResolver, MockNgModuleResolver, MockPipeResolver} from '@angular/compiler/testing';
11-
import {Compiler, CompilerFactory, CompilerOptions, Component, ComponentFactory, Directive, Injectable, Injector, ModuleWithComponentFactories, NgModule, NgModuleFactory, Pipe, PlatformRef, StaticProvider, Type, createPlatformFactory, ɵstringify} from '@angular/core';
11+
import {CompilerFactory, CompilerOptions, Component, ComponentFactory, Directive, Injector, ModuleWithComponentFactories, NgModule, NgModuleFactory, Pipe, StaticProvider, Type, ɵstringify as stringify} from '@angular/core';
1212
import {MetadataOverride, ɵTestingCompiler as TestingCompiler, ɵTestingCompilerFactory as TestingCompilerFactory} from '@angular/core/testing';
13-
import {ɵCompilerImpl as CompilerImpl, ɵplatformCoreDynamic as platformCoreDynamic} from '@angular/platform-browser-dynamic';
13+
import {ɵCompilerImpl as CompilerImpl} from '@angular/platform-browser-dynamic';
1414

1515
import {MetadataOverrider} from './metadata_overrider';
1616

@@ -63,7 +63,7 @@ export class TestingCompilerImpl implements TestingCompiler {
6363

6464
checkOverrideAllowed(type: Type<any>) {
6565
if (this._compiler.hasAotSummary(type)) {
66-
throw new Error(`${ɵstringify(type)} was AOT compiled, so its metadata cannot be changed.`);
66+
throw new Error(`${stringify(type)} was AOT compiled, so its metadata cannot be changed.`);
6767
}
6868
}
6969

packages/platform-browser-dynamic/testing/src/dom_test_component_renderer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/platform-browser';
1515
*/
1616
@Injectable()
1717
export class DOMTestComponentRenderer extends TestComponentRenderer {
18-
constructor(@Inject(DOCUMENT) private _doc: any /** TODO #9100 */) { super(); }
18+
constructor(@Inject(DOCUMENT) private _doc: any) { super(); }
1919

2020
insertRootElement(rootElId: string) {
2121
const rootEl = <HTMLElement>getDOM().firstChild(

packages/platform-browser-dynamic/testing/src/testing.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {NgModule, PlatformRef, StaticProvider, createPlatformFactory} from '@angular/core';
9+
import {NgModule, createPlatformFactory} from '@angular/core';
1010
import {TestComponentRenderer} from '@angular/core/testing';
1111
import {ɵINTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS as INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from '@angular/platform-browser-dynamic';
1212
import {BrowserTestingModule} from '@angular/platform-browser/testing';

0 commit comments

Comments
 (0)