diff --git a/aio/tools/transforms/angular-api-package/index.js b/aio/tools/transforms/angular-api-package/index.js index 8a73fd552e1..9882dad214c 100644 --- a/aio/tools/transforms/angular-api-package/index.js +++ b/aio/tools/transforms/angular-api-package/index.js @@ -179,7 +179,7 @@ module.exports = .config(function(filterMembers) { filterMembers.notAllowedPatterns.push( - /^ng[A-Z].*Def$/ + /^ng[A-Z].*Def$/, /^ɵ/ ); }) diff --git a/integration/ngcc/test.sh b/integration/ngcc/test.sh index 37d7839d8f2..cc321751d96 100755 --- a/integration/ngcc/test.sh +++ b/integration/ngcc/test.sh @@ -83,8 +83,8 @@ assertSucceeded "Expected 'ngcc' to log 'Compiling'." grep "import [*] as ɵngcc0 from './src/r3_symbols';" node_modules/@angular/core/core.d.ts assertSucceeded "Expected 'ngcc' to add an import for 'src/r3_symbols' in '@angular/core' typings." - grep "static ngInjectorDef: ɵngcc0.ɵɵInjectorDef;" node_modules/@angular/core/core.d.ts - assertSucceeded "Expected 'ngcc' to add a definition for 'ApplicationModule.ngInjectorDef' in '@angular/core' typings." + grep "static ɵinj: ɵngcc0.ɵɵInjectorDef;" node_modules/@angular/core/core.d.ts + assertSucceeded "Expected 'ngcc' to add a definition for 'ApplicationModule.ɵinj' in '@angular/core' typings." # Did it generate a base factory call for synthesized constructors correctly? diff --git a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts index d787ea5e99a..4dbd749e426 100644 --- a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts +++ b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts @@ -270,14 +270,14 @@ A.ɵdir = ɵngcc0.ɵɵdefineDirective({ type: A, selectors: [["", "a", ""]] }); const definitions: string = addDefinitionsSpy.calls.first().args[2]; const ngModuleDef = definitions.indexOf('ɵmod'); expect(ngModuleDef).not.toEqual(-1, 'ɵmod should exist'); - const ngInjectorDef = definitions.indexOf('ngInjectorDef'); - expect(ngInjectorDef).not.toEqual(-1, 'ngInjectorDef should exist'); + const ngInjectorDef = definitions.indexOf('ɵinj'); + expect(ngInjectorDef).not.toEqual(-1, 'ɵinj should exist'); const setClassMetadata = definitions.indexOf('setClassMetadata'); expect(setClassMetadata).not.toEqual(-1, 'setClassMetadata call should exist'); expect(setClassMetadata) .toBeGreaterThan(ngModuleDef, 'setClassMetadata should follow ɵmod'); expect(setClassMetadata) - .toBeGreaterThan(ngInjectorDef, 'setClassMetadata should follow ngInjectorDef'); + .toBeGreaterThan(ngInjectorDef, 'setClassMetadata should follow ɵinj'); }); it('should render classes without decorators if handler matches', () => { diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts index 9fb1984c454..2f14dde1054 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts @@ -24,8 +24,8 @@ import {ReferencesRegistry} from './references_registry'; import {combineResolvers, findAngularDecorator, forwardRefResolver, getValidConstructorDependencies, isExpressionForwardReference, toR3Reference, unwrapExpression} from './util'; export interface NgModuleAnalysis { - ɵmod: R3NgModuleMetadata; - ngInjectorDef: R3InjectorMetadata; + mod: R3NgModuleMetadata; + inj: R3InjectorMetadata; metadataStmt: Statement|null; declarations: Reference[]; exports: Reference[]; @@ -236,7 +236,8 @@ export class NgModuleDecoratorHandler implements DecoratorHandler { if (detected === undefined) { return fail('Failed to recognize @NgModule'); } - const moduleDef = handler.analyze(TestModule, detected.metadata).analysis !.ɵmod; + const moduleDef = handler.analyze(TestModule, detected.metadata).analysis !.mod; expect(getReferenceIdentifierTexts(moduleDef.declarations)).toEqual(['TestComp']); expect(getReferenceIdentifierTexts(moduleDef.exports)).toEqual(['TestComp']); diff --git a/packages/compiler-cli/src/transformers/nocollapse_hack.ts b/packages/compiler-cli/src/transformers/nocollapse_hack.ts index f91c9591a42..ba2389b6429 100644 --- a/packages/compiler-cli/src/transformers/nocollapse_hack.ts +++ b/packages/compiler-cli/src/transformers/nocollapse_hack.ts @@ -23,7 +23,7 @@ const R3_DEF_NAME_PATTERN = [ 'ɵcmp', 'ɵdir', 'ngInjectableDef', - 'ngInjectorDef', + 'ɵinj', 'ɵmod', 'ɵpipe', 'ɵfac', diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts index 5603b2e8c7c..0f0ad620d94 100644 --- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts +++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts @@ -377,7 +377,7 @@ runInEachFileSystem(os => { expect(jsContents).toContain('TestPipe.ɵpipe = i0.ɵɵdefinePipe'); expect(jsContents).toContain('TestInjectable.ngInjectableDef = i0.ɵɵdefineInjectable'); expect(jsContents).toContain('MyModule.ɵmod = i0.ɵɵdefineNgModule'); - expect(jsContents).toContain('MyModule.ngInjectorDef = i0.ɵɵdefineInjector'); + expect(jsContents).toContain('MyModule.ɵinj = i0.ɵɵdefineInjector'); expect(jsContents).toContain('inputs: { input: "input" }'); expect(jsContents).toContain('outputs: { output: "output" }'); }); @@ -650,7 +650,7 @@ runInEachFileSystem(os => { expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule });'); expect(jsContents) .toContain( - `TestModule.ngInjectorDef = i0.ɵɵdefineInjector({ factory: ` + + `TestModule.ɵinj = i0.ɵɵdefineInjector({ factory: ` + `function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` + `Token, useValue: 'test' }], imports: [[OtherModule]] });`); @@ -658,7 +658,7 @@ runInEachFileSystem(os => { expect(dtsContents) .toContain( 'static ɵmod: i0.ɵɵNgModuleDefWithMeta'); - expect(dtsContents).toContain('static ngInjectorDef: i0.ɵɵInjectorDef'); + expect(dtsContents).toContain('static ɵinj: i0.ɵɵInjectorDef'); }); it('should compile NgModules with factory providers without errors', () => { @@ -690,7 +690,7 @@ runInEachFileSystem(os => { expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule });'); expect(jsContents) .toContain( - `TestModule.ngInjectorDef = i0.ɵɵdefineInjector({ factory: ` + + `TestModule.ɵinj = i0.ɵɵdefineInjector({ factory: ` + `function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` + `Token, useFactory: function () { return new Token(); } }], imports: [[OtherModule]] });`); @@ -698,7 +698,7 @@ runInEachFileSystem(os => { expect(dtsContents) .toContain( 'static ɵmod: i0.ɵɵNgModuleDefWithMeta'); - expect(dtsContents).toContain('static ngInjectorDef: i0.ɵɵInjectorDef'); + expect(dtsContents).toContain('static ɵinj: i0.ɵɵInjectorDef'); }); it('should compile NgModules with factory providers and deps without errors', () => { @@ -734,7 +734,7 @@ runInEachFileSystem(os => { expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule });'); expect(jsContents) .toContain( - `TestModule.ngInjectorDef = i0.ɵɵdefineInjector({ factory: ` + + `TestModule.ɵinj = i0.ɵɵdefineInjector({ factory: ` + `function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` + `Token, useFactory: function (dep) { return new Token(dep); }, deps: [Dep] }], imports: [[OtherModule]] });`); @@ -742,7 +742,7 @@ runInEachFileSystem(os => { expect(dtsContents) .toContain( 'static ɵmod: i0.ɵɵNgModuleDefWithMeta'); - expect(dtsContents).toContain('static ngInjectorDef: i0.ɵɵInjectorDef'); + expect(dtsContents).toContain('static ɵinj: i0.ɵɵInjectorDef'); }); it('should compile NgModules with references to local components', () => { diff --git a/packages/compiler-cli/test/transformers/nocollapse_hack_spec.ts b/packages/compiler-cli/test/transformers/nocollapse_hack_spec.ts index 095fe8af59b..38742da4399 100644 --- a/packages/compiler-cli/test/transformers/nocollapse_hack_spec.ts +++ b/packages/compiler-cli/test/transformers/nocollapse_hack_spec.ts @@ -10,7 +10,7 @@ import {nocollapseHack} from '../../src/transformers/nocollapse_hack'; describe('@nocollapse hack', () => { it('should add @nocollapse to a basic class', () => { - const decl = `Foo.ngInjectorDef = define(...);`; + const decl = `Foo.ɵinj = define(...);`; expect(nocollapseHack(decl)).toEqual('/** @nocollapse */ ' + decl); }); @@ -18,9 +18,9 @@ describe('@nocollapse hack', () => { const decl = ` if (false) { /** @type {?} */ - Foo.ngInjectorDef; + Foo.ɵinj; } `; expect(nocollapseHack(decl)).toContain('/** @nocollapse @type {?} */'); }); -}); \ No newline at end of file +}); diff --git a/packages/compiler/design/separate_compilation.md b/packages/compiler/design/separate_compilation.md index 3b4c98ebffa..f624a9cd4e0 100644 --- a/packages/compiler/design/separate_compilation.md +++ b/packages/compiler/design/separate_compilation.md @@ -73,7 +73,7 @@ class: | `hostListeners` | `ɵdir` | | `hostProperties` | `ɵdir` | | `hostAttributes` | `ɵdir` | -| `providers` | `ngInjectorDef` | +| `providers` | `ɵinj` | | `viewProviders` | `ɵcmp` | | `queries` | `ɵdir` | | `guards` | not used | @@ -282,7 +282,7 @@ export class MyPipe { The metadata for a module is transformed by: 1. Remove the `@NgModule` directive. -2. Add `"ngInjectorDef": {}` static field. +2. Add `"ɵinj": {}` static field. 3. Add `"ngModuleScope": ` static field. The scope value is an array the following type: @@ -329,7 +329,7 @@ export class MyModule {} *my.module.js* ```js export class MyModule { - static ngInjectorDef = ɵɵdefineInjector(...); + static ɵinj = ɵɵdefineInjector(...); } ``` @@ -342,7 +342,7 @@ export class MyModule { "MyModule": { "__symbolic": "class", "statics": { - "ngInjectorDef": {}, + "ɵinj": {}, "ngModuleScope": [ { "type": { @@ -389,7 +389,7 @@ manually written as: ```ts export class MyModule { - static ngInjectorDef = ɵɵdefineInjector({ + static ɵinj = ɵɵdefineInjector({ providers: [{ provide: Service, useClass: ServiceImpl }], @@ -440,7 +440,7 @@ properties by including a `// @__BUILD_OPTIMIZER_REMOVE_` comment: ```ts export class MyModule { - static ngInjectorDef = ɵɵdefineInjector({ + static ɵinj = ɵɵdefineInjector({ providers: [{ provide: Service, useClass: ServiceImpl }], diff --git a/packages/compiler/src/constant_pool.ts b/packages/compiler/src/constant_pool.ts index 9c665d2a353..129b39ac010 100644 --- a/packages/compiler/src/constant_pool.ts +++ b/packages/compiler/src/constant_pool.ts @@ -204,7 +204,7 @@ export class ConstantPool { case DefinitionKind.Directive: return 'ɵdir'; case DefinitionKind.Injector: - return 'ngInjectorDef'; + return 'ɵinj'; case DefinitionKind.Pipe: return 'ɵpipe'; } diff --git a/packages/compiler/src/render3/r3_module_compiler.ts b/packages/compiler/src/render3/r3_module_compiler.ts index 3c4a865a4e6..ecbe9b1369b 100644 --- a/packages/compiler/src/render3/r3_module_compiler.ts +++ b/packages/compiler/src/render3/r3_module_compiler.ts @@ -251,7 +251,7 @@ export function compileNgModuleFromRender2( /* name */ className, /* parent */ null, /* fields */[new o.ClassField( - /* name */ 'ngInjectorDef', + /* name */ 'ɵinj', /* type */ o.INFERRED_TYPE, /* modifiers */[o.StmtModifier.Static], /* initializer */ injectorDef, )], diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts index 5a53e3dea47..4cbd6e88829 100644 --- a/packages/core/src/core_render3_private_export.ts +++ b/packages/core/src/core_render3_private_export.ts @@ -230,7 +230,7 @@ export { export { NG_INJECTABLE_DEF as ɵNG_INJECTABLE_DEF, - NG_INJECTOR_DEF as ɵNG_INJECTOR_DEF, + NG_INJ_DEF as ɵNG_INJ_DEF, } from './di/interface/defs'; export { diff --git a/packages/core/src/di/interface/defs.ts b/packages/core/src/di/interface/defs.ts index aa793b9e9cd..02aab567f35 100644 --- a/packages/core/src/di/interface/defs.ts +++ b/packages/core/src/di/interface/defs.ts @@ -104,7 +104,7 @@ export interface InjectorType extends Type { /** * Opaque type whose structure is highly version dependent. Do not rely on any properties. */ - ngInjectorDef: never; + ɵinj: never; } /** @@ -159,7 +159,7 @@ export const defineInjectable = ɵɵdefineInjectable; /** * Construct an `InjectorDef` which configures an injector. * - * This should be assigned to a static `ngInjectorDef` field on a type, which will then be an + * This should be assigned to a static injector def (`ɵinj`) field on a type, which will then be an * `InjectorType`. * * Options: @@ -223,13 +223,13 @@ export function getInheritedInjectableDef(type: any): ɵɵInjectableDef|nu } /** - * Read the `ngInjectorDef` type in a way which is immune to accidentally reading inherited value. + * Read the injector def type in a way which is immune to accidentally reading inherited value. * - * @param type type which may have `ngInjectorDef` + * @param type type which may have an injector def (`ɵinj`) */ export function getInjectorDef(type: any): ɵɵInjectorDef|null { - return type && type.hasOwnProperty(NG_INJECTOR_DEF) ? (type as any)[NG_INJECTOR_DEF] : null; + return type && type.hasOwnProperty(NG_INJ_DEF) ? (type as any)[NG_INJ_DEF] : null; } export const NG_INJECTABLE_DEF = getClosureSafeProperty({ngInjectableDef: getClosureSafeProperty}); -export const NG_INJECTOR_DEF = getClosureSafeProperty({ngInjectorDef: getClosureSafeProperty}); +export const NG_INJ_DEF = getClosureSafeProperty({ɵinj: getClosureSafeProperty}); diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts index f944eab19b9..7d4fd59cbd4 100644 --- a/packages/core/src/di/r3_injector.ts +++ b/packages/core/src/di/r3_injector.ts @@ -251,11 +251,11 @@ export class R3Injector { defOrWrappedDef = resolveForwardRef(defOrWrappedDef); if (!defOrWrappedDef) return false; - // Either the defOrWrappedDef is an InjectorType (with ngInjectorDef) or an + // Either the defOrWrappedDef is an InjectorType (with injector def) or an // InjectorDefTypeWithProviders (aka ModuleWithProviders). Detecting either is a megamorphic // read, so care is taken to only do the read once. - // First attempt to read the ngInjectorDef. + // First attempt to read the injector def (`ɵinj`). let def = getInjectorDef(defOrWrappedDef); // If that's not present, then attempt to read ngModule from the InjectorDefTypeWithProviders. @@ -416,7 +416,8 @@ function injectableDefOrInjectorDefFactory(token: Type| InjectionToken return factory; } - // If the token is an NgModule, it's also injectable but the factory is on its ngInjectorDef. + // If the token is an NgModule, it's also injectable but the factory is on its injector def + // (`ɵinj`) const injectorDef = getInjectorDef(token); if (injectorDef !== null) { return injectorDef.factory; diff --git a/packages/core/src/metadata/ng_module.ts b/packages/core/src/metadata/ng_module.ts index 28b8dcbeefd..a44826cd782 100644 --- a/packages/core/src/metadata/ng_module.ts +++ b/packages/core/src/metadata/ng_module.ts @@ -350,7 +350,7 @@ function preR3NgModuleCompile(moduleType: Type, metadata?: NgModule): void imports = [...imports, metadata.exports]; } - (moduleType as InjectorType).ngInjectorDef = ɵɵdefineInjector({ + (moduleType as InjectorType).ɵinj = ɵɵdefineInjector({ factory: convertInjectableProviderToFactory(moduleType, {useClass: moduleType}), providers: metadata && metadata.providers, imports: imports, diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts index c1af91e6340..f0daa049bf1 100644 --- a/packages/core/src/render3/jit/module.ts +++ b/packages/core/src/render3/jit/module.ts @@ -8,7 +8,7 @@ import {R3InjectorMetadataFacade, getCompilerFacade} from '../../compiler/compiler_facade'; import {resolveForwardRef} from '../../di/forward_ref'; -import {NG_INJECTOR_DEF} from '../../di/interface/defs'; +import {NG_INJ_DEF} from '../../di/interface/defs'; import {reflectDependencies} from '../../di/jit/util'; import {Type} from '../../interface/type'; import {Component} from '../../metadata'; @@ -93,7 +93,7 @@ export function compileNgModule(moduleType: Type, ngModule: NgModule = {}): } /** - * Compiles and adds the `ɵmod` and `ngInjectorDef` properties to the module class. + * Compiles and adds the `ɵmod` and `ɵinj` properties to the module class. * * It's possible to compile a module via this API which will allow duplicate declarations in its * root. @@ -135,7 +135,7 @@ export function compileNgModuleDefs( }); let ngInjectorDef: any = null; - Object.defineProperty(moduleType, NG_INJECTOR_DEF, { + Object.defineProperty(moduleType, NG_INJ_DEF, { get: () => { if (ngInjectorDef === null) { ngDevMode && verifySemanticsOfNgModuleDef( @@ -151,7 +151,7 @@ export function compileNgModuleDefs( ], }; ngInjectorDef = getCompilerFacade().compileInjector( - angularCoreEnv, `ng:///${moduleType.name}/ngInjectorDef.js`, meta); + angularCoreEnv, `ng:///${moduleType.name}/ɵinj.js`, meta); } return ngInjectorDef; }, diff --git a/packages/core/test/bundling/injection/bundle.golden_symbols.json b/packages/core/test/bundling/injection/bundle.golden_symbols.json index f2eea4b2e4b..b50e981c024 100644 --- a/packages/core/test/bundling/injection/bundle.golden_symbols.json +++ b/packages/core/test/bundling/injection/bundle.golden_symbols.json @@ -30,7 +30,7 @@ "name": "NG_INJECTABLE_DEF" }, { - "name": "NG_INJECTOR_DEF" + "name": "NG_INJ_DEF" }, { "name": "NG_TEMP_TOKEN_PATH" diff --git a/packages/core/test/bundling/injection/usage.ts b/packages/core/test/bundling/injection/usage.ts index ec7f6ae7c6f..af8d1db771d 100644 --- a/packages/core/test/bundling/injection/usage.ts +++ b/packages/core/test/bundling/injection/usage.ts @@ -30,7 +30,7 @@ export class ScopedService { } export class DefinedInjector { - static ngInjectorDef = ɵɵdefineInjector({ + static ɵinj = ɵɵdefineInjector({ factory: () => new DefinedInjector(), providers: [ScopedService], }); diff --git a/packages/core/test/di/r3_injector_spec.ts b/packages/core/test/di/r3_injector_spec.ts index 4bf206d3a19..171465bed3e 100644 --- a/packages/core/test/di/r3_injector_spec.ts +++ b/packages/core/test/di/r3_injector_spec.ts @@ -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)) diff --git a/packages/core/test/render3/component_spec.ts b/packages/core/test/render3/component_spec.ts index ffdcfbe8129..a8d801ed26b 100644 --- a/packages/core/test/render3/component_spec.ts +++ b/packages/core/test/render3/component_spec.ts @@ -90,7 +90,7 @@ describe('component', () => { } class MyModule { - static ngInjectorDef = ɵɵdefineInjector({ + static ɵinj = ɵɵdefineInjector({ factory: () => new MyModule(), providers: [{provide: MyService, useValue: new MyService('injector')}] }); diff --git a/packages/core/test/render3/ivy/jit_spec.ts b/packages/core/test/render3/ivy/jit_spec.ts index b21cf495f02..1f7e96cb8ea 100644 --- a/packages/core/test/render3/ivy/jit_spec.ts +++ b/packages/core/test/render3/ivy/jit_spec.ts @@ -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 as any).ngInjectorDef; + const injectorDef: ɵɵInjectorDef = (Module as any).ɵinj; const instance = injectorDef.factory(); // Since the instance was created outside of an injector using the module, the diff --git a/packages/core/test/render3/providers_spec.ts b/packages/core/test/render3/providers_spec.ts index 3a48f996238..1b4b8007410 100644 --- a/packages/core/test/render3/providers_spec.ts +++ b/packages/core/test/render3/providers_spec.ts @@ -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('foo'); 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', () => { diff --git a/packages/core/test/test_bed_spec.ts b/packages/core/test/test_bed_spec.ts index 39802b105ce..74673d4b749 100644 --- a/packages/core/test/test_bed_spec.ts +++ b/packages/core/test/test_bed_spec.ts @@ -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', diff --git a/packages/core/testing/src/r3_test_bed_compiler.ts b/packages/core/testing/src/r3_test_bed_compiler.ts index e183346c466..0c510b16c85 100644 --- a/packages/core/testing/src/r3_test_bed_compiler.ts +++ b/packages/core/testing/src/r3_test_bed_compiler.ts @@ -7,7 +7,7 @@ */ import {ResourceLoader} from '@angular/compiler'; -import {ApplicationInitStatus, COMPILER_OPTIONS, Compiler, Component, Directive, Injector, LOCALE_ID, ModuleWithComponentFactories, ModuleWithProviders, NgModule, NgModuleFactory, NgZone, Pipe, PlatformRef, Provider, Type, ɵDEFAULT_LOCALE_ID as DEFAULT_LOCALE_ID, ɵDirectiveDef as DirectiveDef, ɵNG_COMP_DEF as NG_COMP_DEF, ɵNG_DIR_DEF as NG_DIR_DEF, ɵNG_INJECTOR_DEF as NG_INJECTOR_DEF, ɵNG_MOD_DEF as NG_MOD_DEF, ɵNG_PIPE_DEF as NG_PIPE_DEF, ɵNgModuleFactory as R3NgModuleFactory, ɵNgModuleTransitiveScopes as NgModuleTransitiveScopes, ɵNgModuleType as NgModuleType, ɵRender3ComponentFactory as ComponentFactory, ɵRender3NgModuleRef as NgModuleRef, ɵcompileComponent as compileComponent, ɵcompileDirective as compileDirective, ɵcompileNgModuleDefs as compileNgModuleDefs, ɵcompilePipe as compilePipe, ɵgetInjectableDef as getInjectableDef, ɵpatchComponentDefWithScope as patchComponentDefWithScope, ɵsetLocaleId as setLocaleId, ɵtransitiveScopesFor as transitiveScopesFor, ɵɵInjectableDef as InjectableDef} from '@angular/core'; +import {ApplicationInitStatus, COMPILER_OPTIONS, Compiler, Component, Directive, Injector, LOCALE_ID, ModuleWithComponentFactories, ModuleWithProviders, NgModule, NgModuleFactory, NgZone, Pipe, PlatformRef, Provider, Type, ɵDEFAULT_LOCALE_ID as DEFAULT_LOCALE_ID, ɵDirectiveDef as DirectiveDef, ɵNG_COMP_DEF as NG_COMP_DEF, ɵNG_DIR_DEF as NG_DIR_DEF, ɵNG_INJ_DEF as NG_INJ_DEF, ɵNG_MOD_DEF as NG_MOD_DEF, ɵNG_PIPE_DEF as NG_PIPE_DEF, ɵNgModuleFactory as R3NgModuleFactory, ɵNgModuleTransitiveScopes as NgModuleTransitiveScopes, ɵNgModuleType as NgModuleType, ɵRender3ComponentFactory as ComponentFactory, ɵRender3NgModuleRef as NgModuleRef, ɵcompileComponent as compileComponent, ɵcompileDirective as compileDirective, ɵcompileNgModuleDefs as compileNgModuleDefs, ɵcompilePipe as compilePipe, ɵgetInjectableDef as getInjectableDef, ɵpatchComponentDefWithScope as patchComponentDefWithScope, ɵsetLocaleId as setLocaleId, ɵtransitiveScopesFor as transitiveScopesFor, ɵɵInjectableDef as InjectableDef} from '@angular/core'; import {ModuleRegistrationMap, getRegisteredModulesState, restoreRegisteredModulesState} from '../../src/linker/ng_module_factory_registration'; import {clearResolutionOfComponentResourcesQueue, isComponentDefPendingResolution, resolveComponentResources, restoreComponentResolutionQueue} from '../../src/metadata/resource_loading'; @@ -362,7 +362,7 @@ export class R3TestBedCompiler { } this.moduleProvidersOverridden.add(moduleType); - const injectorDef: any = (moduleType as any)[NG_INJECTOR_DEF]; + const injectorDef: any = (moduleType as any)[NG_INJ_DEF]; if (this.providerOverridesByToken.size > 0) { // Extract the list of providers from ModuleWithProviders, so we can define the final list of // providers that might have overrides. @@ -373,9 +373,9 @@ export class R3TestBedCompiler { isModuleWithProviders(imported) ? imported.providers : [])); const providers = [...providersFromModules, ...injectorDef.providers]; if (this.hasProviderOverrides(providers)) { - this.maybeStoreNgDef(NG_INJECTOR_DEF, moduleType); + this.maybeStoreNgDef(NG_INJ_DEF, moduleType); - this.storeFieldOfDefOnType(moduleType, NG_INJECTOR_DEF, 'providers'); + this.storeFieldOfDefOnType(moduleType, NG_INJ_DEF, 'providers'); injectorDef.providers = this.getOverriddenProviders(providers); } @@ -410,7 +410,7 @@ export class R3TestBedCompiler { } // Cache the initial ngModuleDef as it will be overwritten. this.maybeStoreNgDef(NG_MOD_DEF, ngModule); - this.maybeStoreNgDef(NG_INJECTOR_DEF, ngModule); + this.maybeStoreNgDef(NG_INJ_DEF, ngModule); compileNgModuleDefs(ngModule as NgModuleType, metadata); } diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts index 0e70fa22732..49d3fda9e20 100644 --- a/tools/public_api_guard/core/core.d.ts +++ b/tools/public_api_guard/core/core.d.ts @@ -471,7 +471,7 @@ export declare abstract class Injector { export declare const INJECTOR: InjectionToken; export interface InjectorType extends Type { - ngInjectorDef: never; + ɵinj: never; } export interface Input {