cargdev/angular
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(core): rename ngInjectorDef to ɵinj (#33151)

Browse Source 
Injector defs are not considered public API, so the property
that contains them should be prefixed with Angular's marker
for "private" ('ɵ') to discourage apps from relying on def
APIs directly.

This commit adds the prefix and shortens the name from
ngInjectorDef to inj. This is because property names
cannot be minified by Uglify without turning on property
mangling (which most apps have turned off) and are thus
size-sensitive.

PR Close #33151
This commit is contained in:
Kara Erickson
2019-10-14 15:28:01 -07:00
committed by Matias Niemelä
parent 3e14c2d02c
commit cda9248b33
25 changed files with 79 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/test/bundling/injection/bundle.golden_symbols.json
View File

@ -30,7 +30,7 @@
"name": "NG_INJECTABLE_DEF"
},
{
"name": "NG_INJECTOR_DEF"
"name": "NG_INJ_DEF"
},
{
"name": "NG_TEMP_TOKEN_PATH"

2
packages/core/test/bundling/injection/usage.ts
View File

@ -30,7 +30,7 @@ export class ScopedService {
}
export class DefinedInjector {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new DefinedInjector(),
providers: [ScopedService],
});

24
packages/core/test/di/r3_injector_spec.ts
View File

@ -132,7 +132,7 @@ describe('InjectorDef-based createInjector()', () => {
class DeepModule {
constructor(eagerService: EagerService) { deepModuleCreated = true; }
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new DeepModule(ɵɵinject(EagerService)),
imports: undefined,
providers: [
@ -150,7 +150,7 @@ describe('InjectorDef-based createInjector()', () => {
}
class IntermediateModule {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new IntermediateModule(),
imports: [DeepModule.safe()],
providers: [],
@ -160,7 +160,7 @@ describe('InjectorDef-based createInjector()', () => {
class InjectorWithDep {
constructor(readonly service: Service) {}
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new InjectorWithDep(ɵɵinject(Service)),
});
}
@ -168,7 +168,7 @@ describe('InjectorDef-based createInjector()', () => {
class ChildService extends ServiceWithDep {}
class Module {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new Module(),
imports: [IntermediateModule],
providers: [
@ -191,7 +191,7 @@ describe('InjectorDef-based createInjector()', () => {
}
class OtherModule {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new OtherModule(),
imports: undefined,
providers: [],
@ -199,7 +199,7 @@ describe('InjectorDef-based createInjector()', () => {
}
class ModuleWithMissingDep {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new ModuleWithMissingDep(),
imports: undefined,
providers: [ServiceWithMissingDep],
@ -209,7 +209,7 @@ describe('InjectorDef-based createInjector()', () => {
class NotAModule {}
class ImportsNotAModule {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new ImportsNotAModule(),
imports: [NotAModule],
providers: [],
@ -236,21 +236,21 @@ describe('InjectorDef-based createInjector()', () => {
}
class MultiProviderA {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new MultiProviderA(),
providers: [{provide: LOCALE, multi: true, useValue: 'A'}],
});
}
class MultiProviderB {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new MultiProviderB(),
providers: [{provide: LOCALE, multi: true, useValue: 'B'}],
});
}
class WithProvidersTest {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new WithProvidersTest(),
imports: [
{ngModule: MultiProviderA, providers: [{provide: LOCALE, multi: true, useValue: 'C'}]},
@ -402,7 +402,7 @@ describe('InjectorDef-based createInjector()', () => {
.toThrowError('Injector has already been destroyed.');
});
it('should not crash when importing something that has no ngInjectorDef', () => {
it('should not crash when importing something that has no ɵinj', () => {
injector = createInjector(ImportsNotAModule);
expect(injector.get(ImportsNotAModule)).toBeDefined();
});
@ -419,7 +419,7 @@ describe('InjectorDef-based createInjector()', () => {
constructor(missingType: any) {}
}
class ErrorModule {
static ngInjectorDef =
static ɵinj =
ɵɵdefineInjector({factory: () => new ErrorModule(), providers: [MissingArgumentType]});
}
expect(() => createInjector(ErrorModule).get(MissingArgumentType))

2
packages/core/test/render3/component_spec.ts
View File

@ -90,7 +90,7 @@ describe('component', () => {
}
class MyModule {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new MyModule(),
providers: [{provide: MyService, useValue: new MyService('injector')}]
});

4
packages/core/test/render3/ivy/jit_spec.ts
View File

@ -165,7 +165,7 @@ ivyEnabled && describe('render3 jit', () => {
expect(moduleDef.declarations[0]).toBe(Cmp);
});
it('compiles a module to an ngInjectorDef with the providers', () => {
it('compiles a module to an ɵinj with the providers', () => {
class Token {
static ngInjectableDef = ɵɵdefineInjectable({
token: Token,
@ -181,7 +181,7 @@ ivyEnabled && describe('render3 jit', () => {
constructor(public token: Token) {}
}
const injectorDef: ɵɵInjectorDef<Module> = (Module as any).ngInjectorDef;
const injectorDef: ɵɵInjectorDef<Module> = (Module as any).ɵinj;
const instance = injectorDef.factory();
// Since the instance was created outside of an injector using the module, the

10
packages/core/test/render3/providers_spec.ts
View File

@ -326,7 +326,7 @@ describe('providers', () => {
describe('single', () => {
class MyModule {
static ngInjectorDef = ɵɵdefineInjector(
static ɵinj = ɵɵdefineInjector(
{factory: () => new MyModule(), providers: [{provide: String, useValue: 'From module'}]});
}
@ -536,7 +536,7 @@ describe('providers', () => {
describe('multi', () => {
class MyModule {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new MyModule(),
providers: [{provide: String, useValue: 'From module', multi: true}]
});
@ -833,7 +833,7 @@ describe('providers', () => {
it('should work with a module', () => {
class MyModule {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new MyModule(),
providers: [{provide: String, useValue: 'From module'}]
});
@ -1126,7 +1126,7 @@ describe('providers', () => {
expect(fixture.html).toEqual('<host-cmp>foo</host-cmp>');
class MyAppModule {
static ngInjectorDef = ɵɵdefineInjector({
static ɵinj = ɵɵdefineInjector({
factory: () => new MyAppModule(),
imports: [],
providers: [
@ -1210,7 +1210,7 @@ describe('providers', () => {
describe('injection flags', () => {
class MyModule {
static ngInjectorDef = ɵɵdefineInjector(
static ɵinj = ɵɵdefineInjector(
{factory: () => new MyModule(), providers: [{provide: String, useValue: 'Module'}]});
}
it('should not fall through to ModuleInjector if flags limit the scope', () => {

2
packages/core/test/test_bed_spec.ts
View File

@ -699,7 +699,7 @@ describe('TestBed', () => {
// The providers for the module should have been restored to the original array, with
// no trace of the overridden providers.
expect((Module as any).ngInjectorDef.providers).toEqual([Token]);
expect((Module as any).ɵinj.providers).toEqual([Token]);
});
it('should clean up overridden providers on components whose modules are compiled more than once',