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

fix(ivy): resolve forwardRefs correctly in TestBed (JIT) (#27737)

Browse Source 
Forward refs in some places (like imports/export/providers/viewProviders/queries) were not resolved before passing to compilation phase. Now we resolve missing refs before invoking compile function.

PR Close #27737
This commit is contained in:
Andrew Kushnir 2018-12-18 13:36:19 -08:00 committed by Ben Lesh
parent 1dc95c41eb
commit a9790018df
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/src/render3/jit/directive.ts
View File

@ -7,6 +7,7 @@
*/ */
import {ComponentType} from '..'; import {ComponentType} from '..';
import {resolveForwardRef} from '../../di/forward_ref';
import {Query} from '../../metadata/di'; import {Query} from '../../metadata/di';
import {Component, Directive} from '../../metadata/directives'; import {Component, Directive} from '../../metadata/directives';
import {componentNeedsResolution, maybeQueueResolutionOfComponentResources} from '../../metadata/resource_loading'; import {componentNeedsResolution, maybeQueueResolutionOfComponentResources} from '../../metadata/resource_loading';
@ -155,7 +156,7 @@ function directiveMetadata(type: Type<any>, metadata: Directive): R3DirectiveMet
} }
function convertToR3QueryPredicate(selector: any): any|string[] { function convertToR3QueryPredicate(selector: any): any|string[] {
return typeof selector === 'string' ? splitByComma(selector) : selector; return typeof selector === 'string' ? splitByComma(selector) : resolveForwardRef(selector);
} }
export function convertToR3QueryMetadata(propertyName: string, ann: Query): R3QueryMetadataFacade { export function convertToR3QueryMetadata(propertyName: string, ann: Query): R3QueryMetadataFacade {

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

@ -107,10 +107,12 @@ export function compileNgModuleDefs(moduleType: NgModuleType, ngModule: NgModule
ngModuleDef = getCompilerFacade().compileNgModule( ngModuleDef = getCompilerFacade().compileNgModule(
angularCoreEnv, `ng://${moduleType.name}/ngModuleDef.js`, { angularCoreEnv, `ng://${moduleType.name}/ngModuleDef.js`, {
type: moduleType, type: moduleType,
bootstrap: flatten(ngModule.bootstrap || EMPTY_ARRAY), bootstrap: flatten(ngModule.bootstrap || EMPTY_ARRAY, resolveForwardRef),
declarations: declarations, declarations: declarations.map(resolveForwardRef),
imports: flatten(ngModule.imports || EMPTY_ARRAY).map(expandModuleWithProviders), imports: flatten(ngModule.imports || EMPTY_ARRAY, resolveForwardRef)
exports: flatten(ngModule.exports || EMPTY_ARRAY).map(expandModuleWithProviders), .map(expandModuleWithProviders),
exports: flatten(ngModule.exports || EMPTY_ARRAY, resolveForwardRef)
.map(expandModuleWithProviders),
emitInline: true, emitInline: true,
}); });
} }
@ -132,8 +134,8 @@ export function compileNgModuleDefs(moduleType: NgModuleType, ngModule: NgModule
deps: reflectDependencies(moduleType), deps: reflectDependencies(moduleType),
providers: ngModule.providers || EMPTY_ARRAY, providers: ngModule.providers || EMPTY_ARRAY,
imports: [ imports: [
ngModule.imports || EMPTY_ARRAY, (ngModule.imports || EMPTY_ARRAY).map(resolveForwardRef),
ngModule.exports || EMPTY_ARRAY, (ngModule.exports || EMPTY_ARRAY).map(resolveForwardRef),
], ],
}; };
ngInjectorDef = getCompilerFacade().compileInjector( ngInjectorDef = getCompilerFacade().compileInjector(
@ -154,8 +156,8 @@ function verifySemanticsOfNgModuleDef(moduleType: NgModuleType): void {
const errors: string[] = []; const errors: string[] = [];
ngModuleDef.declarations.forEach(verifyDeclarationsHaveDefinitions); ngModuleDef.declarations.forEach(verifyDeclarationsHaveDefinitions);
const combinedDeclarations: Type<any>[] = [ const combinedDeclarations: Type<any>[] = [
...ngModuleDef.declarations, // ...ngModuleDef.declarations.map(resolveForwardRef), //
...flatten(ngModuleDef.imports.map(computeCombinedExports)), ...flatten(ngModuleDef.imports.map(computeCombinedExports), resolveForwardRef),
]; ];
ngModuleDef.exports.forEach(verifyExportsAreDeclaredOrReExported); ngModuleDef.exports.forEach(verifyExportsAreDeclaredOrReExported);
ngModuleDef.declarations.forEach(verifyDeclarationIsUnique); ngModuleDef.declarations.forEach(verifyDeclarationIsUnique);

7
packages/core/test/forward_ref_integration_spec.ts
View File

@ -10,15 +10,12 @@ import {CommonModule} from '@angular/common';
import {Component, ContentChildren, Directive, Inject, NO_ERRORS_SCHEMA, NgModule, QueryList, asNativeElements, forwardRef} from '@angular/core'; import {Component, ContentChildren, Directive, Inject, NO_ERRORS_SCHEMA, NgModule, QueryList, asNativeElements, forwardRef} from '@angular/core';
import {TestBed} from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import {expect} from '@angular/platform-browser/testing/src/matchers'; import {expect} from '@angular/platform-browser/testing/src/matchers';
import {fixmeIvy} from '@angular/private/testing';
describe('forwardRef integration', function() { describe('forwardRef integration', function() {
beforeEach(() => { TestBed.configureTestingModule({imports: [Module], declarations: [App]}); }); beforeEach(() => { TestBed.configureTestingModule({imports: [Module], declarations: [App]}); });
fixmeIvy('FW-756: Pipes and directives from imported modules are not taken into account') it('should instantiate components which are declared using forwardRef', () => {
.it('should instantiate components which are declared using forwardRef', () => { const a = TestBed.configureTestingModule({schemas: [NO_ERRORS_SCHEMA]}).createComponent(App);
const a =
TestBed.configureTestingModule({schemas: [NO_ERRORS_SCHEMA]}).createComponent(App);
a.detectChanges(); a.detectChanges();
expect(asNativeElements(a.debugElement.children)).toHaveText('frame(lock)'); expect(asNativeElements(a.debugElement.children)).toHaveText('frame(lock)');
expect(TestBed.get(ModuleFrame)).toBeDefined(); expect(TestBed.get(ModuleFrame)).toBeDefined();

5
packages/core/testing/src/r3_test_bed.ts
View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import {ApplicationInitStatus, Component, Directive, Injector, NgModule, NgZone, Pipe, PlatformRef, Provider, SchemaMetadata, Type, ɵInjectableDef as InjectableDef, ɵNgModuleDef as NgModuleDef, ɵ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, ɵresetCompiledComponents as resetCompiledComponents, ɵstringify as stringify} from '@angular/core'; import {ApplicationInitStatus, Component, Directive, Injector, NgModule, NgZone, Pipe, PlatformRef, Provider, SchemaMetadata, Type, resolveForwardRef, ɵInjectableDef as InjectableDef, ɵNgModuleDef as NgModuleDef, ɵ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, ɵresetCompiledComponents as resetCompiledComponents, ɵstringify as stringify} from '@angular/core';
import {ComponentFixture} from './component_fixture'; import {ComponentFixture} from './component_fixture';
import {MetadataOverride} from './metadata_override'; import {MetadataOverride} from './metadata_override';
@ -493,7 +493,8 @@ export class TestBedRender3 implements Injector, TestBed {
const metadata = this._getMetaWithOverrides(ngModule); const metadata = this._getMetaWithOverrides(ngModule);
compileNgModuleDefs(moduleType, metadata); compileNgModuleDefs(moduleType, metadata);
const declarations: Type<any>[] = flatten(ngModule.declarations || EMPTY_ARRAY); const declarations: Type<any>[] =
flatten(ngModule.declarations || EMPTY_ARRAY, resolveForwardRef);
const compiledComponents: Type<any>[] = []; const compiledComponents: Type<any>[] = [];
// Compile the components, directives and pipes declared by this module // Compile the components, directives and pipes declared by this module