@angular/compiler 17.1.0-next.2 → 17.1.0-next.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/src/compiler.mjs +2 -2
- package/esm2022/src/compiler_facade_interface.mjs +1 -1
- package/esm2022/src/jit_compiler_facade.mjs +46 -17
- package/esm2022/src/render3/partial/api.mjs +1 -1
- package/esm2022/src/render3/partial/class_metadata.mjs +1 -1
- package/esm2022/src/render3/partial/directive.mjs +112 -17
- package/esm2022/src/render3/partial/factory.mjs +1 -1
- package/esm2022/src/render3/partial/injectable.mjs +1 -1
- package/esm2022/src/render3/partial/injector.mjs +1 -1
- package/esm2022/src/render3/partial/ng_module.mjs +1 -1
- package/esm2022/src/render3/partial/pipe.mjs +1 -1
- package/esm2022/src/render3/r3_identifiers.mjs +4 -1
- package/esm2022/src/render3/view/api.mjs +1 -1
- package/esm2022/src/render3/view/compiler.mjs +43 -16
- package/esm2022/src/render3/view/util.mjs +8 -2
- package/esm2022/src/template/pipeline/ir/src/enums.mjs +34 -17
- package/esm2022/src/template/pipeline/ir/src/expression.mjs +19 -20
- package/esm2022/src/template/pipeline/ir/src/ops/create.mjs +37 -11
- package/esm2022/src/template/pipeline/ir/src/ops/host.mjs +5 -2
- package/esm2022/src/template/pipeline/ir/src/ops/update.mjs +29 -14
- package/esm2022/src/template/pipeline/src/emit.mjs +13 -9
- package/esm2022/src/template/pipeline/src/ingest.mjs +293 -158
- package/esm2022/src/template/pipeline/src/instruction.mjs +18 -14
- package/esm2022/src/template/pipeline/src/phases/apply_i18n_expressions.mjs +20 -4
- package/esm2022/src/template/pipeline/src/phases/assign_i18n_slot_dependencies.mjs +44 -22
- package/esm2022/src/template/pipeline/src/phases/attribute_extraction.mjs +26 -5
- package/esm2022/src/template/pipeline/src/phases/binding_specialization.mjs +4 -4
- package/esm2022/src/template/pipeline/src/phases/const_collection.mjs +15 -6
- package/esm2022/src/template/pipeline/src/phases/convert_i18n_bindings.mjs +52 -0
- package/esm2022/src/template/pipeline/src/phases/create_i18n_contexts.mjs +23 -1
- package/esm2022/src/template/pipeline/src/phases/extract_i18n_messages.mjs +65 -88
- package/esm2022/src/template/pipeline/src/phases/generate_advance.mjs +2 -2
- package/esm2022/src/template/pipeline/src/phases/generate_variables.mjs +7 -1
- package/esm2022/src/template/pipeline/src/phases/i18n_const_collection.mjs +147 -35
- package/esm2022/src/template/pipeline/src/phases/i18n_text_extraction.mjs +5 -3
- package/esm2022/src/template/pipeline/src/phases/parse_extracted_styles.mjs +4 -3
- package/esm2022/src/template/pipeline/src/phases/phase_remove_content_selectors.mjs +15 -3
- package/esm2022/src/template/pipeline/src/phases/propagate_i18n_blocks.mjs +31 -12
- package/esm2022/src/template/pipeline/src/phases/reify.mjs +18 -15
- package/esm2022/src/template/pipeline/src/phases/remove_unused_i18n_attrs.mjs +33 -0
- package/esm2022/src/template/pipeline/src/phases/resolve_i18n_element_placeholders.mjs +175 -31
- package/esm2022/src/template/pipeline/src/phases/resolve_i18n_expression_placeholders.mjs +10 -5
- package/esm2022/src/template/pipeline/src/phases/resolve_sanitizers.mjs +78 -14
- package/esm2022/src/template/pipeline/src/phases/slot_allocation.mjs +3 -1
- package/esm2022/src/template/pipeline/src/phases/var_counting.mjs +3 -1
- package/esm2022/src/version.mjs +1 -1
- package/fesm2022/compiler.mjs +1394 -532
- package/fesm2022/compiler.mjs.map +1 -1
- package/index.d.ts +39 -6
- package/package.json +2 -2
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
|
+
import { mapLiteral } from '../../../../output/map_util';
|
|
8
9
|
import * as o from '../../../../output/output_ast';
|
|
9
10
|
import { sanitizeIdentifier } from '../../../../parse_util';
|
|
10
11
|
import { Identifiers } from '../../../../render3/r3_identifiers';
|
|
@@ -20,35 +21,136 @@ const NG_I18N_CLOSURE_MODE = 'ngI18nClosureMode';
|
|
|
20
21
|
* considers variables like `I18N_0` as constants and throws an error when their value changes.
|
|
21
22
|
*/
|
|
22
23
|
const TRANSLATION_VAR_PREFIX = 'i18n_';
|
|
24
|
+
/** Prefix of ICU expressions for post processing */
|
|
25
|
+
export const I18N_ICU_MAPPING_PREFIX = 'I18N_EXP_';
|
|
26
|
+
/**
|
|
27
|
+
* The escape sequence used for message param values.
|
|
28
|
+
*/
|
|
29
|
+
const ESCAPE = '\uFFFD';
|
|
23
30
|
/**
|
|
24
31
|
* Lifts i18n properties into the consts array.
|
|
25
32
|
* TODO: Can we use `ConstCollectedExpr`?
|
|
33
|
+
* TODO: The way the various attributes are linked together is very complex. Perhaps we could
|
|
34
|
+
* simplify the process, maybe by combining the context and message ops?
|
|
26
35
|
*/
|
|
27
36
|
export function collectI18nConsts(job) {
|
|
28
37
|
const fileBasedI18nSuffix = job.relativeContextFilePath.replace(/[^A-Za-z0-9]/g, '_').toUpperCase() + '_';
|
|
29
|
-
|
|
30
|
-
//
|
|
38
|
+
// Step One: Build up various lookup maps we need to collect all the consts.
|
|
39
|
+
// Context Xref -> Extracted Attribute Ops
|
|
40
|
+
const extractedAttributesByI18nContext = new Map();
|
|
41
|
+
// Element/ElementStart Xref -> I18n Attributes config op
|
|
42
|
+
const i18nAttributesByElement = new Map();
|
|
43
|
+
// Element/ElementStart Xref -> All I18n Expression ops for attrs on that target
|
|
44
|
+
const i18nExpressionsByElement = new Map();
|
|
45
|
+
// I18n Message Xref -> I18n Message Op (TODO: use a central op map)
|
|
31
46
|
const messages = new Map();
|
|
47
|
+
for (const unit of job.units) {
|
|
48
|
+
for (const op of unit.ops()) {
|
|
49
|
+
if (op.kind === ir.OpKind.ExtractedAttribute && op.i18nContext !== null) {
|
|
50
|
+
const attributes = extractedAttributesByI18nContext.get(op.i18nContext) ?? [];
|
|
51
|
+
attributes.push(op);
|
|
52
|
+
extractedAttributesByI18nContext.set(op.i18nContext, attributes);
|
|
53
|
+
}
|
|
54
|
+
else if (op.kind === ir.OpKind.I18nAttributes) {
|
|
55
|
+
i18nAttributesByElement.set(op.target, op);
|
|
56
|
+
}
|
|
57
|
+
else if (op.kind === ir.OpKind.I18nExpression && op.usage === ir.I18nExpressionFor.I18nAttribute) {
|
|
58
|
+
const expressions = i18nExpressionsByElement.get(op.target) ?? [];
|
|
59
|
+
expressions.push(op);
|
|
60
|
+
i18nExpressionsByElement.set(op.target, expressions);
|
|
61
|
+
}
|
|
62
|
+
else if (op.kind === ir.OpKind.I18nMessage) {
|
|
63
|
+
messages.set(op.xref, op);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
// Step Two: Serialize the extracted i18n messages for root i18n blocks and i18n attributes into
|
|
68
|
+
// the const array.
|
|
69
|
+
//
|
|
70
|
+
// Also, each i18n message will have a variable expression that can refer to its
|
|
71
|
+
// value. Store these expressions in the appropriate place:
|
|
72
|
+
// 1. For normal i18n content, it also goes in the const array. We save the const index to use
|
|
73
|
+
// later.
|
|
74
|
+
// 2. For extracted attributes, it becomes the value of the extracted attribute instruction.
|
|
75
|
+
// 3. For i18n bindings, it will go in a separate const array instruction below; for now, we just
|
|
76
|
+
// save it.
|
|
77
|
+
const i18nValuesByContext = new Map();
|
|
78
|
+
const messageConstIndices = new Map();
|
|
32
79
|
for (const unit of job.units) {
|
|
33
80
|
for (const op of unit.create) {
|
|
34
81
|
if (op.kind === ir.OpKind.I18nMessage) {
|
|
35
|
-
|
|
82
|
+
if (op.messagePlaceholder === null) {
|
|
83
|
+
const { mainVar, statements } = collectMessage(job, fileBasedI18nSuffix, messages, op);
|
|
84
|
+
if (op.i18nBlock !== null) {
|
|
85
|
+
// This is a regular i18n message with a corresponding i18n block. Collect it into the
|
|
86
|
+
// const array.
|
|
87
|
+
const i18nConst = job.addConst(mainVar, statements);
|
|
88
|
+
messageConstIndices.set(op.i18nBlock, i18nConst);
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
// This is an i18n attribute. Extract the initializers into the const pool.
|
|
92
|
+
job.constsInitializers.push(...statements);
|
|
93
|
+
// Save the i18n variable value for later.
|
|
94
|
+
i18nValuesByContext.set(op.i18nContext, mainVar);
|
|
95
|
+
// This i18n message may correspond to an individual extracted attribute. If so, The
|
|
96
|
+
// value of that attribute is updated to read the extracted i18n variable.
|
|
97
|
+
const attributesForMessage = extractedAttributesByI18nContext.get(op.i18nContext);
|
|
98
|
+
if (attributesForMessage !== undefined) {
|
|
99
|
+
for (const attr of attributesForMessage) {
|
|
100
|
+
attr.expression = mainVar.clone();
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
36
105
|
ir.OpList.remove(op);
|
|
37
106
|
}
|
|
38
107
|
}
|
|
39
108
|
}
|
|
40
|
-
//
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
109
|
+
// Step Three: Serialize I18nAttributes configurations into the const array. Each I18nAttributes
|
|
110
|
+
// instruction has a config array, which contains k-v pairs describing each binding name, and the
|
|
111
|
+
// i18n variable that provides the value.
|
|
112
|
+
for (const unit of job.units) {
|
|
113
|
+
for (const elem of unit.create) {
|
|
114
|
+
if (ir.isElementOrContainerOp(elem)) {
|
|
115
|
+
const i18nAttributes = i18nAttributesByElement.get(elem.xref);
|
|
116
|
+
if (i18nAttributes === undefined) {
|
|
117
|
+
// This element is not associated with an i18n attributes configuration instruction.
|
|
118
|
+
continue;
|
|
119
|
+
}
|
|
120
|
+
let i18nExpressions = i18nExpressionsByElement.get(elem.xref);
|
|
121
|
+
if (i18nExpressions === undefined) {
|
|
122
|
+
// Unused i18nAttributes should have already been removed.
|
|
123
|
+
// TODO: Should the removal of those dead instructions be merged with this phase?
|
|
124
|
+
throw new Error('AssertionError: Could not find any i18n expressions associated with an I18nAttributes instruction');
|
|
125
|
+
}
|
|
126
|
+
// Find expressions for all the unique property names, removing duplicates.
|
|
127
|
+
const seenPropertyNames = new Set();
|
|
128
|
+
i18nExpressions = i18nExpressions.filter(i18nExpr => {
|
|
129
|
+
const seen = (seenPropertyNames.has(i18nExpr.name));
|
|
130
|
+
seenPropertyNames.add(i18nExpr.name);
|
|
131
|
+
return !seen;
|
|
132
|
+
});
|
|
133
|
+
const i18nAttributeConfig = i18nExpressions.flatMap(i18nExpr => {
|
|
134
|
+
const i18nExprValue = i18nValuesByContext.get(i18nExpr.context);
|
|
135
|
+
if (i18nExprValue === undefined) {
|
|
136
|
+
throw new Error('AssertionError: Could not find i18n expression\'s value');
|
|
137
|
+
}
|
|
138
|
+
return [o.literal(i18nExpr.name), i18nExprValue];
|
|
139
|
+
});
|
|
140
|
+
i18nAttributes.i18nAttributesConfig =
|
|
141
|
+
job.addConst(new o.LiteralArrayExpr(i18nAttributeConfig));
|
|
142
|
+
}
|
|
45
143
|
}
|
|
46
144
|
}
|
|
47
|
-
//
|
|
145
|
+
// Step Four: Propagate the extracted const index into i18n ops that messages were extracted from.
|
|
48
146
|
for (const unit of job.units) {
|
|
49
147
|
for (const op of unit.create) {
|
|
50
148
|
if (op.kind === ir.OpKind.I18nStart) {
|
|
51
|
-
|
|
149
|
+
const msgIndex = messageConstIndices.get(op.root);
|
|
150
|
+
if (msgIndex === undefined) {
|
|
151
|
+
throw new Error('AssertionError: Could not find corresponding i18n block index for an i18n message op; was an i18n message incorrectly assumed to correspond to an attribute?');
|
|
152
|
+
}
|
|
153
|
+
op.messageIndex = msgIndex;
|
|
52
154
|
}
|
|
53
155
|
}
|
|
54
156
|
}
|
|
@@ -58,18 +160,23 @@ export function collectI18nConsts(job) {
|
|
|
58
160
|
* This will recursively collect any sub-messages referenced from the parent message as well.
|
|
59
161
|
*/
|
|
60
162
|
function collectMessage(job, fileBasedI18nSuffix, messages, messageOp) {
|
|
61
|
-
// Recursively collect any sub-messages,
|
|
163
|
+
// Recursively collect any sub-messages, record each sub-message's main variable under its
|
|
164
|
+
// placeholder so that we can add them to the params for the parent message. It is possible
|
|
165
|
+
// that multiple sub-messages will share the same placeholder, so we need to track an array of
|
|
166
|
+
// variables for each placeholder.
|
|
62
167
|
const statements = [];
|
|
168
|
+
const subMessagePlaceholders = new Map();
|
|
63
169
|
for (const subMessageId of messageOp.subMessages) {
|
|
64
170
|
const subMessage = messages.get(subMessageId);
|
|
65
171
|
const { mainVar: subMessageVar, statements: subMessageStatements } = collectMessage(job, fileBasedI18nSuffix, messages, subMessage);
|
|
66
172
|
statements.push(...subMessageStatements);
|
|
67
|
-
|
|
173
|
+
const subMessages = subMessagePlaceholders.get(subMessage.messagePlaceholder) ?? [];
|
|
174
|
+
subMessages.push(subMessageVar);
|
|
175
|
+
subMessagePlaceholders.set(subMessage.messagePlaceholder, subMessages);
|
|
68
176
|
}
|
|
177
|
+
addSubMessageParams(messageOp, subMessagePlaceholders);
|
|
69
178
|
// Sort the params for consistency with TemaplateDefinitionBuilder output.
|
|
70
179
|
messageOp.params = new Map([...messageOp.params.entries()].sort());
|
|
71
|
-
// Check that the message has all of its parameters filled out.
|
|
72
|
-
assertAllParamsResolved(messageOp);
|
|
73
180
|
const mainVar = o.variable(job.pool.uniqueName(TRANSLATION_VAR_PREFIX));
|
|
74
181
|
// Closure Compiler requires const names to start with `MSG_` but disallows any other
|
|
75
182
|
// const to start with `MSG_`. We define a variable starting with `MSG_` just for the
|
|
@@ -80,10 +187,11 @@ function collectMessage(job, fileBasedI18nSuffix, messages, messageOp) {
|
|
|
80
187
|
// set in post-processing.
|
|
81
188
|
if (messageOp.needsPostprocessing) {
|
|
82
189
|
// Sort the post-processing params for consistency with TemaplateDefinitionBuilder output.
|
|
83
|
-
|
|
190
|
+
const postprocessingParams = Object.fromEntries([...messageOp.postprocessingParams.entries()].sort());
|
|
191
|
+
const formattedPostprocessingParams = formatI18nPlaceholderNamesInMap(postprocessingParams, /* useCamelCase */ false);
|
|
84
192
|
const extraTransformFnParams = [];
|
|
85
193
|
if (messageOp.postprocessingParams.size > 0) {
|
|
86
|
-
extraTransformFnParams.push(
|
|
194
|
+
extraTransformFnParams.push(mapLiteral(formattedPostprocessingParams, /* quoted */ true));
|
|
87
195
|
}
|
|
88
196
|
transformFn = (expr) => o.importExpr(Identifiers.i18nPostprocess).callFn([expr, ...extraTransformFnParams]);
|
|
89
197
|
}
|
|
@@ -91,6 +199,26 @@ function collectMessage(job, fileBasedI18nSuffix, messages, messageOp) {
|
|
|
91
199
|
statements.push(...getTranslationDeclStmts(messageOp.message, mainVar, closureVar, messageOp.params, transformFn));
|
|
92
200
|
return { mainVar, statements };
|
|
93
201
|
}
|
|
202
|
+
/**
|
|
203
|
+
* Adds the given subMessage placeholders to the given message op.
|
|
204
|
+
*
|
|
205
|
+
* If a placeholder only corresponds to a single sub-message variable, we just set that variable
|
|
206
|
+
* as the param value. However, if the placeholder corresponds to multiple sub-message
|
|
207
|
+
* variables, we need to add a special placeholder value that is handled by the post-processing
|
|
208
|
+
* step. We then add the array of variables as a post-processing param.
|
|
209
|
+
*/
|
|
210
|
+
function addSubMessageParams(messageOp, subMessagePlaceholders) {
|
|
211
|
+
for (const [placeholder, subMessages] of subMessagePlaceholders) {
|
|
212
|
+
if (subMessages.length === 1) {
|
|
213
|
+
messageOp.params.set(placeholder, subMessages[0]);
|
|
214
|
+
}
|
|
215
|
+
else {
|
|
216
|
+
messageOp.params.set(placeholder, o.literal(`${ESCAPE}${I18N_ICU_MAPPING_PREFIX}${placeholder}${ESCAPE}`));
|
|
217
|
+
messageOp.postprocessingParams.set(placeholder, o.literalArr(subMessages));
|
|
218
|
+
messageOp.needsPostprocessing = true;
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
}
|
|
94
222
|
/**
|
|
95
223
|
* Generate statements that define a given translation message.
|
|
96
224
|
*
|
|
@@ -113,7 +241,8 @@ function collectMessage(job, fileBasedI18nSuffix, messages, messageOp) {
|
|
|
113
241
|
* @param closureVar The variable for Closure `goog.getMsg` calls, e.g. `MSG_EXTERNAL_XXX`.
|
|
114
242
|
* @param params Object mapping placeholder names to their values (e.g.
|
|
115
243
|
* `{ "interpolation": "\uFFFD0\uFFFD" }`).
|
|
116
|
-
* @param transformFn Optional transformation function that will be applied to the translation
|
|
244
|
+
* @param transformFn Optional transformation function that will be applied to the translation
|
|
245
|
+
* (e.g.
|
|
117
246
|
* post-processing).
|
|
118
247
|
* @returns An array of statements that defined a given translation.
|
|
119
248
|
*/
|
|
@@ -158,21 +287,4 @@ function i18nGenerateClosureVar(pool, messageId, fileBasedI18nSuffix, useExterna
|
|
|
158
287
|
}
|
|
159
288
|
return o.variable(name);
|
|
160
289
|
}
|
|
161
|
-
/**
|
|
162
|
-
* Asserts that all of the message's placeholders have values.
|
|
163
|
-
*/
|
|
164
|
-
function assertAllParamsResolved(op) {
|
|
165
|
-
for (let placeholder in op.message.placeholders) {
|
|
166
|
-
placeholder = placeholder.trimEnd();
|
|
167
|
-
if (!op.params.has(placeholder) && !op.postprocessingParams.has(placeholder)) {
|
|
168
|
-
throw Error(`Failed to resolve i18n placeholder: ${placeholder}`);
|
|
169
|
-
}
|
|
170
|
-
}
|
|
171
|
-
for (let placeholder in op.message.placeholderToMessage) {
|
|
172
|
-
placeholder = placeholder.trimEnd();
|
|
173
|
-
if (!op.params.has(placeholder) && !op.postprocessingParams.has(placeholder)) {
|
|
174
|
-
throw Error(`Failed to resolve i18n message placeholder: ${placeholder}`);
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
|
-
}
|
|
178
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"i18n_const_collection.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/i18n_const_collection.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {type ConstantPool} from '../../../../constant_pool';\nimport * as i18n from '../../../../i18n/i18n_ast';\nimport * as o from '../../../../output/output_ast';\nimport {sanitizeIdentifier} from '../../../../parse_util';\nimport {Identifiers} from '../../../../render3/r3_identifiers';\nimport {createGoogleGetMsgStatements} from '../../../../render3/view/i18n/get_msg_utils';\nimport {createLocalizeStatements} from '../../../../render3/view/i18n/localize_utils';\nimport {declareI18nVariable, formatI18nPlaceholderNamesInMap, getTranslationConstPrefix} from '../../../../render3/view/i18n/util';\nimport * as ir from '../../ir';\nimport {ComponentCompilationJob} from '../compilation';\n\n/** Name of the global variable that is used to determine if we use Closure translations or not */\nconst NG_I18N_CLOSURE_MODE = 'ngI18nClosureMode';\n\n/**\n * Prefix for non-`goog.getMsg` i18n-related vars.\n * Note: the prefix uses lowercase characters intentionally due to a Closure behavior that\n * considers variables like `I18N_0` as constants and throws an error when their value changes.\n */\nconst TRANSLATION_VAR_PREFIX = 'i18n_';\n\n/**\n * Lifts i18n properties into the consts array.\n * TODO: Can we use `ConstCollectedExpr`?\n */\nexport function collectI18nConsts(job: ComponentCompilationJob): void {\n  const fileBasedI18nSuffix =\n      job.relativeContextFilePath.replace(/[^A-Za-z0-9]/g, '_').toUpperCase() + '_';\n  const messageConstIndices = new Map<ir.XrefId, ir.ConstIndex>();\n\n  // Remove all of the i18n message ops into a map.\n  const messages = new Map<ir.XrefId, ir.I18nMessageOp>();\n  for (const unit of job.units) {\n    for (const op of unit.create) {\n      if (op.kind === ir.OpKind.I18nMessage) {\n        messages.set(op.xref, op);\n        ir.OpList.remove<ir.CreateOp>(op);\n      }\n    }\n  }\n\n  // Serialize the extracted messages for root i18n blocks into the const array.\n  for (const op of messages.values()) {\n    if (op.kind === ir.OpKind.I18nMessage && op.messagePlaceholder === null) {\n      const {mainVar, statements} = collectMessage(job, fileBasedI18nSuffix, messages, op);\n      messageConstIndices.set(op.i18nBlock, job.addConst(mainVar, statements));\n    }\n  }\n\n  // Assign const index to i18n ops that messages were extracted from.\n  for (const unit of job.units) {\n    for (const op of unit.create) {\n      if (op.kind === ir.OpKind.I18nStart) {\n        op.messageIndex = messageConstIndices.get(op.root)!;\n      }\n    }\n  }\n}\n\n/**\n * Collects the given message into a set of statements that can be added to the const array.\n * This will recursively collect any sub-messages referenced from the parent message as well.\n */\nfunction collectMessage(\n    job: ComponentCompilationJob, fileBasedI18nSuffix: string,\n    messages: Map<ir.XrefId, ir.I18nMessageOp>,\n    messageOp: ir.I18nMessageOp): {mainVar: o.ReadVarExpr, statements: o.Statement[]} {\n  // Recursively collect any sub-messages, and fill in their placeholders in this message.\n  const statements: o.Statement[] = [];\n  for (const subMessageId of messageOp.subMessages) {\n    const subMessage = messages.get(subMessageId)!;\n    const {mainVar: subMessageVar, statements: subMessageStatements} =\n        collectMessage(job, fileBasedI18nSuffix, messages, subMessage);\n    statements.push(...subMessageStatements);\n    messageOp.params.set(subMessage.messagePlaceholder!, subMessageVar);\n  }\n\n  // Sort the params for consistency with TemaplateDefinitionBuilder output.\n  messageOp.params = new Map([...messageOp.params.entries()].sort());\n\n  // Check that the message has all of its parameters filled out.\n  assertAllParamsResolved(messageOp);\n\n  const mainVar = o.variable(job.pool.uniqueName(TRANSLATION_VAR_PREFIX));\n  // Closure Compiler requires const names to start with `MSG_` but disallows any other\n  // const to start with `MSG_`. We define a variable starting with `MSG_` just for the\n  // `goog.getMsg` call\n  const closureVar = i18nGenerateClosureVar(\n      job.pool, messageOp.message.id, fileBasedI18nSuffix, job.i18nUseExternalIds);\n  let transformFn = undefined;\n\n  // If nescessary, add a post-processing step and resolve any placeholder params that are\n  // set in post-processing.\n  if (messageOp.needsPostprocessing) {\n    // Sort the post-processing params for consistency with TemaplateDefinitionBuilder output.\n    messageOp.postprocessingParams = new Map([...messageOp.postprocessingParams.entries()].sort());\n\n    const extraTransformFnParams: o.Expression[] = [];\n    if (messageOp.postprocessingParams.size > 0) {\n      extraTransformFnParams.push(o.literalMap(\n          [...messageOp.postprocessingParams].map(([key, value]) => ({key, value, quoted: true}))));\n    }\n    transformFn = (expr: o.ReadVarExpr) =>\n        o.importExpr(Identifiers.i18nPostprocess).callFn([expr, ...extraTransformFnParams]);\n  }\n\n  // Add the message's statements\n  statements.push(...getTranslationDeclStmts(\n      messageOp.message, mainVar, closureVar, messageOp.params, transformFn));\n\n  return {mainVar, statements};\n}\n\n/**\n * Generate statements that define a given translation message.\n *\n * ```\n * var I18N_1;\n * if (typeof ngI18nClosureMode !== undefined && ngI18nClosureMode) {\n *     var MSG_EXTERNAL_XXX = goog.getMsg(\n *          \"Some message with {$interpolation}!\",\n *          { \"interpolation\": \"\\uFFFD0\\uFFFD\" }\n *     );\n *     I18N_1 = MSG_EXTERNAL_XXX;\n * }\n * else {\n *     I18N_1 = $localize`Some message with ${'\\uFFFD0\\uFFFD'}!`;\n * }\n * ```\n *\n * @param message The original i18n AST message node\n * @param variable The variable that will be assigned the translation, e.g. `I18N_1`.\n * @param closureVar The variable for Closure `goog.getMsg` calls, e.g. `MSG_EXTERNAL_XXX`.\n * @param params Object mapping placeholder names to their values (e.g.\n * `{ \"interpolation\": \"\\uFFFD0\\uFFFD\" }`).\n * @param transformFn Optional transformation function that will be applied to the translation (e.g.\n * post-processing).\n * @returns An array of statements that defined a given translation.\n */\nfunction getTranslationDeclStmts(\n    message: i18n.Message, variable: o.ReadVarExpr, closureVar: o.ReadVarExpr,\n    params: Map<string, o.Expression>,\n    transformFn?: (raw: o.ReadVarExpr) => o.Expression): o.Statement[] {\n  const paramsObject = Object.fromEntries(params);\n  const statements: o.Statement[] = [\n    declareI18nVariable(variable),\n    o.ifStmt(\n        createClosureModeGuard(),\n        createGoogleGetMsgStatements(variable, message, closureVar, paramsObject),\n        createLocalizeStatements(\n            variable, message,\n            formatI18nPlaceholderNamesInMap(paramsObject, /* useCamelCase */ false))),\n  ];\n\n  if (transformFn) {\n    statements.push(new o.ExpressionStatement(variable.set(transformFn(variable))));\n  }\n\n  return statements;\n}\n\n/**\n * Create the expression that will be used to guard the closure mode block\n * It is equivalent to:\n *\n * ```\n * typeof ngI18nClosureMode !== undefined && ngI18nClosureMode\n * ```\n */\nfunction createClosureModeGuard(): o.BinaryOperatorExpr {\n  return o.typeofExpr(o.variable(NG_I18N_CLOSURE_MODE))\n      .notIdentical(o.literal('undefined', o.STRING_TYPE))\n      .and(o.variable(NG_I18N_CLOSURE_MODE));\n}\n\n/**\n * Generates vars with Closure-specific names for i18n blocks (i.e. `MSG_XXX`).\n */\nfunction i18nGenerateClosureVar(\n    pool: ConstantPool, messageId: string, fileBasedI18nSuffix: string,\n    useExternalIds: boolean): o.ReadVarExpr {\n  let name: string;\n  const suffix = fileBasedI18nSuffix;\n  if (useExternalIds) {\n    const prefix = getTranslationConstPrefix(`EXTERNAL_`);\n    const uniqueSuffix = pool.uniqueName(suffix);\n    name = `${prefix}${sanitizeIdentifier(messageId)}$$${uniqueSuffix}`;\n  } else {\n    const prefix = getTranslationConstPrefix(suffix);\n    name = pool.uniqueName(prefix);\n  }\n  return o.variable(name);\n}\n\n/**\n * Asserts that all of the message's placeholders have values.\n */\nfunction assertAllParamsResolved(op: ir.I18nMessageOp): asserts op is ir.I18nMessageOp {\n  for (let placeholder in op.message.placeholders) {\n    placeholder = placeholder.trimEnd();\n    if (!op.params.has(placeholder) && !op.postprocessingParams.has(placeholder)) {\n      throw Error(`Failed to resolve i18n placeholder: ${placeholder}`);\n    }\n  }\n  for (let placeholder in op.message.placeholderToMessage) {\n    placeholder = placeholder.trimEnd();\n    if (!op.params.has(placeholder) && !op.postprocessingParams.has(placeholder)) {\n      throw Error(`Failed to resolve i18n message placeholder: ${placeholder}`);\n    }\n  }\n}\n"]}
|
|
290
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"i18n_const_collection.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/i18n_const_collection.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {type ConstantPool} from '../../../../constant_pool';\nimport * as i18n from '../../../../i18n/i18n_ast';\nimport {mapLiteral} from '../../../../output/map_util';\nimport * as o from '../../../../output/output_ast';\nimport {sanitizeIdentifier} from '../../../../parse_util';\nimport {Identifiers} from '../../../../render3/r3_identifiers';\nimport {createGoogleGetMsgStatements} from '../../../../render3/view/i18n/get_msg_utils';\nimport {createLocalizeStatements} from '../../../../render3/view/i18n/localize_utils';\nimport {declareI18nVariable, formatI18nPlaceholderNamesInMap, getTranslationConstPrefix} from '../../../../render3/view/i18n/util';\nimport * as ir from '../../ir';\nimport {ComponentCompilationJob} from '../compilation';\n\n/** Name of the global variable that is used to determine if we use Closure translations or not */\nconst NG_I18N_CLOSURE_MODE = 'ngI18nClosureMode';\n\n/**\n * Prefix for non-`goog.getMsg` i18n-related vars.\n * Note: the prefix uses lowercase characters intentionally due to a Closure behavior that\n * considers variables like `I18N_0` as constants and throws an error when their value changes.\n */\nconst TRANSLATION_VAR_PREFIX = 'i18n_';\n\n/** Prefix of ICU expressions for post processing */\nexport const I18N_ICU_MAPPING_PREFIX = 'I18N_EXP_';\n\n/**\n * The escape sequence used for message param values.\n */\nconst ESCAPE = '\\uFFFD';\n\n/**\n * Lifts i18n properties into the consts array.\n * TODO: Can we use `ConstCollectedExpr`?\n * TODO: The way the various attributes are linked together is very complex. Perhaps we could\n * simplify the process, maybe by combining the context and message ops?\n */\nexport function collectI18nConsts(job: ComponentCompilationJob): void {\n  const fileBasedI18nSuffix =\n      job.relativeContextFilePath.replace(/[^A-Za-z0-9]/g, '_').toUpperCase() + '_';\n  // Step One: Build up various lookup maps we need to collect all the consts.\n\n  // Context Xref -> Extracted Attribute Ops\n  const extractedAttributesByI18nContext = new Map<ir.XrefId, ir.ExtractedAttributeOp[]>();\n  // Element/ElementStart Xref -> I18n Attributes config op\n  const i18nAttributesByElement = new Map<ir.XrefId, ir.I18nAttributesOp>();\n  // Element/ElementStart Xref -> All I18n Expression ops for attrs on that target\n  const i18nExpressionsByElement = new Map<ir.XrefId, ir.I18nExpressionOp[]>();\n  // I18n Message Xref -> I18n Message Op (TODO: use a central op map)\n  const messages = new Map<ir.XrefId, ir.I18nMessageOp>();\n\n  for (const unit of job.units) {\n    for (const op of unit.ops()) {\n      if (op.kind === ir.OpKind.ExtractedAttribute && op.i18nContext !== null) {\n        const attributes = extractedAttributesByI18nContext.get(op.i18nContext) ?? [];\n        attributes.push(op);\n        extractedAttributesByI18nContext.set(op.i18nContext, attributes);\n      } else if (op.kind === ir.OpKind.I18nAttributes) {\n        i18nAttributesByElement.set(op.target, op);\n      } else if (\n          op.kind === ir.OpKind.I18nExpression && op.usage === ir.I18nExpressionFor.I18nAttribute) {\n        const expressions = i18nExpressionsByElement.get(op.target) ?? [];\n        expressions.push(op);\n        i18nExpressionsByElement.set(op.target, expressions);\n      } else if (op.kind === ir.OpKind.I18nMessage) {\n        messages.set(op.xref, op);\n      }\n    }\n  }\n\n  // Step Two: Serialize the extracted i18n messages for root i18n blocks and i18n attributes into\n  // the const array.\n  //\n  // Also, each i18n message will have a variable expression that can refer to its\n  // value. Store these expressions in the appropriate place:\n  // 1. For normal i18n content, it also goes in the const array. We save the const index to use\n  // later.\n  // 2. For extracted attributes, it becomes the value of the extracted attribute instruction.\n  // 3. For i18n bindings, it will go in a separate const array instruction below; for now, we just\n  // save it.\n\n  const i18nValuesByContext = new Map<ir.XrefId, o.Expression>();\n  const messageConstIndices = new Map<ir.XrefId, ir.ConstIndex>();\n\n  for (const unit of job.units) {\n    for (const op of unit.create) {\n      if (op.kind === ir.OpKind.I18nMessage) {\n        if (op.messagePlaceholder === null) {\n          const {mainVar, statements} = collectMessage(job, fileBasedI18nSuffix, messages, op);\n          if (op.i18nBlock !== null) {\n            // This is a regular i18n message with a corresponding i18n block. Collect it into the\n            // const array.\n            const i18nConst = job.addConst(mainVar, statements);\n            messageConstIndices.set(op.i18nBlock, i18nConst);\n          } else {\n            // This is an i18n attribute. Extract the initializers into the const pool.\n            job.constsInitializers.push(...statements);\n\n            // Save the i18n variable value for later.\n            i18nValuesByContext.set(op.i18nContext, mainVar);\n\n            // This i18n message may correspond to an individual extracted attribute. If so, The\n            // value of that attribute is updated to read the extracted i18n variable.\n            const attributesForMessage = extractedAttributesByI18nContext.get(op.i18nContext);\n            if (attributesForMessage !== undefined) {\n              for (const attr of attributesForMessage) {\n                attr.expression = mainVar.clone();\n              }\n            }\n          }\n        }\n        ir.OpList.remove<ir.CreateOp>(op);\n      }\n    }\n  }\n\n  // Step Three: Serialize I18nAttributes configurations into the const array. Each I18nAttributes\n  // instruction has a config array, which contains k-v pairs describing each binding name, and the\n  // i18n variable that provides the value.\n\n  for (const unit of job.units) {\n    for (const elem of unit.create) {\n      if (ir.isElementOrContainerOp(elem)) {\n        const i18nAttributes = i18nAttributesByElement.get(elem.xref);\n        if (i18nAttributes === undefined) {\n          // This element is not associated with an i18n attributes configuration instruction.\n          continue;\n        }\n\n        let i18nExpressions = i18nExpressionsByElement.get(elem.xref);\n        if (i18nExpressions === undefined) {\n          // Unused i18nAttributes should have already been removed.\n          // TODO: Should the removal of those dead instructions be merged with this phase?\n          throw new Error(\n              'AssertionError: Could not find any i18n expressions associated with an I18nAttributes instruction');\n        }\n\n        // Find expressions for all the unique property names, removing duplicates.\n        const seenPropertyNames = new Set<string>();\n        i18nExpressions = i18nExpressions.filter(i18nExpr => {\n          const seen = (seenPropertyNames.has(i18nExpr.name));\n          seenPropertyNames.add(i18nExpr.name);\n          return !seen;\n        });\n\n        const i18nAttributeConfig = i18nExpressions.flatMap(i18nExpr => {\n          const i18nExprValue = i18nValuesByContext.get(i18nExpr.context);\n          if (i18nExprValue === undefined) {\n            throw new Error('AssertionError: Could not find i18n expression\\'s value');\n          }\n          return [o.literal(i18nExpr.name), i18nExprValue];\n        });\n\n\n        i18nAttributes.i18nAttributesConfig =\n            job.addConst(new o.LiteralArrayExpr(i18nAttributeConfig));\n      }\n    }\n  }\n\n  // Step Four: Propagate the extracted const index into i18n ops that messages were extracted from.\n\n  for (const unit of job.units) {\n    for (const op of unit.create) {\n      if (op.kind === ir.OpKind.I18nStart) {\n        const msgIndex = messageConstIndices.get(op.root);\n        if (msgIndex === undefined) {\n          throw new Error(\n              'AssertionError: Could not find corresponding i18n block index for an i18n message op; was an i18n message incorrectly assumed to correspond to an attribute?');\n        }\n        op.messageIndex = msgIndex;\n      }\n    }\n  }\n}\n\n/**\n * Collects the given message into a set of statements that can be added to the const array.\n * This will recursively collect any sub-messages referenced from the parent message as well.\n */\nfunction collectMessage(\n    job: ComponentCompilationJob, fileBasedI18nSuffix: string,\n    messages: Map<ir.XrefId, ir.I18nMessageOp>,\n    messageOp: ir.I18nMessageOp): {mainVar: o.ReadVarExpr, statements: o.Statement[]} {\n  // Recursively collect any sub-messages, record each sub-message's main variable under its\n  // placeholder so that we can add them to the params for the parent message. It is possible\n  // that multiple sub-messages will share the same placeholder, so we need to track an array of\n  // variables for each placeholder.\n  const statements: o.Statement[] = [];\n  const subMessagePlaceholders = new Map<string, o.Expression[]>();\n  for (const subMessageId of messageOp.subMessages) {\n    const subMessage = messages.get(subMessageId)!;\n    const {mainVar: subMessageVar, statements: subMessageStatements} =\n        collectMessage(job, fileBasedI18nSuffix, messages, subMessage);\n    statements.push(...subMessageStatements);\n    const subMessages = subMessagePlaceholders.get(subMessage.messagePlaceholder!) ?? [];\n    subMessages.push(subMessageVar);\n    subMessagePlaceholders.set(subMessage.messagePlaceholder!, subMessages);\n  }\n  addSubMessageParams(messageOp, subMessagePlaceholders);\n\n  // Sort the params for consistency with TemaplateDefinitionBuilder output.\n  messageOp.params = new Map([...messageOp.params.entries()].sort());\n\n  const mainVar = o.variable(job.pool.uniqueName(TRANSLATION_VAR_PREFIX));\n  // Closure Compiler requires const names to start with `MSG_` but disallows any other\n  // const to start with `MSG_`. We define a variable starting with `MSG_` just for the\n  // `goog.getMsg` call\n  const closureVar = i18nGenerateClosureVar(\n      job.pool, messageOp.message.id, fileBasedI18nSuffix, job.i18nUseExternalIds);\n  let transformFn = undefined;\n\n  // If nescessary, add a post-processing step and resolve any placeholder params that are\n  // set in post-processing.\n  if (messageOp.needsPostprocessing) {\n    // Sort the post-processing params for consistency with TemaplateDefinitionBuilder output.\n    const postprocessingParams =\n        Object.fromEntries([...messageOp.postprocessingParams.entries()].sort());\n    const formattedPostprocessingParams =\n        formatI18nPlaceholderNamesInMap(postprocessingParams, /* useCamelCase */ false);\n    const extraTransformFnParams: o.Expression[] = [];\n    if (messageOp.postprocessingParams.size > 0) {\n      extraTransformFnParams.push(mapLiteral(formattedPostprocessingParams, /* quoted */ true));\n    }\n    transformFn = (expr: o.ReadVarExpr) =>\n        o.importExpr(Identifiers.i18nPostprocess).callFn([expr, ...extraTransformFnParams]);\n  }\n\n  // Add the message's statements\n  statements.push(...getTranslationDeclStmts(\n      messageOp.message, mainVar, closureVar, messageOp.params, transformFn));\n\n  return {mainVar, statements};\n}\n\n/**\n * Adds the given subMessage placeholders to the given message op.\n *\n * If a placeholder only corresponds to a single sub-message variable, we just set that variable\n * as the param value. However, if the placeholder corresponds to multiple sub-message\n * variables, we need to add a special placeholder value that is handled by the post-processing\n * step. We then add the array of variables as a post-processing param.\n */\nfunction addSubMessageParams(\n    messageOp: ir.I18nMessageOp, subMessagePlaceholders: Map<string, o.Expression[]>) {\n  for (const [placeholder, subMessages] of subMessagePlaceholders) {\n    if (subMessages.length === 1) {\n      messageOp.params.set(placeholder, subMessages[0]);\n    } else {\n      messageOp.params.set(\n          placeholder, o.literal(`${ESCAPE}${I18N_ICU_MAPPING_PREFIX}${placeholder}${ESCAPE}`));\n      messageOp.postprocessingParams.set(placeholder, o.literalArr(subMessages));\n      messageOp.needsPostprocessing = true;\n    }\n  }\n}\n\n/**\n * Generate statements that define a given translation message.\n *\n * ```\n * var I18N_1;\n * if (typeof ngI18nClosureMode !== undefined && ngI18nClosureMode) {\n *     var MSG_EXTERNAL_XXX = goog.getMsg(\n *          \"Some message with {$interpolation}!\",\n *          { \"interpolation\": \"\\uFFFD0\\uFFFD\" }\n *     );\n *     I18N_1 = MSG_EXTERNAL_XXX;\n * }\n * else {\n *     I18N_1 = $localize`Some message with ${'\\uFFFD0\\uFFFD'}!`;\n * }\n * ```\n *\n * @param message The original i18n AST message node\n * @param variable The variable that will be assigned the translation, e.g. `I18N_1`.\n * @param closureVar The variable for Closure `goog.getMsg` calls, e.g. `MSG_EXTERNAL_XXX`.\n * @param params Object mapping placeholder names to their values (e.g.\n * `{ \"interpolation\": \"\\uFFFD0\\uFFFD\" }`).\n * @param transformFn Optional transformation function that will be applied to the translation\n *     (e.g.\n * post-processing).\n * @returns An array of statements that defined a given translation.\n */\nfunction getTranslationDeclStmts(\n    message: i18n.Message, variable: o.ReadVarExpr, closureVar: o.ReadVarExpr,\n    params: Map<string, o.Expression>,\n    transformFn?: (raw: o.ReadVarExpr) => o.Expression): o.Statement[] {\n  const paramsObject = Object.fromEntries(params);\n  const statements: o.Statement[] = [\n    declareI18nVariable(variable),\n    o.ifStmt(\n        createClosureModeGuard(),\n        createGoogleGetMsgStatements(variable, message, closureVar, paramsObject),\n        createLocalizeStatements(\n            variable, message,\n            formatI18nPlaceholderNamesInMap(paramsObject, /* useCamelCase */ false))),\n  ];\n\n  if (transformFn) {\n    statements.push(new o.ExpressionStatement(variable.set(transformFn(variable))));\n  }\n\n  return statements;\n}\n\n/**\n * Create the expression that will be used to guard the closure mode block\n * It is equivalent to:\n *\n * ```\n * typeof ngI18nClosureMode !== undefined && ngI18nClosureMode\n * ```\n */\nfunction createClosureModeGuard(): o.BinaryOperatorExpr {\n  return o.typeofExpr(o.variable(NG_I18N_CLOSURE_MODE))\n      .notIdentical(o.literal('undefined', o.STRING_TYPE))\n      .and(o.variable(NG_I18N_CLOSURE_MODE));\n}\n\n/**\n * Generates vars with Closure-specific names for i18n blocks (i.e. `MSG_XXX`).\n */\nfunction i18nGenerateClosureVar(\n    pool: ConstantPool, messageId: string, fileBasedI18nSuffix: string,\n    useExternalIds: boolean): o.ReadVarExpr {\n  let name: string;\n  const suffix = fileBasedI18nSuffix;\n  if (useExternalIds) {\n    const prefix = getTranslationConstPrefix(`EXTERNAL_`);\n    const uniqueSuffix = pool.uniqueName(suffix);\n    name = `${prefix}${sanitizeIdentifier(messageId)}$$${uniqueSuffix}`;\n  } else {\n    const prefix = getTranslationConstPrefix(suffix);\n    name = pool.uniqueName(prefix);\n  }\n  return o.variable(name);\n}\n"]}
|
|
@@ -8,8 +8,10 @@
|
|
|
8
8
|
import * as ir from '../../ir';
|
|
9
9
|
/**
|
|
10
10
|
* Removes text nodes within i18n blocks since they are already hardcoded into the i18n message.
|
|
11
|
+
* Also, replaces interpolations on these text nodes with i18n expressions of the non-text portions,
|
|
12
|
+
* which will be applied later.
|
|
11
13
|
*/
|
|
12
|
-
export function
|
|
14
|
+
export function convertI18nText(job) {
|
|
13
15
|
for (const unit of job.units) {
|
|
14
16
|
// Remove all text nodes within i18n blocks, their content is already captured in the i18n
|
|
15
17
|
// message.
|
|
@@ -64,7 +66,7 @@ export function extractI18nText(job) {
|
|
|
64
66
|
const expr = op.interpolation.expressions[i];
|
|
65
67
|
// For now, this i18nExpression depends on the slot context of the enclosing i18n block.
|
|
66
68
|
// Later, we will modify this, and advance to a different point.
|
|
67
|
-
ops.push(ir.createI18nExpressionOp(contextId, i18nOp.xref, i18nOp.handle, expr, op.i18nPlaceholders[i], resolutionTime, expr.sourceSpan ?? op.sourceSpan));
|
|
69
|
+
ops.push(ir.createI18nExpressionOp(contextId, i18nOp.xref, i18nOp.xref, i18nOp.handle, expr, op.interpolation.i18nPlaceholders[i], resolutionTime, ir.I18nExpressionFor.I18nText, '', expr.sourceSpan ?? op.sourceSpan));
|
|
68
70
|
}
|
|
69
71
|
ir.OpList.replaceWithMany(op, ops);
|
|
70
72
|
break;
|
|
@@ -72,4 +74,4 @@ export function extractI18nText(job) {
|
|
|
72
74
|
}
|
|
73
75
|
}
|
|
74
76
|
}
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaTE4bl90ZXh0X2V4dHJhY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb21waWxlci9zcmMvdGVtcGxhdGUvcGlwZWxpbmUvc3JjL3BoYXNlcy9pMThuX3RleHRfZXh0cmFjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEtBQUssRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUcvQjs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGVBQWUsQ0FBQyxHQUFtQjtJQUNqRCxLQUFLLE1BQU0sSUFBSSxJQUFJLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3QiwwRkFBMEY7UUFDMUYsV0FBVztRQUNYLElBQUksV0FBVyxHQUF3QixJQUFJLENBQUM7UUFDNUMsSUFBSSxVQUFVLEdBQXVCLElBQUksQ0FBQztRQUMxQyxNQUFNLGtCQUFrQixHQUFHLElBQUksR0FBRyxFQUE2QixDQUFDO1FBQ2hFLE1BQU0sWUFBWSxHQUFHLElBQUksR0FBRyxFQUFpQyxDQUFDO1FBQzlELEtBQUssTUFBTSxFQUFFLElBQUksSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQzdCLFFBQVEsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO2dCQUNoQixLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUMsU0FBUztvQkFDdEIsSUFBSSxFQUFFLENBQUMsT0FBTyxLQUFLLElBQUksRUFBRSxDQUFDO3dCQUN4QixNQUFNLEtBQUssQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFDO29CQUN0RCxDQUFDO29CQUNELFdBQVcsR0FBRyxFQUFFLENBQUM7b0JBQ2pCLE1BQU07Z0JBQ1IsS0FBSyxFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU87b0JBQ3BCLFdBQVcsR0FBRyxJQUFJLENBQUM7b0JBQ25CLE1BQU07Z0JBQ1IsS0FBSyxFQUFFLENBQUMsTUFBTSxDQUFDLFFBQVE7b0JBQ3JCLElBQUksRUFBRSxDQUFDLE9BQU8sS0FBSyxJQUFJLEVBQUUsQ0FBQzt3QkFDeEIsTUFBTSxLQUFLLENBQUMscUNBQXFDLENBQUMsQ0FBQztvQkFDckQsQ0FBQztvQkFDRCxVQUFVLEdBQUcsRUFBRSxDQUFDO29CQUNoQixNQUFNO2dCQUNSLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNO29CQUNuQixVQUFVLEdBQUcsSUFBSSxDQUFDO29CQUNsQixNQUFNO2dCQUNSLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJO29CQUNqQixJQUFJLFdBQVcsS0FBSyxJQUFJLEVBQUUsQ0FBQzt3QkFDekIsa0JBQWtCLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsV0FBVyxDQUFDLENBQUM7d0JBQzdDLFlBQVksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsQ0FBQzt3QkFDdEMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQWMsRUFBRSxDQUFDLENBQUM7b0JBQ3BDLENBQUM7b0JBQ0QsTUFBTTtZQUNWLENBQUM7UUFDSCxDQUFDO1FBRUQsZ0dBQWdHO1FBQ2hHLGtDQUFrQztRQUNsQyxLQUFLLE1BQU0sRUFBRSxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUM3QixRQUFRLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDaEIsS0FBSyxFQUFFLENBQUMsTUFBTSxDQUFDLGVBQWU7b0JBQzVCLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7d0JBQ3ZDLFNBQVM7b0JBQ1gsQ0FBQztvQkFFRCxNQUFNLE1BQU0sR0FBRyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBRSxDQUFDO29CQUNsRCxNQUFNLEtBQUssR0FBRyxZQUFZLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQztvQkFDMUMsTUFBTSxTQUFTLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDO29CQUN6RCxNQUFNLGNBQWMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQyxlQUFlLENBQUMsQ0FBQzt3QkFDNUMsRUFBRSxDQUFDLHVCQUF1QixDQUFDLFFBQVEsQ0FBQztvQkFDbkUsTUFBTSxHQUFHLEdBQWtCLEVBQUUsQ0FBQztvQkFDOUIsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO3dCQUM3RCxNQUFNLElBQUksR0FBRyxFQUFFLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQzt3QkFDN0Msd0ZBQXdGO3dCQUN4RixnRUFBZ0U7d0JBQ2hFLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLHNCQUFzQixDQUM5QixTQUFVLEVBQUUsTUFBTSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUN6RCxFQUFFLENBQUMsYUFBYSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxFQUFFLGNBQWMsRUFBRSxFQUFFLENBQUMsaUJBQWlCLENBQUMsUUFBUSxFQUNuRixFQUFFLEVBQUUsSUFBSSxDQUFDLFVBQVUsSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztvQkFDN0MsQ0FBQztvQkFDRCxFQUFFLENBQUMsTUFBTSxDQUFDLGVBQWUsQ0FBQyxFQUFpQixFQUFFLEdBQUcsQ0FBQyxDQUFDO29CQUNsRCxNQUFNO1lBQ1YsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0FBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgKiBhcyBpciBmcm9tICcuLi8uLi9pcic7XG5pbXBvcnQge0NvbXBpbGF0aW9uSm9ifSBmcm9tICcuLi9jb21waWxhdGlvbic7XG5cbi8qKlxuICogUmVtb3ZlcyB0ZXh0IG5vZGVzIHdpdGhpbiBpMThuIGJsb2NrcyBzaW5jZSB0aGV5IGFyZSBhbHJlYWR5IGhhcmRjb2RlZCBpbnRvIHRoZSBpMThuIG1lc3NhZ2UuXG4gKiBBbHNvLCByZXBsYWNlcyBpbnRlcnBvbGF0aW9ucyBvbiB0aGVzZSB0ZXh0IG5vZGVzIHdpdGggaTE4biBleHByZXNzaW9ucyBvZiB0aGUgbm9uLXRleHQgcG9ydGlvbnMsXG4gKiB3aGljaCB3aWxsIGJlIGFwcGxpZWQgbGF0ZXIuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBjb252ZXJ0STE4blRleHQoam9iOiBDb21waWxhdGlvbkpvYik6IHZvaWQge1xuICBmb3IgKGNvbnN0IHVuaXQgb2Ygam9iLnVuaXRzKSB7XG4gICAgLy8gUmVtb3ZlIGFsbCB0ZXh0IG5vZGVzIHdpdGhpbiBpMThuIGJsb2NrcywgdGhlaXIgY29udGVudCBpcyBhbHJlYWR5IGNhcHR1cmVkIGluIHRoZSBpMThuXG4gICAgLy8gbWVzc2FnZS5cbiAgICBsZXQgY3VycmVudEkxOG46IGlyLkkxOG5TdGFydE9wfG51bGwgPSBudWxsO1xuICAgIGxldCBjdXJyZW50SWN1OiBpci5JY3VTdGFydE9wfG51bGwgPSBudWxsO1xuICAgIGNvbnN0IHRleHROb2RlSTE4bkJsb2NrcyA9IG5ldyBNYXA8aXIuWHJlZklkLCBpci5JMThuU3RhcnRPcD4oKTtcbiAgICBjb25zdCB0ZXh0Tm9kZUljdXMgPSBuZXcgTWFwPGlyLlhyZWZJZCwgaXIuSWN1U3RhcnRPcHxudWxsPigpO1xuICAgIGZvciAoY29uc3Qgb3Agb2YgdW5pdC5jcmVhdGUpIHtcbiAgICAgIHN3aXRjaCAob3Aua2luZCkge1xuICAgICAgICBjYXNlIGlyLk9wS2luZC5JMThuU3RhcnQ6XG4gICAgICAgICAgaWYgKG9wLmNvbnRleHQgPT09IG51bGwpIHtcbiAgICAgICAgICAgIHRocm93IEVycm9yKCdJMThuIG9wIHNob3VsZCBoYXZlIGl0cyBjb250ZXh0IHNldC4nKTtcbiAgICAgICAgICB9XG4gICAgICAgICAgY3VycmVudEkxOG4gPSBvcDtcbiAgICAgICAgICBicmVhaztcbiAgICAgICAgY2FzZSBpci5PcEtpbmQuSTE4bkVuZDpcbiAgICAgICAgICBjdXJyZW50STE4biA9IG51bGw7XG4gICAgICAgICAgYnJlYWs7XG4gICAgICAgIGNhc2UgaXIuT3BLaW5kLkljdVN0YXJ0OlxuICAgICAgICAgIGlmIChvcC5jb250ZXh0ID09PSBudWxsKSB7XG4gICAgICAgICAgICB0aHJvdyBFcnJvcignSWN1IG9wIHNob3VsZCBoYXZlIGl0cyBjb250ZXh0IHNldC4nKTtcbiAgICAgICAgICB9XG4gICAgICAgICAgY3VycmVudEljdSA9IG9wO1xuICAgICAgICAgIGJyZWFrO1xuICAgICAgICBjYXNlIGlyLk9wS2luZC5JY3VFbmQ6XG4gICAgICAgICAgY3VycmVudEljdSA9IG51bGw7XG4gICAgICAgICAgYnJlYWs7XG4gICAgICAgIGNhc2UgaXIuT3BLaW5kLlRleHQ6XG4gICAgICAgICAgaWYgKGN1cnJlbnRJMThuICE9PSBudWxsKSB7XG4gICAgICAgICAgICB0ZXh0Tm9kZUkxOG5CbG9ja3Muc2V0KG9wLnhyZWYsIGN1cnJlbnRJMThuKTtcbiAgICAgICAgICAgIHRleHROb2RlSWN1cy5zZXQob3AueHJlZiwgY3VycmVudEljdSk7XG4gICAgICAgICAgICBpci5PcExpc3QucmVtb3ZlPGlyLkNyZWF0ZU9wPihvcCk7XG4gICAgICAgICAgfVxuICAgICAgICAgIGJyZWFrO1xuICAgICAgfVxuICAgIH1cblxuICAgIC8vIFVwZGF0ZSBhbnkgaW50ZXJwb2xhdGlvbnMgdG8gdGhlIHJlbW92ZWQgdGV4dCwgYW5kIGluc3RlYWQgcmVwcmVzZW50IHRoZW0gYXMgYSBzZXJpZXMgb2YgaTE4blxuICAgIC8vIGV4cHJlc3Npb25zIHRoYXQgd2UgdGhlbiBhcHBseS5cbiAgICBmb3IgKGNvbnN0IG9wIG9mIHVuaXQudXBkYXRlKSB7XG4gICAgICBzd2l0Y2ggKG9wLmtpbmQpIHtcbiAgICAgICAgY2FzZSBpci5PcEtpbmQuSW50ZXJwb2xhdGVUZXh0OlxuICAgICAgICAgIGlmICghdGV4dE5vZGVJMThuQmxvY2tzLmhhcyhvcC50YXJnZXQpKSB7XG4gICAgICAgICAgICBjb250aW51ZTtcbiAgICAgICAgICB9XG5cbiAgICAgICAgICBjb25zdCBpMThuT3AgPSB0ZXh0Tm9kZUkxOG5CbG9ja3MuZ2V0KG9wLnRhcmdldCkhO1xuICAgICAgICAgIGNvbnN0IGljdU9wID0gdGV4dE5vZGVJY3VzLmdldChvcC50YXJnZXQpO1xuICAgICAgICAgIGNvbnN0IGNvbnRleHRJZCA9IGljdU9wID8gaWN1T3AuY29udGV4dCA6IGkxOG5PcC5jb250ZXh0O1xuICAgICAgICAgIGNvbnN0IHJlc29sdXRpb25UaW1lID0gaWN1T3AgPyBpci5JMThuUGFyYW1SZXNvbHV0aW9uVGltZS5Qb3N0cHJvY2Nlc3NpbmcgOlxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpci5JMThuUGFyYW1SZXNvbHV0aW9uVGltZS5DcmVhdGlvbjtcbiAgICAgICAgICBjb25zdCBvcHM6IGlyLlVwZGF0ZU9wW10gPSBbXTtcbiAgICAgICAgICBmb3IgKGxldCBpID0gMDsgaSA8IG9wLmludGVycG9sYXRpb24uZXhwcmVzc2lvbnMubGVuZ3RoOyBpKyspIHtcbiAgICAgICAgICAgIGNvbnN0IGV4cHIgPSBvcC5pbnRlcnBvbGF0aW9uLmV4cHJlc3Npb25zW2ldO1xuICAgICAgICAgICAgLy8gRm9yIG5vdywgdGhpcyBpMThuRXhwcmVzc2lvbiBkZXBlbmRzIG9uIHRoZSBzbG90IGNvbnRleHQgb2YgdGhlIGVuY2xvc2luZyBpMThuIGJsb2NrLlxuICAgICAgICAgICAgLy8gTGF0ZXIsIHdlIHdpbGwgbW9kaWZ5IHRoaXMsIGFuZCBhZHZhbmNlIHRvIGEgZGlmZmVyZW50IHBvaW50LlxuICAgICAgICAgICAgb3BzLnB1c2goaXIuY3JlYXRlSTE4bkV4cHJlc3Npb25PcChcbiAgICAgICAgICAgICAgICBjb250ZXh0SWQhLCBpMThuT3AueHJlZiwgaTE4bk9wLnhyZWYsIGkxOG5PcC5oYW5kbGUsIGV4cHIsXG4gICAgICAgICAgICAgICAgb3AuaW50ZXJwb2xhdGlvbi5pMThuUGxhY2Vob2xkZXJzW2ldLCByZXNvbHV0aW9uVGltZSwgaXIuSTE4bkV4cHJlc3Npb25Gb3IuSTE4blRleHQsXG4gICAgICAgICAgICAgICAgJycsIGV4cHIuc291cmNlU3BhbiA/PyBvcC5zb3VyY2VTcGFuKSk7XG4gICAgICAgICAgfVxuICAgICAgICAgIGlyLk9wTGlzdC5yZXBsYWNlV2l0aE1hbnkob3AgYXMgaXIuVXBkYXRlT3AsIG9wcyk7XG4gICAgICAgICAgYnJlYWs7XG4gICAgICB9XG4gICAgfVxuICB9XG59XG4iXX0=
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
|
+
import { SecurityContext } from '../../../../core';
|
|
8
9
|
import * as o from '../../../../output/output_ast';
|
|
9
10
|
import { parse as parseStyle } from '../../../../render3/view/style_parser';
|
|
10
11
|
import * as ir from '../../ir';
|
|
@@ -20,14 +21,14 @@ export function parseExtractedStyles(job) {
|
|
|
20
21
|
if (op.name === 'style') {
|
|
21
22
|
const parsedStyles = parseStyle(op.expression.value);
|
|
22
23
|
for (let i = 0; i < parsedStyles.length - 1; i += 2) {
|
|
23
|
-
ir.OpList.insertBefore(ir.createExtractedAttributeOp(op.target, ir.BindingKind.StyleProperty, parsedStyles[i], o.literal(parsedStyles[i + 1])), op);
|
|
24
|
+
ir.OpList.insertBefore(ir.createExtractedAttributeOp(op.target, ir.BindingKind.StyleProperty, parsedStyles[i], o.literal(parsedStyles[i + 1]), null, null, SecurityContext.STYLE), op);
|
|
24
25
|
}
|
|
25
26
|
ir.OpList.remove(op);
|
|
26
27
|
}
|
|
27
28
|
else if (op.name === 'class') {
|
|
28
29
|
const parsedClasses = op.expression.value.trim().split(/\s+/g);
|
|
29
30
|
for (const parsedClass of parsedClasses) {
|
|
30
|
-
ir.OpList.insertBefore(ir.createExtractedAttributeOp(op.target, ir.BindingKind.ClassName, parsedClass, null), op);
|
|
31
|
+
ir.OpList.insertBefore(ir.createExtractedAttributeOp(op.target, ir.BindingKind.ClassName, parsedClass, null, null, null, SecurityContext.NONE), op);
|
|
31
32
|
}
|
|
32
33
|
ir.OpList.remove(op);
|
|
33
34
|
}
|
|
@@ -35,4 +36,4 @@ export function parseExtractedStyles(job) {
|
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
}
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2VfZXh0cmFjdGVkX3N0eWxlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvbXBpbGVyL3NyYy90ZW1wbGF0ZS9waXBlbGluZS9zcmMvcGhhc2VzL3BhcnNlX2V4dHJhY3RlZF9zdHlsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBRUgsT0FBTyxFQUFDLGVBQWUsRUFBQyxNQUFNLGtCQUFrQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxDQUFDLE1BQU0sK0JBQStCLENBQUM7QUFDbkQsT0FBTyxFQUFDLEtBQUssSUFBSSxVQUFVLEVBQUMsTUFBTSx1Q0FBdUMsQ0FBQztBQUMxRSxPQUFPLEtBQUssRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUkvQjs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsb0JBQW9CLENBQUMsR0FBbUI7SUFDdEQsS0FBSyxNQUFNLElBQUksSUFBSSxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsS0FBSyxNQUFNLEVBQUUsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDN0IsSUFBSSxFQUFFLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUMsa0JBQWtCLElBQUksRUFBRSxDQUFDLFdBQVcsS0FBSyxFQUFFLENBQUMsV0FBVyxDQUFDLFNBQVM7Z0JBQ3ZGLEVBQUUsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDLFVBQVcsQ0FBQyxFQUFFLENBQUM7Z0JBQ3ZDLElBQUksRUFBRSxDQUFDLElBQUksS0FBSyxPQUFPLEVBQUUsQ0FBQztvQkFDeEIsTUFBTSxZQUFZLEdBQUcsVUFBVSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7b0JBQ3JELEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxZQUFZLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7d0JBQ3BELEVBQUUsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUNsQixFQUFFLENBQUMsMEJBQTBCLENBQ3pCLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxhQUFhLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQyxFQUN4RCxDQUFDLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLGVBQWUsQ0FBQyxLQUFLLENBQUMsRUFDdEUsRUFBRSxDQUFDLENBQUM7b0JBQ1YsQ0FBQztvQkFDRCxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBYyxFQUFFLENBQUMsQ0FBQztnQkFDcEMsQ0FBQztxQkFBTSxJQUFJLEVBQUUsQ0FBQyxJQUFJLEtBQUssT0FBTyxFQUFFLENBQUM7b0JBQy9CLE1BQU0sYUFBYSxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztvQkFDL0QsS0FBSyxNQUFNLFdBQVcsSUFBSSxhQUFhLEVBQUUsQ0FBQzt3QkFDeEMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQ2xCLEVBQUUsQ0FBQywwQkFBMEIsQ0FDekIsRUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLFNBQVMsRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQ2xFLGVBQWUsQ0FBQyxJQUFJLENBQUMsRUFDekIsRUFBRSxDQUFDLENBQUM7b0JBQ1YsQ0FBQztvQkFDRCxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBYyxFQUFFLENBQUMsQ0FBQztnQkFDcEMsQ0FBQztZQUNILENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtTZWN1cml0eUNvbnRleHR9IGZyb20gJy4uLy4uLy4uLy4uL2NvcmUnO1xuaW1wb3J0ICogYXMgbyBmcm9tICcuLi8uLi8uLi8uLi9vdXRwdXQvb3V0cHV0X2FzdCc7XG5pbXBvcnQge3BhcnNlIGFzIHBhcnNlU3R5bGV9IGZyb20gJy4uLy4uLy4uLy4uL3JlbmRlcjMvdmlldy9zdHlsZV9wYXJzZXInO1xuaW1wb3J0ICogYXMgaXIgZnJvbSAnLi4vLi4vaXInO1xuXG5pbXBvcnQgdHlwZSB7Q29tcGlsYXRpb25Kb2J9IGZyb20gJy4uL2NvbXBpbGF0aW9uJztcblxuLyoqXG4gKiBQYXJzZXMgZXh0cmFjdGVkIHN0eWxlIGFuZCBjbGFzcyBhdHRyaWJ1dGVzIGludG8gc2VwYXJhdGUgRXh0cmFjdGVkQXR0cmlidXRlT3BzIHBlciBzdHlsZSBvclxuICogY2xhc3MgcHJvcGVydHkuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBwYXJzZUV4dHJhY3RlZFN0eWxlcyhqb2I6IENvbXBpbGF0aW9uSm9iKSB7XG4gIGZvciAoY29uc3QgdW5pdCBvZiBqb2IudW5pdHMpIHtcbiAgICBmb3IgKGNvbnN0IG9wIG9mIHVuaXQuY3JlYXRlKSB7XG4gICAgICBpZiAob3Aua2luZCA9PT0gaXIuT3BLaW5kLkV4dHJhY3RlZEF0dHJpYnV0ZSAmJiBvcC5iaW5kaW5nS2luZCA9PT0gaXIuQmluZGluZ0tpbmQuQXR0cmlidXRlICYmXG4gICAgICAgICAgaXIuaXNTdHJpbmdMaXRlcmFsKG9wLmV4cHJlc3Npb24hKSkge1xuICAgICAgICBpZiAob3AubmFtZSA9PT0gJ3N0eWxlJykge1xuICAgICAgICAgIGNvbnN0IHBhcnNlZFN0eWxlcyA9IHBhcnNlU3R5bGUob3AuZXhwcmVzc2lvbi52YWx1ZSk7XG4gICAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCBwYXJzZWRTdHlsZXMubGVuZ3RoIC0gMTsgaSArPSAyKSB7XG4gICAgICAgICAgICBpci5PcExpc3QuaW5zZXJ0QmVmb3JlPGlyLkNyZWF0ZU9wPihcbiAgICAgICAgICAgICAgICBpci5jcmVhdGVFeHRyYWN0ZWRBdHRyaWJ1dGVPcChcbiAgICAgICAgICAgICAgICAgICAgb3AudGFyZ2V0LCBpci5CaW5kaW5nS2luZC5TdHlsZVByb3BlcnR5LCBwYXJzZWRTdHlsZXNbaV0sXG4gICAgICAgICAgICAgICAgICAgIG8ubGl0ZXJhbChwYXJzZWRTdHlsZXNbaSArIDFdKSwgbnVsbCwgbnVsbCwgU2VjdXJpdHlDb250ZXh0LlNUWUxFKSxcbiAgICAgICAgICAgICAgICBvcCk7XG4gICAgICAgICAgfVxuICAgICAgICAgIGlyLk9wTGlzdC5yZW1vdmU8aXIuQ3JlYXRlT3A+KG9wKTtcbiAgICAgICAgfSBlbHNlIGlmIChvcC5uYW1lID09PSAnY2xhc3MnKSB7XG4gICAgICAgICAgY29uc3QgcGFyc2VkQ2xhc3NlcyA9IG9wLmV4cHJlc3Npb24udmFsdWUudHJpbSgpLnNwbGl0KC9cXHMrL2cpO1xuICAgICAgICAgIGZvciAoY29uc3QgcGFyc2VkQ2xhc3Mgb2YgcGFyc2VkQ2xhc3Nlcykge1xuICAgICAgICAgICAgaXIuT3BMaXN0Lmluc2VydEJlZm9yZTxpci5DcmVhdGVPcD4oXG4gICAgICAgICAgICAgICAgaXIuY3JlYXRlRXh0cmFjdGVkQXR0cmlidXRlT3AoXG4gICAgICAgICAgICAgICAgICAgIG9wLnRhcmdldCwgaXIuQmluZGluZ0tpbmQuQ2xhc3NOYW1lLCBwYXJzZWRDbGFzcywgbnVsbCwgbnVsbCwgbnVsbCxcbiAgICAgICAgICAgICAgICAgICAgU2VjdXJpdHlDb250ZXh0Lk5PTkUpLFxuICAgICAgICAgICAgICAgIG9wKTtcbiAgICAgICAgICB9XG4gICAgICAgICAgaXIuT3BMaXN0LnJlbW92ZTxpci5DcmVhdGVPcD4ob3ApO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuICB9XG59XG4iXX0=
|
|
@@ -14,18 +14,30 @@ import { createOpXrefMap } from '../util/elements';
|
|
|
14
14
|
export function removeContentSelectors(job) {
|
|
15
15
|
for (const unit of job.units) {
|
|
16
16
|
const elements = createOpXrefMap(unit);
|
|
17
|
-
for (const op of unit.
|
|
17
|
+
for (const op of unit.ops()) {
|
|
18
18
|
switch (op.kind) {
|
|
19
19
|
case ir.OpKind.Binding:
|
|
20
20
|
const target = lookupInXrefMap(elements, op.target);
|
|
21
|
-
if (op.name
|
|
21
|
+
if (isSelectAttribute(op.name) && target.kind === ir.OpKind.Projection) {
|
|
22
22
|
ir.OpList.remove(op);
|
|
23
23
|
}
|
|
24
24
|
break;
|
|
25
|
+
case ir.OpKind.Projection:
|
|
26
|
+
// op.attributes is an array of [attr1-name, attr1-value, attr2-name, attr2-value, ...],
|
|
27
|
+
// find the "select" attribute and remove its name and corresponding value.
|
|
28
|
+
for (let i = op.attributes.length - 2; i >= 0; i -= 2) {
|
|
29
|
+
if (isSelectAttribute(op.attributes[i])) {
|
|
30
|
+
op.attributes.splice(i, 2);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
break;
|
|
25
34
|
}
|
|
26
35
|
}
|
|
27
36
|
}
|
|
28
37
|
}
|
|
38
|
+
function isSelectAttribute(name) {
|
|
39
|
+
return name.toLowerCase() === 'select';
|
|
40
|
+
}
|
|
29
41
|
/**
|
|
30
42
|
* Looks up an element in the given map by xref ID.
|
|
31
43
|
*/
|
|
@@ -36,4 +48,4 @@ function lookupInXrefMap(map, xref) {
|
|
|
36
48
|
}
|
|
37
49
|
return el;
|
|
38
50
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGhhc2VfcmVtb3ZlX2NvbnRlbnRfc2VsZWN0b3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29tcGlsZXIvc3JjL3RlbXBsYXRlL3BpcGVsaW5lL3NyYy9waGFzZXMvcGhhc2VfcmVtb3ZlX2NvbnRlbnRfc2VsZWN0b3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sS0FBSyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRS9CLE9BQU8sRUFBQyxlQUFlLEVBQUMsTUFBTSxrQkFBa0IsQ0FBQztBQUVqRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsc0JBQXNCLENBQUMsR0FBbUI7SUFDeEQsS0FBSyxNQUFNLElBQUksSUFBSSxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsTUFBTSxRQUFRLEdBQUcsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZDLEtBQUssTUFBTSxFQUFFLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUM7WUFDNUIsUUFBUSxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ2hCLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPO29CQUNwQixNQUFNLE1BQU0sR0FBRyxlQUFlLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQztvQkFDcEQsSUFBSSxpQkFBaUIsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksTUFBTSxDQUFDLElBQUksS0FBSyxFQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO3dCQUN2RSxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBYyxFQUFFLENBQUMsQ0FBQztvQkFDcEMsQ0FBQztvQkFDRCxNQUFNO2dCQUNSLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxVQUFVO29CQUN2Qix3RkFBd0Y7b0JBQ3hGLDJFQUEyRTtvQkFDM0UsS0FBSyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7d0JBQ3RELElBQUksaUJBQWlCLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7NEJBQ3hDLEVBQUUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQzt3QkFDN0IsQ0FBQztvQkFDSCxDQUFDO29CQUNELE1BQU07WUFDVixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7QUFDSCxDQUFDO0FBRUQsU0FBUyxpQkFBaUIsQ0FBQyxJQUFZO0lBQ3JDLE9BQU8sSUFBSSxDQUFDLFdBQVcsRUFBRSxLQUFLLFFBQVEsQ0FBQztBQUN6QyxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxTQUFTLGVBQWUsQ0FBQyxHQUF1RCxFQUFFLElBQWU7SUFFL0YsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN6QixJQUFJLEVBQUUsS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUNyQixNQUFNLElBQUksS0FBSyxDQUFDLGlEQUFpRCxDQUFDLENBQUM7SUFDckUsQ0FBQztJQUNELE9BQU8sRUFBRSxDQUFDO0FBQ1osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgKiBhcyBpciBmcm9tICcuLi8uLi9pcic7XG5pbXBvcnQgdHlwZSB7Q29tcGlsYXRpb25Kb2J9IGZyb20gJy4uL2NvbXBpbGF0aW9uJztcbmltcG9ydCB7Y3JlYXRlT3BYcmVmTWFwfSBmcm9tICcuLi91dGlsL2VsZW1lbnRzJztcblxuLyoqXG4gKiBBdHRyaWJ1dGVzIG9mIGBuZy1jb250ZW50YCBuYW1lZCAnc2VsZWN0JyBhcmUgc3BlY2lmaWNhbGx5IHJlbW92ZWQsIGJlY2F1c2UgdGhleSBjb250cm9sIHdoaWNoXG4gKiBjb250ZW50IG1hdGNoZXMgYXMgYSBwcm9wZXJ0eSBvZiB0aGUgYHByb2plY3Rpb25gLCBhbmQgYXJlIG5vdCBhIHBsYWluIGF0dHJpYnV0ZS5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHJlbW92ZUNvbnRlbnRTZWxlY3RvcnMoam9iOiBDb21waWxhdGlvbkpvYik6IHZvaWQge1xuICBmb3IgKGNvbnN0IHVuaXQgb2Ygam9iLnVuaXRzKSB7XG4gICAgY29uc3QgZWxlbWVudHMgPSBjcmVhdGVPcFhyZWZNYXAodW5pdCk7XG4gICAgZm9yIChjb25zdCBvcCBvZiB1bml0Lm9wcygpKSB7XG4gICAgICBzd2l0Y2ggKG9wLmtpbmQpIHtcbiAgICAgICAgY2FzZSBpci5PcEtpbmQuQmluZGluZzpcbiAgICAgICAgICBjb25zdCB0YXJnZXQgPSBsb29rdXBJblhyZWZNYXAoZWxlbWVudHMsIG9wLnRhcmdldCk7XG4gICAgICAgICAgaWYgKGlzU2VsZWN0QXR0cmlidXRlKG9wLm5hbWUpICYmIHRhcmdldC5raW5kID09PSBpci5PcEtpbmQuUHJvamVjdGlvbikge1xuICAgICAgICAgICAgaXIuT3BMaXN0LnJlbW92ZTxpci5VcGRhdGVPcD4ob3ApO1xuICAgICAgICAgIH1cbiAgICAgICAgICBicmVhaztcbiAgICAgICAgY2FzZSBpci5PcEtpbmQuUHJvamVjdGlvbjpcbiAgICAgICAgICAvLyBvcC5hdHRyaWJ1dGVzIGlzIGFuIGFycmF5IG9mIFthdHRyMS1uYW1lLCBhdHRyMS12YWx1ZSwgYXR0cjItbmFtZSwgYXR0cjItdmFsdWUsIC4uLl0sXG4gICAgICAgICAgLy8gZmluZCB0aGUgXCJzZWxlY3RcIiBhdHRyaWJ1dGUgYW5kIHJlbW92ZSBpdHMgbmFtZSBhbmQgY29ycmVzcG9uZGluZyB2YWx1ZS5cbiAgICAgICAgICBmb3IgKGxldCBpID0gb3AuYXR0cmlidXRlcy5sZW5ndGggLSAyOyBpID49IDA7IGkgLT0gMikge1xuICAgICAgICAgICAgaWYgKGlzU2VsZWN0QXR0cmlidXRlKG9wLmF0dHJpYnV0ZXNbaV0pKSB7XG4gICAgICAgICAgICAgIG9wLmF0dHJpYnV0ZXMuc3BsaWNlKGksIDIpO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cbiAgICAgICAgICBicmVhaztcbiAgICAgIH1cbiAgICB9XG4gIH1cbn1cblxuZnVuY3Rpb24gaXNTZWxlY3RBdHRyaWJ1dGUobmFtZTogc3RyaW5nKSB7XG4gIHJldHVybiBuYW1lLnRvTG93ZXJDYXNlKCkgPT09ICdzZWxlY3QnO1xufVxuXG4vKipcbiAqIExvb2tzIHVwIGFuIGVsZW1lbnQgaW4gdGhlIGdpdmVuIG1hcCBieSB4cmVmIElELlxuICovXG5mdW5jdGlvbiBsb29rdXBJblhyZWZNYXAobWFwOiBNYXA8aXIuWHJlZklkLCBpci5Db25zdW1lc1Nsb3RPcFRyYWl0JmlyLkNyZWF0ZU9wPiwgeHJlZjogaXIuWHJlZklkKTpcbiAgICBpci5Db25zdW1lc1Nsb3RPcFRyYWl0JmlyLkNyZWF0ZU9wIHtcbiAgY29uc3QgZWwgPSBtYXAuZ2V0KHhyZWYpO1xuICBpZiAoZWwgPT09IHVuZGVmaW5lZCkge1xuICAgIHRocm93IG5ldyBFcnJvcignQWxsIGF0dHJpYnV0ZXMgc2hvdWxkIGhhdmUgYW4gc2xvdHRhYmxlIHRhcmdldC4nKTtcbiAgfVxuICByZXR1cm4gZWw7XG59XG4iXX0=
|