From f4a5b42ebe66c7ec392b7447928049a6a2c8ce97 Mon Sep 17 00:00:00 2001 From: Leon Senft Date: Tue, 17 Mar 2026 11:39:44 -0700 Subject: [PATCH] refactor(forms): rename directive files for consistency (#67727) - **FormField**: `form_field_directive.ts` -> `form_field.ts` - **FormRoot**: `ng_signal_form.ts` -> `form_root.ts` PR Close #67727 --- packages/forms/signals/public_api.ts | 4 ++-- packages/forms/signals/src/api/control.ts | 2 +- .../signals/src/api/rules/validation/validation_errors.ts | 2 +- packages/forms/signals/src/api/types.ts | 2 +- packages/forms/signals/src/directive/control_custom.ts | 2 +- packages/forms/signals/src/directive/control_cva.ts | 2 +- packages/forms/signals/src/directive/control_native.ts | 2 +- .../src/directive/{form_field_directive.ts => form_field.ts} | 0 .../signals/src/directive/{ng_signal_form.ts => form_root.ts} | 0 packages/forms/signals/src/field/node.ts | 2 +- packages/forms/signals/src/field/state.ts | 2 +- .../test/node/{ng_signal_form.spec.ts => form_root.spec.ts} | 0 .../web/{form_field_directive.spec.ts => form_field.spec.ts} | 0 .../forms/signals/test/web/signal_form_control_web.spec.ts | 2 +- 14 files changed, 11 insertions(+), 11 deletions(-) rename packages/forms/signals/src/directive/{form_field_directive.ts => form_field.ts} (100%) rename packages/forms/signals/src/directive/{ng_signal_form.ts => form_root.ts} (100%) rename packages/forms/signals/test/node/{ng_signal_form.spec.ts => form_root.spec.ts} (100%) rename packages/forms/signals/test/web/{form_field_directive.spec.ts => form_field.spec.ts} (100%) diff --git a/packages/forms/signals/public_api.ts b/packages/forms/signals/public_api.ts index 6b5a578c02c..70607397555 100644 --- a/packages/forms/signals/public_api.ts +++ b/packages/forms/signals/public_api.ts @@ -20,5 +20,5 @@ export * from './src/api/rules/validation/validation_errors'; export * from './src/api/structure'; export * from './src/api/transformed_value'; export * from './src/api/types'; -export * from './src/directive/form_field_directive'; -export * from './src/directive/ng_signal_form'; +export * from './src/directive/form_field'; +export * from './src/directive/form_root'; diff --git a/packages/forms/signals/src/api/control.ts b/packages/forms/signals/src/api/control.ts index 22168fddf9d..4c30c8c4254 100644 --- a/packages/forms/signals/src/api/control.ts +++ b/packages/forms/signals/src/api/control.ts @@ -7,7 +7,7 @@ */ import {InputSignal, InputSignalWithTransform, ModelSignal, OutputRef} from '@angular/core'; -import type {FormFieldBindingOptions} from '../directive/form_field_directive'; +import type {FormFieldBindingOptions} from '../directive/form_field'; import type {ValidationError, WithOptionalFieldTree} from './rules/validation/validation_errors'; import type {DisabledReason} from './types'; diff --git a/packages/forms/signals/src/api/rules/validation/validation_errors.ts b/packages/forms/signals/src/api/rules/validation/validation_errors.ts index 0c1589239e1..834dbe51cb7 100644 --- a/packages/forms/signals/src/api/rules/validation/validation_errors.ts +++ b/packages/forms/signals/src/api/rules/validation/validation_errors.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import type {FormField} from '../../../directive/form_field_directive'; +import type {FormField} from '../../../directive/form_field'; import type {ReadonlyFieldTree} from '../../types'; import type {StandardSchemaValidationError} from './standard_schema'; diff --git a/packages/forms/signals/src/api/types.ts b/packages/forms/signals/src/api/types.ts index bc2b6b6d231..b624f350cb0 100644 --- a/packages/forms/signals/src/api/types.ts +++ b/packages/forms/signals/src/api/types.ts @@ -8,7 +8,7 @@ import {Injector, Signal, WritableSignal} from '@angular/core'; import {AbstractControl} from '@angular/forms'; -import type {FormField} from '../directive/form_field_directive'; +import type {FormField} from '../directive/form_field'; import type {MetadataKey, ValidationError} from './rules'; /** diff --git a/packages/forms/signals/src/directive/control_custom.ts b/packages/forms/signals/src/directive/control_custom.ts index 28a1b386c9a..d4767a61e7d 100644 --- a/packages/forms/signals/src/directive/control_custom.ts +++ b/packages/forms/signals/src/directive/control_custom.ts @@ -7,7 +7,7 @@ */ import type {ɵControlDirectiveHost as ControlDirectiveHost} from '@angular/core'; -import type {FormField} from './form_field_directive'; +import type {FormField} from './form_field'; import { bindingUpdated, CONTROL_BINDING_NAMES, diff --git a/packages/forms/signals/src/directive/control_cva.ts b/packages/forms/signals/src/directive/control_cva.ts index 67f46514d73..1103ff2fd2d 100644 --- a/packages/forms/signals/src/directive/control_cva.ts +++ b/packages/forms/signals/src/directive/control_cva.ts @@ -15,7 +15,7 @@ import { readFieldStateBindingValue, } from './bindings'; import {setNativeDomProperty} from './native'; -import type {FormField} from './form_field_directive'; +import type {FormField} from './form_field'; export function cvaControlCreate( host: ControlDirectiveHost, diff --git a/packages/forms/signals/src/directive/control_native.ts b/packages/forms/signals/src/directive/control_native.ts index 07be95d7fb2..d90537886b3 100644 --- a/packages/forms/signals/src/directive/control_native.ts +++ b/packages/forms/signals/src/directive/control_native.ts @@ -19,7 +19,7 @@ import { readFieldStateBindingValue, type ControlBindingKey, } from './bindings'; -import type {FormField} from './form_field_directive'; +import type {FormField} from './form_field'; import {InputValidityMonitor} from './input_validity_monitor'; import { getNativeControlValue, diff --git a/packages/forms/signals/src/directive/form_field_directive.ts b/packages/forms/signals/src/directive/form_field.ts similarity index 100% rename from packages/forms/signals/src/directive/form_field_directive.ts rename to packages/forms/signals/src/directive/form_field.ts diff --git a/packages/forms/signals/src/directive/ng_signal_form.ts b/packages/forms/signals/src/directive/form_root.ts similarity index 100% rename from packages/forms/signals/src/directive/ng_signal_form.ts rename to packages/forms/signals/src/directive/form_root.ts diff --git a/packages/forms/signals/src/field/node.ts b/packages/forms/signals/src/field/node.ts index 55b5a85a69b..7df69c2b269 100644 --- a/packages/forms/signals/src/field/node.ts +++ b/packages/forms/signals/src/field/node.ts @@ -33,7 +33,7 @@ import type { FieldTree, MarkAsTouchedOptions, } from '../api/types'; -import type {FormField} from '../directive/form_field_directive'; +import type {FormField} from '../directive/form_field'; import {DYNAMIC} from '../schema/logic'; import {LogicNode} from '../schema/logic_node'; import {FieldPathNode} from '../schema/path_node'; diff --git a/packages/forms/signals/src/field/state.ts b/packages/forms/signals/src/field/state.ts index 347f4aa2d21..2e979ca9a75 100644 --- a/packages/forms/signals/src/field/state.ts +++ b/packages/forms/signals/src/field/state.ts @@ -7,7 +7,7 @@ */ import {computed, signal, Signal} from '@angular/core'; -import type {FormField} from '../directive/form_field_directive'; +import type {FormField} from '../directive/form_field'; import type {Debouncer, DisabledReason} from '../api/types'; import {DEBOUNCER} from './debounce'; import type {FieldNode} from './node'; diff --git a/packages/forms/signals/test/node/ng_signal_form.spec.ts b/packages/forms/signals/test/node/form_root.spec.ts similarity index 100% rename from packages/forms/signals/test/node/ng_signal_form.spec.ts rename to packages/forms/signals/test/node/form_root.spec.ts diff --git a/packages/forms/signals/test/web/form_field_directive.spec.ts b/packages/forms/signals/test/web/form_field.spec.ts similarity index 100% rename from packages/forms/signals/test/web/form_field_directive.spec.ts rename to packages/forms/signals/test/web/form_field.spec.ts diff --git a/packages/forms/signals/test/web/signal_form_control_web.spec.ts b/packages/forms/signals/test/web/signal_form_control_web.spec.ts index 66684ec1b33..da4ca61b338 100644 --- a/packages/forms/signals/test/web/signal_form_control_web.spec.ts +++ b/packages/forms/signals/test/web/signal_form_control_web.spec.ts @@ -12,7 +12,7 @@ import {FormControl, FormGroup, ReactiveFormsModule} from '@angular/forms'; import {disabled} from '@angular/forms/signals'; import {SignalFormControl} from '../../compat'; -import {FormField} from '../../src/directive/form_field_directive'; +import {FormField} from '../../src/directive/form_field'; describe('SignalFormControl (web)', () => { beforeEach(() => {