@angular/forms 21.2.0-next.0 → 21.2.0-next.2

package/fesm2022/_structure-chunk.mjs

@@ -1,13 +1,64 @@
 /**
- * @license Angular v21.2.0-next.0
+ * @license Angular v21.2.0-next.2
  * (c) 2010-2026 Google LLC. https://angular.dev/
  * License: MIT
  */
 
+import { FormGroup, FormArray, AbstractControl } from '@angular/forms';
 import { untracked, ɵRuntimeError as _RuntimeError, computed, runInInjectionContext, Injector, linkedSignal, signal, APP_ID, effect, inject } from '@angular/core';
-import { AbstractControl } from '@angular/forms';
 import { SIGNAL } from '@angular/core/primitives/signals';
 
+class CompatValidationError {
+  kind = 'compat';
+  control;
+  fieldTree;
+  context;
+  message;
+  constructor({
+    context,
+    kind,
+    control
+  }) {
+    this.context = context;
+    this.kind = kind;
+    this.control = control;
+  }
+}
+function signalErrorsToValidationErrors(errors) {
+  if (errors.length === 0) {
+    return null;
+  }
+  const errObj = {};
+  for (const error of errors) {
+    errObj[error.kind] = error instanceof CompatValidationError ? error.context : error;
+  }
+  return errObj;
+}
+function reactiveErrorsToSignalErrors(errors, control) {
+  if (errors === null) {
+    return [];
+  }
+  return Object.entries(errors).map(([kind, context]) => {
+    return new CompatValidationError({
+      context,
+      kind,
+      control
+    });
+  });
+}
+function extractNestedReactiveErrors(control) {
+  const errors = [];
+  if (control.errors) {
+    errors.push(...reactiveErrorsToSignalErrors(control.errors, control));
+  }
+  if (control instanceof FormGroup || control instanceof FormArray) {
+    for (const c of Object.values(control.controls)) {
+      errors.push(...extractNestedReactiveErrors(c));
+    }
+  }
+  return errors;
+}
+
 let boundPathDepth = 0;
 function getBoundPathDepth() {
   return boundPathDepth;
@@ -647,10 +698,19 @@ class FieldValidationState {
   }, ...(ngDevMode ? [{
     debugName: "asyncErrors"
   }] : []));
