@angular/core 17.0.5 → 17.0.7

package/schematics/ng-generate/control-flow-migration/bundle.js

@@ -3430,6 +3430,39 @@ function getInjectFn(target) {
   }
 }
 
+// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/ml_parser/tags.mjs
+var TagContentType;
+(function(TagContentType2) {
+  TagContentType2[TagContentType2["RAW_TEXT"] = 0] = "RAW_TEXT";
+  TagContentType2[TagContentType2["ESCAPABLE_RAW_TEXT"] = 1] = "ESCAPABLE_RAW_TEXT";
+  TagContentType2[TagContentType2["PARSABLE_DATA"] = 2] = "PARSABLE_DATA";
+})(TagContentType || (TagContentType = {}));
+function splitNsName(elementName) {
+  if (elementName[0] != ":") {
+    return [null, elementName];
+  }
+  const colonIndex = elementName.indexOf(":", 1);
+  if (colonIndex === -1) {
+    throw new Error(`Unsupported format "${elementName}" expecting ":namespace:name"`);
+  }
+  return [elementName.slice(1, colonIndex), elementName.slice(colonIndex + 1)];
+}
+function isNgContainer(tagName) {
+  return splitNsName(tagName)[1] === "ng-container";
+}
+function isNgContent(tagName) {
+  return splitNsName(tagName)[1] === "ng-content";
+}
+function isNgTemplate(tagName) {
+  return splitNsName(tagName)[1] === "ng-template";
+}
+function getNsPrefix(fullName) {
+  return fullName === null ? null : splitNsName(fullName)[0];
+}
+function mergeNsAndName(prefix, localName) {
+  return prefix ? `:${prefix}:${localName}` : localName;
+}
+
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/render3/r3_ast.mjs
 var Comment = class {
   constructor(value, sourceSpan) {
@@ -4273,6 +4306,23 @@ var DefinitionMap = class {
     return literalMap(this.values);
   }
 };
+function createCssSelectorFromNode(node) {
+  const elementName = node instanceof Element ? node.name : "ng-template";
+  const attributes = getAttrsForDirectiveMatching(node);
+  const cssSelector = new CssSelector();
+  const elementNameNoNs = splitNsName(elementName)[1];
+  cssSelector.setElement(elementNameNoNs);
+  Object.getOwnPropertyNames(attributes).forEach((name) => {
+    const nameNoNs = splitNsName(name)[1];
+    const value = attributes[name];
+    cssSelector.addAttribute(nameNoNs, value);
+    if (name.toLowerCase() === "class") {
+      const classes = value.trim().split(/\s+/);
+      classes.forEach((className) => cssSelector.addClassName(className));
+    }
+  });
+  return cssSelector;
+}
 function getAttrsForDirectiveMatching(elOrTpl) {
   const attributesMap = {};
   if (elOrTpl instanceof Template && elOrTpl.tagName !== "ng-template") {
@@ -6990,6 +7040,7 @@ var OpKind;
   OpKind2[OpKind2["IcuStart"] = 41] = "IcuStart";
   OpKind2[OpKind2["IcuEnd"] = 42] = "IcuEnd";
   OpKind2[OpKind2["I18nContext"] = 43] = "I18nContext";
+  OpKind2[OpKind2["I18nAttributes"] = 44] = "I18nAttributes";
 })(OpKind || (OpKind = {}));
 var ExpressionKind;
 (function(ExpressionKind2) {
@@ -7014,10 +7065,11 @@ var ExpressionKind;
   ExpressionKind2[ExpressionKind2["AssignTemporaryExpr"] = 18] = "AssignTemporaryExpr";
   ExpressionKind2[ExpressionKind2["ReadTemporaryExpr"] = 19] = "ReadTemporaryExpr";
   ExpressionKind2[ExpressionKind2["SanitizerExpr"] = 20] = "SanitizerExpr";
-  ExpressionKind2[ExpressionKind2["SlotLiteralExpr"] = 21] = "SlotLiteralExpr";
-  ExpressionKind2[ExpressionKind2["ConditionalCase"] = 22] = "ConditionalCase";
-  ExpressionKind2[ExpressionKind2["DerivedRepeaterVar"] = 23] = "DerivedRepeaterVar";
-  ExpressionKind2[ExpressionKind2["ConstCollected"] = 24] = "ConstCollected";
+  ExpressionKind2[ExpressionKind2["TrustedValueFnExpr"] = 21] = "TrustedValueFnExpr";
+  ExpressionKind2[ExpressionKind2["SlotLiteralExpr"] = 22] = "SlotLiteralExpr";
+  ExpressionKind2[ExpressionKind2["ConditionalCase"] = 23] = "ConditionalCase";
+  ExpressionKind2[ExpressionKind2["DerivedRepeaterVar"] = 24] = "DerivedRepeaterVar";
+  ExpressionKind2[ExpressionKind2["ConstCollected"] = 25] = "ConstCollected";
 })(ExpressionKind || (ExpressionKind = {}));
 var VariableFlags;
 (function(VariableFlags2) {
@@ -7036,15 +7088,6 @@ var CompatibilityMode;
   CompatibilityMode2[CompatibilityMode2["Normal"] = 0] = "Normal";
   CompatibilityMode2[CompatibilityMode2["TemplateDefinitionBuilder"] = 1] = "TemplateDefinitionBuilder";
 })(CompatibilityMode || (CompatibilityMode = {}));
-var SanitizerFn;
-(function(SanitizerFn2) {
-  SanitizerFn2[SanitizerFn2["Html"] = 0] = "Html";
-  SanitizerFn2[SanitizerFn2["Script"] = 1] = "Script";
-  SanitizerFn2[SanitizerFn2["Style"] = 2] = "Style";
-  SanitizerFn2[SanitizerFn2["Url"] = 3] = "Url";
-  SanitizerFn2[SanitizerFn2["ResourceUrl"] = 4] = "ResourceUrl";
-  SanitizerFn2[SanitizerFn2["IframeAttribute"] = 5] = "IframeAttribute";
-})(SanitizerFn || (SanitizerFn = {}));
 var DeferSecondaryKind;
 (function(DeferSecondaryKind2) {
   DeferSecondaryKind2[DeferSecondaryKind2["Loading"] = 0] = "Loading";
@@ -7066,6 +7109,11 @@ var I18nParamResolutionTime;
   I18nParamResolutionTime2[I18nParamResolutionTime2["Creation"] = 0] = "Creation";
   I18nParamResolutionTime2[I18nParamResolutionTime2["Postproccessing"] = 1] = "Postproccessing";
 })(I18nParamResolutionTime || (I18nParamResolutionTime = {}));
+var I18nExpressionFor;
+(function(I18nExpressionFor2) {
+  I18nExpressionFor2[I18nExpressionFor2["I18nText"] = 0] = "I18nText";
+  I18nExpressionFor2[I18nExpressionFor2["I18nAttribute"] = 1] = "I18nAttribute";
+})(I18nExpressionFor || (I18nExpressionFor = {}));
 var I18nParamValueFlags;
 (function(I18nParamValueFlags2) {
   I18nParamValueFlags2[I18nParamValueFlags2["None"] = 0] = "None";
@@ -7101,7 +7149,14 @@ var I18nContextKind;
 (function(I18nContextKind2) {
   I18nContextKind2[I18nContextKind2["RootI18n"] = 0] = "RootI18n";
   I18nContextKind2[I18nContextKind2["Icu"] = 1] = "Icu";
+  I18nContextKind2[I18nContextKind2["Attr"] = 2] = "Attr";
 })(I18nContextKind || (I18nContextKind = {}));
+var TemplateKind;
+(function(TemplateKind2) {
+  TemplateKind2[TemplateKind2["NgTemplate"] = 0] = "NgTemplate";
+  TemplateKind2[TemplateKind2["Structural"] = 1] = "Structural";
+  TemplateKind2[TemplateKind2["Block"] = 2] = "Block";
+})(TemplateKind || (TemplateKind = {}));
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/ir/src/traits.mjs
 var ConsumesSlot = Symbol("ConsumesSlot");
@@ -7158,22 +7213,25 @@ var NEW_OP = {
 };
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/ir/src/ops/update.mjs
-function createInterpolateTextOp(xref, interpolation, i18nPlaceholders, sourceSpan) {
+function createInterpolateTextOp(xref, interpolation, sourceSpan) {
   return __spreadValues(__spreadValues(__spreadValues({
     kind: OpKind.InterpolateText,
     target: xref,
     interpolation,
-    i18nPlaceholders,
     sourceSpan
   }, TRAIT_DEPENDS_ON_SLOT_CONTEXT), TRAIT_CONSUMES_VARS), NEW_OP);
 }
 var Interpolation2 = class {
-  constructor(strings, expressions) {
+  constructor(strings, expressions, i18nPlaceholders) {
     this.strings = strings;
     this.expressions = expressions;
+    this.i18nPlaceholders = i18nPlaceholders;
+    if (i18nPlaceholders.length !== 0 && i18nPlaceholders.length !== expressions.length) {
+      throw new Error(`Expected ${expressions.length} placeholders to match interpolation expression count, but got ${i18nPlaceholders.length}`);
+    }
   }
 };
-function createBindingOp(target, kind, name, expression, unit, securityContext, isTextAttribute, isTemplate, sourceSpan) {
+function createBindingOp(target, kind, name, expression, unit, securityContext, isTextAttribute, isStructuralTemplateAttribute, templateKind, i18nMessage, sourceSpan) {
   return __spreadValues({
     kind: OpKind.Binding,
     bindingKind: kind,
@@ -7183,11 +7241,14 @@ function createBindingOp(target, kind, name, expression, unit, securityContext,
     unit,
     securityContext,
     isTextAttribute,
-    isTemplate,
+    isStructuralTemplateAttribute,
+    templateKind,
+    i18nContext: null,
+    i18nMessage,
     sourceSpan
   }, NEW_OP);
 }
-function createPropertyOp(target, name, expression, isAnimationTrigger, securityContext, isTemplate, sourceSpan) {
+function createPropertyOp(target, name, expression, isAnimationTrigger, securityContext, isStructuralTemplateAttribute, templateKind, i18nContext, i18nMessage, sourceSpan) {
   return __spreadValues(__spreadValues(__spreadValues({
     kind: OpKind.Property,
     target,
@@ -7196,7 +7257,10 @@ function createPropertyOp(target, name, expression, isAnimationTrigger, security
     isAnimationTrigger,
     securityContext,
     sanitizer: null,
-    isTemplate,
+    isStructuralTemplateAttribute,
+    templateKind,
+    i18nContext,
+    i18nMessage,
     sourceSpan
   }, TRAIT_DEPENDS_ON_SLOT_CONTEXT), TRAIT_CONSUMES_VARS), NEW_OP);
 }
@@ -7235,7 +7299,7 @@ function createClassMapOp(xref, expression, sourceSpan) {
     sourceSpan
   }, TRAIT_DEPENDS_ON_SLOT_CONTEXT), TRAIT_CONSUMES_VARS), NEW_OP);
 }
-function createAttributeOp(target, name, expression, securityContext, isTextAttribute, isTemplate, sourceSpan) {
+function createAttributeOp(target, name, expression, securityContext, isTextAttribute, isStructuralTemplateAttribute, templateKind, i18nMessage, sourceSpan) {
   return __spreadValues(__spreadValues(__spreadValues({
     kind: OpKind.Attribute,
     target,
@@ -7244,7 +7308,10 @@ function createAttributeOp(target, name, expression, securityContext, isTextAttr
     securityContext,
     sanitizer: null,
     isTextAttribute,
-    isTemplate,
+    isStructuralTemplateAttribute,
+    templateKind,
+    i18nContext: null,
+    i18nMessage,
     sourceSpan
   }, TRAIT_DEPENDS_ON_SLOT_CONTEXT), TRAIT_CONSUMES_VARS), NEW_OP);
 }
@@ -7285,22 +7352,25 @@ function createDeferWhenOp(target, expr, prefetch, sourceSpan) {
     sourceSpan
   }, NEW_OP), TRAIT_DEPENDS_ON_SLOT_CONTEXT);
 }
-function createI18nExpressionOp(context, target, handle, expression, i18nPlaceholder, resolutionTime, sourceSpan) {
+function createI18nExpressionOp(context, target, i18nOwner, handle, expression, i18nPlaceholder, resolutionTime, usage, name, sourceSpan) {
   return __spreadValues(__spreadValues(__spreadValues({
     kind: OpKind.I18nExpression,
     context,
     target,
+    i18nOwner,
     handle,
     expression,
     i18nPlaceholder,
     resolutionTime,
+    usage,
+    name,
     sourceSpan
   }, NEW_OP), TRAIT_CONSUMES_VARS), TRAIT_DEPENDS_ON_SLOT_CONTEXT);
 }
-function createI18nApplyOp(target, handle, sourceSpan) {
+function createI18nApplyOp(owner, handle, sourceSpan) {
   return __spreadValues({
     kind: OpKind.I18nApply,
-    target,
+    owner,
     handle,
     sourceSpan
   }, NEW_OP);
@@ -7837,26 +7907,6 @@ var ReadTemporaryExpr = class extends ExpressionBase {
     return r;
   }
 };
-var SanitizerExpr = class extends ExpressionBase {
-  constructor(fn2) {
-    super();
-    this.fn = fn2;
-    this.kind = ExpressionKind.SanitizerExpr;
-  }
-  visitExpression(visitor, context) {
-  }
-  isEquivalent(e) {
-    return e instanceof SanitizerExpr && e.fn === this.fn;
-  }
-  isConstant() {
-    return true;
-  }
-  clone() {
-    return new SanitizerExpr(this.fn);
-  }
-  transformInternalExpressions() {
-  }
-};
 var SlotLiteralExpr = class extends ExpressionBase {
   constructor(slot) {
     super();
@@ -7975,7 +8025,6 @@ function transformExpressionsInOp(op, transform2, flags) {
     case OpKind.ClassProp:
     case OpKind.ClassMap:
     case OpKind.Binding:
-    case OpKind.HostProperty:
       if (op.expression instanceof Interpolation2) {
         transformExpressionsInInterpolation(op.expression, transform2, flags);
       } else {
@@ -7983,6 +8032,7 @@ function transformExpressionsInOp(op, transform2, flags) {
       }
       break;
     case OpKind.Property:
+    case OpKind.HostProperty:
     case OpKind.Attribute:
       if (op.expression instanceof Interpolation2) {
         transformExpressionsInInterpolation(op.expression, transform2, flags);
@@ -8024,6 +8074,7 @@ function transformExpressionsInOp(op, transform2, flags) {
       break;
     case OpKind.ExtractedAttribute:
       op.expression = op.expression && transformExpressionsInExpression(op.expression, transform2, flags);
+      op.trustedValueFn = op.trustedValueFn && transformExpressionsInExpression(op.trustedValueFn, transform2, flags);
       break;
     case OpKind.RepeaterCreate:
       op.track = transformExpressionsInExpression(op.track, transform2, flags);
@@ -8076,6 +8127,7 @@ function transformExpressionsInOp(op, transform2, flags) {
     case OpKind.ProjectionDef:
     case OpKind.Template:
     case OpKind.Text:
+    case OpKind.I18nAttributes:
       break;
     default:
       throw new Error(`AssertionError: transformExpressionsInOp doesn't handle ${OpKind[op.kind]}`);
@@ -8087,6 +8139,8 @@ function transformExpressionsInExpression(expr, transform2, flags) {
   } else if (expr instanceof BinaryOperatorExpr) {
     expr.lhs = transformExpressionsInExpression(expr.lhs, transform2, flags);
     expr.rhs = transformExpressionsInExpression(expr.rhs, transform2, flags);
+  } else if (expr instanceof UnaryOperatorExpr) {
+    expr.expr = transformExpressionsInExpression(expr.expr, transform2, flags);
   } else if (expr instanceof ReadPropExpr) {
     expr.receiver = transformExpressionsInExpression(expr.receiver, transform2, flags);
   } else if (expr instanceof ReadKeyExpr) {
@@ -8126,6 +8180,12 @@ function transformExpressionsInExpression(expr, transform2, flags) {
     for (let i = 0; i < expr.expressions.length; i++) {
       expr.expressions[i] = transformExpressionsInExpression(expr.expressions[i], transform2, flags);
     }
+  } else if (expr instanceof NotExpr) {
+    expr.condition = transformExpressionsInExpression(expr.condition, transform2, flags);
+  } else if (expr instanceof TaggedTemplateExpr) {
+    expr.tag = transformExpressionsInExpression(expr.tag, transform2, flags);
+    expr.template.expressions = expr.template.expressions.map((e) => transformExpressionsInExpression(e, transform2, flags));
+  } else if (expr instanceof WrappedNodeExpr) {
   } else if (expr instanceof ReadVarExpr || expr instanceof ExternalExpr || expr instanceof LiteralExpr) {
   } else {
     throw new Error(`Unhandled expression kind: ${expr.constructor.name}`);
@@ -8381,10 +8441,11 @@ function createElementStartOp(tag, xref, namespace, i18nPlaceholder, sourceSpan)
     sourceSpan
   }, TRAIT_CONSUMES_SLOT), NEW_OP);
 }
-function createTemplateOp(xref, tag, functionNameSuffix, namespace, i18nPlaceholder, sourceSpan) {
+function createTemplateOp(xref, templateKind, tag, functionNameSuffix, namespace, i18nPlaceholder, sourceSpan) {
   return __spreadValues(__spreadValues({
     kind: OpKind.Template,
     xref,
+    templateKind,
     attributes: null,
     tag,
     handle: new SlotHandle(),
@@ -8398,7 +8459,7 @@ function createTemplateOp(xref, tag, functionNameSuffix, namespace, i18nPlacehol
     sourceSpan
   }, TRAIT_CONSUMES_SLOT), NEW_OP);
 }
-function createRepeaterCreateOp(primaryView, emptyView, tag, track, varNames, sourceSpan) {
+function createRepeaterCreateOp(primaryView, emptyView, tag, track, varNames, i18nPlaceholder, emptyI18nPlaceholder, sourceSpan) {
   return __spreadProps(__spreadValues(__spreadValues({
     kind: OpKind.RepeaterCreate,
     attributes: null,
@@ -8416,6 +8477,8 @@ function createRepeaterCreateOp(primaryView, emptyView, tag, track, varNames, so
     vars: null,
     varNames,
     usesComponentInstance: false,
+    i18nPlaceholder,
+    emptyI18nPlaceholder,
     sourceSpan
   }, TRAIT_CONSUMES_SLOT), NEW_OP), {
     numSlotsUsed: emptyView === null ? 2 : 3
@@ -8449,7 +8512,9 @@ function createTextOp(xref, initialValue, sourceSpan) {
     sourceSpan
   }, TRAIT_CONSUMES_SLOT), NEW_OP);
 }
-function createListenerOp(target, targetSlot, name, tag, animationPhase, hostListener, sourceSpan) {
+function createListenerOp(target, targetSlot, name, tag, handlerOps, animationPhase, eventTarget, hostListener, sourceSpan) {
+  const handlerList = new OpList();
+  handlerList.push(handlerOps);
   return __spreadValues({
     kind: OpKind.Listener,
     target,
@@ -8457,11 +8522,12 @@ function createListenerOp(target, targetSlot, name, tag, animationPhase, hostLis
     tag,
     hostListener,
     name,
-    handlerOps: new OpList(),
+    handlerOps: handlerList,
     handlerFnName: null,
     consumesDollarEvent: false,
     isAnimationListener: animationPhase !== null,
     animationPhase,
+    eventTarget,
     sourceSpan
   }, NEW_OP);
 }
@@ -8485,25 +8551,30 @@ function createProjectionDefOp(def) {
     def
   }, NEW_OP);
 }
-function createProjectionOp(xref, selector, sourceSpan) {
+function createProjectionOp(xref, selector, i18nPlaceholder, attributes, sourceSpan) {
   return __spreadValues(__spreadValues({
     kind: OpKind.Projection,
     xref,
     handle: new SlotHandle(),
     selector,
+    i18nPlaceholder,
     projectionSlotIndex: 0,
-    attributes: [],
+    attributes,
     localRefs: [],
     sourceSpan
   }, NEW_OP), TRAIT_CONSUMES_SLOT);
 }
-function createExtractedAttributeOp(target, bindingKind, name, expression) {
+function createExtractedAttributeOp(target, bindingKind, name, expression, i18nContext, i18nMessage, securityContext) {
   return __spreadValues({
     kind: OpKind.ExtractedAttribute,
     target,
     bindingKind,
     name,
-    expression
+    expression,
+    i18nContext,
+    i18nMessage,
+    securityContext,
+    trustedValueFn: null
   }, NEW_OP);
 }
 function createDeferOp(xref, main, mainSlot, metadata, sourceSpan) {
@@ -8540,10 +8611,11 @@ function createDeferOnOp(defer2, trigger, prefetch, sourceSpan) {
     sourceSpan
   }, NEW_OP);
 }
-function createI18nMessageOp(xref, i18nBlock, message, messagePlaceholder, params, postprocessingParams, needsPostprocessing) {
+function createI18nMessageOp(xref, i18nContext, i18nBlock, message, messagePlaceholder, params, postprocessingParams, needsPostprocessing) {
   return __spreadValues({
     kind: OpKind.I18nMessage,
     xref,
+    i18nContext,
     i18nBlock,
     message,
     messagePlaceholder,
@@ -8588,6 +8660,9 @@ function createIcuEndOp(xref) {
   }, NEW_OP);
 }
 function createI18nContextOp(contextKind, xref, i18nBlock, message, sourceSpan) {
+  if (i18nBlock === null && contextKind !== I18nContextKind.Attr) {
+    throw new Error("AssertionError: i18nBlock must be provided for non-attribute contexts.");
+  }
   return __spreadValues({
     kind: OpKind.I18nContext,
     contextKind,
@@ -8599,14 +8674,26 @@ function createI18nContextOp(contextKind, xref, i18nBlock, message, sourceSpan)
     postprocessingParams: /* @__PURE__ */ new Map()
   }, NEW_OP);
 }
+function createI18nAttributesOp(xref, handle, target) {
+  return __spreadValues(__spreadValues({
+    kind: OpKind.I18nAttributes,
+    xref,
+    handle,
+    target,
+    i18nAttributesConfig: null
+  }, NEW_OP), TRAIT_CONSUMES_SLOT);
+}
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/ir/src/ops/host.mjs
-function createHostPropertyOp(name, expression, isAnimationTrigger, sourceSpan) {
+function createHostPropertyOp(name, expression, isAnimationTrigger, i18nContext, securityContext, sourceSpan) {
   return __spreadValues(__spreadValues({
     kind: OpKind.HostProperty,
     name,
     expression,
     isAnimationTrigger,
+    i18nContext,
+    securityContext,
+    sanitizer: null,
     sourceSpan
   }, TRAIT_CONSUMES_VARS), NEW_OP);
 }
@@ -8752,7 +8839,7 @@ function applyI18nExpressions(job) {
   for (const unit of job.units) {
     for (const op of unit.update) {
       if (op.kind === OpKind.I18nExpression && needsApplication(i18nContexts, op)) {
-        OpList.insertAfter(createI18nApplyOp(op.target, op.handle, null), op);
+        OpList.insertAfter(createI18nApplyOp(op.i18nOwner, op.handle, null), op);
       }
     }
   }
@@ -8764,7 +8851,19 @@ function needsApplication(i18nContexts, op) {
   }
   const context = i18nContexts.get(op.context);
   const nextContext2 = i18nContexts.get(op.next.context);
-  if (context.i18nBlock !== nextContext2.i18nBlock) {
+  if (context === void 0) {
+    throw new Error("AssertionError: expected an I18nContextOp to exist for the I18nExpressionOp's context");
+  }
+  if (nextContext2 === void 0) {
+    throw new Error("AssertionError: expected an I18nContextOp to exist for the next I18nExpressionOp's context");
+  }
+  if (context.i18nBlock !== null) {
+    if (context.i18nBlock !== nextContext2.i18nBlock) {
+      return true;
+    }
+    return false;
+  }
+  if (op.i18nOwner !== op.next.i18nOwner) {
     return true;
   }
   return false;
@@ -8772,27 +8871,44 @@ function needsApplication(i18nContexts, op) {
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/assign_i18n_slot_dependencies.mjs
 function assignI18nSlotDependencies(job) {
-  const i18nLastSlotConsumers = /* @__PURE__ */ new Map();
-  let lastSlotConsumer = null;
-  let currentI18nOp = null;
   for (const unit of job.units) {
-    for (const op of unit.create) {
-      if (hasConsumesSlotTrait(op)) {
-        lastSlotConsumer = op.xref;
-      }
-      switch (op.kind) {
-        case OpKind.I18nStart:
-          currentI18nOp = op;
-          break;
-        case OpKind.I18nEnd:
-          i18nLastSlotConsumers.set(currentI18nOp.xref, lastSlotConsumer);
-          currentI18nOp = null;
-          break;
+    let updateOp = unit.update.head;
+    let i18nExpressionsInProgress = [];
+    let state = null;
+    for (const createOp of unit.create) {
+      if (createOp.kind === OpKind.I18nStart) {
+        state = {
+          blockXref: createOp.xref,
+          lastSlotConsumer: createOp.xref
+        };
+      } else if (createOp.kind === OpKind.I18nEnd) {
+        for (const op of i18nExpressionsInProgress) {
+          op.target = state.lastSlotConsumer;
+          OpList.insertBefore(op, updateOp);
+        }
+        i18nExpressionsInProgress.length = 0;
+        state = null;
       }
-    }
-    for (const op of unit.update) {
-      if (op.kind === OpKind.I18nExpression) {
-        op.target = i18nLastSlotConsumers.get(op.target);
+      if (hasConsumesSlotTrait(createOp)) {
+        if (state !== null) {
+          state.lastSlotConsumer = createOp.xref;
+        }
+        while (true) {
+          if (updateOp.next === null) {
+            break;
+          }
+          if (state !== null && updateOp.kind === OpKind.I18nExpression && updateOp.usage === I18nExpressionFor.I18nText && updateOp.i18nOwner === state.blockXref) {
+            const opToRemove = updateOp;
+            updateOp = updateOp.next;
+            OpList.remove(opToRemove);
+            i18nExpressionsInProgress.push(opToRemove);
+            continue;
+          }
+          if (hasDependsOnSlotContextTrait(updateOp) && updateOp.target !== createOp.xref) {
+            break;
+          }
+          updateOp = updateOp.next;
+        }
       }
     }
   }
@@ -8821,18 +8937,53 @@ function extractAttributes(job) {
           break;
         case OpKind.Property:
           if (!op.isAnimationTrigger) {
-            OpList.insertBefore(createExtractedAttributeOp(op.target, op.isTemplate ? BindingKind.Template : BindingKind.Property, op.name, null), lookupElement(elements, op.target));
+            let bindingKind;
+            if (op.i18nMessage !== null && op.templateKind === null) {
+              bindingKind = BindingKind.I18n;
+            } else if (op.isStructuralTemplateAttribute) {
+              bindingKind = BindingKind.Template;
+            } else {
+              bindingKind = BindingKind.Property;
+            }
+            OpList.insertBefore(
+              createExtractedAttributeOp(
+                op.target,
+                bindingKind,
+                op.name,
+                null,
+                null,
+                null,
+                op.securityContext
+              ),
+              lookupElement(elements, op.target)
+            );
           }
           break;
         case OpKind.StyleProp:
         case OpKind.ClassProp:
           if (unit.job.compatibility === CompatibilityMode.TemplateDefinitionBuilder && op.expression instanceof EmptyExpr2) {
-            OpList.insertBefore(createExtractedAttributeOp(op.target, BindingKind.Property, op.name, null), lookupElement(elements, op.target));
+            OpList.insertBefore(createExtractedAttributeOp(
+              op.target,
+              BindingKind.Property,
+              op.name,
+              null,
+              null,
+              null,
+              SecurityContext.STYLE
+            ), lookupElement(elements, op.target));
           }
           break;
         case OpKind.Listener:
           if (!op.isAnimationListener) {
-            const extractedAttributeOp = createExtractedAttributeOp(op.target, BindingKind.Property, op.name, null);
+            const extractedAttributeOp = createExtractedAttributeOp(
+              op.target,
+              BindingKind.Property,
+              op.name,
+              null,
+              null,
+              null,
+              SecurityContext.NONE
+            );
             if (job.kind === CompilationJobKind.Host) {
               unit.create.push(extractedAttributeOp);
             } else {
@@ -8866,7 +9017,7 @@ function extractAttributeOp(unit, op, elements) {
     }
   }
   if (extractable) {
-    const extractedAttributeOp = createExtractedAttributeOp(op.target, op.isTemplate ? BindingKind.Template : BindingKind.Attribute, op.name, op.expression);
+    const extractedAttributeOp = createExtractedAttributeOp(op.target, op.isStructuralTemplateAttribute ? BindingKind.Template : BindingKind.Attribute, op.name, op.expression, op.i18nContext, op.i18nMessage, op.securityContext);
     if (unit.job.kind === CompilationJobKind.Host) {
       unit.create.push(extractedAttributeOp);
     } else {
@@ -8907,15 +9058,15 @@ function specializeBindings(job) {
             const target = lookupElement2(elements, op.target);
             target.nonBindable = true;
           } else {
-            OpList.replace(op, createAttributeOp(op.target, op.name, op.expression, op.securityContext, op.isTextAttribute, op.isTemplate, op.sourceSpan));
+            OpList.replace(op, createAttributeOp(op.target, op.name, op.expression, op.securityContext, op.isTextAttribute, op.isStructuralTemplateAttribute, op.templateKind, op.i18nMessage, op.sourceSpan));
           }
           break;
         case BindingKind.Property:
         case BindingKind.Animation:
           if (job.kind === CompilationJobKind.Host) {
-            OpList.replace(op, createHostPropertyOp(op.name, op.expression, op.bindingKind === BindingKind.Animation, op.sourceSpan));
+            OpList.replace(op, createHostPropertyOp(op.name, op.expression, op.bindingKind === BindingKind.Animation, op.i18nContext, op.securityContext, op.sourceSpan));
           } else {
-            OpList.replace(op, createPropertyOp(op.target, op.name, op.expression, op.bindingKind === BindingKind.Animation, op.securityContext, op.isTemplate, op.sourceSpan));
+            OpList.replace(op, createPropertyOp(op.target, op.name, op.expression, op.bindingKind === BindingKind.Animation, op.securityContext, op.isStructuralTemplateAttribute, op.templateKind, op.i18nContext, op.i18nMessage, op.sourceSpan));
           }
           break;
         case BindingKind.I18n:
@@ -9042,39 +9193,6 @@ function generateConditionalExpressions(job) {
   }
 }
 
-// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/ml_parser/tags.mjs
-var TagContentType;
-(function(TagContentType2) {
-  TagContentType2[TagContentType2["RAW_TEXT"] = 0] = "RAW_TEXT";
-  TagContentType2[TagContentType2["ESCAPABLE_RAW_TEXT"] = 1] = "ESCAPABLE_RAW_TEXT";
-  TagContentType2[TagContentType2["PARSABLE_DATA"] = 2] = "PARSABLE_DATA";
-})(TagContentType || (TagContentType = {}));
-function splitNsName(elementName) {
-  if (elementName[0] != ":") {
-    return [null, elementName];
-  }
-  const colonIndex = elementName.indexOf(":", 1);
-  if (colonIndex === -1) {
-    throw new Error(`Unsupported format "${elementName}" expecting ":namespace:name"`);
-  }
-  return [elementName.slice(1, colonIndex), elementName.slice(colonIndex + 1)];
-}
-function isNgContainer(tagName) {
-  return splitNsName(tagName)[1] === "ng-container";
-}
-function isNgContent(tagName) {
-  return splitNsName(tagName)[1] === "ng-content";
-}
-function isNgTemplate(tagName) {
-  return splitNsName(tagName)[1] === "ng-template";
-}
-function getNsPrefix(fullName) {
-  return fullName === null ? null : splitNsName(fullName)[0];
-}
-function mergeNsAndName(prefix, localName) {
-  return prefix ? `:${prefix}:${localName}` : localName;
-}
-
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/conversion.mjs
 var BINARY_OPERATORS = /* @__PURE__ */ new Map([
   ["&&", BinaryOperator.And],
@@ -9133,7 +9251,7 @@ function collectElementConsts(job) {
       if (op.kind === OpKind.ExtractedAttribute) {
         const attributes = allElementAttributes.get(op.target) || new ElementAttributes();
         allElementAttributes.set(op.target, attributes);
-        attributes.add(op.bindingKind, op.name, op.expression);
+        attributes.add(op.bindingKind, op.name, op.expression, op.trustedValueFn);
         OpList.remove(op);
       }
     }
@@ -9195,7 +9313,7 @@ var ElementAttributes = class {
     var _a2;
     return (_a2 = this.byKind.get(BindingKind.I18n)) != null ? _a2 : FLYWEIGHT_ARRAY;
   }
-  add(kind, name, value) {
+  add(kind, name, value, trustedValueFn) {
     var _a2;
     if (this.known.has(name)) {
       return;
@@ -9211,9 +9329,16 @@ var ElementAttributes = class {
     array.push(...getAttributeNameLiterals(name));
     if (kind === BindingKind.Attribute || kind === BindingKind.StyleProperty) {
       if (value === null) {
-        throw Error("Attribute & style element attributes must have a value");
+        throw Error("Attribute, i18n attribute, & style element attributes must have a value");
+      }
+      if (trustedValueFn !== null) {
+        if (!isStringLiteral(value)) {
+          throw Error("AssertionError: extracted attribute value should be string literal");
+        }
+        array.push(taggedTemplate(trustedValueFn, new TemplateLiteral([new TemplateLiteralElement(value.value)], []), void 0, value.sourceSpan));
+      } else {
+        array.push(value);
       }
-      array.push(value);
     }
   }
   arrayFor(kind) {
@@ -9259,6 +9384,47 @@ function serializeAttributes({ attributes, bindings, classes, i18n: i18n2, proje
   return literalArr(attrArray);
 }
 
+// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/convert_i18n_bindings.mjs
+function convertI18nBindings(job) {
+  const i18nAttributesByElem = /* @__PURE__ */ new Map();
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      if (op.kind === OpKind.I18nAttributes) {
+        i18nAttributesByElem.set(op.target, op);
+      }
+    }
+    for (const op of unit.update) {
+      switch (op.kind) {
+        case OpKind.Property:
+        case OpKind.Attribute:
+          if (op.i18nContext === null) {
+            continue;
+          }
+          if (!(op.expression instanceof Interpolation2)) {
+            continue;
+          }
+          const i18nAttributesForElem = i18nAttributesByElem.get(op.target);
+          if (i18nAttributesForElem === void 0) {
+            throw new Error("AssertionError: An i18n attribute binding instruction requires the owning element to have an I18nAttributes create instruction");
+          }
+          if (i18nAttributesForElem.target !== op.target) {
+            throw new Error("AssertionError: Expected i18nAttributes target element to match binding target element");
+          }
+          const ops = [];
+          for (let i = 0; i < op.expression.expressions.length; i++) {
+            const expr = op.expression.expressions[i];
+            if (op.expression.i18nPlaceholders.length !== op.expression.expressions.length) {
+              throw new Error(`AssertionError: An i18n attribute binding instruction requires the same number of expressions and placeholders, but found ${op.expression.i18nPlaceholders.length} placeholders and ${op.expression.expressions.length} expressions`);
+            }
+            ops.push(createI18nExpressionOp(op.i18nContext, i18nAttributesForElem.target, i18nAttributesForElem.xref, i18nAttributesForElem.handle, expr, op.expression.i18nPlaceholders[i], I18nParamResolutionTime.Creation, I18nExpressionFor.I18nAttribute, op.name, op.sourceSpan));
+          }
+          OpList.replaceWithMany(op, ops);
+          break;
+      }
+    }
+  }
+}
+
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/create_defer_deps_fns.mjs
 function createDeferDepsFns(job) {
   for (const unit of job.units) {
@@ -9292,6 +9458,7 @@ function createI18nContexts(job) {
   const rootContexts = /* @__PURE__ */ new Map();
   let currentI18nOp = null;
   let xref;
+  const messageToContext = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
     for (const op of unit.create) {
       switch (op.kind) {
@@ -9321,6 +9488,24 @@ function createI18nContexts(job) {
           break;
       }
     }
+    for (const op of unit.ops()) {
+      switch (op.kind) {
+        case OpKind.Binding:
+        case OpKind.Property:
+        case OpKind.Attribute:
+        case OpKind.ExtractedAttribute:
+          if (!op.i18nMessage) {
+            continue;
+          }
+          if (!messageToContext.has(op.i18nMessage)) {
+            const i18nContext = job.allocateXrefId();
+            unit.create.push(createI18nContextOp(I18nContextKind.Attr, i18nContext, null, op.i18nMessage, null));
+            messageToContext.set(op.i18nMessage, i18nContext);
+          }
+          op.i18nContext = messageToContext.get(op.i18nMessage);
+          break;
+      }
+    }
   }
   for (const unit of job.units) {
     for (const op of unit.create) {
@@ -9629,6 +9814,15 @@ function extractI18nMessages(job) {
       }
     }
   }
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      if (op.kind !== OpKind.I18nContext || op.contextKind !== I18nContextKind.Attr) {
+        continue;
+      }
+      const i18nMessageOp = createI18nMessage(job, op);
+      unit.create.push(i18nMessageOp);
+    }
+  }
   const i18nBlockMessages = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
     for (const op of unit.create) {
@@ -9651,6 +9845,9 @@ function extractI18nMessages(job) {
           }
           const i18nContext = i18nContexts.get(op.context);
           if (i18nContext.contextKind === I18nContextKind.Icu) {
+            if (i18nContext.i18nBlock === null) {
+              throw Error("ICU context should have its i18n block set.");
+            }
             const subMessage = createI18nMessage(job, i18nContext, op.messagePlaceholder);
             unit.create.push(subMessage);
             const rootI18nId = i18nBlocks.get(i18nContext.i18nBlock).root;
@@ -9667,69 +9864,54 @@ function extractI18nMessages(job) {
   }
 }
 function createI18nMessage(job, context, messagePlaceholder) {
-  let [formattedParams, needsPostprocessing] = formatParams(context.params);
-  const [formattedPostprocessingParams] = formatParams(context.postprocessingParams);
-  needsPostprocessing || (needsPostprocessing = formattedPostprocessingParams.size > 0);
-  return createI18nMessageOp(job.allocateXrefId(), context.i18nBlock, context.message, messagePlaceholder != null ? messagePlaceholder : null, formattedParams, formattedPostprocessingParams, needsPostprocessing);
+  let formattedParams = formatParams(context.params);
+  const formattedPostprocessingParams = formatParams(context.postprocessingParams);
+  let needsPostprocessing = formattedPostprocessingParams.size > 0;
+  for (const values of context.params.values()) {
+    if (values.length > 1) {
+      needsPostprocessing = true;
+    }
+  }
+  return createI18nMessageOp(job.allocateXrefId(), context.xref, context.i18nBlock, context.message, messagePlaceholder != null ? messagePlaceholder : null, formattedParams, formattedPostprocessingParams, needsPostprocessing);
 }
 function formatParams(params) {
   const formattedParams = /* @__PURE__ */ new Map();
-  let needsPostprocessing = false;
   for (const [placeholder, placeholderValues] of params) {
-    const [serializedValues, paramNeedsPostprocessing] = formatParamValues(placeholderValues);
-    needsPostprocessing || (needsPostprocessing = paramNeedsPostprocessing);
+    const serializedValues = formatParamValues(placeholderValues);
     if (serializedValues !== null) {
       formattedParams.set(placeholder, literal(serializedValues));
     }
   }
-  return [formattedParams, needsPostprocessing];
+  return formattedParams;
 }
 function formatParamValues(values) {
   if (values.length === 0) {
-    return [null, false];
+    return null;
   }
-  collapseElementTemplatePairs(values);
   const serializedValues = values.map((value) => formatValue(value));
-  return serializedValues.length === 1 ? [serializedValues[0], false] : [`${LIST_START_MARKER}${serializedValues.join(LIST_DELIMITER)}${LIST_END_MARKER}`, true];
+  return serializedValues.length === 1 ? serializedValues[0] : `${LIST_START_MARKER}${serializedValues.join(LIST_DELIMITER)}${LIST_END_MARKER}`;
 }
-function collapseElementTemplatePairs(values) {
-  var _a2;
-  const valueIndiciesBySubTemplateIndex = /* @__PURE__ */ new Map();
-  for (let i = 0; i < values.length; i++) {
-    const value = values[i];
-    if (value.subTemplateIndex !== null && value.flags & (I18nParamValueFlags.ElementTag | I18nParamValueFlags.TemplateTag)) {
-      const valueIndicies = (_a2 = valueIndiciesBySubTemplateIndex.get(value.subTemplateIndex)) != null ? _a2 : [];
-      valueIndicies.push(i);
-      valueIndiciesBySubTemplateIndex.set(value.subTemplateIndex, valueIndicies);
-    }
-  }
-  for (const [subTemplateIndex, valueIndicies] of valueIndiciesBySubTemplateIndex) {
-    if (valueIndicies.length > 1) {
-      const elementIndex = valueIndicies.find((index) => values[index].flags & I18nParamValueFlags.ElementTag);
-      const templateIndex = valueIndicies.find((index) => values[index].flags & I18nParamValueFlags.TemplateTag);
-      if (elementIndex !== void 0 && templateIndex !== void 0) {
-        const elementValue = values[elementIndex];
-        const templateValue = values[templateIndex];
-        let compundValue;
-        if (elementValue.flags & I18nParamValueFlags.OpenTag && elementValue.flags & I18nParamValueFlags.CloseTag) {
-          compundValue = `${formatValue(templateValue)}${formatValue(elementValue)}${formatValue(templateValue)}`;
-        } else if (elementValue.flags & I18nParamValueFlags.OpenTag) {
-          compundValue = `${formatValue(templateValue)}${formatValue(elementValue)}`;
-        } else {
-          compundValue = `${formatValue(elementValue)}${formatValue(templateValue)}`;
-        }
-        values.splice(elementIndex, 1, { value: compundValue, subTemplateIndex, flags: I18nParamValueFlags.None });
-        values.splice(templateIndex, 1, null);
-      }
+function formatValue(value) {
+  if (value.flags & I18nParamValueFlags.ElementTag && value.flags & I18nParamValueFlags.TemplateTag) {
+    if (typeof value.value !== "object") {
+      throw Error("AssertionError: Expected i18n param value to have an element and template slot");
     }
-  }
-  for (let i = values.length - 1; i >= 0; i--) {
-    if (values[i] === null) {
-      values.splice(i, 1);
+    const elementValue = formatValue(__spreadProps(__spreadValues({}, value), {
+      value: value.value.element,
+      flags: value.flags & ~I18nParamValueFlags.TemplateTag
+    }));
+    const templateValue = formatValue(__spreadProps(__spreadValues({}, value), {
+      value: value.value.template,
+      flags: value.flags & ~I18nParamValueFlags.ElementTag
+    }));
+    if (value.flags & I18nParamValueFlags.OpenTag && value.flags & I18nParamValueFlags.CloseTag) {
+      return `${templateValue}${elementValue}${templateValue}`;
     }
+    return value.flags & I18nParamValueFlags.CloseTag ? `${elementValue}${templateValue}` : `${templateValue}${elementValue}`;
+  }
+  if (value.flags & I18nParamValueFlags.OpenTag && value.flags & I18nParamValueFlags.CloseTag) {
+    return `${formatValue(__spreadProps(__spreadValues({}, value), { flags: value.flags & ~I18nParamValueFlags.CloseTag }))}${formatValue(__spreadProps(__spreadValues({}, value), { flags: value.flags & ~I18nParamValueFlags.OpenTag }))}`;
   }
-}
-function formatValue(value) {
   if (value.flags === I18nParamValueFlags.None) {
     return `${value.value}`;
   }
@@ -9744,9 +9926,6 @@ function formatValue(value) {
     closeMarker = value.flags & I18nParamValueFlags.CloseTag ? TAG_CLOSE_MARKER : "";
   }
   const context = value.subTemplateIndex === null ? "" : `${CONTEXT_MARKER}${value.subTemplateIndex}`;
-  if (value.flags & I18nParamValueFlags.OpenTag && value.flags & I18nParamValueFlags.CloseTag) {
-    return `${ESCAPE}${tagMarker}${value.value}${context}${ESCAPE}${ESCAPE}${closeMarker}${tagMarker}${value.value}${context}${ESCAPE}`;
-  }
   return `${ESCAPE}${closeMarker}${tagMarker}${value.value}${context}${ESCAPE}`;
 }
 
@@ -9767,7 +9946,7 @@ function generateAdvance(job) {
       if (!hasDependsOnSlotContextTrait(op)) {
         continue;
       } else if (!slotMap.has(op.target)) {
-        throw new Error(`AssertionError: reference to unknown slot for var ${op.target}`);
+        throw new Error(`AssertionError: reference to unknown slot for target ${op.target}`);
       }
       const slot = slotMap.get(op.target);
       if (slotContext !== slot) {
@@ -9815,8 +9994,13 @@ function recursivelyProcessView(view, parentScope) {
   for (const op of view.create) {
     switch (op.kind) {
       case OpKind.Template:
+        recursivelyProcessView(view.job.views.get(op.xref), scope);
+        break;
       case OpKind.RepeaterCreate:
         recursivelyProcessView(view.job.views.get(op.xref), scope);
+        if (op.emptyView) {
+          recursivelyProcessView(view.job.views.get(op.emptyView), scope);
+        }
         break;
       case OpKind.Listener:
         op.handlerOps.prepend(generateVariablesInScopeForView(view, scope));
@@ -15950,56 +16134,137 @@ function createEmptyMessagePart(location) {
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/i18n_const_collection.mjs
 var NG_I18N_CLOSURE_MODE = "ngI18nClosureMode";
 var TRANSLATION_VAR_PREFIX2 = "i18n_";
+var I18N_ICU_MAPPING_PREFIX2 = "I18N_EXP_";
+var ESCAPE2 = "\uFFFD";
 function collectI18nConsts(job) {
+  var _a2, _b2;
   const fileBasedI18nSuffix = job.relativeContextFilePath.replace(/[^A-Za-z0-9]/g, "_").toUpperCase() + "_";
-  const messageConstIndices = /* @__PURE__ */ new Map();
+  const extractedAttributesByI18nContext = /* @__PURE__ */ new Map();
+  const i18nAttributesByElement = /* @__PURE__ */ new Map();
+  const i18nExpressionsByElement = /* @__PURE__ */ new Map();
   const messages = /* @__PURE__ */ new Map();
+  for (const unit of job.units) {
+    for (const op of unit.ops()) {
+      if (op.kind === OpKind.ExtractedAttribute && op.i18nContext !== null) {
+        const attributes = (_a2 = extractedAttributesByI18nContext.get(op.i18nContext)) != null ? _a2 : [];
+        attributes.push(op);
+        extractedAttributesByI18nContext.set(op.i18nContext, attributes);
+      } else if (op.kind === OpKind.I18nAttributes) {
+        i18nAttributesByElement.set(op.target, op);
+      } else if (op.kind === OpKind.I18nExpression && op.usage === I18nExpressionFor.I18nAttribute) {
+        const expressions = (_b2 = i18nExpressionsByElement.get(op.target)) != null ? _b2 : [];
+        expressions.push(op);
+        i18nExpressionsByElement.set(op.target, expressions);
+      } else if (op.kind === OpKind.I18nMessage) {
+        messages.set(op.xref, op);
+      }
+    }
+  }
+  const i18nValuesByContext = /* @__PURE__ */ new Map();
+  const messageConstIndices = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
     for (const op of unit.create) {
       if (op.kind === OpKind.I18nMessage) {
-        messages.set(op.xref, op);
+        if (op.messagePlaceholder === null) {
+          const { mainVar, statements } = collectMessage(job, fileBasedI18nSuffix, messages, op);
+          if (op.i18nBlock !== null) {
+            const i18nConst = job.addConst(mainVar, statements);
+            messageConstIndices.set(op.i18nBlock, i18nConst);
+          } else {
+            job.constsInitializers.push(...statements);
+            i18nValuesByContext.set(op.i18nContext, mainVar);
+            const attributesForMessage = extractedAttributesByI18nContext.get(op.i18nContext);
+            if (attributesForMessage !== void 0) {
+              for (const attr of attributesForMessage) {
+                attr.expression = mainVar.clone();
+              }
+            }
+          }
+        }
         OpList.remove(op);
       }
     }
   }
-  for (const op of messages.values()) {
-    if (op.kind === OpKind.I18nMessage && op.messagePlaceholder === null) {
-      const { mainVar, statements } = collectMessage(job, fileBasedI18nSuffix, messages, op);
-      messageConstIndices.set(op.i18nBlock, job.addConst(mainVar, statements));
+  for (const unit of job.units) {
+    for (const elem of unit.create) {
+      if (isElementOrContainerOp(elem)) {
+        const i18nAttributes2 = i18nAttributesByElement.get(elem.xref);
+        if (i18nAttributes2 === void 0) {
+          continue;
+        }
+        let i18nExpressions = i18nExpressionsByElement.get(elem.xref);
+        if (i18nExpressions === void 0) {
+          throw new Error("AssertionError: Could not find any i18n expressions associated with an I18nAttributes instruction");
+        }
+        const seenPropertyNames = /* @__PURE__ */ new Set();
+        i18nExpressions = i18nExpressions.filter((i18nExpr) => {
+          const seen = seenPropertyNames.has(i18nExpr.name);
+          seenPropertyNames.add(i18nExpr.name);
+          return !seen;
+        });
+        const i18nAttributeConfig = i18nExpressions.flatMap((i18nExpr) => {
+          const i18nExprValue = i18nValuesByContext.get(i18nExpr.context);
+          if (i18nExprValue === void 0) {
+            throw new Error("AssertionError: Could not find i18n expression's value");
+          }
+          return [literal(i18nExpr.name), i18nExprValue];
+        });
+        i18nAttributes2.i18nAttributesConfig = job.addConst(new LiteralArrayExpr(i18nAttributeConfig));
+      }
     }
   }
   for (const unit of job.units) {
     for (const op of unit.create) {
       if (op.kind === OpKind.I18nStart) {
-        op.messageIndex = messageConstIndices.get(op.root);
+        const msgIndex = messageConstIndices.get(op.root);
+        if (msgIndex === void 0) {
+          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?");
+        }
+        op.messageIndex = msgIndex;
       }
     }
   }
 }
 function collectMessage(job, fileBasedI18nSuffix, messages, messageOp) {
+  var _a2;
   const statements = [];
+  const subMessagePlaceholders = /* @__PURE__ */ new Map();
   for (const subMessageId of messageOp.subMessages) {
     const subMessage = messages.get(subMessageId);
     const { mainVar: subMessageVar, statements: subMessageStatements } = collectMessage(job, fileBasedI18nSuffix, messages, subMessage);
     statements.push(...subMessageStatements);
-    messageOp.params.set(subMessage.messagePlaceholder, subMessageVar);
+    const subMessages = (_a2 = subMessagePlaceholders.get(subMessage.messagePlaceholder)) != null ? _a2 : [];
+    subMessages.push(subMessageVar);
+    subMessagePlaceholders.set(subMessage.messagePlaceholder, subMessages);
   }
+  addSubMessageParams(messageOp, subMessagePlaceholders);
   messageOp.params = new Map([...messageOp.params.entries()].sort());
-  assertAllParamsResolved(messageOp);
   const mainVar = variable(job.pool.uniqueName(TRANSLATION_VAR_PREFIX2));
   const closureVar = i18nGenerateClosureVar(job.pool, messageOp.message.id, fileBasedI18nSuffix, job.i18nUseExternalIds);
   let transformFn = void 0;
   if (messageOp.needsPostprocessing) {
-    messageOp.postprocessingParams = new Map([...messageOp.postprocessingParams.entries()].sort());
+    const postprocessingParams = Object.fromEntries([...messageOp.postprocessingParams.entries()].sort());
+    const formattedPostprocessingParams = formatI18nPlaceholderNamesInMap(postprocessingParams, false);
     const extraTransformFnParams = [];
     if (messageOp.postprocessingParams.size > 0) {
-      extraTransformFnParams.push(literalMap([...messageOp.postprocessingParams].map(([key, value]) => ({ key, value, quoted: true }))));
+      extraTransformFnParams.push(mapLiteral(formattedPostprocessingParams, true));
     }
     transformFn = (expr) => importExpr(Identifiers.i18nPostprocess).callFn([expr, ...extraTransformFnParams]);
   }
   statements.push(...getTranslationDeclStmts(messageOp.message, mainVar, closureVar, messageOp.params, transformFn));
   return { mainVar, statements };
 }
+function addSubMessageParams(messageOp, subMessagePlaceholders) {
+  for (const [placeholder, subMessages] of subMessagePlaceholders) {
+    if (subMessages.length === 1) {
+      messageOp.params.set(placeholder, subMessages[0]);
+    } else {
+      messageOp.params.set(placeholder, literal(`${ESCAPE2}${I18N_ICU_MAPPING_PREFIX2}${placeholder}${ESCAPE2}`));
+      messageOp.postprocessingParams.set(placeholder, literalArr(subMessages));
+      messageOp.needsPostprocessing = true;
+    }
+  }
+}
 function getTranslationDeclStmts(message, variable2, closureVar, params, transformFn) {
   const paramsObject = Object.fromEntries(params);
   const statements = [
@@ -16027,23 +16292,9 @@ function i18nGenerateClosureVar(pool, messageId, fileBasedI18nSuffix, useExterna
   }
   return variable(name);
 }
-function assertAllParamsResolved(op) {
-  for (let placeholder in op.message.placeholders) {
-    placeholder = placeholder.trimEnd();
-    if (!op.params.has(placeholder) && !op.postprocessingParams.has(placeholder)) {
-      throw Error(`Failed to resolve i18n placeholder: ${placeholder}`);
-    }
-  }
-  for (let placeholder in op.message.placeholderToMessage) {
-    placeholder = placeholder.trimEnd();
-    if (!op.params.has(placeholder) && !op.postprocessingParams.has(placeholder)) {
-      throw Error(`Failed to resolve i18n message placeholder: ${placeholder}`);
-    }
-  }
-}
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/i18n_text_extraction.mjs
-function extractI18nText(job) {
+function convertI18nText(job) {
   var _a2;
   for (const unit of job.units) {
     let currentI18n = null;
@@ -16092,7 +16343,7 @@ function extractI18nText(job) {
           const ops = [];
           for (let i = 0; i < op.interpolation.expressions.length; i++) {
             const expr = op.interpolation.expressions[i];
-            ops.push(createI18nExpressionOp(contextId, i18nOp.xref, i18nOp.handle, expr, op.i18nPlaceholders[i], resolutionTime, (_a2 = expr.sourceSpan) != null ? _a2 : op.sourceSpan));
+            ops.push(createI18nExpressionOp(contextId, i18nOp.xref, i18nOp.xref, i18nOp.handle, expr, op.interpolation.i18nPlaceholders[i], resolutionTime, I18nExpressionFor.I18nText, "", (_a2 = expr.sourceSpan) != null ? _a2 : op.sourceSpan));
           }
           OpList.replaceWithMany(op, ops);
           break;
@@ -16514,13 +16765,13 @@ function parseExtractedStyles(job) {
         if (op.name === "style") {
           const parsedStyles = parse(op.expression.value);
           for (let i = 0; i < parsedStyles.length - 1; i += 2) {
-            OpList.insertBefore(createExtractedAttributeOp(op.target, BindingKind.StyleProperty, parsedStyles[i], literal(parsedStyles[i + 1])), op);
+            OpList.insertBefore(createExtractedAttributeOp(op.target, BindingKind.StyleProperty, parsedStyles[i], literal(parsedStyles[i + 1]), null, null, SecurityContext.STYLE), op);
           }
           OpList.remove(op);
         } else if (op.name === "class") {
           const parsedClasses = op.expression.value.trim().split(/\s+/g);
           for (const parsedClass of parsedClasses) {
-            OpList.insertBefore(createExtractedAttributeOp(op.target, BindingKind.ClassName, parsedClass, null), op);
+            OpList.insertBefore(createExtractedAttributeOp(op.target, BindingKind.ClassName, parsedClass, null, null, null, SecurityContext.NONE), op);
           }
           OpList.remove(op);
         }
@@ -16533,18 +16784,28 @@ function parseExtractedStyles(job) {
 function removeContentSelectors(job) {
   for (const unit of job.units) {
     const elements = createOpXrefMap(unit);
-    for (const op of unit.update) {
+    for (const op of unit.ops()) {
       switch (op.kind) {
         case OpKind.Binding:
           const target = lookupInXrefMap(elements, op.target);
-          if (op.name.toLowerCase() === "select" && target.kind === OpKind.Projection) {
+          if (isSelectAttribute(op.name) && target.kind === OpKind.Projection) {
             OpList.remove(op);
           }
           break;
+        case OpKind.Projection:
+          for (let i = op.attributes.length - 2; i >= 0; i -= 2) {
+            if (isSelectAttribute(op.attributes[i])) {
+              op.attributes.splice(i, 2);
+            }
+          }
+          break;
       }
     }
   }
 }
+function isSelectAttribute(name) {
+  return name.toLowerCase() === "select";
+}
 function lookupInXrefMap(map, xref) {
   const el = map.get(xref);
   if (el === void 0) {
@@ -16631,22 +16892,35 @@ function propagateI18nBlocksToTemplates(unit, subTemplateIndex) {
         i18nBlock = op;
         break;
       case OpKind.I18nEnd:
+        if (i18nBlock.subTemplateIndex === null) {
+          subTemplateIndex = 0;
+        }
         i18nBlock = null;
         break;
       case OpKind.Template:
-        const templateView = unit.job.views.get(op.xref);
-        if (op.i18nPlaceholder !== void 0) {
-          if (i18nBlock === null) {
-            throw Error("Expected template with i18n placeholder to be in an i18n block.");
-          }
-          subTemplateIndex++;
-          wrapTemplateWithI18n(templateView, i18nBlock);
+        subTemplateIndex = propagateI18nBlocksForView(unit.job.views.get(op.xref), i18nBlock, op.i18nPlaceholder, subTemplateIndex);
+        break;
+      case OpKind.RepeaterCreate:
+        const forView = unit.job.views.get(op.xref);
+        subTemplateIndex = propagateI18nBlocksForView(unit.job.views.get(op.xref), i18nBlock, op.i18nPlaceholder, subTemplateIndex);
+        if (op.emptyView !== null) {
+          subTemplateIndex = propagateI18nBlocksForView(unit.job.views.get(op.emptyView), i18nBlock, op.emptyI18nPlaceholder, subTemplateIndex);
         }
-        subTemplateIndex = propagateI18nBlocksToTemplates(templateView, subTemplateIndex);
+        break;
     }
   }
   return subTemplateIndex;
 }
+function propagateI18nBlocksForView(view, i18nBlock, i18nPlaceholder, subTemplateIndex) {
+  if (i18nPlaceholder !== void 0) {
+    if (i18nBlock === null) {
+      throw Error("Expected template with i18n placeholder to be in an i18n block.");
+    }
+    subTemplateIndex++;
+    wrapTemplateWithI18n(view, i18nBlock);
+  }
+  return propagateI18nBlocksToTemplates(view, subTemplateIndex);
+}
 function wrapTemplateWithI18n(unit, parentI18n) {
   var _a2;
   if (((_a2 = unit.create.head.next) == null ? void 0 : _a2.kind) !== OpKind.I18nStart) {
@@ -16803,17 +17077,13 @@ function disableBindings2() {
 function enableBindings() {
   return call(Identifiers.enableBindings, [], null);
 }
-function listener(name, handlerFn, sourceSpan) {
-  return call(Identifiers.listener, [
-    literal(name),
-    handlerFn
-  ], sourceSpan);
-}
-function syntheticHostListener(name, handlerFn, sourceSpan) {
-  return call(Identifiers.syntheticHostListener, [
-    literal(name),
-    handlerFn
-  ], sourceSpan);
+function listener(name, handlerFn, eventTargetResolver, syntheticHost, sourceSpan) {
+  const args = [literal(name), handlerFn];
+  if (eventTargetResolver !== null) {
+    args.push(literal(false));
+    args.push(importExpr(eventTargetResolver));
+  }
+  return call(syntheticHost ? Identifiers.syntheticHostListener : Identifiers.listener, args, sourceSpan);
 }
 function pipe(slot, name) {
   return call(Identifiers.pipe, [
@@ -16960,6 +17230,10 @@ function i18n(slot, constIndex, subTemplateIndex) {
 function i18nEnd() {
   return call(Identifiers.i18nEnd, [], null);
 }
+function i18nAttributes(slot, i18nAttributesConfig) {
+  const args = [literal(slot), literal(i18nAttributesConfig)];
+  return call(Identifiers.i18nAttributes, args, null);
+}
 function property(name, expression, sanitizer, sourceSpan) {
   const args = [literal(name), expression];
   if (sanitizer !== null) {
@@ -17068,8 +17342,12 @@ function classMapInterpolate(strings, expressions, sourceSpan) {
   const interpolationArgs = collateInterpolationArgs(strings, expressions);
   return callVariadicInstruction(CLASS_MAP_INTERPOLATE_CONFIG, [], interpolationArgs, [], sourceSpan);
 }
-function hostProperty(name, expression, sourceSpan) {
-  return call(Identifiers.hostProperty, [literal(name), expression], sourceSpan);
+function hostProperty(name, expression, sanitizer, sourceSpan) {
+  const args = [literal(name), expression];
+  if (sanitizer !== null) {
+    args.push(sanitizer);
+  }
+  return call(Identifiers.hostProperty, args, sourceSpan);
 }
 function syntheticHostProperty(name, expression, sourceSpan) {
   return call(Identifiers.syntheticHostProperty, [literal(name), expression], sourceSpan);
@@ -17257,13 +17535,10 @@ function callVariadicInstruction(config, baseArgs, interpolationArgs, extraArgs,
 }
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/reify.mjs
-var sanitizerIdentifierMap = /* @__PURE__ */ new Map([
-  [SanitizerFn.Html, Identifiers.sanitizeHtml],
-  [SanitizerFn.IframeAttribute, Identifiers.validateIframeAttribute],
-  [SanitizerFn.ResourceUrl, Identifiers.sanitizeResourceUrl],
-  [SanitizerFn.Script, Identifiers.sanitizeScript],
-  [SanitizerFn.Style, Identifiers.sanitizeStyle],
-  [SanitizerFn.Url, Identifiers.sanitizeUrl]
+var GLOBAL_TARGET_RESOLVERS = /* @__PURE__ */ new Map([
+  ["window", Identifiers.resolveWindow],
+  ["document", Identifiers.resolveDocument],
+  ["body", Identifiers.resolveBody]
 ]);
 function reify(job) {
   for (const unit of job.units) {
@@ -17306,6 +17581,12 @@ function reifyCreateOperations(unit, ops) {
       case OpKind.I18n:
         OpList.replace(op, i18n(op.handle.slot, op.messageIndex, op.subTemplateIndex));
         break;
+      case OpKind.I18nAttributes:
+        if (op.i18nAttributesConfig === null) {
+          throw new Error(`AssertionError: i18nAttributesConfig was not set`);
+        }
+        OpList.replace(op, i18nAttributes(op.handle.slot, op.i18nAttributesConfig));
+        break;
       case OpKind.Template:
         if (!(unit instanceof ViewCompilationUnit)) {
           throw new Error(`AssertionError: must be compiling a component`);
@@ -17327,8 +17608,11 @@ function reifyCreateOperations(unit, ops) {
         break;
       case OpKind.Listener:
         const listenerFn = reifyListenerHandler(unit, op.handlerFnName, op.handlerOps, op.consumesDollarEvent);
-        const reified = op.hostListener && op.isAnimationListener ? syntheticHostListener(op.name, listenerFn, op.sourceSpan) : listener(op.name, listenerFn, op.sourceSpan);
-        OpList.replace(op, reified);
+        const eventTargetResolver = op.eventTarget ? GLOBAL_TARGET_RESOLVERS.get(op.eventTarget) : null;
+        if (eventTargetResolver === void 0) {
+          throw new Error(`AssertionError: unknown event target ${op.eventTarget}`);
+        }
+        OpList.replace(op, listener(op.name, listenerFn, eventTargetResolver, op.hostListener && op.isAnimationListener, op.sourceSpan));
         break;
       case OpKind.Variable:
         if (op.variable.name === null) {
@@ -17483,7 +17767,7 @@ function reifyUpdateOperations(_unit, ops) {
           if (op.isAnimationTrigger) {
             OpList.replace(op, syntheticHostProperty(op.name, op.expression, op.sourceSpan));
           } else {
-            OpList.replace(op, hostProperty(op.name, op.expression, op.sourceSpan));
+            OpList.replace(op, hostProperty(op.name, op.expression, op.sanitizer, op.sourceSpan));
           }
         }
         break;
@@ -17561,8 +17845,6 @@ function reifyIrExpression(expr) {
       return pipeBind(expr.targetSlot.slot, expr.varOffset, expr.args);
     case ExpressionKind.PipeBindingVariadic:
       return pipeBindV(expr.targetSlot.slot, expr.varOffset, expr.args);
-    case ExpressionKind.SanitizerExpr:
-      return importExpr(sanitizerIdentifierMap.get(expr.fn));
     case ExpressionKind.SlotLiteralExpr:
       return literal(expr.slot.slot);
     default:
@@ -17622,6 +17904,28 @@ function removeI18nContexts(job) {
   }
 }
 
+// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/remove_unused_i18n_attrs.mjs
+function removeUnusedI18nAttributesOps(job) {
+  for (const unit of job.units) {
+    const ownersWithI18nExpressions = /* @__PURE__ */ new Set();
+    for (const op of unit.update) {
+      switch (op.kind) {
+        case OpKind.I18nExpression:
+          ownersWithI18nExpressions.add(op.i18nOwner);
+      }
+    }
+    for (const op of unit.create) {
+      switch (op.kind) {
+        case OpKind.I18nAttributes:
+          if (ownersWithI18nExpressions.has(op.xref)) {
+            continue;
+          }
+          OpList.remove(op);
+      }
+    }
+  }
+}
+
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/repeater_derived_vars.mjs
 function generateRepeaterDerivedVars(job) {
   const repeaters = /* @__PURE__ */ new Map();
@@ -17734,8 +18038,9 @@ function resolveI18nElementPlaceholders(job) {
   }
   resolvePlaceholdersForView(job, job.root, i18nContexts, elements);
 }
-function resolvePlaceholdersForView(job, unit, i18nContexts, elements) {
+function resolvePlaceholdersForView(job, unit, i18nContexts, elements, pendingStructuralDirective) {
   let currentOps = null;
+  let pendingStructuralDirectiveCloses = /* @__PURE__ */ new Map();
   for (const op of unit.create) {
     switch (op.kind) {
       case OpKind.I18nStart:
@@ -17752,52 +18057,135 @@ function resolvePlaceholdersForView(job, unit, i18nContexts, elements) {
           if (currentOps === null) {
             throw Error("i18n tag placeholder should only occur inside an i18n block");
           }
-          const { startName, closeName } = op.i18nPlaceholder;
-          let flags = I18nParamValueFlags.ElementTag | I18nParamValueFlags.OpenTag;
-          if (closeName === "") {
-            flags |= I18nParamValueFlags.CloseTag;
+          recordElementStart(op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
+          if (pendingStructuralDirective && op.i18nPlaceholder.closeName) {
+            pendingStructuralDirectiveCloses.set(op.xref, pendingStructuralDirective);
           }
-          addParam(currentOps.i18nContext.params, startName, op.handle.slot, currentOps.i18nBlock.subTemplateIndex, flags);
+          pendingStructuralDirective = void 0;
         }
         break;
       case OpKind.ElementEnd:
         const startOp = elements.get(op.xref);
         if (startOp && startOp.i18nPlaceholder !== void 0) {
           if (currentOps === null) {
-            throw Error("i18n tag placeholder should only occur inside an i18n block");
-          }
-          const { closeName } = startOp.i18nPlaceholder;
-          if (closeName !== "") {
-            addParam(currentOps.i18nContext.params, closeName, startOp.handle.slot, currentOps.i18nBlock.subTemplateIndex, I18nParamValueFlags.ElementTag | I18nParamValueFlags.CloseTag);
+            throw Error("AssertionError: i18n tag placeholder should only occur inside an i18n block");
           }
+          recordElementClose(startOp, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirectiveCloses.get(op.xref));
+          pendingStructuralDirectiveCloses.delete(op.xref);
         }
         break;
-      case OpKind.Template:
+      case OpKind.Projection:
         if (op.i18nPlaceholder !== void 0) {
           if (currentOps === null) {
             throw Error("i18n tag placeholder should only occur inside an i18n block");
           }
-          let startFlags = I18nParamValueFlags.TemplateTag | I18nParamValueFlags.OpenTag;
-          const subTemplateIndex = getSubTemplateIndexForTemplateTag(job, currentOps.i18nBlock, op);
-          const { startName, closeName } = op.i18nPlaceholder;
-          const isSelfClosing = closeName === "";
-          if (isSelfClosing) {
-            startFlags |= I18nParamValueFlags.CloseTag;
+          recordElementStart(op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
+          recordElementClose(op, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
+          pendingStructuralDirective = void 0;
+        }
+        break;
+      case OpKind.Template:
+        const view = job.views.get(op.xref);
+        if (op.i18nPlaceholder === void 0) {
+          resolvePlaceholdersForView(job, view, i18nContexts, elements);
+        } else {
+          if (currentOps === null) {
+            throw Error("i18n tag placeholder should only occur inside an i18n block");
           }
-          addParam(currentOps.i18nContext.params, startName, op.handle.slot, subTemplateIndex, startFlags);
-          resolvePlaceholdersForView(job, job.views.get(op.xref), i18nContexts, elements);
-          if (!isSelfClosing) {
-            addParam(currentOps.i18nContext.params, closeName, op.handle.slot, subTemplateIndex, I18nParamValueFlags.TemplateTag | I18nParamValueFlags.CloseTag);
+          if (op.templateKind === TemplateKind.Structural) {
+            resolvePlaceholdersForView(job, view, i18nContexts, elements, op);
+          } else {
+            recordTemplateStart(job, view, op.handle.slot, op.i18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
+            resolvePlaceholdersForView(job, view, i18nContexts, elements);
+            recordTemplateClose(job, view, op.handle.slot, op.i18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
+            pendingStructuralDirective = void 0;
           }
+        }
+        break;
+      case OpKind.RepeaterCreate:
+        if (pendingStructuralDirective !== void 0) {
+          throw Error("AssertionError: Unexpected structural directive associated with @for block");
+        }
+        const forSlot = op.handle.slot + 1;
+        const forView = job.views.get(op.xref);
+        if (op.i18nPlaceholder === void 0) {
+          resolvePlaceholdersForView(job, forView, i18nContexts, elements);
         } else {
-          resolvePlaceholdersForView(job, job.views.get(op.xref), i18nContexts, elements);
+          if (currentOps === null) {
+            throw Error("i18n tag placeholder should only occur inside an i18n block");
+          }
+          recordTemplateStart(job, forView, forSlot, op.i18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
+          resolvePlaceholdersForView(job, forView, i18nContexts, elements);
+          recordTemplateClose(job, forView, forSlot, op.i18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
+          pendingStructuralDirective = void 0;
+        }
+        if (op.emptyView !== null) {
+          const emptySlot = op.handle.slot + 2;
+          const emptyView = job.views.get(op.emptyView);
+          if (op.emptyI18nPlaceholder === void 0) {
+            resolvePlaceholdersForView(job, emptyView, i18nContexts, elements);
+          } else {
+            if (currentOps === null) {
+              throw Error("i18n tag placeholder should only occur inside an i18n block");
+            }
+            recordTemplateStart(job, emptyView, emptySlot, op.emptyI18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
+            resolvePlaceholdersForView(job, emptyView, i18nContexts, elements);
+            recordTemplateClose(job, emptyView, emptySlot, op.emptyI18nPlaceholder, currentOps.i18nContext, currentOps.i18nBlock, pendingStructuralDirective);
+            pendingStructuralDirective = void 0;
+          }
         }
         break;
     }
   }
 }
-function getSubTemplateIndexForTemplateTag(job, i18nOp, op) {
-  for (const childOp of job.views.get(op.xref).create) {
+function recordElementStart(op, i18nContext, i18nBlock, structuralDirective) {
+  const { startName, closeName } = op.i18nPlaceholder;
+  let flags = I18nParamValueFlags.ElementTag | I18nParamValueFlags.OpenTag;
+  let value = op.handle.slot;
+  if (structuralDirective !== void 0) {
+    flags |= I18nParamValueFlags.TemplateTag;
+    value = { element: value, template: structuralDirective.handle.slot };
+  }
+  if (!closeName) {
+    flags |= I18nParamValueFlags.CloseTag;
+  }
+  addParam(i18nContext.params, startName, value, i18nBlock.subTemplateIndex, flags);
+}
+function recordElementClose(op, i18nContext, i18nBlock, structuralDirective) {
+  const { closeName } = op.i18nPlaceholder;
+  if (closeName) {
+    let flags = I18nParamValueFlags.ElementTag | I18nParamValueFlags.CloseTag;
+    let value = op.handle.slot;
+    if (structuralDirective !== void 0) {
+      flags |= I18nParamValueFlags.TemplateTag;
+      value = { element: value, template: structuralDirective.handle.slot };
+    }
+    addParam(i18nContext.params, closeName, value, i18nBlock.subTemplateIndex, flags);
+  }
+}
+function recordTemplateStart(job, view, slot, i18nPlaceholder, i18nContext, i18nBlock, structuralDirective) {
+  let { startName, closeName } = i18nPlaceholder;
+  let flags = I18nParamValueFlags.TemplateTag | I18nParamValueFlags.OpenTag;
+  if (!closeName) {
+    flags |= I18nParamValueFlags.CloseTag;
+  }
+  if (structuralDirective !== void 0) {
+    addParam(i18nContext.params, startName, structuralDirective.handle.slot, i18nBlock.subTemplateIndex, flags);
+  }
+  addParam(i18nContext.params, startName, slot, getSubTemplateIndexForTemplateTag(job, i18nBlock, view), flags);
+}
+function recordTemplateClose(job, view, slot, i18nPlaceholder, i18nContext, i18nBlock, structuralDirective) {
+  const { startName, closeName } = i18nPlaceholder;
+  const flags = I18nParamValueFlags.TemplateTag | I18nParamValueFlags.CloseTag;
+  if (closeName) {
+    addParam(i18nContext.params, closeName, slot, getSubTemplateIndexForTemplateTag(job, i18nBlock, view), flags);
+    if (structuralDirective !== void 0) {
+      addParam(i18nContext.params, closeName, structuralDirective.handle.slot, i18nBlock.subTemplateIndex, flags);
+    }
+  }
+}
+function getSubTemplateIndexForTemplateTag(job, i18nOp, view) {
+  for (const childOp of view.create) {
     if (childOp.kind === OpKind.I18nStart) {
       return childOp.subTemplateIndex;
     }
@@ -17813,6 +18201,7 @@ function addParam(params, placeholder, value, subTemplateIndex, flags) {
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/resolve_i18n_expression_placeholders.mjs
 function resolveI18nExpressionPlaceholders(job) {
+  var _a2;
   const subTemplateIndicies = /* @__PURE__ */ new Map();
   const i18nContexts = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
@@ -17828,12 +18217,13 @@ function resolveI18nExpressionPlaceholders(job) {
     }
   }
   const expressionIndices = /* @__PURE__ */ new Map();
+  const referenceIndex = (op) => op.usage === I18nExpressionFor.I18nText ? op.i18nOwner : op.context;
   for (const unit of job.units) {
     for (const op of unit.update) {
       if (op.kind === OpKind.I18nExpression) {
         const i18nContext = i18nContexts.get(op.context);
-        const index = expressionIndices.get(op.target) || 0;
-        const subTemplateIndex = subTemplateIndicies.get(op.target);
+        const index = expressionIndices.get(referenceIndex(op)) || 0;
+        const subTemplateIndex = (_a2 = subTemplateIndicies.get(op.i18nOwner)) != null ? _a2 : null;
         const params = op.resolutionTime === I18nParamResolutionTime.Creation ? i18nContext.params : i18nContext.postprocessingParams;
         const values = params.get(op.i18nPlaceholder) || [];
         values.push({
@@ -17842,7 +18232,7 @@ function resolveI18nExpressionPlaceholders(job) {
           flags: I18nParamValueFlags.ExpressionIndex
         });
         params.set(op.i18nPlaceholder, values);
-        expressionIndices.set(op.target, index + 1);
+        expressionIndices.set(referenceIndex(op), index + 1);
       }
     }
   }
@@ -17957,30 +18347,54 @@ function processLexicalScope2(unit, ops, savedView) {
 }
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/resolve_sanitizers.mjs
-var sanitizers = /* @__PURE__ */ new Map([
-  [SecurityContext.HTML, SanitizerFn.Html],
-  [SecurityContext.SCRIPT, SanitizerFn.Script],
-  [SecurityContext.STYLE, SanitizerFn.Style],
-  [SecurityContext.URL, SanitizerFn.Url],
-  [SecurityContext.RESOURCE_URL, SanitizerFn.ResourceUrl]
+var sanitizerFns = /* @__PURE__ */ new Map([
+  [SecurityContext.HTML, Identifiers.sanitizeHtml],
+  [SecurityContext.RESOURCE_URL, Identifiers.sanitizeResourceUrl],
+  [SecurityContext.SCRIPT, Identifiers.sanitizeScript],
+  [SecurityContext.STYLE, Identifiers.sanitizeStyle],
+  [SecurityContext.URL, Identifiers.sanitizeUrl]
+]);
+var trustedValueFns = /* @__PURE__ */ new Map([
+  [SecurityContext.HTML, Identifiers.trustConstantHtml],
+  [SecurityContext.RESOURCE_URL, Identifiers.trustConstantResourceUrl]
 ]);
 function resolveSanitizers(job) {
+  var _a2, _b2;
   for (const unit of job.units) {
     const elements = createOpXrefMap(unit);
-    let sanitizerFn;
+    if (job.kind !== CompilationJobKind.Host) {
+      for (const op of unit.create) {
+        if (op.kind === OpKind.ExtractedAttribute) {
+          const trustedValueFn = (_a2 = trustedValueFns.get(getOnlySecurityContext(op.securityContext))) != null ? _a2 : null;
+          op.trustedValueFn = trustedValueFn !== null ? importExpr(trustedValueFn) : null;
+        }
+      }
+    }
     for (const op of unit.update) {
       switch (op.kind) {
         case OpKind.Property:
         case OpKind.Attribute:
-          sanitizerFn = sanitizers.get(op.securityContext) || null;
-          op.sanitizer = sanitizerFn ? new SanitizerExpr(sanitizerFn) : null;
+        case OpKind.HostProperty:
+          let sanitizerFn = null;
+          if (Array.isArray(op.securityContext) && op.securityContext.length === 2 && op.securityContext.indexOf(SecurityContext.URL) > -1 && op.securityContext.indexOf(SecurityContext.RESOURCE_URL) > -1) {
+            sanitizerFn = Identifiers.sanitizeUrlOrResourceUrl;
+          } else {
+            sanitizerFn = (_b2 = sanitizerFns.get(getOnlySecurityContext(op.securityContext))) != null ? _b2 : null;
+          }
+          op.sanitizer = sanitizerFn !== null ? importExpr(sanitizerFn) : null;
           if (op.sanitizer === null) {
-            const ownerOp = elements.get(op.target);
-            if (ownerOp === void 0 || !isElementOrContainerOp(ownerOp)) {
-              throw Error("Property should have an element-like owner");
+            let isIframe = false;
+            if (job.kind === CompilationJobKind.Host || op.kind === OpKind.HostProperty) {
+              isIframe = true;
+            } else {
+              const ownerOp = elements.get(op.target);
+              if (ownerOp === void 0 || !isElementOrContainerOp(ownerOp)) {
+                throw Error("Property should have an element-like owner");
+              }
+              isIframe = isIframeElement(ownerOp);
             }
-            if (isIframeElement(ownerOp) && isIframeSecuritySensitiveAttr(op.name)) {
-              op.sanitizer = new SanitizerExpr(SanitizerFn.IframeAttribute);
+            if (isIframe && isIframeSecuritySensitiveAttr(op.name)) {
+              op.sanitizer = importExpr(Identifiers.validateIframeAttribute);
             }
           }
           break;
@@ -17992,6 +18406,15 @@ function isIframeElement(op) {
   var _a2;
   return op.kind === OpKind.ElementStart && ((_a2 = op.tag) == null ? void 0 : _a2.toLowerCase()) === "iframe";
 }
+function getOnlySecurityContext(securityContext) {
+  if (Array.isArray(securityContext)) {
+    if (securityContext.length > 1) {
+      throw Error(`AssertionError: Ambiguous security context`);
+    }
+    return securityContext[0] || SecurityContext.NONE;
+  }
+  return securityContext;
+}
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/save_restore_view.mjs
 function saveAndRestoreView(job) {
@@ -18639,12 +19062,12 @@ var phases = [
   { kind: CompilationJobKind.Tmpl, fn: removeContentSelectors },
   { kind: CompilationJobKind.Host, fn: parseHostStyleProperties },
   { kind: CompilationJobKind.Tmpl, fn: emitNamespaceChanges },
-  { kind: CompilationJobKind.Both, fn: specializeStyleBindings },
-  { kind: CompilationJobKind.Both, fn: specializeBindings },
   { kind: CompilationJobKind.Tmpl, fn: propagateI18nBlocks },
   { kind: CompilationJobKind.Tmpl, fn: wrapI18nIcus },
-  { kind: CompilationJobKind.Tmpl, fn: createI18nContexts },
+  { kind: CompilationJobKind.Both, fn: specializeStyleBindings },
+  { kind: CompilationJobKind.Both, fn: specializeBindings },
   { kind: CompilationJobKind.Both, fn: extractAttributes },
+  { kind: CompilationJobKind.Tmpl, fn: createI18nContexts },
   { kind: CompilationJobKind.Both, fn: parseExtractedStyles },
   { kind: CompilationJobKind.Tmpl, fn: removeEmptyBindings },
   { kind: CompilationJobKind.Both, fn: collapseSingletonInterpolations },
@@ -18652,14 +19075,17 @@ var phases = [
   { kind: CompilationJobKind.Tmpl, fn: generateConditionalExpressions },
   { kind: CompilationJobKind.Tmpl, fn: createPipes },
   { kind: CompilationJobKind.Tmpl, fn: configureDeferInstructions },
-  { kind: CompilationJobKind.Tmpl, fn: extractI18nText },
+  { kind: CompilationJobKind.Tmpl, fn: convertI18nText },
+  { kind: CompilationJobKind.Tmpl, fn: convertI18nBindings },
+  { kind: CompilationJobKind.Tmpl, fn: removeUnusedI18nAttributesOps },
+  { kind: CompilationJobKind.Tmpl, fn: assignI18nSlotDependencies },
   { kind: CompilationJobKind.Tmpl, fn: applyI18nExpressions },
   { kind: CompilationJobKind.Tmpl, fn: createVariadicPipes },
   { kind: CompilationJobKind.Both, fn: generatePureLiteralStructures },
   { kind: CompilationJobKind.Tmpl, fn: generateProjectionDefs },
   { kind: CompilationJobKind.Tmpl, fn: generateVariables },
   { kind: CompilationJobKind.Tmpl, fn: saveAndRestoreView },
-  { kind: CompilationJobKind.Tmpl, fn: deleteAnyCasts },
+  { kind: CompilationJobKind.Both, fn: deleteAnyCasts },
   { kind: CompilationJobKind.Both, fn: resolveDollarEvent },
   { kind: CompilationJobKind.Tmpl, fn: generateRepeaterDerivedVars },
   { kind: CompilationJobKind.Tmpl, fn: generateTrackVariables },
@@ -18667,7 +19093,7 @@ var phases = [
   { kind: CompilationJobKind.Tmpl, fn: resolveDeferTargetNames },
   { kind: CompilationJobKind.Tmpl, fn: optimizeTrackFns },
   { kind: CompilationJobKind.Both, fn: resolveContexts },
-  { kind: CompilationJobKind.Tmpl, fn: resolveSanitizers },
+  { kind: CompilationJobKind.Both, fn: resolveSanitizers },
   { kind: CompilationJobKind.Tmpl, fn: liftLocalRefs },
   { kind: CompilationJobKind.Both, fn: generateNullishCoalesceExpressions },
   { kind: CompilationJobKind.Both, fn: expandSafeReads },
@@ -18682,7 +19108,6 @@ var phases = [
   { kind: CompilationJobKind.Tmpl, fn: collectI18nConsts },
   { kind: CompilationJobKind.Tmpl, fn: collectConstExpressions },
   { kind: CompilationJobKind.Both, fn: collectElementConsts },
-  { kind: CompilationJobKind.Tmpl, fn: assignI18nSlotDependencies },
   { kind: CompilationJobKind.Tmpl, fn: removeI18nContexts },
   { kind: CompilationJobKind.Both, fn: countVariables },
   { kind: CompilationJobKind.Tmpl, fn: generateAdvance },
@@ -18800,6 +19225,8 @@ function emitHostBindingFunction(job) {
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/ingest.mjs
 var compatibilityMode = CompatibilityMode.TemplateDefinitionBuilder;
+var domSchema = new DomElementSchemaRegistry();
+var NG_TEMPLATE_TAG_NAME = "ng-template";
 function ingestComponent(componentName, template2, constantPool, relativeContextFilePath, i18nUseExternalIds, deferBlocksMeta) {
   const job = new ComponentCompilationJob(componentName, constantPool, compatibilityMode, relativeContextFilePath, i18nUseExternalIds, deferBlocksMeta);
   ingestNodes(job.root, template2);
@@ -18809,50 +19236,55 @@ function ingestHostBinding(input, bindingParser, constantPool) {
   var _a2, _b2, _c2;
   const job = new HostBindingCompilationJob(input.componentName, constantPool, compatibilityMode);
   for (const property2 of (_a2 = input.properties) != null ? _a2 : []) {
-    ingestHostProperty(job, property2, false);
+    let bindingKind = BindingKind.Property;
+    if (property2.name.startsWith("attr.")) {
+      property2.name = property2.name.substring("attr.".length);
+      bindingKind = BindingKind.Attribute;
+    }
+    if (property2.isAnimation) {
+      bindingKind = BindingKind.Animation;
+    }
+    const securityContexts = bindingParser.calcPossibleSecurityContexts(input.componentSelector, property2.name, bindingKind === BindingKind.Attribute).filter((context) => context !== SecurityContext.NONE);
+    ingestHostProperty(job, property2, bindingKind, false, securityContexts);
   }
   for (const [name, expr] of (_b2 = Object.entries(input.attributes)) != null ? _b2 : []) {
-    ingestHostAttribute(job, name, expr);
+    const securityContexts = bindingParser.calcPossibleSecurityContexts(input.componentSelector, name, true).filter((context) => context !== SecurityContext.NONE);
+    ingestHostAttribute(job, name, expr, securityContexts);
   }
   for (const event of (_c2 = input.events) != null ? _c2 : []) {
     ingestHostEvent(job, event);
   }
   return job;
 }
-function ingestHostProperty(job, property2, isTextAttribute) {
+function ingestHostProperty(job, property2, bindingKind, isTextAttribute, securityContexts) {
   let expression;
   const ast = property2.expression.ast;
   if (ast instanceof Interpolation) {
-    expression = new Interpolation2(ast.strings, ast.expressions.map((expr) => convertAst(expr, job, property2.sourceSpan)));
+    expression = new Interpolation2(ast.strings, ast.expressions.map((expr) => convertAst(expr, job, property2.sourceSpan)), []);
   } else {
     expression = convertAst(ast, job, property2.sourceSpan);
   }
-  let bindingKind = BindingKind.Property;
-  if (property2.name.startsWith("attr.")) {
-    property2.name = property2.name.substring("attr.".length);
-    bindingKind = BindingKind.Attribute;
-  }
-  if (property2.isAnimation) {
-    bindingKind = BindingKind.Animation;
-  }
-  job.root.update.push(createBindingOp(job.root.xref, bindingKind, property2.name, expression, null, SecurityContext.NONE, isTextAttribute, false, property2.sourceSpan));
+  job.root.update.push(createBindingOp(job.root.xref, bindingKind, property2.name, expression, null, securityContexts, isTextAttribute, false, null, null, property2.sourceSpan));
 }
-function ingestHostAttribute(job, name, value) {
+function ingestHostAttribute(job, name, value, securityContexts) {
   const attrBinding = createBindingOp(
     job.root.xref,
     BindingKind.Attribute,
     name,
     value,
     null,
-    SecurityContext.NONE,
+    securityContexts,
     true,
     false,
+    null,
+    null,
     null
   );
   job.root.update.push(attrBinding);
 }
 function ingestHostEvent(job, event) {
-  const eventBinding = createListenerOp(job.root.xref, new SlotHandle(), event.name, null, event.targetOrPhase, true, event.sourceSpan);
+  const [phase, target] = event.type === 0 ? [null, event.targetOrPhase] : [event.targetOrPhase, null];
+  const eventBinding = createListenerOp(job.root.xref, new SlotHandle(), event.name, null, [], phase, target, true, event.sourceSpan);
   eventBinding.handlerOps.push(createStatementOp(new ReturnStatement(convertAst(event.handler.ast, job, event.sourceSpan), event.handlerSpan)));
   job.root.create.push(eventBinding);
 }
@@ -18892,14 +19324,17 @@ function ingestElement(unit, element2) {
   const [namespaceKey, elementName] = splitNsName(element2.name);
   const startOp = createElementStartOp(elementName, id, namespaceForKey(namespaceKey), element2.i18n instanceof TagPlaceholder ? element2.i18n : void 0, element2.startSourceSpan);
   unit.create.push(startOp);
-  ingestBindings(unit, startOp, element2);
+  ingestElementBindings(unit, startOp, element2);
   ingestReferences(startOp, element2);
+  let i18nBlockId = null;
+  if (element2.i18n instanceof Message) {
+    i18nBlockId = unit.job.allocateXrefId();
+    unit.create.push(createI18nStartOp(i18nBlockId, element2.i18n));
+  }
   ingestNodes(unit, element2.children);
   const endOp = createElementEndOp(id, (_a2 = element2.endSourceSpan) != null ? _a2 : element2.startSourceSpan);
   unit.create.push(endOp);
-  if (element2.i18n instanceof Message) {
-    const i18nBlockId = unit.job.allocateXrefId();
-    OpList.insertAfter(createI18nStartOp(i18nBlockId, element2.i18n), startOp);
+  if (i18nBlockId !== null) {
     OpList.insertBefore(createI18nEndOp(i18nBlockId), endOp);
   }
 }
@@ -18916,24 +19351,30 @@ function ingestTemplate(unit, tmpl) {
   const i18nPlaceholder = tmpl.i18n instanceof TagPlaceholder ? tmpl.i18n : void 0;
   const namespace = namespaceForKey(namespacePrefix);
   const functionNameSuffix = tagNameWithoutNamespace === null ? "" : prefixWithNamespace(tagNameWithoutNamespace, namespace);
-  const tplOp = createTemplateOp(childView.xref, tagNameWithoutNamespace, functionNameSuffix, namespace, i18nPlaceholder, tmpl.startSourceSpan);
-  unit.create.push(tplOp);
-  ingestBindings(unit, tplOp, tmpl);
-  ingestReferences(tplOp, tmpl);
+  const templateKind = isPlainTemplate(tmpl) ? TemplateKind.NgTemplate : TemplateKind.Structural;
+  const templateOp = createTemplateOp(childView.xref, templateKind, tagNameWithoutNamespace, functionNameSuffix, namespace, i18nPlaceholder, tmpl.startSourceSpan);
+  unit.create.push(templateOp);
+  ingestTemplateBindings(unit, templateOp, tmpl, templateKind);
+  ingestReferences(templateOp, tmpl);
   ingestNodes(childView, tmpl.children);
   for (const { name, value } of tmpl.variables) {
     childView.contextVariables.set(name, value !== "" ? value : "$implicit");
   }
-  if (isPlainTemplate(tmpl) && tmpl.i18n instanceof Message) {
+  if (templateKind === TemplateKind.NgTemplate && tmpl.i18n instanceof Message) {
     const id = unit.job.allocateXrefId();
     OpList.insertAfter(createI18nStartOp(id, tmpl.i18n), childView.create.head);
     OpList.insertBefore(createI18nEndOp(id), childView.create.tail);
   }
 }
 function ingestContent(unit, content) {
-  const op = createProjectionOp(unit.job.allocateXrefId(), content.selector, content.sourceSpan);
+  if (content.i18n !== void 0 && !(content.i18n instanceof TagPlaceholder)) {
+    throw Error(`Unhandled i18n metadata type for element: ${content.i18n.constructor.name}`);
+  }
+  const attrs = content.attributes.flatMap((a) => [a.name, a.value]);
+  const op = createProjectionOp(unit.job.allocateXrefId(), content.selector, content.i18n, attrs, content.sourceSpan);
   for (const attr of content.attributes) {
-    ingestBinding(unit, op.xref, attr.name, literal(attr.value), 1, null, SecurityContext.NONE, attr.sourceSpan, BindingFlags.TextValue);
+    const securityContext = domSchema.securityContext(content.name, attr.name, true);
+    unit.update.push(createBindingOp(op.xref, BindingKind.Attribute, attr.name, literal(attr.value), null, securityContext, true, false, null, asMessage(attr.i18n), attr.sourceSpan));
   }
   unit.create.push(op);
 }
@@ -18961,9 +19402,10 @@ function ingestBoundText(unit, text2, i18nPlaceholders) {
   const textXref = unit.job.allocateXrefId();
   unit.create.push(createTextOp(textXref, "", text2.sourceSpan));
   const baseSourceSpan = unit.job.compatibility ? null : text2.sourceSpan;
-  unit.update.push(createInterpolateTextOp(textXref, new Interpolation2(value.strings, value.expressions.map((expr) => convertAst(expr, unit.job, baseSourceSpan))), i18nPlaceholders, text2.sourceSpan));
+  unit.update.push(createInterpolateTextOp(textXref, new Interpolation2(value.strings, value.expressions.map((expr) => convertAst(expr, unit.job, baseSourceSpan)), i18nPlaceholders), text2.sourceSpan));
 }
 function ingestIfBlock(unit, ifBlock) {
+  var _a2;
   let firstXref = null;
   let firstSlotHandle = null;
   let conditions = [];
@@ -18977,14 +19419,21 @@ function ingestIfBlock(unit, ifBlock) {
     if (ifCase.expressionAlias !== null) {
       cView.contextVariables.set(ifCase.expressionAlias.name, CTX_REF);
     }
-    const tmplOp = createTemplateOp(cView.xref, tagName, "Conditional", Namespace.HTML, void 0, ifCase.sourceSpan);
-    unit.create.push(tmplOp);
+    let ifCaseI18nMeta = void 0;
+    if (ifCase.i18n !== void 0) {
+      if (!(ifCase.i18n instanceof BlockPlaceholder)) {
+        throw Error(`Unhandled i18n metadata type for if block: ${(_a2 = ifCase.i18n) == null ? void 0 : _a2.constructor.name}`);
+      }
+      ifCaseI18nMeta = ifCase.i18n;
+    }
+    const templateOp = createTemplateOp(cView.xref, TemplateKind.Block, tagName, "Conditional", Namespace.HTML, ifCaseI18nMeta, ifCase.sourceSpan);
+    unit.create.push(templateOp);
     if (firstXref === null) {
       firstXref = cView.xref;
-      firstSlotHandle = tmplOp.handle;
+      firstSlotHandle = templateOp.handle;
     }
     const caseExpr = ifCase.expression ? convertAst(ifCase.expression, unit.job, null) : null;
-    const conditionalCaseExpr = new ConditionalCaseExpr(caseExpr, tmplOp.xref, tmplOp.handle, ifCase.expressionAlias);
+    const conditionalCaseExpr = new ConditionalCaseExpr(caseExpr, templateOp.xref, templateOp.handle, ifCase.expressionAlias);
     conditions.push(conditionalCaseExpr);
     ingestNodes(cView, ifCase.children);
   }
@@ -18992,54 +19441,65 @@ function ingestIfBlock(unit, ifBlock) {
   unit.update.push(conditional2);
 }
 function ingestSwitchBlock(unit, switchBlock) {
+  var _a2;
   let firstXref = null;
   let firstSlotHandle = null;
   let conditions = [];
   for (const switchCase of switchBlock.cases) {
     const cView = unit.job.allocateView(unit.xref);
-    const tmplOp = createTemplateOp(cView.xref, null, "Case", Namespace.HTML, void 0, switchCase.sourceSpan);
-    unit.create.push(tmplOp);
+    let switchCaseI18nMeta = void 0;
+    if (switchCase.i18n !== void 0) {
+      if (!(switchCase.i18n instanceof BlockPlaceholder)) {
+        throw Error(`Unhandled i18n metadata type for switch block: ${(_a2 = switchCase.i18n) == null ? void 0 : _a2.constructor.name}`);
+      }
+      switchCaseI18nMeta = switchCase.i18n;
+    }
+    const templateOp = createTemplateOp(cView.xref, TemplateKind.Block, null, "Case", Namespace.HTML, switchCaseI18nMeta, switchCase.sourceSpan);
+    unit.create.push(templateOp);
     if (firstXref === null) {
       firstXref = cView.xref;
-      firstSlotHandle = tmplOp.handle;
+      firstSlotHandle = templateOp.handle;
     }
     const caseExpr = switchCase.expression ? convertAst(switchCase.expression, unit.job, switchBlock.startSourceSpan) : null;
-    const conditionalCaseExpr = new ConditionalCaseExpr(caseExpr, tmplOp.xref, tmplOp.handle);
+    const conditionalCaseExpr = new ConditionalCaseExpr(caseExpr, templateOp.xref, templateOp.handle);
     conditions.push(conditionalCaseExpr);
     ingestNodes(cView, switchCase.children);
   }
   const conditional2 = createConditionalOp(firstXref, firstSlotHandle, convertAst(switchBlock.expression, unit.job, null), conditions, switchBlock.sourceSpan);
   unit.update.push(conditional2);
 }
-function ingestDeferView(unit, suffix, children, sourceSpan) {
+function ingestDeferView(unit, suffix, i18nMeta, children, sourceSpan) {
+  if (i18nMeta !== void 0 && !(i18nMeta instanceof BlockPlaceholder)) {
+    throw Error("Unhandled i18n metadata type for defer block");
+  }
   if (children === void 0) {
     return null;
   }
   const secondaryView = unit.job.allocateView(unit.xref);
   ingestNodes(secondaryView, children);
-  const templateOp = createTemplateOp(secondaryView.xref, null, `Defer${suffix}`, Namespace.HTML, void 0, sourceSpan);
+  const templateOp = createTemplateOp(secondaryView.xref, TemplateKind.Block, null, `Defer${suffix}`, Namespace.HTML, i18nMeta, sourceSpan);
   unit.create.push(templateOp);
   return templateOp;
 }
 function ingestDeferBlock(unit, deferBlock) {
-  var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+  var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
   const blockMeta = unit.job.deferBlocksMeta.get(deferBlock);
   if (blockMeta === void 0) {
     throw new Error(`AssertionError: unable to find metadata for deferred block`);
   }
-  const main = ingestDeferView(unit, "", deferBlock.children, deferBlock.sourceSpan);
-  const loading = ingestDeferView(unit, "Loading", (_a2 = deferBlock.loading) == null ? void 0 : _a2.children, (_b2 = deferBlock.loading) == null ? void 0 : _b2.sourceSpan);
-  const placeholder = ingestDeferView(unit, "Placeholder", (_c2 = deferBlock.placeholder) == null ? void 0 : _c2.children, (_d2 = deferBlock.placeholder) == null ? void 0 : _d2.sourceSpan);
-  const error2 = ingestDeferView(unit, "Error", (_e2 = deferBlock.error) == null ? void 0 : _e2.children, (_f2 = deferBlock.error) == null ? void 0 : _f2.sourceSpan);
+  const main = ingestDeferView(unit, "", deferBlock.i18n, deferBlock.children, deferBlock.sourceSpan);
+  const loading = ingestDeferView(unit, "Loading", (_a2 = deferBlock.loading) == null ? void 0 : _a2.i18n, (_b2 = deferBlock.loading) == null ? void 0 : _b2.children, (_c2 = deferBlock.loading) == null ? void 0 : _c2.sourceSpan);
+  const placeholder = ingestDeferView(unit, "Placeholder", (_d2 = deferBlock.placeholder) == null ? void 0 : _d2.i18n, (_e2 = deferBlock.placeholder) == null ? void 0 : _e2.children, (_f2 = deferBlock.placeholder) == null ? void 0 : _f2.sourceSpan);
+  const error2 = ingestDeferView(unit, "Error", (_g = deferBlock.error) == null ? void 0 : _g.i18n, (_h = deferBlock.error) == null ? void 0 : _h.children, (_i = deferBlock.error) == null ? void 0 : _i.sourceSpan);
   const deferXref = unit.job.allocateXrefId();
   const deferOp = createDeferOp(deferXref, main.xref, main.handle, blockMeta, deferBlock.sourceSpan);
-  deferOp.placeholderView = (_g = placeholder == null ? void 0 : placeholder.xref) != null ? _g : null;
-  deferOp.placeholderSlot = (_h = placeholder == null ? void 0 : placeholder.handle) != null ? _h : null;
-  deferOp.loadingSlot = (_i = loading == null ? void 0 : loading.handle) != null ? _i : null;
-  deferOp.errorSlot = (_j = error2 == null ? void 0 : error2.handle) != null ? _j : null;
-  deferOp.placeholderMinimumTime = (_l = (_k = deferBlock.placeholder) == null ? void 0 : _k.minimumTime) != null ? _l : null;
-  deferOp.loadingMinimumTime = (_n = (_m = deferBlock.loading) == null ? void 0 : _m.minimumTime) != null ? _n : null;
-  deferOp.loadingAfterTime = (_p = (_o = deferBlock.loading) == null ? void 0 : _o.afterTime) != null ? _p : null;
+  deferOp.placeholderView = (_j = placeholder == null ? void 0 : placeholder.xref) != null ? _j : null;
+  deferOp.placeholderSlot = (_k = placeholder == null ? void 0 : placeholder.handle) != null ? _k : null;
+  deferOp.loadingSlot = (_l = loading == null ? void 0 : loading.handle) != null ? _l : null;
+  deferOp.errorSlot = (_m = error2 == null ? void 0 : error2.handle) != null ? _m : null;
+  deferOp.placeholderMinimumTime = (_o = (_n = deferBlock.placeholder) == null ? void 0 : _n.minimumTime) != null ? _o : null;
+  deferOp.loadingMinimumTime = (_q = (_p = deferBlock.loading) == null ? void 0 : _p.minimumTime) != null ? _q : null;
+  deferOp.loadingAfterTime = (_s = (_r = deferBlock.loading) == null ? void 0 : _r.afterTime) != null ? _s : null;
   unit.create.push(deferOp);
   let prefetch = false;
   let deferOnOps = [];
@@ -19103,17 +19563,12 @@ function ingestDeferBlock(unit, deferBlock) {
   unit.update.push(deferWhenOps);
 }
 function ingestIcu(unit, icu) {
-  var _a2, _b2;
+  var _a2;
   if (icu.i18n instanceof Message && isSingleI18nIcu(icu.i18n)) {
     const xref = unit.job.allocateXrefId();
     const icuNode = icu.i18n.nodes[0];
     unit.create.push(createIcuStartOp(xref, icu.i18n, icuFromI18nMessage(icu.i18n).name, null));
-    const expressionPlaceholder = (_a2 = icuNode.expressionPlaceholder) == null ? void 0 : _a2.trimEnd();
-    if (expressionPlaceholder === void 0 || icu.vars[expressionPlaceholder] === void 0) {
-      throw Error("ICU should have a text binding");
-    }
-    ingestBoundText(unit, icu.vars[expressionPlaceholder], [expressionPlaceholder]);
-    for (const [placeholder, text2] of Object.entries(icu.placeholders)) {
+    for (const [placeholder, text2] of Object.entries(__spreadValues(__spreadValues({}, icu.vars), icu.placeholders))) {
       if (text2 instanceof BoundText) {
         ingestBoundText(unit, text2, [placeholder]);
       } else {
@@ -19122,11 +19577,11 @@ function ingestIcu(unit, icu) {
     }
     unit.create.push(createIcuEndOp(xref));
   } else {
-    throw Error(`Unhandled i18n metadata type for ICU: ${(_b2 = icu.i18n) == null ? void 0 : _b2.constructor.name}`);
+    throw Error(`Unhandled i18n metadata type for ICU: ${(_a2 = icu.i18n) == null ? void 0 : _a2.constructor.name}`);
   }
 }
 function ingestForBlock(unit, forBlock) {
-  var _a2;
+  var _a2, _b2, _c2;
   const repeaterView = unit.job.allocateView(unit.xref);
   const createRepeaterAlias = (ident, repeaterVar) => {
     repeaterView.aliases.add({
@@ -19160,8 +19615,16 @@ function ingestForBlock(unit, forBlock) {
     $odd: forBlock.contextVariables.$odd.name,
     $implicit: forBlock.item.name
   };
+  if (forBlock.i18n !== void 0 && !(forBlock.i18n instanceof BlockPlaceholder)) {
+    throw Error("AssertionError: Unhandled i18n metadata type or @for");
+  }
+  if (((_a2 = forBlock.empty) == null ? void 0 : _a2.i18n) !== void 0 && !(forBlock.empty.i18n instanceof BlockPlaceholder)) {
+    throw Error("AssertionError: Unhandled i18n metadata type or @empty");
+  }
+  const i18nPlaceholder = forBlock.i18n;
+  const emptyI18nPlaceholder = (_b2 = forBlock.empty) == null ? void 0 : _b2.i18n;
   const tagName = ingestControlFlowInsertionPoint(unit, repeaterView.xref, forBlock);
-  const repeaterCreate2 = createRepeaterCreateOp(repeaterView.xref, (_a2 = emptyView == null ? void 0 : emptyView.xref) != null ? _a2 : null, tagName, track, varNames, forBlock.sourceSpan);
+  const repeaterCreate2 = createRepeaterCreateOp(repeaterView.xref, (_c2 = emptyView == null ? void 0 : emptyView.xref) != null ? _c2 : null, tagName, track, varNames, i18nPlaceholder, emptyI18nPlaceholder, forBlock.sourceSpan);
   unit.create.push(repeaterCreate2);
   const expression = convertAst(forBlock.expression, unit.job, convertSourceSpan(forBlock.expression.span, forBlock.sourceSpan));
   const repeater2 = createRepeaterOp(repeaterCreate2.xref, repeaterCreate2.handle, expression, forBlock.sourceSpan);
@@ -19197,6 +19660,15 @@ function convertAst(ast, job, baseSourceSpan) {
     }
   } else if (ast instanceof LiteralPrimitive) {
     return literal(ast.value, void 0, convertSourceSpan(ast.span, baseSourceSpan));
+  } else if (ast instanceof Unary) {
+    switch (ast.operator) {
+      case "+":
+        return new UnaryOperatorExpr(UnaryOperator.Plus, convertAst(ast.expr, job, baseSourceSpan), void 0, convertSourceSpan(ast.span, baseSourceSpan));
+      case "-":
+        return new UnaryOperatorExpr(UnaryOperator.Minus, convertAst(ast.expr, job, baseSourceSpan), void 0, convertSourceSpan(ast.span, baseSourceSpan));
+      default:
+        throw new Error(`AssertionError: unknown unary operator ${ast.operator}`);
+    }
   } else if (ast instanceof Binary) {
     const operator = BINARY_OPERATORS.get(ast.operation);
     if (operator === void 0) {
@@ -19234,104 +19706,134 @@ function convertAst(ast, job, baseSourceSpan) {
     return new SafeInvokeFunctionExpr(convertAst(ast.receiver, job, baseSourceSpan), ast.args.map((a) => convertAst(a, job, baseSourceSpan)));
   } else if (ast instanceof EmptyExpr) {
     return new EmptyExpr2(convertSourceSpan(ast.span, baseSourceSpan));
+  } else if (ast instanceof PrefixNot) {
+    return not(convertAst(ast.expression, job, baseSourceSpan), convertSourceSpan(ast.span, baseSourceSpan));
   } else {
     throw new Error(`Unhandled expression type "${ast.constructor.name}" in file "${baseSourceSpan == null ? void 0 : baseSourceSpan.start.file.url}"`);
   }
 }
+function convertAstWithInterpolation(job, value, i18nMeta) {
+  var _a2, _b2;
+  let expression;
+  if (value instanceof Interpolation) {
+    expression = new Interpolation2(value.strings, value.expressions.map((e) => convertAst(e, job, null)), Object.keys((_b2 = (_a2 = asMessage(i18nMeta)) == null ? void 0 : _a2.placeholders) != null ? _b2 : {}));
+  } else if (value instanceof AST) {
+    expression = convertAst(value, job, null);
+  } else {
+    expression = literal(value);
+  }
+  return expression;
+}
+var BINDING_KINDS = /* @__PURE__ */ new Map([
+  [0, BindingKind.Property],
+  [1, BindingKind.Attribute],
+  [2, BindingKind.ClassName],
+  [3, BindingKind.StyleProperty],
+  [4, BindingKind.Animation]
+]);
 function isPlainTemplate(tmpl) {
   var _a2;
-  return splitNsName((_a2 = tmpl.tagName) != null ? _a2 : "")[1] === "ng-template";
-}
-function ingestBindings(unit, op, element2) {
-  let flags = BindingFlags.None;
-  if (element2 instanceof Template) {
-    flags |= BindingFlags.OnNgTemplateElement;
-    if (element2 instanceof Template && isPlainTemplate(element2)) {
-      flags |= BindingFlags.BindingTargetsTemplate;
-    }
-    const templateAttrFlags = flags | BindingFlags.BindingTargetsTemplate | BindingFlags.IsStructuralTemplateAttribute;
-    for (const attr of element2.templateAttrs) {
-      if (attr instanceof TextAttribute) {
-        ingestBinding(unit, op.xref, attr.name, literal(attr.value), 1, null, SecurityContext.NONE, attr.sourceSpan, templateAttrFlags | BindingFlags.TextValue);
-      } else {
-        ingestBinding(unit, op.xref, attr.name, attr.value, attr.type, attr.unit, attr.securityContext, attr.sourceSpan, templateAttrFlags);
-      }
-    }
+  return splitNsName((_a2 = tmpl.tagName) != null ? _a2 : "")[1] === NG_TEMPLATE_TAG_NAME;
+}
+function asMessage(i18nMeta) {
+  if (i18nMeta == null) {
+    return null;
   }
+  if (!(i18nMeta instanceof Message)) {
+    throw Error(`Expected i18n meta to be a Message, but got: ${i18nMeta.constructor.name}`);
+  }
+  return i18nMeta;
+}
+function ingestElementBindings(unit, op, element2) {
+  var _a2;
+  let bindings = new Array();
   for (const attr of element2.attributes) {
-    ingestBinding(unit, op.xref, attr.name, literal(attr.value), 1, null, SecurityContext.NONE, attr.sourceSpan, flags | BindingFlags.TextValue);
+    const securityContext = domSchema.securityContext(element2.name, attr.name, true);
+    bindings.push(createBindingOp(op.xref, BindingKind.Attribute, attr.name, convertAstWithInterpolation(unit.job, attr.value, attr.i18n), null, securityContext, true, false, null, asMessage(attr.i18n), attr.sourceSpan));
   }
   for (const input of element2.inputs) {
-    ingestBinding(unit, op.xref, input.name, input.value, input.type, input.unit, input.securityContext, input.sourceSpan, flags);
+    bindings.push(createBindingOp(op.xref, BINDING_KINDS.get(input.type), input.name, convertAstWithInterpolation(unit.job, astOf(input.value), input.i18n), input.unit, input.securityContext, false, false, null, (_a2 = asMessage(input.i18n)) != null ? _a2 : null, input.sourceSpan));
   }
+  unit.create.push(bindings.filter((b) => (b == null ? void 0 : b.kind) === OpKind.ExtractedAttribute));
+  unit.update.push(bindings.filter((b) => (b == null ? void 0 : b.kind) === OpKind.Binding));
   for (const output of element2.outputs) {
-    let listenerOp;
-    if (output.type === 1) {
-      if (output.phase === null) {
-        throw Error("Animation listener should have a phase");
-      }
-    }
-    if (element2 instanceof Template && !isPlainTemplate(element2)) {
-      unit.create.push(createExtractedAttributeOp(op.xref, BindingKind.Property, output.name, null));
-      continue;
+    if (output.type === 1 && output.phase === null) {
+      throw Error("Animation listener should have a phase");
     }
-    listenerOp = createListenerOp(op.xref, op.handle, output.name, op.tag, output.phase, false, output.sourceSpan);
-    let handlerExprs;
-    let handler = output.handler;
-    if (handler instanceof ASTWithSource) {
-      handler = handler.ast;
-    }
-    if (handler instanceof Chain) {
-      handlerExprs = handler.expressions;
+    unit.create.push(createListenerOp(op.xref, op.handle, output.name, op.tag, makeListenerHandlerOps(unit, output.handler, output.handlerSpan), output.phase, output.target, false, output.sourceSpan));
+  }
+  if (bindings.some((b) => b == null ? void 0 : b.i18nMessage) !== null) {
+    unit.create.push(createI18nAttributesOp(unit.job.allocateXrefId(), new SlotHandle(), op.xref));
+  }
+}
+function ingestTemplateBindings(unit, op, template2, templateKind) {
+  let bindings = new Array();
+  for (const attr of template2.templateAttrs) {
+    if (attr instanceof TextAttribute) {
+      const securityContext = domSchema.securityContext(NG_TEMPLATE_TAG_NAME, attr.name, true);
+      bindings.push(createTemplateBinding(unit, op.xref, 1, attr.name, attr.value, null, securityContext, true, templateKind, asMessage(attr.i18n), attr.sourceSpan));
     } else {
-      handlerExprs = [handler];
+      bindings.push(createTemplateBinding(unit, op.xref, attr.type, attr.name, astOf(attr.value), attr.unit, attr.securityContext, true, templateKind, asMessage(attr.i18n), attr.sourceSpan));
     }
-    if (handlerExprs.length === 0) {
-      throw new Error("Expected listener to have non-empty expression list.");
+  }
+  for (const attr of template2.attributes) {
+    const securityContext = domSchema.securityContext(NG_TEMPLATE_TAG_NAME, attr.name, true);
+    bindings.push(createTemplateBinding(unit, op.xref, 1, attr.name, attr.value, null, securityContext, false, templateKind, asMessage(attr.i18n), attr.sourceSpan));
+  }
+  for (const input of template2.inputs) {
+    bindings.push(createTemplateBinding(unit, op.xref, input.type, input.name, astOf(input.value), input.unit, input.securityContext, false, templateKind, asMessage(input.i18n), input.sourceSpan));
+  }
+  unit.create.push(bindings.filter((b) => (b == null ? void 0 : b.kind) === OpKind.ExtractedAttribute));
+  unit.update.push(bindings.filter((b) => (b == null ? void 0 : b.kind) === OpKind.Binding));
+  for (const output of template2.outputs) {
+    if (output.type === 1 && output.phase === null) {
+      throw Error("Animation listener should have a phase");
+    }
+    if (templateKind === TemplateKind.NgTemplate) {
+      unit.create.push(createListenerOp(op.xref, op.handle, output.name, op.tag, makeListenerHandlerOps(unit, output.handler, output.handlerSpan), output.phase, output.target, false, output.sourceSpan));
     }
-    const expressions = handlerExprs.map((expr) => convertAst(expr, unit.job, output.handlerSpan));
-    const returnExpr = expressions.pop();
-    for (const expr of expressions) {
-      const stmtOp = createStatementOp(new ExpressionStatement(expr, expr.sourceSpan));
-      listenerOp.handlerOps.push(stmtOp);
+    if (templateKind === TemplateKind.Structural && output.type !== 1) {
+      const securityContext = domSchema.securityContext(NG_TEMPLATE_TAG_NAME, output.name, false);
+      unit.create.push(createExtractedAttributeOp(op.xref, BindingKind.Property, output.name, null, null, null, securityContext));
     }
-    listenerOp.handlerOps.push(createStatementOp(new ReturnStatement(returnExpr, returnExpr.sourceSpan)));
-    unit.create.push(listenerOp);
+  }
+  if (bindings.some((b) => b == null ? void 0 : b.i18nMessage) !== null) {
+    unit.create.push(createI18nAttributesOp(unit.job.allocateXrefId(), new SlotHandle(), op.xref));
   }
 }
-var BINDING_KINDS = /* @__PURE__ */ new Map([
-  [0, BindingKind.Property],
-  [1, BindingKind.Attribute],
-  [2, BindingKind.ClassName],
-  [3, BindingKind.StyleProperty],
-  [4, BindingKind.Animation]
-]);
-var BindingFlags;
-(function(BindingFlags2) {
-  BindingFlags2[BindingFlags2["None"] = 0] = "None";
-  BindingFlags2[BindingFlags2["TextValue"] = 1] = "TextValue";
-  BindingFlags2[BindingFlags2["BindingTargetsTemplate"] = 2] = "BindingTargetsTemplate";
-  BindingFlags2[BindingFlags2["IsStructuralTemplateAttribute"] = 4] = "IsStructuralTemplateAttribute";
-  BindingFlags2[BindingFlags2["OnNgTemplateElement"] = 8] = "OnNgTemplateElement";
-})(BindingFlags || (BindingFlags = {}));
-function ingestBinding(view, xref, name, value, type, unit, securityContext, sourceSpan, flags) {
-  if (value instanceof ASTWithSource) {
-    value = value.ast;
+function createTemplateBinding(view, xref, type, name, value, unit, securityContext, isStructuralTemplateAttribute, templateKind, i18nMessage, sourceSpan) {
+  const isTextBinding = typeof value === "string";
+  if (templateKind === TemplateKind.Structural) {
+    if (!isStructuralTemplateAttribute && (type === 0 || type === 2 || type === 3)) {
+      return createExtractedAttributeOp(xref, BindingKind.Property, name, null, null, i18nMessage, securityContext);
+    }
+    if (!isTextBinding && (type === 1 || type === 4)) {
+      return null;
+    }
   }
-  if (flags & BindingFlags.OnNgTemplateElement && !(flags & BindingFlags.BindingTargetsTemplate) && type === 0) {
-    view.create.push(createExtractedAttributeOp(xref, BindingKind.Property, name, null));
-    return;
+  let bindingType = BINDING_KINDS.get(type);
+  if (templateKind === TemplateKind.NgTemplate) {
+    if (type === 2 || type === 3 || type === 1 && !isTextBinding) {
+      bindingType = BindingKind.Property;
+    }
   }
-  let expression;
-  if (value instanceof Interpolation) {
-    expression = new Interpolation2(value.strings, value.expressions.map((expr) => convertAst(expr, view.job, null)));
-  } else if (value instanceof AST) {
-    expression = convertAst(value, view.job, null);
-  } else {
-    expression = value;
+  return createBindingOp(xref, bindingType, name, convertAstWithInterpolation(view.job, value, i18nMessage), unit, securityContext, isTextBinding, isStructuralTemplateAttribute, templateKind, i18nMessage, sourceSpan);
+}
+function makeListenerHandlerOps(unit, handler, handlerSpan) {
+  handler = astOf(handler);
+  const handlerOps = new Array();
+  let handlerExprs = handler instanceof Chain ? handler.expressions : [handler];
+  if (handlerExprs.length === 0) {
+    throw new Error("Expected listener to have non-empty expression list.");
   }
-  const kind = BINDING_KINDS.get(type);
-  view.update.push(createBindingOp(xref, kind, name, expression, unit, securityContext, !!(flags & BindingFlags.TextValue), !!(flags & BindingFlags.IsStructuralTemplateAttribute), sourceSpan));
+  const expressions = handlerExprs.map((expr) => convertAst(expr, unit.job, handlerSpan));
+  const returnExpr = expressions.pop();
+  handlerOps.push(...expressions.map((e) => createStatementOp(new ExpressionStatement(e, e.sourceSpan))));
+  handlerOps.push(createStatementOp(new ReturnStatement(returnExpr, returnExpr.sourceSpan)));
+  return handlerOps;
+}
+function astOf(ast) {
+  return ast instanceof ASTWithSource ? ast.ast : ast;
 }
 function ingestReferences(op, element2) {
   assertIsArray(op.localRefs);
@@ -19371,10 +19873,11 @@ function ingestControlFlowInsertionPoint(unit, xref, node) {
   }
   if (root !== null) {
     for (const attr of root.attributes) {
-      ingestBinding(unit, xref, attr.name, literal(attr.value), 1, null, SecurityContext.NONE, attr.sourceSpan, BindingFlags.TextValue);
+      const securityContext = domSchema.securityContext(NG_TEMPLATE_TAG_NAME, attr.name, true);
+      unit.update.push(createBindingOp(xref, BindingKind.Attribute, attr.name, literal(attr.value), null, securityContext, true, false, null, asMessage(attr.i18n), attr.sourceSpan));
     }
     const tagName = root instanceof Element ? root.name : root.tagName;
-    return tagName === "ng-template" ? null : tagName;
+    return tagName === NG_TEMPLATE_TAG_NAME ? null : tagName;
   }
   return null;
 }
@@ -21460,17 +21963,17 @@ function serializePlaceholderValue(value) {
 var NG_CONTENT_SELECT_ATTR2 = "select";
 var NG_PROJECT_AS_ATTR_NAME = "ngProjectAs";
 var EVENT_BINDING_SCOPE_GLOBALS = /* @__PURE__ */ new Set(["$event"]);
-var NG_TEMPLATE_TAG_NAME = "ng-template";
-var GLOBAL_TARGET_RESOLVERS = /* @__PURE__ */ new Map([["window", Identifiers.resolveWindow], ["document", Identifiers.resolveDocument], ["body", Identifiers.resolveBody]]);
+var NG_TEMPLATE_TAG_NAME2 = "ng-template";
+var GLOBAL_TARGET_RESOLVERS2 = /* @__PURE__ */ new Map([["window", Identifiers.resolveWindow], ["document", Identifiers.resolveDocument], ["body", Identifiers.resolveBody]]);
 var LEADING_TRIVIA_CHARS = [" ", "\n", "\r", "	"];
 function renderFlagCheckIfStmt(flags, statements) {
   return ifStmt(variable(RENDER_FLAGS).bitwiseAnd(literal(flags), null, false), statements);
 }
 function prepareEventListenerParameters(eventAst, handlerName = null, scope = null) {
   const { type, name, target, phase, handler } = eventAst;
-  if (target && !GLOBAL_TARGET_RESOLVERS.has(target)) {
+  if (target && !GLOBAL_TARGET_RESOLVERS2.has(target)) {
     throw new Error(`Unexpected global target '${target}' defined for '${name}' event.
-        Supported list of global targets: ${Array.from(GLOBAL_TARGET_RESOLVERS.keys())}.`);
+        Supported list of global targets: ${Array.from(GLOBAL_TARGET_RESOLVERS2.keys())}.`);
   }
   const eventArgumentName = "$event";
   const implicitReceiverAccesses = /* @__PURE__ */ new Set();
@@ -21503,7 +22006,7 @@ function prepareEventListenerParameters(eventAst, handlerName = null, scope = nu
   if (target) {
     params.push(
       literal(false),
-      importExpr(GLOBAL_TARGET_RESOLVERS.get(target))
+      importExpr(GLOBAL_TARGET_RESOLVERS2.get(target))
     );
   }
   return params;
@@ -22049,10 +22552,10 @@ var TemplateDefinitionBuilder = class {
     var _a2;
     const tagNameWithoutNamespace = template2.tagName ? splitNsName(template2.tagName)[1] : template2.tagName;
     const contextNameSuffix = template2.tagName ? "_" + sanitizeIdentifier(template2.tagName) : "";
-    const attrsExprs = this.getAttributeExpressions(NG_TEMPLATE_TAG_NAME, template2.attributes, template2.inputs, template2.outputs, void 0, template2.templateAttrs);
+    const attrsExprs = this.getAttributeExpressions(NG_TEMPLATE_TAG_NAME2, template2.attributes, template2.inputs, template2.outputs, void 0, template2.templateAttrs);
     const templateIndex = this.createEmbeddedTemplateFn(tagNameWithoutNamespace, template2.children, contextNameSuffix, template2.sourceSpan, template2.variables, attrsExprs, template2.references, template2.i18n);
     this.templatePropertyBindings(templateIndex, template2.templateAttrs);
-    if (tagNameWithoutNamespace === NG_TEMPLATE_TAG_NAME) {
+    if (tagNameWithoutNamespace === NG_TEMPLATE_TAG_NAME2) {
       const [i18nInputs, inputs] = partitionArray(template2.inputs, hasI18nMeta);
       if (i18nInputs.length > 0) {
         this.i18nAttributesInstruction(templateIndex, i18nInputs, (_a2 = template2.startSourceSpan) != null ? _a2 : template2.sourceSpan);
@@ -22293,8 +22796,8 @@ var TemplateDefinitionBuilder = class {
     }
     if (root !== null) {
       const name = root instanceof Element ? root.name : root.tagName;
-      tagName = name === NG_TEMPLATE_TAG_NAME ? null : name;
-      attrsExprs = this.getAttributeExpressions(NG_TEMPLATE_TAG_NAME, root.attributes, root.inputs, []);
+      tagName = name === NG_TEMPLATE_TAG_NAME2 ? null : name;
+      attrsExprs = this.getAttributeExpressions(NG_TEMPLATE_TAG_NAME2, root.attributes, root.inputs, []);
     }
     return { tagName, attrsExprs };
   }
@@ -22916,21 +23419,6 @@ var TrackByBindingScope = class extends BindingScope {
     return this.componentAccessCount;
   }
 };
-function createCssSelector(elementName, attributes) {
-  const cssSelector = new CssSelector();
-  const elementNameNoNs = splitNsName(elementName)[1];
-  cssSelector.setElement(elementNameNoNs);
-  Object.getOwnPropertyNames(attributes).forEach((name) => {
-    const nameNoNs = splitNsName(name)[1];
-    const value = attributes[name];
-    cssSelector.addAttribute(nameNoNs, value);
-    if (name.toLowerCase() === "class") {
-      const classes = value.trim().split(/\s+/);
-      classes.forEach((className) => cssSelector.addClassName(className));
-    }
-  });
-  return cssSelector;
-}
 function getNgProjectAsLiteral(attribute2) {
   const parsedR3Selector = parseSelectorToR3Selector(attribute2.value)[0];
   return [literal(5), asLiteral(parsedR3Selector)];
@@ -23469,6 +23957,7 @@ function createHostBindingsFunction(hostBindingsMetadata, typeSourceSpan, bindin
     }
     const hostJob = ingestHostBinding({
       componentName: name,
+      componentSelector: selector,
       properties: bindings,
       events: eventBindings,
       attributes: hostBindingsMetadata.attributes
@@ -23481,6 +23970,8 @@ function createHostBindingsFunction(hostBindingsMetadata, typeSourceSpan, bindin
     }
     return emitHostBindingFunction(hostJob);
   }
+  let bindingId = 0;
+  const getNextBindingId = () => `${bindingId++}`;
   const bindingContext = variable(CONTEXT_NAME);
   const styleBuilder = new StylingBuilder(bindingContext);
   const { styleAttr, classAttr } = hostBindingsMetadata.specialAttributes;
@@ -23530,7 +24021,7 @@ function createHostBindingsFunction(hostBindingsMetadata, typeSourceSpan, bindin
   const syntheticHostBindings = [];
   for (const binding of allOtherBindings) {
     const value = binding.expression.visit(getValueConverter());
-    const bindingExpr = bindingFn(bindingContext, value);
+    const bindingExpr = bindingFn(bindingContext, value, getNextBindingId);
     const { bindingName, instruction, isAttribute } = getBindingNameAndInstruction(binding);
     const securityContexts = bindingParser.calcPossibleSecurityContexts(selector, bindingName, isAttribute).filter((context) => context !== SecurityContext.NONE);
     let sanitizerFn = null;
@@ -23575,9 +24066,11 @@ function createHostBindingsFunction(hostBindingsMetadata, typeSourceSpan, bindin
     styleBuilder.buildUpdateLevelInstructions(getValueConverter()).forEach((instruction) => {
       for (const call2 of instruction.calls) {
         totalHostVarsCount += Math.max(call2.allocateBindingSlots - MIN_STYLING_BINDING_SLOTS_REQUIRED, 0);
+        const { params, stmts } = convertStylingCall(call2, bindingContext, bindingFn, getNextBindingId);
+        updateVariables.push(...stmts);
         updateInstructions.push({
           reference: instruction.reference,
-          paramsOrFn: convertStylingCall(call2, bindingContext, bindingFn),
+          paramsOrFn: params,
           span: null
         });
       }
@@ -23599,11 +24092,19 @@ function createHostBindingsFunction(hostBindingsMetadata, typeSourceSpan, bindin
   }
   return null;
 }
-function bindingFn(implicit, value) {
-  return convertPropertyBinding(null, implicit, value, "b");
+function bindingFn(implicit, value, getNextBindingIdFn) {
+  return convertPropertyBinding(null, implicit, value, getNextBindingIdFn());
 }
-function convertStylingCall(call2, bindingContext, bindingFn2) {
-  return call2.params((value) => bindingFn2(bindingContext, value).currValExpr);
+function convertStylingCall(call2, bindingContext, bindingFn2, getNextBindingIdFn) {
+  const stmts = [];
+  const params = call2.params((value) => {
+    const result = bindingFn2(bindingContext, value, getNextBindingIdFn);
+    if (Array.isArray(result.stmts) && result.stmts.length > 0) {
+      stmts.push(...result.stmts);
+    }
+    return result.currValExpr;
+  });
+  return { params, stmts };
 }
 function getBindingNameAndInstruction(binding) {
   let bindingName = binding.name;
@@ -23918,13 +24419,13 @@ var DirectiveBinder = class {
     template2.forEach((node) => node.visit(this));
   }
   visitElement(element2) {
-    this.visitElementOrTemplate(element2.name, element2);
+    this.visitElementOrTemplate(element2);
   }
   visitTemplate(template2) {
-    this.visitElementOrTemplate("ng-template", template2);
+    this.visitElementOrTemplate(template2);
   }
-  visitElementOrTemplate(elementName, node) {
-    const cssSelector = createCssSelector(elementName, getAttrsForDirectiveMatching(node));
+  visitElementOrTemplate(node) {
+    const cssSelector = createCssSelectorFromNode(node);
     const directives = [];
     this.matcher.match(cssSelector, (_selector, results) => directives.push(...results));
     if (directives.length > 0) {
@@ -24912,7 +25413,7 @@ function publishFacade(global) {
 }
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/version.mjs
-var VERSION2 = new Version("17.0.5");
+var VERSION2 = new Version("17.0.7");
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/i18n/extractor_merger.mjs
 var _VisitorMode;
@@ -24962,6 +25463,10 @@ var boundngifelse = "[ngIfElse]";
 var boundngifthenelse = "[ngIfThenElse]";
 var boundngifthen = "[ngIfThen]";
 var nakedngfor = "ngFor";
+var startMarker = "\u25EC";
+var endMarker = "\u2722";
+var startI18nMarker = "\u2688";
+var endI18nMarker = "\u2689";
 function allFormsOf(selector) {
   return [
     selector,
@@ -25003,12 +25508,13 @@ var commonModulePipes = [
   "titlecase"
 ].map((name) => pipeMatchRegExpFor(name));
 var ElementToMigrate = class {
-  constructor(el, attr, elseAttr = void 0, thenAttr = void 0, forAttrs = void 0) {
+  constructor(el, attr, elseAttr = void 0, thenAttr = void 0, forAttrs = void 0, aliasAttrs = void 0) {
     __publicField(this, "el");
     __publicField(this, "attr");
     __publicField(this, "elseAttr");
     __publicField(this, "thenAttr");
     __publicField(this, "forAttrs");
+    __publicField(this, "aliasAttrs");
     __publicField(this, "nestCount", 0);
     __publicField(this, "hasLineBreaks", false);
     this.el = el;
@@ -25016,6 +25522,7 @@ var ElementToMigrate = class {
     this.elseAttr = elseAttr;
     this.thenAttr = thenAttr;
     this.forAttrs = forAttrs;
+    this.aliasAttrs = aliasAttrs;
   }
   getCondition() {
     const chunks = this.attr.value.split(";");
@@ -25033,7 +25540,11 @@ var ElementToMigrate = class {
   getTemplateName(targetStr, secondStr) {
     const targetLocation = this.attr.value.indexOf(targetStr);
     const secondTargetLocation = secondStr ? this.attr.value.indexOf(secondStr) : void 0;
-    return this.attr.value.slice(targetLocation + targetStr.length, secondTargetLocation).replace(":", "").trim().split(";")[0].trim();
+    let templateName = this.attr.value.slice(targetLocation + targetStr.length, secondTargetLocation);
+    if (templateName.startsWith(":")) {
+      templateName = templateName.slice(1).trim();
+    }
+    return templateName.split(";")[0].trim();
   }
   getValueEnd(offset) {
     return (this.attr.valueSpan ? this.attr.valueSpan.end.offset + 1 : this.attr.keySpan.end.offset) - offset;
@@ -25108,6 +25619,7 @@ var AnalyzedFile = class {
   constructor() {
     __publicField(this, "ranges", []);
     __publicField(this, "removeCommonModule", false);
+    __publicField(this, "canRemoveImports", false);
     __publicField(this, "sourceFilePath", "");
   }
   getSortedRanges() {
@@ -25155,6 +25667,18 @@ var CommonCollector = class extends RecursiveVisitor {
     return commonModulePipes.some((regexp) => regexp.test(input));
   }
 };
+var i18nCollector = class extends RecursiveVisitor {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "elements", []);
+  }
+  visitElement(el) {
+    if (el.attrs.find((a) => a.name === "i18n") !== void 0) {
+      this.elements.push(el);
+    }
+    super.visitElement(el, null);
+  }
+};
 var ElementCollector = class extends RecursiveVisitor {
   constructor(_attributes = []) {
     super();
@@ -25169,15 +25693,14 @@ var ElementCollector = class extends RecursiveVisitor {
           const elseAttr = el.attrs.find((x) => x.name === boundngifelse);
           const thenAttr = el.attrs.find((x) => x.name === boundngifthenelse || x.name === boundngifthen);
           const forAttrs = attr.name === nakedngfor ? this.getForAttrs(el) : void 0;
-          this.elements.push(new ElementToMigrate(el, attr, elseAttr, thenAttr, forAttrs));
+          const aliasAttrs = this.getAliasAttrs(el);
+          this.elements.push(new ElementToMigrate(el, attr, elseAttr, thenAttr, forAttrs, aliasAttrs));
         }
       }
     }
     super.visitElement(el, null);
   }
   getForAttrs(el) {
-    const aliases = /* @__PURE__ */ new Map();
-    let item = "";
     let trackBy = "";
     let forOf = "";
     for (const attr of el.attrs) {
@@ -25187,6 +25710,13 @@ var ElementCollector = class extends RecursiveVisitor {
       if (attr.name === "[ngForOf]") {
         forOf = attr.value;
       }
+    }
+    return { forOf, trackBy };
+  }
+  getAliasAttrs(el) {
+    const aliases = /* @__PURE__ */ new Map();
+    let item = "";
+    for (const attr of el.attrs) {
       if (attr.name.startsWith("let-")) {
         if (attr.value === "") {
           item = attr.name.replace("let-", "");
@@ -25195,7 +25725,7 @@ var ElementCollector = class extends RecursiveVisitor {
         }
       }
     }
-    return { forOf, trackBy, item, aliases };
+    return { item, aliases };
   }
 };
 var TemplateCollector = class extends RecursiveVisitor {
@@ -25242,6 +25772,11 @@ var importRemovals = [
   "NgSwitchDefault"
 ];
 var importWithCommonRemovals = [...importRemovals, "CommonModule"];
+var startMarkerRegex = new RegExp(startMarker, "gm");
+var endMarkerRegex = new RegExp(endMarker, "gm");
+var startI18nMarkerRegex = new RegExp(startI18nMarker, "gm");
+var endI18nMarkerRegex = new RegExp(endI18nMarker, "gm");
+var replaceMarkerRegex = new RegExp(`${startMarker}|${endMarker}`, "gm");
 function analyze(sourceFile, analyzedFiles) {
   forEachClass(sourceFile, (node) => {
     if (import_typescript5.default.isClassDeclaration(node)) {
@@ -25279,9 +25814,7 @@ function updateImportClause(clause, removeCommonModule) {
   return clause;
 }
 function updateClassImports(propAssignment, removeCommonModule) {
-  const printer = import_typescript5.default.createPrinter({
-    removeComments: true
-  });
+  const printer = import_typescript5.default.createPrinter();
   const importList = propAssignment.initializer;
   const removals = removeCommonModule ? importWithCommonRemovals : importRemovals;
   const elements = importList.elements.filter((el) => !removals.includes(el.getText()));
@@ -25364,12 +25897,13 @@ function parseTemplate2(template2) {
       preserveLineEndings: true
     });
     if (parsed.errors && parsed.errors.length > 0) {
-      return null;
+      const errors = parsed.errors.map((e) => ({ type: "parse", error: e }));
+      return { tree: void 0, errors };
     }
   } catch (e) {
-    return null;
+    return { tree: void 0, errors: [{ type: "parse", error: e }] };
   }
-  return parsed;
+  return { tree: parsed, errors: [] };
 }
 function calculateNesting(visitor, hasLineBreaks2) {
   let nestedQueue = [];
@@ -25406,12 +25940,12 @@ function reduceNestingOffset(el, nestLevel, offset, postOffsets) {
 function getTemplates(template2) {
   var _a2;
   const parsed = parseTemplate2(template2);
-  if (parsed !== null) {
+  if (parsed.tree !== void 0) {
     const visitor = new TemplateCollector();
-    visitAll2(visitor, parsed.rootNodes);
+    visitAll2(visitor, parsed.tree.rootNodes);
     for (let [key, tmpl] of visitor.templates) {
       const escapeKey = escapeRegExp(key.slice(1));
-      const regex = new RegExp(`[^a-zA-Z0-9-<']${escapeKey}\\W`, "gm");
+      const regex = new RegExp(`[^a-zA-Z0-9-<(']${escapeKey}\\W`, "gm");
       const matches = template2.match(regex);
       tmpl.count = (_a2 = matches == null ? void 0 : matches.length) != null ? _a2 : 0;
       tmpl.generateContents(template2);
@@ -25420,6 +25954,13 @@ function getTemplates(template2) {
   }
   return /* @__PURE__ */ new Map();
 }
+function updateTemplates(template2, templates) {
+  const updatedTemplates = getTemplates(template2);
+  for (let [key, tmpl] of updatedTemplates) {
+    templates.set(key, tmpl);
+  }
+  return templates;
+}
 function wrapIntoI18nContainer(i18nAttr, content) {
   const { start, middle, end } = generatei18nContainer(i18nAttr, content);
   return `${start}${middle}${end}`;
@@ -25432,8 +25973,8 @@ function processNgTemplates(template2) {
   try {
     const templates = getTemplates(template2);
     for (const [name, t] of templates) {
-      const replaceRegex = new RegExp(`${name}\\|`, "g");
-      const forRegex = new RegExp(`${name}\\#`, "g");
+      const replaceRegex = new RegExp(`\u03B8${name.slice(1)}\\\u03B4`, "g");
+      const forRegex = new RegExp(`\u03B8${name.slice(1)}\\\u03C6`, "g");
       const forMatches = [...template2.matchAll(forRegex)];
       const matches = [...forMatches, ...template2.matchAll(replaceRegex)];
       let safeToRemove = true;
@@ -25454,21 +25995,33 @@ function processNgTemplates(template2) {
           template2 = template2.replace(replaceRegex, t.children);
         }
         if (t.count === matches.length + 1 && safeToRemove) {
-          template2 = template2.replace(t.contents, "");
+          template2 = template2.replace(t.contents, `${startMarker}${endMarker}`);
         }
+        updateTemplates(template2, templates);
       }
     }
+    template2 = replaceRemainingPlaceholders(template2);
     return { migrated: template2, err: void 0 };
   } catch (err) {
     return { migrated: template2, err };
   }
 }
+function replaceRemainingPlaceholders(template2) {
+  const replaceRegex = new RegExp(`\u03B8.*\u03B4`, "g");
+  const placeholders = [...template2.matchAll(replaceRegex)];
+  for (let ph of placeholders) {
+    const placeholder = ph[0];
+    const name = placeholder.slice(1, placeholder.length - 1);
+    template2 = template2.replace(placeholder, `<ng-template [ngTemplateOutlet]="${name}"></ng-template>`);
+  }
+  return template2;
+}
 function canRemoveCommonModule(template2) {
   const parsed = parseTemplate2(template2);
   let removeCommonModule = false;
-  if (parsed !== null) {
+  if (parsed.tree !== void 0) {
     const visitor = new CommonCollector();
-    visitAll2(visitor, parsed.rootNodes);
+    visitAll2(visitor, parsed.tree.rootNodes);
     removeCommonModule = visitor.count === 0;
   }
   return removeCommonModule;
@@ -25489,16 +26042,46 @@ function getOriginals(etm, tmpl, offset) {
     const start2 = tmpl.slice(etm.el.sourceSpan.start.offset - offset, etm.el.children[0].sourceSpan.start.offset - offset);
     const end = tmpl.slice(etm.el.children[etm.el.children.length - 1].sourceSpan.end.offset - offset, etm.el.sourceSpan.end.offset - offset);
     const childLength = childEnd - childStart;
-    return { start: start2, end, childLength };
+    return {
+      start: start2,
+      end,
+      childLength,
+      children: getOriginalChildren(etm.el.children, tmpl, offset),
+      childNodes: etm.el.children
+    };
   }
   const start = tmpl.slice(etm.el.sourceSpan.start.offset - offset, etm.el.sourceSpan.end.offset - offset);
-  return { start, end: "", childLength: 0 };
+  return { start, end: "", childLength: 0, children: [], childNodes: [] };
+}
+function getOriginalChildren(children, tmpl, offset) {
+  return children.map((child) => {
+    return tmpl.slice(child.sourceSpan.start.offset - offset, child.sourceSpan.end.offset - offset);
+  });
 }
 function isI18nTemplate(etm, i18nAttr) {
-  return etm.el.name === "ng-template" && i18nAttr !== void 0 && (etm.el.attrs.length === 2 || etm.el.attrs.length === 3 && etm.elseAttr !== void 0);
+  let attrCount = countAttributes(etm);
+  const safeToRemove = etm.el.attrs.length === attrCount + (i18nAttr !== void 0 ? 1 : 0);
+  return etm.el.name === "ng-template" && i18nAttr !== void 0 && safeToRemove;
 }
 function isRemovableContainer(etm) {
-  return (etm.el.name === "ng-container" || etm.el.name === "ng-template") && (etm.el.attrs.length === 1 || etm.forAttrs !== void 0 || etm.el.attrs.length === 2 && etm.elseAttr !== void 0 || etm.el.attrs.length === 3 && etm.elseAttr !== void 0 && etm.thenAttr !== void 0);
+  let attrCount = countAttributes(etm);
+  const safeToRemove = etm.el.attrs.length === attrCount;
+  return (etm.el.name === "ng-container" || etm.el.name === "ng-template") && safeToRemove;
+}
+function countAttributes(etm) {
+  var _a2, _b2, _c2, _d2, _e2;
+  let attrCount = 1;
+  if (etm.elseAttr !== void 0) {
+    attrCount++;
+  }
+  if (etm.thenAttr !== void 0) {
+    attrCount++;
+  }
+  attrCount += (_b2 = (_a2 = etm.aliasAttrs) == null ? void 0 : _a2.aliases.size) != null ? _b2 : 0;
+  attrCount += ((_c2 = etm.aliasAttrs) == null ? void 0 : _c2.item) ? 1 : 0;
+  attrCount += ((_d2 = etm.forAttrs) == null ? void 0 : _d2.trackBy) ? 1 : 0;
+  attrCount += ((_e2 = etm.forAttrs) == null ? void 0 : _e2.forOf) ? 1 : 0;
+  return attrCount;
 }
 function getMainBlock(etm, tmpl, offset) {
   const i18nAttr = etm.el.attrs.find((x) => x.name === "i18n");
@@ -25507,6 +26090,8 @@ function getMainBlock(etm, tmpl, offset) {
     if (etm.hasChildren()) {
       const { childStart: childStart2, childEnd: childEnd2 } = etm.getChildSpan(offset);
       middle2 = tmpl.slice(childStart2, childEnd2);
+    } else {
+      middle2 = startMarker + endMarker;
     }
     return { start: "", middle: middle2, end: "" };
   } else if (isI18nTemplate(etm, i18nAttr)) {
@@ -25517,16 +26102,37 @@ function getMainBlock(etm, tmpl, offset) {
   const valEnd = etm.getValueEnd(offset);
   const { childStart, childEnd } = etm.hasChildren() ? etm.getChildSpan(offset) : { childStart: valEnd, childEnd: valEnd };
   let start = tmpl.slice(etm.start(offset), attrStart) + tmpl.slice(valEnd, childStart);
+  const middle = tmpl.slice(childStart, childEnd);
+  let end = tmpl.slice(childEnd, etm.end(offset));
   if (etm.shouldRemoveElseAttr()) {
     start = start.replace(etm.getElseAttrStr(), "");
+    end = end.replace(etm.getElseAttrStr(), "");
   }
-  const middle = tmpl.slice(childStart, childEnd);
-  const end = tmpl.slice(childEnd, etm.end(offset));
   return { start, middle, end };
 }
+function generateI18nMarkers(tmpl) {
+  let parsed = parseTemplate2(tmpl);
+  if (parsed.tree !== void 0) {
+    const visitor = new i18nCollector();
+    visitAll2(visitor, parsed.tree.rootNodes);
+    for (const [ix, el] of visitor.elements.entries()) {
+      const offset = ix * 2;
+      if (el.children.length > 0) {
+        tmpl = addI18nMarkers(tmpl, el, offset);
+      }
+    }
+  }
+  return tmpl;
+}
+function addI18nMarkers(tmpl, el, offset) {
+  const startPos = el.children[0].sourceSpan.start.offset + offset;
+  const endPos = el.children[el.children.length - 1].sourceSpan.end.offset + offset;
+  return tmpl.slice(0, startPos) + startI18nMarker + tmpl.slice(startPos, endPos) + endI18nMarker + tmpl.slice(endPos);
+}
 var selfClosingList = "input|br|img|base|wbr|area|col|embed|hr|link|meta|param|source|track";
 function formatTemplate(tmpl, templateType) {
   if (tmpl.indexOf("\n") > -1) {
+    tmpl = generateI18nMarkers(tmpl);
     let openSelfClosingEl = false;
     const openBlockRegex = /^\s*\@(if|switch|case|default|for)|^\s*\}\s\@else/;
     const openElRegex = /^\s*<([a-z0-9]+)(?![^>]*\/>)[^>]*>?/;
@@ -25541,8 +26147,20 @@ function formatTemplate(tmpl, templateType) {
     const formatted = [];
     let indent = "";
     let mindent = "";
+    let depth = 0;
+    let i18nDepth = 0;
+    let inMigratedBlock = false;
+    let inI18nBlock = false;
     for (let [index, line] of lines.entries()) {
-      if (line.trim() === "" && index !== 0 && index !== lines.length - 1) {
+      depth += [...line.matchAll(startMarkerRegex)].length - [...line.matchAll(endMarkerRegex)].length;
+      inMigratedBlock = depth > 0;
+      i18nDepth += [...line.matchAll(startI18nMarkerRegex)].length - [...line.matchAll(endI18nMarkerRegex)].length;
+      let lineWasMigrated = false;
+      if (line.match(replaceMarkerRegex)) {
+        line = line.replace(replaceMarkerRegex, "");
+        lineWasMigrated = true;
+      }
+      if (line.trim() === "" && index !== 0 && index !== lines.length - 1 && (inMigratedBlock || lineWasMigrated)) {
         continue;
       }
       if (templateType === "template" && index <= 1) {
@@ -25552,7 +26170,8 @@ function formatTemplate(tmpl, templateType) {
       if ((closeBlockRegex.test(line) || closeElRegex.test(line) && (!singleLineElRegex.test(line) && !closeMultiLineElRegex.test(line))) && indent !== "") {
         indent = indent.slice(2);
       }
-      formatted.push(mindent + indent + line.trim());
+      const newLine = inI18nBlock ? line : mindent + (line.trim() !== "" ? indent : "") + line.trim();
+      formatted.push(newLine);
       if (closeMultiLineElRegex.test(line)) {
         indent = indent.slice(2);
         if (openSelfClosingEl) {
@@ -25570,6 +26189,7 @@ function formatTemplate(tmpl, templateType) {
         openSelfClosingEl = true;
         indent += "  ";
       }
+      inI18nBlock = i18nDepth > 0;
     }
     tmpl = formatted.join("\n");
   }
@@ -25600,12 +26220,12 @@ var cases = [
 function migrateCase(template2) {
   let errors = [];
   let parsed = parseTemplate2(template2);
-  if (parsed === null) {
+  if (parsed.tree === void 0) {
     return { migrated: template2, errors, changed: false };
   }
   let result = template2;
   const visitor = new ElementCollector(cases);
-  visitAll2(visitor, parsed.rootNodes);
+  visitAll2(visitor, parsed.tree.rootNodes);
   calculateNesting(visitor, hasLineBreaks(template2));
   let offset = 0;
   let nestLevel = -1;
@@ -25640,8 +26260,8 @@ function migrateNgSwitchCase(etm, tmpl, offset) {
   const condition = etm.attr.value;
   const originals = getOriginals(etm, tmpl, offset);
   const { start, middle, end } = getMainBlock(etm, tmpl, offset);
-  const startBlock = `${leadingSpace}@case (${condition}) {${leadingSpace}${lbString}${start}`;
-  const endBlock = `${end}${lbString}${leadingSpace}}`;
+  const startBlock = `${startMarker}${leadingSpace}@case (${condition}) {${leadingSpace}${lbString}${start}`;
+  const endBlock = `${end}${lbString}${leadingSpace}}${endMarker}`;
   const defaultBlock = startBlock + middle + endBlock;
   const updatedTmpl = tmpl.slice(0, etm.start(offset)) + defaultBlock + tmpl.slice(etm.end(offset));
   const pre = originals.start.length - startBlock.length;
@@ -25653,8 +26273,8 @@ function migrateNgSwitchDefault(etm, tmpl, offset) {
   const leadingSpace = etm.hasLineBreaks ? "" : " ";
   const originals = getOriginals(etm, tmpl, offset);
   const { start, middle, end } = getMainBlock(etm, tmpl, offset);
-  const startBlock = `${leadingSpace}@default {${leadingSpace}${lbString}${start}`;
-  const endBlock = `${end}${lbString}${leadingSpace}}`;
+  const startBlock = `${startMarker}${leadingSpace}@default {${leadingSpace}${lbString}${start}`;
+  const endBlock = `${end}${lbString}${leadingSpace}}${endMarker}`;
   const defaultBlock = startBlock + middle + endBlock;
   const updatedTmpl = tmpl.slice(0, etm.start(offset)) + defaultBlock + tmpl.slice(etm.end(offset));
   const pre = originals.start.length - startBlock.length;
@@ -25681,12 +26301,12 @@ var stringPairs = /* @__PURE__ */ new Map([
 function migrateFor(template2) {
   let errors = [];
   let parsed = parseTemplate2(template2);
-  if (parsed === null) {
+  if (parsed.tree === void 0) {
     return { migrated: template2, errors, changed: false };
   }
   let result = template2;
   const visitor = new ElementCollector(fors);
-  visitAll2(visitor, parsed.rootNodes);
+  visitAll2(visitor, parsed.tree.rootNodes);
   calculateNesting(visitor, hasLineBreaks(template2));
   let offset = 0;
   let nestLevel = -1;
@@ -25736,7 +26356,7 @@ function migrateStandardNgFor(etm, tmpl, offset) {
       trackBy = `${trackByFn}($index, ${loopVar})`;
     }
     if (part.startsWith("template:")) {
-      tmplPlaceholder = `#${part.split(":")[1].trim()}#`;
+      tmplPlaceholder = `\u03B8${part.split(":")[1].trim()}\u03C6`;
     }
     if (part.match(aliasWithEqualRegexp)) {
       const aliasParts = part.split("=");
@@ -25757,8 +26377,8 @@ function migrateStandardNgFor(etm, tmpl, offset) {
     trackBy = trackBy.replace("$index", aliasedIndex);
   }
   const aliasStr = aliases.length > 0 ? `;${aliases.join(";")}` : "";
-  let startBlock = `@for (${condition}; track ${trackBy}${aliasStr}) {${lbString}`;
-  let endBlock = `${lbString}}`;
+  let startBlock = `${startMarker}@for (${condition}; track ${trackBy}${aliasStr}) {${lbString}`;
+  let endBlock = `${lbString}}${endMarker}`;
   let forBlock = "";
   if (tmplPlaceholder !== "") {
     startBlock = startBlock + tmplPlaceholder;
@@ -25776,9 +26396,10 @@ function migrateStandardNgFor(etm, tmpl, offset) {
 }
 function migrateBoundNgFor(etm, tmpl, offset) {
   const forAttrs = etm.forAttrs;
-  const aliasMap = forAttrs.aliases;
+  const aliasAttrs = etm.aliasAttrs;
+  const aliasMap = aliasAttrs.aliases;
   const originals = getOriginals(etm, tmpl, offset);
-  const condition = `${forAttrs.item} of ${forAttrs.forOf}`;
+  const condition = `${aliasAttrs.item} of ${forAttrs.forOf}`;
   const aliases = [];
   let aliasedIndex = "$index";
   for (const [key, val] of aliasMap) {
@@ -25788,15 +26409,15 @@ function migrateBoundNgFor(etm, tmpl, offset) {
     }
   }
   const aliasStr = aliases.length > 0 ? `;${aliases.join(";")}` : "";
-  let trackBy = forAttrs.item;
+  let trackBy = aliasAttrs.item;
   if (forAttrs.trackBy !== "") {
-    trackBy = `${forAttrs.trackBy.trim()}(${aliasedIndex}, ${forAttrs.item})`;
+    trackBy = `${forAttrs.trackBy.trim()}(${aliasedIndex}, ${aliasAttrs.item})`;
   }
   const { start, middle, end } = getMainBlock(etm, tmpl, offset);
-  const startBlock = `@for (${condition}; track ${trackBy}${aliasStr}) {
+  const startBlock = `${startMarker}@for (${condition}; track ${trackBy}${aliasStr}) {
 ${start}`;
   const endBlock = `${end}
-}`;
+}${endMarker}`;
   const forBlock = startBlock + middle + endBlock;
   const updatedTmpl = tmpl.slice(0, etm.start(offset)) + forBlock + tmpl.slice(etm.end(offset));
   const pre = originals.start.length - startBlock.length;
@@ -25847,12 +26468,12 @@ var ifs = [
 function migrateIf(template2) {
   let errors = [];
   let parsed = parseTemplate2(template2);
-  if (parsed === null) {
+  if (parsed.tree === void 0) {
     return { migrated: template2, errors, changed: false };
   }
   let result = template2;
   const visitor = new ElementCollector(ifs);
-  visitAll2(visitor, parsed.rootNodes);
+  visitAll2(visitor, parsed.tree.rootNodes);
   calculateNesting(visitor, hasLineBreaks(template2));
   let offset = 0;
   let nestLevel = -1;
@@ -25874,24 +26495,36 @@ function migrateIf(template2) {
   return { migrated: result, errors, changed };
 }
 function migrateNgIf(etm, tmpl, offset) {
-  const matchThen = etm.attr.value.match(/;?\s*then/gm);
-  const matchElse = etm.attr.value.match(/;?\s*else/gm);
+  const matchThen = etm.attr.value.match(/[^\w\d];?\s*then/gm);
+  const matchElse = etm.attr.value.match(/[^\w\d];?\s*else/gm);
   if (etm.thenAttr !== void 0 || etm.elseAttr !== void 0) {
     return buildBoundIfElseBlock(etm, tmpl, offset);
-  } else if (matchThen && matchThen.length > 0) {
+  } else if (matchThen && matchThen.length > 0 && matchElse && matchElse.length > 0) {
     return buildStandardIfThenElseBlock(etm, tmpl, matchThen[0], matchElse[0], offset);
+  } else if (matchThen && matchThen.length > 0) {
+    return buildStandardIfThenBlock(etm, tmpl, matchThen[0], offset);
   } else if (matchElse && matchElse.length > 0) {
     return buildStandardIfElseBlock(etm, tmpl, matchElse[0], offset);
   }
   return buildIfBlock(etm, tmpl, offset);
 }
 function buildIfBlock(etm, tmpl, offset) {
+  const aliasAttrs = etm.aliasAttrs;
+  const aliases = [...aliasAttrs.aliases.keys()];
+  if (aliasAttrs.item) {
+    aliases.push(aliasAttrs.item);
+  }
   const lbString = etm.hasLineBreaks ? "\n" : "";
-  const condition = etm.attr.value.replace(" as ", "; as ").replace(/;\s*let/g, "; as");
+  let condition = etm.attr.value.replace(" as ", "; as ").replace(/;\s*let/g, "; as");
+  if (aliases.length > 1 || aliases.length === 1 && condition.indexOf("; as") > -1) {
+    throw new Error("Found more than one alias on your ngIf. Remove one of them and re-run the migration.");
+  } else if (aliases.length === 1) {
+    condition += `; as ${aliases[0]}`;
+  }
   const originals = getOriginals(etm, tmpl, offset);
   const { start, middle, end } = getMainBlock(etm, tmpl, offset);
-  const startBlock = `@if (${condition}) {${lbString}${start}`;
-  const endBlock = `${end}${lbString}}`;
+  const startBlock = `${startMarker}@if (${condition}) {${lbString}${start}`;
+  const endBlock = `${end}${lbString}}${endMarker}`;
   const ifBlock = startBlock + middle + endBlock;
   const updatedTmpl = tmpl.slice(0, etm.start(offset)) + ifBlock + tmpl.slice(etm.end(offset));
   const pre = originals.start.length - startBlock.length;
@@ -25900,14 +26533,24 @@ function buildIfBlock(etm, tmpl, offset) {
 }
 function buildStandardIfElseBlock(etm, tmpl, elseString, offset) {
   const condition = etm.getCondition().replace(" as ", "; as ").replace(/;\s*let/g, "; as");
-  const elsePlaceholder = `#${etm.getTemplateName(elseString)}|`;
+  const elsePlaceholder = `\u03B8${etm.getTemplateName(elseString)}\u03B4`;
   return buildIfElseBlock(etm, tmpl, condition, elsePlaceholder, offset);
 }
 function buildBoundIfElseBlock(etm, tmpl, offset) {
-  const condition = etm.attr.value.replace(" as ", "; as ");
-  const elsePlaceholder = `#${etm.elseAttr.value}|`;
+  const aliasAttrs = etm.aliasAttrs;
+  const aliases = [...aliasAttrs.aliases.keys()];
+  if (aliasAttrs.item) {
+    aliases.push(aliasAttrs.item);
+  }
+  let condition = etm.attr.value.replace(" as ", "; as ");
+  if (aliases.length > 1 || aliases.length === 1 && condition.indexOf("; as") > -1) {
+    throw new Error("Found more than one alias on your ngIf. Remove one of them and re-run the migration.");
+  } else if (aliases.length === 1) {
+    condition += `; as ${aliases[0]}`;
+  }
+  const elsePlaceholder = `\u03B8${etm.elseAttr.value.trim()}\u03B4`;
   if (etm.thenAttr !== void 0) {
-    const thenPlaceholder = `#${etm.thenAttr.value}|`;
+    const thenPlaceholder = `\u03B8${etm.thenAttr.value.trim()}\u03B4`;
     return buildIfThenElseBlock(etm, tmpl, condition, thenPlaceholder, elsePlaceholder, offset);
   }
   return buildIfElseBlock(etm, tmpl, condition, elsePlaceholder, offset);
@@ -25916,9 +26559,9 @@ function buildIfElseBlock(etm, tmpl, condition, elsePlaceholder, offset) {
   const lbString = etm.hasLineBreaks ? "\n" : "";
   const originals = getOriginals(etm, tmpl, offset);
   const { start, middle, end } = getMainBlock(etm, tmpl, offset);
-  const startBlock = `@if (${condition}) {${lbString}${start}`;
+  const startBlock = `${startMarker}@if (${condition}) {${lbString}${start}`;
   const elseBlock = `${end}${lbString}} @else {${lbString}`;
-  const postBlock = elseBlock + elsePlaceholder + `${lbString}}`;
+  const postBlock = elseBlock + elsePlaceholder + `${lbString}}${endMarker}`;
   const ifElseBlock = startBlock + middle + postBlock;
   const tmplStart = tmpl.slice(0, etm.start(offset));
   const tmplEnd = tmpl.slice(etm.end(offset));
@@ -25929,16 +26572,21 @@ function buildIfElseBlock(etm, tmpl, condition, elsePlaceholder, offset) {
 }
 function buildStandardIfThenElseBlock(etm, tmpl, thenString, elseString, offset) {
   const condition = etm.getCondition().replace(" as ", "; as ").replace(/;\s*let/g, "; as");
-  const thenPlaceholder = `#${etm.getTemplateName(thenString, elseString)}|`;
-  const elsePlaceholder = `#${etm.getTemplateName(elseString)}|`;
+  const thenPlaceholder = `\u03B8${etm.getTemplateName(thenString, elseString)}\u03B4`;
+  const elsePlaceholder = `\u03B8${etm.getTemplateName(elseString)}\u03B4`;
   return buildIfThenElseBlock(etm, tmpl, condition, thenPlaceholder, elsePlaceholder, offset);
 }
+function buildStandardIfThenBlock(etm, tmpl, thenString, offset) {
+  const condition = etm.getCondition().replace(" as ", "; as ").replace(/;\s*let/g, "; as");
+  const thenPlaceholder = `\u03B8${etm.getTemplateName(thenString)}\u03B4`;
+  return buildIfThenBlock(etm, tmpl, condition, thenPlaceholder, offset);
+}
 function buildIfThenElseBlock(etm, tmpl, condition, thenPlaceholder, elsePlaceholder, offset) {
   const lbString = etm.hasLineBreaks ? "\n" : "";
   const originals = getOriginals(etm, tmpl, offset);
-  const startBlock = `@if (${condition}) {${lbString}`;
+  const startBlock = `${startMarker}@if (${condition}) {${lbString}`;
   const elseBlock = `${lbString}} @else {${lbString}`;
-  const postBlock = thenPlaceholder + elseBlock + elsePlaceholder + `${lbString}}`;
+  const postBlock = thenPlaceholder + elseBlock + elsePlaceholder + `${lbString}}${endMarker}`;
   const ifThenElseBlock = startBlock + postBlock;
   const tmplStart = tmpl.slice(0, etm.start(offset));
   const tmplEnd = tmpl.slice(etm.end(offset));
@@ -25947,6 +26595,19 @@ function buildIfThenElseBlock(etm, tmpl, condition, thenPlaceholder, elsePlaceho
   const post = originals.end.length - postBlock.length;
   return { tmpl: updatedTmpl, offsets: { pre, post } };
 }
+function buildIfThenBlock(etm, tmpl, condition, thenPlaceholder, offset) {
+  const lbString = etm.hasLineBreaks ? "\n" : "";
+  const originals = getOriginals(etm, tmpl, offset);
+  const startBlock = `${startMarker}@if (${condition}) {${lbString}`;
+  const postBlock = thenPlaceholder + `${lbString}}${endMarker}`;
+  const ifThenBlock = startBlock + postBlock;
+  const tmplStart = tmpl.slice(0, etm.start(offset));
+  const tmplEnd = tmpl.slice(etm.end(offset));
+  const updatedTmpl = tmplStart + ifThenBlock + tmplEnd;
+  const pre = originals.start.length + originals.childLength - startBlock.length;
+  const post = originals.end.length - postBlock.length;
+  return { tmpl: updatedTmpl, offsets: { pre, post } };
+}
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/ng-generate/control-flow-migration/switches.mjs
 var ngswitch = "[ngSwitch]";
@@ -25956,12 +26617,12 @@ var switches = [
 function migrateSwitch(template2) {
   let errors = [];
   let parsed = parseTemplate2(template2);
-  if (parsed === null) {
+  if (parsed.tree === void 0) {
     return { migrated: template2, errors, changed: false };
   }
   let result = template2;
   const visitor = new ElementCollector(switches);
-  visitAll2(visitor, parsed.rootNodes);
+  visitAll2(visitor, parsed.tree.rootNodes);
   calculateNesting(visitor, hasLineBreaks(template2));
   let offset = 0;
   let nestLevel = -1;
@@ -25984,13 +26645,31 @@ function migrateSwitch(template2) {
   const changed = visitor.elements.length > 0;
   return { migrated: result, errors, changed };
 }
+function assertValidSwitchStructure(children) {
+  for (const child of children) {
+    if (child instanceof Text4 && child.value.trim() !== "") {
+      throw new Error(`Text node: "${child.value}" would result in invalid migrated @switch block structure. @switch can only have @case or @default as children.`);
+    } else if (child instanceof Element2) {
+      let hasCase = false;
+      for (const attr of child.attrs) {
+        if (cases.includes(attr.name)) {
+          hasCase = true;
+        }
+      }
+      if (!hasCase) {
+        throw new Error(`Element node: "${child.name}" would result in invalid migrated @switch block structure. @switch can only have @case or @default as children.`);
+      }
+    }
+  }
+}
 function migrateNgSwitch(etm, tmpl, offset) {
   const lbString = etm.hasLineBreaks ? "\n" : "";
   const condition = etm.attr.value;
   const originals = getOriginals(etm, tmpl, offset);
+  assertValidSwitchStructure(originals.childNodes);
   const { start, middle, end } = getMainBlock(etm, tmpl, offset);
-  const startBlock = `${start}${lbString}@switch (${condition}) {`;
-  const endBlock = `}${lbString}${end}`;
+  const startBlock = `${startMarker}${start}${lbString}@switch (${condition}) {`;
+  const endBlock = `}${lbString}${end}${endMarker}`;
   const switchBlock = startBlock + middle + endBlock;
   const updatedTmpl = tmpl.slice(0, etm.start(offset)) + switchBlock + tmpl.slice(etm.end(offset));
   const pre = originals.start.length - startBlock.length;
@@ -26006,6 +26685,9 @@ function migrateTemplate(template2, templateType, node, file, format = true, ana
     const ifResult = migrateIf(template2);
     const forResult = migrateFor(ifResult.migrated);
     const switchResult = migrateSwitch(forResult.migrated);
+    if (switchResult.errors.length > 0) {
+      return { migrated: template2, errors: switchResult.errors };
+    }
     const caseResult = migrateCase(switchResult.migrated);
     const templateResult = processNgTemplates(caseResult.migrated);
     if (templateResult.err !== void 0) {
@@ -26013,13 +26695,27 @@ function migrateTemplate(template2, templateType, node, file, format = true, ana
     }
     migrated = templateResult.migrated;
     const changed = ifResult.changed || forResult.changed || switchResult.changed || caseResult.changed;
+    if (changed) {
+      const parsed = parseTemplate2(migrated);
+      if (parsed.errors.length > 0) {
+        const parsingError = {
+          type: "parse",
+          error: new Error(`The migration resulted in invalid HTML for ${file.sourceFilePath}. Please check the template for valid HTML structures and run the migration again.`)
+        };
+        return { migrated: template2, errors: [parsingError] };
+      }
+    }
     if (format && changed) {
       migrated = formatTemplate(migrated, templateType);
     }
+    const markerRegex = new RegExp(`${startMarker}|${endMarker}|${startI18nMarker}|${endI18nMarker}`, "gm");
+    migrated = migrated.replace(markerRegex, "");
     file.removeCommonModule = canRemoveCommonModule(template2);
+    file.canRemoveImports = true;
     if (templateType === "templateUrl" && analyzedFiles !== null && analyzedFiles.has(file.sourceFilePath)) {
       const componentFile = analyzedFiles.get(file.sourceFilePath);
       componentFile.removeCommonModule = file.removeCommonModule;
+      componentFile.canRemoveImports = file.canRemoveImports;
     }
     errors = [
       ...ifResult.errors,
@@ -26027,7 +26723,7 @@ function migrateTemplate(template2, templateType, node, file, format = true, ana
       ...switchResult.errors,
       ...caseResult.errors
     ];
-  } else {
+  } else if (file.canRemoveImports) {
     migrated = removeImports(template2, node, file.removeCommonModule);
   }
   return { migrated, errors };