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

fix(compiler): generate constant array for i18n attributes (#23837)

Browse Source 
PR Close #23837
This commit is contained in:
Victor Berchet 2018-05-10 15:58:27 -07:00 committed by Matias Niemelä
parent d889f57ae2
commit cfde36da84
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/compiler/src/constant_pool.ts
View File

@ -295,8 +295,9 @@ class KeyVisitor implements o.ExpressionVisitor {
`EX:${ast.value.runtime.name}`; `EX:${ast.value.runtime.name}`;
} }
visitReadVarExpr(node: o.ReadVarExpr) { return `VAR:${node.name}`; }
visitWrappedNodeExpr = invalid; visitWrappedNodeExpr = invalid;
visitReadVarExpr = invalid;
visitWriteVarExpr = invalid; visitWriteVarExpr = invalid;
visitWriteKeyExpr = invalid; visitWriteKeyExpr = invalid;
visitWritePropExpr = invalid; visitWritePropExpr = invalid;

12
packages/compiler/src/render3/view/template.ts
View File

@ -257,13 +257,11 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
// Add the attributes // Add the attributes
const i18nMessages: o.Statement[] = []; const i18nMessages: o.Statement[] = [];
const attributes: o.Expression[] = []; const attributes: o.Expression[] = [];
let hasI18nAttr = false;
Object.getOwnPropertyNames(outputAttrs).forEach(name => { Object.getOwnPropertyNames(outputAttrs).forEach(name => {
const value = outputAttrs[name]; const value = outputAttrs[name];
attributes.push(o.literal(name)); attributes.push(o.literal(name));
if (attrI18nMetas.hasOwnProperty(name)) { if (attrI18nMetas.hasOwnProperty(name)) {
hasI18nAttr = true;
const meta = parseI18nMeta(attrI18nMetas[name]); const meta = parseI18nMeta(attrI18nMetas[name]);
const variable = this.constantPool.getTranslation(value, meta); const variable = this.constantPool.getTranslation(value, meta);
attributes.push(variable); attributes.push(variable);
@ -272,13 +270,9 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
} }
}); });
let attrArg: o.Expression = o.TYPED_NULL_EXPR; const attrArg: o.Expression = attributes.length > 0 ?
this.constantPool.getConstLiteral(o.literalArr(attributes), true) :
if (attributes.length > 0) { o.TYPED_NULL_EXPR;
attrArg = hasI18nAttr ? getLiteralFactory(this.constantPool, o.literalArr(attributes)) :
this.constantPool.getConstLiteral(o.literalArr(attributes), true);
}
parameters.push(attrArg); parameters.push(attrArg);
if (element.references && element.references.length > 0) { if (element.references && element.references.length > 0) {

14
packages/compiler/test/render3/r3_view_compiler_i18n_spec.ts
View File

@ -93,10 +93,7 @@ describe('i18n support in the view compiler', () => {
* @desc desc * @desc desc
*/ */
const $msg_1$ = goog.getMsg('introduction'); const $msg_1$ = goog.getMsg('introduction');
… const $c1$ = ['title', $msg_1$];
const $c1$ = ($a1$:any) => {
return ['title', $a1$];
};
… …
/** /**
* @desc desc * @desc desc
@ -106,7 +103,7 @@ describe('i18n support in the view compiler', () => {
… …
template: function MyComponent_Template(rf: IDENT, ctx: IDENT) { template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
if (rf & 1) { if (rf & 1) {
$r3$.ɵE(0, 'div', $r3$.ɵf1($c1$, $msg_1$)); $r3$.ɵE(0, 'div', $c1$);
$r3$.ɵT(1, $msg_2$); $r3$.ɵT(1, $msg_2$);
$r3$.ɵe(); $r3$.ɵe();
} }
@ -147,14 +144,11 @@ describe('i18n support in the view compiler', () => {
* @meaning m * @meaning m
*/ */
const $msg_1$ = goog.getMsg('introduction'); const $msg_1$ = goog.getMsg('introduction');
… const $c1$ = ['id', 'static', 'title', $msg_1$];
const $c1$ = ($a1$:any) => {
return ['id', 'static', 'title', $a1$];
};
… …
template: function MyComponent_Template(rf: IDENT, ctx: IDENT) { template: function MyComponent_Template(rf: IDENT, ctx: IDENT) {
if (rf & 1) { if (rf & 1) {
$r3$.ɵE(0, 'div', $r3$.ɵf1($c1$, $msg_1$)); $r3$.ɵE(0, 'div', $c1$);
$r3$.ɵe(); $r3$.ɵe();
} }
} }