From 7bce4ac16ac8b4f9ead806c89e51af4ab01a48fd Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@abv.bg>
Date: Fri, 21 Oct 2022 12:57:07 +0200
Subject: [PATCH] fix(forms): don't mutate validators array

Fixes that the `AbstractControl` was mutating the validators arrays being passed into the constructor an helper methods like `setValidators`.

Fixes #47827.
---
 packages/forms/src/model/abstract_model.ts | 22 +++++------
 packages/forms/test/form_control_spec.ts   | 44 ++++++++++++++++++++++
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/packages/forms/src/model/abstract_model.ts b/packages/forms/src/model/abstract_model.ts
index 015cb39ba54b0e..40383efbde1a10 100644
--- a/packages/forms/src/model/abstract_model.ts
+++ b/packages/forms/src/model/abstract_model.ts
@@ -372,7 +372,7 @@ export abstract class AbstractControl<TValue = any, TRawValue extends TValue = T
    *
    * @internal
    */
-  private _composedValidatorFn: ValidatorFn|null;
+  private _composedValidatorFn!: ValidatorFn|null;
 
   /**
    * Contains the result of merging asynchronous validators into a single validator function
@@ -380,7 +380,7 @@ export abstract class AbstractControl<TValue = any, TRawValue extends TValue = T
    *
    * @internal
    */
-  private _composedAsyncValidatorFn: AsyncValidatorFn|null;
+  private _composedAsyncValidatorFn!: AsyncValidatorFn|null;
 
   /**
    * Synchronous validators as they were provided:
@@ -390,7 +390,7 @@ export abstract class AbstractControl<TValue = any, TRawValue extends TValue = T
    *
    * @internal
    */
-  private _rawValidators: ValidatorFn|ValidatorFn[]|null;
+  private _rawValidators!: ValidatorFn|ValidatorFn[]|null;
 
   /**
    * Asynchronous validators as they were provided:
@@ -401,7 +401,7 @@ export abstract class AbstractControl<TValue = any, TRawValue extends TValue = T
    *
    * @internal
    */
-  private _rawAsyncValidators: AsyncValidatorFn|AsyncValidatorFn[]|null;
+  private _rawAsyncValidators!: AsyncValidatorFn|AsyncValidatorFn[]|null;
 
   /**
    * The current value of the control.
@@ -427,10 +427,8 @@ export abstract class AbstractControl<TValue = any, TRawValue extends TValue = T
   constructor(
       validators: ValidatorFn|ValidatorFn[]|null,
       asyncValidators: AsyncValidatorFn|AsyncValidatorFn[]|null) {
-    this._rawValidators = validators;
-    this._rawAsyncValidators = asyncValidators;
-    this._composedValidatorFn = coerceToValidator(this._rawValidators);
-    this._composedAsyncValidatorFn = coerceToAsyncValidator(this._rawAsyncValidators);
+    this.setValidators(validators);
+    this.setAsyncValidators(asyncValidators);
   }
 
   /**
@@ -620,8 +618,8 @@ export abstract class AbstractControl<TValue = any, TRawValue extends TValue = T
    * using `addValidators()` method instead.
    */
   setValidators(validators: ValidatorFn|ValidatorFn[]|null): void {
-    this._rawValidators = validators;
-    this._composedValidatorFn = coerceToValidator(validators);
+    this._rawValidators = Array.isArray(validators) ? validators.slice() : validators;
+    this._composedValidatorFn = coerceToValidator(this._rawValidators);
   }
 
   /**
@@ -635,8 +633,8 @@ export abstract class AbstractControl<TValue = any, TRawValue extends TValue = T
    * using `addAsyncValidators()` method instead.
    */
   setAsyncValidators(validators: AsyncValidatorFn|AsyncValidatorFn[]|null): void {
-    this._rawAsyncValidators = validators;
-    this._composedAsyncValidatorFn = coerceToAsyncValidator(validators);
+    this._rawAsyncValidators = Array.isArray(validators) ? validators.slice() : validators;
+    this._composedAsyncValidatorFn = coerceToAsyncValidator(this._rawAsyncValidators);
   }
 
   /**
diff --git a/packages/forms/test/form_control_spec.ts b/packages/forms/test/form_control_spec.ts
index 3887ed75403c60..5f29cb18f75265 100644
--- a/packages/forms/test/form_control_spec.ts
+++ b/packages/forms/test/form_control_spec.ts
@@ -266,6 +266,16 @@ describe('FormControl', () => {
       expect(c.valid).toEqual(true);
     });
 
+    it('should not mutate the validators array when overriding using setValidators', () => {
+      const control = new FormControl('');
+      const originalValidators = [Validators.required];
+
+      control.setValidators(originalValidators);
+      control.addValidators(Validators.minLength(10));
+
+      expect(originalValidators.length).toBe(1);
+    });
+
     it('should override validators by setting `control.validator` field value', () => {
       const c = new FormControl('');
       expect(c.valid).toEqual(true);
@@ -357,6 +367,30 @@ describe('FormControl', () => {
       expect(c.hasValidator(Validators.required)).toEqual(false);
     });
 
+    it('should not mutate the validators array when adding/removing sync validators', () => {
+      const originalValidators = [Validators.required];
+      const control = new FormControl('', originalValidators);
+
+      control.addValidators(Validators.min(10));
+      expect(originalValidators.length).toBe(1);
+
+      control.removeValidators(Validators.required);
+      expect(originalValidators.length).toBe(1);
+    });
+
+    it('should not mutate the validators array when adding/removing async validators', () => {
+      const firstValidator = asyncValidator('one');
+      const secondValidator = asyncValidator('two');
+      const originalValidators = [firstValidator];
+      const control = new FormControl('', null, originalValidators);
+
+      control.addAsyncValidators(secondValidator);
+      expect(originalValidators.length).toBe(1);
+
+      control.removeAsyncValidators(firstValidator);
+      expect(originalValidators.length).toBe(1);
+    });
+
     it('should return false when checking presence of a validator not identical by reference',
        () => {
          const minValidator = Validators.min(5);
@@ -518,6 +552,16 @@ describe('FormControl', () => {
          expect(c.valid).toEqual(true);
        }));
 
+    it('should not mutate the validators array when overriding using setValidators', () => {
+      const control = new FormControl('');
+      const originalValidators = [asyncValidator('one')];
+
+      control.setAsyncValidators(originalValidators);
+      control.addAsyncValidators(asyncValidator('two'));
+
+      expect(originalValidators.length).toBe(1);
+    });
+
     it('should override validators by setting `control.asyncValidator` field value',
        fakeAsync(() => {
          const c = new FormControl('');