@angular/core 17.0.2 → 17.0.4

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

@@ -83,86 +83,6 @@ function normalizePath(path2) {
   return path2.replace(/\\/g, "/");
 }
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/project_tsconfig_paths.mjs
-var import_core = require("@angular-devkit/core");
-function getProjectTsConfigPaths(tree) {
-  return __async(this, null, function* () {
-    const buildPaths = /* @__PURE__ */ new Set();
-    const testPaths = /* @__PURE__ */ new Set();
-    const workspace = yield getWorkspace(tree);
-    for (const [, project] of workspace.projects) {
-      for (const [name, target] of project.targets) {
-        if (name !== "build" && name !== "test") {
-          continue;
-        }
-        for (const [, options] of allTargetOptions(target)) {
-          const tsConfig = options["tsConfig"];
-          if (typeof tsConfig !== "string" || !tree.exists(tsConfig)) {
-            continue;
-          }
-          if (name === "build") {
-            buildPaths.add((0, import_core.normalize)(tsConfig));
-          } else {
-            testPaths.add((0, import_core.normalize)(tsConfig));
-          }
-        }
-      }
-    }
-    return {
-      buildPaths: [...buildPaths],
-      testPaths: [...testPaths]
-    };
-  });
-}
-function* allTargetOptions(target) {
-  if (target.options) {
-    yield [void 0, target.options];
-  }
-  if (!target.configurations) {
-    return;
-  }
-  for (const [name, options] of Object.entries(target.configurations)) {
-    if (options) {
-      yield [name, options];
-    }
-  }
-}
-function createHost(tree) {
-  return {
-    readFile(path2) {
-      return __async(this, null, function* () {
-        const data = tree.read(path2);
-        if (!data) {
-          throw new Error("File not found.");
-        }
-        return import_core.virtualFs.fileBufferToString(data);
-      });
-    },
-    writeFile(path2, data) {
-      return __async(this, null, function* () {
-        return tree.overwrite(path2, data);
-      });
-    },
-    isDirectory(path2) {
-      return __async(this, null, function* () {
-        return !tree.exists(path2) && tree.getDir(path2).subfiles.length > 0;
-      });
-    },
-    isFile(path2) {
-      return __async(this, null, function* () {
-        return tree.exists(path2);
-      });
-    }
-  };
-}
-function getWorkspace(tree) {
-  return __async(this, null, function* () {
-    const host = createHost(tree);
-    const { workspace } = yield import_core.workspaces.readWorkspace("/", host);
-    return workspace;
-  });
-}
-
 // bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/typescript/compiler_host.mjs
 var import_path = require("path");
 var import_typescript4 = __toESM(require("typescript"), 1);
