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

feat(ivy): add error reporting to the html to ivy transformer (#23546)

Browse Source 
PR Close #23546
This commit is contained in:
Victor Berchet
2018-04-27 14:39:07 -07:00
committed by Igor Minar
parent 46674d5fac
commit 08e7efc69e
7 changed files with 121 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/compiler/src/aot/compiler.ts
View File

@ -24,7 +24,7 @@ import * as o from '../output/output_ast';
import {ParseError} from '../parse_util';
import {compileNgModule as compileIvyModule} from '../render3/r3_module_compiler';
import {compilePipe as compileIvyPipe} from '../render3/r3_pipe_compiler';
import {HtmlToTemplateTransform} from '../render3/r3_template_transform';
import {htmlAstToRender3Ast} from '../render3/r3_template_transform';
import {compileComponentFromRender2 as compileIvyComponent, compileDirectiveFromRender2 as compileIvyDirective} from '../render3/view/compiler';
import {DomElementSchemaRegistry} from '../schema/dom_element_schema_registry';
import {CompiledStylesheet, StyleCompiler} from '../style_compiler';
@ -391,10 +391,7 @@ export class AotCompiler {
if (!preserveWhitespaces) {
htmlAst = removeWhitespaces(htmlAst);
}
const transform = new HtmlToTemplateTransform(hostBindingParser);
const nodes = html.visitAll(transform, htmlAst.rootNodes, null);
const hasNgContent = transform.hasNgContent;
const ngContentSelectors = transform.ngContentSelectors;
const render3Ast = htmlAstToRender3Ast(htmlAst.rootNodes, hostBindingParser);
// Map of StaticType by directive selectors
const directiveTypeBySel = new Map<string, any>();
@ -417,8 +414,8 @@ export class AotCompiler {
pipes.forEach(pipe => { pipeTypeByName.set(pipe.name, pipe.type.reference); });
compileIvyComponent(
context, directiveMetadata, nodes, hasNgContent, ngContentSelectors, this.reflector,
hostBindingParser, directiveTypeBySel, pipeTypeByName);
context, directiveMetadata, render3Ast, this.reflector, hostBindingParser,
directiveTypeBySel, pipeTypeByName);
} else {
compileIvyDirective(context, directiveMetadata, this.reflector, hostBindingParser);
}