@angular/core 17.0.0-rc.2 → 17.0.0

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

@@ -7001,20 +7001,22 @@ var OpKind;
   OpKind2[OpKind2["ExtractedAttribute"] = 25] = "ExtractedAttribute";
   OpKind2[OpKind2["Defer"] = 26] = "Defer";
   OpKind2[OpKind2["DeferOn"] = 27] = "DeferOn";
-  OpKind2[OpKind2["ExtractedMessage"] = 28] = "ExtractedMessage";
-  OpKind2[OpKind2["HostProperty"] = 29] = "HostProperty";
-  OpKind2[OpKind2["Namespace"] = 30] = "Namespace";
-  OpKind2[OpKind2["ProjectionDef"] = 31] = "ProjectionDef";
-  OpKind2[OpKind2["Projection"] = 32] = "Projection";
-  OpKind2[OpKind2["RepeaterCreate"] = 33] = "RepeaterCreate";
-  OpKind2[OpKind2["Repeater"] = 34] = "Repeater";
-  OpKind2[OpKind2["I18nStart"] = 35] = "I18nStart";
-  OpKind2[OpKind2["I18n"] = 36] = "I18n";
-  OpKind2[OpKind2["I18nEnd"] = 37] = "I18nEnd";
-  OpKind2[OpKind2["I18nExpression"] = 38] = "I18nExpression";
-  OpKind2[OpKind2["I18nApply"] = 39] = "I18nApply";
-  OpKind2[OpKind2["Icu"] = 40] = "Icu";
-  OpKind2[OpKind2["IcuUpdate"] = 41] = "IcuUpdate";
+  OpKind2[OpKind2["DeferWhen"] = 28] = "DeferWhen";
+  OpKind2[OpKind2["I18nMessage"] = 29] = "I18nMessage";
+  OpKind2[OpKind2["HostProperty"] = 30] = "HostProperty";
+  OpKind2[OpKind2["Namespace"] = 31] = "Namespace";
+  OpKind2[OpKind2["ProjectionDef"] = 32] = "ProjectionDef";
+  OpKind2[OpKind2["Projection"] = 33] = "Projection";
+  OpKind2[OpKind2["RepeaterCreate"] = 34] = "RepeaterCreate";
+  OpKind2[OpKind2["Repeater"] = 35] = "Repeater";
+  OpKind2[OpKind2["I18nStart"] = 36] = "I18nStart";
+  OpKind2[OpKind2["I18n"] = 37] = "I18n";
+  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["I18nContext"] = 43] = "I18nContext";
 })(OpKind || (OpKind = {}));
 var ExpressionKind;
 (function(ExpressionKind2) {
@@ -7295,23 +7297,32 @@ function createRepeaterOp(repeaterCreate2, targetSlot, collection, sourceSpan) {
     sourceSpan
   }, NEW_OP);
 }
