@angular/compiler 17.0.6 → 17.0.8
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/constant_pool.mjs +5 -3
- package/esm2022/src/ml_parser/tags.mjs +8 -3
- package/esm2022/src/render3/partial/class_metadata.mjs +1 -1
- package/esm2022/src/render3/partial/directive.mjs +1 -1
- 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/view/compiler.mjs +2 -1
- package/esm2022/src/render3/view/template.mjs +7 -7
- package/esm2022/src/template/pipeline/ir/src/enums.mjs +15 -19
- package/esm2022/src/template/pipeline/ir/src/expression.mjs +16 -20
- package/esm2022/src/template/pipeline/ir/src/ops/create.mjs +39 -13
- package/esm2022/src/template/pipeline/ir/src/ops/host.mjs +4 -2
- package/esm2022/src/template/pipeline/ir/src/ops/update.mjs +18 -10
- package/esm2022/src/template/pipeline/src/emit.mjs +6 -6
- package/esm2022/src/template/pipeline/src/ingest.mjs +266 -178
- package/esm2022/src/template/pipeline/src/instruction.mjs +14 -14
- package/esm2022/src/template/pipeline/src/phases/assign_i18n_slot_dependencies.mjs +40 -56
- package/esm2022/src/template/pipeline/src/phases/attribute_extraction.mjs +19 -22
- package/esm2022/src/template/pipeline/src/phases/binding_specialization.mjs +4 -4
- package/esm2022/src/template/pipeline/src/phases/const_collection.mjs +37 -13
- package/esm2022/src/template/pipeline/src/phases/convert_i18n_bindings.mjs +2 -2
- package/esm2022/src/template/pipeline/src/phases/create_defer_deps_fns.mjs +3 -2
- package/esm2022/src/template/pipeline/src/phases/create_i18n_contexts.mjs +63 -29
- package/esm2022/src/template/pipeline/src/phases/deduplicate_text_bindings.mjs +40 -0
- package/esm2022/src/template/pipeline/src/phases/extract_i18n_messages.mjs +52 -49
- package/esm2022/src/template/pipeline/src/phases/generate_variables.mjs +7 -1
- package/esm2022/src/template/pipeline/src/phases/host_style_property_parsing.mjs +2 -2
- package/esm2022/src/template/pipeline/src/phases/i18n_const_collection.mjs +11 -8
- package/esm2022/src/template/pipeline/src/phases/i18n_text_extraction.mjs +22 -3
- package/esm2022/src/template/pipeline/src/phases/parse_extracted_styles.mjs +22 -3
- package/esm2022/src/template/pipeline/src/phases/propagate_i18n_blocks.mjs +27 -12
- package/esm2022/src/template/pipeline/src/phases/reify.mjs +18 -21
- package/esm2022/src/template/pipeline/src/phases/resolve_i18n_element_placeholders.mjs +60 -14
- package/esm2022/src/template/pipeline/src/phases/resolve_i18n_expression_placeholders.mjs +23 -10
- 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 +10 -1
- package/esm2022/src/version.mjs +1 -1
- package/fesm2022/compiler.mjs +894 -561
- package/fesm2022/compiler.mjs.map +1 -1
- package/index.d.ts +3 -3
- package/package.json +2 -2
- package/esm2022/src/template/pipeline/src/phases/resolve_i18n_icu_placeholders.mjs +0 -62
|
@@ -90,10 +90,11 @@ function resolvePlaceholdersForView(job, unit, i18nContexts, elements, pendingSt
|
|
|
90
90
|
}
|
|
91
91
|
break;
|
|
92
92
|
case ir.OpKind.Template:
|
|
93
|
+
const view = job.views.get(op.xref);
|
|
93
94
|
if (op.i18nPlaceholder === undefined) {
|
|
94
95
|
// If there is no i18n placeholder, just recurse into the view in case it contains i18n
|
|
95
96
|
// blocks.
|
|
96
|
-
resolvePlaceholdersForView(job,
|
|
97
|
+
resolvePlaceholdersForView(job, view, i18nContexts, elements);
|
|
97
98
|
}
|
|
98
99
|
else {
|
|
99
100
|
if (currentOps === null) {
|
|
@@ -104,14 +105,59 @@ function resolvePlaceholdersForView(job, unit, i18nContexts, elements, pendingSt
|
|
|
104
105
|
// the current template as a pending structural directive to be recorded when we find
|
|
105
106
|
// the element, content, or template it belongs to. This allows us to create combined
|
|
106
107
|
// values that represent, e.g. the start of a template and element at the same time.
|
|
107
|
-
resolvePlaceholdersForView(job,
|
|
108
|
+
resolvePlaceholdersForView(job, view, i18nContexts, elements, op);
|
|
108
109
|
}
|
|
109
110
|
else {
|
|
110
111
|
// If this is some other kind of template, we can record its start, recurse into its
|
|
111
112
|
// view, and then record its end.
|
|
112
|
-
recordTemplateStart(job, op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
|
|
113
|
-
resolvePlaceholdersForView(job,
|
|
114
|
-
recordTemplateClose(job, op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
|
|
113
|
+
recordTemplateStart(job, view, op.handle.slot, op.i18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
|
|
114
|
+
resolvePlaceholdersForView(job, view, i18nContexts, elements);
|
|
115
|
+
recordTemplateClose(job, view, op.handle.slot, op.i18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
|
|
116
|
+
pendingStructuralDirective = undefined;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
break;
|
|
120
|
+
case ir.OpKind.RepeaterCreate:
|
|
121
|
+
if (pendingStructuralDirective !== undefined) {
|
|
122
|
+
throw Error('AssertionError: Unexpected structural directive associated with @for block');
|
|
123
|
+
}
|
|
124
|
+
// RepeaterCreate has 3 slots: the first is for the op itself, the second is for the @for
|
|
125
|
+
// template and the (optional) third is for the @empty template.
|
|
126
|
+
const forSlot = op.handle.slot + 1;
|
|
127
|
+
const forView = job.views.get(op.xref);
|
|
128
|
+
// First record all of the placeholders for the @for template.
|
|
129
|
+
if (op.i18nPlaceholder === undefined) {
|
|
130
|
+
// If there is no i18n placeholder, just recurse into the view in case it contains i18n
|
|
131
|
+
// blocks.
|
|
132
|
+
resolvePlaceholdersForView(job, forView, i18nContexts, elements);
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
if (currentOps === null) {
|
|
136
|
+
throw Error('i18n tag placeholder should only occur inside an i18n block');
|
|
137
|
+
}
|
|
138
|
+
recordTemplateStart(job, forView, forSlot, op.i18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
|
|
139
|
+
resolvePlaceholdersForView(job, forView, i18nContexts, elements);
|
|
140
|
+
recordTemplateClose(job, forView, forSlot, op.i18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
|
|
141
|
+
pendingStructuralDirective = undefined;
|
|
142
|
+
}
|
|
143
|
+
// Then if there's an @empty template, add its placeholders as well.
|
|
144
|
+
if (op.emptyView !== null) {
|
|
145
|
+
// RepeaterCreate has 3 slots: the first is for the op itself, the second is for the @for
|
|
146
|
+
// template and the (optional) third is for the @empty template.
|
|
147
|
+
const emptySlot = op.handle.slot + 2;
|
|
148
|
+
const emptyView = job.views.get(op.emptyView);
|
|
149
|
+
if (op.emptyI18nPlaceholder === undefined) {
|
|
150
|
+
// If there is no i18n placeholder, just recurse into the view in case it contains i18n
|
|
151
|
+
// blocks.
|
|
152
|
+
resolvePlaceholdersForView(job, emptyView, i18nContexts, elements);
|
|
153
|
+
}
|
|
154
|
+
else {
|
|
155
|
+
if (currentOps === null) {
|
|
156
|
+
throw Error('i18n tag placeholder should only occur inside an i18n block');
|
|
157
|
+
}
|
|
158
|
+
recordTemplateStart(job, emptyView, emptySlot, op.emptyI18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
|
|
159
|
+
resolvePlaceholdersForView(job, emptyView, i18nContexts, elements);
|
|
160
|
+
recordTemplateClose(job, emptyView, emptySlot, op.emptyI18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
|
|
115
161
|
pendingStructuralDirective = undefined;
|
|
116
162
|
}
|
|
117
163
|
}
|
|
@@ -159,8 +205,8 @@ function recordElementClose(op, i18nContext, i18nBlock, structuralDirective) {
|
|
|
159
205
|
/**
|
|
160
206
|
* Records an i18n param value for the start of a template.
|
|
161
207
|
*/
|
|
162
|
-
function recordTemplateStart(job,
|
|
163
|
-
let { startName, closeName } =
|
|
208
|
+
function recordTemplateStart(job, view, slot, i18nPlaceholder, i18nContext, i18nBlock, structuralDirective) {
|
|
209
|
+
let { startName, closeName } = i18nPlaceholder;
|
|
164
210
|
let flags = ir.I18nParamValueFlags.TemplateTag | ir.I18nParamValueFlags.OpenTag;
|
|
165
211
|
// For self-closing tags, there is no close tag placeholder. Instead, the start tag
|
|
166
212
|
// placeholder accounts for the start and close of the element.
|
|
@@ -175,20 +221,20 @@ function recordTemplateStart(job, op, i18nContext, i18nBlock, structuralDirectiv
|
|
|
175
221
|
}
|
|
176
222
|
// Record the start of the template. For the sub-template index, pass the index for the template's
|
|
177
223
|
// view, rather than the current i18n block's index.
|
|
178
|
-
addParam(i18nContext.params, startName,
|
|
224
|
+
addParam(i18nContext.params, startName, slot, getSubTemplateIndexForTemplateTag(job, i18nBlock, view), flags);
|
|
179
225
|
}
|
|
180
226
|
/**
|
|
181
227
|
* Records an i18n param value for the closing of a template.
|
|
182
228
|
*/
|
|
183
|
-
function recordTemplateClose(job,
|
|
184
|
-
const { startName, closeName } =
|
|
229
|
+
function recordTemplateClose(job, view, slot, i18nPlaceholder, i18nContext, i18nBlock, structuralDirective) {
|
|
230
|
+
const { startName, closeName } = i18nPlaceholder;
|
|
185
231
|
const flags = ir.I18nParamValueFlags.TemplateTag | ir.I18nParamValueFlags.CloseTag;
|
|
186
232
|
// Self-closing tags don't have a closing tag placeholder, instead the template's closing is
|
|
187
233
|
// recorded via an additional flag on the template start value.
|
|
188
234
|
if (closeName) {
|
|
189
235
|
// Record the closing of the template. For the sub-template index, pass the index for the
|
|
190
236
|
// template's view, rather than the current i18n block's index.
|
|
191
|
-
addParam(i18nContext.params, closeName,
|
|
237
|
+
addParam(i18nContext.params, closeName, slot, getSubTemplateIndexForTemplateTag(job, i18nBlock, view), flags);
|
|
192
238
|
// If the template is associated with a structural directive, record the structural directive's
|
|
193
239
|
// closing after. Since this template must be in the structural directive's view, we can just
|
|
194
240
|
// directly use the current i18n block's sub-template index.
|
|
@@ -201,8 +247,8 @@ function recordTemplateClose(job, op, i18nContext, i18nBlock, structuralDirectiv
|
|
|
201
247
|
* Get the subTemplateIndex for the given template op. For template ops, use the subTemplateIndex of
|
|
202
248
|
* the child i18n block inside the template.
|
|
203
249
|
*/
|
|
204
|
-
function getSubTemplateIndexForTemplateTag(job, i18nOp,
|
|
205
|
-
for (const childOp of
|
|
250
|
+
function getSubTemplateIndexForTemplateTag(job, i18nOp, view) {
|
|
251
|
+
for (const childOp of view.create) {
|
|
206
252
|
if (childOp.kind === ir.OpKind.I18nStart) {
|
|
207
253
|
return childOp.subTemplateIndex;
|
|
208
254
|
}
|
|
@@ -217,4 +263,4 @@ function addParam(params, placeholder, value, subTemplateIndex, flags) {
|
|
|
217
263
|
values.push({ value, subTemplateIndex, flags });
|
|
218
264
|
params.set(placeholder, values);
|
|
219
265
|
}
|
|
220
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolve_i18n_element_placeholders.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/resolve_i18n_element_placeholders.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 * as ir from '../../ir';\nimport {ComponentCompilationJob, ViewCompilationUnit} from '../compilation';\n\n/**\n * Resolve the element placeholders in i18n messages.\n */\nexport function resolveI18nElementPlaceholders(job: ComponentCompilationJob) {\n  // Record all of the element and i18n context ops for use later.\n  const i18nContexts = new Map<ir.XrefId, ir.I18nContextOp>();\n  const elements = new Map<ir.XrefId, ir.ElementStartOp>();\n  for (const unit of job.units) {\n    for (const op of unit.create) {\n      switch (op.kind) {\n        case ir.OpKind.I18nContext:\n          i18nContexts.set(op.xref, op);\n          break;\n        case ir.OpKind.ElementStart:\n          elements.set(op.xref, op);\n          break;\n      }\n    }\n  }\n\n  resolvePlaceholdersForView(job, job.root, i18nContexts, elements);\n}\n\n/**\n * Recursively resolves element and template tag placeholders in the given view.\n */\nfunction resolvePlaceholdersForView(\n    job: ComponentCompilationJob, unit: ViewCompilationUnit,\n    i18nContexts: Map<ir.XrefId, ir.I18nContextOp>, elements: Map<ir.XrefId, ir.ElementStartOp>,\n    pendingStructuralDirective?: ir.TemplateOp) {\n  // Track the current i18n op and corresponding i18n context op as we step through the creation\n  // IR.\n  let currentOps: {i18nBlock: ir.I18nStartOp, i18nContext: ir.I18nContextOp}|null = null;\n  let pendingStructuralDirectiveCloses = new Map<ir.XrefId, ir.TemplateOp>();\n  for (const op of unit.create) {\n    switch (op.kind) {\n      case ir.OpKind.I18nStart:\n        if (!op.context) {\n          throw Error('Could not find i18n context for i18n op');\n        }\n        currentOps = {i18nBlock: op, i18nContext: i18nContexts.get(op.context)!};\n        break;\n      case ir.OpKind.I18nEnd:\n        currentOps = null;\n        break;\n      case ir.OpKind.ElementStart:\n        // For elements with i18n placeholders, record its slot value in the params map under the\n        // corresponding tag start placeholder.\n        if (op.i18nPlaceholder !== undefined) {\n          if (currentOps === null) {\n            throw Error('i18n tag placeholder should only occur inside an i18n block');\n          }\n          recordElementStart(\n              op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);\n          // If there is a separate close tag placeholder for this element, save the pending\n          // structural directive so we can pass it to the closing tag as well.\n          if (pendingStructuralDirective && op.i18nPlaceholder.closeName) {\n            pendingStructuralDirectiveCloses.set(op.xref, pendingStructuralDirective);\n          }\n          // Clear out the pending structural directive now that its been accounted for.\n          pendingStructuralDirective = undefined;\n        }\n        break;\n      case ir.OpKind.ElementEnd:\n        // For elements with i18n placeholders, record its slot value in the params map under the\n        // corresponding tag close placeholder.\n        const startOp = elements.get(op.xref);\n        if (startOp && startOp.i18nPlaceholder !== undefined) {\n          if (currentOps === null) {\n            throw Error(\n                'AssertionError: i18n tag placeholder should only occur inside an i18n block');\n          }\n          recordElementClose(\n              startOp, currentOps.i18nContext, currentOps.i18nBlock,\n              pendingStructuralDirectiveCloses.get(op.xref));\n          // Clear out the pending structural directive close that was accounted for.\n          pendingStructuralDirectiveCloses.delete(op.xref);\n        }\n        break;\n      case ir.OpKind.Projection:\n        // For content projections with i18n placeholders, record its slot value in the params map\n        // under the corresponding tag start and close placeholders.\n        if (op.i18nPlaceholder !== undefined) {\n          if (currentOps === null) {\n            throw Error('i18n tag placeholder should only occur inside an i18n block');\n          }\n          recordElementStart(\n              op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);\n          recordElementClose(\n              op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);\n          // Clear out the pending structural directive now that its been accounted for.\n          pendingStructuralDirective = undefined;\n        }\n        break;\n      case ir.OpKind.Template:\n        if (op.i18nPlaceholder === undefined) {\n          // If there is no i18n placeholder, just recurse into the view in case it contains i18n\n          // blocks.\n          resolvePlaceholdersForView(job, job.views.get(op.xref)!, i18nContexts, elements);\n        } else {\n          if (currentOps === null) {\n            throw Error('i18n tag placeholder should only occur inside an i18n block');\n          }\n          if (op.templateKind === ir.TemplateKind.Structural) {\n            // If this is a structural directive template, don't record anything yet. Instead pass\n            // the current template as a pending structural directive to be recorded when we find\n            // the element, content, or template it belongs to. This allows us to create combined\n            // values that represent, e.g. the start of a template and element at the same time.\n            resolvePlaceholdersForView(job, job.views.get(op.xref)!, i18nContexts, elements, op);\n          } else {\n            // If this is some other kind of template, we can record its start, recurse into its\n            // view, and then record its end.\n            recordTemplateStart(\n                job, op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);\n            resolvePlaceholdersForView(job, job.views.get(op.xref)!, i18nContexts, elements);\n            recordTemplateClose(\n                job, op, currentOps!.i18nContext, currentOps!.i18nBlock,\n                pendingStructuralDirective);\n            pendingStructuralDirective = undefined;\n          }\n        }\n        break;\n    }\n  }\n}\n\n/**\n * Records an i18n param value for the start of an element.\n */\nfunction recordElementStart(\n    op: ir.ElementStartOp|ir.ProjectionOp, i18nContext: ir.I18nContextOp, i18nBlock: ir.I18nStartOp,\n    structuralDirective?: ir.TemplateOp) {\n  const {startName, closeName} = op.i18nPlaceholder!;\n  let flags = ir.I18nParamValueFlags.ElementTag | ir.I18nParamValueFlags.OpenTag;\n  let value: ir.I18nParamValue['value'] = op.handle.slot!;\n  // If the element is associated with a structural directive, start it as well.\n  if (structuralDirective !== undefined) {\n    flags |= ir.I18nParamValueFlags.TemplateTag;\n    value = {element: value, template: structuralDirective.handle.slot!};\n  }\n  // For self-closing tags, there is no close tag placeholder. Instead, the start tag\n  // placeholder accounts for the start and close of the element.\n  if (!closeName) {\n    flags |= ir.I18nParamValueFlags.CloseTag;\n  }\n  addParam(i18nContext.params, startName, value, i18nBlock.subTemplateIndex, flags);\n}\n\n/**\n * Records an i18n param value for the closing of an element.\n */\nfunction recordElementClose(\n    op: ir.ElementStartOp|ir.ProjectionOp, i18nContext: ir.I18nContextOp, i18nBlock: ir.I18nStartOp,\n    structuralDirective?: ir.TemplateOp) {\n  const {closeName} = op.i18nPlaceholder!;\n  // Self-closing tags don't have a closing tag placeholder, instead the element closing is\n  // recorded via an additional flag on the element start value.\n  if (closeName) {\n    let flags = ir.I18nParamValueFlags.ElementTag | ir.I18nParamValueFlags.CloseTag;\n    let value: ir.I18nParamValue['value'] = op.handle.slot!;\n    // If the element is associated with a structural directive, close it as well.\n    if (structuralDirective !== undefined) {\n      flags |= ir.I18nParamValueFlags.TemplateTag;\n      value = {element: value, template: structuralDirective.handle.slot!};\n    }\n    addParam(i18nContext.params, closeName, value, i18nBlock.subTemplateIndex, flags);\n  }\n}\n\n/**\n * Records an i18n param value for the start of a template.\n */\nfunction recordTemplateStart(\n    job: ComponentCompilationJob, op: ir.TemplateOp, i18nContext: ir.I18nContextOp,\n    i18nBlock: ir.I18nStartOp, structuralDirective?: ir.TemplateOp) {\n  let {startName, closeName} = op.i18nPlaceholder!;\n  let flags = ir.I18nParamValueFlags.TemplateTag | ir.I18nParamValueFlags.OpenTag;\n  // For self-closing tags, there is no close tag placeholder. Instead, the start tag\n  // placeholder accounts for the start and close of the element.\n  if (!closeName) {\n    flags |= ir.I18nParamValueFlags.CloseTag;\n  }\n  // If the template is associated with a structural directive, record the structural directive's\n  // start first. Since this template must be in the structural directive's view, we can just\n  // directly use the current i18n block's sub-template index.\n  if (structuralDirective !== undefined) {\n    addParam(\n        i18nContext.params, startName, structuralDirective.handle.slot!, i18nBlock.subTemplateIndex,\n        flags);\n  }\n  // Record the start of the template. For the sub-template index, pass the index for the template's\n  // view, rather than the current i18n block's index.\n  addParam(\n      i18nContext.params, startName, op.handle.slot!,\n      getSubTemplateIndexForTemplateTag(job, i18nBlock, op), flags);\n}\n\n/**\n * Records an i18n param value for the closing of a template.\n */\nfunction recordTemplateClose(\n    job: ComponentCompilationJob, op: ir.TemplateOp, i18nContext: ir.I18nContextOp,\n    i18nBlock: ir.I18nStartOp, structuralDirective?: ir.TemplateOp) {\n  const {startName, closeName} = op.i18nPlaceholder!;\n  const flags = ir.I18nParamValueFlags.TemplateTag | ir.I18nParamValueFlags.CloseTag;\n  // Self-closing tags don't have a closing tag placeholder, instead the template's closing is\n  // recorded via an additional flag on the template start value.\n  if (closeName) {\n    // Record the closing of the template. For the sub-template index, pass the index for the\n    // template's view, rather than the current i18n block's index.\n    addParam(\n        i18nContext.params, closeName, op.handle.slot!,\n        getSubTemplateIndexForTemplateTag(job, i18nBlock, op), flags);\n    // If the template is associated with a structural directive, record the structural directive's\n    // closing after. Since this template must be in the structural directive's view, we can just\n    // directly use the current i18n block's sub-template index.\n    if (structuralDirective !== undefined) {\n      addParam(\n          i18nContext.params, closeName, structuralDirective.handle.slot!,\n          i18nBlock.subTemplateIndex, flags);\n    }\n  }\n}\n\n/**\n * Get the subTemplateIndex for the given template op. For template ops, use the subTemplateIndex of\n * the child i18n block inside the template.\n */\nfunction getSubTemplateIndexForTemplateTag(\n    job: ComponentCompilationJob, i18nOp: ir.I18nStartOp, op: ir.TemplateOp): number|null {\n  for (const childOp of job.views.get(op.xref)!.create) {\n    if (childOp.kind === ir.OpKind.I18nStart) {\n      return childOp.subTemplateIndex;\n    }\n  }\n  return i18nOp.subTemplateIndex;\n}\n\n/**\n * Add a param value to the given params map.\n */\nfunction addParam(\n    params: Map<string, ir.I18nParamValue[]>, placeholder: string,\n    value: string|number|{element: number, template: number}, subTemplateIndex: number|null,\n    flags: ir.I18nParamValueFlags) {\n  const values = params.get(placeholder) ?? [];\n  values.push({value, subTemplateIndex, flags});\n  params.set(placeholder, values);\n}\n"]}
|
|
266
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolve_i18n_element_placeholders.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/resolve_i18n_element_placeholders.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 * as i18n from '../../../../i18n/i18n_ast';\nimport * as ir from '../../ir';\nimport {ComponentCompilationJob, ViewCompilationUnit} from '../compilation';\n\n/**\n * Resolve the element placeholders in i18n messages.\n */\nexport function resolveI18nElementPlaceholders(job: ComponentCompilationJob) {\n  // Record all of the element and i18n context ops for use later.\n  const i18nContexts = new Map<ir.XrefId, ir.I18nContextOp>();\n  const elements = new Map<ir.XrefId, ir.ElementStartOp>();\n  for (const unit of job.units) {\n    for (const op of unit.create) {\n      switch (op.kind) {\n        case ir.OpKind.I18nContext:\n          i18nContexts.set(op.xref, op);\n          break;\n        case ir.OpKind.ElementStart:\n          elements.set(op.xref, op);\n          break;\n      }\n    }\n  }\n\n  resolvePlaceholdersForView(job, job.root, i18nContexts, elements);\n}\n\n/**\n * Recursively resolves element and template tag placeholders in the given view.\n */\nfunction resolvePlaceholdersForView(\n    job: ComponentCompilationJob, unit: ViewCompilationUnit,\n    i18nContexts: Map<ir.XrefId, ir.I18nContextOp>, elements: Map<ir.XrefId, ir.ElementStartOp>,\n    pendingStructuralDirective?: ir.TemplateOp) {\n  // Track the current i18n op and corresponding i18n context op as we step through the creation\n  // IR.\n  let currentOps: {i18nBlock: ir.I18nStartOp, i18nContext: ir.I18nContextOp}|null = null;\n  let pendingStructuralDirectiveCloses = new Map<ir.XrefId, ir.TemplateOp>();\n  for (const op of unit.create) {\n    switch (op.kind) {\n      case ir.OpKind.I18nStart:\n        if (!op.context) {\n          throw Error('Could not find i18n context for i18n op');\n        }\n        currentOps = {i18nBlock: op, i18nContext: i18nContexts.get(op.context)!};\n        break;\n      case ir.OpKind.I18nEnd:\n        currentOps = null;\n        break;\n      case ir.OpKind.ElementStart:\n        // For elements with i18n placeholders, record its slot value in the params map under the\n        // corresponding tag start placeholder.\n        if (op.i18nPlaceholder !== undefined) {\n          if (currentOps === null) {\n            throw Error('i18n tag placeholder should only occur inside an i18n block');\n          }\n          recordElementStart(\n              op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);\n          // If there is a separate close tag placeholder for this element, save the pending\n          // structural directive so we can pass it to the closing tag as well.\n          if (pendingStructuralDirective && op.i18nPlaceholder.closeName) {\n            pendingStructuralDirectiveCloses.set(op.xref, pendingStructuralDirective);\n          }\n          // Clear out the pending structural directive now that its been accounted for.\n          pendingStructuralDirective = undefined;\n        }\n        break;\n      case ir.OpKind.ElementEnd:\n        // For elements with i18n placeholders, record its slot value in the params map under the\n        // corresponding tag close placeholder.\n        const startOp = elements.get(op.xref);\n        if (startOp && startOp.i18nPlaceholder !== undefined) {\n          if (currentOps === null) {\n            throw Error(\n                'AssertionError: i18n tag placeholder should only occur inside an i18n block');\n          }\n          recordElementClose(\n              startOp, currentOps.i18nContext, currentOps.i18nBlock,\n              pendingStructuralDirectiveCloses.get(op.xref));\n          // Clear out the pending structural directive close that was accounted for.\n          pendingStructuralDirectiveCloses.delete(op.xref);\n        }\n        break;\n      case ir.OpKind.Projection:\n        // For content projections with i18n placeholders, record its slot value in the params map\n        // under the corresponding tag start and close placeholders.\n        if (op.i18nPlaceholder !== undefined) {\n          if (currentOps === null) {\n            throw Error('i18n tag placeholder should only occur inside an i18n block');\n          }\n          recordElementStart(\n              op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);\n          recordElementClose(\n              op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);\n          // Clear out the pending structural directive now that its been accounted for.\n          pendingStructuralDirective = undefined;\n        }\n        break;\n      case ir.OpKind.Template:\n        const view = job.views.get(op.xref)!;\n        if (op.i18nPlaceholder === undefined) {\n          // If there is no i18n placeholder, just recurse into the view in case it contains i18n\n          // blocks.\n          resolvePlaceholdersForView(job, view, i18nContexts, elements);\n        } else {\n          if (currentOps === null) {\n            throw Error('i18n tag placeholder should only occur inside an i18n block');\n          }\n          if (op.templateKind === ir.TemplateKind.Structural) {\n            // If this is a structural directive template, don't record anything yet. Instead pass\n            // the current template as a pending structural directive to be recorded when we find\n            // the element, content, or template it belongs to. This allows us to create combined\n            // values that represent, e.g. the start of a template and element at the same time.\n            resolvePlaceholdersForView(job, view, i18nContexts, elements, op);\n          } else {\n            // If this is some other kind of template, we can record its start, recurse into its\n            // view, and then record its end.\n            recordTemplateStart(\n                job, view, op.handle.slot!, op.i18nPlaceholder, currentOps.i18nContext,\n                currentOps.i18nBlock, pendingStructuralDirective);\n            resolvePlaceholdersForView(job, view, i18nContexts, elements);\n            recordTemplateClose(\n                job, view, op.handle.slot!, op.i18nPlaceholder, currentOps!.i18nContext,\n                currentOps!.i18nBlock, pendingStructuralDirective);\n            pendingStructuralDirective = undefined;\n          }\n        }\n        break;\n      case ir.OpKind.RepeaterCreate:\n        if (pendingStructuralDirective !== undefined) {\n          throw Error('AssertionError: Unexpected structural directive associated with @for block');\n        }\n        // RepeaterCreate has 3 slots: the first is for the op itself, the second is for the @for\n        // template and the (optional) third is for the @empty template.\n        const forSlot = op.handle.slot! + 1;\n        const forView = job.views.get(op.xref)!;\n        // First record all of the placeholders for the @for template.\n        if (op.i18nPlaceholder === undefined) {\n          // If there is no i18n placeholder, just recurse into the view in case it contains i18n\n          // blocks.\n          resolvePlaceholdersForView(job, forView, i18nContexts, elements);\n        } else {\n          if (currentOps === null) {\n            throw Error('i18n tag placeholder should only occur inside an i18n block');\n          }\n          recordTemplateStart(\n              job, forView, forSlot, op.i18nPlaceholder, currentOps.i18nContext,\n              currentOps.i18nBlock, pendingStructuralDirective);\n          resolvePlaceholdersForView(job, forView, i18nContexts, elements);\n          recordTemplateClose(\n              job, forView, forSlot, op.i18nPlaceholder, currentOps!.i18nContext,\n              currentOps!.i18nBlock, pendingStructuralDirective);\n          pendingStructuralDirective = undefined;\n        }\n        // Then if there's an @empty template, add its placeholders as well.\n        if (op.emptyView !== null) {\n          // RepeaterCreate has 3 slots: the first is for the op itself, the second is for the @for\n          // template and the (optional) third is for the @empty template.\n          const emptySlot = op.handle.slot! + 2;\n          const emptyView = job.views.get(op.emptyView!)!;\n          if (op.emptyI18nPlaceholder === undefined) {\n            // If there is no i18n placeholder, just recurse into the view in case it contains i18n\n            // blocks.\n            resolvePlaceholdersForView(job, emptyView, i18nContexts, elements);\n          } else {\n            if (currentOps === null) {\n              throw Error('i18n tag placeholder should only occur inside an i18n block');\n            }\n            recordTemplateStart(\n                job, emptyView, emptySlot, op.emptyI18nPlaceholder, currentOps.i18nContext,\n                currentOps.i18nBlock, pendingStructuralDirective);\n            resolvePlaceholdersForView(job, emptyView, i18nContexts, elements);\n            recordTemplateClose(\n                job, emptyView, emptySlot, op.emptyI18nPlaceholder, currentOps!.i18nContext,\n                currentOps!.i18nBlock, pendingStructuralDirective);\n            pendingStructuralDirective = undefined;\n          }\n        }\n        break;\n    }\n  }\n}\n\n/**\n * Records an i18n param value for the start of an element.\n */\nfunction recordElementStart(\n    op: ir.ElementStartOp|ir.ProjectionOp, i18nContext: ir.I18nContextOp, i18nBlock: ir.I18nStartOp,\n    structuralDirective?: ir.TemplateOp) {\n  const {startName, closeName} = op.i18nPlaceholder!;\n  let flags = ir.I18nParamValueFlags.ElementTag | ir.I18nParamValueFlags.OpenTag;\n  let value: ir.I18nParamValue['value'] = op.handle.slot!;\n  // If the element is associated with a structural directive, start it as well.\n  if (structuralDirective !== undefined) {\n    flags |= ir.I18nParamValueFlags.TemplateTag;\n    value = {element: value, template: structuralDirective.handle.slot!};\n  }\n  // For self-closing tags, there is no close tag placeholder. Instead, the start tag\n  // placeholder accounts for the start and close of the element.\n  if (!closeName) {\n    flags |= ir.I18nParamValueFlags.CloseTag;\n  }\n  addParam(i18nContext.params, startName, value, i18nBlock.subTemplateIndex, flags);\n}\n\n/**\n * Records an i18n param value for the closing of an element.\n */\nfunction recordElementClose(\n    op: ir.ElementStartOp|ir.ProjectionOp, i18nContext: ir.I18nContextOp, i18nBlock: ir.I18nStartOp,\n    structuralDirective?: ir.TemplateOp) {\n  const {closeName} = op.i18nPlaceholder!;\n  // Self-closing tags don't have a closing tag placeholder, instead the element closing is\n  // recorded via an additional flag on the element start value.\n  if (closeName) {\n    let flags = ir.I18nParamValueFlags.ElementTag | ir.I18nParamValueFlags.CloseTag;\n    let value: ir.I18nParamValue['value'] = op.handle.slot!;\n    // If the element is associated with a structural directive, close it as well.\n    if (structuralDirective !== undefined) {\n      flags |= ir.I18nParamValueFlags.TemplateTag;\n      value = {element: value, template: structuralDirective.handle.slot!};\n    }\n    addParam(i18nContext.params, closeName, value, i18nBlock.subTemplateIndex, flags);\n  }\n}\n\n/**\n * Records an i18n param value for the start of a template.\n */\nfunction recordTemplateStart(\n    job: ComponentCompilationJob, view: ViewCompilationUnit, slot: number,\n    i18nPlaceholder: i18n.TagPlaceholder|i18n.BlockPlaceholder, i18nContext: ir.I18nContextOp,\n    i18nBlock: ir.I18nStartOp, structuralDirective?: ir.TemplateOp) {\n  let {startName, closeName} = i18nPlaceholder;\n  let flags = ir.I18nParamValueFlags.TemplateTag | ir.I18nParamValueFlags.OpenTag;\n  // For self-closing tags, there is no close tag placeholder. Instead, the start tag\n  // placeholder accounts for the start and close of the element.\n  if (!closeName) {\n    flags |= ir.I18nParamValueFlags.CloseTag;\n  }\n  // If the template is associated with a structural directive, record the structural directive's\n  // start first. Since this template must be in the structural directive's view, we can just\n  // directly use the current i18n block's sub-template index.\n  if (structuralDirective !== undefined) {\n    addParam(\n        i18nContext.params, startName, structuralDirective.handle.slot!, i18nBlock.subTemplateIndex,\n        flags);\n  }\n  // Record the start of the template. For the sub-template index, pass the index for the template's\n  // view, rather than the current i18n block's index.\n  addParam(\n      i18nContext.params, startName, slot, getSubTemplateIndexForTemplateTag(job, i18nBlock, view),\n      flags);\n}\n\n/**\n * Records an i18n param value for the closing of a template.\n */\nfunction recordTemplateClose(\n    job: ComponentCompilationJob, view: ViewCompilationUnit, slot: number,\n    i18nPlaceholder: i18n.TagPlaceholder|i18n.BlockPlaceholder, i18nContext: ir.I18nContextOp,\n    i18nBlock: ir.I18nStartOp, structuralDirective?: ir.TemplateOp) {\n  const {startName, closeName} = i18nPlaceholder;\n  const flags = ir.I18nParamValueFlags.TemplateTag | ir.I18nParamValueFlags.CloseTag;\n  // Self-closing tags don't have a closing tag placeholder, instead the template's closing is\n  // recorded via an additional flag on the template start value.\n  if (closeName) {\n    // Record the closing of the template. For the sub-template index, pass the index for the\n    // template's view, rather than the current i18n block's index.\n    addParam(\n        i18nContext.params, closeName, slot,\n        getSubTemplateIndexForTemplateTag(job, i18nBlock, view), flags);\n    // If the template is associated with a structural directive, record the structural directive's\n    // closing after. Since this template must be in the structural directive's view, we can just\n    // directly use the current i18n block's sub-template index.\n    if (structuralDirective !== undefined) {\n      addParam(\n          i18nContext.params, closeName, structuralDirective.handle.slot!,\n          i18nBlock.subTemplateIndex, flags);\n    }\n  }\n}\n\n/**\n * Get the subTemplateIndex for the given template op. For template ops, use the subTemplateIndex of\n * the child i18n block inside the template.\n */\nfunction getSubTemplateIndexForTemplateTag(\n    job: ComponentCompilationJob, i18nOp: ir.I18nStartOp, view: ViewCompilationUnit): number|null {\n  for (const childOp of view.create) {\n    if (childOp.kind === ir.OpKind.I18nStart) {\n      return childOp.subTemplateIndex;\n    }\n  }\n  return i18nOp.subTemplateIndex;\n}\n\n/**\n * Add a param value to the given params map.\n */\nfunction addParam(\n    params: Map<string, ir.I18nParamValue[]>, placeholder: string,\n    value: string|number|{element: number, template: number}, subTemplateIndex: number|null,\n    flags: ir.I18nParamValueFlags) {\n  const values = params.get(placeholder) ?? [];\n  values.push({value, subTemplateIndex, flags});\n  params.set(placeholder, values);\n}\n"]}
|
|
@@ -13,6 +13,7 @@ export function resolveI18nExpressionPlaceholders(job) {
|
|
|
13
13
|
// Record all of the i18n context ops, and the sub-template index for each i18n op.
|
|
14
14
|
const subTemplateIndicies = new Map();
|
|
15
15
|
const i18nContexts = new Map();
|
|
16
|
+
const icuPlaceholders = new Map();
|
|
16
17
|
for (const unit of job.units) {
|
|
17
18
|
for (const op of unit.create) {
|
|
18
19
|
switch (op.kind) {
|
|
@@ -22,6 +23,9 @@ export function resolveI18nExpressionPlaceholders(job) {
|
|
|
22
23
|
case ir.OpKind.I18nContext:
|
|
23
24
|
i18nContexts.set(op.xref, op);
|
|
24
25
|
break;
|
|
26
|
+
case ir.OpKind.IcuPlaceholder:
|
|
27
|
+
icuPlaceholders.set(op.xref, op);
|
|
28
|
+
break;
|
|
25
29
|
}
|
|
26
30
|
}
|
|
27
31
|
}
|
|
@@ -35,23 +39,32 @@ export function resolveI18nExpressionPlaceholders(job) {
|
|
|
35
39
|
for (const unit of job.units) {
|
|
36
40
|
for (const op of unit.update) {
|
|
37
41
|
if (op.kind === ir.OpKind.I18nExpression) {
|
|
38
|
-
const i18nContext = i18nContexts.get(op.context);
|
|
39
42
|
const index = expressionIndices.get(referenceIndex(op)) || 0;
|
|
40
43
|
const subTemplateIndex = subTemplateIndicies.get(op.i18nOwner) ?? null;
|
|
41
|
-
|
|
42
|
-
const params = op.resolutionTime === ir.I18nParamResolutionTime.Creation ?
|
|
43
|
-
i18nContext.params :
|
|
44
|
-
i18nContext.postprocessingParams;
|
|
45
|
-
const values = params.get(op.i18nPlaceholder) || [];
|
|
46
|
-
values.push({
|
|
44
|
+
const value = {
|
|
47
45
|
value: index,
|
|
48
46
|
subTemplateIndex: subTemplateIndex,
|
|
49
47
|
flags: ir.I18nParamValueFlags.ExpressionIndex
|
|
50
|
-
}
|
|
51
|
-
|
|
48
|
+
};
|
|
49
|
+
updatePlaceholder(op, value, i18nContexts, icuPlaceholders);
|
|
52
50
|
expressionIndices.set(referenceIndex(op), index + 1);
|
|
53
51
|
}
|
|
54
52
|
}
|
|
55
53
|
}
|
|
56
54
|
}
|
|
57
|
-
|
|
55
|
+
function updatePlaceholder(op, value, i18nContexts, icuPlaceholders) {
|
|
56
|
+
if (op.i18nPlaceholder !== null) {
|
|
57
|
+
const i18nContext = i18nContexts.get(op.context);
|
|
58
|
+
const params = op.resolutionTime === ir.I18nParamResolutionTime.Creation ?
|
|
59
|
+
i18nContext.params :
|
|
60
|
+
i18nContext.postprocessingParams;
|
|
61
|
+
const values = params.get(op.i18nPlaceholder) || [];
|
|
62
|
+
values.push(value);
|
|
63
|
+
params.set(op.i18nPlaceholder, values);
|
|
64
|
+
}
|
|
65
|
+
if (op.icuPlaceholder !== null) {
|
|
66
|
+
const icuPlaceholderOp = icuPlaceholders.get(op.icuPlaceholder);
|
|
67
|
+
icuPlaceholderOp?.expressionPlaceholders.push(value);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZV9pMThuX2V4cHJlc3Npb25fcGxhY2Vob2xkZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29tcGlsZXIvc3JjL3RlbXBsYXRlL3BpcGVsaW5lL3NyYy9waGFzZXMvcmVzb2x2ZV9pMThuX2V4cHJlc3Npb25fcGxhY2Vob2xkZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sS0FBSyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRy9COztHQUVHO0FBQ0gsTUFBTSxVQUFVLGlDQUFpQyxDQUFDLEdBQTRCO0lBQzVFLG1GQUFtRjtJQUNuRixNQUFNLG1CQUFtQixHQUFHLElBQUksR0FBRyxFQUEwQixDQUFDO0lBQzlELE1BQU0sWUFBWSxHQUFHLElBQUksR0FBRyxFQUErQixDQUFDO0lBQzVELE1BQU0sZUFBZSxHQUFHLElBQUksR0FBRyxFQUFrQyxDQUFDO0lBQ2xFLEtBQUssTUFBTSxJQUFJLElBQUksR0FBRyxDQUFDLEtBQUssRUFBRTtRQUM1QixLQUFLLE1BQU0sRUFBRSxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDNUIsUUFBUSxFQUFFLENBQUMsSUFBSSxFQUFFO2dCQUNmLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxTQUFTO29CQUN0QixtQkFBbUIsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztvQkFDdEQsTUFBTTtnQkFDUixLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUMsV0FBVztvQkFDeEIsWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO29CQUM5QixNQUFNO2dCQUNSLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxjQUFjO29CQUMzQixlQUFlLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUM7b0JBQ2pDLE1BQU07YUFDVDtTQUNGO0tBQ0Y7SUFFRCwyRUFBMkU7SUFDM0UsTUFBTSxpQkFBaUIsR0FBRyxJQUFJLEdBQUcsRUFBcUIsQ0FBQztJQUV2RCx1REFBdUQ7SUFDdkQsZ0dBQWdHO0lBQ2hHLGdHQUFnRztJQUNoRyw4RUFBOEU7SUFDOUUsTUFBTSxjQUFjLEdBQUcsQ0FBQyxFQUF1QixFQUFhLEVBQUUsQ0FDMUQsRUFBRSxDQUFDLEtBQUssS0FBSyxFQUFFLENBQUMsaUJBQWlCLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDO0lBRTNFLEtBQUssTUFBTSxJQUFJLElBQUksR0FBRyxDQUFDLEtBQUssRUFBRTtRQUM1QixLQUFLLE1BQU0sRUFBRSxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDNUIsSUFBSSxFQUFFLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUMsY0FBYyxFQUFFO2dCQUN4QyxNQUFNLEtBQUssR0FBRyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDO2dCQUM3RCxNQUFNLGdCQUFnQixHQUFHLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLElBQUksSUFBSSxDQUFDO2dCQUN2RSxNQUFNLEtBQUssR0FBc0I7b0JBQy9CLEtBQUssRUFBRSxLQUFLO29CQUNaLGdCQUFnQixFQUFFLGdCQUFnQjtvQkFDbEMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxlQUFlO2lCQUM5QyxDQUFDO2dCQUNGLGlCQUFpQixDQUFDLEVBQUUsRUFBRSxLQUFLLEVBQUUsWUFBWSxFQUFFLGVBQWUsQ0FBQyxDQUFDO2dCQUM1RCxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQzthQUN0RDtTQUNGO0tBQ0Y7QUFDSCxDQUFDO0FBRUQsU0FBUyxpQkFBaUIsQ0FDdEIsRUFBdUIsRUFBRSxLQUF3QixFQUNqRCxZQUE4QyxFQUM5QyxlQUFvRDtJQUN0RCxJQUFJLEVBQUUsQ0FBQyxlQUFlLEtBQUssSUFBSSxFQUFFO1FBQy9CLE1BQU0sV0FBVyxHQUFHLFlBQVksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBRSxDQUFDO1FBQ2xELE1BQU0sTUFBTSxHQUFHLEVBQUUsQ0FBQyxjQUFjLEtBQUssRUFBRSxDQUFDLHVCQUF1QixDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3RFLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNwQixXQUFXLENBQUMsb0JBQW9CLENBQUM7UUFDckMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsZUFBZSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3BELE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDbkIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsZUFBZSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0tBQ3hDO0lBQ0QsSUFBSSxFQUFFLENBQUMsY0FBYyxLQUFLLElBQUksRUFBRTtRQUM5QixNQUFNLGdCQUFnQixHQUFHLGVBQWUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQ2hFLGdCQUFnQixFQUFFLHNCQUFzQixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztLQUN0RDtBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0ICogYXMgaXIgZnJvbSAnLi4vLi4vaXInO1xuaW1wb3J0IHtDb21wb25lbnRDb21waWxhdGlvbkpvYn0gZnJvbSAnLi4vY29tcGlsYXRpb24nO1xuXG4vKipcbiAqIFJlc29sdmUgdGhlIGkxOG4gZXhwcmVzc2lvbiBwbGFjZWhvbGRlcnMgaW4gaTE4biBtZXNzYWdlcy5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHJlc29sdmVJMThuRXhwcmVzc2lvblBsYWNlaG9sZGVycyhqb2I6IENvbXBvbmVudENvbXBpbGF0aW9uSm9iKSB7XG4gIC8vIFJlY29yZCBhbGwgb2YgdGhlIGkxOG4gY29udGV4dCBvcHMsIGFuZCB0aGUgc3ViLXRlbXBsYXRlIGluZGV4IGZvciBlYWNoIGkxOG4gb3AuXG4gIGNvbnN0IHN1YlRlbXBsYXRlSW5kaWNpZXMgPSBuZXcgTWFwPGlyLlhyZWZJZCwgbnVtYmVyfG51bGw+KCk7XG4gIGNvbnN0IGkxOG5Db250ZXh0cyA9IG5ldyBNYXA8aXIuWHJlZklkLCBpci5JMThuQ29udGV4dE9wPigpO1xuICBjb25zdCBpY3VQbGFjZWhvbGRlcnMgPSBuZXcgTWFwPGlyLlhyZWZJZCwgaXIuSWN1UGxhY2Vob2xkZXJPcD4oKTtcbiAgZm9yIChjb25zdCB1bml0IG9mIGpvYi51bml0cykge1xuICAgIGZvciAoY29uc3Qgb3Agb2YgdW5pdC5jcmVhdGUpIHtcbiAgICAgIHN3aXRjaCAob3Aua2luZCkge1xuICAgICAgICBjYXNlIGlyLk9wS2luZC5JMThuU3RhcnQ6XG4gICAgICAgICAgc3ViVGVtcGxhdGVJbmRpY2llcy5zZXQob3AueHJlZiwgb3Auc3ViVGVtcGxhdGVJbmRleCk7XG4gICAgICAgICAgYnJlYWs7XG4gICAgICAgIGNhc2UgaXIuT3BLaW5kLkkxOG5Db250ZXh0OlxuICAgICAgICAgIGkxOG5Db250ZXh0cy5zZXQob3AueHJlZiwgb3ApO1xuICAgICAgICAgIGJyZWFrO1xuICAgICAgICBjYXNlIGlyLk9wS2luZC5JY3VQbGFjZWhvbGRlcjpcbiAgICAgICAgICBpY3VQbGFjZWhvbGRlcnMuc2V0KG9wLnhyZWYsIG9wKTtcbiAgICAgICAgICBicmVhaztcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICAvLyBLZWVwIHRyYWNrIG9mIHRoZSBuZXh0IGF2YWlsYWJsZSBleHByZXNzaW9uIGluZGV4IGZvciBlYWNoIGkxOG4gbWVzc2FnZS5cbiAgY29uc3QgZXhwcmVzc2lvbkluZGljZXMgPSBuZXcgTWFwPGlyLlhyZWZJZCwgbnVtYmVyPigpO1xuXG4gIC8vIEtlZXAgdHJhY2sgb2YgYSByZWZlcmVuY2UgaW5kZXggZm9yIGVhY2ggZXhwcmVzc2lvbi5cbiAgLy8gV2UgdXNlIGRpZmZlcmVudCByZWZlcmVuY2VzIGZvciBub3JtYWwgaTE4biBleHByZXNzaW8gYW5kIGF0dHJpYnV0ZSBpMThuIGV4cHJlc3Npb25zLiBUaGlzIGlzXG4gIC8vIGJlY2F1c2UgY2hpbGQgaTE4biBibG9ja3MgaW4gdGVtcGxhdGVzIGRvbid0IGdldCB0aGVpciBvd24gY29udGV4dCwgc2luY2UgdGhleSdyZSByb2xsZWQgaW50b1xuICAvLyB0aGUgdHJhbnNsYXRlZCBtZXNzYWdlIG9mIHRoZSBwYXJlbnQsIGJ1dCB0aGV5IG1heSB0YXJnZXQgYSBkaWZmZXJlbnQgc2xvdC5cbiAgY29uc3QgcmVmZXJlbmNlSW5kZXggPSAob3A6IGlyLkkxOG5FeHByZXNzaW9uT3ApOiBpci5YcmVmSWQgPT5cbiAgICAgIG9wLnVzYWdlID09PSBpci5JMThuRXhwcmVzc2lvbkZvci5JMThuVGV4dCA/IG9wLmkxOG5Pd25lciA6IG9wLmNvbnRleHQ7XG5cbiAgZm9yIChjb25zdCB1bml0IG9mIGpvYi51bml0cykge1xuICAgIGZvciAoY29uc3Qgb3Agb2YgdW5pdC51cGRhdGUpIHtcbiAgICAgIGlmIChvcC5raW5kID09PSBpci5PcEtpbmQuSTE4bkV4cHJlc3Npb24pIHtcbiAgICAgICAgY29uc3QgaW5kZXggPSBleHByZXNzaW9uSW5kaWNlcy5nZXQocmVmZXJlbmNlSW5kZXgob3ApKSB8fCAwO1xuICAgICAgICBjb25zdCBzdWJUZW1wbGF0ZUluZGV4ID0gc3ViVGVtcGxhdGVJbmRpY2llcy5nZXQob3AuaTE4bk93bmVyKSA/PyBudWxsO1xuICAgICAgICBjb25zdCB2YWx1ZTogaXIuSTE4blBhcmFtVmFsdWUgPSB7XG4gICAgICAgICAgdmFsdWU6IGluZGV4LFxuICAgICAgICAgIHN1YlRlbXBsYXRlSW5kZXg6IHN1YlRlbXBsYXRlSW5kZXgsXG4gICAgICAgICAgZmxhZ3M6IGlyLkkxOG5QYXJhbVZhbHVlRmxhZ3MuRXhwcmVzc2lvbkluZGV4XG4gICAgICAgIH07XG4gICAgICAgIHVwZGF0ZVBsYWNlaG9sZGVyKG9wLCB2YWx1ZSwgaTE4bkNvbnRleHRzLCBpY3VQbGFjZWhvbGRlcnMpO1xuICAgICAgICBleHByZXNzaW9uSW5kaWNlcy5zZXQocmVmZXJlbmNlSW5kZXgob3ApLCBpbmRleCArIDEpO1xuICAgICAgfVxuICAgIH1cbiAgfVxufVxuXG5mdW5jdGlvbiB1cGRhdGVQbGFjZWhvbGRlcihcbiAgICBvcDogaXIuSTE4bkV4cHJlc3Npb25PcCwgdmFsdWU6IGlyLkkxOG5QYXJhbVZhbHVlLFxuICAgIGkxOG5Db250ZXh0czogTWFwPGlyLlhyZWZJZCwgaXIuSTE4bkNvbnRleHRPcD4sXG4gICAgaWN1UGxhY2Vob2xkZXJzOiBNYXA8aXIuWHJlZklkLCBpci5JY3VQbGFjZWhvbGRlck9wPikge1xuICBpZiAob3AuaTE4blBsYWNlaG9sZGVyICE9PSBudWxsKSB7XG4gICAgY29uc3QgaTE4bkNvbnRleHQgPSBpMThuQ29udGV4dHMuZ2V0KG9wLmNvbnRleHQpITtcbiAgICBjb25zdCBwYXJhbXMgPSBvcC5yZXNvbHV0aW9uVGltZSA9PT0gaXIuSTE4blBhcmFtUmVzb2x1dGlvblRpbWUuQ3JlYXRpb24gP1xuICAgICAgICBpMThuQ29udGV4dC5wYXJhbXMgOlxuICAgICAgICBpMThuQ29udGV4dC5wb3N0cHJvY2Vzc2luZ1BhcmFtcztcbiAgICBjb25zdCB2YWx1ZXMgPSBwYXJhbXMuZ2V0KG9wLmkxOG5QbGFjZWhvbGRlcikgfHwgW107XG4gICAgdmFsdWVzLnB1c2godmFsdWUpO1xuICAgIHBhcmFtcy5zZXQob3AuaTE4blBsYWNlaG9sZGVyLCB2YWx1ZXMpO1xuICB9XG4gIGlmIChvcC5pY3VQbGFjZWhvbGRlciAhPT0gbnVsbCkge1xuICAgIGNvbnN0IGljdVBsYWNlaG9sZGVyT3AgPSBpY3VQbGFjZWhvbGRlcnMuZ2V0KG9wLmljdVBsYWNlaG9sZGVyKTtcbiAgICBpY3VQbGFjZWhvbGRlck9wPy5leHByZXNzaW9uUGxhY2Vob2xkZXJzLnB1c2godmFsdWUpO1xuICB9XG59XG4iXX0=
|
|
@@ -6,16 +6,27 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
8
|
import { SecurityContext } from '../../../../core';
|
|
9
|
+
import * as o from '../../../../output/output_ast';
|
|
10
|
+
import { Identifiers } from '../../../../render3/r3_identifiers';
|
|
9
11
|
import { isIframeSecuritySensitiveAttr } from '../../../../schema/dom_security_schema';
|
|
10
12
|
import * as ir from '../../ir';
|
|
13
|
+
import { CompilationJobKind } from '../compilation';
|
|
11
14
|
import { createOpXrefMap } from '../util/elements';
|
|
12
15
|
/**
|
|
13
|
-
*
|
|
16
|
+
* Map of security contexts to their sanitizer function.
|
|
14
17
|
*/
|
|
15
|
-
const
|
|
16
|
-
[SecurityContext.HTML,
|
|
17
|
-
[SecurityContext.
|
|
18
|
-
[SecurityContext.
|
|
18
|
+
const sanitizerFns = new Map([
|
|
19
|
+
[SecurityContext.HTML, Identifiers.sanitizeHtml],
|
|
20
|
+
[SecurityContext.RESOURCE_URL, Identifiers.sanitizeResourceUrl],
|
|
21
|
+
[SecurityContext.SCRIPT, Identifiers.sanitizeScript],
|
|
22
|
+
[SecurityContext.STYLE, Identifiers.sanitizeStyle], [SecurityContext.URL, Identifiers.sanitizeUrl]
|
|
23
|
+
]);
|
|
24
|
+
/**
|
|
25
|
+
* Map of security contexts to their trusted value function.
|
|
26
|
+
*/
|
|
27
|
+
const trustedValueFns = new Map([
|
|
28
|
+
[SecurityContext.HTML, Identifiers.trustConstantHtml],
|
|
29
|
+
[SecurityContext.RESOURCE_URL, Identifiers.trustConstantResourceUrl],
|
|
19
30
|
]);
|
|
20
31
|
/**
|
|
21
32
|
* Resolves sanitization functions for ops that need them.
|
|
@@ -23,24 +34,61 @@ const sanitizers = new Map([
|
|
|
23
34
|
export function resolveSanitizers(job) {
|
|
24
35
|
for (const unit of job.units) {
|
|
25
36
|
const elements = createOpXrefMap(unit);
|
|
26
|
-
|
|
37
|
+
// For normal element bindings we create trusted values for security sensitive constant
|
|
38
|
+
// attributes. However, for host bindings we skip this step (this matches what
|
|
39
|
+
// TemplateDefinitionBuilder does).
|
|
40
|
+
// TODO: Is the TDB behavior correct here?
|
|
41
|
+
if (job.kind !== CompilationJobKind.Host) {
|
|
42
|
+
for (const op of unit.create) {
|
|
43
|
+
if (op.kind === ir.OpKind.ExtractedAttribute) {
|
|
44
|
+
const trustedValueFn = trustedValueFns.get(getOnlySecurityContext(op.securityContext)) ?? null;
|
|
45
|
+
op.trustedValueFn = trustedValueFn !== null ? o.importExpr(trustedValueFn) : null;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
27
49
|
for (const op of unit.update) {
|
|
28
50
|
switch (op.kind) {
|
|
29
51
|
case ir.OpKind.Property:
|
|
30
52
|
case ir.OpKind.Attribute:
|
|
31
|
-
|
|
32
|
-
|
|
53
|
+
case ir.OpKind.HostProperty:
|
|
54
|
+
let sanitizerFn = null;
|
|
55
|
+
if (Array.isArray(op.securityContext) && op.securityContext.length === 2 &&
|
|
56
|
+
op.securityContext.indexOf(SecurityContext.URL) > -1 &&
|
|
57
|
+
op.securityContext.indexOf(SecurityContext.RESOURCE_URL) > -1) {
|
|
58
|
+
// When the host element isn't known, some URL attributes (such as "src" and "href") may
|
|
59
|
+
// be part of multiple different security contexts. In this case we use special
|
|
60
|
+
// sanitization function and select the actual sanitizer at runtime based on a tag name
|
|
61
|
+
// that is provided while invoking sanitization function.
|
|
62
|
+
sanitizerFn = Identifiers.sanitizeUrlOrResourceUrl;
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
sanitizerFn = sanitizerFns.get(getOnlySecurityContext(op.securityContext)) ?? null;
|
|
66
|
+
}
|
|
67
|
+
op.sanitizer = sanitizerFn !== null ? o.importExpr(sanitizerFn) : null;
|
|
33
68
|
// If there was no sanitization function found based on the security context of an
|
|
34
69
|
// attribute/property, check whether this attribute/property is one of the
|
|
35
70
|
// security-sensitive <iframe> attributes (and that the current element is actually an
|
|
36
71
|
// <iframe>).
|
|
37
72
|
if (op.sanitizer === null) {
|
|
38
|
-
|
|
39
|
-
if (
|
|
40
|
-
|
|
73
|
+
let isIframe = false;
|
|
74
|
+
if (job.kind === CompilationJobKind.Host || op.kind === ir.OpKind.HostProperty) {
|
|
75
|
+
// Note: for host bindings defined on a directive, we do not try to find all
|
|
76
|
+
// possible places where it can be matched, so we can not determine whether
|
|
77
|
+
// the host element is an <iframe>. In this case, we just assume it is and append a
|
|
78
|
+
// validation function, which is invoked at runtime and would have access to the
|
|
79
|
+
// underlying DOM element to check if it's an <iframe> and if so - run extra checks.
|
|
80
|
+
isIframe = true;
|
|
41
81
|
}
|
|
42
|
-
|
|
43
|
-
|
|
82
|
+
else {
|
|
83
|
+
// For a normal binding we can just check if the element its on is an iframe.
|
|
84
|
+
const ownerOp = elements.get(op.target);
|
|
85
|
+
if (ownerOp === undefined || !ir.isElementOrContainerOp(ownerOp)) {
|
|
86
|
+
throw Error('Property should have an element-like owner');
|
|
87
|
+
}
|
|
88
|
+
isIframe = isIframeElement(ownerOp);
|
|
89
|
+
}
|
|
90
|
+
if (isIframe && isIframeSecuritySensitiveAttr(op.name)) {
|
|
91
|
+
op.sanitizer = o.importExpr(Identifiers.validateIframeAttribute);
|
|
44
92
|
}
|
|
45
93
|
}
|
|
46
94
|
break;
|
|
@@ -54,4 +102,20 @@ export function resolveSanitizers(job) {
|
|
|
54
102
|
function isIframeElement(op) {
|
|
55
103
|
return op.kind === ir.OpKind.ElementStart && op.tag?.toLowerCase() === 'iframe';
|
|
56
104
|
}
|
|
57
|
-
|
|
105
|
+
/**
|
|
106
|
+
* Asserts that there is only a single security context and returns it.
|
|
107
|
+
*/
|
|
108
|
+
function getOnlySecurityContext(securityContext) {
|
|
109
|
+
if (Array.isArray(securityContext)) {
|
|
110
|
+
if (securityContext.length > 1) {
|
|
111
|
+
// TODO: What should we do here? TDB just took the first one, but this feels like something we
|
|
112
|
+
// would want to know about and create a special case for like we did for Url/ResourceUrl. My
|
|
113
|
+
// guess is that, outside of the Url/ResourceUrl case, this never actually happens. If there
|
|
114
|
+
// do turn out to be other cases, throwing an error until we can address it feels safer.
|
|
115
|
+
throw Error(`AssertionError: Ambiguous security context`);
|
|
116
|
+
}
|
|
117
|
+
return securityContext[0] || SecurityContext.NONE;
|
|
118
|
+
}
|
|
119
|
+
return securityContext;
|
|
120
|
+
}
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolve_sanitizers.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/resolve_sanitizers.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 {SecurityContext} from '../../../../core';\nimport * as o from '../../../../output/output_ast';\nimport {Identifiers} from '../../../../render3/r3_identifiers';\nimport {isIframeSecuritySensitiveAttr} from '../../../../schema/dom_security_schema';\nimport * as ir from '../../ir';\nimport {CompilationJob, CompilationJobKind} from '../compilation';\nimport {createOpXrefMap} from '../util/elements';\n\n/**\n * Map of security contexts to their sanitizer function.\n */\nconst sanitizerFns = new Map<SecurityContext, o.ExternalReference>([\n  [SecurityContext.HTML, Identifiers.sanitizeHtml],\n  [SecurityContext.RESOURCE_URL, Identifiers.sanitizeResourceUrl],\n  [SecurityContext.SCRIPT, Identifiers.sanitizeScript],\n  [SecurityContext.STYLE, Identifiers.sanitizeStyle], [SecurityContext.URL, Identifiers.sanitizeUrl]\n]);\n\n/**\n * Map of security contexts to their trusted value function.\n */\nconst trustedValueFns = new Map<SecurityContext, o.ExternalReference>([\n  [SecurityContext.HTML, Identifiers.trustConstantHtml],\n  [SecurityContext.RESOURCE_URL, Identifiers.trustConstantResourceUrl],\n]);\n\n/**\n * Resolves sanitization functions for ops that need them.\n */\nexport function resolveSanitizers(job: CompilationJob): void {\n  for (const unit of job.units) {\n    const elements = createOpXrefMap(unit);\n\n    // For normal element bindings we create trusted values for security sensitive constant\n    // attributes. However, for host bindings we skip this step (this matches what\n    // TemplateDefinitionBuilder does).\n    // TODO: Is the TDB behavior correct here?\n    if (job.kind !== CompilationJobKind.Host) {\n      for (const op of unit.create) {\n        if (op.kind === ir.OpKind.ExtractedAttribute) {\n          const trustedValueFn =\n              trustedValueFns.get(getOnlySecurityContext(op.securityContext)) ?? null;\n          op.trustedValueFn = trustedValueFn !== null ? o.importExpr(trustedValueFn) : null;\n        }\n      }\n    }\n\n    for (const op of unit.update) {\n      switch (op.kind) {\n        case ir.OpKind.Property:\n        case ir.OpKind.Attribute:\n        case ir.OpKind.HostProperty:\n          let sanitizerFn: o.ExternalReference|null = null;\n          if (Array.isArray(op.securityContext) && op.securityContext.length === 2 &&\n              op.securityContext.indexOf(SecurityContext.URL) > -1 &&\n              op.securityContext.indexOf(SecurityContext.RESOURCE_URL) > -1) {\n            // When the host element isn't known, some URL attributes (such as \"src\" and \"href\") may\n            // be part of multiple different security contexts. In this case we use special\n            // sanitization function and select the actual sanitizer at runtime based on a tag name\n            // that is provided while invoking sanitization function.\n            sanitizerFn = Identifiers.sanitizeUrlOrResourceUrl;\n          } else {\n            sanitizerFn = sanitizerFns.get(getOnlySecurityContext(op.securityContext)) ?? null;\n          }\n          op.sanitizer = sanitizerFn !== null ? o.importExpr(sanitizerFn) : null;\n\n          // If there was no sanitization function found based on the security context of an\n          // attribute/property, check whether this attribute/property is one of the\n          // security-sensitive <iframe> attributes (and that the current element is actually an\n          // <iframe>).\n          if (op.sanitizer === null) {\n            let isIframe = false;\n            if (job.kind === CompilationJobKind.Host || op.kind === ir.OpKind.HostProperty) {\n              // Note: for host bindings defined on a directive, we do not try to find all\n              // possible places where it can be matched, so we can not determine whether\n              // the host element is an <iframe>. In this case, we just assume it is and append a\n              // validation function, which is invoked at runtime and would have access to the\n              // underlying DOM element to check if it's an <iframe> and if so - run extra checks.\n              isIframe = true;\n            } else {\n              // For a normal binding we can just check if the element its on is an iframe.\n              const ownerOp = elements.get(op.target);\n              if (ownerOp === undefined || !ir.isElementOrContainerOp(ownerOp)) {\n                throw Error('Property should have an element-like owner');\n              }\n              isIframe = isIframeElement(ownerOp);\n            }\n            if (isIframe && isIframeSecuritySensitiveAttr(op.name)) {\n              op.sanitizer = o.importExpr(Identifiers.validateIframeAttribute);\n            }\n          }\n          break;\n      }\n    }\n  }\n}\n\n/**\n * Checks whether the given op represents an iframe element.\n */\nfunction isIframeElement(op: ir.ElementOrContainerOps): boolean {\n  return op.kind === ir.OpKind.ElementStart && op.tag?.toLowerCase() === 'iframe';\n}\n\n/**\n * Asserts that there is only a single security context and returns it.\n */\nfunction getOnlySecurityContext(securityContext: SecurityContext|\n                                SecurityContext[]): SecurityContext {\n  if (Array.isArray(securityContext)) {\n    if (securityContext.length > 1) {\n      // TODO: What should we do here? TDB just took the first one, but this feels like something we\n      // would want to know about and create a special case for like we did for Url/ResourceUrl. My\n      // guess is that, outside of the Url/ResourceUrl case, this never actually happens. If there\n      // do turn out to be other cases, throwing an error until we can address it feels safer.\n      throw Error(`AssertionError: Ambiguous security context`);\n    }\n    return securityContext[0] || SecurityContext.NONE;\n  }\n  return securityContext;\n}\n"]}
|
|
@@ -53,8 +53,10 @@ export function allocateSlots(job) {
|
|
|
53
53
|
// operation itself, so it can be emitted later.
|
|
54
54
|
const childView = job.views.get(op.xref);
|
|
55
55
|
op.decls = childView.decls;
|
|
56
|
+
// TODO: currently we handle the decls for the RepeaterCreate empty template in the reify
|
|
57
|
+
// phase. We should handle that here instead.
|
|
56
58
|
}
|
|
57
59
|
}
|
|
58
60
|
}
|
|
59
61
|
}
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xvdF9hbGxvY2F0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29tcGlsZXIvc3JjL3RlbXBsYXRlL3BpcGVsaW5lL3NyYy9waGFzZXMvc2xvdF9hbGxvY2F0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sS0FBSyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRy9COzs7Ozs7O0dBT0c7QUFDSCxNQUFNLFVBQVUsYUFBYSxDQUFDLEdBQTRCO0lBQ3hELGtHQUFrRztJQUNsRyw2RkFBNkY7SUFDN0YsK0ZBQStGO0lBQy9GLGFBQWE7SUFDYixNQUFNLE9BQU8sR0FBRyxJQUFJLEdBQUcsRUFBcUIsQ0FBQztJQUU3Qyw4REFBOEQ7SUFDOUQsS0FBSyxNQUFNLElBQUksSUFBSSxHQUFHLENBQUMsS0FBSyxFQUFFO1FBQzVCLDRFQUE0RTtRQUM1RSxJQUFJLFNBQVMsR0FBRyxDQUFDLENBQUM7UUFFbEIsS0FBSyxNQUFNLEVBQUUsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQzVCLHVEQUF1RDtZQUN2RCxJQUFJLENBQUMsRUFBRSxDQUFDLG9CQUFvQixDQUFDLEVBQUUsQ0FBQyxFQUFFO2dCQUNoQyxTQUFTO2FBQ1Y7WUFFRCx3RUFBd0U7WUFDeEUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEdBQUcsU0FBUyxDQUFDO1lBRTNCLGdEQUFnRDtZQUNoRCxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUVyQyw0RkFBNEY7WUFDNUYscUJBQXFCO1lBQ3JCLFNBQVMsSUFBSSxFQUFFLENBQUMsWUFBWSxDQUFDO1NBQzlCO1FBRUQsK0ZBQStGO1FBQy9GLHlFQUF5RTtRQUN6RSxJQUFJLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQztLQUN4QjtJQUVELDhGQUE4RjtJQUM5RiwrRUFBK0U7SUFDL0UsOEVBQThFO0lBQzlFLDRGQUE0RjtJQUM1Rix5RkFBeUY7SUFDekYsS0FBSyxNQUFNLElBQUksSUFBSSxHQUFHLENBQUMsS0FBSyxFQUFFO1FBQzVCLEtBQUssTUFBTSxFQUFFLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxFQUFFO1lBQzNCLElBQUksRUFBRSxDQUFDLElBQUksS0FBSyxFQUFFLENBQUMsTUFBTSxDQUFDLFFBQVEsSUFBSSxFQUFFLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUMsY0FBYyxFQUFFO2dCQUMxRSxtRkFBbUY7Z0JBQ25GLGdEQUFnRDtnQkFDaEQsTUFBTSxTQUFTLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBRSxDQUFDO2dCQUMxQyxFQUFFLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUM7Z0JBRTNCLHlGQUF5RjtnQkFDekYsNkNBQTZDO2FBQzlDO1NBQ0Y7S0FDRjtBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0ICogYXMgaXIgZnJvbSAnLi4vLi4vaXInO1xuaW1wb3J0IHR5cGUge0NvbXBvbmVudENvbXBpbGF0aW9uSm9ifSBmcm9tICcuLi9jb21waWxhdGlvbic7XG5cbi8qKlxuICogQXNzaWduIGRhdGEgc2xvdHMgZm9yIGFsbCBvcGVyYXRpb25zIHdoaWNoIGltcGxlbWVudCBgQ29uc3VtZXNTbG90T3BUcmFpdGAsIGFuZCBwcm9wYWdhdGUgdGhlXG4gKiBhc3NpZ25lZCBkYXRhIHNsb3RzIG9mIHRob3NlIG9wZXJhdGlvbnMgdG8gYW55IGV4cHJlc3Npb25zIHdoaWNoIHJlZmVyZW5jZSB0aGVtIHZpYVxuICogYFVzZXNTbG90SW5kZXhUcmFpdGAuXG4gKlxuICogVGhpcyBwaGFzZSBpcyBhbHNvIHJlc3BvbnNpYmxlIGZvciBjb3VudGluZyB0aGUgbnVtYmVyIG9mIHNsb3RzIHVzZWQgZm9yIGVhY2ggdmlldyAoaXRzIGBkZWNsc2ApXG4gKiBhbmQgcHJvcGFnYXRpbmcgdGhhdCBudW1iZXIgaW50byB0aGUgYFRlbXBsYXRlYCBvcGVyYXRpb25zIHdoaWNoIGRlY2xhcmUgZW1iZWRkZWQgdmlld3MuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBhbGxvY2F0ZVNsb3RzKGpvYjogQ29tcG9uZW50Q29tcGlsYXRpb25Kb2IpOiB2b2lkIHtcbiAgLy8gTWFwIG9mIGFsbCBkZWNsYXJhdGlvbnMgaW4gYWxsIHZpZXdzIHdpdGhpbiB0aGUgY29tcG9uZW50IHdoaWNoIHJlcXVpcmUgYW4gYXNzaWduZWQgc2xvdCBpbmRleC5cbiAgLy8gVGhpcyBtYXAgbmVlZHMgdG8gYmUgZ2xvYmFsIChhY3Jvc3MgYWxsIHZpZXdzIHdpdGhpbiB0aGUgY29tcG9uZW50KSBzaW5jZSBpdCdzIHBvc3NpYmxlIHRvXG4gIC8vIHJlZmVyZW5jZSBhIHNsb3QgZnJvbSBvbmUgdmlldyBmcm9tIGFuIGV4cHJlc3Npb24gd2l0aGluIGFub3RoZXIgKGUuZy4gbG9jYWwgcmVmZXJlbmNlcyB3b3JrXG4gIC8vIHRoaXMgd2F5KS5cbiAgY29uc3Qgc2xvdE1hcCA9IG5ldyBNYXA8aXIuWHJlZklkLCBudW1iZXI+KCk7XG5cbiAgLy8gUHJvY2VzcyBhbGwgdmlld3MgaW4gdGhlIGNvbXBvbmVudCBhbmQgYXNzaWduIHNsb3QgaW5kZXhlcy5cbiAgZm9yIChjb25zdCB1bml0IG9mIGpvYi51bml0cykge1xuICAgIC8vIFNsb3QgaW5kaWNlcyBzdGFydCBhdCAwIGZvciBlYWNoIHZpZXcgKGFuZCBhcmUgbm90IHVuaXF1ZSBiZXR3ZWVuIHZpZXdzKS5cbiAgICBsZXQgc2xvdENvdW50ID0gMDtcblxuICAgIGZvciAoY29uc3Qgb3Agb2YgdW5pdC5jcmVhdGUpIHtcbiAgICAgIC8vIE9ubHkgY29uc2lkZXIgZGVjbGFyYXRpb25zIHdoaWNoIGNvbnN1bWUgZGF0YSBzbG90cy5cbiAgICAgIGlmICghaXIuaGFzQ29uc3VtZXNTbG90VHJhaXQob3ApKSB7XG4gICAgICAgIGNvbnRpbnVlO1xuICAgICAgfVxuXG4gICAgICAvLyBBc3NpZ24gc2xvdHMgdG8gdGhpcyBkZWNsYXJhdGlvbiBzdGFydGluZyBhdCB0aGUgY3VycmVudCBgc2xvdENvdW50YC5cbiAgICAgIG9wLmhhbmRsZS5zbG90ID0gc2xvdENvdW50O1xuXG4gICAgICAvLyBBbmQgdHJhY2sgaXRzIGFzc2lnbmVkIHNsb3QgaW4gdGhlIGBzbG90TWFwYC5cbiAgICAgIHNsb3RNYXAuc2V0KG9wLnhyZWYsIG9wLmhhbmRsZS5zbG90KTtcblxuICAgICAgLy8gRWFjaCBkZWNsYXJhdGlvbiBtYXkgdXNlIG1vcmUgdGhhbiAxIHNsb3QsIHNvIGluY3JlbWVudCBgc2xvdENvdW50YCB0byByZXNlcnZlIHRoZSBudW1iZXJcbiAgICAgIC8vIG9mIHNsb3RzIHJlcXVpcmVkLlxuICAgICAgc2xvdENvdW50ICs9IG9wLm51bVNsb3RzVXNlZDtcbiAgICB9XG5cbiAgICAvLyBSZWNvcmQgdGhlIHRvdGFsIG51bWJlciBvZiBzbG90cyB1c2VkIG9uIHRoZSB2aWV3IGl0c2VsZi4gVGhpcyB3aWxsIGxhdGVyIGJlIHByb3BhZ2F0ZWQgaW50b1xuICAgIC8vIGBpci5UZW1wbGF0ZU9wYHMgd2hpY2ggZGVjbGFyZSB0aG9zZSB2aWV3cyAoZXhjZXB0IGZvciB0aGUgcm9vdCB2aWV3KS5cbiAgICB1bml0LmRlY2xzID0gc2xvdENvdW50O1xuICB9XG5cbiAgLy8gQWZ0ZXIgc2xvdCBhc3NpZ25tZW50LCBgc2xvdE1hcGAgbm93IGNvbnRhaW5zIHNsb3QgYXNzaWdubWVudHMgZm9yIGV2ZXJ5IGRlY2xhcmF0aW9uIGluIHRoZVxuICAvLyB3aG9sZSB0ZW1wbGF0ZSwgYWNyb3NzIGFsbCB2aWV3cy4gTmV4dCwgbG9vayBmb3IgZXhwcmVzc2lvbnMgd2hpY2ggaW1wbGVtZW50XG4gIC8vIGBVc2VzU2xvdEluZGV4RXhwclRyYWl0YCBhbmQgcHJvcGFnYXRlIHRoZSBhc3NpZ25lZCBzbG90IGluZGV4ZXMgaW50byB0aGVtLlxuICAvLyBBZGRpdGlvbmFsbHksIHRoaXMgc2Vjb25kIHNjYW4gYWxsb3dzIHVzIHRvIGZpbmQgYGlyLlRlbXBsYXRlT3BgcyB3aGljaCBkZWNsYXJlIHZpZXdzIGFuZFxuICAvLyBwcm9wYWdhdGUgdGhlIG51bWJlciBvZiBzbG90cyB1c2VkIGZvciBlYWNoIHZpZXcgaW50byB0aGUgb3BlcmF0aW9uIHdoaWNoIGRlY2xhcmVzIGl0LlxuICBmb3IgKGNvbnN0IHVuaXQgb2Ygam9iLnVuaXRzKSB7XG4gICAgZm9yIChjb25zdCBvcCBvZiB1bml0Lm9wcygpKSB7XG4gICAgICBpZiAob3Aua2luZCA9PT0gaXIuT3BLaW5kLlRlbXBsYXRlIHx8IG9wLmtpbmQgPT09IGlyLk9wS2luZC5SZXBlYXRlckNyZWF0ZSkge1xuICAgICAgICAvLyBSZWNvcmQgdGhlIG51bWJlciBvZiBzbG90cyB1c2VkIGJ5IHRoZSB2aWV3IHRoaXMgYGlyLlRlbXBsYXRlT3BgIGRlY2xhcmVzIGluIHRoZVxuICAgICAgICAvLyBvcGVyYXRpb24gaXRzZWxmLCBzbyBpdCBjYW4gYmUgZW1pdHRlZCBsYXRlci5cbiAgICAgICAgY29uc3QgY2hpbGRWaWV3ID0gam9iLnZpZXdzLmdldChvcC54cmVmKSE7XG4gICAgICAgIG9wLmRlY2xzID0gY2hpbGRWaWV3LmRlY2xzO1xuXG4gICAgICAgIC8vIFRPRE86IGN1cnJlbnRseSB3ZSBoYW5kbGUgdGhlIGRlY2xzIGZvciB0aGUgUmVwZWF0ZXJDcmVhdGUgZW1wdHkgdGVtcGxhdGUgaW4gdGhlIHJlaWZ5XG4gICAgICAgIC8vIHBoYXNlLiBXZSBzaG91bGQgaGFuZGxlIHRoYXQgaGVyZSBpbnN0ZWFkLlxuICAgICAgfVxuICAgIH1cbiAgfVxufVxuIl19
|