@angular/core 17.1.0-next.4 → 17.1.0-next.5

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

@@ -1805,7 +1805,7 @@ var ConstantPool = class {
       }))));
     }
   }
-  getSharedFunctionReference(fn2, prefix) {
+  getSharedFunctionReference(fn2, prefix, useUniqueName = true) {
     var _a2;
     const isArrow = fn2 instanceof ArrowFunctionExpr;
     for (const current of this.statements) {
@@ -1816,7 +1816,7 @@ var ConstantPool = class {
         return variable(current.name);
       }
     }
-    const name = this.uniqueName(prefix);
+    const name = useUniqueName ? this.uniqueName(prefix) : prefix;
     this.statements.push(fn2.toDeclStmt(name, StmtModifier.Final));
     return variable(name);
   }
@@ -3443,13 +3443,17 @@ var TagContentType;
   TagContentType2[TagContentType2["ESCAPABLE_RAW_TEXT"] = 1] = "ESCAPABLE_RAW_TEXT";
   TagContentType2[TagContentType2["PARSABLE_DATA"] = 2] = "PARSABLE_DATA";
 })(TagContentType || (TagContentType = {}));
-function splitNsName(elementName) {
+function splitNsName(elementName, fatal = true) {
   if (elementName[0] != ":") {
     return [null, elementName];
   }
   const colonIndex = elementName.indexOf(":", 1);
   if (colonIndex === -1) {
-    throw new Error(`Unsupported format "${elementName}" expecting ":namespace:name"`);
+    if (fatal) {
+      throw new Error(`Unsupported format "${elementName}" expecting ":namespace:name"`);
+    } else {
+      return [null, elementName];
+    }
   }
   return [elementName.slice(1, colonIndex), elementName.slice(colonIndex + 1)];
 }
@@ -3956,28 +3960,6 @@ var BlockPlaceholder = class {
     return visitor.visitBlockPlaceholder(this, context);
   }
 };
-var RecurseVisitor = class {
-  visitText(text2, context) {
-  }
-  visitContainer(container, context) {
-    container.children.forEach((child) => child.visit(this));
-  }
-  visitIcu(icu, context) {
-    Object.keys(icu.cases).forEach((k) => {
-      icu.cases[k].visit(this);
-    });
-  }
-  visitTagPlaceholder(ph, context) {
-    ph.children.forEach((child) => child.visit(this));
-  }
-  visitPlaceholder(ph, context) {
-  }
-  visitIcuPlaceholder(ph, context) {
-  }
-  visitBlockPlaceholder(ph, context) {
-    ph.children.forEach((child) => child.visit(this));
-  }
-};
 function serializeMessage(messageNodes) {
   const visitor = new LocalizeMessageStringVisitor();
   const str = messageNodes.map((n) => n.visit(visitor)).join("");
@@ -7045,8 +7027,9 @@ var OpKind;
   OpKind2[OpKind2["I18nApply"] = 40] = "I18nApply";
   OpKind2[OpKind2["IcuStart"] = 41] = "IcuStart";
   OpKind2[OpKind2["IcuEnd"] = 42] = "IcuEnd";
-  OpKind2[OpKind2["I18nContext"] = 43] = "I18nContext";
-  OpKind2[OpKind2["I18nAttributes"] = 44] = "I18nAttributes";
+  OpKind2[OpKind2["IcuPlaceholder"] = 43] = "IcuPlaceholder";
+  OpKind2[OpKind2["I18nContext"] = 44] = "I18nContext";
+  OpKind2[OpKind2["I18nAttributes"] = 45] = "I18nAttributes";
 })(OpKind || (OpKind = {}));
 var ExpressionKind;
 (function(ExpressionKind2) {
@@ -7350,15 +7333,15 @@ function createRepeaterOp(repeaterCreate2, targetSlot, collection, sourceSpan) {
   }, NEW_OP), TRAIT_DEPENDS_ON_SLOT_CONTEXT);
 }
 function createDeferWhenOp(target, expr, prefetch, sourceSpan) {
-  return __spreadValues(__spreadValues({
+  return __spreadValues(__spreadValues(__spreadValues({
     kind: OpKind.DeferWhen,
     target,
     expr,
     prefetch,
     sourceSpan
-  }, NEW_OP), TRAIT_DEPENDS_ON_SLOT_CONTEXT);
+  }, NEW_OP), TRAIT_DEPENDS_ON_SLOT_CONTEXT), TRAIT_CONSUMES_VARS);
 }
