refactor(forms): move addDefaultField out of public API (#63389)

mmalerba · web-flow · commit 447b6e958ffd · 2025-08-25T17:05:25.000-07:00
diff --git a/goldens/public-api/forms/signals/index.api.md b/goldens/public-api/forms/signals/index.api.md
@@ -24,12 +24,6 @@ import { ValidationErrors } from '@angular/forms';
 import { ValidatorFn } from '@angular/forms';
 import { WritableSignal } from '@angular/core';
 
-// @public
-export function addDefaultField<E extends ValidationError>(error: WithOptionalField<E>, field: Field<unknown>): E;
-
-// @public (undocumented)
-export function addDefaultField<E extends ValidationError>(errors: TreeValidationResult<E>, field: Field<unknown>): ValidationResult<E>;
-
 // @public
 export class AggregateProperty<TAcc, TItem> {
     // (undocumented)
diff --git a/packages/forms/signals/src/api/async.ts b/packages/forms/signals/src/api/async.ts
@@ -9,11 +9,11 @@
 import {httpResource, HttpResourceOptions, HttpResourceRequest} from '@angular/common/http';
 import {computed, ResourceRef, Signal} from '@angular/core';
 import {FieldNode} from '../field/node';
+import {addDefaultField} from '../field/validation';
 import {FieldPathNode} from '../schema/path_node';
 import {assertPathIsCurrent} from '../schema/schema';
 import {property} from './logic';
 import {FieldContext, FieldPath, PathKind, TreeValidationResult} from './types';
-import {addDefaultField} from './validation_errors';
 
 /**
  * A function that takes the result of an async operation and the current field context, and maps it
diff --git a/packages/forms/signals/src/api/logic.ts b/packages/forms/signals/src/api/logic.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
+import {addDefaultField} from '../field/validation';
 import {FieldPathNode} from '../schema/path_node';
 import {assertPathIsCurrent} from '../schema/schema';
 import {AggregateProperty, createProperty, Property} from './property';
@@ -17,7 +18,6 @@ import type {
   PathKind,
   TreeValidator,
 } from './types';
-import {addDefaultField} from './validation_errors';
 
 /**
  * Adds logic to a field to conditionally disable it. A disabled field does not contribute to the
diff --git a/packages/forms/signals/src/api/structure.ts b/packages/forms/signals/src/api/structure.ts
@@ -11,6 +11,7 @@ import {inject, Injector, runInInjectionContext, WritableSignal} from '@angular/
 import {BasicFieldAdapter, FieldAdapter} from '../field/field_adapter';
 import {FormFieldManager} from '../field/manager';
 import {FieldNode} from '../field/node';
+import {addDefaultField} from '../field/validation';
 import {FieldPathNode} from '../schema/path_node';
 import {assertPathIsCurrent, isSchemaOrSchemaFn, SchemaImpl} from '../schema/schema';
 import {isArray} from '../util/type_guards';
@@ -25,7 +26,7 @@ import type {
   SchemaOrSchemaFn,
   TreeValidationResult,
 } from './types';
-import {addDefaultField, ValidationError, WithOptionalField} from './validation_errors';
+import {ValidationError, WithOptionalField} from './validation_errors';
 
 /** Options that may be specified when creating a form. */
 export interface FormOptions {
diff --git a/packages/forms/signals/src/api/validation_errors.ts b/packages/forms/signals/src/api/validation_errors.ts
@@ -7,40 +7,11 @@
  */
 
 import type {StandardSchemaV1} from '@standard-schema/spec';
-import {isArray} from '../util/type_guards';
-import {Field, Mutable, TreeValidationResult, ValidationResult} from './types';
+import {Field} from './types';
 
 /** Internal symbol used for class branding. */
 const BRAND = Symbol();
 
-/**
- * Sets the given field on the given error(s) if it does not already have a field.
- * @param errors The error(s) to add the field to
- * @param field The default field to add
- * @returns The passed in error(s), with its field set.
- */
-export function addDefaultField<E extends ValidationError>(
-  error: WithOptionalField<E>,
-  field: Field<unknown>,
-): E;
-export function addDefaultField<E extends ValidationError>(
-  errors: TreeValidationResult<E>,
-  field: Field<unknown>,
-): ValidationResult<E>;
-export function addDefaultField<E extends ValidationError>(
-  errors: TreeValidationResult<E>,
-  field: Field<unknown>,
-): ValidationResult<E> {
-  if (isArray(errors)) {
-    for (const error of errors) {
-      (error as Mutable<ValidationError>).field ??= field;
-    }
-  } else if (errors) {
-    (errors as Mutable<ValidationError>).field ??= field;
-  }
-  return errors as ValidationResult<E>;
-}
-
 /**
  * Options used to create a `ValidationError`.
  */
diff --git a/packages/forms/signals/src/api/validators/standard_schema.ts b/packages/forms/signals/src/api/validators/standard_schema.ts
@@ -8,14 +8,11 @@
 
 import {computed, resource, ɵisPromise} from '@angular/core';
 import type {StandardSchemaV1} from '@standard-schema/spec';
+import {addDefaultField} from '../../field/validation';
 import {validateAsync} from '../async';
 import {property, validateTree} from '../logic';
 import {Field, FieldPath} from '../types';
-import {
-  addDefaultField,
-  standardSchemaError,
-  StandardSchemaValidationError,
-} from '../validation_errors';
+import {standardSchemaError, StandardSchemaValidationError} from '../validation_errors';
 
 /**
  * Utility type that removes a string index key when its value is `unknown`,
diff --git a/packages/forms/signals/src/field/validation.ts b/packages/forms/signals/src/field/validation.ts
@@ -7,8 +7,8 @@
  */
 
 import {computed, Signal} from '@angular/core';
-import type {ValidationResult} from '../api/types';
-import type {ValidationError} from '../api/validation_errors';
+import type {Field, Mutable, TreeValidationResult, ValidationResult} from '../api/types';
+import type {ValidationError, WithOptionalField} from '../api/validation_errors';
 import {isArray} from '../util/type_guards';
 import type {FieldNode} from './node';
 import {reduceChildren, shortCircuitFalse} from './util';
@@ -350,3 +350,31 @@ function normalizeErrors(error: ValidationResult): readonly ValidationError[] {
 
   return [error as ValidationError];
 }
+
+/**
+ * Sets the given field on the given error(s) if it does not already have a field.
+ * @param errors The error(s) to add the field to
+ * @param field The default field to add
+ * @returns The passed in error(s), with its field set.
+ */
+export function addDefaultField<E extends ValidationError>(
+  error: WithOptionalField<E>,
+  field: Field<unknown>,
+): E;
+export function addDefaultField<E extends ValidationError>(
+  errors: TreeValidationResult<E>,
+  field: Field<unknown>,
+): ValidationResult<E>;
+export function addDefaultField<E extends ValidationError>(
+  errors: TreeValidationResult<E>,
+  field: Field<unknown>,
+): ValidationResult<E> {
+  if (isArray(errors)) {
+    for (const error of errors) {
+      (error as Mutable<ValidationError>).field ??= field;
+    }
+  } else if (errors) {
+    (errors as Mutable<ValidationError>).field ??= field;
+  }
+  return errors as ValidationResult<E>;
+}