@@ -620,6 +540,9 @@ var _SerializerVisitor = class {
   visitIcuPlaceholder(ph, context) {
     return `<ph icu name="${ph.name}">${ph.value.visit(this)}</ph>`;
   }
+  visitBlockPlaceholder(ph, context) {
+    return `<ph block name="${ph.startName}">${ph.children.map((child) => child.visit(this)).join(", ")}</ph name="${ph.closeName}">`;
+  }
 };
 var serializerVisitor = new _SerializerVisitor();
 function serializeNodes(nodes) {
@@ -3665,43 +3588,47 @@ var BlockNode = class {
   }
 };
 var DeferredBlockPlaceholder = class extends BlockNode {
-  constructor(children, minimumTime, nameSpan, sourceSpan, startSourceSpan, endSourceSpan) {
+  constructor(children, minimumTime, nameSpan, sourceSpan, startSourceSpan, endSourceSpan, i18n2) {
     super(nameSpan, sourceSpan, startSourceSpan, endSourceSpan);
     this.children = children;
     this.minimumTime = minimumTime;
+    this.i18n = i18n2;
   }
   visit(visitor) {
     return visitor.visitDeferredBlockPlaceholder(this);
   }
 };
 var DeferredBlockLoading = class extends BlockNode {
-  constructor(children, afterTime, minimumTime, nameSpan, sourceSpan, startSourceSpan, endSourceSpan) {
+  constructor(children, afterTime, minimumTime, nameSpan, sourceSpan, startSourceSpan, endSourceSpan, i18n2) {
     super(nameSpan, sourceSpan, startSourceSpan, endSourceSpan);
     this.children = children;
     this.afterTime = afterTime;
     this.minimumTime = minimumTime;
+    this.i18n = i18n2;
   }
   visit(visitor) {
     return visitor.visitDeferredBlockLoading(this);
   }
 };
 var DeferredBlockError = class extends BlockNode {
-  constructor(children, nameSpan, sourceSpan, startSourceSpan, endSourceSpan) {
+  constructor(children, nameSpan, sourceSpan, startSourceSpan, endSourceSpan, i18n2) {
     super(nameSpan, sourceSpan, startSourceSpan, endSourceSpan);
     this.children = children;
+    this.i18n = i18n2;
   }
   visit(visitor) {
     return visitor.visitDeferredBlockError(this);
   }
 };
 var DeferredBlock = class extends BlockNode {
-  constructor(children, triggers, prefetchTriggers, placeholder, loading, error2, nameSpan, sourceSpan, mainBlockSpan, startSourceSpan, endSourceSpan) {
+  constructor(children, triggers, prefetchTriggers, placeholder, loading, error2, nameSpan, sourceSpan, mainBlockSpan, startSourceSpan, endSourceSpan, i18n2) {
     super(nameSpan, sourceSpan, startSourceSpan, endSourceSpan);
     this.children = children;
     this.placeholder = placeholder;
     this.loading = loading;
     this.error = error2;
     this.mainBlockSpan = mainBlockSpan;
+    this.i18n = i18n2;
     this.triggers = triggers;
     this.prefetchTriggers = prefetchTriggers;
     this.definedTriggers = Object.keys(triggers);
@@ -3722,10 +3649,10 @@ var DeferredBlock = class extends BlockNode {
   }
 };
 var SwitchBlock = class extends BlockNode {
-  constructor(expression, cases, unknownBlocks, sourceSpan, startSourceSpan, endSourceSpan, nameSpan) {
+  constructor(expression, cases2, unknownBlocks, sourceSpan, startSourceSpan, endSourceSpan, nameSpan) {
     super(nameSpan, sourceSpan, startSourceSpan, endSourceSpan);
     this.expression = expression;
-    this.cases = cases;
+    this.cases = cases2;
     this.unknownBlocks = unknownBlocks;
   }
   visit(visitor) {
@@ -3733,17 +3660,18 @@ var SwitchBlock = class extends BlockNode {
   }
 };
 var SwitchBlockCase = class extends BlockNode {
-  constructor(expression, children, sourceSpan, startSourceSpan, endSourceSpan, nameSpan) {
+  constructor(expression, children, sourceSpan, startSourceSpan, endSourceSpan, nameSpan, i18n2) {
     super(nameSpan, sourceSpan, startSourceSpan, endSourceSpan);
     this.expression = expression;
     this.children = children;
+    this.i18n = i18n2;
   }
   visit(visitor) {
     return visitor.visitSwitchBlockCase(this);
   }
 };
 var ForLoopBlock = class extends BlockNode {
-  constructor(item, expression, trackBy, trackKeywordSpan, contextVariables, children, empty, sourceSpan, mainBlockSpan, startSourceSpan, endSourceSpan, nameSpan) {
+  constructor(item, expression, trackBy, trackKeywordSpan, contextVariables, children, empty, sourceSpan, mainBlockSpan, startSourceSpan, endSourceSpan, nameSpan, i18n2) {
     super(nameSpan, sourceSpan, startSourceSpan, endSourceSpan);
     this.item = item;
     this.expression = expression;
@@ -3753,15 +3681,17 @@ var ForLoopBlock = class extends BlockNode {
     this.children = children;
     this.empty = empty;
     this.mainBlockSpan = mainBlockSpan;
+    this.i18n = i18n2;
   }
   visit(visitor) {
     return visitor.visitForLoopBlock(this);
   }
 };
 var ForLoopBlockEmpty = class extends BlockNode {
-  constructor(children, sourceSpan, startSourceSpan, endSourceSpan, nameSpan) {
+  constructor(children, sourceSpan, startSourceSpan, endSourceSpan, nameSpan, i18n2) {
     super(nameSpan, sourceSpan, startSourceSpan, endSourceSpan);
     this.children = children;
+    this.i18n = i18n2;
   }
   visit(visitor) {
     return visitor.visitForLoopBlockEmpty(this);
@@ -3777,11 +3707,12 @@ var IfBlock = class extends BlockNode {
   }
 };
 var IfBlockBranch = class extends BlockNode {
-  constructor(expression, children, expressionAlias, sourceSpan, startSourceSpan, endSourceSpan, nameSpan) {
+  constructor(expression, children, expressionAlias, sourceSpan, startSourceSpan, endSourceSpan, nameSpan, i18n2) {
     super(nameSpan, sourceSpan, startSourceSpan, endSourceSpan);
     this.expression = expression;
     this.children = children;
     this.expressionAlias = expressionAlias;
+    this.i18n = i18n2;
   }
   visit(visitor) {
     return visitor.visitIfBlockBranch(this);
@@ -3924,10 +3855,10 @@ var Container = class {
   }
 };
 var Icu2 = class {
-  constructor(expression, type, cases, sourceSpan, expressionPlaceholder) {
+  constructor(expression, type, cases2, sourceSpan, expressionPlaceholder) {
     this.expression = expression;
     this.type = type;
-    this.cases = cases;
+    this.cases = cases2;
     this.sourceSpan = sourceSpan;
     this.expressionPlaceholder = expressionPlaceholder;
   }
@@ -3971,6 +3902,43 @@ var IcuPlaceholder = class {
     return visitor.visitIcuPlaceholder(this, context);
   }
 };
+var BlockPlaceholder = class {
+  constructor(name, parameters, startName, closeName, children, sourceSpan, startSourceSpan, endSourceSpan) {
+    this.name = name;
+    this.parameters = parameters;
+    this.startName = startName;
+    this.closeName = closeName;
+    this.children = children;
+    this.sourceSpan = sourceSpan;
+    this.startSourceSpan = startSourceSpan;
+    this.endSourceSpan = endSourceSpan;
+  }
+  visit(visitor, context) {
+    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("");
@@ -3997,6 +3965,10 @@ var LocalizeMessageStringVisitor = class {
   visitIcuPlaceholder(ph) {
     return `{$${ph.name}}`;
   }
+  visitBlockPlaceholder(ph) {
+    const children = ph.children.map((child) => child.visit(this)).join("");
+    return `{$${ph.startName}}${children}{$${ph.closeName}}`;
+  }
 };
 
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/i18n/serializers/xml_helper.mjs
@@ -4464,7 +4436,7 @@ function assertInterpolationSymbols(identifier, value) {
   }
 }
 
-// bazel-out/k8-fastbuild/bin/packages/compiler/src/ml_parser/interpolation_config.mjs
+// bazel-out/k8-fastbuild/bin/packages/compiler/src/ml_parser/defaults.mjs
 var InterpolationConfig = class {
   static fromArray(markers) {
     if (!markers) {
@@ -4479,6 +4451,7 @@ var InterpolationConfig = class {
   }
 };
 var DEFAULT_INTERPOLATION_CONFIG = new InterpolationConfig("{{", "}}");
+var DEFAULT_CONTAINER_BLOCKS = /* @__PURE__ */ new Set(["switch"]);
 
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/chars.mjs
 var $EOF = 0;
@@ -7014,8 +6987,8 @@ var OpKind;
   OpKind2[OpKind2["I18nEnd"] = 38] = "I18nEnd";
   OpKind2[OpKind2["I18nExpression"] = 39] = "I18nExpression";
   OpKind2[OpKind2["I18nApply"] = 40] = "I18nApply";
-  OpKind2[OpKind2["Icu"] = 41] = "Icu";
-  OpKind2[OpKind2["IcuUpdate"] = 42] = "IcuUpdate";
+  OpKind2[OpKind2["IcuStart"] = 41] = "IcuStart";
+  OpKind2[OpKind2["IcuEnd"] = 42] = "IcuEnd";
   OpKind2[OpKind2["I18nContext"] = 43] = "I18nContext";
 })(OpKind || (OpKind = {}));
 var ExpressionKind;
@@ -7100,6 +7073,7 @@ var I18nParamValueFlags;
   I18nParamValueFlags2[I18nParamValueFlags2["TemplateTag"] = 2] = "TemplateTag";
   I18nParamValueFlags2[I18nParamValueFlags2["OpenTag"] = 4] = "OpenTag";
   I18nParamValueFlags2[I18nParamValueFlags2["CloseTag"] = 8] = "CloseTag";
+  I18nParamValueFlags2[I18nParamValueFlags2["ExpressionIndex"] = 16] = "ExpressionIndex";
 })(I18nParamValueFlags || (I18nParamValueFlags = {}));
 var Namespace;
 (function(Namespace2) {
@@ -7289,13 +7263,13 @@ function createConditionalOp(target, targetSlot, test, conditions, sourceSpan) {
   }, NEW_OP), TRAIT_DEPENDS_ON_SLOT_CONTEXT), TRAIT_CONSUMES_VARS);
 }
 function createRepeaterOp(repeaterCreate2, targetSlot, collection, sourceSpan) {
-  return __spreadValues({
+  return __spreadValues(__spreadValues({
     kind: OpKind.Repeater,
     target: repeaterCreate2,
     targetSlot,
     collection,
     sourceSpan
-  }, NEW_OP);
+  }, NEW_OP), TRAIT_DEPENDS_ON_SLOT_CONTEXT);
 }
 function createDeferWhenOp(target, expr, prefetch, sourceSpan) {
   return __spreadValues(__spreadValues({
@@ -7326,13 +7300,6 @@ function createI18nApplyOp(target, handle, sourceSpan) {
     sourceSpan
   }, NEW_OP);
 }
-function createIcuUpdateOp(xref, sourceSpan) {
-  return __spreadValues({
-    kind: OpKind.IcuUpdate,
-    xref,
-    sourceSpan
-  }, NEW_OP);
-}
 
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/template/pipeline/ir/src/expression.mjs
 var _a;
@@ -8096,8 +8063,8 @@ function transformExpressionsInOp(op, transform2, flags) {
     case OpKind.I18nContext:
     case OpKind.I18nEnd:
     case OpKind.I18nStart:
-    case OpKind.Icu:
-    case OpKind.IcuUpdate:
+    case OpKind.IcuEnd:
+    case OpKind.IcuStart:
     case OpKind.Namespace:
     case OpKind.Pipe:
     case OpKind.Projection:
@@ -8599,17 +8566,22 @@ function createI18nEndOp(xref) {
     xref
   }, NEW_OP);
 }
-function createIcuOp(xref, message, icu, messagePlaceholder, sourceSpan) {
+function createIcuStartOp(xref, message, messagePlaceholder, sourceSpan) {
   return __spreadValues({
-    kind: OpKind.Icu,
+    kind: OpKind.IcuStart,
     xref,
     message,
-    icu,
     messagePlaceholder,
     context: null,
     sourceSpan
   }, NEW_OP);
 }
+function createIcuEndOp(xref) {
+  return __spreadValues({
+    kind: OpKind.IcuEnd,
+    xref
+  }, NEW_OP);
+}
 function createI18nContextOp(xref, i18nBlock, message, sourceSpan) {
   return __spreadValues({
     kind: OpKind.I18nContext,
@@ -8763,20 +8735,30 @@ function removeAnys(e) {
 
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/apply_i18n_expressions.mjs
 function applyI18nExpressions(job) {
+  const i18nContexts = /* @__PURE__ */ new Map();
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      if (op.kind === OpKind.I18nContext) {
+        i18nContexts.set(op.xref, op);
+      }
+    }
+  }
   for (const unit of job.units) {
     for (const op of unit.update) {
-      if (op.kind === OpKind.I18nExpression && needsApplication(op)) {
+      if (op.kind === OpKind.I18nExpression && needsApplication(i18nContexts, op)) {
         OpList.insertAfter(createI18nApplyOp(op.target, op.handle, null), op);
       }
     }
   }
 }
-function needsApplication(op) {
+function needsApplication(i18nContexts, op) {
   var _a2;
   if (((_a2 = op.next) == null ? void 0 : _a2.kind) !== OpKind.I18nExpression) {
     return true;
   }
-  if (op.next.context !== op.context) {
+  const context = i18nContexts.get(op.context);
+  const nextContext2 = i18nContexts.get(op.next.context);
+  if (context.i18nBlock !== nextContext2.i18nBlock) {
     return true;
   }
   return false;
@@ -9320,7 +9302,7 @@ function createI18nContexts(job) {
         case OpKind.I18nEnd:
           currentI18nOp = null;
           break;
-        case OpKind.Icu:
+        case OpKind.IcuStart:
           if (currentI18nOp === null) {
             throw Error("Unexpected ICU outside of an i18n block.");
           }
@@ -9337,52 +9319,6 @@ function createI18nContexts(job) {
   }
 }
 
-// bazel-out/k8-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/create_i18n_icu_expressions.mjs
-function createI18nIcuExpressions(job) {
-  const icus = /* @__PURE__ */ new Map();
-  const i18nContexts = /* @__PURE__ */ new Map();
-  const i18nBlocks = /* @__PURE__ */ new Map();
-  for (const unit of job.units) {
-    for (const op of unit.create) {
-      switch (op.kind) {
-        case OpKind.Icu:
-          icus.set(op.xref, op);
-          break;
-        case OpKind.I18nContext:
-          i18nContexts.set(op.xref, op);
-          break;
-        case OpKind.I18nStart:
-          i18nBlocks.set(op.xref, op);
-          break;
-      }
-    }
-    for (const op of unit.update) {
-      switch (op.kind) {
-        case OpKind.IcuUpdate:
-          const icuOp = icus.get(op.xref);
-          if ((icuOp == null ? void 0 : icuOp.icu.expressionPlaceholder) === void 0) {
-            throw Error("ICU should have an i18n placeholder");
-          }
-          if (icuOp.context === null) {
-            throw Error("ICU should have its i18n context set");
-          }
-          const i18nContext = i18nContexts.get(icuOp.context);
-          const i18nBlock = i18nBlocks.get(i18nContext.i18nBlock);
-          OpList.replace(op, createI18nExpressionOp(
-            i18nContext.xref,
-            i18nBlock.xref,
-            i18nBlock.handle,
-            new LexicalReadExpr(icuOp.icu.expression),
-            icuOp.icu.expressionPlaceholder,
-            I18nParamResolutionTime.Postproccessing,
-            null
-          ));
-          break;
-      }
-    }
-  }
-}
-
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/defer_configs.mjs
 function configureDeferInstructions(job) {
   for (const unit of job.units) {
@@ -9696,18 +9632,23 @@ function extractI18nMessages(job) {
   }
   for (const unit of job.units) {
     for (const op of unit.create) {
-      if (op.kind === OpKind.Icu) {
-        if (!op.context) {
-          throw Error("ICU op should have its context set.");
-        }
-        if (!i18nBlockContexts.has(op.context)) {
-          const i18nContext = i18nContexts.get(op.context);
-          const subMessage = createI18nMessage(job, i18nContext, op.messagePlaceholder);
-          unit.create.push(subMessage);
-          const parentMessage = i18nBlockMessages.get(i18nContext.i18nBlock);
-          parentMessage == null ? void 0 : parentMessage.subMessages.push(subMessage.xref);
-        }
-        OpList.remove(op);
+      switch (op.kind) {
+        case OpKind.IcuStart:
+          if (!op.context) {
+            throw Error("ICU op should have its context set.");
+          }
+          if (!i18nBlockContexts.has(op.context)) {
+            const i18nContext = i18nContexts.get(op.context);
+            const subMessage = createI18nMessage(job, i18nContext, op.messagePlaceholder);
+            unit.create.push(subMessage);
+            const parentMessage = i18nBlockMessages.get(i18nContext.i18nBlock);
+            parentMessage == null ? void 0 : parentMessage.subMessages.push(subMessage.xref);
+          }
+          OpList.remove(op);
+          break;
+        case OpKind.IcuEnd:
+          OpList.remove(op);
+          break;
       }
     }
   }
@@ -9723,7 +9664,7 @@ function createI18nMessage(job, context, messagePlaceholder) {
 }
 function formatParams(params) {
   const result = /* @__PURE__ */ new Map();
-  for (const [placeholder, placeholderValues] of [...params].sort()) {
+  for (const [placeholder, placeholderValues] of params) {
     const serializedValues = formatParamValues(placeholderValues);
     if (serializedValues !== null) {
       result.set(placeholder, literal(formatParamValues(placeholderValues)));
@@ -9739,6 +9680,9 @@ function formatParamValues(values) {
   return serializedValues.length === 1 ? serializedValues[0] : `${LIST_START_MARKER}${serializedValues.join(LIST_DELIMITER)}${LIST_END_MARKER}`;
 }
 function formatValue(value) {
+  if (value.flags === I18nParamValueFlags.None) {
+    return `${value.value}`;
+  }
   let tagMarker = "";
   let closeMarker = "";
   if (value.flags & I18nParamValueFlags.ElementTag) {
@@ -10000,6 +9944,9 @@ var IcuSerializerVisitor = class {
   visitPlaceholder(ph) {
     return this.formatPh(ph.name);
   }
+  visitBlockPlaceholder(ph) {
+    return `${this.formatPh(ph.startName)}${ph.children.map((child) => child.visit(this)).join("")}${this.formatPh(ph.closeName)}`;
+  }
   visitIcuPlaceholder(ph, context) {
     return this.formatPh(ph.name);
   }
@@ -11285,11 +11232,11 @@ var Text4 = class extends NodeWithI18n {
   }
 };
 var Expansion = class extends NodeWithI18n {
-  constructor(switchValue, type, cases, sourceSpan, switchValueSourceSpan, i18n2) {
+  constructor(switchValue, type, cases2, sourceSpan, switchValueSourceSpan, i18n2) {
     super(sourceSpan, i18n2);
     this.switchValue = switchValue;
     this.type = type;
-    this.cases = cases;
+    this.cases = cases2;
     this.switchValueSourceSpan = switchValueSourceSpan;
   }
   visit(visitor, context) {
@@ -11343,12 +11290,12 @@ var Comment2 = class {
     return visitor.visitComment(this, context);
   }
 };
-var Block = class {
-  constructor(name, parameters, children, sourceSpan, nameSpan, startSourceSpan, endSourceSpan = null) {
+var Block = class extends NodeWithI18n {
+  constructor(name, parameters, children, sourceSpan, nameSpan, startSourceSpan, endSourceSpan = null, i18n2) {
+    super(sourceSpan, i18n2);
     this.name = name;
     this.parameters = parameters;
     this.children = children;
-    this.sourceSpan = sourceSpan;
     this.nameSpan = nameSpan;
     this.startSourceSpan = startSourceSpan;
     this.endSourceSpan = endSourceSpan;
@@ -11967,6 +11914,24 @@ var PlaceholderRegistry = class {
   getUniquePlaceholder(name) {
     return this._generateUniqueName(name.toUpperCase());
   }
+  getStartBlockPlaceholderName(name, parameters) {
+    const signature = this._hashBlock(name, parameters);
+    if (this._signatureToName[signature]) {
+      return this._signatureToName[signature];
+    }
+    const placeholder = this._generateUniqueName(`START_BLOCK_${this._toSnakeCase(name)}`);
+    this._signatureToName[signature] = placeholder;
+    return placeholder;
+  }
+  getCloseBlockPlaceholderName(name) {
+    const signature = this._hashClosingBlock(name);
+    if (this._signatureToName[signature]) {
+      return this._signatureToName[signature];
+    }
+    const placeholder = this._generateUniqueName(`CLOSE_BLOCK_${this._toSnakeCase(name)}`);
+    this._signatureToName[signature] = placeholder;
+    return placeholder;
+  }
   _hashTag(tag, attrs, isVoid) {
     const start = `<${tag}`;
     const strAttrs = Object.keys(attrs).sort().map((name) => ` ${name}=${attrs[name]}`).join("");
@@ -11976,6 +11941,16 @@ var PlaceholderRegistry = class {
   _hashClosingTag(tag) {
     return this._hashTag(`/${tag}`, {}, false);
   }
+  _hashBlock(name, parameters) {
+    const params = parameters.length === 0 ? "" : ` (${parameters.sort().join("; ")})`;
+    return `@${name}${params} {}`;
+  }
+  _hashClosingBlock(name) {
+    return this._hashBlock(`close_${name}`, []);
+  }
+  _toSnakeCase(name) {
+    return name.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+  }
   _generateUniqueName(base) {
     const seen = this._placeHolderNameCounts.hasOwnProperty(base);
     if (!seen) {
@@ -11990,17 +11965,18 @@ var PlaceholderRegistry = class {
 
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/i18n/i18n_parser.mjs
 var _expParser = new Parser(new Lexer());
-function createI18nMessageFactory(interpolationConfig) {
-  const visitor = new _I18nVisitor(_expParser, interpolationConfig);
+function createI18nMessageFactory(interpolationConfig, containerBlocks) {
+  const visitor = new _I18nVisitor(_expParser, interpolationConfig, containerBlocks);
   return (nodes, meaning, description, customId, visitNodeFn) => visitor.toI18nMessage(nodes, meaning, description, customId, visitNodeFn);
 }
 function noopVisitNodeFn(_html, i18n2) {
   return i18n2;
 }
 var _I18nVisitor = class {
-  constructor(_expressionParser, _interpolationConfig) {
+  constructor(_expressionParser, _interpolationConfig, _containerBlocks) {
     this._expressionParser = _expressionParser;
     this._interpolationConfig = _interpolationConfig;
+    this._containerBlocks = _containerBlocks;
   }
   toI18nMessage(nodes, meaning = "", description = "", customId = "", visitNodeFn) {
     const context = {
@@ -12075,11 +12051,27 @@ var _I18nVisitor = class {
     throw new Error("Unreachable code");
   }
   visitBlock(block, context) {
+    var _a2;
     const children = visitAll2(this, block.children, context);
-    const node = new Container(children, block.sourceSpan);
+    if (this._containerBlocks.has(block.name)) {
+      return new Container(children, block.sourceSpan);
+    }
+    const parameters = block.parameters.map((param) => param.expression);
+    const startPhName = context.placeholderRegistry.getStartBlockPlaceholderName(block.name, parameters);
+    const closePhName = context.placeholderRegistry.getCloseBlockPlaceholderName(block.name);
+    context.placeholderToContent[startPhName] = {
+      text: block.startSourceSpan.toString(),
+      sourceSpan: block.startSourceSpan
+    };
+    context.placeholderToContent[closePhName] = {
+      text: block.endSourceSpan ? block.endSourceSpan.toString() : "}",
+      sourceSpan: (_a2 = block.endSourceSpan) != null ? _a2 : block.sourceSpan
+    };
+    const node = new BlockPlaceholder(block.name, parameters, startPhName, closePhName, children, block.sourceSpan, block.startSourceSpan, block.endSourceSpan);
     return context.visitNodeFn(block, node);
   }
   visitBlockParameter(_parameter, _context) {
+    throw new Error("Unreachable code");
   }
   _visitTextWithInterpolation(tokens, sourceSpan, context, previousI18n) {
     const nodes = [];
@@ -15310,19 +15302,19 @@ var _TreeBuilder = class {
   _consumeExpansion(token) {
     const switchValue = this._advance();
     const type = this._advance();
-    const cases = [];
+    const cases2 = [];
     while (this._peek.type === 20) {
       const expCase = this._parseExpansionCase();
       if (!expCase)
         return;
-      cases.push(expCase);
+      cases2.push(expCase);
     }
     if (this._peek.type !== 23) {
       this.errors.push(TreeError.create(null, this._peek.sourceSpan, `Invalid ICU message. Missing '}'.`));
       return;
     }
     const sourceSpan = new ParseSourceSpan(token.sourceSpan.start, this._peek.sourceSpan.end, token.sourceSpan.fullStart);
-    this._addToParent(new Expansion(switchValue.parts[0], type.parts[0], cases, sourceSpan, switchValue.sourceSpan));
+    this._addToParent(new Expansion(switchValue.parts[0], type.parts[0], cases2, sourceSpan, switchValue.sourceSpan));
     this._advance();
   }
   _parseExpansionCase() {
@@ -15619,16 +15611,17 @@ var setI18nRefs = (htmlNode, i18nNode) => {
   return i18nNode;
 };
 var I18nMetaVisitor = class {
-  constructor(interpolationConfig = DEFAULT_INTERPOLATION_CONFIG, keepI18nAttrs = false, enableI18nLegacyMessageIdFormat = false) {
+  constructor(interpolationConfig = DEFAULT_INTERPOLATION_CONFIG, keepI18nAttrs = false, enableI18nLegacyMessageIdFormat = false, containerBlocks = DEFAULT_CONTAINER_BLOCKS) {
     this.interpolationConfig = interpolationConfig;
     this.keepI18nAttrs = keepI18nAttrs;
     this.enableI18nLegacyMessageIdFormat = enableI18nLegacyMessageIdFormat;
+    this.containerBlocks = containerBlocks;
     this.hasI18nMeta = false;
     this._errors = [];
   }
   _generateI18nMessage(nodes, meta = "", visitNodeFn) {
     const { meaning, description, customId } = this._parseMetadata(meta);
-    const createI18nMessage2 = createI18nMessageFactory(this.interpolationConfig);
+    const createI18nMessage2 = createI18nMessageFactory(this.interpolationConfig, this.containerBlocks);
     const message = createI18nMessage2(nodes, meaning, description, customId, visitNodeFn);
     this._setMessageId(message, meta);
     this._setLegacyIds(message, meta);
@@ -15803,6 +15796,9 @@ var GetMsgSerializerVisitor = class {
   visitPlaceholder(ph) {
     return this.formatPh(ph.name);
   }
+  visitBlockPlaceholder(ph) {
+    return `${this.formatPh(ph.startName)}${ph.children.map((child) => child.visit(this)).join("")}${this.formatPh(ph.closeName)}`;
+  }
   visitIcuPlaceholder(ph, context) {
     return this.formatPh(ph.name);
   }
@@ -15851,6 +15847,12 @@ var LocalizeSerializerVisitor = class {
   visitPlaceholder(ph) {
     this.pieces.push(this.createPlaceholderPiece(ph.name, ph.sourceSpan));
   }
+  visitBlockPlaceholder(ph) {
+    var _a2, _b2;
+    this.pieces.push(this.createPlaceholderPiece(ph.startName, (_a2 = ph.startSourceSpan) != null ? _a2 : ph.sourceSpan));
+    ph.children.forEach((child) => child.visit(this));
+    this.pieces.push(this.createPlaceholderPiece(ph.closeName, (_b2 = ph.endSourceSpan) != null ? _b2 : ph.sourceSpan));
+  }
   visitIcuPlaceholder(ph) {
     this.pieces.push(this.createPlaceholderPiece(ph.name, ph.sourceSpan, this.placeholderToMessage[ph.name]));
   }
@@ -15932,11 +15934,13 @@ function collectMessage(job, fileBasedI18nSuffix, messages, messageOp) {
     statements.push(...subMessageStatements);
     messageOp.params.set(subMessage.messagePlaceholder, subMessageVar);
   }
+  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 extraTransformFnParams = [];
     if (messageOp.postprocessingParams.size > 0) {
       extraTransformFnParams.push(literalMap([...messageOp.postprocessingParams].map(([key, value]) => ({ key, value, quoted: true }))));
@@ -15974,12 +15978,14 @@ function i18nGenerateClosureVar(pool, messageId, fileBasedI18nSuffix, useExterna
   return variable(name);
 }
 function assertAllParamsResolved(op) {
-  for (const placeholder in op.message.placeholders) {
+  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 (const placeholder in op.message.placeholderToMessage) {
+  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}`);
     }
@@ -15991,7 +15997,9 @@ function extractI18nText(job) {
   var _a2;
   for (const unit of job.units) {
     let currentI18n = null;
+    let currentIcu = null;
     const textNodeI18nBlocks = /* @__PURE__ */ new Map();
+    const textNodeIcus = /* @__PURE__ */ new Map();
     for (const op of unit.create) {
       switch (op.kind) {
         case OpKind.I18nStart:
@@ -16003,9 +16011,19 @@ function extractI18nText(job) {
         case OpKind.I18nEnd:
           currentI18n = null;
           break;
+        case OpKind.IcuStart:
+          if (op.context === null) {
+            throw Error("Icu op should have its context set.");
+          }
+          currentIcu = op;
+          break;
+        case OpKind.IcuEnd:
+          currentIcu = null;
+          break;
         case OpKind.Text:
           if (currentI18n !== null) {
             textNodeI18nBlocks.set(op.xref, currentI18n);
+            textNodeIcus.set(op.xref, currentIcu);
             OpList.remove(op);
           }
           break;
@@ -16018,11 +16036,13 @@ function extractI18nText(job) {
             continue;
           }
           const i18nOp = textNodeI18nBlocks.get(op.target);
+          const icuOp = textNodeIcus.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];
-            const placeholder = op.i18nPlaceholders[i];
-            ops.push(createI18nExpressionOp(i18nOp.context, i18nOp.xref, i18nOp.handle, expr, placeholder.name, I18nParamResolutionTime.Creation, (_a2 = expr.sourceSpan) != null ? _a2 : op.sourceSpan));
+            ops.push(createI18nExpressionOp(contextId, i18nOp.xref, i18nOp.handle, expr, op.i18nPlaceholders[i], resolutionTime, (_a2 = expr.sourceSpan) != null ? _a2 : op.sourceSpan));
           }
           OpList.replaceWithMany(op, ops);
           break;
@@ -16914,8 +16934,8 @@ function repeaterCreate(slot, viewFnName, decls, vars, tag, constIndex, trackByF
   }
   return call(Identifiers.repeaterCreate, args, sourceSpan);
 }
-function repeater(metadataSlot, collection, sourceSpan) {
-  return call(Identifiers.repeater, [literal(metadataSlot), collection], sourceSpan);
+function repeater(collection, sourceSpan) {
+  return call(Identifiers.repeater, [collection], sourceSpan);
 }
 function deferWhen(prefetch, expr, sourceSpan) {
   return call(prefetch ? Identifiers.deferPrefetchWhen : Identifiers.deferWhen, [expr], sourceSpan);
@@ -17473,7 +17493,7 @@ function reifyUpdateOperations(_unit, ops) {
         OpList.replace(op, conditional(op.targetSlot.slot, op.processed, op.contextValue, op.sourceSpan));
         break;
       case OpKind.Repeater:
-        OpList.replace(op, repeater(op.targetSlot.slot, op.collection, op.sourceSpan));
+        OpList.replace(op, repeater(op.collection, op.sourceSpan));
         break;
       case OpKind.DeferWhen:
         OpList.replace(op, deferWhen(op.prefetch, op.expr, op.sourceSpan));
@@ -17762,7 +17782,7 @@ function getSubTemplateIndexForTemplateTag(job, i18nOp, op) {
   }
   return i18nOp.subTemplateIndex;
 }
-function addParam(params, placeholder, value, subTemplateIndex, flags = I18nParamValueFlags.None) {
+function addParam(params, placeholder, value, subTemplateIndex, flags) {
   var _a2;
   const values = (_a2 = params.get(placeholder)) != null ? _a2 : [];
   values.push({ value, subTemplateIndex, flags });
@@ -17789,18 +17809,82 @@ function resolveI18nExpressionPlaceholders(job) {
   for (const unit of job.units) {
     for (const op of unit.update) {
       if (op.kind === OpKind.I18nExpression) {
-        const index = expressionIndices.get(op.context) || 0;
         const i18nContext = i18nContexts.get(op.context);
+        const index = expressionIndices.get(i18nContext.i18nBlock) || 0;
         const subTemplateIndex = subTemplateIndicies.get(i18nContext.i18nBlock);
         const params = op.resolutionTime === I18nParamResolutionTime.Creation ? i18nContext.params : i18nContext.postprocessingParams;
         const values = params.get(op.i18nPlaceholder) || [];
-        values.push({ value: index, subTemplateIndex, flags: I18nParamValueFlags.None });
+        values.push({
+          value: index,
+          subTemplateIndex,
+          flags: I18nParamValueFlags.ExpressionIndex
+        });
         params.set(op.i18nPlaceholder, values);
-        expressionIndices.set(op.context, index + 1);
+        expressionIndices.set(i18nContext.i18nBlock, index + 1);
+      }
+    }
+  }
+}
+
+// bazel-out/k8-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/resolve_i18n_icu_placeholders.mjs
+function resolveI18nIcuPlaceholders(job) {
+  const contextOps = /* @__PURE__ */ new Map();
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      switch (op.kind) {
+        case OpKind.I18nContext:
+          contextOps.set(op.xref, op);
+          break;
+      }
+    }
+  }
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      switch (op.kind) {
+        case OpKind.IcuStart:
+          if (op.context === null) {
+            throw Error("Icu should have its i18n context set.");
+          }
+          const i18nContext = contextOps.get(op.context);
+          for (const node of op.message.nodes) {
+            node.visit(new ResolveIcuPlaceholdersVisitor(i18nContext.postprocessingParams));
+          }
+          break;
       }
     }
   }
 }
+var ResolveIcuPlaceholdersVisitor = class extends RecurseVisitor {
+  constructor(params) {
+    super();
+    this.params = params;
+  }
+  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);
+  }
+};
 
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/resolve_names.mjs
 function resolveNames(job) {
@@ -18518,6 +18602,7 @@ function allowConservativeInlining(decl, target) {
 function wrapI18nIcus(job) {
   for (const unit of job.units) {
     let currentI18nOp = null;
+    let addedI18nId = null;
     for (const op of unit.create) {
       switch (op.kind) {
         case OpKind.I18nStart:
@@ -18526,11 +18611,16 @@ function wrapI18nIcus(job) {
         case OpKind.I18nEnd:
           currentI18nOp = null;
           break;
-        case OpKind.Icu:
+        case OpKind.IcuStart:
           if (currentI18nOp === null) {
-            const id = job.allocateXrefId();
-            OpList.insertBefore(createI18nStartOp(id, op.message), op);
-            OpList.insertAfter(createI18nEndOp(id), op);
+            addedI18nId = job.allocateXrefId();
+            OpList.insertBefore(createI18nStartOp(addedI18nId, op.message), op);
+          }
+          break;
+        case OpKind.IcuEnd:
+          if (addedI18nId !== null) {
+            OpList.insertAfter(createI18nEndOp(addedI18nId), op);
+            addedI18nId = null;
           }
           break;
       }
@@ -18557,7 +18647,6 @@ var phases = [
   { kind: CompilationJobKind.Tmpl, fn: createPipes },
   { kind: CompilationJobKind.Tmpl, fn: configureDeferInstructions },
   { kind: CompilationJobKind.Tmpl, fn: extractI18nText },
-  { kind: CompilationJobKind.Tmpl, fn: createI18nIcuExpressions },
   { kind: CompilationJobKind.Tmpl, fn: applyI18nExpressions },
   { kind: CompilationJobKind.Tmpl, fn: createVariadicPipes },
   { kind: CompilationJobKind.Both, fn: generatePureLiteralStructures },
@@ -18581,6 +18670,7 @@ 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: mergeI18nContexts },
   { kind: CompilationJobKind.Tmpl, fn: extractI18nMessages },
   { kind: CompilationJobKind.Tmpl, fn: generateTrackFns },
@@ -18845,7 +18935,7 @@ function ingestContent(unit, content) {
 function ingestText(unit, text2) {
   unit.create.push(createTextOp(unit.job.allocateXrefId(), text2.value, text2.sourceSpan));
 }
-function ingestBoundText(unit, text2) {
+function ingestBoundText(unit, text2, i18nPlaceholders) {
   var _a2;
   let value = text2.value;
   if (value instanceof ASTWithSource) {
@@ -18857,7 +18947,12 @@ function ingestBoundText(unit, text2) {
   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}`);
   }
-  const i18nPlaceholders = text2.i18n instanceof Container ? text2.i18n.children.filter((node) => node instanceof Placeholder) : [];
+  if (i18nPlaceholders === void 0) {
+    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));
   const baseSourceSpan = unit.job.compatibility ? null : text2.sourceSpan;
@@ -19003,13 +19098,26 @@ function ingestDeferBlock(unit, deferBlock) {
   unit.update.push(deferWhenOps);
 }
 function ingestIcu(unit, icu) {
-  var _a2;
+  var _a2, _b2;
   if (icu.i18n instanceof Message && isSingleI18nIcu(icu.i18n)) {
     const xref = unit.job.allocateXrefId();
-    unit.create.push(createIcuOp(xref, icu.i18n, icu.i18n.nodes[0], icuFromI18nMessage(icu.i18n).name, null));
-    unit.update.push(createIcuUpdateOp(xref, null));
+    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)) {
+      if (text2 instanceof BoundText) {
+        ingestBoundText(unit, text2, [placeholder]);
+      } else {
+        ingestText(unit, text2);
+      }
+    }
+    unit.create.push(createIcuEndOp(xref));
   } else {
-    throw Error(`Unhandled i18n metadata type for ICU: ${(_a2 = icu.i18n) == null ? void 0 : _a2.constructor.name}`);
+    throw Error(`Unhandled i18n metadata type for ICU: ${(_b2 = icu.i18n) == null ? void 0 : _b2.constructor.name}`);
   }
 }
 function ingestForBlock(unit, forBlock) {
@@ -20095,18 +20203,18 @@ function createIfBlock(ast, connectedBlocks, visitor, bindingParser) {
   const branches = [];
   const mainBlockParams = parseConditionalBlockParameters(ast, errors, bindingParser);
   if (mainBlockParams !== null) {
-    branches.push(new IfBlockBranch(mainBlockParams.expression, visitAll2(visitor, ast.children, ast.children), mainBlockParams.expressionAlias, ast.sourceSpan, ast.startSourceSpan, ast.endSourceSpan, ast.nameSpan));
+    branches.push(new IfBlockBranch(mainBlockParams.expression, visitAll2(visitor, ast.children, ast.children), mainBlockParams.expressionAlias, ast.sourceSpan, ast.startSourceSpan, ast.endSourceSpan, ast.nameSpan, ast.i18n));
   }
   for (const block of connectedBlocks) {
     if (ELSE_IF_PATTERN.test(block.name)) {
       const params = parseConditionalBlockParameters(block, errors, bindingParser);
       if (params !== null) {
         const children = visitAll2(visitor, block.children, block.children);
-        branches.push(new IfBlockBranch(params.expression, children, params.expressionAlias, block.sourceSpan, block.startSourceSpan, block.endSourceSpan, block.nameSpan));
+        branches.push(new IfBlockBranch(params.expression, children, params.expressionAlias, block.sourceSpan, block.startSourceSpan, block.endSourceSpan, block.nameSpan, block.i18n));
       }
     } else if (block.name === "else") {
       const children = visitAll2(visitor, block.children, block.children);
-      branches.push(new IfBlockBranch(null, children, null, block.sourceSpan, block.startSourceSpan, block.endSourceSpan, block.nameSpan));
+      branches.push(new IfBlockBranch(null, children, null, block.sourceSpan, block.startSourceSpan, block.endSourceSpan, block.nameSpan, block.i18n));
     }
   }
   const ifBlockStartSourceSpan = branches.length > 0 ? branches[0].startSourceSpan : ast.startSourceSpan;
@@ -20134,7 +20242,7 @@ function createForLoop(ast, connectedBlocks, visitor, bindingParser) {
       } else if (block.parameters.length > 0) {
         errors.push(new ParseError(block.sourceSpan, "@empty block cannot have parameters"));
       } else {
-        empty = new ForLoopBlockEmpty(visitAll2(visitor, block.children, block.children), block.sourceSpan, block.startSourceSpan, block.endSourceSpan, block.nameSpan);
+        empty = new ForLoopBlockEmpty(visitAll2(visitor, block.children, block.children), block.sourceSpan, block.startSourceSpan, block.endSourceSpan, block.nameSpan, block.i18n);
       }
     } else {
       errors.push(new ParseError(block.sourceSpan, `Unrecognized @for loop block "${block.name}"`));
@@ -20146,7 +20254,7 @@ function createForLoop(ast, connectedBlocks, visitor, bindingParser) {
     } else {
       const endSpan = (_a2 = empty == null ? void 0 : empty.endSourceSpan) != null ? _a2 : ast.endSourceSpan;
       const sourceSpan = new ParseSourceSpan(ast.sourceSpan.start, (_b2 = endSpan == null ? void 0 : endSpan.end) != null ? _b2 : ast.sourceSpan.end);
-      node = new ForLoopBlock(params.itemName, params.expression, params.trackBy.expression, params.trackBy.keywordSpan, params.context, visitAll2(visitor, ast.children, ast.children), empty, sourceSpan, ast.sourceSpan, ast.startSourceSpan, endSpan, ast.nameSpan);
+      node = new ForLoopBlock(params.itemName, params.expression, params.trackBy.expression, params.trackBy.keywordSpan, params.context, visitAll2(visitor, ast.children, ast.children), empty, sourceSpan, ast.sourceSpan, ast.startSourceSpan, endSpan, ast.nameSpan, ast.i18n);
     }
   }
   return { node, errors };
@@ -20154,7 +20262,7 @@ function createForLoop(ast, connectedBlocks, visitor, bindingParser) {
 function createSwitchBlock(ast, visitor, bindingParser) {
   const errors = validateSwitchBlock(ast);
   const primaryExpression = ast.parameters.length > 0 ? parseBlockParameterToBinding(ast.parameters[0], bindingParser) : bindingParser.parseBinding("", false, ast.sourceSpan, 0);
-  const cases = [];
+  const cases2 = [];
   const unknownBlocks = [];
   let defaultCase = null;
   for (const node of ast.children) {
@@ -20166,18 +20274,18 @@ function createSwitchBlock(ast, visitor, bindingParser) {
       continue;
     }
     const expression = node.name === "case" ? parseBlockParameterToBinding(node.parameters[0], bindingParser) : null;
-    const ast2 = new SwitchBlockCase(expression, visitAll2(visitor, node.children, node.children), node.sourceSpan, node.startSourceSpan, node.endSourceSpan, node.nameSpan);
+    const ast2 = new SwitchBlockCase(expression, visitAll2(visitor, node.children, node.children), node.sourceSpan, node.startSourceSpan, node.endSourceSpan, node.nameSpan, node.i18n);
     if (expression === null) {
       defaultCase = ast2;
     } else {
-      cases.push(ast2);
+      cases2.push(ast2);
     }
   }
   if (defaultCase !== null) {
-    cases.push(defaultCase);
+    cases2.push(defaultCase);
   }
   return {
-    node: new SwitchBlock(primaryExpression, cases, unknownBlocks, ast.sourceSpan, ast.startSourceSpan, ast.endSourceSpan, ast.nameSpan),
+    node: new SwitchBlock(primaryExpression, cases2, unknownBlocks, ast.sourceSpan, ast.startSourceSpan, ast.endSourceSpan, ast.nameSpan),
     errors
   };
 }
@@ -20654,7 +20762,7 @@ function createDeferredBlock(ast, connectedBlocks, visitor, bindingParser) {
     endOfLastSourceSpan = lastConnectedBlock.sourceSpan.end;
   }
   const sourceSpanWithConnectedBlocks = new ParseSourceSpan(ast.sourceSpan.start, endOfLastSourceSpan);
-  const node = new DeferredBlock(visitAll2(visitor, ast.children, ast.children), triggers, prefetchTriggers, placeholder, loading, error2, ast.nameSpan, sourceSpanWithConnectedBlocks, ast.sourceSpan, ast.startSourceSpan, lastEndSourceSpan);
+  const node = new DeferredBlock(visitAll2(visitor, ast.children, ast.children), triggers, prefetchTriggers, placeholder, loading, error2, ast.nameSpan, sourceSpanWithConnectedBlocks, ast.sourceSpan, ast.startSourceSpan, lastEndSourceSpan, ast.i18n);
   return { node, errors };
 }
 function parseConnectedBlocks(connectedBlocks, errors, visitor) {
@@ -20712,7 +20820,7 @@ function parsePlaceholderBlock(ast, visitor) {
       throw new Error(`Unrecognized parameter in @placeholder block: "${param.expression}"`);
     }
   }
-  return new DeferredBlockPlaceholder(visitAll2(visitor, ast.children, ast.children), minimumTime, ast.nameSpan, ast.sourceSpan, ast.startSourceSpan, ast.endSourceSpan);
+  return new DeferredBlockPlaceholder(visitAll2(visitor, ast.children, ast.children), minimumTime, ast.nameSpan, ast.sourceSpan, ast.startSourceSpan, ast.endSourceSpan, ast.i18n);
 }
 function parseLoadingBlock(ast, visitor) {
   let afterTime = null;
@@ -20740,13 +20848,13 @@ function parseLoadingBlock(ast, visitor) {
       throw new Error(`Unrecognized parameter in @loading block: "${param.expression}"`);
     }
   }
-  return new DeferredBlockLoading(visitAll2(visitor, ast.children, ast.children), afterTime, minimumTime, ast.nameSpan, ast.sourceSpan, ast.startSourceSpan, ast.endSourceSpan);
+  return new DeferredBlockLoading(visitAll2(visitor, ast.children, ast.children), afterTime, minimumTime, ast.nameSpan, ast.sourceSpan, ast.startSourceSpan, ast.endSourceSpan, ast.i18n);
 }
 function parseErrorBlock(ast, visitor) {
   if (ast.parameters.length > 0) {
     throw new Error(`@error block cannot have parameters`);
   }
-  return new DeferredBlockError(visitAll2(visitor, ast.children, ast.children), ast.nameSpan, ast.sourceSpan, ast.startSourceSpan, ast.endSourceSpan);
+  return new DeferredBlockError(visitAll2(visitor, ast.children, ast.children), ast.nameSpan, ast.sourceSpan, ast.startSourceSpan, ast.endSourceSpan, ast.i18n);
 }
 function parsePrimaryTriggers(params, bindingParser, errors, placeholder) {
   const triggers = {};
@@ -21230,6 +21338,11 @@ var I18nContext = class {
     const content = { type, index, ctx: this.id, isVoid: node.isVoid, closed };
     updatePlaceholderMap(this.placeholders, ph, content);
   }
+  appendBlockPart(node, index, closed) {
+    const ph = closed ? node.closeName : node.startName;
+    const content = { type: TagType.TEMPLATE, index, ctx: this.id, closed };
+    updatePlaceholderMap(this.placeholders, ph, content);
+  }
   get icus() {
     return this._registry.icus;
   }
@@ -21259,6 +21372,11 @@ var I18nContext = class {
     this.appendTag(TagType.TEMPLATE, node, index, true);
     this._unresolvedCtxCount++;
   }
+  appendBlock(node, index) {
+    this.appendBlockPart(node, index, false);
+    this.appendBlockPart(node, index, true);
+    this._unresolvedCtxCount++;
+  }
   appendElement(node, index, closed) {
     this.appendTag(TagType.ELEMENT, node, index, closed);
   }
@@ -21454,12 +21572,18 @@ var TemplateDefinitionBuilder = class {
       this.creationInstruction(null, Identifiers.pipe, [literal(slot), literal(name)]);
     });
   }
-  buildTemplateFunction(nodes, variables, ngContentSelectorsOffset = 0, i18n2) {
+  buildTemplateFunction(nodes, variables, ngContentSelectorsOffset = 0, i18n2, variableAliases) {
     this._ngContentSelectorsOffset = ngContentSelectorsOffset;
     if (this._namespace !== Identifiers.namespaceHTML) {
       this.creationInstruction(null, this._namespace);
     }
-    variables.forEach((v) => this.registerContextVariables(v));
+    variables.forEach((v) => {
+      const alias = variableAliases == null ? void 0 : variableAliases[v.name];
+      this.registerContextVariables(v.name, v.value);
+      if (alias) {
+        this.registerContextVariables(alias, v.value);
+      }
+    });
     const initI18nContext = this.i18nContext || isI18nRootNode(i18n2) && !isSingleI18nIcu(i18n2) && !(isSingleElementTemplate(nodes) && nodes[0].i18n === i18n2);
     const selfClosingI18nInstruction = hasTextChildrenOnly(nodes);
     if (initI18nContext) {
@@ -21514,12 +21638,12 @@ var TemplateDefinitionBuilder = class {
     this._constants.prepareStatements.push(...statements);
     return _ref;
   }
-  registerContextVariables(variable2) {
+  registerContextVariables(name, value) {
     const scopedName = this._bindingScope.freshReferenceName();
     const retrievalLevel = this.level;
-    const isDirect = variable2.value === DIRECT_CONTEXT_REFERENCE;
-    const lhs = variable(variable2.name + scopedName);
-    this._bindingScope.set(retrievalLevel, variable2.name, (scope) => {
+    const isDirect = value === DIRECT_CONTEXT_REFERENCE;
+    const lhs = variable(name + scopedName);
+    this._bindingScope.set(retrievalLevel, name, (scope) => {
       return isDirect && scope.bindingLevel === retrievalLevel && !scope.isListenerScope() ? variable(CONTEXT_NAME) : lhs;
     }, 1, (scope, relativeLevel) => {
       let rhs;
@@ -21537,7 +21661,7 @@ var TemplateDefinitionBuilder = class {
         rhs = sharedCtxVar ? sharedCtxVar : generateNextContextExpr(relativeLevel);
       }
       return [
-        lhs.set(isDirect ? rhs : rhs.prop(variable2.value || IMPLICIT_REFERENCE)).toConstDecl()
+        lhs.set(isDirect ? rhs : rhs.prop(value || IMPLICIT_REFERENCE)).toConstDecl()
       ];
     });
   }
@@ -21876,16 +22000,20 @@ var TemplateDefinitionBuilder = class {
       this.creationInstruction(span, isNgContainer2 ? Identifiers.elementContainerEnd : Identifiers.elementEnd);
     }
   }
-  prepareEmbeddedTemplateFn(children, contextNameSuffix, variables = [], i18n2) {
+  prepareEmbeddedTemplateFn(children, contextNameSuffix, variables = [], i18nMeta, variableAliases) {
     const index = this.allocateDataSlot();
-    if (this.i18n && i18n2) {
-      this.i18n.appendTemplate(i18n2, index);
+    if (this.i18n && i18nMeta) {
+      if (i18nMeta instanceof BlockPlaceholder) {
+        this.i18n.appendBlock(i18nMeta, index);
+      } else {
+        this.i18n.appendTemplate(i18nMeta, index);
+      }
     }
     const contextName = `${this.contextName}${contextNameSuffix}_${index}`;
     const name = `${contextName}_Template`;
     const visitor = new TemplateDefinitionBuilder(this.constantPool, this._bindingScope, this.level + 1, contextName, this.i18n, index, name, this._namespace, this.fileBasedI18nSuffix, this.i18nUseExternalIds, this.deferBlocks, this.elementLocations, this._constants);
     this._nestedTemplateFns.push(() => {
-      const templateFunctionExpr = visitor.buildTemplateFunction(children, variables, this._ngContentReservedSlots.length + this._ngContentSelectorsOffset, i18n2);
+      const templateFunctionExpr = visitor.buildTemplateFunction(children, variables, this._ngContentReservedSlots.length + this._ngContentSelectorsOffset, i18nMeta, variableAliases);
       this.constantPool.statements.push(templateFunctionExpr.toDeclStmt(name));
       if (visitor._ngContentReservedSlots.length) {
         this._ngContentReservedSlots.push(...visitor._ngContentReservedSlots);
@@ -21968,7 +22096,7 @@ var TemplateDefinitionBuilder = class {
     const placeholders = this.i18nBindProps(icu.placeholders);
     const message = icu.i18n;
     const transformFn = (raw) => {
-      const params = __spreadValues(__spreadValues({}, vars), placeholders);
+      const params = Object.fromEntries(Object.entries(__spreadValues(__spreadValues({}, vars), placeholders)).sort());
       const formatted = formatI18nPlaceholderNamesInMap(params, false);
       return invokeInstruction(null, Identifiers.i18nPostprocess, [raw, mapLiteral(formatted, true)]);
     };
@@ -21995,7 +22123,7 @@ var TemplateDefinitionBuilder = class {
         tagName = inferredData.tagName;
         attrsExprs = inferredData.attrsExprs;
       }
-      const templateIndex = this.createEmbeddedTemplateFn(tagName, children, "_Conditional", sourceSpan, variables, attrsExprs);
+      const templateIndex = this.createEmbeddedTemplateFn(tagName, children, "_Conditional", sourceSpan, variables, attrsExprs, void 0, branch.i18n);
       const processedExpression = expression === null ? null : expression.visit(this._valueConverter);
       return { index: templateIndex, expression: processedExpression, alias: expressionAlias };
     });
@@ -22029,7 +22157,7 @@ var TemplateDefinitionBuilder = class {
   }
   visitSwitchBlock(block) {
     const caseData = block.cases.map((currentCase) => {
-      const index = this.createEmbeddedTemplateFn(null, currentCase.children, "_Case", currentCase.sourceSpan);
+      const index = this.createEmbeddedTemplateFn(null, currentCase.children, "_Case", currentCase.sourceSpan, void 0, void 0, void 0, currentCase.i18n);
       const expression = currentCase.expression === null ? null : currentCase.expression.visit(this._valueConverter);
       return { index, expression };
     });
@@ -22057,12 +22185,12 @@ var TemplateDefinitionBuilder = class {
     if (!metadata) {
       throw new Error("Could not resolve `defer` block metadata. Block may need to be analyzed.");
     }
-    const primaryTemplateIndex = this.createEmbeddedTemplateFn(null, deferred.children, "_Defer", deferred.sourceSpan);
-    const loadingIndex = loading ? this.createEmbeddedTemplateFn(null, loading.children, "_DeferLoading", loading.sourceSpan) : null;
+    const primaryTemplateIndex = this.createEmbeddedTemplateFn(null, deferred.children, "_Defer", deferred.sourceSpan, void 0, void 0, void 0, deferred.i18n);
+    const loadingIndex = loading ? this.createEmbeddedTemplateFn(null, loading.children, "_DeferLoading", loading.sourceSpan, void 0, void 0, void 0, loading.i18n) : null;
     const loadingConsts = loading ? trimTrailingNulls([literal(loading.minimumTime), literal(loading.afterTime)]) : null;
-    const placeholderIndex = placeholder ? this.createEmbeddedTemplateFn(null, placeholder.children, "_DeferPlaceholder", placeholder.sourceSpan) : null;
+    const placeholderIndex = placeholder ? this.createEmbeddedTemplateFn(null, placeholder.children, "_DeferPlaceholder", placeholder.sourceSpan, void 0, void 0, void 0, placeholder.i18n) : null;
     const placeholderConsts = placeholder && placeholder.minimumTime !== null ? literalArr([literal(placeholder.minimumTime)]) : null;
-    const errorIndex = error2 ? this.createEmbeddedTemplateFn(null, error2.children, "_DeferError", error2.sourceSpan) : null;
+    const errorIndex = error2 ? this.createEmbeddedTemplateFn(null, error2.children, "_DeferError", error2.sourceSpan, void 0, void 0, void 0, error2.i18n) : null;
     const deferredIndex = this.allocateDataSlot();
     const depsFnName = `${this.contextName}_Defer_${deferredIndex}_DepsFn`;
     this.creationInstruction(deferred.sourceSpan, Identifiers.defer, trimTrailingNulls([
@@ -22171,11 +22299,14 @@ var TemplateDefinitionBuilder = class {
   visitForLoopBlock(block) {
     const blockIndex = this.allocateDataSlot();
     const { tagName, attrsExprs } = this.inferProjectionDataFromInsertionPoint(block);
-    const primaryData = this.prepareEmbeddedTemplateFn(block.children, "_For", [block.item, block.contextVariables.$index, block.contextVariables.$count]);
+    const primaryData = this.prepareEmbeddedTemplateFn(block.children, "_For", [block.item, block.contextVariables.$index, block.contextVariables.$count], block.i18n, {
+      [block.contextVariables.$index.name]: this.getLevelSpecificVariableName("$index", this.level + 1),
+      [block.contextVariables.$count.name]: this.getLevelSpecificVariableName("$count", this.level + 1)
+    });
     const { expression: trackByExpression, usesComponentInstance: trackByUsesComponentInstance } = this.createTrackByFunction(block);
     let emptyData = null;
     if (block.empty !== null) {
-      emptyData = this.prepareEmbeddedTemplateFn(block.empty.children, "_ForEmpty");
+      emptyData = this.prepareEmbeddedTemplateFn(block.empty.children, "_ForEmpty", void 0, block.empty.i18n);
       this.allocateBindingSlots(null);
     }
     this.registerComputedLoopVariables(block, primaryData.scope);
@@ -22197,16 +22328,31 @@ var TemplateDefinitionBuilder = class {
       return params;
     });
     const value = block.expression.visit(this._valueConverter);
-    this.updateInstruction(block.sourceSpan, Identifiers.repeater, () => [literal(blockIndex), this.convertPropertyBinding(value)]);
+    this.updateInstructionWithAdvance(blockIndex, block.sourceSpan, Identifiers.repeater, () => [this.convertPropertyBinding(value)]);
   }
   registerComputedLoopVariables(block, bindingScope) {
-    const indexLocalName = block.contextVariables.$index.name;
-    const countLocalName = block.contextVariables.$count.name;
     const level = bindingScope.bindingLevel;
-    bindingScope.set(level, block.contextVariables.$odd.name, (scope) => scope.get(indexLocalName).modulo(literal(2)).notIdentical(literal(0)));
-    bindingScope.set(level, block.contextVariables.$even.name, (scope) => scope.get(indexLocalName).modulo(literal(2)).identical(literal(0)));
-    bindingScope.set(level, block.contextVariables.$first.name, (scope) => scope.get(indexLocalName).identical(literal(0)));
-    bindingScope.set(level, block.contextVariables.$last.name, (scope) => scope.get(indexLocalName).identical(scope.get(countLocalName).minus(literal(1))));
+    bindingScope.set(level, block.contextVariables.$odd.name, (scope, retrievalLevel) => {
+      return this.getLevelSpecificForLoopVariable(block, scope, retrievalLevel, "$index").modulo(literal(2)).notIdentical(literal(0));
+    });
+    bindingScope.set(level, block.contextVariables.$even.name, (scope, retrievalLevel) => {
+      return this.getLevelSpecificForLoopVariable(block, scope, retrievalLevel, "$index").modulo(literal(2)).identical(literal(0));
+    });
+    bindingScope.set(level, block.contextVariables.$first.name, (scope, retrievalLevel) => {
+      return this.getLevelSpecificForLoopVariable(block, scope, retrievalLevel, "$index").identical(literal(0));
+    });
+    bindingScope.set(level, block.contextVariables.$last.name, (scope, retrievalLevel) => {
+      const index = this.getLevelSpecificForLoopVariable(block, scope, retrievalLevel, "$index");
+      const count = this.getLevelSpecificForLoopVariable(block, scope, retrievalLevel, "$count");
+      return index.identical(count.minus(literal(1)));
+    });
+  }
+  getLevelSpecificVariableName(name, level) {
+    return `\u0275${name}_${level}`;
+  }
+  getLevelSpecificForLoopVariable(block, scope, retrievalLevel, name) {
+    const scopeName = scope.bindingLevel === retrievalLevel ? block.contextVariables[name].name : this.getLevelSpecificVariableName(name, retrievalLevel);
+    return scope.get(scopeName);
   }
   optimizeTrackByFunction(block) {
     const indexLocalName = block.contextVariables.$index.name;
@@ -22616,7 +22762,7 @@ var BindingScope = class {
         if (value.declareLocalCallback && !value.declare) {
           value.declare = true;
         }
-        return typeof value.lhs === "function" ? value.lhs(this) : value.lhs;
+        return typeof value.lhs === "function" ? value.lhs(this, value.retrievalLevel) : value.lhs;
       }
       current = current.parent;
     }
@@ -22692,7 +22838,7 @@ var BindingScope = class {
     const componentValue = this.map.get(SHARED_CONTEXT_KEY + 0);
     componentValue.declare = true;
     this.maybeRestoreView();
-    const lhs = typeof componentValue.lhs === "function" ? componentValue.lhs(this) : componentValue.lhs;
+    const lhs = typeof componentValue.lhs === "function" ? componentValue.lhs(this, componentValue.retrievalLevel) : componentValue.lhs;
     return name === DIRECT_CONTEXT_REFERENCE ? lhs : lhs.prop(name);
   }
   maybeRestoreView() {
@@ -24761,7 +24907,7 @@ function publishFacade(global) {
 }
 
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/version.mjs
-var VERSION2 = new Version("17.0.2");
+var VERSION2 = new Version("17.0.4");
 
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/i18n/extractor_merger.mjs
 var _VisitorMode;
@@ -24807,14 +24953,63 @@ publishFacade(_global);
 
 // bazel-out/k8-fastbuild/bin/packages/core/schematics/ng-generate/control-flow-migration/types.mjs
 var ngtemplate = "ng-template";
+var boundngifelse = "[ngIfElse]";
+var boundngifthenelse = "[ngIfThenElse]";
+var nakedngfor = "ngFor";
+function allFormsOf(selector) {
+  return [
+    selector,
+    `*${selector}`,
+    `[${selector}]`
+  ];
+}
+var commonModuleDirectives = /* @__PURE__ */ new Set([
+  ...allFormsOf("ngComponentOutlet"),
+  ...allFormsOf("ngTemplateOutlet"),
+  ...allFormsOf("ngClass"),
+  ...allFormsOf("ngPlural"),
+  ...allFormsOf("ngPluralCase"),
+  ...allFormsOf("ngStyle"),
+  ...allFormsOf("ngTemplateOutlet"),
+  ...allFormsOf("ngComponentOutlet"),
+  "[NgForOf]",
+  "[NgForTrackBy]",
+  "[ngIfElse]",
+  "[ngIfThenElse]"
+]);
+function pipeMatchRegExpFor(name) {
+  return new RegExp(`\\|\\s*${name}`);
+}
+var commonModulePipes = [
+  "date",
+  "async",
+  "currency",
+  "number",
+  "i18nPlural",
+  "i18nSelect",
+  "json",
+  "keyvalue",
+  "slice",
+  "lowercase",
+  "uppercase",
+  "titlecase",
+  "percent",
+  "titlecase"
+].map((name) => pipeMatchRegExpFor(name));
 var ElementToMigrate = class {
-  constructor(el, attr) {
+  constructor(el, attr, elseAttr = void 0, thenAttr = void 0, forAttrs = void 0) {
     __publicField(this, "el");
     __publicField(this, "attr");
+    __publicField(this, "elseAttr");
+    __publicField(this, "thenAttr");
+    __publicField(this, "forAttrs");
     __publicField(this, "nestCount", 0);
     __publicField(this, "hasLineBreaks", false);
     this.el = el;
     this.attr = attr;
+    this.elseAttr = elseAttr;
+    this.thenAttr = thenAttr;
+    this.forAttrs = forAttrs;
   }
   getCondition(targetStr) {
     const targetLocation = this.attr.value.indexOf(targetStr);
@@ -24862,9 +25057,12 @@ var Template2 = class {
 var AnalyzedFile = class {
   constructor() {
     __publicField(this, "ranges", []);
+    __publicField(this, "removeCommonModule", false);
   }
   getSortedRanges() {
-    return this.ranges.slice().sort(([aStart], [bStart]) => bStart - aStart);
+    const templateRanges = this.ranges.slice().filter((x) => x.type === "template").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];
   }
   static addRange(path2, analyzedFiles, range) {
     let analysis = analyzedFiles.get(path2);
@@ -24872,12 +25070,39 @@ var AnalyzedFile = class {
       analysis = new AnalyzedFile();
       analyzedFiles.set(path2, analysis);
     }
-    const duplicate = analysis.ranges.find((current) => current[0] === range[0] && current[1] === range[1]);
+    const duplicate = analysis.ranges.find((current) => current.start === range.start && current.end === range.end);
     if (!duplicate) {
       analysis.ranges.push(range);
     }
   }
 };
+var CommonCollector = class extends RecursiveVisitor {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "count", 0);
+  }
+  visitElement(el) {
+    if (el.attrs.length > 0) {
+      for (const attr of el.attrs) {
+        if (this.hasDirectives(attr.name) || this.hasPipes(attr.value)) {
+          this.count++;
+        }
+      }
+    }
+    super.visitElement(el, null);
+  }
+  visitText(ast) {
+    if (this.hasPipes(ast.value)) {
+      this.count++;
+    }
+  }
+  hasDirectives(input) {
+    return commonModuleDirectives.has(input);
+  }
+  hasPipes(input) {
+    return commonModulePipes.some((regexp) => regexp.test(input));
+  }
+};
 var ElementCollector = class extends RecursiveVisitor {
   constructor(_attributes = []) {
     super();
@@ -24889,12 +25114,37 @@ var ElementCollector = class extends RecursiveVisitor {
     if (el.attrs.length > 0) {
       for (const attr of el.attrs) {
         if (this._attributes.includes(attr.name)) {
-          this.elements.push(new ElementToMigrate(el, attr));
+          const elseAttr = el.attrs.find((x) => x.name === boundngifelse);
+          const thenAttr = el.attrs.find((x) => x.name === boundngifthenelse);
+          const forAttrs = attr.name === nakedngfor ? this.getForAttrs(el) : void 0;
+          this.elements.push(new ElementToMigrate(el, attr, elseAttr, thenAttr, forAttrs));
         }
       }
     }
     super.visitElement(el, null);
   }
+  getForAttrs(el) {
+    const aliases = /* @__PURE__ */ new Map();
+    let item = "";
+    let trackBy = "";
+    let forOf = "";
+    for (const attr of el.attrs) {
+      if (attr.name === "[ngForTrackBy]") {
+        trackBy = attr.value;
+      }
+      if (attr.name === "[ngForOf]") {
+        forOf = attr.value;
+      }
+      if (attr.name.startsWith("let-")) {
+        if (attr.value === "") {
+          item = attr.name.replace("let-", "");
+        } else {
+          aliases.set(attr.name.replace("let-", ""), attr.value);
+        }
+      }
+    }
+    return { forOf, trackBy, item, aliases };
+  }
 };
 var TemplateCollector = class extends RecursiveVisitor {
   constructor() {
@@ -24926,31 +25176,113 @@ var TemplateCollector = class extends RecursiveVisitor {
 // bazel-out/k8-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"];
 function analyze(sourceFile, analyzedFiles) {
   forEachClass(sourceFile, (node) => {
-    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 metadata = decorator && decorator.expression.arguments.length > 0 && import_typescript5.default.isObjectLiteralExpression(decorator.expression.arguments[0]) ? decorator.expression.arguments[0] : null;
-    if (!metadata) {
-      return;
+    if (import_typescript5.default.isClassDeclaration(node)) {
+      analyzeDecorators(node, sourceFile, analyzedFiles);
+    } else {
+      analyzeImportDeclarations(node, sourceFile, analyzedFiles);
     }
-    for (const prop of metadata.properties) {
-      if (!import_typescript5.default.isPropertyAssignment(prop) || !import_typescript5.default.isStringLiteralLike(prop.initializer) || !import_typescript5.default.isIdentifier(prop.name) && !import_typescript5.default.isStringLiteralLike(prop.name)) {
-        continue;
-      }
-      switch (prop.name.text) {
-        case "template":
-          AnalyzedFile.addRange(sourceFile.fileName, analyzedFiles, [prop.initializer.getStart() + 1, prop.initializer.getEnd() - 1]);
-          break;
-        case "templateUrl":
-          const path2 = (0, import_path2.join)((0, import_path2.dirname)(sourceFile.fileName), prop.initializer.text);
-          AnalyzedFile.addRange(path2, analyzedFiles, [0]);
-          break;
-      }
+  });
+}
+function checkIfShouldChange(decl, removeCommonModule) {
+  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");
+}
+function updateImportDeclaration(decl, removeCommonModule) {
+  const clause = decl.getChildAt(1);
+  const updatedClause = updateImportClause(clause, removeCommonModule);
+  if (updatedClause === null) {
+    return "";
+  }
+  const printer = import_typescript5.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());
+}
+function updateImportClause(clause, removeCommonModule) {
+  if (clause.namedBindings && import_typescript5.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));
+  }
+  return clause;
+}
+function updateClassImports(propAssignment, removeCommonModule) {
+  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()));
+  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());
+}
+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)) {
+    const elements = clause.namedBindings.elements.filter((el) => importWithCommonRemovals.includes(el.getText()));
+    if (elements.length > 0) {
+      AnalyzedFile.addRange(sourceFile.fileName, analyzedFiles, { start: node.getStart(), end: node.getEnd(), node, type: "import" });
+    }
+  }
+}
+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 metadata = decorator && decorator.expression.arguments.length > 0 && import_typescript5.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)) {
+      continue;
+    }
+    switch (prop.name.text) {
+      case "template":
+        AnalyzedFile.addRange(sourceFile.fileName, analyzedFiles, {
+          start: prop.initializer.getStart() + 1,
+          end: prop.initializer.getEnd() - 1,
+          node: prop,
+          type: "template"
+        });
+        break;
+      case "imports":
+        AnalyzedFile.addRange(sourceFile.fileName, analyzedFiles, {
+          start: prop.name.getStart(),
+          end: prop.initializer.getEnd(),
+          node: prop,
+          type: "import"
+        });
+        break;
+      case "templateUrl":
+        if (import_typescript5.default.isStringLiteralLike(prop.initializer)) {
+          const path2 = (0, import_path2.join)((0, import_path2.dirname)(sourceFile.fileName), prop.initializer.text);
+          AnalyzedFile.addRange(path2, analyzedFiles, { start: 0, node: prop, type: "template" });
+        }
+        break;
+    }
+  }
 }
 function getNestedCount(etm, aggregator) {
   if (aggregator.length === 0) {
@@ -25036,38 +25368,66 @@ function wrapIntoI18nContainer(i18nAttr, content) {
 function processNgTemplates(template2) {
   const templates = countTemplateUsage(template2);
   for (const [name, t] of templates) {
-    const placeholder = `${name}|`;
-    if (template2.indexOf(placeholder) > -1) {
+    const replaceRegex = new RegExp(`${name}\\|`, "g");
+    const matches = [...template2.matchAll(replaceRegex)];
+    if (matches.length > 0) {
       if (t.i18n !== null) {
         const container = wrapIntoI18nContainer(t.i18n, t.children);
-        template2 = template2.replace(placeholder, container);
+        template2 = template2.replace(replaceRegex, container);
       } else {
-        template2 = template2.replace(placeholder, t.children);
+        template2 = template2.replace(replaceRegex, t.children);
       }
-      if (t.count <= 2) {
+      if (t.count === matches.length + 1) {
         template2 = template2.replace(t.contents, "");
       }
     }
   }
   return template2;
 }
+function canRemoveCommonModule(template2) {
+  const parsed = parseTemplate2(template2);
+  let removeCommonModule = false;
+  if (parsed !== null) {
+    const visitor = new CommonCollector();
+    visitAll2(visitor, parsed.rootNodes);
+    removeCommonModule = visitor.count === 0;
+  }
+  return removeCommonModule;
+}
+function removeImports(template2, node, removeCommonModule) {
+  if (template2.startsWith("imports") && import_typescript5.default.isPropertyAssignment(node)) {
+    return updateClassImports(node, removeCommonModule);
+  } else if (import_typescript5.default.isImportDeclaration(node) && checkIfShouldChange(node, removeCommonModule)) {
+    return updateImportDeclaration(node, removeCommonModule);
+  }
+  return template2;
+}
 function getOriginals(etm, tmpl, offset) {
   if (etm.el.children.length > 0) {
+    const childStart = etm.el.children[0].sourceSpan.start.offset - offset;
+    const childEnd = etm.el.children[etm.el.children.length - 1].sourceSpan.end.offset - 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);
-    return { start: start2, end };
+    const childLength = childEnd - childStart;
+    return { start: start2, end, childLength };
   }
   const start = tmpl.slice(etm.el.sourceSpan.start.offset - offset, etm.el.sourceSpan.end.offset - offset);
-  return { start, end: "" };
+  return { start, end: "", childLength: 0 };
+}
+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);
+}
+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);
 }
 function getMainBlock(etm, tmpl, offset) {
   const i18nAttr = etm.el.attrs.find((x) => x.name === "i18n");
-  if ((etm.el.name === "ng-container" || etm.el.name === "ng-template") && etm.el.attrs.length === 1) {
+  if (isRemovableContainer(etm)) {
     const childStart2 = etm.el.children[0].sourceSpan.start.offset - offset;
     const childEnd2 = etm.el.children[etm.el.children.length - 1].sourceSpan.end.offset - offset;
     const middle2 = tmpl.slice(childStart2, childEnd2);
     return { start: "", middle: middle2, end: "" };
-  } else if (etm.el.name === "ng-template" && etm.el.attrs.length === 2 && i18nAttr !== void 0) {
+  } else if (isI18nTemplate(etm, i18nAttr)) {
     const childStart2 = etm.el.children[0].sourceSpan.start.offset - offset;
     const childEnd2 = etm.el.children[etm.el.children.length - 1].sourceSpan.end.offset - offset;
     const middle2 = wrapIntoI18nContainer(i18nAttr, tmpl.slice(childStart2, childEnd2));
@@ -25087,17 +25447,130 @@ function getMainBlock(etm, tmpl, offset) {
   const end = tmpl.slice(childEnd, etm.end(offset));
   return { start, middle, end };
 }
+function formatTemplate(tmpl) {
+  if (tmpl.indexOf("\n") > -1) {
+    const openBlockRegex = /^\s*\@(if|switch|case|default|for)|^\s*\}\s\@else/;
+    const openElRegex = /^\s*<([a-z0-9]+)(?![^>]*\/>)[^>]*>?/;
+    const closeBlockRegex = /^\s*\}\s*$|^\s*\}\s\@else/;
+    const closeElRegex = /\s*<\/([a-z0-9\-]+)*>/;
+    const closeMultiLineElRegex = /^\s*([a-z0-9\-\[\]]+)?=?"?([^”<]+)?"?\s?\/>$/;
+    const singleLineElRegex = /^\s*<([a-z0-9]+)(?![^>]*\/>)[^>]*>.*<\/([a-z0-9\-]+)*>/;
+    const lines = tmpl.split("\n");
+    const formatted = [];
+    let indent = "";
+    for (let [index, line] of lines.entries()) {
+      if (line.trim() === "" && index !== 0 && index !== lines.length - 1) {
+        continue;
+      }
+      if ((closeBlockRegex.test(line) || closeElRegex.test(line) && (!singleLineElRegex.test(line) && !closeMultiLineElRegex.test(line))) && indent !== "") {
+        indent = indent.slice(2);
+      }
+      formatted.push(indent + line.trim());
+      if (closeMultiLineElRegex.test(line)) {
+        indent = indent.slice(2);
+      }
+      if ((openBlockRegex.test(line) || openElRegex.test(line)) && !singleLineElRegex.test(line)) {
+        indent += "  ";
+      }
+    }
+    tmpl = formatted.join("\n");
+  }
+  return tmpl;
+}
 function forEachClass(sourceFile, callback) {
   sourceFile.forEachChild(function walk(node) {
-    if (import_typescript5.default.isClassDeclaration(node)) {
+    if (import_typescript5.default.isClassDeclaration(node) || import_typescript5.default.isImportDeclaration(node)) {
       callback(node);
     }
     node.forEachChild(walk);
   });
 }
 
+// bazel-out/k8-fastbuild/bin/packages/core/schematics/ng-generate/control-flow-migration/cases.mjs
+var boundcase = "[ngSwitchCase]";
+var switchcase = "*ngSwitchCase";
+var nakedcase = "ngSwitchCase";
+var switchdefault = "*ngSwitchDefault";
+var nakeddefault = "ngSwitchDefault";
+var cases = [
+  boundcase,
+  switchcase,
+  nakedcase,
+  switchdefault,
+  nakeddefault
+];
+function migrateCase(template2) {
+  let errors = [];
+  let parsed = parseTemplate2(template2);
+  if (parsed === null) {
+    return { migrated: template2, errors, changed: false };
+  }
+  let result = template2;
+  const visitor = new ElementCollector(cases);
+  visitAll2(visitor, parsed.rootNodes);
+  calculateNesting(visitor, hasLineBreaks(template2));
+  let offset = 0;
+  let nestLevel = -1;
+  let postOffsets = [];
+  for (const el of visitor.elements) {
+    let migrateResult = { tmpl: result, offsets: { pre: 0, post: 0 } };
+    offset = reduceNestingOffset(el, nestLevel, offset, postOffsets);
+    if (el.attr.name === switchcase || el.attr.name === nakedcase || el.attr.name === boundcase) {
+      try {
+        migrateResult = migrateNgSwitchCase(el, result, offset);
+      } catch (error2) {
+        errors.push({ type: switchcase, error: error2 });
+      }
+    } else if (el.attr.name === switchdefault || el.attr.name === nakeddefault) {
+      try {
+        migrateResult = migrateNgSwitchDefault(el, result, offset);
+      } catch (error2) {
+        errors.push({ type: switchdefault, error: error2 });
+      }
+    }
+    result = migrateResult.tmpl;
+    offset += migrateResult.offsets.pre;
+    postOffsets.push(migrateResult.offsets.post);
+    nestLevel = el.nestCount;
+  }
+  const changed = visitor.elements.length > 0;
+  return { migrated: result, errors, changed };
+}
+function migrateNgSwitchCase(etm, tmpl, offset) {
+  const lbString = etm.hasLineBreaks ? "\n" : "";
+  const leadingSpace = etm.hasLineBreaks ? "" : " ";
+  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 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;
+  const post = originals.end.length - endBlock.length;
+  return { tmpl: updatedTmpl, offsets: { pre, post } };
+}
+function migrateNgSwitchDefault(etm, tmpl, offset) {
+  const lbString = etm.hasLineBreaks ? "\n" : "";
+  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 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;
+  const post = originals.end.length - endBlock.length;
+  return { tmpl: updatedTmpl, offsets: { pre, post } };
+}
+
 // bazel-out/k8-fastbuild/bin/packages/core/schematics/ng-generate/control-flow-migration/fors.mjs
 var ngfor = "*ngFor";
+var nakedngfor2 = "ngFor";
+var fors = [
+  ngfor,
+  nakedngfor2
+];
 var commaSeparatedSyntax = /* @__PURE__ */ new Map([
   ["(", ")"],
   ["{", "}"],
@@ -25111,10 +25584,10 @@ function migrateFor(template2) {
   let errors = [];
   let parsed = parseTemplate2(template2);
   if (parsed === null) {
-    return { migrated: template2, errors };
+    return { migrated: template2, errors, changed: false };
   }
   let result = template2;
-  const visitor = new ElementCollector([ngfor]);
+  const visitor = new ElementCollector(fors);
   visitAll2(visitor, parsed.rootNodes);
   calculateNesting(visitor, hasLineBreaks(template2));
   let offset = 0;
@@ -25133,15 +25606,20 @@ function migrateFor(template2) {
     postOffsets.push(migrateResult.offsets.post);
     nestLevel = el.nestCount;
   }
-  return { migrated: result, errors };
+  const changed = visitor.elements.length > 0;
+  return { migrated: result, errors, changed };
 }
 function migrateNgFor(etm, tmpl, offset) {
+  if (etm.forAttrs !== void 0) {
+    return migrateBoundNgFor(etm, tmpl, offset);
+  }
+  return migrateStandardNgFor(etm, tmpl, offset);
+}
+function migrateStandardNgFor(etm, tmpl, offset) {
   const aliasWithEqualRegexp = /=\s*(count|index|first|last|even|odd)/gm;
   const aliasWithAsRegexp = /(count|index|first|last|even|odd)\s+as/gm;
   const aliases = [];
   const lbString = etm.hasLineBreaks ? "\n" : "";
-  const lbSpaces = etm.hasLineBreaks ? `
-  ` : "";
   const parts = getNgForParts(etm.attr.value);
   const originals = getOriginals(etm, tmpl, offset);
   const condition = parts[0].replace("let ", "");
@@ -25174,7 +25652,7 @@ function migrateNgFor(etm, tmpl, offset) {
   }
   const aliasStr = aliases.length > 0 ? `;${aliases.join(";")}` : "";
   const { start, middle, end } = getMainBlock(etm, tmpl, offset);
-  const startBlock = `@for (${condition}; track ${trackBy}${aliasStr}) {${lbSpaces}${start}`;
+  const startBlock = `@for (${condition}; track ${trackBy}${aliasStr}) {${lbString}${start}`;
   const endBlock = `${end}${lbString}}`;
   const forBlock = startBlock + middle + endBlock;
   const updatedTmpl = tmpl.slice(0, etm.start(offset)) + forBlock + tmpl.slice(etm.end(offset));
@@ -25182,6 +25660,35 @@ function migrateNgFor(etm, tmpl, offset) {
   const post = originals.end.length - endBlock.length;
   return { tmpl: updatedTmpl, offsets: { pre, post } };
 }
+function migrateBoundNgFor(etm, tmpl, offset) {
+  const forAttrs = etm.forAttrs;
+  const aliasMap = forAttrs.aliases;
+  const originals = getOriginals(etm, tmpl, offset);
+  const condition = `${forAttrs.item} of ${forAttrs.forOf}`;
+  const aliases = [];
+  let aliasedIndex = "$index";
+  for (const [key, val] of aliasMap) {
+    aliases.push(` let ${key.trim()} = $${val}`);
+    if (val.trim() === "index") {
+      aliasedIndex = key;
+    }
+  }
+  const aliasStr = aliases.length > 0 ? `;${aliases.join(";")}` : "";
+  let trackBy = forAttrs.item;
+  if (forAttrs.trackBy !== "") {
+    trackBy = `${forAttrs.trackBy.trim()}(${aliasedIndex}, ${forAttrs.item})`;
+  }
+  const { start, middle, end } = getMainBlock(etm, tmpl, offset);
+  const startBlock = `@for (${condition}; track ${trackBy}${aliasStr}) {
+${start}`;
+  const endBlock = `${end}
+}`;
+  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;
+  const post = originals.end.length - endBlock.length;
+  return { tmpl: updatedTmpl, offsets: { pre, post } };
+}
 function getNgForParts(expression) {
   const parts = [];
   const commaSeparatedStack = [];
@@ -25227,7 +25734,7 @@ function migrateIf(template2) {
   let errors = [];
   let parsed = parseTemplate2(template2);
   if (parsed === null) {
-    return { migrated: template2, errors };
+    return { migrated: template2, errors, changed: false };
   }
   let result = template2;
   const visitor = new ElementCollector(ifs);
@@ -25249,21 +25756,24 @@ function migrateIf(template2) {
     postOffsets.push(migrateResult.offsets.post);
     nestLevel = el.nestCount;
   }
-  return { migrated: result, errors };
+  const changed = visitor.elements.length > 0;
+  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);
-  if (matchThen && matchThen.length > 0) {
-    return buildIfThenElseBlock(etm, tmpl, matchThen[0], matchElse[0], offset);
+  if (etm.thenAttr !== void 0 || etm.elseAttr !== void 0) {
+    return buildBoundIfElseBlock(etm, tmpl, offset);
+  } else if (matchThen && matchThen.length > 0) {
+    return buildStandardIfThenElseBlock(etm, tmpl, matchThen[0], matchElse[0], offset);
   } else if (matchElse && matchElse.length > 0) {
-    return buildIfElseBlock(etm, tmpl, matchElse[0], offset);
+    return buildStandardIfElseBlock(etm, tmpl, matchElse[0], offset);
   }
   return buildIfBlock(etm, tmpl, offset);
 }
 function buildIfBlock(etm, tmpl, offset) {
   const lbString = etm.hasLineBreaks ? "\n" : "";
-  const condition = etm.attr.value.replace(" as ", "; as ");
+  const condition = etm.attr.value.replace(" as ", "; as ").replace(/;\s*let/g, "; as");
   const originals = getOriginals(etm, tmpl, offset);
   const { start, middle, end } = getMainBlock(etm, tmpl, offset);
   const startBlock = `@if (${condition}) {${lbString}${start}`;
@@ -25274,11 +25784,23 @@ function buildIfBlock(etm, tmpl, offset) {
   const post = originals.end.length - endBlock.length;
   return { tmpl: updatedTmpl, offsets: { pre, post } };
 }
-function buildIfElseBlock(etm, tmpl, elseString, offset) {
+function buildStandardIfElseBlock(etm, tmpl, elseString, offset) {
+  const condition = etm.getCondition(elseString).replace(" as ", "; as ").replace(/;\s*let/g, "; as");
+  const elsePlaceholder = `#${etm.getTemplateName(elseString)}|`;
+  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}|`;
+  if (etm.thenAttr !== void 0) {
+    const thenPlaceholder = `#${etm.thenAttr.value}|`;
+    return buildIfThenElseBlock(etm, tmpl, condition, thenPlaceholder, elsePlaceholder, offset);
+  }
+  return buildIfElseBlock(etm, tmpl, condition, elsePlaceholder, offset);
+}
+function buildIfElseBlock(etm, tmpl, condition, elsePlaceholder, offset) {
   const lbString = etm.hasLineBreaks ? "\n" : "";
-  const condition = etm.getCondition(elseString).replace(" as ", "; as ");
   const originals = getOriginals(etm, tmpl, offset);
-  const elsePlaceholder = `#${etm.getTemplateName(elseString)}|`;
   const { start, middle, end } = getMainBlock(etm, tmpl, offset);
   const startBlock = `@if (${condition}) {${lbString}${start}`;
   const elseBlock = `${end}${lbString}} @else {${lbString}`;
@@ -25291,44 +25813,37 @@ function buildIfElseBlock(etm, tmpl, elseString, offset) {
   const post = originals.end.length - postBlock.length;
   return { tmpl: updatedTmpl, offsets: { pre, post } };
 }
-function buildIfThenElseBlock(etm, tmpl, thenString, elseString, offset) {
-  const condition = etm.getCondition(thenString).replace(" as ", "; as ");
+function buildStandardIfThenElseBlock(etm, tmpl, thenString, elseString, offset) {
+  const condition = etm.getCondition(thenString).replace(" as ", "; as ").replace(/;\s*let/g, "; as");
+  const thenPlaceholder = `#${etm.getTemplateName(thenString, elseString)}|`;
+  const elsePlaceholder = `#${etm.getTemplateName(elseString)}|`;
+  return buildIfThenElseBlock(etm, tmpl, condition, thenPlaceholder, elsePlaceholder, 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 elseBlock = `${lbString}} @else {${lbString}`;
-  const thenPlaceholder = `#${etm.getTemplateName(thenString, elseString)}|`;
-  const elsePlaceholder = `#${etm.getTemplateName(elseString)}|`;
   const postBlock = thenPlaceholder + elseBlock + elsePlaceholder + `${lbString}}`;
   const ifThenElseBlock = startBlock + postBlock;
   const tmplStart = tmpl.slice(0, etm.start(offset));
   const tmplEnd = tmpl.slice(etm.end(offset));
   const updatedTmpl = tmplStart + ifThenElseBlock + tmplEnd;
-  const pre = originals.start.length - startBlock.length;
+  const pre = originals.start.length + originals.childLength - startBlock.length;
   const post = originals.end.length - postBlock.length;
   return { tmpl: updatedTmpl, offsets: { pre, post } };
 }
 
 // bazel-out/k8-fastbuild/bin/packages/core/schematics/ng-generate/control-flow-migration/switches.mjs
 var ngswitch = "[ngSwitch]";
-var boundcase = "[ngSwitchCase]";
-var switchcase = "*ngSwitchCase";
-var nakedcase = "ngSwitchCase";
-var switchdefault = "*ngSwitchDefault";
-var nakeddefault = "ngSwitchDefault";
 var switches = [
-  ngswitch,
-  boundcase,
-  switchcase,
-  nakedcase,
-  switchdefault,
-  nakeddefault
+  ngswitch
 ];
 function migrateSwitch(template2) {
   let errors = [];
   let parsed = parseTemplate2(template2);
   if (parsed === null) {
-    return { migrated: template2, errors };
+    return { migrated: template2, errors, changed: false };
   }
   let result = template2;
   const visitor = new ElementCollector(switches);
@@ -25346,25 +25861,14 @@ function migrateSwitch(template2) {
       } catch (error2) {
         errors.push({ type: ngswitch, error: error2 });
       }
-    } else if (el.attr.name === switchcase || el.attr.name === nakedcase || el.attr.name === boundcase) {
-      try {
-        migrateResult = migrateNgSwitchCase(el, result, offset);
-      } catch (error2) {
-        errors.push({ type: ngswitch, error: error2 });
-      }
-    } else if (el.attr.name === switchdefault || el.attr.name === nakeddefault) {
-      try {
-        migrateResult = migrateNgSwitchDefault(el, result, offset);
-      } catch (error2) {
-        errors.push({ type: ngswitch, error: error2 });
-      }
     }
     result = migrateResult.tmpl;
     offset += migrateResult.offsets.pre;
     postOffsets.push(migrateResult.offsets.post);
     nestLevel = el.nestCount;
   }
-  return { migrated: result, errors };
+  const changed = visitor.elements.length > 0;
+  return { migrated: result, errors, changed };
 }
 function migrateNgSwitch(etm, tmpl, offset) {
   const lbString = etm.hasLineBreaks ? "\n" : "";
@@ -25379,43 +25883,43 @@ function migrateNgSwitch(etm, tmpl, offset) {
   const post = originals.end.length - endBlock.length;
   return { tmpl: updatedTmpl, offsets: { pre, post } };
 }
-function migrateNgSwitchCase(etm, tmpl, offset) {
-  const lbString = etm.hasLineBreaks ? "\n" : "";
-  const lbSpaces = etm.hasLineBreaks ? "  " : "";
-  const leadingSpace = etm.hasLineBreaks ? "" : " ";
-  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}${lbSpaces}${start}`;
-  const endBlock = `${end}${lbString}${leadingSpace}}`;
-  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;
-  const post = originals.end.length - endBlock.length;
-  return { tmpl: updatedTmpl, offsets: { pre, post } };
-}
-function migrateNgSwitchDefault(etm, tmpl, offset) {
-  const lbString = etm.hasLineBreaks ? "\n" : "";
-  const lbSpaces = etm.hasLineBreaks ? "  " : "";
-  const leadingSpace = etm.hasLineBreaks ? "" : " ";
-  const originals = getOriginals(etm, tmpl, offset);
-  const { start, middle, end } = getMainBlock(etm, tmpl, offset);
-  const startBlock = `${leadingSpace}@default {${leadingSpace}${lbString}${lbSpaces}${start}`;
-  const endBlock = `${end}${lbString}${leadingSpace}}`;
-  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;
-  const post = originals.end.length - endBlock.length;
-  return { tmpl: updatedTmpl, offsets: { pre, post } };
+
+// bazel-out/k8-fastbuild/bin/packages/core/schematics/ng-generate/control-flow-migration/migration.mjs
+function migrateTemplate(template2, templateType, node, file, format = true) {
+  let errors = [];
+  let migrated = template2;
+  if (templateType === "template") {
+    const ifResult = migrateIf(template2);
+    const forResult = migrateFor(ifResult.migrated);
+    const switchResult = migrateSwitch(forResult.migrated);
+    const caseResult = migrateCase(switchResult.migrated);
+    migrated = processNgTemplates(caseResult.migrated);
+    const changed = ifResult.changed || forResult.changed || switchResult.changed || caseResult.changed;
+    if (format && changed) {
+      migrated = formatTemplate(migrated);
+    }
+    file.removeCommonModule = canRemoveCommonModule(template2);
+    errors = [
+      ...ifResult.errors,
+      ...forResult.errors,
+      ...switchResult.errors,
+      ...caseResult.errors
+    ];
+  } else {
+    migrated = removeImports(template2, node, file.removeCommonModule);
+  }
+  return { migrated, errors };
 }
 
 // bazel-out/k8-fastbuild/bin/packages/core/schematics/ng-generate/control-flow-migration/index.mjs
 function control_flow_migration_default(options) {
   return (tree, context) => __async(this, null, function* () {
-    const { buildPaths, testPaths } = yield getProjectTsConfigPaths(tree);
     const basePath = process.cwd();
     const pathToMigrate = normalizePath((0, import_path3.join)(basePath, options.path));
-    const allPaths = options.path !== "./" ? [...buildPaths, ...testPaths] : [pathToMigrate];
+    let allPaths = [];
+    if (pathToMigrate.trim() !== "") {
+      allPaths.push(pathToMigrate);
+    }
     if (!allPaths.length) {
       throw new import_schematics.SchematicsException("Could not find any tsconfig file. Cannot run the control flow migration.");
     }
@@ -25453,18 +25957,10 @@ function runControlFlowMigration(tree, tsconfigPath, basePath, pathToMigrate, sc
     const relativePath = (0, import_path3.relative)(basePath, path2);
     const content = tree.readText(relativePath);
     const update = tree.beginUpdate(relativePath);
-    for (const [start, end] of ranges) {
+    for (const { start, end, node, type } of ranges) {
       const template2 = content.slice(start, end);
       const length = (end != null ? end : content.length) - start;
-      const ifResult = migrateIf(template2);
-      const forResult = migrateFor(ifResult.migrated);
-      const switchResult = migrateSwitch(forResult.migrated);
-      const errors = [
-        ...ifResult.errors,
-        ...forResult.errors,
-        ...switchResult.errors
-      ];
-      const migrated = processNgTemplates(switchResult.migrated);
+      const { migrated, errors } = migrateTemplate(template2, type, node, file, schematicOptions.format);
       if (migrated !== null) {
         update.remove(start, length);
         update.insertLeft(start, migrated);