-function createI18nExpressionOp(context, target, i18nOwner, handle, expression, i18nPlaceholder, resolutionTime, usage, name, sourceSpan) {
+function createI18nExpressionOp(context, target, i18nOwner, handle, expression, icuPlaceholder, i18nPlaceholder, resolutionTime, usage, name, sourceSpan) {
   return __spreadValues(__spreadValues(__spreadValues({
     kind: OpKind.I18nExpression,
     context,
@@ -7366,6 +7349,7 @@ function createI18nExpressionOp(context, target, i18nOwner, handle, expression,
     i18nOwner,
     handle,
     expression,
+    icuPlaceholder,
     i18nPlaceholder,
     resolutionTime,
     usage,
@@ -8098,6 +8082,9 @@ function transformExpressionsInOp(op, transform2, flags) {
       if (op.placeholderConfig !== null) {
         op.placeholderConfig = transformExpressionsInExpression(op.placeholderConfig, transform2, flags);
       }
+      if (op.resolverFn !== null) {
+        op.resolverFn = transformExpressionsInExpression(op.resolverFn, transform2, flags);
+      }
       break;
     case OpKind.I18nMessage:
       for (const [placeholder, expr] of op.params) {
@@ -8134,6 +8121,7 @@ function transformExpressionsInOp(op, transform2, flags) {
     case OpKind.Template:
     case OpKind.Text:
     case OpKind.I18nAttributes:
+    case OpKind.IcuPlaceholder:
       break;
     default:
       throw new Error(`AssertionError: transformExpressionsInOp doesn't handle ${OpKind[op.kind]}`);
@@ -8191,6 +8179,14 @@ function transformExpressionsInExpression(expr, 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 ArrowFunctionExpr) {
+    if (Array.isArray(expr.body)) {
+      for (let i = 0; i < expr.body.length; i++) {
+        transformExpressionsInStatement(expr.body[i], transform2, flags);
+      }
+    } else {
+      expr.body = transformExpressionsInExpression(expr.body, transform2, flags);
+    }
   } else if (expr instanceof WrappedNodeExpr) {
   } else if (expr instanceof ReadVarExpr || expr instanceof ExternalExpr || expr instanceof LiteralExpr) {
   } else {
@@ -8433,7 +8429,7 @@ var elementContainerOpKinds = /* @__PURE__ */ new Set([
 function isElementOrContainerOp(op) {
   return elementContainerOpKinds.has(op.kind);
 }
-function createElementStartOp(tag, xref, namespace, i18nPlaceholder, sourceSpan) {
+function createElementStartOp(tag, xref, namespace, i18nPlaceholder, startSourceSpan, wholeSourceSpan) {
   return __spreadValues(__spreadValues({
     kind: OpKind.ElementStart,
     xref,
@@ -8444,10 +8440,11 @@ function createElementStartOp(tag, xref, namespace, i18nPlaceholder, sourceSpan)
     nonBindable: false,
     namespace,
     i18nPlaceholder,
-    sourceSpan
+    startSourceSpan,
+    wholeSourceSpan
   }, TRAIT_CONSUMES_SLOT), NEW_OP);
 }
-function createTemplateOp(xref, templateKind, tag, functionNameSuffix, namespace, i18nPlaceholder, sourceSpan) {
+function createTemplateOp(xref, templateKind, tag, functionNameSuffix, namespace, i18nPlaceholder, startSourceSpan, wholeSourceSpan) {
   return __spreadValues(__spreadValues({
     kind: OpKind.Template,
     xref,
@@ -8462,11 +8459,12 @@ function createTemplateOp(xref, templateKind, tag, functionNameSuffix, namespace
     nonBindable: false,
     namespace,
     i18nPlaceholder,
-    sourceSpan
+    startSourceSpan,
+    wholeSourceSpan
   }, TRAIT_CONSUMES_SLOT), NEW_OP);
 }
-function createRepeaterCreateOp(primaryView, emptyView, tag, track, varNames, i18nPlaceholder, emptyI18nPlaceholder, sourceSpan) {
-  return __spreadProps(__spreadValues(__spreadValues({
+function createRepeaterCreateOp(primaryView, emptyView, tag, track, varNames, emptyTag, i18nPlaceholder, emptyI18nPlaceholder, startSourceSpan, wholeSourceSpan) {
+  return __spreadProps(__spreadValues(__spreadValues(__spreadValues({
     kind: OpKind.RepeaterCreate,
     attributes: null,
     xref: primaryView,
@@ -8475,6 +8473,8 @@ function createRepeaterCreateOp(primaryView, emptyView, tag, track, varNames, i1
     track,
     trackByFn: null,
     tag,
+    emptyTag,
+    emptyAttributes: null,
     functionNameSuffix: "For",
     namespace: Namespace.HTML,
     nonBindable: false,
@@ -8485,8 +8485,9 @@ function createRepeaterCreateOp(primaryView, emptyView, tag, track, varNames, i1
     usesComponentInstance: false,
     i18nPlaceholder,
     emptyI18nPlaceholder,
-    sourceSpan
-  }, TRAIT_CONSUMES_SLOT), NEW_OP), {
+    startSourceSpan,
+    wholeSourceSpan
+  }, TRAIT_CONSUMES_SLOT), NEW_OP), TRAIT_CONSUMES_VARS), {
     numSlotsUsed: emptyView === null ? 2 : 3
   });
 }
@@ -8509,12 +8510,13 @@ function createEnableBindingsOp(xref) {
     xref
   }, NEW_OP);
 }
-function createTextOp(xref, initialValue, sourceSpan) {
+function createTextOp(xref, initialValue, icuPlaceholder, sourceSpan) {
   return __spreadValues(__spreadValues({
     kind: OpKind.Text,
     xref,
     handle: new SlotHandle(),
     initialValue,
+    icuPlaceholder,
     sourceSpan
   }, TRAIT_CONSUMES_SLOT), NEW_OP);
 }
@@ -8557,7 +8559,7 @@ function createProjectionDefOp(def) {
     def
   }, NEW_OP);
 }
-function createProjectionOp(xref, selector, i18nPlaceholder, attributes, sourceSpan) {
+function createProjectionOp(xref, selector, i18nPlaceholder, sourceSpan) {
   return __spreadValues(__spreadValues({
     kind: OpKind.Projection,
     xref,
@@ -8565,7 +8567,7 @@ function createProjectionOp(xref, selector, i18nPlaceholder, attributes, sourceS
     selector,
     i18nPlaceholder,
     projectionSlotIndex: 0,
-    attributes,
+    attributes: null,
     localRefs: [],
     sourceSpan
   }, NEW_OP), TRAIT_CONSUMES_SLOT);
@@ -8631,7 +8633,7 @@ function createI18nMessageOp(xref, i18nContext, i18nBlock, message, messagePlace
     subMessages: []
   }, NEW_OP);
 }
-function createI18nStartOp(xref, message, root) {
+function createI18nStartOp(xref, message, root, sourceSpan) {
   return __spreadValues(__spreadValues({
     kind: OpKind.I18nStart,
     xref,
@@ -8640,13 +8642,15 @@ function createI18nStartOp(xref, message, root) {
     message,
     messageIndex: null,
     subTemplateIndex: null,
-    context: null
+    context: null,
+    sourceSpan
   }, NEW_OP), TRAIT_CONSUMES_SLOT);
 }
-function createI18nEndOp(xref) {
+function createI18nEndOp(xref, sourceSpan) {
   return __spreadValues({
     kind: OpKind.I18nEnd,
-    xref
+    xref,
+    sourceSpan
   }, NEW_OP);
 }
 function createIcuStartOp(xref, message, messagePlaceholder, sourceSpan) {
@@ -8665,6 +8669,15 @@ function createIcuEndOp(xref) {
     xref
   }, NEW_OP);
 }
+function createIcuPlaceholderOp(xref, name, strings) {
+  return __spreadValues({
+    kind: OpKind.IcuPlaceholder,
+    xref,
+    name,
+    strings,
+    expressionPlaceholders: []
+  }, 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.");
@@ -8928,6 +8941,9 @@ function createOpXrefMap(unit) {
       continue;
     }
     map.set(op.xref, op);
+    if (op.kind === OpKind.RepeaterCreate && op.emptyView !== null) {
+      map.set(op.emptyView, op);
+    }
   }
   return map;
 }
@@ -8991,6 +9007,9 @@ function extractAttributes(job) {
               SecurityContext.NONE
             );
             if (job.kind === CompilationJobKind.Host) {
+              if (job.compatibility) {
+                break;
+              }
               unit.create.push(extractedAttributeOp);
             } else {
               OpList.insertBefore(extractedAttributeOp, lookupElement(elements, op.target));
@@ -9012,15 +9031,9 @@ function extractAttributeOp(unit, op, elements) {
   if (op.expression instanceof Interpolation2) {
     return;
   }
-  let extractable = op.expression.isConstant();
+  let extractable = op.isTextAttribute || op.expression.isConstant();
   if (unit.job.compatibility === CompatibilityMode.TemplateDefinitionBuilder) {
-    extractable = isStringLiteral(op.expression);
-    if (op.name === "style" || op.name === "class") {
-      extractable && (extractable = op.isTextAttribute);
-    }
-    if (unit.job.kind === CompilationJobKind.Host) {
-      extractable && (extractable = op.isTextAttribute);
-    }
+    extractable && (extractable = op.isTextAttribute);
   }
   if (extractable) {
     const extractedAttributeOp = createExtractedAttributeOp(op.target, op.isStructuralTemplateAttribute ? BindingKind.Template : BindingKind.Attribute, op.name, op.expression, op.i18nContext, op.i18nMessage, op.securityContext);
@@ -9255,7 +9268,7 @@ function collectElementConsts(job) {
   for (const unit of job.units) {
     for (const op of unit.create) {
       if (op.kind === OpKind.ExtractedAttribute) {
-        const attributes = allElementAttributes.get(op.target) || new ElementAttributes();
+        const attributes = allElementAttributes.get(op.target) || new ElementAttributes(job.compatibility);
         allElementAttributes.set(op.target, attributes);
         attributes.add(op.bindingKind, op.name, op.expression, op.trustedValueFn);
         OpList.remove(op);
@@ -9265,14 +9278,19 @@ function collectElementConsts(job) {
   if (job instanceof ComponentCompilationJob) {
     for (const unit of job.units) {
       for (const op of unit.create) {
-        if (isElementOrContainerOp(op)) {
+        if (op.kind == OpKind.Projection) {
           const attributes = allElementAttributes.get(op.xref);
           if (attributes !== void 0) {
             const attrArray = serializeAttributes(attributes);
             if (attrArray.entries.length > 0) {
-              op.attributes = job.addConst(attrArray);
+              op.attributes = attrArray;
             }
           }
+        } else if (isElementOrContainerOp(op)) {
+          op.attributes = getConstIndex(job, allElementAttributes, op.xref);
+          if (op.kind === OpKind.RepeaterCreate && op.emptyView !== null) {
+            op.emptyAttributes = getConstIndex(job, allElementAttributes, op.emptyView);
+          }
         }
       }
     }
@@ -9288,13 +9306,18 @@ function collectElementConsts(job) {
     }
   }
 }
+function getConstIndex(job, allElementAttributes, xref) {
+  const attributes = allElementAttributes.get(xref);
+  if (attributes !== void 0) {
+    const attrArray = serializeAttributes(attributes);
+    if (attrArray.entries.length > 0) {
+      return job.addConst(attrArray);
+    }
+  }
+  return null;
+}
 var FLYWEIGHT_ARRAY = Object.freeze([]);
 var ElementAttributes = class {
-  constructor() {
-    this.known = /* @__PURE__ */ new Set();
-    this.byKind = /* @__PURE__ */ new Map();
-    this.projectAs = null;
-  }
   get attributes() {
     var _a2;
     return (_a2 = this.byKind.get(BindingKind.Attribute)) != null ? _a2 : FLYWEIGHT_ARRAY;
@@ -9319,12 +9342,28 @@ var ElementAttributes = class {
     var _a2;
     return (_a2 = this.byKind.get(BindingKind.I18n)) != null ? _a2 : FLYWEIGHT_ARRAY;
   }
+  constructor(compatibility) {
+    this.compatibility = compatibility;
+    this.known = /* @__PURE__ */ new Map();
+    this.byKind = /* @__PURE__ */ new Map();
+    this.projectAs = null;
+  }
+  isKnown(kind, name, value) {
+    var _a2;
+    const nameToValue = (_a2 = this.known.get(kind)) != null ? _a2 : /* @__PURE__ */ new Set();
+    this.known.set(kind, nameToValue);
+    if (nameToValue.has(name)) {
+      return true;
+    }
+    nameToValue.add(name);
+    return false;
+  }
   add(kind, name, value, trustedValueFn) {
     var _a2;
-    if (this.known.has(name)) {
+    const allowDuplicates = this.compatibility === CompatibilityMode.TemplateDefinitionBuilder && (kind === BindingKind.Attribute || kind === BindingKind.ClassName || kind === BindingKind.StyleProperty);
+    if (!allowDuplicates && this.isKnown(kind, name, value)) {
       return;
     }
-    this.known.add(name);
     if (name === "ngProjectAs") {
       if (value === null || !(value instanceof LiteralExpr) || value.value == null || typeof ((_a2 = value.value) == null ? void 0 : _a2.toString()) !== "string") {
         throw Error("ngProjectAs must have a string literal value");
@@ -9355,7 +9394,7 @@ var ElementAttributes = class {
   }
 };
 function getAttributeNameLiterals(name) {
-  const [attributeNamespace, attributeName] = splitNsName(name);
+  const [attributeNamespace, attributeName] = splitNsName(name, false);
   const nameLiteral = literal(attributeName);
   if (attributeNamespace) {
     return [
@@ -9422,7 +9461,7 @@ function convertI18nBindings(job) {
             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));
+            ops.push(createI18nExpressionOp(op.i18nContext, i18nAttributesForElem.target, i18nAttributesForElem.xref, i18nAttributesForElem.handle, expr, null, op.expression.i18nPlaceholders[i], I18nParamResolutionTime.Creation, I18nExpressionFor.I18nAttribute, op.name, op.sourceSpan));
           }
           OpList.replaceWithMany(op, ops);
           break;
@@ -9453,7 +9492,11 @@ function createDeferDepsFns(job) {
         if (op.handle.slot === null) {
           throw new Error("AssertionError: slot must be assigned bfore extracting defer deps functions");
         }
-        op.resolverFn = job.pool.getSharedFunctionReference(depsFnExpr, `${job.componentName}_Defer_${op.handle.slot}_DepsFn`);
+        op.resolverFn = job.pool.getSharedFunctionReference(
+          depsFnExpr,
+          `${job.componentName}_Defer_${op.handle.slot}_DepsFn`,
+          false
+        );
       }
     }
   }
@@ -9461,62 +9504,99 @@ function createDeferDepsFns(job) {
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/create_i18n_contexts.mjs
 function createI18nContexts(job) {
-  const rootContexts = /* @__PURE__ */ new Map();
-  let currentI18nOp = null;
-  let xref;
-  const messageToContext = /* @__PURE__ */ new Map();
+  const attrContextByMessage = /* @__PURE__ */ new Map();
+  for (const unit of job.units) {
+    for (const op of unit.ops()) {
+      switch (op.kind) {
+        case OpKind.Binding:
+        case OpKind.Property:
+        case OpKind.Attribute:
+        case OpKind.ExtractedAttribute:
+          if (op.i18nMessage === null) {
+            continue;
+          }
+          if (!attrContextByMessage.has(op.i18nMessage)) {
+            const i18nContext = createI18nContextOp(I18nContextKind.Attr, job.allocateXrefId(), null, op.i18nMessage, null);
+            unit.create.push(i18nContext);
+            attrContextByMessage.set(op.i18nMessage, i18nContext.xref);
+          }
+          op.i18nContext = attrContextByMessage.get(op.i18nMessage);
+          break;
+      }
+    }
+  }
+  const blockContextByI18nBlock = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
     for (const op of unit.create) {
       switch (op.kind) {
         case OpKind.I18nStart:
-          currentI18nOp = op;
           if (op.xref === op.root) {
-            xref = job.allocateXrefId();
-            unit.create.push(createI18nContextOp(I18nContextKind.RootI18n, xref, op.xref, op.message, null));
-            op.context = xref;
-            rootContexts.set(op.xref, xref);
+            const contextOp = createI18nContextOp(I18nContextKind.RootI18n, job.allocateXrefId(), op.xref, op.message, null);
+            unit.create.push(contextOp);
+            op.context = contextOp.xref;
+            blockContextByI18nBlock.set(op.xref, contextOp);
           }
           break;
+      }
+    }
+  }
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      if (op.kind === OpKind.I18nStart && op.xref !== op.root) {
+        const rootContext = blockContextByI18nBlock.get(op.root);
+        if (rootContext === void 0) {
+          throw Error("AssertionError: Root i18n block i18n context should have been created.");
+        }
+        op.context = rootContext.xref;
+        blockContextByI18nBlock.set(op.xref, rootContext);
+      }
+    }
+  }
+  let currentI18nOp = null;
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      switch (op.kind) {
+        case OpKind.I18nStart:
+          currentI18nOp = op;
+          break;
         case OpKind.I18nEnd:
           currentI18nOp = null;
           break;
         case OpKind.IcuStart:
           if (currentI18nOp === null) {
-            throw Error("Unexpected ICU outside of an i18n block.");
+            throw Error("AssertionError: Unexpected ICU outside of an i18n block.");
           }
           if (op.message.id !== currentI18nOp.message.id) {
-            xref = job.allocateXrefId();
-            unit.create.push(createI18nContextOp(I18nContextKind.Icu, xref, currentI18nOp.xref, op.message, null));
-            op.context = xref;
+            const contextOp = createI18nContextOp(I18nContextKind.Icu, job.allocateXrefId(), currentI18nOp.xref, op.message, null);
+            unit.create.push(contextOp);
+            op.context = contextOp.xref;
           } else {
             op.context = currentI18nOp.context;
+            blockContextByI18nBlock.get(currentI18nOp.xref).contextKind = I18nContextKind.Icu;
           }
           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;
-      }
-    }
   }
+}
+
+// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/deduplicate_text_bindings.mjs
+function deduplicateTextBindings(job) {
+  const seen = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
-    for (const op of unit.create) {
-      if (op.kind === OpKind.I18nStart && op.xref !== op.root) {
-        op.context = rootContexts.get(op.root);
+    for (const op of unit.update.reversed()) {
+      if (op.kind === OpKind.Binding && op.isTextAttribute) {
+        const seenForElement = seen.get(op.target) || /* @__PURE__ */ new Set();
+        if (seenForElement.has(op.name)) {
+          if (job.compatibility === CompatibilityMode.TemplateDefinitionBuilder) {
+            if (op.name === "style" || op.name === "class") {
+              OpList.remove(op);
+            }
+          } else {
+          }
+        }
+        seenForElement.add(op.name);
+        seen.set(op.target, seenForElement);
       }
     }
   }
@@ -9806,12 +9886,16 @@ var LIST_START_MARKER = "[";
 var LIST_END_MARKER = "]";
 var LIST_DELIMITER = "|";
 function extractI18nMessages(job) {
-  const i18nContexts = /* @__PURE__ */ new Map();
+  const i18nMessagesByContext = /* @__PURE__ */ new Map();
   const i18nBlocks = /* @__PURE__ */ new Map();
+  const i18nContexts = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
     for (const op of unit.create) {
       switch (op.kind) {
         case OpKind.I18nContext:
+          const i18nMessageOp = createI18nMessage(job, op);
+          unit.create.push(i18nMessageOp);
+          i18nMessagesByContext.set(op.xref, i18nMessageOp);
           i18nContexts.set(op.xref, op);
           break;
         case OpKind.I18nStart:
@@ -9820,49 +9904,40 @@ 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) {
-      if (op.kind === OpKind.I18nStart && op.xref === op.root) {
-        if (!op.context) {
-          throw Error("I18n start op should have its context set.");
-        }
-        const i18nMessageOp = createI18nMessage(job, i18nContexts.get(op.context));
-        i18nBlockMessages.set(op.xref, i18nMessageOp);
-        unit.create.push(i18nMessageOp);
-      }
-    }
-  }
+  let currentIcu = null;
   for (const unit of job.units) {
     for (const op of unit.create) {
       switch (op.kind) {
         case OpKind.IcuStart:
-          if (!op.context) {
-            throw Error("ICU op should have its context set.");
+          currentIcu = op;
+          OpList.remove(op);
+          const icuContext = i18nContexts.get(op.context);
+          if (icuContext.contextKind !== I18nContextKind.Icu) {
+            continue;
           }
-          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;
-            const parentMessage = i18nBlockMessages.get(rootI18nId);
-            parentMessage == null ? void 0 : parentMessage.subMessages.push(subMessage.xref);
+          const i18nBlock = i18nBlocks.get(icuContext.i18nBlock);
+          if (i18nBlock.context === icuContext.xref) {
+            continue;
           }
-          OpList.remove(op);
+          const rootI18nBlock = i18nBlocks.get(i18nBlock.root);
+          const rootMessage = i18nMessagesByContext.get(rootI18nBlock.context);
+          if (rootMessage === void 0) {
+            throw Error("AssertionError: ICU sub-message should belong to a root message.");
+          }
+          const subMessage = i18nMessagesByContext.get(icuContext.xref);
+          subMessage.messagePlaceholder = op.messagePlaceholder;
+          rootMessage.subMessages.push(subMessage.xref);
           break;
         case OpKind.IcuEnd:
+          currentIcu = null;
+          OpList.remove(op);
+          break;
+        case OpKind.IcuPlaceholder:
+          if (currentIcu === null || currentIcu.context == null) {
+            throw Error("AssertionError: Unexpected ICU placeholder outside of i18n context");
+          }
+          const msg = i18nMessagesByContext.get(currentIcu.context);
+          msg.postprocessingParams.set(op.name, literal(formatIcuPlaceholder(op)));
           OpList.remove(op);
           break;
       }
@@ -9872,14 +9947,16 @@ function extractI18nMessages(job) {
 function createI18nMessage(job, context, messagePlaceholder) {
   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;
-    }
-  }
+  let needsPostprocessing = [...context.params.values()].some((v) => v.length > 1);
   return createI18nMessageOp(job.allocateXrefId(), context.xref, context.i18nBlock, context.message, messagePlaceholder != null ? messagePlaceholder : null, formattedParams, formattedPostprocessingParams, needsPostprocessing);
 }
+function formatIcuPlaceholder(op) {
+  if (op.strings.length !== op.expressionPlaceholders.length + 1) {
+    throw Error(`AsserionError: Invalid ICU placeholder with ${op.strings.length} strings and ${op.expressionPlaceholders.length} expressions`);
+  }
+  const values = op.expressionPlaceholders.map(formatValue);
+  return op.strings.flatMap((str, i) => [str, values[i] || ""]).join("");
+}
 function formatParams(params) {
   const formattedParams = /* @__PURE__ */ new Map();
   for (const [placeholder, placeholderValues] of params) {
@@ -10106,7 +10183,7 @@ var CLASS_BANG = "class!";
 var BANG_IMPORTANT = "!important";
 function parseHostStyleProperties(job) {
   for (const op of job.root.update) {
-    if (op.kind !== OpKind.Binding) {
+    if (!(op.kind === OpKind.Binding && op.bindingKind === BindingKind.Property)) {
       continue;
     }
     if (op.name.endsWith(BANG_IMPORTANT)) {
@@ -16248,7 +16325,7 @@ function collectMessage(job, fileBasedI18nSuffix, messages, 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) {
+  if (messageOp.needsPostprocessing || messageOp.postprocessingParams.size > 0) {
     const postprocessingParams = Object.fromEntries([...messageOp.postprocessingParams.entries()].sort());
     const formattedPostprocessingParams = formatI18nPlaceholderNamesInMap(postprocessingParams, false);
     const extraTransformFnParams = [];
@@ -16267,7 +16344,6 @@ function addSubMessageParams(messageOp, subMessagePlaceholders) {
     } else {
       messageOp.params.set(placeholder, literal(`${ESCAPE2}${I18N_ICU_MAPPING_PREFIX2}${placeholder}${ESCAPE2}`));
       messageOp.postprocessingParams.set(placeholder, literalArr(subMessages));
-      messageOp.needsPostprocessing = true;
     }
   }
 }
@@ -16301,12 +16377,13 @@ function i18nGenerateClosureVar(pool, messageId, fileBasedI18nSuffix, useExterna
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/i18n_text_extraction.mjs
 function convertI18nText(job) {
-  var _a2;
+  var _a2, _b2, _c2;
   for (const unit of job.units) {
     let currentI18n = null;
     let currentIcu = null;
     const textNodeI18nBlocks = /* @__PURE__ */ new Map();
     const textNodeIcus = /* @__PURE__ */ new Map();
+    const icuPlaceholderByText = /* @__PURE__ */ new Map();
     for (const op of unit.create) {
       switch (op.kind) {
         case OpKind.I18nStart:
@@ -16331,7 +16408,13 @@ function convertI18nText(job) {
           if (currentI18n !== null) {
             textNodeI18nBlocks.set(op.xref, currentI18n);
             textNodeIcus.set(op.xref, currentIcu);
-            OpList.remove(op);
+            if (op.icuPlaceholder !== null) {
+              const icuPlaceholderOp = createIcuPlaceholderOp(job.allocateXrefId(), op.icuPlaceholder, [op.initialValue]);
+              OpList.replace(op, icuPlaceholderOp);
+              icuPlaceholderByText.set(op.xref, icuPlaceholderOp);
+            } else {
+              OpList.remove(op);
+            }
           }
           break;
       }
@@ -16344,14 +16427,18 @@ function convertI18nText(job) {
           }
           const i18nOp = textNodeI18nBlocks.get(op.target);
           const icuOp = textNodeIcus.get(op.target);
+          const icuPlaceholder = icuPlaceholderByText.get(op.target);
           const contextId = icuOp ? icuOp.context : i18nOp.context;
           const resolutionTime = icuOp ? I18nParamResolutionTime.Postproccessing : I18nParamResolutionTime.Creation;
           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.xref, i18nOp.handle, expr, op.interpolation.i18nPlaceholders[i], resolutionTime, I18nExpressionFor.I18nText, "", (_a2 = expr.sourceSpan) != null ? _a2 : op.sourceSpan));
+            ops.push(createI18nExpressionOp(contextId, i18nOp.xref, i18nOp.xref, i18nOp.handle, expr, (_a2 = icuPlaceholder == null ? void 0 : icuPlaceholder.xref) != null ? _a2 : null, (_b2 = op.interpolation.i18nPlaceholders[i]) != null ? _b2 : null, resolutionTime, I18nExpressionFor.I18nText, "", (_c2 = expr.sourceSpan) != null ? _c2 : op.sourceSpan));
           }
           OpList.replaceWithMany(op, ops);
+          if (icuPlaceholder !== void 0) {
+            icuPlaceholder.strings = op.interpolation.strings;
+          }
           break;
       }
     }
@@ -16502,7 +16589,7 @@ function addNamesToView(unit, baseName, state, compatibility) {
         op.handlerFnName = sanitizeIdentifier(op.handlerFnName);
         break;
       case OpKind.Variable:
-        varNames.set(op.xref, getVariableName(op.variable, state));
+        varNames.set(op.xref, getVariableName(unit, op.variable, state));
         break;
       case OpKind.RepeaterCreate:
         if (!(unit instanceof ViewCompilationUnit)) {
@@ -16553,14 +16640,19 @@ function addNamesToView(unit, baseName, state, compatibility) {
     });
   }
 }
-function getVariableName(variable2, state) {
+function getVariableName(unit, variable2, state) {
   if (variable2.name === null) {
     switch (variable2.kind) {
       case SemanticVariableKind.Context:
         variable2.name = `ctx_r${state.index++}`;
         break;
       case SemanticVariableKind.Identifier:
-        variable2.name = `${variable2.identifier}_r${++state.index}`;
+        if (unit.job.compatibility === CompatibilityMode.TemplateDefinitionBuilder) {
+          const compatPrefix = variable2.identifier === "ctx" ? "i" : "";
+          variable2.name = `${variable2.identifier}_${compatPrefix}r${++state.index}`;
+        } else {
+          variable2.name = `${variable2.identifier}_i${state.index++}`;
+        }
         break;
       default:
         variable2.name = `_r${++state.index}`;
@@ -16703,17 +16795,24 @@ var CREATE_ORDERING = [
   { test: (op) => op.kind === OpKind.Listener && !(op.hostListener && op.isAnimationListener) }
 ];
 var UPDATE_ORDERING = [
-  { test: kindWithInterpolationTest(OpKind.HostProperty, true) },
-  { test: kindWithInterpolationTest(OpKind.HostProperty, false) },
   { test: kindTest(OpKind.StyleMap), transform: keepLast },
   { test: kindTest(OpKind.ClassMap), transform: keepLast },
   { test: kindTest(OpKind.StyleProp) },
   { test: kindTest(OpKind.ClassProp) },
-  { test: kindWithInterpolationTest(OpKind.Property, true) },
   { test: kindWithInterpolationTest(OpKind.Attribute, true) },
+  { test: kindWithInterpolationTest(OpKind.Property, true) },
   { test: kindWithInterpolationTest(OpKind.Property, false) },
   { test: kindWithInterpolationTest(OpKind.Attribute, false) }
 ];
+var UPDATE_HOST_ORDERING = [
+  { test: kindWithInterpolationTest(OpKind.HostProperty, true) },
+  { test: kindWithInterpolationTest(OpKind.HostProperty, false) },
+  { test: kindTest(OpKind.Attribute) },
+  { test: kindTest(OpKind.StyleMap), transform: keepLast },
+  { test: kindTest(OpKind.ClassMap), transform: keepLast },
+  { test: kindTest(OpKind.StyleProp) },
+  { test: kindTest(OpKind.ClassProp) }
+];
 var handledOpKinds = /* @__PURE__ */ new Set([
   OpKind.Listener,
   OpKind.StyleMap,
@@ -16727,7 +16826,8 @@ var handledOpKinds = /* @__PURE__ */ new Set([
 function orderOps(job) {
   for (const unit of job.units) {
     orderWithin(unit.create, CREATE_ORDERING);
-    orderWithin(unit.update, UPDATE_ORDERING);
+    const ordering = unit.job.kind === CompilationJobKind.Host ? UPDATE_HOST_ORDERING : UPDATE_ORDERING;
+    orderWithin(unit.update, ordering);
   }
 }
 function orderWithin(opList, ordering) {
@@ -16765,9 +16865,21 @@ function keepLast(ops) {
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/parse_extracted_styles.mjs
 function parseExtractedStyles(job) {
+  const elements = /* @__PURE__ */ new Map();
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      if (isElementOrContainerOp(op)) {
+        elements.set(op.xref, op);
+      }
+    }
+  }
   for (const unit of job.units) {
     for (const op of unit.create) {
       if (op.kind === OpKind.ExtractedAttribute && op.bindingKind === BindingKind.Attribute && isStringLiteral(op.expression)) {
+        const target = elements.get(op.target);
+        if (target !== void 0 && target.kind === OpKind.Template && target.templateKind === TemplateKind.Structural) {
+          continue;
+        }
         if (op.name === "style") {
           const parsedStyles = parse(op.expression.value);
           for (let i = 0; i < parsedStyles.length - 1; i += 2) {
@@ -16798,13 +16910,6 @@ function removeContentSelectors(job) {
             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;
       }
     }
   }
@@ -16931,8 +17036,11 @@ function wrapTemplateWithI18n(unit, parentI18n) {
   var _a2;
   if (((_a2 = unit.create.head.next) == null ? void 0 : _a2.kind) !== OpKind.I18nStart) {
     const id = unit.job.allocateXrefId();
-    OpList.insertAfter(createI18nStartOp(id, parentI18n.message, parentI18n.root), unit.create.head);
-    OpList.insertBefore(createI18nEndOp(id), unit.create.tail);
+    OpList.insertAfter(
+      createI18nStartOp(id, parentI18n.message, parentI18n.root, null),
+      unit.create.head
+    );
+    OpList.insertBefore(createI18nEndOp(id, null), unit.create.tail);
   }
 }
 
@@ -17187,22 +17295,22 @@ function projectionDef(def) {
 }
 function projection(slot, projectionSlotIndex, attributes, sourceSpan) {
   const args = [literal(slot)];
-  if (projectionSlotIndex !== 0 || attributes.length > 0) {
+  if (projectionSlotIndex !== 0 || attributes !== null) {
     args.push(literal(projectionSlotIndex));
-    if (attributes.length > 0) {
-      args.push(literalArr(attributes.map((attr) => literal(attr))));
+    if (attributes !== null) {
+      args.push(attributes);
     }
   }
   return call(Identifiers.projection, args, sourceSpan);
 }
-function i18nStart(slot, constIndex, subTemplateIndex) {
+function i18nStart(slot, constIndex, subTemplateIndex, sourceSpan) {
   const args = [literal(slot), literal(constIndex)];
   if (subTemplateIndex !== null) {
     args.push(literal(subTemplateIndex));
   }
-  return call(Identifiers.i18nStart, args, null);
+  return call(Identifiers.i18nStart, args, sourceSpan);
 }
-function repeaterCreate(slot, viewFnName, decls, vars, tag, constIndex, trackByFn, trackByUsesComponentInstance, emptyViewFnName, emptyDecls, emptyVars, sourceSpan) {
+function repeaterCreate(slot, viewFnName, decls, vars, tag, constIndex, trackByFn, trackByUsesComponentInstance, emptyViewFnName, emptyDecls, emptyVars, emptyTag, emptyConstIndex, sourceSpan) {
   const args = [
     literal(slot),
     variable(viewFnName),
@@ -17216,6 +17324,12 @@ function repeaterCreate(slot, viewFnName, decls, vars, tag, constIndex, trackByF
     args.push(literal(trackByUsesComponentInstance));
     if (emptyViewFnName !== null) {
       args.push(variable(emptyViewFnName), literal(emptyDecls), literal(emptyVars));
+      if (emptyTag !== null || emptyConstIndex !== null) {
+        args.push(literal(emptyTag));
+      }
+      if (emptyConstIndex !== null) {
+        args.push(literal(emptyConstIndex));
+      }
     }
   }
   return call(Identifiers.repeaterCreate, args, sourceSpan);
@@ -17226,15 +17340,15 @@ function repeater(collection, sourceSpan) {
 function deferWhen(prefetch, expr, sourceSpan) {
   return call(prefetch ? Identifiers.deferPrefetchWhen : Identifiers.deferWhen, [expr], sourceSpan);
 }
-function i18n(slot, constIndex, subTemplateIndex) {
+function i18n(slot, constIndex, subTemplateIndex, sourceSpan) {
   const args = [literal(slot), literal(constIndex)];
   if (subTemplateIndex) {
     args.push(literal(subTemplateIndex));
   }
-  return call(Identifiers.i18n, args, null);
+  return call(Identifiers.i18n, args, sourceSpan);
 }
-function i18nEnd() {
-  return call(Identifiers.i18nEnd, [], null);
+function i18nEnd(endSourceSpan) {
+  return call(Identifiers.i18nEnd, [], endSourceSpan);
 }
 function i18nAttributes(slot, i18nAttributesConfig) {
   const args = [literal(slot), literal(i18nAttributesConfig)];
@@ -17561,31 +17675,31 @@ function reifyCreateOperations(unit, ops) {
         OpList.replace(op, text(op.handle.slot, op.initialValue, op.sourceSpan));
         break;
       case OpKind.ElementStart:
-        OpList.replace(op, elementStart(op.handle.slot, op.tag, op.attributes, op.localRefs, op.sourceSpan));
+        OpList.replace(op, elementStart(op.handle.slot, op.tag, op.attributes, op.localRefs, op.startSourceSpan));
         break;
       case OpKind.Element:
-        OpList.replace(op, element(op.handle.slot, op.tag, op.attributes, op.localRefs, op.sourceSpan));
+        OpList.replace(op, element(op.handle.slot, op.tag, op.attributes, op.localRefs, op.wholeSourceSpan));
         break;
       case OpKind.ElementEnd:
         OpList.replace(op, elementEnd(op.sourceSpan));
         break;
       case OpKind.ContainerStart:
-        OpList.replace(op, elementContainerStart(op.handle.slot, op.attributes, op.localRefs, op.sourceSpan));
+        OpList.replace(op, elementContainerStart(op.handle.slot, op.attributes, op.localRefs, op.startSourceSpan));
         break;
       case OpKind.Container:
-        OpList.replace(op, elementContainer(op.handle.slot, op.attributes, op.localRefs, op.sourceSpan));
+        OpList.replace(op, elementContainer(op.handle.slot, op.attributes, op.localRefs, op.wholeSourceSpan));
         break;
       case OpKind.ContainerEnd:
         OpList.replace(op, elementContainerEnd());
         break;
       case OpKind.I18nStart:
-        OpList.replace(op, i18nStart(op.handle.slot, op.messageIndex, op.subTemplateIndex));
+        OpList.replace(op, i18nStart(op.handle.slot, op.messageIndex, op.subTemplateIndex, op.sourceSpan));
         break;
       case OpKind.I18nEnd:
-        OpList.replace(op, i18nEnd());
+        OpList.replace(op, i18nEnd(op.sourceSpan));
         break;
       case OpKind.I18n:
-        OpList.replace(op, i18n(op.handle.slot, op.messageIndex, op.subTemplateIndex));
+        OpList.replace(op, i18n(op.handle.slot, op.messageIndex, op.subTemplateIndex, op.sourceSpan));
         break;
       case OpKind.I18nAttributes:
         if (op.i18nAttributesConfig === null) {
@@ -17601,7 +17715,7 @@ function reifyCreateOperations(unit, ops) {
           throw new Error(`AssertionError: local refs array should have been extracted into a constant`);
         }
         const childView = unit.job.views.get(op.xref);
-        OpList.replace(op, template(op.handle.slot, variable(childView.fnName), childView.decls, childView.vars, op.tag, op.attributes, op.localRefs, op.sourceSpan));
+        OpList.replace(op, template(op.handle.slot, variable(childView.fnName), childView.decls, childView.vars, op.tag, op.attributes, op.localRefs, op.startSourceSpan));
         break;
       case OpKind.DisableBindings:
         OpList.replace(op, disableBindings2());
@@ -17616,7 +17730,7 @@ function reifyCreateOperations(unit, ops) {
         const listenerFn = reifyListenerHandler(unit, op.handlerFnName, op.handlerOps, op.consumesDollarEvent);
         const eventTargetResolver = op.eventTarget ? GLOBAL_TARGET_RESOLVERS.get(op.eventTarget) : null;
         if (eventTargetResolver === void 0) {
-          throw new Error(`AssertionError: unknown event target ${op.eventTarget}`);
+          throw new Error(`Unexpected global target '${op.eventTarget}' defined for '${op.name}' event. Supported list of global targets: window,document,body.`);
         }
         OpList.replace(op, listener(op.name, listenerFn, eventTargetResolver, op.hostListener && op.isAnimationListener, op.sourceSpan));
         break;
@@ -17703,7 +17817,7 @@ function reifyCreateOperations(unit, ops) {
           emptyDecls = emptyView.decls;
           emptyVars = emptyView.vars;
         }
-        OpList.replace(op, repeaterCreate(op.handle.slot, repeaterView.fnName, op.decls, op.vars, op.tag, op.attributes, op.trackByFn, op.usesComponentInstance, emptyViewFnName, emptyDecls, emptyVars, op.sourceSpan));
+        OpList.replace(op, repeaterCreate(op.handle.slot, repeaterView.fnName, op.decls, op.vars, op.tag, op.attributes, op.trackByFn, op.usesComponentInstance, emptyViewFnName, emptyDecls, emptyVars, op.emptyTag, op.emptyAttributes, op.wholeSourceSpan));
         break;
       case OpKind.Statement:
         break;
@@ -18210,6 +18324,7 @@ function resolveI18nExpressionPlaceholders(job) {
   var _a2;
   const subTemplateIndicies = /* @__PURE__ */ new Map();
   const i18nContexts = /* @__PURE__ */ new Map();
+  const icuPlaceholders = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
     for (const op of unit.create) {
       switch (op.kind) {
@@ -18219,6 +18334,9 @@ function resolveI18nExpressionPlaceholders(job) {
         case OpKind.I18nContext:
           i18nContexts.set(op.xref, op);
           break;
+        case OpKind.IcuPlaceholder:
+          icuPlaceholders.set(op.xref, op);
+          break;
       }
     }
   }
@@ -18227,66 +18345,32 @@ function resolveI18nExpressionPlaceholders(job) {
   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(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({
+        const value = {
           value: index,
           subTemplateIndex,
           flags: I18nParamValueFlags.ExpressionIndex
-        });
-        params.set(op.i18nPlaceholder, values);
+        };
+        updatePlaceholder(op, value, i18nContexts, icuPlaceholders);
         expressionIndices.set(referenceIndex(op), index + 1);
       }
     }
   }
 }
-
-// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/resolve_i18n_icu_placeholders.mjs
-function resolveI18nIcuPlaceholders(job) {
-  for (const unit of job.units) {
-    for (const op of unit.create) {
-      if (op.kind === OpKind.I18nContext && op.contextKind === I18nContextKind.Icu) {
-        for (const node of op.message.nodes) {
-          node.visit(new ResolveIcuPlaceholdersVisitor(op.postprocessingParams));
-        }
-      }
-    }
-  }
-}
-var ResolveIcuPlaceholdersVisitor = class extends RecurseVisitor {
-  constructor(params) {
-    super();
-    this.params = params;
+function updatePlaceholder(op, value, i18nContexts, icuPlaceholders) {
+  if (op.i18nPlaceholder !== null) {
+    const i18nContext = i18nContexts.get(op.context);
+    const params = op.resolutionTime === I18nParamResolutionTime.Creation ? i18nContext.params : i18nContext.postprocessingParams;
+    const values = params.get(op.i18nPlaceholder) || [];
+    values.push(value);
+    params.set(op.i18nPlaceholder, values);
   }
-  visitContainerPlaceholder(placeholder) {
-    var _a2, _b2;
-    if (placeholder.startName && placeholder.startSourceSpan && !this.params.has(placeholder.startName)) {
-      this.params.set(placeholder.startName, [{
-        value: (_a2 = placeholder.startSourceSpan) == null ? void 0 : _a2.toString(),
-        subTemplateIndex: null,
-        flags: I18nParamValueFlags.None
-      }]);
-    }
-    if (placeholder.closeName && placeholder.endSourceSpan && !this.params.has(placeholder.closeName)) {
-      this.params.set(placeholder.closeName, [{
-        value: (_b2 = placeholder.endSourceSpan) == null ? void 0 : _b2.toString(),
-        subTemplateIndex: null,
-        flags: I18nParamValueFlags.None
-      }]);
-    }
-  }
-  visitTagPlaceholder(placeholder) {
-    super.visitTagPlaceholder(placeholder);
-    this.visitContainerPlaceholder(placeholder);
-  }
-  visitBlockPlaceholder(placeholder) {
-    super.visitBlockPlaceholder(placeholder);
-    this.visitContainerPlaceholder(placeholder);
+  if (op.icuPlaceholder !== null) {
+    const icuPlaceholderOp = icuPlaceholders.get(op.icuPlaceholder);
+    icuPlaceholderOp == null ? void 0 : icuPlaceholderOp.expressionPlaceholders.push(value);
   }
-};
+}
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/resolve_names.mjs
 function resolveNames(job) {
@@ -18592,6 +18676,9 @@ function generateTrackFns(job) {
       }
       let usesComponentContext = false;
       op.track = transformExpressionsInExpression(op.track, (expr) => {
+        if (expr instanceof PipeBindingExpr || expr instanceof PipeBindingVariadicExpr) {
+          throw new Error(`Illegal State: Pipes are not allowed in this context`);
+        }
         if (expr instanceof TrackContextExpr) {
           usesComponentContext = true;
           return variable("this");
@@ -18756,7 +18843,10 @@ function varsUsedByOp(op) {
       return op.interpolation.expressions.length;
     case OpKind.I18nExpression:
     case OpKind.Conditional:
+    case OpKind.DeferWhen:
       return 1;
+    case OpKind.RepeaterCreate:
+      return op.emptyView ? 1 : 0;
     default:
       throw new Error(`Unhandled op: ${OpKind[op.kind]}`);
   }
@@ -19049,12 +19139,12 @@ function wrapI18nIcus(job) {
         case OpKind.IcuStart:
           if (currentI18nOp === null) {
             addedI18nId = job.allocateXrefId();
-            OpList.insertBefore(createI18nStartOp(addedI18nId, op.message), op);
+            OpList.insertBefore(createI18nStartOp(addedI18nId, op.message, void 0, null), op);
           }
           break;
         case OpKind.IcuEnd:
           if (addedI18nId !== null) {
-            OpList.insertAfter(createI18nEndOp(addedI18nId), op);
+            OpList.insertAfter(createI18nEndOp(addedI18nId, null), op);
             addedI18nId = null;
           }
           break;
@@ -19070,6 +19160,7 @@ var phases = [
   { kind: CompilationJobKind.Tmpl, fn: emitNamespaceChanges },
   { kind: CompilationJobKind.Tmpl, fn: propagateI18nBlocks },
   { kind: CompilationJobKind.Tmpl, fn: wrapI18nIcus },
+  { kind: CompilationJobKind.Both, fn: deduplicateTextBindings },
   { kind: CompilationJobKind.Both, fn: specializeStyleBindings },
   { kind: CompilationJobKind.Both, fn: specializeBindings },
   { kind: CompilationJobKind.Both, fn: extractAttributes },
@@ -19108,7 +19199,6 @@ var phases = [
   { kind: CompilationJobKind.Tmpl, fn: createDeferDepsFns },
   { kind: CompilationJobKind.Tmpl, fn: resolveI18nElementPlaceholders },
   { kind: CompilationJobKind.Tmpl, fn: resolveI18nExpressionPlaceholders },
-  { kind: CompilationJobKind.Tmpl, fn: resolveI18nIcuPlaceholders },
   { kind: CompilationJobKind.Tmpl, fn: extractI18nMessages },
   { kind: CompilationJobKind.Tmpl, fn: generateTrackFns },
   { kind: CompilationJobKind.Tmpl, fn: collectI18nConsts },
@@ -19251,7 +19341,7 @@ function ingestHostBinding(input, bindingParser, constantPool) {
       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);
+    ingestHostProperty(job, property2, bindingKind, securityContexts);
   }
   for (const [name, expr] of (_b2 = Object.entries(input.attributes)) != null ? _b2 : []) {
     const securityContexts = bindingParser.calcPossibleSecurityContexts(input.componentSelector, name, true).filter((context) => context !== SecurityContext.NONE);
@@ -19262,7 +19352,7 @@ function ingestHostBinding(input, bindingParser, constantPool) {
   }
   return job;
 }
-function ingestHostProperty(job, property2, bindingKind, isTextAttribute, securityContexts) {
+function ingestHostProperty(job, property2, bindingKind, securityContexts) {
   let expression;
   const ast = property2.expression.ast;
   if (ast instanceof Interpolation) {
@@ -19270,7 +19360,7 @@ function ingestHostProperty(job, property2, bindingKind, isTextAttribute, securi
   } else {
     expression = convertAst(ast, job, property2.sourceSpan);
   }
-  job.root.update.push(createBindingOp(job.root.xref, bindingKind, property2.name, expression, null, securityContexts, isTextAttribute, false, null, null, property2.sourceSpan));
+  job.root.update.push(createBindingOp(job.root.xref, bindingKind, property2.name, expression, null, securityContexts, false, false, null, null, property2.sourceSpan));
 }
 function ingestHostAttribute(job, name, value, securityContexts) {
   const attrBinding = createBindingOp(
@@ -19284,14 +19374,13 @@ function ingestHostAttribute(job, name, value, securityContexts) {
     false,
     null,
     null,
-    null
+    value.sourceSpan
   );
   job.root.update.push(attrBinding);
 }
 function ingestHostEvent(job, event) {
   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)));
+  const eventBinding = createListenerOp(job.root.xref, new SlotHandle(), event.name, null, makeListenerHandlerOps(job.root, event.handler, event.handlerSpan), phase, target, true, event.sourceSpan);
   job.root.create.push(eventBinding);
 }
 function ingestNodes(unit, template2) {
@@ -19303,9 +19392,9 @@ function ingestNodes(unit, template2) {
     } else if (node instanceof Content) {
       ingestContent(unit, node);
     } else if (node instanceof Text) {
-      ingestText(unit, node);
+      ingestText(unit, node, null);
     } else if (node instanceof BoundText) {
-      ingestBoundText(unit, node);
+      ingestBoundText(unit, node, null);
     } else if (node instanceof IfBlock) {
       ingestIfBlock(unit, node);
     } else if (node instanceof SwitchBlock) {
@@ -19322,29 +19411,30 @@ function ingestNodes(unit, template2) {
   }
 }
 function ingestElement(unit, element2) {
-  var _a2;
+  var _a2, _b2;
   if (element2.i18n !== void 0 && !(element2.i18n instanceof Message || element2.i18n instanceof TagPlaceholder)) {
     throw Error(`Unhandled i18n metadata type for element: ${element2.i18n.constructor.name}`);
   }
   const id = unit.job.allocateXrefId();
   const [namespaceKey, elementName] = splitNsName(element2.name);
-  const startOp = createElementStartOp(elementName, id, namespaceForKey(namespaceKey), element2.i18n instanceof TagPlaceholder ? element2.i18n : void 0, element2.startSourceSpan);
+  const startOp = createElementStartOp(elementName, id, namespaceForKey(namespaceKey), element2.i18n instanceof TagPlaceholder ? element2.i18n : void 0, element2.startSourceSpan, element2.sourceSpan);
   unit.create.push(startOp);
   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));
+    unit.create.push(createI18nStartOp(i18nBlockId, element2.i18n, void 0, element2.startSourceSpan));
   }
   ingestNodes(unit, element2.children);
   const endOp = createElementEndOp(id, (_a2 = element2.endSourceSpan) != null ? _a2 : element2.startSourceSpan);
   unit.create.push(endOp);
   if (i18nBlockId !== null) {
-    OpList.insertBefore(createI18nEndOp(i18nBlockId), endOp);
+    OpList.insertBefore(createI18nEndOp(i18nBlockId, (_b2 = element2.endSourceSpan) != null ? _b2 : element2.startSourceSpan), endOp);
   }
 }
 function ingestTemplate(unit, tmpl) {
+  var _a2;
   if (tmpl.i18n !== void 0 && !(tmpl.i18n instanceof Message || tmpl.i18n instanceof TagPlaceholder)) {
     throw Error(`Unhandled i18n metadata type for template: ${tmpl.i18n.constructor.name}`);
   }
@@ -19358,7 +19448,7 @@ function ingestTemplate(unit, tmpl) {
   const namespace = namespaceForKey(namespacePrefix);
   const functionNameSuffix = tagNameWithoutNamespace === null ? "" : prefixWithNamespace(tagNameWithoutNamespace, namespace);
   const templateKind = isPlainTemplate(tmpl) ? TemplateKind.NgTemplate : TemplateKind.Structural;
-  const templateOp = createTemplateOp(childView.xref, templateKind, tagNameWithoutNamespace, functionNameSuffix, namespace, i18nPlaceholder, tmpl.startSourceSpan);
+  const templateOp = createTemplateOp(childView.xref, templateKind, tagNameWithoutNamespace, functionNameSuffix, namespace, i18nPlaceholder, tmpl.startSourceSpan, tmpl.sourceSpan);
   unit.create.push(templateOp);
   ingestTemplateBindings(unit, templateOp, tmpl, templateKind);
   ingestReferences(templateOp, tmpl);
@@ -19368,26 +19458,25 @@ function ingestTemplate(unit, tmpl) {
   }
   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);
+    OpList.insertAfter(createI18nStartOp(id, tmpl.i18n, void 0, tmpl.startSourceSpan), childView.create.head);
+    OpList.insertBefore(createI18nEndOp(id, (_a2 = tmpl.endSourceSpan) != null ? _a2 : tmpl.startSourceSpan), childView.create.tail);
   }
 }
 function ingestContent(unit, content) {
   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);
+  const op = createProjectionOp(unit.job.allocateXrefId(), content.selector, content.i18n, content.sourceSpan);
   for (const attr of content.attributes) {
     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);
 }
-function ingestText(unit, text2) {
-  unit.create.push(createTextOp(unit.job.allocateXrefId(), text2.value, text2.sourceSpan));
+function ingestText(unit, text2, icuPlaceholder) {
+  unit.create.push(createTextOp(unit.job.allocateXrefId(), text2.value, icuPlaceholder, text2.sourceSpan));
 }
-function ingestBoundText(unit, text2, i18nPlaceholders) {
+function ingestBoundText(unit, text2, icuPlaceholder) {
   var _a2;
   let value = text2.value;
   if (value instanceof ASTWithSource) {
@@ -19399,14 +19488,12 @@ function ingestBoundText(unit, text2, i18nPlaceholders) {
   if (text2.i18n !== void 0 && !(text2.i18n instanceof Container)) {
     throw Error(`Unhandled i18n metadata type for text interpolation: ${(_a2 = text2.i18n) == null ? void 0 : _a2.constructor.name}`);
   }
-  if (i18nPlaceholders === void 0) {
-    i18nPlaceholders = text2.i18n instanceof Container ? text2.i18n.children.filter((node) => node instanceof Placeholder).map((placeholder) => placeholder.name) : [];
-  }
+  const i18nPlaceholders = text2.i18n instanceof Container ? text2.i18n.children.filter((node) => node instanceof Placeholder).map((placeholder) => placeholder.name) : [];
   if (i18nPlaceholders.length > 0 && i18nPlaceholders.length !== value.expressions.length) {
     throw Error(`Unexpected number of i18n placeholders (${value.expressions.length}) for BoundText with ${value.expressions.length} expressions`);
   }
   const textXref = unit.job.allocateXrefId();
-  unit.create.push(createTextOp(textXref, "", text2.sourceSpan));
+  unit.create.push(createTextOp(textXref, "", icuPlaceholder, 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));
 }
@@ -19432,7 +19519,7 @@ function ingestIfBlock(unit, ifBlock) {
       }
       ifCaseI18nMeta = ifCase.i18n;
     }
-    const templateOp = createTemplateOp(cView.xref, TemplateKind.Block, tagName, "Conditional", Namespace.HTML, ifCaseI18nMeta, ifCase.sourceSpan);
+    const templateOp = createTemplateOp(cView.xref, TemplateKind.Block, tagName, "Conditional", Namespace.HTML, ifCaseI18nMeta, ifCase.startSourceSpan, ifCase.sourceSpan);
     unit.create.push(templateOp);
     if (firstXref === null) {
       firstXref = cView.xref;
@@ -19460,7 +19547,7 @@ function ingestSwitchBlock(unit, switchBlock) {
       }
       switchCaseI18nMeta = switchCase.i18n;
     }
-    const templateOp = createTemplateOp(cView.xref, TemplateKind.Block, null, "Case", Namespace.HTML, switchCaseI18nMeta, switchCase.sourceSpan);
+    const templateOp = createTemplateOp(cView.xref, TemplateKind.Block, null, "Case", Namespace.HTML, switchCaseI18nMeta, switchCase.startSourceSpan, switchCase.sourceSpan);
     unit.create.push(templateOp);
     if (firstXref === null) {
       firstXref = cView.xref;
@@ -19483,7 +19570,7 @@ function ingestDeferView(unit, suffix, i18nMeta, children, sourceSpan) {
   }
   const secondaryView = unit.job.allocateView(unit.xref);
   ingestNodes(secondaryView, children);
-  const templateOp = createTemplateOp(secondaryView.xref, TemplateKind.Block, null, `Defer${suffix}`, Namespace.HTML, i18nMeta, sourceSpan);
+  const templateOp = createTemplateOp(secondaryView.xref, TemplateKind.Block, null, `Defer${suffix}`, Namespace.HTML, i18nMeta, sourceSpan, sourceSpan);
   unit.create.push(templateOp);
   return templateOp;
 }
@@ -19557,6 +19644,9 @@ function ingestDeferBlock(unit, deferBlock) {
       deferOnOps.push(deferOnOp);
     }
     if (triggers.when !== void 0) {
+      if (triggers.when.value instanceof Interpolation) {
+        throw new Error(`Unexpected interpolation in defer block when trigger`);
+      }
       const deferOnOp = createDeferWhenOp(deferXref, convertAst(triggers.when.value, unit.job, triggers.when.sourceSpan), prefetch, triggers.when.sourceSpan);
       deferWhenOps.push(deferOnOp);
     }
@@ -19576,9 +19666,9 @@ function ingestIcu(unit, icu) {
     unit.create.push(createIcuStartOp(xref, icu.i18n, icuFromI18nMessage(icu.i18n).name, null));
     for (const [placeholder, text2] of Object.entries(__spreadValues(__spreadValues({}, icu.vars), icu.placeholders))) {
       if (text2 instanceof BoundText) {
-        ingestBoundText(unit, text2, [placeholder]);
+        ingestBoundText(unit, text2, placeholder);
       } else {
-        ingestText(unit, text2);
+        ingestText(unit, text2, placeholder);
       }
     }
     unit.create.push(createIcuEndOp(xref));
@@ -19608,9 +19698,11 @@ function ingestForBlock(unit, forBlock) {
   const track = convertAst(forBlock.trackBy, unit.job, sourceSpan);
   ingestNodes(repeaterView, forBlock.children);
   let emptyView = null;
+  let emptyTagName = null;
   if (forBlock.empty !== null) {
     emptyView = unit.job.allocateView(unit.xref);
     ingestNodes(emptyView, forBlock.empty.children);
+    emptyTagName = ingestControlFlowInsertionPoint(unit, emptyView.xref, forBlock.empty);
   }
   const varNames = {
     $index: forBlock.contextVariables.$index.name,
@@ -19630,7 +19722,7 @@ function ingestForBlock(unit, forBlock) {
   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, (_c2 = emptyView == null ? void 0 : emptyView.xref) != null ? _c2 : null, tagName, track, varNames, i18nPlaceholder, emptyI18nPlaceholder, forBlock.sourceSpan);
+  const repeaterCreate2 = createRepeaterCreateOp(repeaterView.xref, (_c2 = emptyView == null ? void 0 : emptyView.xref) != null ? _c2 : null, tagName, track, varNames, emptyTagName, i18nPlaceholder, emptyI18nPlaceholder, forBlock.startSourceSpan, 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);
@@ -19640,7 +19732,10 @@ function convertAst(ast, job, baseSourceSpan) {
   if (ast instanceof ASTWithSource) {
     return convertAst(ast.ast, job, baseSourceSpan);
   } else if (ast instanceof PropertyRead) {
-    if (ast.receiver instanceof ImplicitReceiver && !(ast.receiver instanceof ThisReceiver)) {
+    const isThisReceiver = ast.receiver instanceof ThisReceiver;
+    const isImplicitReceiver = ast.receiver instanceof ImplicitReceiver && !(ast.receiver instanceof ThisReceiver);
+    const isSpecialNode = ast.name === "$any" || ast.name === "$event";
+    if (isImplicitReceiver || isThisReceiver && !isSpecialNode) {
       return new LexicalReadExpr(ast.name);
     } else {
       return new ReadPropExpr(convertAst(ast.receiver, job, baseSourceSpan), ast.name, null, convertSourceSpan(ast.span, baseSourceSpan));
@@ -19718,13 +19813,13 @@ function convertAst(ast, job, baseSourceSpan) {
     throw new Error(`Unhandled expression type "${ast.constructor.name}" in file "${baseSourceSpan == null ? void 0 : baseSourceSpan.start.file.url}"`);
   }
 }
-function convertAstWithInterpolation(job, value, i18nMeta) {
+function convertAstWithInterpolation(job, value, i18nMeta, sourceSpan) {
   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 : {}));
+    expression = new Interpolation2(value.strings, value.expressions.map((e) => convertAst(e, job, sourceSpan != null ? sourceSpan : null)), Object.keys((_b2 = (_a2 = asMessage(i18nMeta)) == null ? void 0 : _a2.placeholders) != null ? _b2 : {}));
   } else if (value instanceof AST) {
-    expression = convertAst(value, job, null);
+    expression = convertAst(value, job, sourceSpan != null ? sourceSpan : null);
   } else {
     expression = literal(value);
   }
@@ -22819,7 +22914,12 @@ var TemplateDefinitionBuilder = class {
     });
     const { expression: trackByExpression, usesComponentInstance: trackByUsesComponentInstance } = this.createTrackByFunction(block);
     let emptyData = null;
+    let emptyTagName = null;
+    let emptyAttrsExprs;
     if (block.empty !== null) {
+      const emptyInferred = this.inferProjectionDataFromInsertionPoint(block.empty);
+      emptyTagName = emptyInferred.tagName;
+      emptyAttrsExprs = emptyInferred.attrsExprs;
       emptyData = this.prepareEmbeddedTemplateFn(block.empty.children, "_ForEmpty", void 0, block.empty.i18n);
       this.allocateBindingSlots(null);
     }
@@ -22835,11 +22935,11 @@ var TemplateDefinitionBuilder = class {
         trackByExpression
       ];
       if (emptyData !== null) {
-        params.push(literal(trackByUsesComponentInstance), variable(emptyData.name), literal(emptyData.getConstCount()), literal(emptyData.getVarCount()));
+        params.push(literal(trackByUsesComponentInstance), variable(emptyData.name), literal(emptyData.getConstCount()), literal(emptyData.getVarCount()), literal(emptyTagName), this.addAttrsToConsts(emptyAttrsExprs || null));
       } else if (trackByUsesComponentInstance) {
         params.push(literal(trackByUsesComponentInstance));
       }
-      return params;
+      return trimTrailingNulls(params);
     });
     const value = block.expression.visit(this._valueConverter);
     this.updateInstructionWithAdvance(blockIndex, block.sourceSpan, Identifiers.repeater, () => [this.convertPropertyBinding(value)]);
@@ -23402,12 +23502,15 @@ var BindingScope = class {
   }
 };
 var TrackByBindingScope = class extends BindingScope {
-  constructor(parentScope, globalAliases) {
+  constructor(parentScope, globalOverrides) {
     super(parentScope.bindingLevel + 1, parentScope);
-    this.globalAliases = globalAliases;
+    this.globalOverrides = globalOverrides;
     this.componentAccessCount = 0;
   }
   get(name) {
+    if (this.globalOverrides.hasOwnProperty(name)) {
+      return variable(this.globalOverrides[name]);
+    }
     let current = this.parent;
     while (current) {
       if (current.hasLocal(name)) {
@@ -23415,9 +23518,6 @@ var TrackByBindingScope = class extends BindingScope {
       }
       current = current.parent;
     }
-    if (this.globalAliases[name]) {
-      return variable(this.globalAliases[name]);
-    }
     this.componentAccessCount++;
     return variable("this").prop(name);
   }
@@ -25436,7 +25536,7 @@ function publishFacade(global) {
 }
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/version.mjs
-var VERSION2 = new Version("17.1.0-next.4");
+var VERSION2 = new Version("17.1.0-next.5");
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/i18n/extractor_merger.mjs
 var _VisitorMode;
@@ -25480,6 +25580,20 @@ var FactoryTarget2;
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/compiler.mjs
 publishFacade(_global);
 
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/ng-generate/control-flow-migration/identifier-lookup.mjs
+var import_typescript5 = __toESM(require("typescript"), 1);
+function lookupIdentifiersInSourceFile(sourceFile, names) {
+  const results = /* @__PURE__ */ new Set();
+  const visit = (node) => {
+    if (import_typescript5.default.isIdentifier(node) && names.includes(node.text)) {
+      results.add(node);
+    }
+    import_typescript5.default.forEachChild(node, visit);
+  };
+  visit(sourceFile);
+  return results;
+}
+
 // bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/ng-generate/control-flow-migration/types.mjs
 var ngtemplate = "ng-template";
 var boundngifelse = "[ngIfElse]";
@@ -25490,6 +25604,18 @@ var startMarker = "\u25EC";
 var endMarker = "\u2722";
 var startI18nMarker = "\u2688";
 var endI18nMarker = "\u2689";
+var importRemovals = [
+  "NgIf",
+  "NgIfElse",
+  "NgIfThenElse",
+  "NgFor",
+  "NgForOf",
+  "NgForTrackBy",
+  "NgSwitch",
+  "NgSwitchCase",
+  "NgSwitchDefault"
+];
+var importWithCommonRemovals = [...importRemovals, "CommonModule"];
 function allFormsOf(selector) {
   return [
     selector,
@@ -25639,22 +25765,24 @@ var Template2 = class {
   }
 };
 var AnalyzedFile = class {
-  constructor() {
+  constructor(sourceFile) {
     __publicField(this, "ranges", []);
     __publicField(this, "removeCommonModule", false);
     __publicField(this, "canRemoveImports", false);
-    __publicField(this, "sourceFilePath", "");
+    __publicField(this, "sourceFile");
+    __publicField(this, "importRanges", []);
+    __publicField(this, "templateRanges", []);
+    this.sourceFile = sourceFile;
   }
   getSortedRanges() {
-    const templateRanges = this.ranges.slice().filter((x) => x.type !== "import").sort((aStart, bStart) => bStart.start - aStart.start);
-    const importRanges = this.ranges.slice().filter((x) => x.type === "import").sort((aStart, bStart) => bStart.start - aStart.start);
-    return [...templateRanges, ...importRanges];
+    this.templateRanges = this.ranges.slice().filter((x) => x.type === "template" || x.type === "templateUrl").sort((aStart, bStart) => bStart.start - aStart.start);
+    this.importRanges = this.ranges.slice().filter((x) => x.type === "importDecorator" || x.type === "importDeclaration").sort((aStart, bStart) => bStart.start - aStart.start);
+    return [...this.templateRanges, ...this.importRanges];
   }
-  static addRange(path2, sourceFilePath, analyzedFiles, range) {
+  static addRange(path2, sourceFile, analyzedFiles, range) {
     let analysis = analyzedFiles.get(path2);
     if (!analysis) {
-      analysis = new AnalyzedFile();
-      analysis.sourceFilePath = sourceFilePath;
+      analysis = new AnalyzedFile(sourceFile);
       analyzedFiles.set(path2, analysis);
     }
     const duplicate = analysis.ranges.find((current) => current.start === range.start && current.end === range.end);
@@ -25662,6 +25790,25 @@ var AnalyzedFile = class {
       analysis.ranges.push(range);
     }
   }
+  verifyCanRemoveImports() {
+    const importDeclaration = this.importRanges.find((r) => r.type === "importDeclaration");
+    const instances = lookupIdentifiersInSourceFile(this.sourceFile, importWithCommonRemovals);
+    let foundImportDeclaration = false;
+    let count = 0;
+    for (let range of this.importRanges) {
+      for (let instance of instances) {
+        if (instance.getStart() >= range.start && instance.getEnd() <= range.end) {
+          if (range === importDeclaration) {
+            foundImportDeclaration = true;
+          }
+          count++;
+        }
+      }
+    }
+    if (instances.size !== count && importDeclaration !== void 0 && foundImportDeclaration) {
+      importDeclaration.remove = false;
+    }
+  }
 };
 var CommonCollector = class extends RecursiveVisitor {
   constructor() {
@@ -25782,19 +25929,7 @@ var TemplateCollector = class extends RecursiveVisitor {
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/ng-generate/control-flow-migration/util.mjs
 var import_path2 = require("path");
-var import_typescript5 = __toESM(require("typescript"), 1);
-var importRemovals = [
-  "NgIf",
-  "NgIfElse",
-  "NgIfThenElse",
-  "NgFor",
-  "NgForOf",
-  "NgForTrackBy",
-  "NgSwitch",
-  "NgSwitchCase",
-  "NgSwitchDefault"
-];
-var importWithCommonRemovals = [...importRemovals, "CommonModule"];
+var import_typescript6 = __toESM(require("typescript"), 1);
 var startMarkerRegex = new RegExp(startMarker, "gm");
 var endMarkerRegex = new RegExp(endMarker, "gm");
 var startI18nMarkerRegex = new RegExp(startI18nMarker, "gm");
@@ -25802,16 +25937,20 @@ 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)) {
+    if (import_typescript6.default.isClassDeclaration(node)) {
       analyzeDecorators(node, sourceFile, analyzedFiles);
     } else {
       analyzeImportDeclarations(node, sourceFile, analyzedFiles);
     }
   });
 }
-function checkIfShouldChange(decl, removeCommonModule) {
+function checkIfShouldChange(decl, file) {
+  const range = file.importRanges.find((r) => r.type === "importDeclaration");
+  if (range === void 0 || !range.remove) {
+    return false;
+  }
   const clause = decl.getChildAt(1);
-  return !(!removeCommonModule && clause.namedBindings && import_typescript5.default.isNamedImports(clause.namedBindings) && clause.namedBindings.elements.length === 1 && clause.namedBindings.elements[0].getText() === "CommonModule");
+  return !(!file.removeCommonModule && clause.namedBindings && import_typescript6.default.isNamedImports(clause.namedBindings) && clause.namedBindings.elements.length === 1 && clause.namedBindings.elements[0].getText() === "CommonModule");
 }
 function updateImportDeclaration(decl, removeCommonModule) {
   const clause = decl.getChildAt(1);
@@ -25819,81 +25958,89 @@ function updateImportDeclaration(decl, removeCommonModule) {
   if (updatedClause === null) {
     return "";
   }
-  const printer = import_typescript5.default.createPrinter({
+  const printer = import_typescript6.default.createPrinter({
     removeComments: true
   });
-  const updated = import_typescript5.default.factory.updateImportDeclaration(decl, decl.modifiers, updatedClause, decl.moduleSpecifier, void 0);
-  return printer.printNode(import_typescript5.default.EmitHint.Unspecified, updated, clause.getSourceFile());
+  const updated = import_typescript6.default.factory.updateImportDeclaration(decl, decl.modifiers, updatedClause, decl.moduleSpecifier, void 0);
+  return printer.printNode(import_typescript6.default.EmitHint.Unspecified, updated, clause.getSourceFile());
 }
 function updateImportClause(clause, removeCommonModule) {
-  if (clause.namedBindings && import_typescript5.default.isNamedImports(clause.namedBindings)) {
+  if (clause.namedBindings && import_typescript6.default.isNamedImports(clause.namedBindings)) {
     const removals = removeCommonModule ? importWithCommonRemovals : importRemovals;
     const elements = clause.namedBindings.elements.filter((el) => !removals.includes(el.getText()));
     if (elements.length === 0) {
       return null;
     }
-    clause = import_typescript5.default.factory.updateImportClause(clause, clause.isTypeOnly, clause.name, import_typescript5.default.factory.createNamedImports(elements));
+    clause = import_typescript6.default.factory.updateImportClause(clause, clause.isTypeOnly, clause.name, import_typescript6.default.factory.createNamedImports(elements));
   }
   return clause;
 }
 function updateClassImports(propAssignment, removeCommonModule) {
-  const printer = import_typescript5.default.createPrinter();
+  const printer = import_typescript6.default.createPrinter();
   const importList = propAssignment.initializer;
   const removals = removeCommonModule ? importWithCommonRemovals : importRemovals;
   const elements = importList.elements.filter((el) => !removals.includes(el.getText()));
   if (elements.length === importList.elements.length) {
     return null;
   }
-  const updatedElements = import_typescript5.default.factory.updateArrayLiteralExpression(importList, elements);
-  const updatedAssignment = import_typescript5.default.factory.updatePropertyAssignment(propAssignment, propAssignment.name, updatedElements);
-  return printer.printNode(import_typescript5.default.EmitHint.Unspecified, updatedAssignment, updatedAssignment.getSourceFile());
+  const updatedElements = import_typescript6.default.factory.updateArrayLiteralExpression(importList, elements);
+  const updatedAssignment = import_typescript6.default.factory.updatePropertyAssignment(propAssignment, propAssignment.name, updatedElements);
+  return printer.printNode(import_typescript6.default.EmitHint.Unspecified, updatedAssignment, updatedAssignment.getSourceFile());
 }
 function analyzeImportDeclarations(node, sourceFile, analyzedFiles) {
   if (node.getText().indexOf("@angular/common") === -1) {
     return;
   }
   const clause = node.getChildAt(1);
-  if (clause.namedBindings && import_typescript5.default.isNamedImports(clause.namedBindings)) {
+  if (clause.namedBindings && import_typescript6.default.isNamedImports(clause.namedBindings)) {
     const elements = clause.namedBindings.elements.filter((el) => importWithCommonRemovals.includes(el.getText()));
     if (elements.length > 0) {
-      AnalyzedFile.addRange(sourceFile.fileName, sourceFile.fileName, analyzedFiles, { start: node.getStart(), end: node.getEnd(), node, type: "import" });
+      AnalyzedFile.addRange(sourceFile.fileName, sourceFile, analyzedFiles, {
+        start: node.getStart(),
+        end: node.getEnd(),
+        node,
+        type: "importDeclaration",
+        remove: true
+      });
     }
   }
 }
 function analyzeDecorators(node, sourceFile, analyzedFiles) {
   var _a2;
-  const decorator = (_a2 = import_typescript5.default.getDecorators(node)) == null ? void 0 : _a2.find((dec) => {
-    return import_typescript5.default.isCallExpression(dec.expression) && import_typescript5.default.isIdentifier(dec.expression.expression) && dec.expression.expression.text === "Component";
+  const decorator = (_a2 = import_typescript6.default.getDecorators(node)) == null ? void 0 : _a2.find((dec) => {
+    return import_typescript6.default.isCallExpression(dec.expression) && import_typescript6.default.isIdentifier(dec.expression.expression) && dec.expression.expression.text === "Component";
   });
-  const metadata = decorator && decorator.expression.arguments.length > 0 && import_typescript5.default.isObjectLiteralExpression(decorator.expression.arguments[0]) ? decorator.expression.arguments[0] : null;
+  const metadata = decorator && decorator.expression.arguments.length > 0 && import_typescript6.default.isObjectLiteralExpression(decorator.expression.arguments[0]) ? decorator.expression.arguments[0] : null;
   if (!metadata) {
     return;
   }
   for (const prop of metadata.properties) {
-    if (!import_typescript5.default.isPropertyAssignment(prop) || !import_typescript5.default.isIdentifier(prop.name) && !import_typescript5.default.isStringLiteralLike(prop.name)) {
+    if (!import_typescript6.default.isPropertyAssignment(prop) || !import_typescript6.default.isIdentifier(prop.name) && !import_typescript6.default.isStringLiteralLike(prop.name)) {
       continue;
     }
     switch (prop.name.text) {
       case "template":
-        AnalyzedFile.addRange(sourceFile.fileName, sourceFile.fileName, analyzedFiles, {
+        AnalyzedFile.addRange(sourceFile.fileName, sourceFile, analyzedFiles, {
           start: prop.initializer.getStart() + 1,
           end: prop.initializer.getEnd() - 1,
           node: prop,
-          type: "template"
+          type: "template",
+          remove: true
         });
         break;
       case "imports":
-        AnalyzedFile.addRange(sourceFile.fileName, sourceFile.fileName, analyzedFiles, {
+        AnalyzedFile.addRange(sourceFile.fileName, sourceFile, analyzedFiles, {
           start: prop.name.getStart(),
           end: prop.initializer.getEnd(),
           node: prop,
-          type: "import"
+          type: "importDecorator",
+          remove: true
         });
         break;
       case "templateUrl":
-        if (import_typescript5.default.isStringLiteralLike(prop.initializer)) {
+        if (import_typescript6.default.isStringLiteralLike(prop.initializer)) {
           const path2 = (0, import_path2.join)((0, import_path2.dirname)(sourceFile.fileName), prop.initializer.text);
-          AnalyzedFile.addRange(path2, sourceFile.fileName, analyzedFiles, { start: 0, node: prop, type: "templateUrl" });
+          AnalyzedFile.addRange(path2, sourceFile, analyzedFiles, { start: 0, node: prop, type: "templateUrl", remove: true });
         }
         break;
     }
@@ -25928,6 +26075,41 @@ function parseTemplate2(template2) {
   }
   return { tree: parsed, errors: [] };
 }
+function validateMigratedTemplate(migrated, fileName) {
+  const parsed = parseTemplate2(migrated);
+  let errors = [];
+  if (parsed.errors.length > 0) {
+    errors.push({
+      type: "parse",
+      error: new Error(`The migration resulted in invalid HTML for ${fileName}. Please check the template for valid HTML structures and run the migration again.`)
+    });
+  }
+  if (parsed.tree) {
+    const i18nError = validateI18nStructure(parsed.tree, fileName);
+    if (i18nError !== null) {
+      errors.push({ type: "i18n", error: i18nError });
+    }
+  }
+  return errors;
+}
+function validateI18nStructure(parsed, fileName) {
+  const visitor = new i18nCollector();
+  visitAll2(visitor, parsed.rootNodes);
+  const parents = visitor.elements.filter((el) => el.children.length > 0);
+  for (const p of parents) {
+    for (const el of visitor.elements) {
+      if (el === p)
+        continue;
+      if (isChildOf(p, el)) {
+        return new Error(`i18n Nesting error: The migration would result in invalid i18n nesting for ${fileName}. Element with i18n attribute "${p.name}" would result having a child of element with i18n attribute "${el.name}". Please fix and re-run the migration.`);
+      }
+    }
+  }
+  return null;
+}
+function isChildOf(parent, el) {
+  return parent.sourceSpan.start.offset < el.sourceSpan.start.offset && parent.sourceSpan.end.offset > el.sourceSpan.end.offset;
+}
 function calculateNesting(visitor, hasLineBreaks2) {
   let nestedQueue = [];
   for (let i = 0; i < visitor.elements.length; i++) {
@@ -26049,12 +26231,12 @@ function canRemoveCommonModule(template2) {
   }
   return removeCommonModule;
 }
-function removeImports(template2, node, removeCommonModule) {
-  if (template2.startsWith("imports") && import_typescript5.default.isPropertyAssignment(node)) {
-    const updatedImport = updateClassImports(node, removeCommonModule);
+function removeImports(template2, node, file) {
+  if (template2.startsWith("imports") && import_typescript6.default.isPropertyAssignment(node)) {
+    const updatedImport = updateClassImports(node, file.removeCommonModule);
     return updatedImport != null ? updatedImport : template2;
-  } else if (import_typescript5.default.isImportDeclaration(node) && checkIfShouldChange(node, removeCommonModule)) {
-    return updateImportDeclaration(node, removeCommonModule);
+  } else if (import_typescript6.default.isImportDeclaration(node) && checkIfShouldChange(node, file)) {
+    return updateImportDeclaration(node, file.removeCommonModule);
   }
   return template2;
 }
@@ -26159,6 +26341,10 @@ function formatTemplate(tmpl, templateType) {
     let openSelfClosingEl = false;
     const openBlockRegex = /^\s*\@(if|switch|case|default|for)|^\s*\}\s\@else/;
     const openElRegex = /^\s*<([a-z0-9]+)(?![^>]*\/>)[^>]*>?/;
+    const openAttrDoubleRegex = /="([^"]|\\")*$/;
+    const openAttrSingleRegex = /='([^']|\\')*$/;
+    const closeAttrDoubleRegex = /^\s*([^><]|\\")*"/;
+    const closeAttrSingleRegex = /^\s*([^><]|\\')*'/;
     const selfClosingRegex = new RegExp(`^\\s*<(${selfClosingList}).+\\/?>`);
     const openSelfClosingRegex = new RegExp(`^\\s*<(${selfClosingList})(?![^>]*\\/>)[^>]*$`);
     const closeBlockRegex = /^\s*\}\s*$|^\s*\}\s\@else/;
@@ -26174,6 +26360,8 @@ function formatTemplate(tmpl, templateType) {
     let i18nDepth = 0;
     let inMigratedBlock = false;
     let inI18nBlock = false;
+    let inAttribute = false;
+    let isDoubleQuotes = false;
     for (let [index, line] of lines.entries()) {
       depth += [...line.matchAll(startMarkerRegex)].length - [...line.matchAll(endMarkerRegex)].length;
       inMigratedBlock = depth > 0;
@@ -26183,7 +26371,7 @@ function formatTemplate(tmpl, templateType) {
         line = line.replace(replaceMarkerRegex, "");
         lineWasMigrated = true;
       }
-      if (line.trim() === "" && index !== 0 && index !== lines.length - 1 && (inMigratedBlock || lineWasMigrated)) {
+      if (line.trim() === "" && index !== 0 && index !== lines.length - 1 && (inMigratedBlock || lineWasMigrated) && !inI18nBlock && !inAttribute) {
         continue;
       }
       if (templateType === "template" && index <= 1) {
@@ -26193,8 +26381,20 @@ function formatTemplate(tmpl, templateType) {
       if ((closeBlockRegex.test(line) || closeElRegex.test(line) && (!singleLineElRegex.test(line) && !closeMultiLineElRegex.test(line))) && indent !== "") {
         indent = indent.slice(2);
       }
-      const newLine = inI18nBlock ? line : mindent + (line.trim() !== "" ? indent : "") + line.trim();
+      const isOpenDoubleAttr = openAttrDoubleRegex.test(line);
+      const isOpenSingleAttr = openAttrSingleRegex.test(line);
+      if (!inAttribute && isOpenDoubleAttr) {
+        inAttribute = true;
+        isDoubleQuotes = true;
+      } else if (!inAttribute && isOpenSingleAttr) {
+        inAttribute = true;
+        isDoubleQuotes = false;
+      }
+      const newLine = inI18nBlock || inAttribute ? line : mindent + (line.trim() !== "" ? indent : "") + line.trim();
       formatted.push(newLine);
+      if (!isOpenDoubleAttr && !isOpenSingleAttr && (inAttribute && isDoubleQuotes && closeAttrDoubleRegex.test(line) || inAttribute && !isDoubleQuotes && closeAttrSingleRegex.test(line))) {
+        inAttribute = false;
+      }
       if (closeMultiLineElRegex.test(line)) {
         indent = indent.slice(2);
         if (openSelfClosingEl) {
@@ -26220,7 +26420,7 @@ function formatTemplate(tmpl, templateType) {
 }
 function forEachClass(sourceFile, callback) {
   sourceFile.forEachChild(function walk(node) {
-    if (import_typescript5.default.isClassDeclaration(node) || import_typescript5.default.isImportDeclaration(node)) {
+    if (import_typescript6.default.isClassDeclaration(node) || import_typescript6.default.isImportDeclaration(node)) {
       callback(node);
     }
     node.forEachChild(walk);
@@ -26461,10 +26661,10 @@ function getNgForParts(expression) {
       current = "";
       continue;
     }
-    if (stringPairs.has(char)) {
-      stringStack.push(stringPairs.get(char));
-    } else if (stringStack.length > 0 && stringStack[stringStack.length - 1] === char) {
+    if (stringStack.length > 0 && stringStack[stringStack.length - 1] === char) {
       stringStack.pop();
+    } else if (stringPairs.has(char)) {
+      stringStack.push(stringPairs.get(char));
     }
     if (commaSeparatedSyntax.has(char)) {
       commaSeparatedStack.push(commaSeparatedSyntax.get(char));
@@ -26719,13 +26919,9 @@ 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] };
+      const errors2 = validateMigratedTemplate(migrated, file.sourceFile.fileName);
+      if (errors2.length > 0) {
+        return { migrated: template2, errors: errors2 };
       }
     }
     if (format && changed) {
@@ -26735,11 +26931,14 @@ function migrateTemplate(template2, templateType, node, file, format = true, ana
     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);
+    if (templateType === "templateUrl" && analyzedFiles !== null && analyzedFiles.has(file.sourceFile.fileName)) {
+      const componentFile = analyzedFiles.get(file.sourceFile.fileName);
+      componentFile.getSortedRanges();
       componentFile.removeCommonModule = file.removeCommonModule;
       componentFile.canRemoveImports = file.canRemoveImports;
+      componentFile.verifyCanRemoveImports();
     }
+    file.verifyCanRemoveImports();
     errors = [
       ...ifResult.errors,
       ...forResult.errors,
@@ -26747,7 +26946,7 @@ function migrateTemplate(template2, templateType, node, file, format = true, ana
       ...caseResult.errors
     ];
   } else if (file.canRemoveImports) {
-    migrated = removeImports(template2, node, file.removeCommonModule);
+    migrated = removeImports(template2, node, file);
   }
   return { migrated, errors };
 }