iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(compiler): lower @NgModule ids if needed (#23031) 

This change allows the id of an NgModule to be dynamically computed if
needed.

PR Close #23031
This commit is contained in:
Alex Rickabaugh 2018-03-27 11:56:23 -07:00
parent 884bf0ef09
commit bd024c02e2
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/compiler-cli/src/transformers/program.ts
View File

@ -68,7 +68,7 @@ const MAX_FILE_COUNT_FOR_SINGLE_FILE_EMIT = 20;
/** /**
* Fields to lower within metadata in render2 mode. * Fields to lower within metadata in render2 mode.
*/ */
const LOWER_FIELDS = ['useValue', 'useFactory', 'data']; const LOWER_FIELDS = ['useValue', 'useFactory', 'data', 'id'];
/** /**
* Fields to lower within metadata in render3 mode. * Fields to lower within metadata in render3 mode.

17
packages/compiler-cli/test/ngc_spec.ts
View File

@ -826,6 +826,23 @@ describe('ngc transformer command-line', () => {
expect(mymoduleSource).not.toContain('ɵ0'); expect(mymoduleSource).not.toContain('ɵ0');
}); });
it('should lower an NgModule id', () => {
write('mymodule.ts', `
import {NgModule} from '@angular/core';
@NgModule({
id: (() => 'test')(),
})
export class MyModule {}
`);
expect(compile()).toEqual(0);
const mymodulejs = path.resolve(outDir, 'mymodule.js');
const mymoduleSource = fs.readFileSync(mymodulejs, 'utf8');
expect(mymoduleSource).toContain('id: ɵ0');
expect(mymoduleSource).toMatch(/ɵ0 = .*'test'/);
});
it('should be able to lower supported expressions', () => { it('should be able to lower supported expressions', () => {
writeConfig(`{ writeConfig(`{
"extends": "./tsconfig-base.json", "extends": "./tsconfig-base.json",

2
packages/compiler/src/aot/static_reflector.ts
View File

@ -28,7 +28,7 @@ const IGNORE = {
const USE_VALUE = 'useValue'; const USE_VALUE = 'useValue';
const PROVIDE = 'provide'; const PROVIDE = 'provide';
const REFERENCE_SET = new Set([USE_VALUE, 'useFactory', 'data']); const REFERENCE_SET = new Set([USE_VALUE, 'useFactory', 'data', 'id']);
const TYPEGUARD_POSTFIX = 'TypeGuard'; const TYPEGUARD_POSTFIX = 'TypeGuard';
const USE_IF = 'UseIf'; const USE_IF = 'UseIf';

9
packages/compiler/src/ng_module_compiler.ts
View File

@ -55,10 +55,11 @@ export class NgModuleCompiler {
])); ]));
if (ngModuleMeta.id) { if (ngModuleMeta.id) {
const registerFactoryStmt = const id = typeof ngModuleMeta.id === 'string' ? o.literal(ngModuleMeta.id) :
o.importExpr(Identifiers.RegisterModuleFactoryFn) ctx.importExpr(ngModuleMeta.id);
.callFn([o.literal(ngModuleMeta.id), o.variable(ngModuleFactoryVar)]) const registerFactoryStmt = o.importExpr(Identifiers.RegisterModuleFactoryFn)
.toStmt(); .callFn([id, o.variable(ngModuleFactoryVar)])
.toStmt();
ctx.statements.push(registerFactoryStmt); ctx.statements.push(registerFactoryStmt);
} }