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

fix(compiler): only log template deprecation warning once (#15364)

Browse Source
This commit is contained in:
Rob Wormald
2017-03-22 21:26:53 -07:00
committed by Igor Minar
parent 9319b5f329
commit 08d86751b9
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/compiler/src/template_parser/template_parser.ts
View File

@ -63,6 +63,23 @@ const CLASS_ATTR = 'class';
const TEXT_CSS_SELECTOR = CssSelector.parse('*')[0]; const TEXT_CSS_SELECTOR = CssSelector.parse('*')[0];
const TEMPLATE_ELEMENT_DEPRECATION_WARNING =
'The <template> element is deprecated. Use <ng-template> instead';
const TEMPLATE_ATTR_DEPRECATION_WARNING =
'The template attribute is deprecated. Use an ng-template element instead.';
let warningCounts: {[warning: string]: number} = {};
function warnOnlyOnce(warnings: string[]): (warning: ParseError) => boolean {
return (error: ParseError) => {
if (warnings.indexOf(error.msg) !== -1) {
warningCounts[error.msg] = (warningCounts[error.msg] || 0) + 1;
return warningCounts[error.msg] <= 1;
}
return true;
};
}
/** /**
* Provides an array of {@link TemplateAstVisitor}s which will be used to transform * Provides an array of {@link TemplateAstVisitor}s which will be used to transform
* parsed templates before compilation is invoked, allowing custom expression syntax * parsed templates before compilation is invoked, allowing custom expression syntax
@ -97,7 +114,11 @@ export class TemplateParser {
pipes: CompilePipeSummary[], schemas: SchemaMetadata[], pipes: CompilePipeSummary[], schemas: SchemaMetadata[],
templateUrl: string): {template: TemplateAst[], pipes: CompilePipeSummary[]} { templateUrl: string): {template: TemplateAst[], pipes: CompilePipeSummary[]} {
const result = this.tryParse(component, template, directives, pipes, schemas, templateUrl); const result = this.tryParse(component, template, directives, pipes, schemas, templateUrl);
const warnings = result.errors.filter(error => error.level === ParseErrorLevel.WARNING); const warnings =
result.errors.filter(error => error.level === ParseErrorLevel.WARNING).filter(warnOnlyOnce([
TEMPLATE_ATTR_DEPRECATION_WARNING, TEMPLATE_ELEMENT_DEPRECATION_WARNING
]));
const errors = result.errors.filter(error => error.level === ParseErrorLevel.ERROR); const errors = result.errors.filter(error => error.level === ParseErrorLevel.ERROR);
if (warnings.length > 0) { if (warnings.length > 0) {
@ -285,8 +306,7 @@ class TemplateParseVisitor implements html.Visitor {
if (this.config.enableLegacyTemplate && normalizedName == TEMPLATE_ATTR) { if (this.config.enableLegacyTemplate && normalizedName == TEMPLATE_ATTR) {
this._reportError( this._reportError(
`The template attribute is deprecated. Use an ng-template element instead.`, TEMPLATE_ATTR_DEPRECATION_WARNING, attr.sourceSpan, ParseErrorLevel.WARNING);
attr.sourceSpan, ParseErrorLevel.WARNING);
templateBindingsSource = attr.value; templateBindingsSource = attr.value;
} else if (normalizedName.startsWith(TEMPLATE_ATTR_PREFIX)) { } else if (normalizedName.startsWith(TEMPLATE_ATTR_PREFIX)) {
templateBindingsSource = attr.value; templateBindingsSource = attr.value;
@ -873,8 +893,7 @@ function isTemplate(
// `<template>` is HTML and case insensitive // `<template>` is HTML and case insensitive
if (tagNoNs.toLowerCase() === TEMPLATE_ELEMENT) { if (tagNoNs.toLowerCase() === TEMPLATE_ELEMENT) {
if (enableLegacyTemplate && tagNoNs.toLowerCase() === TEMPLATE_ELEMENT) { if (enableLegacyTemplate && tagNoNs.toLowerCase() === TEMPLATE_ELEMENT) {
reportDeprecation( reportDeprecation(TEMPLATE_ELEMENT_DEPRECATION_WARNING, el.sourceSpan);
`The <template> element is deprecated. Use <ng-template> instead`, el.sourceSpan);
return true; return true;
} }