-  errors = computed(() => [...this.syncErrors(), ...this.asyncErrors().filter(err => err !== 'pending')], ...(ngDevMode ? [{
+  parseErrors = computed(() => this.node.formFieldBindings().flatMap(field => field.parseErrors()), ...(ngDevMode ? [{
+    debugName: "parseErrors"
+  }] : []));
+  errors = computed(() => [...this.parseErrors(), ...this.syncErrors(), ...this.asyncErrors().filter(err => err !== 'pending')], ...(ngDevMode ? [{
     debugName: "errors"
   }] : []));
-  errorSummary = computed(() => this.node.structure.reduceChildren(this.errors(), (child, result) => [...result, ...child.errorSummary()]), ...(ngDevMode ? [{
+  errorSummary = computed(() => {
+    const errors = this.node.structure.reduceChildren(this.errors(), (child, result) => [...result, ...child.errorSummary()]);
+    if (typeof ngServerMode === 'undefined' || !ngServerMode) {
+      untracked(() => errors.sort(compareErrorPosition));
+    }
+    return errors;
+  }, ...(ngDevMode ? [{
     debugName: "errorSummary"
   }] : []));
   pending = computed(() => this.node.structure.reduceChildren(this.asyncErrors().includes('pending'), (child, value) => value || child.validationState.asyncErrors().includes('pending')), ...(ngDevMode ? [{
@@ -701,6 +761,20 @@ function addDefaultField(errors, fieldTree) {
   }
   return errors;
 }
+function getFirstBoundElement(error) {
+  if (error.formField) return error.formField.element;
+  return error.fieldTree().formFieldBindings().reduce((el, binding) => {
+    if (!el || !binding.element) return el ?? binding.element;
+    return el.compareDocumentPosition(binding.element) & Node.DOCUMENT_POSITION_PRECEDING ? binding.element : el;
+  }, undefined);
+}
+function compareErrorPosition(a, b) {
+  const aEl = getFirstBoundElement(a);
+  const bEl = getFirstBoundElement(b);
+  if (aEl === bEl) return 0;
+  if (aEl === undefined || bEl === undefined) return aEl === undefined ? 1 : -1;
+  return aEl.compareDocumentPosition(bEl) & Node.DOCUMENT_POSITION_PRECEDING ? 1 : -1;
+}
 
 const DEBOUNCER = createMetadataKey();
 
@@ -1163,6 +1237,7 @@ class FieldNode {
   nodeState;
   submitState;
   fieldAdapter;
+  controlValue;
   _context = undefined;
   get context() {
     return this._context ??= new FieldNodeContext(this);
@@ -1177,6 +1252,7 @@ class FieldNode {
     this.nodeState = this.fieldAdapter.createNodeState(this, options);
     this.metadataState = new FieldMetadataState(this);
     this.submitState = new FieldSubmitState(this);
+    this.controlValue = this.controlValueSignal();
   }
   focusBoundControl(options) {
     this.getBindingForFocus()?.focus(options);
@@ -1202,18 +1278,15 @@ class FieldNode {
   get value() {
     return this.structure.value;
   }
-  _controlValue = linkedSignal(() => this.value(), ...(ngDevMode ? [{
-    debugName: "_controlValue"
-  }] : []));
-  get controlValue() {
-    return this._controlValue.asReadonly();
-  }
   get keyInParent() {
     return this.structure.keyInParent;
   }
   get errors() {
     return this.validationState.errors;
   }
+  get parseErrors() {
+    return this.validationState.parseErrors;
+  }
   get errorSummary() {
     return this.validationState.errorSummary;
   }
@@ -1286,6 +1359,12 @@ class FieldNode {
   markAsDirty() {
     this.nodeState.markAsDirty();
   }
+  markAsPristine() {
+    this.nodeState.markAsPristine();
+  }
+  markAsUntouched() {
+    this.nodeState.markAsUntouched();
+  }
   reset(value) {
     untracked(() => this._reset(value));
   }
@@ -1299,12 +1378,25 @@ class FieldNode {
       child._reset();
     }
   }
-  setControlValue(newValue) {
-    untracked(() => {
-      this._controlValue.set(newValue);
+  controlValueSignal() {
+    const controlValue = linkedSignal(this.value, ...(ngDevMode ? [{
+      debugName: "controlValue"
+    }] : []));
+    const {
+      set,
+      update
+    } = controlValue;
+    controlValue.set = newValue => {
+      set(newValue);
       this.markAsDirty();
       this.debounceSync();
-    });
+    };
+    controlValue.update = updateFn => {
+      update(updateFn);
+      this.markAsDirty();
+      this.debounceSync();
+    };
+    return controlValue;
   }
   sync() {
     this.value.set(this.controlValue());
@@ -1317,8 +1409,10 @@ class FieldNode {
     }
   }
   async debounceSync() {
-    this.pendingSync()?.abort();
-    const debouncer = this.nodeState.debouncer();
+    const debouncer = untracked(() => {
+      this.pendingSync()?.abort();
+      return this.nodeState.debouncer();
+    });
     if (debouncer) {
       const controller = new AbortController();
       const promise = debouncer(controller.signal);
@@ -1476,9 +1570,11 @@ class BasicFieldAdapter {
 class FormFieldManager {
   injector;
   rootName;
-  constructor(injector, rootName) {
+  submitOptions;
+  constructor(injector, rootName, submitOptions) {
     this.injector = injector;
     this.rootName = rootName ?? `${this.injector.get(APP_ID)}.form${nextFormId++}`;
+    this.submitOptions = submitOptions;
   }
   structures = new Set();
   createFieldManagementEffect(root) {
@@ -1526,7 +1622,7 @@ function form(...args) {
   const [model, schema, options] = normalizeFormArgs(args);
   const injector = options?.injector ?? inject(Injector);
   const pathNode = runInInjectionContext(injector, () => SchemaImpl.rootCompile(schema));
-  const fieldManager = new FormFieldManager(injector, options?.name);
+  const fieldManager = new FormFieldManager(injector, options?.name, options?.submission);
   const adapter = options?.adapter ?? new BasicFieldAdapter();
   const fieldRoot = FieldNode.newRoot(fieldManager, model, pathNode, adapter);
   fieldManager.createFieldManagementEffect(fieldRoot.structure);
@@ -1555,16 +1651,39 @@ function applyWhenValue(path, predicate, schema) {
     value
   }) => predicate(value()), schema);
 }
-async function submit(form, action) {
+async function submit(form, options) {
   const node = form();
-  markAllAsTouched(node);
-  if (node.invalid()) {
-    return;
-  }
-  node.submitState.selfSubmitting.set(true);
+  const opts = typeof options === 'function' ? {
+    action: options
+  } : {
+    ...(node.structure.fieldManager.submitOptions ?? {}),
+    ...(options ?? {})
+  };
+  const action = opts?.action;
+  if (!action) {
+    throw new _RuntimeError(1915, ngDevMode && 'Cannot submit form with no submit action. Specify the action when creating the form, or as an additional argument to `submit()`.');
+  }
+  const onInvalid = opts?.onInvalid;
+  const ignoreValidators = opts?.ignoreValidators ?? 'pending';
+  let shouldRunAction = true;
+  untracked(() => {
+    markAllAsTouched(node);
+    if (ignoreValidators === 'none') {
+      shouldRunAction = node.valid();
+    } else if (ignoreValidators === 'pending') {
+      shouldRunAction = !node.invalid();
+    }
+  });
   try {
-    const errors = await action(form);
-    errors && setSubmissionErrors(node, errors);
+    if (shouldRunAction) {
+      node.submitState.selfSubmitting.set(true);
+      const errors = await untracked(() => action?.(form));
+      errors && setSubmissionErrors(node, errors);
+      return !errors || isArray(errors) && errors.length === 0;
+    } else {
+      untracked(() => onInvalid?.(form));
+    }
+    return false;
   } finally {
     node.submitState.selfSubmitting.set(false);
   }
@@ -1592,11 +1711,14 @@ function schema(fn) {
   return SchemaImpl.create(fn);
 }
 function markAllAsTouched(node) {
+  if (node.validationState.shouldSkipValidation()) {
+    return;
+  }
   node.markAsTouched();
   for (const child of node.structure.children()) {
     markAllAsTouched(child);
   }
 }
 
-export { BasicFieldAdapter, DEBOUNCER, FieldNode, FieldNodeState, FieldNodeStructure, FieldPathNode, MAX, MAX_LENGTH, MIN, MIN_LENGTH, MetadataKey, MetadataReducer, PATTERN, REQUIRED, addDefaultField, apply, applyEach, applyWhen, applyWhenValue, assertPathIsCurrent, calculateValidationSelfStatus, createManagedMetadataKey, createMetadataKey, form, getInjectorFromOptions, metadata, normalizeFormArgs, schema, submit };
+export { BasicFieldAdapter, CompatValidationError, DEBOUNCER, FieldNode, FieldNodeState, FieldNodeStructure, FieldPathNode, MAX, MAX_LENGTH, MIN, MIN_LENGTH, MetadataKey, MetadataReducer, PATTERN, REQUIRED, addDefaultField, apply, applyEach, applyWhen, applyWhenValue, assertPathIsCurrent, calculateValidationSelfStatus, createManagedMetadataKey, createMetadataKey, extractNestedReactiveErrors, form, getInjectorFromOptions, metadata, normalizeFormArgs, schema, signalErrorsToValidationErrors, submit };
 //# sourceMappingURL=_structure-chunk.mjs.map