diff --git a/src/dev/i18n/extractors/__snapshots__/html.test.js.snap b/src/dev/i18n/extractors/__snapshots__/html.test.js.snap index ad8ead5c4979..6a4376d5ee9d 100644 --- a/src/dev/i18n/extractors/__snapshots__/html.test.js.snap +++ b/src/dev/i18n/extractors/__snapshots__/html.test.js.snap @@ -38,14 +38,24 @@ Array [ ] `; +exports[`dev/i18n/extractors/html extracts message from i18n filter in interpolating directive 1`] = ` +Array [ + Array [ + "namespace.messageId", + Object { + "description": undefined, + "message": "Message", + }, + ], +] +`; + exports[`dev/i18n/extractors/html throws on empty i18n-id 1`] = `"Empty \\"i18n-id\\" value in angular directive is not allowed."`; -exports[`dev/i18n/extractors/html throws on i18n filter usage in angular directive argument 1`] = ` -"I18n filter can be used only in interpolation expressions: -
-" +exports[`dev/i18n/extractors/html throws on i18n filter usage in complex angular expression 1`] = ` +"Couldn't parse angular i18n expression: +Unexpected token, expected \\";\\" (1:6): + mode as ('metricVis.colorModes.' + mode" `; exports[`dev/i18n/extractors/html throws on missing i18n-default-message attribute 1`] = `"Empty defaultMessage in angular directive is not allowed (\\"message-id\\")."`; diff --git a/src/dev/i18n/extractors/html.js b/src/dev/i18n/extractors/html.js index 80d53131cf62..7a5f61f1a685 100644 --- a/src/dev/i18n/extractors/html.js +++ b/src/dev/i18n/extractors/html.js @@ -109,18 +109,8 @@ function parseIdExpression(expression) { } function trimCurlyBraces(string) { - return string.slice(2, -2).trim(); -} - -/** - * Removes parentheses from the start and the end of a string. - * - * Example: `('id' | i18n: { defaultMessage: 'Message' })` - * @param {string} string string to trim - */ -function trimParentheses(string) { - if (string.startsWith('(') && string.endsWith(')')) { - return string.slice(1, -1); + if (string.startsWith('{{') && string.endsWith('}}')) { + return string.slice(2, -2).trim(); } return string; @@ -140,54 +130,37 @@ function trimOneTimeBindingOperator(string) { return string; } -/** - * Remove interpolation expressions from angular and throw on `| i18n:` substring. - * - * Correct usage: `

