@angular/compiler-cli 21.0.6 → 21.0.7

package/bundles/{chunk-6VDGFZBQ.js → chunk-IVLAY5II.js}

@@ -87,7 +87,7 @@ import {
   toUnredirectedSourceFile,
   tryParseInitializerApi,
   untagAllTsFiles
-} from "./chunk-PUEBQK4X.js";
+} from "./chunk-ULL25HYK.js";
 import {
   LogicalFileSystem,
   absoluteFromSourceFile,
@@ -622,12 +622,15 @@ var DirectiveExtractor = class extends ClassExtractor {
   }
   /** Extract docs info for directives and components (including underlying class info). */
   extract() {
+    const selector = this.metadata.selector ?? "";
+    const aliases = extractAliasesFromSelector(selector);
     return {
       ...super.extract(),
       isStandalone: this.metadata.isStandalone,
-      selector: this.metadata.selector ?? "",
+      selector,
       exportAs: this.metadata.exportAs ?? [],
-      entryType: this.metadata.isComponent ? EntryType.Component : EntryType.Directive
+      entryType: this.metadata.isComponent ? EntryType.Component : EntryType.Directive,
+      ...aliases.length > 0 && { aliases }
     };
   }
   /** Extracts docs info for a directive property, including input/output metadata. */
@@ -717,6 +720,21 @@ function extractPipeSyntax(metadata, classDeclaration) {
   });
   return `{{ value_expression | ${metadata.name}${paramNames.length ? ":" + paramNames.join(":") : ""} }}`;
 }
+function extractAliasesFromSelector(selector) {
+  if (!selector) {
+    return [];
+  }
+  const aliases = [];
+  const attributeRegex = /\[([^\]=]+)(?:=[^\]]+)?\]/g;
+  let match;
+  while ((match = attributeRegex.exec(selector)) !== null) {
+    const attributeName = match[1].trim();
+    if (attributeName) {
+      aliases.push(attributeName);
+    }
+  }
+  return aliases;
+}
 
 // packages/compiler-cli/src/ngtsc/docs/src/constant_extractor.js
 import ts7 from "typescript";
