@angular/core 17.0.2 → 17.0.3

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);
@@ -3971,6 +3891,25 @@ var IcuPlaceholder = class {
     return visitor.visitIcuPlaceholder(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) {
+  }
+};
 function serializeMessage(messageNodes) {
   const visitor = new LocalizeMessageStringVisitor();
   const str = messageNodes.map((n) => n.visit(visitor)).join("");
@@ -7014,8 +6953,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 +7039,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) {
@@ -7326,13 +7266,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 +8029,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 +8532,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 +8701,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 +9268,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 +9285,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 +9598,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 +9630,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 +9646,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) {
@@ -15932,11 +15842,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 +15886,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 +15905,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 +15919,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 +15944,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;
@@ -17762,7 +17690,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,19 +17717,76 @@ 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;
+  }
+  visitTagPlaceholder(placeholder) {
+    var _a2, _b2;
+    super.visitTagPlaceholder(placeholder);
+    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
+      }]);
+    }
+  }
+};
+
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/resolve_names.mjs
 function resolveNames(job) {
   for (const unit of job.units) {
@@ -18518,6 +18503,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 +18512,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 +18548,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 +18571,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 +18836,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 +18848,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 +18999,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) {
@@ -21968,7 +21977,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)]);
     };
@@ -24761,7 +24770,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.3");
 
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/i18n/extractor_merger.mjs
 var _VisitorMode;
@@ -24807,14 +24816,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 +24920,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 +24933,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 +24977,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 +25039,107 @@ 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 updateImportDeclaration(decl, removeCommonModule) {
+  const clause = decl.getChildAt(1);
+  const updatedClause = updateImportClause(clause, removeCommonModule);
+  if (updatedClause === null) {
+    return "";
+  }
+  const printer = import_typescript5.default.createPrinter();
+  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,21 +25225,40 @@ 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)) {
+    return updateImportDeclaration(node, removeCommonModule);
+  }
+  return template2;
+}
 function getOriginals(etm, tmpl, offset) {
   if (etm.el.children.length > 0) {
     const start2 = tmpl.slice(etm.el.sourceSpan.start.offset - offset, etm.el.children[0].sourceSpan.start.offset - offset);
@@ -25060,14 +25268,20 @@ function getOriginals(etm, tmpl, offset) {
   const start = tmpl.slice(etm.el.sourceSpan.start.offset - offset, etm.el.sourceSpan.end.offset - offset);
   return { start, end: "" };
 }
+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));
@@ -25089,7 +25303,7 @@ function getMainBlock(etm, tmpl, offset) {
 }
 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);
@@ -25098,6 +25312,11 @@ function forEachClass(sourceFile, callback) {
 
 // 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([
   ["(", ")"],
   ["{", "}"],
@@ -25114,7 +25333,7 @@ function migrateFor(template2) {
     return { migrated: template2, errors };
   }
   let result = template2;
-  const visitor = new ElementCollector([ngfor]);
+  const visitor = new ElementCollector(fors);
   visitAll2(visitor, parsed.rootNodes);
   calculateNesting(visitor, hasLineBreaks(template2));
   let offset = 0;
@@ -25136,6 +25355,12 @@ function migrateFor(template2) {
   return { migrated: result, errors };
 }
 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 = [];
@@ -25182,6 +25407,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 = [];
@@ -25254,10 +25508,12 @@ function migrateIf(template2) {
 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);
 }
@@ -25274,11 +25530,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) {
-  const lbString = etm.hasLineBreaks ? "\n" : "";
+function buildStandardIfElseBlock(etm, tmpl, elseString, offset) {
   const condition = etm.getCondition(elseString).replace(" as ", "; as ");
-  const originals = getOriginals(etm, tmpl, offset);
   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 originals = getOriginals(etm, tmpl, offset);
   const { start, middle, end } = getMainBlock(etm, tmpl, offset);
   const startBlock = `@if (${condition}) {${lbString}${start}`;
   const elseBlock = `${end}${lbString}} @else {${lbString}`;
@@ -25291,14 +25559,17 @@ 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) {
+function buildStandardIfThenElseBlock(etm, tmpl, thenString, elseString, offset) {
   const condition = etm.getCondition(thenString).replace(" as ", "; 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));
@@ -25409,13 +25680,36 @@ function migrateNgSwitchDefault(etm, tmpl, offset) {
   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) {
+  let errors = [];
+  let migrated = template2;
+  if (templateType === "template") {
+    const ifResult = migrateIf(template2);
+    const forResult = migrateFor(ifResult.migrated);
+    const switchResult = migrateSwitch(forResult.migrated);
+    migrated = processNgTemplates(switchResult.migrated);
+    file.removeCommonModule = canRemoveCommonModule(template2);
+    errors = [
+      ...ifResult.errors,
+      ...forResult.errors,
+      ...switchResult.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 +25747,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);
       if (migrated !== null) {
         update.remove(start, length);
         update.insertLeft(start, migrated);