`. - * - * Incorrect usage: `ng-options="mode as ('metricVis.colorModes.' + mode | i18n: { defaultMessage: mode }) for mode in collections.metricColorMode"` - * - * @param {string} string html content - */ -function validateI18nFilterUsage(string) { - const stringWithoutExpressions = string.replace(ANGULAR_EXPRESSION_REGEX, ''); - const i18nMarkerPosition = stringWithoutExpressions.indexOf(I18N_FILTER_MARKER); +function* extractExpressions(htmlContent) { + const elements = cheerio + .load(htmlContent)('*') + .toArray(); - if (i18nMarkerPosition === -1) { - return; + for (const element of elements) { + for (const node of element.children) { + if (node.type === 'text') { + yield* (node.data.match(ANGULAR_EXPRESSION_REGEX) || []) + .filter(expression => expression.includes(I18N_FILTER_MARKER)) + .map(trimCurlyBraces); + } + } + + for (const attribute of Object.values(element.attribs)) { + if (attribute.includes(I18N_FILTER_MARKER)) { + yield trimCurlyBraces(attribute); + } + } } - - const linesCount = (stringWithoutExpressions.slice(0, i18nMarkerPosition).match(/\n/g) || []) - .length; - - const errorWithContext = createParserErrorMessage(string, { - loc: { - line: linesCount + 1, - column: 0, - }, - message: 'I18n filter can be used only in interpolation expressions', - }); - - throw createFailError(errorWithContext); } function* getFilterMessages(htmlContent) { - validateI18nFilterUsage(htmlContent); - - const expressions = (htmlContent.match(ANGULAR_EXPRESSION_REGEX) || []) - .filter(expression => expression.includes(I18N_FILTER_MARKER)) - .map(trimCurlyBraces); - - for (const expression of expressions) { + for (const expression of extractExpressions(htmlContent)) { const filterStart = expression.indexOf(I18N_FILTER_MARKER); - const idExpression = trimParentheses( - trimOneTimeBindingOperator(expression.slice(0, filterStart).trim()) - ); + const idExpression = trimOneTimeBindingOperator(expression.slice(0, filterStart).trim()); const filterObjectExpression = expression.slice(filterStart + I18N_FILTER_MARKER.length).trim(); if (!filterObjectExpression || !idExpression) { - throw createFailError(`Cannot parse i18n filter expression: {{ ${expression} }}`); + throw createFailError(`Cannot parse i18n filter expression: ${expression}`); } const messageId = parseIdExpression(idExpression); @@ -217,8 +190,9 @@ function* getDirectiveMessages(htmlContent) { const $ = cheerio.load(htmlContent); const elements = $('[i18n-id]') - .map(function (idx, el) { + .map((idx, el) => { const $el = $(el); + return { id: $el.attr('i18n-id'), defaultMessage: $el.attr('i18n-default-message'), diff --git a/src/dev/i18n/extractors/html.test.js b/src/dev/i18n/extractors/html.test.js index a9b098464cef..16cf448a92bf 100644 --- a/src/dev/i18n/extractors/html.test.js +++ b/src/dev/i18n/extractors/html.test.js @@ -80,7 +80,7 @@ describe('dev/i18n/extractors/html', () => { expect(() => extractHtmlMessages(source).next()).toThrowErrorMatchingSnapshot(); }); - test('throws on i18n filter usage in angular directive argument', () => { + test('throws on i18n filter usage in complex angular expression', () => { const source = Buffer.from(`\
{ expect(() => extractHtmlMessages(source).next()).toThrowErrorMatchingSnapshot(); }); + + test('extracts message from i18n filter in interpolating directive', () => { + const source = Buffer.from(` + +`); + + expect(Array.from(extractHtmlMessages(source))).toMatchSnapshot(); + }); }); diff --git a/src/legacy/core_plugins/region_map/public/region_map_vis_params.html b/src/legacy/core_plugins/region_map/public/region_map_vis_params.html index 0ec64a45c475..75f313b96a3e 100644 --- a/src/legacy/core_plugins/region_map/public/region_map_vis_params.html +++ b/src/legacy/core_plugins/region_map/public/region_map_vis_params.html @@ -79,9 +79,9 @@  
@@ -97,9 +97,9 @@   diff --git a/src/legacy/core_plugins/tile_map/public/editors/tile_map_vis_params.html b/src/legacy/core_plugins/tile_map/public/editors/tile_map_vis_params.html index 8e810eab3bd8..b4da3cfa8fce 100644 --- a/src/legacy/core_plugins/tile_map/public/editors/tile_map_vis_params.html +++ b/src/legacy/core_plugins/tile_map/public/editors/tile_map_vis_params.html @@ -80,7 +80,9 @@ >   diff --git a/src/legacy/core_plugins/tile_map/public/editors/wms_options.html b/src/legacy/core_plugins/tile_map/public/editors/wms_options.html index f2b625f866e9..f70602c20594 100644 --- a/src/legacy/core_plugins/tile_map/public/editors/wms_options.html +++ b/src/legacy/core_plugins/tile_map/public/editors/wms_options.html @@ -45,7 +45,9 @@ >   @@ -66,7 +68,12 @@ i18n-id="tileMap.wmsOptions.wmsUrlLabel" i18n-default-message="WMS url*" > - + - + - + - + - + - +