-function createI18nExpressionOp(owner, ownerSlot, expression, i18nPlaceholder, resolutionTime, sourceSpan) {
+function createDeferWhenOp(target, expr, prefetch, sourceSpan) {
+  return __spreadValues(__spreadValues({
+    kind: OpKind.DeferWhen,
+    target,
+    expr,
+    prefetch,
+    sourceSpan
+  }, NEW_OP), TRAIT_DEPENDS_ON_SLOT_CONTEXT);
+}
+function createI18nExpressionOp(context, target, handle, expression, i18nPlaceholder, resolutionTime, sourceSpan) {
   return __spreadValues(__spreadValues(__spreadValues({
     kind: OpKind.I18nExpression,
-    owner,
-    ownerSlot,
-    target: owner,
+    context,
+    target,
+    handle,
     expression,
     i18nPlaceholder,
     resolutionTime,
     sourceSpan
   }, NEW_OP), TRAIT_CONSUMES_VARS), TRAIT_DEPENDS_ON_SLOT_CONTEXT);
 }
-function createI18nApplyOp(target, targetSlot, sourceSpan) {
+function createI18nApplyOp(target, handle, sourceSpan) {
   return __spreadValues({
     kind: OpKind.I18nApply,
     target,
-    targetSlot,
+    handle,
     sourceSpan
   }, NEW_OP);
 }
@@ -8059,6 +8070,17 @@ function transformExpressionsInOp(op, transform2, flags) {
         op.placeholderConfig = transformExpressionsInExpression(op.placeholderConfig, transform2, flags);
       }
       break;
+    case OpKind.I18nMessage:
+      for (const [placeholder, expr] of op.params) {
+        op.params.set(placeholder, transformExpressionsInExpression(expr, transform2, flags));
+      }
+      for (const [placeholder, expr] of op.postprocessingParams) {
+        op.postprocessingParams.set(placeholder, transformExpressionsInExpression(expr, transform2, flags));
+      }
+      break;
+    case OpKind.DeferWhen:
+      op.expr = transformExpressionsInExpression(op.expr, transform2, flags);
+      break;
     case OpKind.Advance:
     case OpKind.Container:
     case OpKind.ContainerEnd:
@@ -8069,9 +8091,9 @@ function transformExpressionsInOp(op, transform2, flags) {
     case OpKind.ElementEnd:
     case OpKind.ElementStart:
     case OpKind.EnableBindings:
-    case OpKind.ExtractedMessage:
     case OpKind.I18n:
     case OpKind.I18nApply:
+    case OpKind.I18nContext:
     case OpKind.I18nEnd:
     case OpKind.I18nStart:
     case OpKind.Icu:
@@ -8512,7 +8534,7 @@ function createExtractedAttributeOp(target, bindingKind, name, expression) {
     expression
   }, NEW_OP);
 }
-function createDeferOp(xref, main, mainSlot, sourceSpan) {
+function createDeferOp(xref, main, mainSlot, metadata, sourceSpan) {
   return __spreadProps(__spreadValues(__spreadValues({
     kind: OpKind.Defer,
     xref,
@@ -8530,6 +8552,8 @@ function createDeferOp(xref, main, mainSlot, sourceSpan) {
     placeholderMinimumTime: null,
     errorView: null,
     errorSlot: null,
+    metadata,
+    resolverFn: null,
     sourceSpan
   }, NEW_OP), TRAIT_CONSUMES_SLOT), {
     numSlotsUsed: 2
@@ -8544,17 +8568,17 @@ function createDeferOnOp(defer2, trigger, prefetch, sourceSpan) {
     sourceSpan
   }, NEW_OP);
 }
-function createExtractedMessageOp(owner, message, isRoot) {
+function createI18nMessageOp(xref, i18nBlock, message, messagePlaceholder, params, postprocessingParams, needsPostprocessing) {
   return __spreadValues({
-    kind: OpKind.ExtractedMessage,
-    owner,
+    kind: OpKind.I18nMessage,
+    xref,
+    i18nBlock,
     message,
-    isRoot,
-    params: /* @__PURE__ */ new Map(),
-    postprocessingParams: /* @__PURE__ */ new Map(),
-    needsPostprocessing: false,
-    formattedParams: null,
-    formattedPostprocessingParams: null
+    messagePlaceholder,
+    params,
+    postprocessingParams,
+    needsPostprocessing,
+    subMessages: []
   }, NEW_OP);
 }
 function createI18nStartOp(xref, message, root) {
@@ -8565,7 +8589,8 @@ function createI18nStartOp(xref, message, root) {
     root: root != null ? root : xref,
     message,
     messageIndex: null,
-    subTemplateIndex: null
+    subTemplateIndex: null,
+    context: null
   }, NEW_OP), TRAIT_CONSUMES_SLOT);
 }
 function createI18nEndOp(xref) {
@@ -8574,14 +8599,28 @@ function createI18nEndOp(xref) {
     xref
   }, NEW_OP);
 }
-function createIcuOp(xref, message, sourceSpan) {
+function createIcuOp(xref, message, icu, messagePlaceholder, sourceSpan) {
   return __spreadValues({
     kind: OpKind.Icu,
     xref,
     message,
+    icu,
+    messagePlaceholder,
+    context: null,
     sourceSpan
   }, NEW_OP);
 }
+function createI18nContextOp(xref, i18nBlock, message, sourceSpan) {
+  return __spreadValues({
+    kind: OpKind.I18nContext,
+    xref,
+    i18nBlock,
+    message,
+    sourceSpan,
+    params: /* @__PURE__ */ new Map(),
+    postprocessingParams: /* @__PURE__ */ new Map()
+  }, NEW_OP);
+}
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/ir/src/ops/host.mjs
 function createHostPropertyOp(name, expression, isAnimationTrigger, sourceSpan) {
@@ -8617,10 +8656,11 @@ var CompilationJob = class {
   }
 };
 var ComponentCompilationJob = class extends CompilationJob {
-  constructor(componentName, pool, compatibility, relativeContextFilePath, i18nUseExternalIds) {
+  constructor(componentName, pool, compatibility, relativeContextFilePath, i18nUseExternalIds, deferBlocksMeta) {
     super(componentName, pool, compatibility);
     this.relativeContextFilePath = relativeContextFilePath;
     this.i18nUseExternalIds = i18nUseExternalIds;
+    this.deferBlocksMeta = deferBlocksMeta;
     this.kind = CompilationJobKind.Tmpl;
     this.fnSuffix = "Template";
     this.views = /* @__PURE__ */ new Map();
@@ -8726,7 +8766,7 @@ function applyI18nExpressions(job) {
   for (const unit of job.units) {
     for (const op of unit.update) {
       if (op.kind === OpKind.I18nExpression && needsApplication(op)) {
-        OpList.insertAfter(createI18nApplyOp(op.owner, op.ownerSlot, null), op);
+        OpList.insertAfter(createI18nApplyOp(op.target, op.handle, null), op);
       }
     }
   }
@@ -8736,7 +8776,7 @@ function needsApplication(op) {
   if (((_a2 = op.next) == null ? void 0 : _a2.kind) !== OpKind.I18nExpression) {
     return true;
   }
-  if (op.next.owner !== op.owner) {
+  if (op.next.context !== op.context) {
     return true;
   }
   return false;
@@ -8745,19 +8785,31 @@ function needsApplication(op) {
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/assign_i18n_slot_dependencies.mjs
 function assignI18nSlotDependencies(job) {
   const i18nLastSlotConsumers = /* @__PURE__ */ new Map();
+  const i18nContexts = /* @__PURE__ */ new Map();
   let lastSlotConsumer = null;
+  let currentI18nOp = null;
   for (const unit of job.units) {
     for (const op of unit.create) {
-      if (op.kind === OpKind.I18nEnd) {
-        i18nLastSlotConsumers.set(op.xref, lastSlotConsumer);
-      }
       if (hasConsumesSlotTrait(op)) {
         lastSlotConsumer = op.xref;
       }
+      switch (op.kind) {
+        case OpKind.I18nStart:
+          currentI18nOp = op;
+          break;
+        case OpKind.I18nEnd:
+          i18nLastSlotConsumers.set(currentI18nOp.xref, lastSlotConsumer);
+          currentI18nOp = null;
+          break;
+        case OpKind.I18nContext:
+          i18nContexts.set(op.xref, op);
+          break;
+      }
     }
     for (const op of unit.update) {
       if (op.kind === OpKind.I18nExpression) {
-        op.target = i18nLastSlotConsumers.get(op.owner);
+        const i18nContext = i18nContexts.get(op.context);
+        op.target = i18nLastSlotConsumers.get(i18nContext.i18nBlock);
       }
     }
   }
@@ -9224,6 +9276,113 @@ function serializeAttributes({ attributes, bindings, classes, i18n: i18n2, proje
   return literalArr(attrArray);
 }
 
+// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/create_defer_deps_fns.mjs
+function createDeferDepsFns(job) {
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      if (op.kind === OpKind.Defer) {
+        if (op.metadata.deps.length === 0) {
+          continue;
+        }
+        const dependencies = [];
+        for (const dep of op.metadata.deps) {
+          if (dep.isDeferrable) {
+            const innerFn = arrowFn([new FnParam("m", DYNAMIC_TYPE)], variable("m").prop(dep.symbolName));
+            const importExpr2 = new DynamicImportExpr(dep.importPath).prop("then").callFn([innerFn]);
+            dependencies.push(importExpr2);
+          } else {
+            dependencies.push(dep.type);
+          }
+        }
+        const depsFnExpr = arrowFn([], literalArr(dependencies));
+        if (op.handle.slot === null) {
+          throw new Error("AssertionError: slot must be assigned bfore extracting defer deps functions");
+        }
+        op.resolverFn = job.pool.getSharedFunctionReference(depsFnExpr, `${job.componentName}_Defer_${op.handle.slot}_DepsFn`);
+      }
+    }
+  }
+}
+
+// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/create_i18n_contexts.mjs
+function createI18nContexts(job) {
+  let currentI18nOp = null;
+  let xref;
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      switch (op.kind) {
+        case OpKind.I18nStart:
+          xref = job.allocateXrefId();
+          unit.create.push(createI18nContextOp(xref, op.xref, op.message, null));
+          op.context = xref;
+          currentI18nOp = op;
+          break;
+        case OpKind.I18nEnd:
+          currentI18nOp = null;
+          break;
+        case OpKind.Icu:
+          if (currentI18nOp === null) {
+            throw Error("Unexpected ICU outside of an i18n block.");
+          }
+          if (op.message.id !== currentI18nOp.message.id) {
+            xref = job.allocateXrefId();
+            unit.create.push(createI18nContextOp(xref, currentI18nOp.xref, op.message, null));
+            op.context = xref;
+          } else {
+            op.context = currentI18nOp.context;
+          }
+          break;
+      }
+    }
+  }
+}
+
+// bazel-out/darwin_arm64-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/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/defer_configs.mjs
 function configureDeferInstructions(job) {
   for (const unit of job.units) {
@@ -9276,6 +9435,22 @@ function resolveDeferTargetNames(job) {
       case DeferTriggerKind.Interaction:
       case DeferTriggerKind.Viewport:
         if (op.trigger.targetName === null) {
+          if (placeholderView === null) {
+            throw new Error("defer on trigger with no target name must have a placeholder block");
+          }
+          const placeholder = job.views.get(placeholderView);
+          if (placeholder == void 0) {
+            throw new Error("AssertionError: could not find placeholder view for defer on trigger");
+          }
+          for (const placeholderOp of placeholder.create) {
+            if (hasConsumesSlotTrait(placeholderOp) && (isElementOrContainerOp(placeholderOp) || placeholderOp.kind === OpKind.Projection)) {
+              op.trigger.targetXref = placeholderOp.xref;
+              op.trigger.targetView = placeholderView;
+              op.trigger.targetSlotViewSteps = -1;
+              op.trigger.targetSlot = placeholderOp.handle;
+              return;
+            }
+          }
           return;
         }
         let view = placeholderView !== null ? job.views.get(placeholderView) : deferOwnerView;
@@ -9482,7 +9657,7 @@ function ternaryTransform(e) {
   return new ConditionalExpr(new BinaryOperatorExpr(BinaryOperator.Equals, e.guard, NULL_EXPR), NULL_EXPR, e.expr);
 }
 
-// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/format_i18n_params.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/extract_i18n_messages.mjs
 var ESCAPE = "\uFFFD";
 var ELEMENT_MARKER = "#";
 var TEMPLATE_MARKER = "*";
@@ -9491,24 +9666,61 @@ var CONTEXT_MARKER = ":";
 var LIST_START_MARKER = "[";
 var LIST_END_MARKER = "]";
 var LIST_DELIMITER = "|";
-function formatI18nParams(job) {
+function extractI18nMessages(job) {
+  const i18nContexts = /* @__PURE__ */ new Map();
+  const i18nBlockContexts = /* @__PURE__ */ new Set();
   for (const unit of job.units) {
     for (const op of unit.create) {
-      if (op.kind === OpKind.ExtractedMessage) {
-        if (op.isRoot) {
-          op.formattedParams = formatParams(op.params);
-          op.formattedPostprocessingParams = formatParams(op.postprocessingParams);
-          op.needsPostprocessing = op.postprocessingParams.size > 0;
-          for (const [param, values] of op.params) {
-            if (values.length > 1) {
-              op.needsPostprocessing = true;
-            }
-          }
+      switch (op.kind) {
+        case OpKind.I18nContext:
+          i18nContexts.set(op.xref, op);
+          break;
+        case OpKind.I18nStart:
+          i18nBlockContexts.add(op.context);
+          break;
+      }
+    }
+  }
+  const i18nBlockMessages = /* @__PURE__ */ new Map();
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      if (op.kind === OpKind.I18nStart && op.xref === op.root) {
+        if (!op.context) {
+          throw Error("I18n start op should have its context set.");
+        }
+        const i18nMessageOp = createI18nMessage(job, i18nContexts.get(op.context));
+        i18nBlockMessages.set(op.xref, i18nMessageOp);
+        unit.create.push(i18nMessageOp);
+      }
+    }
+  }
+  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);
       }
     }
   }
 }
+function createI18nMessage(job, context, messagePlaceholder) {
+  let needsPostprocessing = context.postprocessingParams.size > 0;
+  for (const values of context.params.values()) {
+    if (values.length > 1) {
+      needsPostprocessing = true;
+    }
+  }
+  return createI18nMessageOp(job.allocateXrefId(), context.i18nBlock, context.message, messagePlaceholder != null ? messagePlaceholder : null, formatParams(context.params), formatParams(context.postprocessingParams), needsPostprocessing);
+}
 function formatParams(params) {
   const result = /* @__PURE__ */ new Map();
   for (const [placeholder, placeholderValues] of [...params].sort()) {
@@ -15416,8 +15628,8 @@ var I18nMetaVisitor = class {
   }
   _generateI18nMessage(nodes, meta = "", visitNodeFn) {
     const { meaning, description, customId } = this._parseMetadata(meta);
-    const createI18nMessage = createI18nMessageFactory(this.interpolationConfig);
-    const message = createI18nMessage(nodes, meaning, description, customId, visitNodeFn);
+    const createI18nMessage2 = createI18nMessageFactory(this.interpolationConfig);
+    const message = createI18nMessage2(nodes, meaning, description, customId, visitNodeFn);
     this._setMessageId(message, meta);
     this._setLegacyIds(message, meta);
     return message;
@@ -15689,28 +15901,21 @@ var TRANSLATION_VAR_PREFIX2 = "i18n_";
 function collectI18nConsts(job) {
   const fileBasedI18nSuffix = job.relativeContextFilePath.replace(/[^A-Za-z0-9]/g, "_").toUpperCase() + "_";
   const messageConstIndices = /* @__PURE__ */ new Map();
+  const messages = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
     for (const op of unit.create) {
-      if (op.kind === OpKind.ExtractedMessage) {
-        if (op.isRoot) {
-          assertAllParamsResolved(op);
-          const mainVar = variable(job.pool.uniqueName(TRANSLATION_VAR_PREFIX2));
-          const closureVar = i18nGenerateClosureVar(job.pool, op.message.id, fileBasedI18nSuffix, job.i18nUseExternalIds);
-          let transformFn = void 0;
-          if (op.needsPostprocessing) {
-            const extraTransformFnParams = [];
-            if (op.formattedPostprocessingParams.size > 0) {
-              extraTransformFnParams.push(literalMap([...op.formattedPostprocessingParams].map(([key, value]) => ({ key, value, quoted: true }))));
-            }
-            transformFn = (expr) => importExpr(Identifiers.i18nPostprocess).callFn([expr, ...extraTransformFnParams]);
-          }
-          const statements = getTranslationDeclStmts(op.message, mainVar, closureVar, op.formattedParams, transformFn);
-          messageConstIndices.set(op.owner, job.addConst(mainVar, statements));
-        }
+      if (op.kind === OpKind.I18nMessage) {
+        messages.set(op.xref, op);
         OpList.remove(op);
       }
     }
   }
+  for (const op of messages.values()) {
+    if (op.kind === OpKind.I18nMessage && op.messagePlaceholder === null) {
+      const { mainVar, statements } = collectMessage(job, fileBasedI18nSuffix, messages, op);
+      messageConstIndices.set(op.i18nBlock, job.addConst(mainVar, statements));
+    }
+  }
   for (const unit of job.units) {
     for (const op of unit.create) {
       if (op.kind === OpKind.I18nStart) {
@@ -15719,6 +15924,28 @@ function collectI18nConsts(job) {
     }
   }
 }
+function collectMessage(job, fileBasedI18nSuffix, messages, messageOp) {
+  const statements = [];
+  for (const subMessageId of messageOp.subMessages) {
+    const subMessage = messages.get(subMessageId);
+    const { mainVar: subMessageVar, statements: subMessageStatements } = collectMessage(job, fileBasedI18nSuffix, messages, subMessage);
+    statements.push(...subMessageStatements);
+    messageOp.params.set(subMessage.messagePlaceholder, subMessageVar);
+  }
+  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) {
+    const extraTransformFnParams = [];
+    if (messageOp.postprocessingParams.size > 0) {
+      extraTransformFnParams.push(literalMap([...messageOp.postprocessingParams].map(([key, value]) => ({ key, value, quoted: true }))));
+    }
+    transformFn = (expr) => importExpr(Identifiers.i18nPostprocess).callFn([expr, ...extraTransformFnParams]);
+  }
+  statements.push(...getTranslationDeclStmts(messageOp.message, mainVar, closureVar, messageOp.params, transformFn));
+  return { mainVar, statements };
+}
 function getTranslationDeclStmts(message, variable2, closureVar, params, transformFn) {
   const paramsObject = Object.fromEntries(params);
   const statements = [
@@ -15747,52 +15974,38 @@ function i18nGenerateClosureVar(pool, messageId, fileBasedI18nSuffix, useExterna
   return variable(name);
 }
 function assertAllParamsResolved(op) {
-  if (op.formattedParams === null || op.formattedPostprocessingParams === null) {
-    throw Error("Params should have been formatted.");
-  }
   for (const placeholder in op.message.placeholders) {
-    if (!op.formattedParams.has(placeholder) && !op.formattedPostprocessingParams.has(placeholder)) {
+    if (!op.params.has(placeholder) && !op.postprocessingParams.has(placeholder)) {
       throw Error(`Failed to resolve i18n placeholder: ${placeholder}`);
     }
   }
   for (const placeholder in op.message.placeholderToMessage) {
-    if (!op.formattedParams.has(placeholder) && !op.formattedPostprocessingParams.has(placeholder)) {
+    if (!op.params.has(placeholder) && !op.postprocessingParams.has(placeholder)) {
       throw Error(`Failed to resolve i18n message placeholder: ${placeholder}`);
     }
   }
 }
 
-// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/i18n_message_extraction.mjs
-function extractI18nMessages(job) {
-  for (const unit of job.units) {
-    for (const op of unit.create) {
-      if (op.kind === OpKind.I18nStart) {
-        unit.create.push(createExtractedMessageOp(op.xref, op.message, op.xref === op.root));
-      }
-    }
-  }
-}
-
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/i18n_text_extraction.mjs
 function extractI18nText(job) {
   var _a2;
   for (const unit of job.units) {
-    let currentI18nId = null;
-    let currentI18nSlot = null;
-    const textNodes = /* @__PURE__ */ new Map();
+    let currentI18n = null;
+    const textNodeI18nBlocks = /* @__PURE__ */ new Map();
     for (const op of unit.create) {
       switch (op.kind) {
         case OpKind.I18nStart:
-          currentI18nId = op.xref;
-          currentI18nSlot = op.handle;
+          if (op.context === null) {
+            throw Error("I18n op should have its context set.");
+          }
+          currentI18n = op;
           break;
         case OpKind.I18nEnd:
-          currentI18nId = null;
-          currentI18nSlot = null;
+          currentI18n = null;
           break;
         case OpKind.Text:
-          if (currentI18nId !== null && currentI18nSlot !== null) {
-            textNodes.set(op.xref, { xref: currentI18nId, slot: currentI18nSlot });
+          if (currentI18n !== null) {
+            textNodeI18nBlocks.set(op.xref, currentI18n);
             OpList.remove(op);
           }
           break;
@@ -15801,17 +16014,15 @@ function extractI18nText(job) {
     for (const op of unit.update) {
       switch (op.kind) {
         case OpKind.InterpolateText:
-          if (!textNodes.has(op.target)) {
+          if (!textNodeI18nBlocks.has(op.target)) {
             continue;
           }
-          const i18nBlock = textNodes.get(op.target);
+          const i18nOp = textNodeI18nBlocks.get(op.target);
           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(i18nBlock.xref, i18nBlock.slot, expr, placeholder.name, I18nParamResolutionTime.Creation, (_a2 = expr.sourceSpan) != null ? _a2 : op.sourceSpan));
-          }
-          if (ops.length > 0) {
+            ops.push(createI18nExpressionOp(i18nOp.context, i18nOp.xref, i18nOp.handle, expr, placeholder.name, I18nParamResolutionTime.Creation, (_a2 = expr.sourceSpan) != null ? _a2 : op.sourceSpan));
           }
           OpList.replaceWithMany(op, ops);
           break;
@@ -15820,49 +16031,6 @@ function extractI18nText(job) {
   }
 }
 
-// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/icu_extraction.mjs
-function extractI18nICUs(job) {
-  for (const unit of job.units) {
-    const icus = /* @__PURE__ */ new Map();
-    let currentI18nId = null;
-    let currentI18nSlot = null;
-    for (const op of unit.create) {
-      switch (op.kind) {
-        case OpKind.I18nStart:
-          currentI18nId = op.xref;
-          currentI18nSlot = op.handle;
-          break;
-        case OpKind.I18nEnd:
-          currentI18nId = null;
-          currentI18nSlot = null;
-          break;
-        case OpKind.Icu:
-          if (currentI18nId === null) {
-            throw Error("Unexpected ICU outside of an i18n block.");
-          }
-          icus.set(op.xref, { message: op.message, i18nBlockId: currentI18nId, i18nBlockSlot: currentI18nSlot });
-          OpList.remove(op);
-          break;
-      }
-    }
-    for (const op of unit.update) {
-      switch (op.kind) {
-        case OpKind.IcuUpdate:
-          const { message, i18nBlockId, i18nBlockSlot } = icus.get(op.xref);
-          const icuNode = message.nodes.find((n) => n instanceof Icu2);
-          if (icuNode === void 0) {
-            throw Error("Could not find ICU in i18n AST");
-          }
-          if (icuNode.expressionPlaceholder === void 0) {
-            throw Error("ICU is missing an i18n placeholder");
-          }
-          OpList.replace(op, createI18nExpressionOp(i18nBlockId, i18nBlockSlot, new LexicalReadExpr(icuNode.expression), icuNode.expressionPlaceholder, I18nParamResolutionTime.Postproccessing, null));
-          break;
-      }
-    }
-  }
-}
-
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/local_refs.mjs
 function liftLocalRefs(job) {
   for (const unit of job.units) {
@@ -15893,6 +16061,47 @@ function serializeLocalRefs(refs) {
   return literalArr(constRefs);
 }
 
+// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/merge_i18n_contexts.mjs
+function mergeI18nContexts(job) {
+  const i18nOps = /* @__PURE__ */ new Map();
+  const i18nContexts = /* @__PURE__ */ new Map();
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      switch (op.kind) {
+        case OpKind.I18nStart:
+          if (!op.context) {
+            throw Error("I18n op should have its context set.");
+          }
+          i18nOps.set(op.xref, op);
+          break;
+        case OpKind.I18nContext:
+          i18nContexts.set(op.xref, op);
+          break;
+      }
+    }
+  }
+  for (const childI18nOp of i18nOps.values()) {
+    if (childI18nOp.xref !== childI18nOp.root) {
+      const childContext = i18nContexts.get(childI18nOp.context);
+      const rootI18nOp = i18nOps.get(childI18nOp.root);
+      const rootContext = i18nContexts.get(rootI18nOp.context);
+      mergeParams(rootContext.params, childContext.params);
+      mergeParams(rootContext.postprocessingParams, childContext.postprocessingParams);
+    }
+  }
+}
+function mergeParams(to, from) {
+  for (const [placeholder, fromValues] of from) {
+    const toValues = to.get(placeholder) || [];
+    const flags = fromValues[0].flags;
+    if (flags & I18nParamValueFlags.CloseTag && !(flags & I18nParamValueFlags.OpenTag)) {
+      to.set(placeholder, [...fromValues, ...toValues]);
+    } else {
+      to.set(placeholder, [...toValues, ...fromValues]);
+    }
+  }
+}
+
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/namespace.mjs
 function emitNamespaceChanges(job) {
   for (const unit of job.units) {
@@ -16417,49 +16626,6 @@ function wrapTemplateWithI18n(unit, parentI18n) {
   }
 }
 
-// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/propagate_i18n_placeholders.mjs
-function propogateI18nPlaceholders(job) {
-  const i18nOps = /* @__PURE__ */ new Map();
-  const extractedMessageOps = /* @__PURE__ */ new Map();
-  for (const unit of job.units) {
-    for (const op of unit.create) {
-      switch (op.kind) {
-        case OpKind.I18nStart:
-          i18nOps.set(op.xref, op);
-          break;
-        case OpKind.ExtractedMessage:
-          extractedMessageOps.set(op.owner, op);
-          break;
-      }
-    }
-  }
-  for (const [xref, childExtractedMessageOp] of extractedMessageOps) {
-    if (!childExtractedMessageOp.isRoot) {
-      const i18nOp = i18nOps.get(xref);
-      if (i18nOp === void 0) {
-        throw Error("Could not find owner i18n block for extracted message.");
-      }
-      const rootExtractedMessageOp = extractedMessageOps.get(i18nOp.root);
-      if (rootExtractedMessageOp === void 0) {
-        throw Error("Could not find extracted message op for root i18n block.");
-      }
-      mergeParams(rootExtractedMessageOp.params, childExtractedMessageOp.params);
-      mergeParams(rootExtractedMessageOp.postprocessingParams, childExtractedMessageOp.postprocessingParams);
-    }
-  }
-}
-function mergeParams(to, from) {
-  for (const [placeholder, fromValues] of from) {
-    const toValues = to.get(placeholder) || [];
-    const flags = fromValues[0].flags;
-    if (flags & I18nParamValueFlags.CloseTag && !(flags & I18nParamValueFlags.OpenTag)) {
-      to.set(placeholder, [...fromValues, ...toValues]);
-    } else {
-      to.set(placeholder, [...toValues, ...fromValues]);
-    }
-  }
-}
-
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/pure_function_extraction.mjs
 function extractPureFunctions(job) {
   for (const view of job.units) {
@@ -16583,13 +16749,21 @@ function elementContainer(slot, constIndex, localRefIndex, sourceSpan) {
 function elementContainerEnd() {
   return call(Identifiers.elementContainerEnd, [], null);
 }
-function template(slot, templateFnRef, decls, vars, tag, constIndex, sourceSpan) {
-  const args = [literal(slot), templateFnRef, literal(decls), literal(vars)];
-  if (tag !== null || constIndex !== null) {
-    args.push(literal(tag));
-    if (constIndex !== null) {
-      args.push(literal(constIndex));
-    }
+function template(slot, templateFnRef, decls, vars, tag, constIndex, localRefs, sourceSpan) {
+  const args = [
+    literal(slot),
+    templateFnRef,
+    literal(decls),
+    literal(vars),
+    literal(tag),
+    literal(constIndex)
+  ];
+  if (localRefs !== null) {
+    args.push(literal(localRefs));
+    args.push(importExpr(Identifiers.templateRefExtractor));
+  }
+  while (args[args.length - 1].isEquivalent(NULL_EXPR)) {
+    args.pop();
   }
   return call(Identifiers.templateCreate, args, sourceSpan);
 }
@@ -16663,7 +16837,7 @@ function defer(selfSlot, primarySlot, dependencyResolverFn, loadingSlot, placeho
   const args = [
     literal(selfSlot),
     literal(primarySlot),
-    literal(dependencyResolverFn),
+    dependencyResolverFn != null ? dependencyResolverFn : literal(null),
     literal(loadingSlot),
     literal(placeholderSlot),
     literal(errorSlot),
@@ -16743,6 +16917,9 @@ function repeaterCreate(slot, viewFnName, decls, vars, tag, constIndex, trackByF
 function repeater(metadataSlot, collection, sourceSpan) {
   return call(Identifiers.repeater, [literal(metadataSlot), collection], sourceSpan);
 }
+function deferWhen(prefetch, expr, sourceSpan) {
+  return call(prefetch ? Identifiers.deferPrefetchWhen : Identifiers.deferWhen, [expr], sourceSpan);
+}
 function i18n(slot, constIndex, subTemplateIndex) {
   const args = [literal(slot), literal(constIndex)];
   if (subTemplateIndex) {
@@ -17103,8 +17280,11 @@ function reifyCreateOperations(unit, ops) {
         if (!(unit instanceof ViewCompilationUnit)) {
           throw new Error(`AssertionError: must be compiling a component`);
         }
+        if (Array.isArray(op.localRefs)) {
+          throw new Error(`AssertionError: local refs array should have been extracted into a constant`);
+        }
         const childView = unit.job.views.get(op.xref);
-        OpList.replace(op, template(op.handle.slot, variable(childView.fnName), childView.decls, childView.vars, op.tag, op.attributes, op.sourceSpan));
+        OpList.replace(op, template(op.handle.slot, variable(childView.fnName), childView.decls, childView.vars, op.tag, op.attributes, op.localRefs, op.sourceSpan));
         break;
       case OpKind.DisableBindings:
         OpList.replace(op, disableBindings2());
@@ -17141,7 +17321,7 @@ function reifyCreateOperations(unit, ops) {
         break;
       case OpKind.Defer:
         const timerScheduling = !!op.loadingMinimumTime || !!op.loadingAfterTime || !!op.placeholderMinimumTime;
-        OpList.replace(op, defer(op.handle.slot, op.mainSlot.slot, null, (_b2 = (_a2 = op.loadingSlot) == null ? void 0 : _a2.slot) != null ? _b2 : null, (_d2 = (_c2 = op.placeholderSlot) == null ? void 0 : _c2.slot) != null ? _d2 : null, (_f2 = (_e2 = op.errorSlot) == null ? void 0 : _e2.slot) != null ? _f2 : null, op.loadingConfig, op.placeholderConfig, timerScheduling, op.sourceSpan));
+        OpList.replace(op, defer(op.handle.slot, op.mainSlot.slot, op.resolverFn, (_b2 = (_a2 = op.loadingSlot) == null ? void 0 : _a2.slot) != null ? _b2 : null, (_d2 = (_c2 = op.placeholderSlot) == null ? void 0 : _c2.slot) != null ? _d2 : null, (_f2 = (_e2 = op.errorSlot) == null ? void 0 : _e2.slot) != null ? _f2 : null, op.loadingConfig, op.placeholderConfig, timerScheduling, op.sourceSpan));
         break;
       case OpKind.DeferOn:
         let args = [];
@@ -17254,7 +17434,7 @@ function reifyUpdateOperations(_unit, ops) {
         OpList.replace(op, i18nExp(op.expression, op.sourceSpan));
         break;
       case OpKind.I18nApply:
-        OpList.replace(op, i18nApply(op.targetSlot.slot, op.sourceSpan));
+        OpList.replace(op, i18nApply(op.handle.slot, op.sourceSpan));
         break;
       case OpKind.InterpolateText:
         OpList.replace(op, textInterpolate(op.interpolation.strings, op.interpolation.expressions, op.sourceSpan));
@@ -17295,6 +17475,9 @@ function reifyUpdateOperations(_unit, ops) {
       case OpKind.Repeater:
         OpList.replace(op, repeater(op.targetSlot.slot, op.collection, op.sourceSpan));
         break;
+      case OpKind.DeferWhen:
+        OpList.replace(op, deferWhen(op.prefetch, op.expr, op.sourceSpan));
+        break;
       case OpKind.Statement:
         break;
       default:
@@ -17393,6 +17576,22 @@ function removeEmptyBindings(job) {
   }
 }
 
+// bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/remove_i18n_contexts.mjs
+function removeI18nContexts(job) {
+  for (const unit of job.units) {
+    for (const op of unit.create) {
+      switch (op.kind) {
+        case OpKind.I18nContext:
+          OpList.remove(op);
+          break;
+        case OpKind.I18nStart:
+          op.context = null;
+          break;
+      }
+    }
+  }
+}
+
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/repeater_derived_vars.mjs
 function generateRepeaterDerivedVars(job) {
   const repeaters = /* @__PURE__ */ new Map();
@@ -17489,13 +17688,13 @@ function transformDollarEvent(unit, ops) {
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/resolve_i18n_element_placeholders.mjs
 function resolveI18nElementPlaceholders(job) {
-  const extractedMessageOps = /* @__PURE__ */ new Map();
+  const i18nContexts = /* @__PURE__ */ new Map();
   const elements = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
     for (const op of unit.create) {
       switch (op.kind) {
-        case OpKind.ExtractedMessage:
-          extractedMessageOps.set(op.owner, op);
+        case OpKind.I18nContext:
+          i18nContexts.set(op.xref, op);
           break;
         case OpKind.ElementStart:
           elements.set(op.xref, op);
@@ -17508,10 +17707,10 @@ function resolveI18nElementPlaceholders(job) {
     for (const op of unit.create) {
       switch (op.kind) {
         case OpKind.I18nStart:
-          if (!extractedMessageOps.has(op.xref)) {
-            throw Error("Could not find extracted message for i18n op");
+          if (!op.context) {
+            throw Error("Could not find i18n context for i18n op");
           }
-          currentOps = { i18n: op, extractedMessage: extractedMessageOps.get(op.xref) };
+          currentOps = { i18nBlock: op, i18nContext: i18nContexts.get(op.context) };
           break;
         case OpKind.I18nEnd:
           currentOps = null;
@@ -17526,7 +17725,7 @@ function resolveI18nElementPlaceholders(job) {
             if (closeName === "") {
               flags |= I18nParamValueFlags.CloseTag;
             }
-            addParam(currentOps.extractedMessage.params, startName, op.handle.slot, currentOps.i18n.subTemplateIndex, flags);
+            addParam(currentOps.i18nContext.params, startName, op.handle.slot, currentOps.i18nBlock.subTemplateIndex, flags);
           }
           break;
         case OpKind.ElementEnd:
@@ -17537,7 +17736,7 @@ function resolveI18nElementPlaceholders(job) {
             }
             const { closeName } = startOp.i18nPlaceholder;
             if (closeName !== "") {
-              addParam(currentOps.extractedMessage.params, closeName, startOp.handle.slot, currentOps.i18n.subTemplateIndex, I18nParamValueFlags.ElementTag | I18nParamValueFlags.CloseTag);
+              addParam(currentOps.i18nContext.params, closeName, startOp.handle.slot, currentOps.i18nBlock.subTemplateIndex, I18nParamValueFlags.ElementTag | I18nParamValueFlags.CloseTag);
             }
           }
           break;
@@ -17546,9 +17745,9 @@ function resolveI18nElementPlaceholders(job) {
             if (currentOps === null) {
               throw Error("i18n tag placeholder should only occur inside an i18n block");
             }
-            const subTemplateIndex = getSubTemplateIndexForTemplateTag(job, currentOps.i18n, op);
-            addParam(currentOps.extractedMessage.params, op.i18nPlaceholder.startName, op.handle.slot, subTemplateIndex, I18nParamValueFlags.TemplateTag);
-            addParam(currentOps.extractedMessage.params, op.i18nPlaceholder.closeName, op.handle.slot, subTemplateIndex, I18nParamValueFlags.TemplateTag | I18nParamValueFlags.CloseTag);
+            const subTemplateIndex = getSubTemplateIndexForTemplateTag(job, currentOps.i18nBlock, op);
+            addParam(currentOps.i18nContext.params, op.i18nPlaceholder.startName, op.handle.slot, subTemplateIndex, I18nParamValueFlags.TemplateTag);
+            addParam(currentOps.i18nContext.params, op.i18nPlaceholder.closeName, op.handle.slot, subTemplateIndex, I18nParamValueFlags.TemplateTag | I18nParamValueFlags.CloseTag);
           }
           break;
       }
@@ -17572,16 +17771,16 @@ function addParam(params, placeholder, value, subTemplateIndex, flags = I18nPara
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/resolve_i18n_expression_placeholders.mjs
 function resolveI18nExpressionPlaceholders(job) {
-  const i18nOps = /* @__PURE__ */ new Map();
-  const extractedMessageOps = /* @__PURE__ */ new Map();
+  const subTemplateIndicies = /* @__PURE__ */ new Map();
+  const i18nContexts = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
     for (const op of unit.create) {
       switch (op.kind) {
         case OpKind.I18nStart:
-          i18nOps.set(op.xref, op);
+          subTemplateIndicies.set(op.xref, op.subTemplateIndex);
           break;
-        case OpKind.ExtractedMessage:
-          extractedMessageOps.set(op.owner, op);
+        case OpKind.I18nContext:
+          i18nContexts.set(op.xref, op);
           break;
       }
     }
@@ -17590,24 +17789,14 @@ function resolveI18nExpressionPlaceholders(job) {
   for (const unit of job.units) {
     for (const op of unit.update) {
       if (op.kind === OpKind.I18nExpression) {
-        const i18nOp = i18nOps.get(op.owner);
-        let index = expressionIndices.get(op.owner) || 0;
-        if (!i18nOp) {
-          throw Error("Cannot find corresponding i18n block for i18nExpr");
-        }
-        const extractedMessageOp = extractedMessageOps.get(i18nOp.xref);
-        if (!extractedMessageOp) {
-          throw Error("Cannot find extracted message for i18n block");
-        }
-        const params = op.resolutionTime === I18nParamResolutionTime.Creation ? extractedMessageOp.params : extractedMessageOp.postprocessingParams;
+        const index = expressionIndices.get(op.context) || 0;
+        const i18nContext = i18nContexts.get(op.context);
+        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: i18nOp.subTemplateIndex,
-          flags: I18nParamValueFlags.None
-        });
+        values.push({ value: index, subTemplateIndex, flags: I18nParamValueFlags.None });
         params.set(op.i18nPlaceholder, values);
-        expressionIndices.set(op.owner, index + 1);
+        expressionIndices.set(op.context, index + 1);
       }
     }
   }
@@ -18358,6 +18547,7 @@ var phases = [
   { kind: CompilationJobKind.Both, fn: specializeBindings },
   { kind: CompilationJobKind.Tmpl, fn: propagateI18nBlocks },
   { kind: CompilationJobKind.Tmpl, fn: wrapI18nIcus },
+  { kind: CompilationJobKind.Tmpl, fn: createI18nContexts },
   { kind: CompilationJobKind.Both, fn: extractAttributes },
   { kind: CompilationJobKind.Both, fn: parseExtractedStyles },
   { kind: CompilationJobKind.Tmpl, fn: removeEmptyBindings },
@@ -18367,7 +18557,7 @@ var phases = [
   { kind: CompilationJobKind.Tmpl, fn: createPipes },
   { kind: CompilationJobKind.Tmpl, fn: configureDeferInstructions },
   { kind: CompilationJobKind.Tmpl, fn: extractI18nText },
-  { kind: CompilationJobKind.Tmpl, fn: extractI18nICUs },
+  { kind: CompilationJobKind.Tmpl, fn: createI18nIcuExpressions },
   { kind: CompilationJobKind.Tmpl, fn: applyI18nExpressions },
   { kind: CompilationJobKind.Tmpl, fn: createVariadicPipes },
   { kind: CompilationJobKind.Both, fn: generatePureLiteralStructures },
@@ -18388,16 +18578,17 @@ var phases = [
   { kind: CompilationJobKind.Both, fn: expandSafeReads },
   { kind: CompilationJobKind.Both, fn: generateTemporaryVariables },
   { kind: CompilationJobKind.Tmpl, fn: allocateSlots },
-  { kind: CompilationJobKind.Tmpl, fn: extractI18nMessages },
+  { kind: CompilationJobKind.Tmpl, fn: createDeferDepsFns },
   { kind: CompilationJobKind.Tmpl, fn: resolveI18nElementPlaceholders },
   { kind: CompilationJobKind.Tmpl, fn: resolveI18nExpressionPlaceholders },
-  { kind: CompilationJobKind.Tmpl, fn: propogateI18nPlaceholders },
-  { kind: CompilationJobKind.Tmpl, fn: formatI18nParams },
+  { kind: CompilationJobKind.Tmpl, fn: mergeI18nContexts },
+  { kind: CompilationJobKind.Tmpl, fn: extractI18nMessages },
   { kind: CompilationJobKind.Tmpl, fn: generateTrackFns },
   { kind: CompilationJobKind.Tmpl, fn: collectI18nConsts },
   { kind: CompilationJobKind.Tmpl, fn: collectConstExpressions },
   { kind: CompilationJobKind.Both, fn: collectElementConsts },
   { kind: CompilationJobKind.Tmpl, fn: assignI18nSlotDependencies },
+  { kind: CompilationJobKind.Tmpl, fn: removeI18nContexts },
   { kind: CompilationJobKind.Both, fn: countVariables },
   { kind: CompilationJobKind.Tmpl, fn: generateAdvance },
   { kind: CompilationJobKind.Both, fn: optimizeVariables },
@@ -18514,8 +18705,8 @@ function emitHostBindingFunction(job) {
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/ingest.mjs
 var compatibilityMode = CompatibilityMode.TemplateDefinitionBuilder;
-function ingestComponent(componentName, template2, constantPool, relativeContextFilePath, i18nUseExternalIds) {
-  const job = new ComponentCompilationJob(componentName, constantPool, compatibilityMode, relativeContextFilePath, i18nUseExternalIds);
+function ingestComponent(componentName, template2, constantPool, relativeContextFilePath, i18nUseExternalIds, deferBlocksMeta) {
+  const job = new ComponentCompilationJob(componentName, constantPool, compatibilityMode, relativeContextFilePath, i18nUseExternalIds, deferBlocksMeta);
   ingestNodes(job.root, template2);
   return job;
 }
@@ -18598,6 +18789,7 @@ function ingestNodes(unit, template2) {
   }
 }
 function ingestElement(unit, element2) {
+  var _a2;
   if (element2.i18n !== void 0 && !(element2.i18n instanceof Message || element2.i18n instanceof TagPlaceholder)) {
     throw Error(`Unhandled i18n metadata type for element: ${element2.i18n.constructor.name}`);
   }
@@ -18608,7 +18800,7 @@ function ingestElement(unit, element2) {
   ingestBindings(unit, startOp, element2);
   ingestReferences(startOp, element2);
   ingestNodes(unit, element2.children);
-  const endOp = createElementEndOp(id, element2.endSourceSpan);
+  const endOp = createElementEndOp(id, (_a2 = element2.endSourceSpan) != null ? _a2 : element2.startSourceSpan);
   unit.create.push(endOp);
   if (element2.i18n instanceof Message) {
     const i18nBlockId = unit.job.allocateXrefId();
@@ -18731,12 +18923,16 @@ function ingestDeferView(unit, suffix, children, sourceSpan) {
 }
 function ingestDeferBlock(unit, deferBlock) {
   var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+  const blockMeta = unit.job.deferBlocksMeta.get(deferBlock);
+  if (blockMeta === void 0) {
+    throw new Error(`AssertionError: unable to find metadata for deferred block`);
+  }
   const main = ingestDeferView(unit, "", deferBlock.children, deferBlock.sourceSpan);
   const loading = ingestDeferView(unit, "Loading", (_a2 = deferBlock.loading) == null ? void 0 : _a2.children, (_b2 = deferBlock.loading) == null ? void 0 : _b2.sourceSpan);
   const placeholder = ingestDeferView(unit, "Placeholder", (_c2 = deferBlock.placeholder) == null ? void 0 : _c2.children, (_d2 = deferBlock.placeholder) == null ? void 0 : _d2.sourceSpan);
   const error2 = ingestDeferView(unit, "Error", (_e2 = deferBlock.error) == null ? void 0 : _e2.children, (_f2 = deferBlock.error) == null ? void 0 : _f2.sourceSpan);
   const deferXref = unit.job.allocateXrefId();
-  const deferOp = createDeferOp(deferXref, main.xref, main.handle, deferBlock.sourceSpan);
+  const deferOp = createDeferOp(deferXref, main.xref, main.handle, blockMeta, deferBlock.sourceSpan);
   deferOp.placeholderView = (_g = placeholder == null ? void 0 : placeholder.xref) != null ? _g : null;
   deferOp.placeholderSlot = (_h = placeholder == null ? void 0 : placeholder.handle) != null ? _h : null;
   deferOp.loadingSlot = (_i = loading == null ? void 0 : loading.handle) != null ? _i : null;
@@ -18747,17 +18943,18 @@ function ingestDeferBlock(unit, deferBlock) {
   unit.create.push(deferOp);
   let prefetch = false;
   let deferOnOps = [];
+  let deferWhenOps = [];
   for (const triggers of [deferBlock.triggers, deferBlock.prefetchTriggers]) {
     if (triggers.idle !== void 0) {
-      const deferOnOp = createDeferOnOp(deferXref, { kind: DeferTriggerKind.Idle }, prefetch, null);
+      const deferOnOp = createDeferOnOp(deferXref, { kind: DeferTriggerKind.Idle }, prefetch, triggers.idle.sourceSpan);
       deferOnOps.push(deferOnOp);
     }
     if (triggers.immediate !== void 0) {
-      const deferOnOp = createDeferOnOp(deferXref, { kind: DeferTriggerKind.Immediate }, prefetch, null);
+      const deferOnOp = createDeferOnOp(deferXref, { kind: DeferTriggerKind.Immediate }, prefetch, triggers.immediate.sourceSpan);
       deferOnOps.push(deferOnOp);
     }
     if (triggers.timer !== void 0) {
-      const deferOnOp = createDeferOnOp(deferXref, { kind: DeferTriggerKind.Timer, delay: triggers.timer.delay }, prefetch, null);
+      const deferOnOp = createDeferOnOp(deferXref, { kind: DeferTriggerKind.Timer, delay: triggers.timer.delay }, prefetch, triggers.timer.sourceSpan);
       deferOnOps.push(deferOnOp);
     }
     if (triggers.hover !== void 0) {
@@ -18768,7 +18965,7 @@ function ingestDeferBlock(unit, deferBlock) {
         targetSlot: null,
         targetView: null,
         targetSlotViewSteps: null
-      }, prefetch, null);
+      }, prefetch, triggers.hover.sourceSpan);
       deferOnOps.push(deferOnOp);
     }
     if (triggers.interaction !== void 0) {
@@ -18779,7 +18976,7 @@ function ingestDeferBlock(unit, deferBlock) {
         targetSlot: null,
         targetView: null,
         targetSlotViewSteps: null
-      }, prefetch, null);
+      }, prefetch, triggers.interaction.sourceSpan);
       deferOnOps.push(deferOnOp);
     }
     if (triggers.viewport !== void 0) {
@@ -18790,21 +18987,26 @@ function ingestDeferBlock(unit, deferBlock) {
         targetSlot: null,
         targetView: null,
         targetSlotViewSteps: null
-      }, prefetch, null);
+      }, prefetch, triggers.viewport.sourceSpan);
       deferOnOps.push(deferOnOp);
     }
-    if (deferOnOps.length === 0) {
+    if (triggers.when !== void 0) {
+      const deferOnOp = createDeferWhenOp(deferXref, convertAst(triggers.when.value, unit.job, triggers.when.sourceSpan), prefetch, triggers.when.sourceSpan);
+      deferWhenOps.push(deferOnOp);
+    }
+    if (deferOnOps.length === 0 && deferWhenOps.length === 0) {
       deferOnOps.push(createDeferOnOp(deferXref, { kind: DeferTriggerKind.Idle }, false, null));
     }
     prefetch = true;
   }
   unit.create.push(deferOnOps);
+  unit.update.push(deferWhenOps);
 }
 function ingestIcu(unit, icu) {
   var _a2;
-  if (icu.i18n instanceof Message) {
+  if (icu.i18n instanceof Message && isSingleI18nIcu(icu.i18n)) {
     const xref = unit.job.allocateXrefId();
-    unit.create.push(createIcuOp(xref, icu.i18n, null));
+    unit.create.push(createIcuOp(xref, icu.i18n, icu.i18n.nodes[0], icuFromI18nMessage(icu.i18n).name, null));
     unit.update.push(createIcuUpdateOp(xref, null));
   } else {
     throw Error(`Unhandled i18n metadata type for ICU: ${(_a2 = icu.i18n) == null ? void 0 : _a2.constructor.name}`);
@@ -18862,6 +19064,15 @@ function convertAst(ast, job, baseSourceSpan) {
       return new ReadPropExpr(convertAst(ast.receiver, job, baseSourceSpan), ast.name, null, convertSourceSpan(ast.span, baseSourceSpan));
     }
   } else if (ast instanceof PropertyWrite) {
+    if (ast.receiver instanceof ImplicitReceiver) {
+      return new WritePropExpr(
+        new ContextExpr(job.root.xref),
+        ast.name,
+        convertAst(ast.value, job, baseSourceSpan),
+        null,
+        convertSourceSpan(ast.span, baseSourceSpan)
+      );
+    }
     return new WritePropExpr(convertAst(ast.receiver, job, baseSourceSpan), ast.name, convertAst(ast.value, job, baseSourceSpan), void 0, convertSourceSpan(ast.span, baseSourceSpan));
   } else if (ast instanceof KeyedWrite) {
     return new WriteKeyExpr(convertAst(ast.receiver, job, baseSourceSpan), convertAst(ast.key, job, baseSourceSpan), convertAst(ast.value, job, baseSourceSpan), void 0, convertSourceSpan(ast.span, baseSourceSpan));
@@ -18911,7 +19122,7 @@ function convertAst(ast, job, baseSourceSpan) {
   } else if (ast instanceof EmptyExpr) {
     return new EmptyExpr2(convertSourceSpan(ast.span, baseSourceSpan));
   } else {
-    throw new Error(`Unhandled expression type: ${ast.constructor.name}`);
+    throw new Error(`Unhandled expression type "${ast.constructor.name}" in file "${baseSourceSpan == null ? void 0 : baseSourceSpan.start.file.url}"`);
   }
 }
 function isPlainTemplate(tmpl) {
@@ -19049,7 +19260,8 @@ function ingestControlFlowInsertionPoint(unit, xref, node) {
     for (const attr of root.attributes) {
       ingestBinding(unit, xref, attr.name, literal(attr.value), 1, null, SecurityContext.NONE, attr.sourceSpan, BindingFlags.TextValue);
     }
-    return root instanceof Element ? root.name : root.tagName;
+    const tagName = root instanceof Element ? root.name : root.tagName;
+    return tagName === "ng-template" ? null : tagName;
   }
   return null;
 }
@@ -21947,7 +22159,8 @@ var TemplateDefinitionBuilder = class {
       }
     }
     if (root !== null) {
-      tagName = root instanceof Element ? root.name : root.tagName;
+      const name = root instanceof Element ? root.name : root.tagName;
+      tagName = name === NG_TEMPLATE_TAG_NAME ? null : name;
       attrsExprs = this.getAttributeExpressions(NG_TEMPLATE_TAG_NAME, root.attributes, root.inputs, []);
     }
     return { tagName, attrsExprs };
@@ -22897,7 +23110,7 @@ function compileComponentFromMetadata(meta, constantPool, bindingParser) {
     }
     definitionMap.set("template", templateFunctionExpression);
   } else {
-    const tpl = ingestComponent(meta.name, meta.template.nodes, constantPool, meta.relativeContextFilePath, meta.i18nUseExternalIds);
+    const tpl = ingestComponent(meta.name, meta.template.nodes, constantPool, meta.relativeContextFilePath, meta.i18nUseExternalIds, meta.deferBlocks);
     transform(tpl, CompilationJobKind.Tmpl);
     const templateFn = emitTemplateFn(tpl, constantPool);
     if (tpl.contentSelectors !== null) {
@@ -24548,7 +24761,7 @@ function publishFacade(global) {
 }
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/version.mjs
-var VERSION2 = new Version("17.0.0-rc.2");
+var VERSION2 = new Version("17.0.0");
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/i18n/extractor_merger.mjs
 var _VisitorMode;
@@ -24607,6 +24820,15 @@ var switchcase = "*ngSwitchCase";
 var nakedcase = "ngSwitchCase";
 var switchdefault = "*ngSwitchDefault";
 var nakeddefault = "ngSwitchDefault";
+var commaSeparatedSyntax = /* @__PURE__ */ new Map([
+  ["(", ")"],
+  ["{", "}"],
+  ["[", "]"]
+]);
+var stringPairs = /* @__PURE__ */ new Map([
+  [`"`, `"`],
+  [`'`, `'`]
+]);
 var attributesToMigrate = [
   ngif,
   nakedngif,
@@ -24777,7 +24999,7 @@ function migrateTemplate(template2) {
   const visitor = new ElementCollector();
   visitAll2(visitor, parsed.rootNodes);
   for (let [key, tmpl] of visitor.templates) {
-    const regex = new RegExp(`\\W${key.slice(1)}\\W`, "gm");
+    const regex = new RegExp(`[^a-zA-Z0-9-<]+${key.slice(1)}\\W`, "gm");
     const matches = template2.match(regex);
     tmpl.count = (_a2 = matches == null ? void 0 : matches.length) != null ? _a2 : 0;
     tmpl.generateContents(template2);
@@ -24851,8 +25073,8 @@ function migrateTemplate(template2) {
   return { migrated: result, errors };
 }
 function migrateNgIf(etm, ngTemplates, tmpl, offset) {
-  const matchThen = etm.attr.value.match(/;\s+then/gm);
-  const matchElse = etm.attr.value.match(/;\s+else/gm);
+  const matchThen = etm.attr.value.match(/;\s*then/gm);
+  const matchElse = etm.attr.value.match(/;\s*else/gm);
   if (matchThen && matchThen.length > 0) {
     return buildIfThenElseBlock(etm, ngTemplates, tmpl, matchThen[0], matchElse[0], offset);
   } else if (matchElse && matchElse.length > 0) {
@@ -24919,7 +25141,7 @@ function migrateNgFor(etm, tmpl, offset) {
   const aliases = [];
   const lbString = etm.hasLineBreaks ? lb : "";
   const lbSpaces = etm.hasLineBreaks ? `${lb}  ` : "";
-  const parts = etm.attr.value.split(";");
+  const parts = getNgForParts(etm.attr.value);
   const originals = getOriginals(etm, tmpl, offset);
   const condition = parts[0].replace("let ", "");
   const loopVar = condition.split(" of ")[0];
@@ -24935,7 +25157,7 @@ function migrateNgFor(etm, tmpl, offset) {
       const aliasParts = part.split("=");
       aliases.push(` ${aliasParts[0].trim()} = $${aliasParts[1].trim()}`);
       if (aliasParts[1].trim() === "index") {
-        aliasedIndex = aliasParts[0].trim().split(/\s+as\s+/)[1];
+        aliasedIndex = aliasParts[0].replace("let", "").trim();
       }
     }
     if (part.match(aliasWithAsRegexp)) {
@@ -24959,6 +25181,37 @@ function migrateNgFor(etm, tmpl, offset) {
   const post = originals.end.length - endBlock.length;
   return { tmpl: updatedTmpl, offsets: { pre, post } };
 }
+function getNgForParts(expression) {
+  const parts = [];
+  const commaSeparatedStack = [];
+  const stringStack = [];
+  let current = "";
+  for (let i = 0; i < expression.length; i++) {
+    const char = expression[i];
+    const isInString = stringStack.length === 0;
+    const isInCommaSeparated = commaSeparatedStack.length === 0;
+    if (isInString && current.length > 0 && (char === ";" || char === "," && isInCommaSeparated)) {
+      parts.push(current);
+      current = "";
+      continue;
+    }
+    if (stringPairs.has(char)) {
+      stringStack.push(stringPairs.get(char));
+    } else if (stringStack.length > 0 && stringStack[stringStack.length - 1] === char) {
+      stringStack.pop();
+    }
+    if (commaSeparatedSyntax.has(char)) {
+      commaSeparatedStack.push(commaSeparatedSyntax.get(char));
+    } else if (commaSeparatedStack.length > 0 && commaSeparatedStack[commaSeparatedStack.length - 1] === char) {
+      commaSeparatedStack.pop();
+    }
+    current += char;
+  }
+  if (current.length > 0) {
+    parts.push(current);
+  }
+  return parts;
+}
 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);