@@ -1204,7 +1222,7 @@ var DocsExtractor = class {
       if (isAngularPrivateName(exportName)) {
         continue;
       }
-      const entry = this.extractDeclarations(exportName, declarations);
+      const entry = this.extractDeclarations(declarations);
       if (entry && !isIgnoredDocEntry(entry)) {
         const realSourceFile = declarations[0].getSourceFile();
         const importedSymbols = getImportedSymbols(realSourceFile);
@@ -1233,7 +1251,7 @@ var DocsExtractor = class {
    * the same name. This is used to combine entries, e.g. for a type and a namespace that are
    * exported under the same name.
    */
-  extractDeclarations(exportName, nodes) {
+  extractDeclarations(nodes) {
     const entries = nodes.map((node) => this.extractDeclaration(node));
     const decorator = entries.find((e) => e?.entryType === EntryType.Decorator);
     if (decorator) {
@@ -2138,7 +2156,7 @@ var IndexingContext = class {
 import { ParseSourceFile } from "@angular/compiler";
 
 // packages/compiler-cli/src/ngtsc/indexer/src/template.js
-import { ASTWithSource, CombinedRecursiveAstVisitor, ImplicitReceiver, PropertyRead, TmplAstComponent, TmplAstDirective, TmplAstElement, TmplAstReference, TmplAstTemplate, TmplAstVariable, tmplAstVisitAll } from "@angular/compiler";
+import { ASTWithSource, CombinedRecursiveAstVisitor, ImplicitReceiver, PropertyRead, ThisReceiver, TmplAstComponent, TmplAstDirective, TmplAstElement, TmplAstReference, TmplAstTemplate, TmplAstVariable, tmplAstVisitAll } from "@angular/compiler";
 var TemplateVisitor = class extends CombinedRecursiveAstVisitor {
   boundTemplate;
   // Identifiers of interest found in the template.
@@ -2368,7 +2386,7 @@ var TemplateVisitor = class extends CombinedRecursiveAstVisitor {
     if (this.currentAstWithSource === null || this.currentAstWithSource.source === null) {
       return;
     }
-    if (!(ast.receiver instanceof ImplicitReceiver)) {
+    if (!(ast.receiver instanceof ImplicitReceiver) && !(ast.receiver instanceof ThisReceiver)) {
       return;
     }
     const { absoluteOffset, source: expressionStr } = this.currentAstWithSource;
@@ -3664,7 +3682,7 @@ var SUPPORTED_DIAGNOSTIC_NAMES = /* @__PURE__ */ new Set([
 ]);
 
 // packages/compiler-cli/src/ngtsc/typecheck/template_semantics/src/template_semantics_checker.js
-import { ASTWithSource as ASTWithSource5, ImplicitReceiver as ImplicitReceiver2, ParsedEventType as ParsedEventType2, PropertyRead as PropertyRead6, Binary as Binary3, RecursiveAstVisitor, TmplAstBoundEvent as TmplAstBoundEvent3, TmplAstLetDeclaration as TmplAstLetDeclaration2, TmplAstRecursiveVisitor, TmplAstVariable as TmplAstVariable2 } from "@angular/compiler";
+import { ASTWithSource as ASTWithSource5, ImplicitReceiver as ImplicitReceiver2, ParsedEventType as ParsedEventType2, PropertyRead as PropertyRead6, Binary as Binary3, RecursiveAstVisitor, TmplAstBoundEvent as TmplAstBoundEvent3, TmplAstLetDeclaration as TmplAstLetDeclaration2, TmplAstRecursiveVisitor, TmplAstVariable as TmplAstVariable2, ThisReceiver as ThisReceiver2 } from "@angular/compiler";
 import ts23 from "typescript";
 var TemplateSemanticsCheckerImpl = class {
   templateTypeChecker;
@@ -3716,7 +3734,7 @@ var ExpressionsSemanticsVisitor = class extends RecursiveAstVisitor {
     this.checkForIllegalWriteInTwoWayBinding(ast, context);
   }
   checkForIllegalWriteInEventBinding(ast, context) {
-    if (!(context instanceof TmplAstBoundEvent3) || !(ast.receiver instanceof ImplicitReceiver2)) {
+    if (!this.shouldCheckForIllegalWrites(ast, context)) {
       return;
     }
     const target = this.templateTypeChecker.getExpressionTarget(ast, this.component);
@@ -3726,7 +3744,7 @@ var ExpressionsSemanticsVisitor = class extends RecursiveAstVisitor {
     }
   }
   checkForIllegalWriteInTwoWayBinding(ast, context) {
-    if (!(context instanceof TmplAstBoundEvent3) || context.type !== ParsedEventType2.TwoWay || !(ast.receiver instanceof ImplicitReceiver2) || ast !== unwrapAstWithSource(context.handler)) {
+    if (!this.shouldCheckForIllegalWrites(ast, context) || context.type !== ParsedEventType2.TwoWay || ast !== unwrapAstWithSource(context.handler)) {
       return;
     }
     const target = this.templateTypeChecker.getExpressionTarget(ast, this.component);
@@ -3757,6 +3775,9 @@ var ExpressionsSemanticsVisitor = class extends RecursiveAstVisitor {
       }
     ]);
   }
+  shouldCheckForIllegalWrites(ast, context) {
+    return context instanceof TmplAstBoundEvent3 && (ast.receiver instanceof ImplicitReceiver2 || ast.receiver instanceof ThisReceiver2);
+  }
 };
 function unwrapAstWithSource(ast) {
   return ast instanceof ASTWithSource5 ? ast.ast : ast;

package/bundles/{chunk-OPZT26MK.js → chunk-OQOYWATZ.js}

@@ -12,7 +12,7 @@ import {
   formatDiagnostics,
   performCompilation,
   readConfiguration
-} from "./chunk-ML6J2RBK.js";
+} from "./chunk-SGVDYEOA.js";
 
 // packages/compiler-cli/src/main.js
 import ts2 from "typescript";

package/bundles/{chunk-ML6J2RBK.js → chunk-SGVDYEOA.js}

@@ -8,7 +8,7 @@ import {
   TrackedIncrementalBuildStrategy,
   freshCompilationTicket,
   incrementalFromCompilerTicket
-} from "./chunk-6VDGFZBQ.js";
+} from "./chunk-IVLAY5II.js";
 import {
   ActivePerfRecorder,
   OptimizeFor,
@@ -18,7 +18,7 @@ import {
   TsCreateProgramDriver,
   replaceTsWithNgInErrors,
   retagAllTsFiles
-} from "./chunk-PUEBQK4X.js";
+} from "./chunk-ULL25HYK.js";
 import {
   absoluteFrom,
   createFileSystemTsReadDirectoryFn,

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

@@ -4434,12 +4434,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);
@@ -9595,7 +9596,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 +11599,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 +11678,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 +13083,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 +13181,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 +13199,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])) {
@@ -14125,7 +14126,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
@@ -14560,7 +14561,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 +14571,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 +14586,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 +14618,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);
@@ -15052,7 +15053,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 +15101,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 +15150,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 +15204,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 === "field" || input.name === "formField")) ?? null;
     if (fieldBinding === null) {
       return null;
     }
@@ -15279,17 +15283,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 === "field" || 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 +15302,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 +15311,7 @@ function expandBoundAttributesForField(directive, node, customFieldType) {
   return boundInputs;
 }
 function isFieldDirective(meta) {
-  if (meta.name !== "Field") {
+  if (meta.name !== "Field" && meta.name !== "FormField") {
     return false;
   }
   if (meta.ref.bestGuessOwningModule?.specifier === "@angular/forms/signals") {
@@ -15390,7 +15394,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("field")) {
+      if (!isFieldDirective(match)) {
+        return false;
+      }
+      result = true;
+    }
+  }
+  return result;
 }
 
 // packages/compiler-cli/src/ngtsc/typecheck/src/ops/bindings.js
@@ -15478,14 +15494,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 +15512,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 +15718,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 +15878,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 +16019,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 +16042,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);
         }
@@ -16720,15 +16740,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 +20503,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 +20526,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 +20541,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;

package/bundles/chunk-ZJZNLTWN.js

@@ -455,7 +455,7 @@ import { compileDirectiveFromMetadata, makeBindingParser, ParseLocation, ParseSo
 // packages/compiler-cli/linker/src/file_linker/partial_linkers/util.js
 import { createMayBeForwardRefExpression, outputAst as o2 } from "@angular/compiler";
 import semver from "semver";
-var PLACEHOLDER_VERSION = "21.0.6";
+var PLACEHOLDER_VERSION = "21.0.7";
 function wrapReference(wrapped) {
   return { value: wrapped, type: wrapped };
 }

package/bundles/index.js

@@ -17,7 +17,7 @@ import {
   isTsDiagnostic,
   performCompilation,
   readConfiguration
-} from "./chunk-ML6J2RBK.js";
+} from "./chunk-SGVDYEOA.js";
 import {
   ConsoleLogger,
   LogLevel
@@ -34,7 +34,7 @@ import {
   freshCompilationTicket,
   incrementalFromStateTicket,
   isDocEntryWithSourceInfo
-} from "./chunk-6VDGFZBQ.js";
+} from "./chunk-IVLAY5II.js";
 import {
   ActivePerfRecorder,
   ErrorCode,
@@ -46,7 +46,7 @@ import {
   getInitializerApiJitTransform,
   isLocalCompilationDiagnostics,
   ngErrorCode
-} from "./chunk-PUEBQK4X.js";
+} from "./chunk-ULL25HYK.js";
 import "./chunk-LS5RJ5CS.js";
 import {
   InvalidFileSystem,
@@ -77,7 +77,7 @@ import "./chunk-G7GFT6BU.js";
 
 // packages/compiler-cli/src/version.js
 import { Version } from "@angular/compiler";
-var VERSION = new Version("21.0.6");
+var VERSION = new Version("21.0.7");
 
 // packages/compiler-cli/private/tooling.js
 var GLOBAL_DEFS_FOR_TERSER = {

package/bundles/private/migrations.js

@@ -5,7 +5,7 @@
 import {
   DiagnosticCategoryLabel,
   NgCompiler
-} from "../chunk-6VDGFZBQ.js";
+} from "../chunk-IVLAY5II.js";
 import {
   CompilationMode,
   DtsMetadataReader,
@@ -32,7 +32,7 @@ import {
   queryDecoratorNames,
   reflectObjectLiteral,
   unwrapExpression
-} from "../chunk-PUEBQK4X.js";
+} from "../chunk-ULL25HYK.js";
 import "../chunk-LS5RJ5CS.js";
 import {
   getFileSystem,

package/bundles/private/testing.js

@@ -6,7 +6,7 @@ import {
   ImportedSymbolsTracker,
   TypeScriptReflectionHost,
   getInitializerApiJitTransform
-} from "../chunk-PUEBQK4X.js";
+} from "../chunk-ULL25HYK.js";
 import "../chunk-LS5RJ5CS.js";
 import {
   InvalidFileSystem,

package/bundles/private/tooling.js

@@ -4,7 +4,7 @@
     
 import {
   angularJitApplicationTransform
-} from "../chunk-PUEBQK4X.js";
+} from "../chunk-ULL25HYK.js";
 import "../chunk-LS5RJ5CS.js";
 import "../chunk-JEXAXD23.js";
 import "../chunk-XYYEESKY.js";

package/bundles/src/bin/ng_xi18n.js

@@ -6,12 +6,12 @@
 import {
   main,
   readCommandLineAndConfiguration
-} from "../../chunk-OPZT26MK.js";
+} from "../../chunk-OQOYWATZ.js";
 import {
   EmitFlags
-} from "../../chunk-ML6J2RBK.js";
-import "../../chunk-6VDGFZBQ.js";
-import "../../chunk-PUEBQK4X.js";
+} from "../../chunk-SGVDYEOA.js";
+import "../../chunk-IVLAY5II.js";
+import "../../chunk-ULL25HYK.js";
 import "../../chunk-LS5RJ5CS.js";
 import {
   setFileSystem

package/bundles/src/bin/ngc.js

@@ -5,10 +5,10 @@
     
 import {
   main
-} from "../../chunk-OPZT26MK.js";
-import "../../chunk-ML6J2RBK.js";
-import "../../chunk-6VDGFZBQ.js";
-import "../../chunk-PUEBQK4X.js";
+} from "../../chunk-OQOYWATZ.js";
+import "../../chunk-SGVDYEOA.js";
+import "../../chunk-IVLAY5II.js";
+import "../../chunk-ULL25HYK.js";
 import "../../chunk-LS5RJ5CS.js";
 import {
   setFileSystem

package/linker/src/file_linker/partial_linkers/util.d.ts

@@ -7,7 +7,7 @@
  */
 import { MaybeForwardRefExpression, outputAst as o, R3DeclareDependencyMetadata, R3DependencyMetadata, R3Reference } from '@angular/compiler';
 import { AstObject, AstValue } from '../../ast/ast_value';
-export declare const PLACEHOLDER_VERSION = "21.0.6";
+export declare const PLACEHOLDER_VERSION = "21.0.7";
 export declare function wrapReference<TExpression>(wrapped: o.WrappedNodeExpr<TExpression>): R3Reference;
 /**
  * Parses the value of an enum from the AST value's symbol name.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/compiler-cli",
-  "version": "21.0.6",
+  "version": "21.0.7",
   "description": "Angular - the compiler CLI for Node.js",
   "typings": "index.d.ts",
   "bin": {
@@ -40,7 +40,7 @@
     "yargs": "^18.0.0"
   },
   "peerDependencies": {
-    "@angular/compiler": "21.0.6",
+    "@angular/compiler": "21.0.7",
     "typescript": ">=5.9 <6.0"
   },
   "peerDependenciesMeta": {

package/src/ngtsc/typecheck/src/ops/directive_constructor.d.ts

@@ -11,7 +11,7 @@ import { TcbOp } from './base';
 import { Context } from './context';
 import type { Scope } from './scope';
 import { TypeCheckableDirectiveMeta } from '../../api';
-import { CustomFieldType } from './signal_forms';
+import { CustomFormControlType } from './signal_forms';
 /**
  * A `TcbOp` which constructs an instance of a directive with types inferred from its inputs. The
  * inputs themselves are not checked here; checking of inputs is achieved in `TcbDirectiveInputsOp`.
@@ -29,8 +29,8 @@ export declare class TcbDirectiveCtorOp extends TcbOp {
     private scope;
     private node;
     private dir;
-    private customControlType;
-    constructor(tcb: Context, scope: Scope, node: DirectiveOwner, dir: TypeCheckableDirectiveMeta, customControlType: CustomFieldType | null);
+    private customFormControlType;
+    constructor(tcb: Context, scope: Scope, node: DirectiveOwner, dir: TypeCheckableDirectiveMeta, customFormControlType: CustomFormControlType | null);
     get optional(): boolean;
     execute(): ts.Identifier;
     circularFallback(): TcbOp;

package/src/ngtsc/typecheck/src/ops/inputs.d.ts

@@ -11,7 +11,7 @@ import type { Context } from './context';
 import type { Scope } from './scope';
 import { TypeCheckableDirectiveMeta } from '../../api';
 import { TcbOp } from './base';
-import { CustomFieldType } from './signal_forms';
+import { CustomFormControlType } from './signal_forms';
 import { LocalSymbol } from './references';
 /**
  * Translates the given attribute binding to a `ts.Expression`.
@@ -28,8 +28,9 @@ export declare class TcbDirectiveInputsOp extends TcbOp {
     private scope;
     private node;
     private dir;
-    private customControlType;
-    constructor(tcb: Context, scope: Scope, node: TmplAstTemplate | TmplAstElement | TmplAstComponent | TmplAstDirective, dir: TypeCheckableDirectiveMeta, customControlType: CustomFieldType | null);
+    private isFormControl;
+    private customFormControlType;
+    constructor(tcb: Context, scope: Scope, node: TmplAstTemplate | TmplAstElement | TmplAstComponent | TmplAstDirective, dir: TypeCheckableDirectiveMeta, isFormControl: boolean | undefined, customFormControlType: CustomFormControlType | null);
     get optional(): boolean;
     execute(): null;
     private checkRequiredInputs;

package/src/ngtsc/typecheck/src/ops/signal_forms.d.ts

@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import { DirectiveOwner, TmplAstComponent, TmplAstDirective, TmplAstElement, TmplAstNode, TmplAstTemplate } from '@angular/compiler';
+import { TypeCheckableDirectiveMeta } from '../../api';
 import { TcbOp } from './base';
+import { TcbBoundAttribute } from './bindings';
 import type { Context } from './context';
 import type { Scope } from './scope';
-import { TypeCheckableDirectiveMeta } from '../../api';
-import { TcbBoundAttribute } from './bindings';
-/** Possible types of custom field directives. */
-export type CustomFieldType = 'value' | 'checkbox';
+/** Possible types of custom form control directives. */
+export type CustomFormControlType = 'value' | 'checkbox';
 /** Names of input fields to which users aren't allowed to bind when using a `field` directive. */
 export declare const customFormControlBannedInputFields: Set<string>;
 /**
@@ -39,13 +39,20 @@ export declare class TcbNativeRadioButtonFieldOp extends TcbNativeFieldOp {
     execute(): null;
 }
 /** Expands the set of bound inputs with the ones from custom field directives. */
-export declare function expandBoundAttributesForField(directive: TypeCheckableDirectiveMeta, node: TmplAstTemplate | TmplAstElement | TmplAstComponent | TmplAstDirective, customFieldType: CustomFieldType): TcbBoundAttribute[] | null;
+export declare function expandBoundAttributesForField(directive: TypeCheckableDirectiveMeta, node: TmplAstTemplate | TmplAstElement | TmplAstComponent | TmplAstDirective, customFormControlType: CustomFormControlType | null): TcbBoundAttribute[] | null;
 export declare function isFieldDirective(meta: TypeCheckableDirectiveMeta): boolean;
 /** Determines if a directive is a custom field and its type. */
-export declare function getCustomFieldDirectiveType(meta: TypeCheckableDirectiveMeta): CustomFieldType | null;
+export declare function getCustomFieldDirectiveType(meta: TypeCheckableDirectiveMeta): CustomFormControlType | null;
 /** Determines if a directive usage is on a native field. */
 export declare function isNativeField(dir: TypeCheckableDirectiveMeta, node: TmplAstNode, allDirectiveMatches: TypeCheckableDirectiveMeta[]): node is TmplAstElement & {
     name: 'input' | 'select' | 'textarea';
 };
 /** Checks whether a node has bindings that aren't supported on fields. */
 export declare function checkUnsupportedFieldBindings(node: DirectiveOwner, unsupportedBindingFields: Set<string>, tcb: Context): void;
+/**
+ * Determines whether a node is a form control based on its matching directives.
+ *
+ * A node is a form control if it has a matching `Field` directive, and no other directives match
+ * the `field` input.
+ */
+export declare function isFormControl(allDirectiveMatches: TypeCheckableDirectiveMeta[]): boolean;