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

fix(ivy): @Component should support entry components from another module (#29566)

Browse Source 
PR Close #29566
This commit is contained in:
Marc Laval
2019-03-28 14:50:39 +01:00
committed by Andrew Kushnir
parent acfcf90528
commit d47de60944
3 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/src/render3/jit/module.ts
View File

@ -14,6 +14,7 @@ import {Type} from '../../interface/type';
import {registerNgModuleType} from '../../linker/ng_module_factory_loader';
import {Component} from '../../metadata';
import {ModuleWithProviders, NgModule, NgModuleDef, NgModuleTransitiveScopes} from '../../metadata/ng_module';
import {flatten} from '../../util/array_utils';
import {assertDefined} from '../../util/assert';
import {getComponentDef, getDirectiveDef, getNgModuleDef, getPipeDef} from '../definition';
import {NG_COMPONENT_DEF, NG_DIRECTIVE_DEF, NG_MODULE_DEF, NG_PIPE_DEF} from '../fields';
@ -158,6 +159,7 @@ function verifySemanticsOfNgModuleDef(moduleType: NgModuleType): void {
const errors: string[] = [];
const declarations = maybeUnwrapFn(ngModuleDef.declarations);
const imports = maybeUnwrapFn(ngModuleDef.imports);
flatten(imports, unwrapModuleWithProvidersImports).forEach(verifySemanticsOfNgModuleDef);
const exports = maybeUnwrapFn(ngModuleDef.exports);
declarations.forEach(verifyDeclarationsHaveDefinitions);
const combinedDeclarations: Type<any>[] = [
@ -464,18 +466,6 @@ export function transitiveScopesFor<T>(
return scopes;
}
function flatten<T>(values: any[], mapFn?: (value: T) => any): Type<T>[] {
const out: Type<T>[] = [];
values.forEach(value => {
if (Array.isArray(value)) {
out.push(...flatten<T>(value, mapFn));
} else {
out.push(mapFn ? mapFn(value) : value);
}
});
return out;
}
function expandModuleWithProviders(value: Type<any>| ModuleWithProviders<{}>): Type<any> {
if (isModuleWithProviders(value)) {
return value.ngModule;

4
packages/core/src/util/array_utils.ts
View File

@ -21,7 +21,7 @@ export function addAllToArray(items: any[], arr: any[]) {
/**
* Flattens an array in non-recursive way. Input arrays are not modified.
*/
export function flatten(list: any[]): any[] {
export function flatten(list: any[], mapFn?: (value: any) => any): any[] {
const result: any[] = [];
let i = 0;
while (i < list.length) {
@ -34,7 +34,7 @@ export function flatten(list: any[]): any[] {
i++;
}
} else {
result.push(item);
result.push(mapFn ? mapFn(item) : item);
i++;
}
}