@angular/compiler-cli 21.1.0-next.4 → 21.1.0

package/bundles/{chunk-PUEBQK4X.js → chunk-TTZRVNVM.js}

@@ -5,7 +5,7 @@
 import {
   Context,
   ExpressionTranslatorVisitor
-} from "./chunk-LS5RJ5CS.js";
+} from "./chunk-FROPOOFC.js";
 import {
   LogicalProjectPath,
   absoluteFrom,
@@ -227,9 +227,14 @@ var COMPILER_ERRORS_WITH_GUIDES = /* @__PURE__ */ new Set([
 
 // packages/compiler-cli/src/ngtsc/diagnostics/src/error_details_base_url.js
 import { VERSION } from "@angular/compiler";
+var DOC_PAGE_BASE_URL = (() => {
+  const full = VERSION.full;
+  const isPreRelease = full.includes("-next") || full.includes("-rc") || full === "21.1.0";
+  const prefix = isPreRelease ? "next" : `v${VERSION.major}`;
+  return `https://${prefix}.angular.dev`;
+})();
 var ERROR_DETAILS_PAGE_BASE_URL = (() => {
-  const versionSubDomain = VERSION.major !== "0" ? `v${VERSION.major}.` : "";
-  return `https://${versionSubDomain}angular.dev/errors`;
+  return `${DOC_PAGE_BASE_URL}/errors`;
 })();
 
 // packages/compiler-cli/src/ngtsc/diagnostics/src/extended_template_diagnostic_name.js
@@ -4434,12 +4439,13 @@ var StaticInterpreter = class {
     return res;
   }
   visitTypeQuery(node, context) {
-    if (!ts16.isIdentifier(node.exprName)) {
+    const exprName = ts16.isQualifiedName(node.exprName) ? node.exprName.right : node.exprName;
+    if (!ts16.isIdentifier(exprName)) {
       return DynamicValue.fromUnknown(node);
     }
-    const decl = this.host.getDeclarationOfIdentifier(node.exprName);
+    const decl = this.host.getDeclarationOfIdentifier(exprName);
     if (decl === null) {
-      return DynamicValue.fromUnknownIdentifier(node.exprName);
+      return DynamicValue.fromUnknownIdentifier(exprName);
     }
     const declContext = { ...context, ...joinModuleContext(context, node, decl) };
     return this.visitDeclaration(decl.node, declContext);
@@ -5348,6 +5354,9 @@ var TypeTranslatorVisitor = class {
   }
   visitLiteralMapExpr(ast, context) {
     const entries = ast.entries.map((entry) => {
+      if (entry instanceof o.LiteralMapSpreadAssignment) {
+        throw new Error("Spread is not supported in this context");
+      }
       const { key, quoted } = entry;
       const type = this.translateExpression(entry.value, context);
       return ts25.factory.createPropertySignature(
@@ -5396,6 +5405,10 @@ var TypeTranslatorVisitor = class {
   visitParenthesizedExpr(ast, context) {
     throw new Error("Method not implemented.");
   }
+  visitSpreadElementExpr(ast, context) {
+    const typeNode = this.translateExpression(ast.expression, context);
+    return ts25.factory.createRestTypeNode(typeNode);
+  }
   translateType(type, context) {
     const typeNode = type.visitType(this, context);
     if (!ts25.isTypeNode(typeNode)) {
@@ -5565,10 +5578,16 @@ var TypeScriptAstFactory = class {
     return ts26.factory.createNewExpression(expression, void 0, args);
   }
   createObjectLiteral(properties) {
-    return ts26.factory.createObjectLiteralExpression(properties.map((prop) => ts26.factory.createPropertyAssignment(prop.quoted ? ts26.factory.createStringLiteral(prop.propertyName) : ts26.factory.createIdentifier(prop.propertyName), prop.value)));
+    return ts26.factory.createObjectLiteralExpression(properties.map((prop) => {
+      if (prop.kind === "spread") {
+        return ts26.factory.createSpreadAssignment(prop.expression);
+      }
+      return ts26.factory.createPropertyAssignment(prop.quoted ? ts26.factory.createStringLiteral(prop.propertyName) : ts26.factory.createIdentifier(prop.propertyName), prop.value);
+    }));
   }
   createParenthesizedExpression = ts26.factory.createParenthesizedExpression;
   createPropertyAccess = ts26.factory.createPropertyAccessExpression;
+  createSpreadElement = ts26.factory.createSpreadElement;
   createReturnStatement(expression) {
     return ts26.factory.createReturnStatement(expression ?? void 0);
   }
@@ -9595,7 +9614,7 @@ function parseTemplateDeclaration(node, decorator, component, containingFile, ev
       resolvedTemplateUrl: containingFile
     };
   } else {
-    throw new FatalDiagnosticError(ErrorCode.COMPONENT_MISSING_TEMPLATE, decorator.node, "component is missing a template");
+    throw new FatalDiagnosticError(ErrorCode.COMPONENT_MISSING_TEMPLATE, decorator.node, "@Component is missing a template. Add either a `template` or `templateUrl`");
   }
 }
 function preloadAndParseTemplate(evaluator, resourceLoader, depTracker, preanalyzeTemplateCache, node, decorator, component, containingFile, defaultPreserveWhitespaces, options, compilationMode) {
@@ -11598,7 +11617,7 @@ function getTypeCheckId(clazz) {
 }
 
 // packages/compiler-cli/src/ngtsc/typecheck/src/completion.js
-import { EmptyExpr, ImplicitReceiver, PropertyRead, SafePropertyRead, TmplAstLetDeclaration, TmplAstReference, TmplAstTextAttribute } from "@angular/compiler";
+import { EmptyExpr, ImplicitReceiver, PropertyRead, SafePropertyRead, ThisReceiver, TmplAstLetDeclaration, TmplAstReference, TmplAstTextAttribute } from "@angular/compiler";
 import ts51 from "typescript";
 var CompletionEngine = class {
   tcb;
@@ -11677,7 +11696,7 @@ var CompletionEngine = class {
         };
       }
     }
-    if (node instanceof PropertyRead && node.receiver instanceof ImplicitReceiver) {
+    if (node instanceof PropertyRead && (node.receiver instanceof ImplicitReceiver || node.receiver instanceof ThisReceiver)) {
       const nodeLocation = findFirstMatchingNode(this.tcb, {
         filter: ts51.isPropertyAccessExpression,
         withSpan: node.sourceSpan
@@ -13082,7 +13101,7 @@ var TypeParameterEmitter = class {
 };
 
 // packages/compiler-cli/src/ngtsc/typecheck/src/host_bindings.js
-import { BindingType, CssSelector as CssSelector2, makeBindingParser, TmplAstBoundAttribute, TmplAstBoundEvent, TmplAstHostElement, AbsoluteSourceSpan as AbsoluteSourceSpan2, ParseSpan, PropertyRead as PropertyRead2, ParsedEventType, Call, ThisReceiver, KeyedRead, LiteralPrimitive, RecursiveAstVisitor, ASTWithName, SafeCall, ImplicitReceiver as ImplicitReceiver2 } from "@angular/compiler";
+import { BindingType, CssSelector as CssSelector2, makeBindingParser, TmplAstBoundAttribute, TmplAstBoundEvent, TmplAstHostElement, AbsoluteSourceSpan as AbsoluteSourceSpan2, ParseSpan, PropertyRead as PropertyRead2, ParsedEventType, Call, ThisReceiver as ThisReceiver2, KeyedRead, LiteralPrimitive, RecursiveAstVisitor, ASTWithName, SafeCall, ImplicitReceiver as ImplicitReceiver2 } from "@angular/compiler";
 import ts54 from "typescript";
 var GUARD_COMMENT_TEXT = "hostBindingsBlockGuard";
 function createHostElement(type, selector, sourceNode, literal4, bindingDecorators, listenerDecorators) {
@@ -13180,7 +13199,7 @@ function createNodeFromBindingDecorator(decorator, bindings) {
   }
   const span = new ParseSpan(-1, -1);
   const propertyStart = property.getStart();
-  const receiver = new ThisReceiver(span, new AbsoluteSourceSpan2(propertyStart, propertyStart));
+  const receiver = new ThisReceiver2(span, new AbsoluteSourceSpan2(propertyStart, propertyStart));
   const nameSpan = new AbsoluteSourceSpan2(propertyName.getStart(), propertyName.getEnd());
   const read = ts54.isIdentifier(propertyName) ? new PropertyRead2(span, nameSpan, nameSpan, receiver, propertyName.text) : new KeyedRead(span, nameSpan, receiver, new LiteralPrimitive(span, nameSpan, propertyName.text));
   const { attrName, type } = inferBoundAttribute(nameNode.text);
@@ -13198,7 +13217,7 @@ function createNodeFromListenerDecorator(decorator, parser, listeners) {
   const span = new ParseSpan(-1, -1);
   const argNodes = [];
   const methodStart = method.getStart();
-  const methodReceiver = new ThisReceiver(span, new AbsoluteSourceSpan2(methodStart, methodStart));
+  const methodReceiver = new ThisReceiver2(span, new AbsoluteSourceSpan2(methodStart, methodStart));
   const nameSpan = new AbsoluteSourceSpan2(method.name.getStart(), method.name.getEnd());
   const receiver = ts54.isIdentifier(method.name) ? new PropertyRead2(span, nameSpan, nameSpan, methodReceiver, method.name.text) : new KeyedRead(span, nameSpan, methodReceiver, new LiteralPrimitive(span, nameSpan, method.name.text));
   if (args.length > 1 && ts54.isArrayLiteralExpression(args[1])) {
@@ -13683,7 +13702,7 @@ var Environment = class extends ReferenceEmitEnvironment {
 };
 
 // packages/compiler-cli/src/ngtsc/typecheck/src/oob.js
-import { AbsoluteSourceSpan as AbsoluteSourceSpan3, TmplAstBoundAttribute as TmplAstBoundAttribute2, TmplAstBoundEvent as TmplAstBoundEvent2, TmplAstComponent, TmplAstDirective, TmplAstElement, ParseSourceSpan as ParseSourceSpan2, BindingType as BindingType2 } from "@angular/compiler";
+import { AbsoluteSourceSpan as AbsoluteSourceSpan3, BindingType as BindingType2, ParseSourceSpan as ParseSourceSpan2, TmplAstBoundAttribute as TmplAstBoundAttribute2, TmplAstBoundEvent as TmplAstBoundEvent2, TmplAstComponent, TmplAstDirective, TmplAstElement } from "@angular/compiler";
 import ts58 from "typescript";
 var OutOfBandDiagnosticRecorderImpl = class {
   resolver;
@@ -13818,7 +13837,7 @@ Consider enabling the 'strictTemplates' option in your tsconfig.json for better
   splitTwoWayBinding(id, input, output, inputConsumer, outputConsumer) {
     const mapping = this.resolver.getTemplateSourceMapping(id);
     const errorMsg = `The property and event halves of the two-way binding '${input.name}' are not bound to the same target.
-            Find more at https://angular.dev/guide/templates/two-way-binding#how-two-way-binding-works`;
+            Find more at ${DOC_PAGE_BASE_URL}/guide/templates/two-way-binding`;
     const relatedMessages = [];
     relatedMessages.push({
       text: `The property half of the binding is to the '${inputConsumer.name.text}' component.`,
@@ -13958,9 +13977,9 @@ Deferred blocks can only access triggers in same view, a parent embedded view or
       } else {
         name = node.name;
       }
-      message = `Binding to '${name}' is not allowed on nodes using the '[field]' directive`;
+      message = `Binding to '${name}' is not allowed on nodes using the '[formField]' directive`;
     } else {
-      message = `Setting the '${node.name}' attribute is not allowed on nodes using the '[field]' directive`;
+      message = `Setting the '${node.name}' attribute is not allowed on nodes using the '[formField]' directive`;
     }
     this._diagnostics.push(makeTemplateDiagnostic(id, this.resolver.getTemplateSourceMapping(id), node.sourceSpan, ts58.DiagnosticCategory.Error, ngErrorCode(ErrorCode.FORM_FIELD_UNSUPPORTED_BINDING), message));
   }
@@ -14125,7 +14144,7 @@ import { TmplAstBoundAttribute as TmplAstBoundAttribute3, TmplAstTemplate } from
 import ts65 from "typescript";
 
 // packages/compiler-cli/src/ngtsc/typecheck/src/ops/expression.js
-import { Binary, BindingPipe, Call as Call3, ImplicitReceiver as ImplicitReceiver3, PropertyRead as PropertyRead4, R3Identifiers as R3Identifiers4, SafeCall as SafeCall2, SafePropertyRead as SafePropertyRead3, ThisReceiver as ThisReceiver2, TmplAstLetDeclaration as TmplAstLetDeclaration2 } from "@angular/compiler";
+import { Binary, BindingPipe, Call as Call3, ImplicitReceiver as ImplicitReceiver3, PropertyRead as PropertyRead4, R3Identifiers as R3Identifiers4, SafeCall as SafeCall2, SafePropertyRead as SafePropertyRead3, ThisReceiver as ThisReceiver3, TmplAstLetDeclaration as TmplAstLetDeclaration2 } from "@angular/compiler";
 import ts64 from "typescript";
 
 // packages/compiler-cli/src/ngtsc/typecheck/src/expression.js
@@ -14260,9 +14279,13 @@ var AstTranslator = class {
     return node;
   }
   visitLiteralMap(ast) {
-    const properties = ast.keys.map(({ key }, idx) => {
+    const properties = ast.keys.map((key, idx) => {
       const value = this.translate(ast.values[idx]);
-      return ts63.factory.createPropertyAssignment(ts63.factory.createStringLiteral(key), value);
+      if (key.kind === "property") {
+        return ts63.factory.createPropertyAssignment(ts63.factory.createStringLiteral(key.key), value);
+      } else {
+        return ts63.factory.createSpreadAssignment(value);
+      }
     });
     const literal4 = ts63.factory.createObjectLiteralExpression(properties, true);
     const node = this.config.strictLiteralTypes ? literal4 : tsCastToAny(literal4);
@@ -14418,6 +14441,12 @@ var AstTranslator = class {
   visitParenthesizedExpression(ast) {
     return ts63.factory.createParenthesizedExpression(this.translate(ast.expression));
   }
+  visitSpreadElement(ast) {
+    const expression = wrapForDiagnostics(this.translate(ast.expression));
+    const node = ts63.factory.createSpreadElement(expression);
+    addParseSpanInfo(node, ast.sourceSpan);
+    return node;
+  }
   convertToSafeCall(ast, expr, args) {
     if (this.config.strictSafeNavigationTypes) {
       const call = ts63.factory.createCallExpression(ts63.factory.createNonNullExpression(expr), void 0, args);
@@ -14441,40 +14470,40 @@ var VeSafeLhsInferenceBugDetector = class _VeSafeLhsInferenceBugDetector {
   visitBinary(ast) {
     return ast.left.visit(this) || ast.right.visit(this);
   }
-  visitChain(ast) {
+  visitChain() {
     return false;
   }
   visitConditional(ast) {
     return ast.condition.visit(this) || ast.trueExp.visit(this) || ast.falseExp.visit(this);
   }
-  visitCall(ast) {
+  visitCall() {
     return true;
   }
-  visitSafeCall(ast) {
+  visitSafeCall() {
     return false;
   }
-  visitImplicitReceiver(ast) {
+  visitImplicitReceiver() {
     return false;
   }
-  visitThisReceiver(ast) {
+  visitThisReceiver() {
     return false;
   }
   visitInterpolation(ast) {
     return ast.expressions.some((exp) => exp.visit(this));
   }
-  visitKeyedRead(ast) {
+  visitKeyedRead() {
     return false;
   }
-  visitLiteralArray(ast) {
+  visitLiteralArray() {
     return true;
   }
-  visitLiteralMap(ast) {
+  visitLiteralMap() {
     return true;
   }
-  visitLiteralPrimitive(ast) {
+  visitLiteralPrimitive() {
     return false;
   }
-  visitPipe(ast) {
+  visitPipe() {
     return true;
   }
   visitPrefixNot(ast) {
@@ -14489,30 +14518,33 @@ var VeSafeLhsInferenceBugDetector = class _VeSafeLhsInferenceBugDetector {
   visitNonNullAssert(ast) {
     return ast.expression.visit(this);
   }
-  visitPropertyRead(ast) {
+  visitPropertyRead() {
     return false;
   }
-  visitSafePropertyRead(ast) {
+  visitSafePropertyRead() {
     return false;
   }
-  visitSafeKeyedRead(ast) {
+  visitSafeKeyedRead() {
     return false;
   }
-  visitTemplateLiteral(ast, context) {
+  visitTemplateLiteral() {
     return false;
   }
-  visitTemplateLiteralElement(ast, context) {
+  visitTemplateLiteralElement() {
     return false;
   }
-  visitTaggedTemplateLiteral(ast, context) {
+  visitTaggedTemplateLiteral() {
     return false;
   }
-  visitParenthesizedExpression(ast, context) {
+  visitParenthesizedExpression(ast) {
     return ast.expression.visit(this);
   }
-  visitRegularExpressionLiteral(ast, context) {
+  visitRegularExpressionLiteral() {
     return false;
   }
+  visitSpreadElement(ast) {
+    return ast.expression.visit(this);
+  }
 };
 
 // packages/compiler-cli/src/ngtsc/typecheck/src/ops/expression.js
@@ -14560,7 +14592,7 @@ var TcbExpressionTranslator = class {
    * context). This method assists in resolving those.
    */
   resolve(ast) {
-    if (ast instanceof PropertyRead4 && ast.receiver instanceof ImplicitReceiver3 && !(ast.receiver instanceof ThisReceiver2)) {
+    if (ast instanceof PropertyRead4 && ast.receiver instanceof ImplicitReceiver3) {
       const target = this.tcb.boundTarget.getExpressionTarget(ast);
       const targetExpression = target === null ? null : this.getTargetNodeExpression(target, ast);
       if (target instanceof TmplAstLetDeclaration2 && !this.isValidLetDeclarationAccess(target, ast)) {
@@ -14570,7 +14602,7 @@ var TcbExpressionTranslator = class {
         }
       }
       return targetExpression;
-    } else if (ast instanceof Binary && Binary.isAssignmentOperation(ast.operation) && ast.left instanceof PropertyRead4 && ast.left.receiver instanceof ImplicitReceiver3) {
+    } else if (ast instanceof Binary && Binary.isAssignmentOperation(ast.operation) && ast.left instanceof PropertyRead4 && (ast.left.receiver instanceof ImplicitReceiver3 || ast.left.receiver instanceof ThisReceiver3)) {
       const read = ast.left;
       const target = this.tcb.boundTarget.getExpressionTarget(read);
       if (target === null) {
@@ -14585,7 +14617,7 @@ var TcbExpressionTranslator = class {
         this.tcb.oobRecorder.illegalWriteToLetDeclaration(this.tcb.id, read, target);
       }
       return result;
-    } else if (ast instanceof ImplicitReceiver3) {
+    } else if (ast instanceof ImplicitReceiver3 || ast instanceof ThisReceiver3) {
       return ts64.factory.createThis();
     } else if (ast instanceof BindingPipe) {
       const expr = this.translate(ast.exp);
@@ -14617,7 +14649,7 @@ var TcbExpressionTranslator = class {
       addParseSpanInfo(result, ast.sourceSpan);
       return result;
     } else if ((ast instanceof Call3 || ast instanceof SafeCall2) && (ast.receiver instanceof PropertyRead4 || ast.receiver instanceof SafePropertyRead3)) {
-      if (ast.receiver.receiver instanceof ImplicitReceiver3 && !(ast.receiver.receiver instanceof ThisReceiver2) && ast.receiver.name === "$any" && ast.args.length === 1) {
+      if (ast.receiver.receiver instanceof ImplicitReceiver3 && ast.receiver.name === "$any" && ast.args.length === 1) {
         const expr = this.translate(ast.args[0]);
         const exprAsAny = ts64.factory.createAsExpression(expr, ts64.factory.createKeywordTypeNode(ts64.SyntaxKind.AnyKeyword));
         const result = ts64.factory.createParenthesizedExpression(exprAsAny);
@@ -15018,33 +15050,53 @@ var TcbSwitchOp = class extends TcbOp {
   }
   execute() {
     const switchExpression = tcbExpression(this.block.expression, this.tcb, this.scope);
-    const clauses = this.block.cases.map((current) => {
+    const clauses = this.block.groups.flatMap((current) => {
       const checkBody = this.tcb.env.config.checkControlFlowBodies;
       const clauseScope = this.scope.createChildScope(this.scope, null, checkBody ? current.children : [], checkBody ? this.generateGuard(current, switchExpression) : null);
       const statements = [...clauseScope.render(), ts70.factory.createBreakStatement()];
-      return current.expression === null ? ts70.factory.createDefaultClause(statements) : ts70.factory.createCaseClause(tcbExpression(current.expression, this.tcb, clauseScope), statements);
+      return current.cases.map((switchCase, index) => {
+        const statementsForCase = index === current.cases.length - 1 ? statements : [];
+        return switchCase.expression === null ? ts70.factory.createDefaultClause(statementsForCase) : ts70.factory.createCaseClause(tcbExpression(switchCase.expression, this.tcb, this.scope), statementsForCase);
+      });
     });
     this.scope.addStatement(ts70.factory.createSwitchStatement(switchExpression, ts70.factory.createCaseBlock(clauses)));
     return null;
   }
-  generateGuard(node, switchValue) {
-    if (node.expression !== null) {
-      const expression = tcbExpression(node.expression, this.tcb, this.scope);
-      markIgnoreDiagnostics(expression);
-      return ts70.factory.createBinaryExpression(switchValue, ts70.SyntaxKind.EqualsEqualsEqualsToken, expression);
+  generateGuard(group, switchValue) {
+    const hasDefault = group.cases.some((c) => c.expression === null);
+    if (!hasDefault) {
+      let guard2 = null;
+      for (const switchCase of group.cases) {
+        if (switchCase.expression !== null) {
+          const expression = tcbExpression(switchCase.expression, this.tcb, this.scope);
+          markIgnoreDiagnostics(expression);
+          const comparison = ts70.factory.createBinaryExpression(switchValue, ts70.SyntaxKind.EqualsEqualsEqualsToken, expression);
+          if (guard2 === null) {
+            guard2 = comparison;
+          } else {
+            guard2 = ts70.factory.createBinaryExpression(guard2, ts70.SyntaxKind.BarBarToken, comparison);
+          }
+        }
+      }
+      return guard2;
     }
     let guard = null;
-    for (const current of this.block.cases) {
-      if (current.expression === null) {
+    for (const currentGroup of this.block.groups) {
+      if (currentGroup === group) {
         continue;
       }
-      const expression = tcbExpression(current.expression, this.tcb, this.scope);
-      markIgnoreDiagnostics(expression);
-      const comparison = ts70.factory.createBinaryExpression(switchValue, ts70.SyntaxKind.ExclamationEqualsEqualsToken, expression);
-      if (guard === null) {
-        guard = comparison;
-      } else {
-        guard = ts70.factory.createBinaryExpression(guard, ts70.SyntaxKind.AmpersandAmpersandToken, comparison);
+      for (const switchCase of currentGroup.cases) {
+        if (switchCase.expression === null) {
+          continue;
+        }
+        const expression = tcbExpression(switchCase.expression, this.tcb, this.scope);
+        markIgnoreDiagnostics(expression);
+        const comparison = ts70.factory.createBinaryExpression(switchValue, ts70.SyntaxKind.ExclamationEqualsEqualsToken, expression);
+        if (guard === null) {
+          guard = comparison;
+        } else {
+          guard = ts70.factory.createBinaryExpression(guard, ts70.SyntaxKind.AmpersandAmpersandToken, comparison);
+        }
       }
     }
     return guard;
@@ -15052,7 +15104,7 @@ var TcbSwitchOp = class extends TcbOp {
 };
 
 // packages/compiler-cli/src/ngtsc/typecheck/src/ops/for_block.js
-import { ImplicitReceiver as ImplicitReceiver4, PropertyRead as PropertyRead5, TmplAstVariable } from "@angular/compiler";
+import { ImplicitReceiver as ImplicitReceiver4, PropertyRead as PropertyRead5, ThisReceiver as ThisReceiver4, TmplAstVariable } from "@angular/compiler";
 import ts71 from "typescript";
 var TcbForOfOp = class extends TcbOp {
   tcb;
@@ -15100,7 +15152,7 @@ var TcbForLoopTrackTranslator = class extends TcbExpressionTranslator {
     }
   }
   resolve(ast) {
-    if (ast instanceof PropertyRead5 && ast.receiver instanceof ImplicitReceiver4) {
+    if (ast instanceof PropertyRead5 && (ast.receiver instanceof ImplicitReceiver4 || ast.receiver instanceof ThisReceiver4)) {
       const target = this.tcb.boundTarget.getExpressionTarget(ast);
       if (target !== null && (!(target instanceof TmplAstVariable) || !this.allowedVariables.has(target))) {
         this.tcb.oobRecorder.illegalForLoopTrackAccess(this.tcb.id, this.block, ast);
@@ -15149,10 +15201,13 @@ var formControlInputFields = [
   // Should be kept in sync with the `FormUiControl` bindings,
   // defined in `packages/forms/signals/src/api/control.ts`.
   "errors",
-  "invalid",
+  "dirty",
   "disabled",
   "disabledReasons",
+  "hidden",
+  "invalid",
   "name",
+  "pending",
   "readonly",
   "touched",
   "max",
@@ -15200,7 +15255,7 @@ var TcbNativeFieldOp = class extends TcbOp {
   }
   execute() {
     const inputs = this.node instanceof TmplAstHostElement2 ? this.node.bindings : this.node.inputs;
-    const fieldBinding = inputs.find((input) => input.type === BindingType3.Property && input.name === "field") ?? null;
+    const fieldBinding = inputs.find((input) => input.type === BindingType3.Property && input.name === "formField") ?? null;
     if (fieldBinding === null) {
       return null;
     }
@@ -15279,17 +15334,17 @@ var TcbNativeRadioButtonFieldOp = class extends TcbNativeFieldOp {
     return null;
   }
 };
-function expandBoundAttributesForField(directive, node, customFieldType) {
-  const fieldBinding = node.inputs.find((input) => input.type === BindingType3.Property && input.name === "field");
+function expandBoundAttributesForField(directive, node, customFormControlType) {
+  const fieldBinding = node.inputs.find((input) => input.type === BindingType3.Property && input.name === "formField");
   if (!fieldBinding) {
     return null;
   }
   let boundInputs = null;
   let primaryInput;
-  if (customFieldType === "value") {
-    primaryInput = getSyntheticFieldBoundInput(directive, "value", "value", fieldBinding, customFieldType);
-  } else if (customFieldType === "checkbox") {
-    primaryInput = getSyntheticFieldBoundInput(directive, "checked", "value", fieldBinding, customFieldType);
+  if (customFormControlType === "value") {
+    primaryInput = getSyntheticFieldBoundInput(directive, "value", "value", fieldBinding, customFormControlType);
+  } else if (customFormControlType === "checkbox") {
+    primaryInput = getSyntheticFieldBoundInput(directive, "checked", "value", fieldBinding, customFormControlType);
   } else {
     primaryInput = null;
   }
@@ -15298,7 +15353,7 @@ function expandBoundAttributesForField(directive, node, customFieldType) {
     boundInputs.push(primaryInput);
   }
   for (const name of formControlInputFields) {
-    const input = getSyntheticFieldBoundInput(directive, name, name, fieldBinding, customFieldType);
+    const input = getSyntheticFieldBoundInput(directive, name, name, fieldBinding, customFormControlType);
     if (input !== null) {
       boundInputs ??= [];
       boundInputs.push(input);
@@ -15307,7 +15362,7 @@ function expandBoundAttributesForField(directive, node, customFieldType) {
   return boundInputs;
 }
 function isFieldDirective(meta) {
-  if (meta.name !== "Field") {
+  if (meta.name !== "FormField") {
     return false;
   }
   if (meta.ref.bestGuessOwningModule?.specifier === "@angular/forms/signals") {
@@ -15390,7 +15445,19 @@ function extractFieldValue(expression, tcb, scope) {
   return ts73.factory.createCallExpression(ts73.factory.createPropertyAccessExpression(innerCall, "value"), void 0, void 0);
 }
 function hasModelInput(name, meta) {
-  return !!meta.inputs.getByBindingPropertyName(name)?.some((v) => v.isSignal) && meta.outputs.hasBindingPropertyName(name + "Change");
+  return meta.inputs.hasBindingPropertyName(name) && meta.outputs.hasBindingPropertyName(name + "Change");
+}
+function isFormControl(allDirectiveMatches) {
+  let result = false;
+  for (const match of allDirectiveMatches) {
+    if (match.inputs.hasBindingPropertyName("formField")) {
+      if (!isFieldDirective(match)) {
+        return false;
+      }
+      result = true;
+    }
+  }
+  return result;
 }
 
 // packages/compiler-cli/src/ngtsc/typecheck/src/ops/bindings.js
@@ -15478,14 +15545,16 @@ var TcbDirectiveInputsOp = class extends TcbOp {
   scope;
   node;
   dir;
-  customControlType;
-  constructor(tcb, scope, node, dir, customControlType) {
+  isFormControl;
+  customFormControlType;
+  constructor(tcb, scope, node, dir, isFormControl2 = false, customFormControlType) {
     super();
     this.tcb = tcb;
     this.scope = scope;
     this.node = node;
     this.dir = dir;
-    this.customControlType = customControlType;
+    this.isFormControl = isFormControl2;
+    this.customFormControlType = customFormControlType;
   }
   get optional() {
     return false;
@@ -15494,9 +15563,11 @@ var TcbDirectiveInputsOp = class extends TcbOp {
     let dirId = null;
     const seenRequiredInputs = /* @__PURE__ */ new Set();
     const boundAttrs = getBoundAttributes(this.dir, this.node);
-    if (this.customControlType !== null) {
+    if (this.customFormControlType !== null) {
       checkUnsupportedFieldBindings(this.node, customFormControlBannedInputFields, this.tcb);
-      const additionalBindings = expandBoundAttributesForField(this.dir, this.node, this.customControlType);
+    }
+    if (this.customFormControlType !== null || this.isFormControl) {
+      const additionalBindings = expandBoundAttributesForField(this.dir, this.node, this.customFormControlType);
       if (additionalBindings !== null) {
         boundAttrs.push(...additionalBindings);
       }
@@ -15698,7 +15769,7 @@ var TcbDomSchemaCheckerOp = class extends TcbOp {
 };
 
 // packages/compiler-cli/src/ngtsc/typecheck/src/ops/events.js
-import { ImplicitReceiver as ImplicitReceiver5, ParsedEventType as ParsedEventType2, PropertyRead as PropertyRead7, ThisReceiver as ThisReceiver3, TmplAstElement as TmplAstElement6 } from "@angular/compiler";
+import { ImplicitReceiver as ImplicitReceiver5, ParsedEventType as ParsedEventType2, PropertyRead as PropertyRead7, TmplAstElement as TmplAstElement6 } from "@angular/compiler";
 import ts76 from "typescript";
 var EVENT_PARAMETER = "$event";
 function tcbEventHandlerExpression(ast, tcb, scope) {
@@ -15858,7 +15929,7 @@ var TcbUnclaimedOutputsOp = class extends TcbOp {
 };
 var TcbEventHandlerTranslator = class extends TcbExpressionTranslator {
   resolve(ast) {
-    if (ast instanceof PropertyRead7 && ast.receiver instanceof ImplicitReceiver5 && !(ast.receiver instanceof ThisReceiver3) && ast.name === EVENT_PARAMETER) {
+    if (ast instanceof PropertyRead7 && ast.receiver instanceof ImplicitReceiver5 && ast.name === EVENT_PARAMETER) {
       const event = ts76.factory.createIdentifier(EVENT_PARAMETER);
       addParseSpanInfo(event, ast.nameSpan);
       return event;
@@ -15999,14 +16070,14 @@ var TcbDirectiveCtorOp = class extends TcbOp {
   scope;
   node;
   dir;
-  customControlType;
-  constructor(tcb, scope, node, dir, customControlType) {
+  customFormControlType;
+  constructor(tcb, scope, node, dir, customFormControlType) {
     super();
     this.tcb = tcb;
     this.scope = scope;
     this.node = node;
     this.dir = dir;
-    this.customControlType = customControlType;
+    this.customFormControlType = customFormControlType;
   }
   get optional() {
     return true;
@@ -16022,8 +16093,8 @@ var TcbDirectiveCtorOp = class extends TcbOp {
     } else {
       span = this.node.startSourceSpan || this.node.sourceSpan;
       boundAttrs = getBoundAttributes(this.dir, this.node);
-      if (this.customControlType !== null) {
-        const additionalBindings = expandBoundAttributesForField(this.dir, this.node, this.customControlType);
+      if (this.customFormControlType !== null) {
+        const additionalBindings = expandBoundAttributesForField(this.dir, this.node, this.customFormControlType);
         if (additionalBindings !== null) {
           boundAttrs.push(...additionalBindings);
         }
@@ -16171,7 +16242,7 @@ var TcbControlFlowContentProjectionOp = class extends TcbOp {
           }
         }
       } else if (child instanceof TmplAstSwitchBlock) {
-        for (const current of child.cases) {
+        for (const current of child.groups) {
           if (this.shouldCheck(current)) {
             result.push(current);
           }
@@ -16720,15 +16791,16 @@ var Scope = class _Scope {
     }
   }
   appendDirectiveInputs(dir, node, dirMap, allDirectiveMatches) {
-    const customFieldType = allDirectiveMatches.some(isFieldDirective) ? getCustomFieldDirectiveType(dir) : null;
-    const directiveOp = this.getDirectiveOp(dir, node, customFieldType);
+    const nodeIsFormControl = isFormControl(allDirectiveMatches);
+    const customFormControlType = nodeIsFormControl ? getCustomFieldDirectiveType(dir) : null;
+    const directiveOp = this.getDirectiveOp(dir, node, customFormControlType);
     const dirIndex = this.opQueue.push(directiveOp) - 1;
     dirMap.set(dir, dirIndex);
     if (isNativeField(dir, node, allDirectiveMatches)) {
       const inputType = node.name === "input" && node.attributes.find((attr) => attr.name === "type")?.value || null;
       this.opQueue.push(inputType === "radio" ? new TcbNativeRadioButtonFieldOp(this.tcb, this, node) : new TcbNativeFieldOp(this.tcb, this, node, inputType));
     }
-    this.opQueue.push(new TcbDirectiveInputsOp(this.tcb, this, node, dir, customFieldType));
+    this.opQueue.push(new TcbDirectiveInputsOp(this.tcb, this, node, dir, nodeIsFormControl, customFormControlType));
   }
   getDirectiveOp(dir, node, customFieldType) {
     const dirRef = dir.ref;
@@ -20482,8 +20554,12 @@ function validateAndFlattenComponentImports(imports, expr, isDeferred) {
   const diagnostics = [];
   for (let i = 0; i < imports.length; i++) {
     const ref = imports[i];
+    let refExpr = expr;
+    if (ts90.isArrayLiteralExpression(expr) && expr.elements.length === imports.length && !expr.elements.some(ts90.isSpreadAssignment)) {
+      refExpr = expr.elements[i];
+    }
     if (Array.isArray(ref)) {
-      const { imports: childImports, diagnostics: childDiagnostics } = validateAndFlattenComponentImports(ref, expr, isDeferred);
+      const { imports: childImports, diagnostics: childDiagnostics } = validateAndFlattenComponentImports(ref, refExpr, isDeferred);
       flattened.push(...childImports);
       diagnostics.push(...childDiagnostics);
     } else if (ref instanceof Reference) {
@@ -20501,11 +20577,11 @@ function validateAndFlattenComponentImports(imports, expr, isDeferred) {
     } else {
       let diagnosticNode;
       let diagnosticValue;
-      if (ref instanceof DynamicValue) {
+      if (ref instanceof DynamicValue && isWithinExpression(ref.node, expr)) {
         diagnosticNode = ref.node;
         diagnosticValue = ref;
-      } else if (ts90.isArrayLiteralExpression(expr) && expr.elements.length === imports.length && !expr.elements.some(ts90.isSpreadAssignment) && !imports.some(Array.isArray)) {
-        diagnosticNode = expr.elements[i];
+      } else if (refExpr !== expr) {
+        diagnosticNode = refExpr;
         diagnosticValue = ref;
       } else {
         diagnosticNode = expr;
@@ -20516,6 +20592,16 @@ function validateAndFlattenComponentImports(imports, expr, isDeferred) {
   }
   return { imports: flattened, diagnostics };
 }
+function isWithinExpression(node, expr) {
+  let current = node;
+  while (current !== void 0) {
+    if (current === expr) {
+      return true;
+    }
+    current = current.parent;
+  }
+  return false;
+}
 function isLikelyModuleWithProviders(value) {
   if (value instanceof SyntheticValue && isResolvedModuleWithProviders(value)) {
     return true;
@@ -22918,6 +23004,7 @@ export {
   makeDiagnostic,
   isFatalDiagnosticError,
   isLocalCompilationDiagnostics,
+  DOC_PAGE_BASE_URL,
   ERROR_DETAILS_PAGE_BASE_URL,
   ExtendedTemplateDiagnosticName,
   isDtsPath,