feat: provide a mergeErrors helper method

ngneat · Aug 26, 2020 · e6c9a82 · e6c9a82
1 parent ccd56bb
commit e6c9a82
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 0 deletions.
diff --git a/projects/ngneat/reactive-forms/src/lib/formArray.spec.ts b/projects/ngneat/reactive-forms/src/lib/formArray.spec.ts
@@ -184,6 +184,18 @@ describe('FormArray', () => {
     expect(control.hasErrorAndDirty('isInvalid')).toBeTruthy();
   });
 
+  it('should setErrors', () => {
+    const control = createArray(true);
+    control.setErrors({ customError: true });
+    expect(control.errors).toEqual({ customError: true });
+  });
+
+  it('should mergeErrors', () => {
+    const control = createArray(true);
+    control.mergeErrors({ customError: true });
+    expect(control.errors).toEqual({ isInvalid: true, customError: true });
+  });
+
   it('should setEnable', () => {
     const control = createArray();
 

diff --git a/projects/ngneat/reactive-forms/src/lib/formArray.ts b/projects/ngneat/reactive-forms/src/lib/formArray.ts
@@ -171,6 +171,16 @@ export class FormArray<T = any, E extends object = any> extends NgFormArray {
     return super.setErrors(errors, opts);
   }
 
+  mergeErrors(errors: Partial<E>, opts: EmitEvent = {}): void {
+    this.setErrors(
+      {
+        ...this.errors,
+        ...errors
+      },
+      opts
+    );
+  }
+
   getError<K extends ExtractStrings<E>>(errorCode: K, path?: ControlPath) {
     return super.getError(errorCode, path) as E[K] | null;
   }

diff --git a/projects/ngneat/reactive-forms/src/lib/formControl.spec.ts b/projects/ngneat/reactive-forms/src/lib/formControl.spec.ts
@@ -191,6 +191,18 @@ describe('FormControl', () => {
     expect(control.enabled).toBe(false);
   });
 
+  it('should setErrors', () => {
+    const control = new FormControl<string>('', Validators.required);
+    control.setErrors({ customError: true });
+    expect(control.errors).toEqual({ customError: true });
+  });
+
+  it('should mergeErrors', () => {
+    const control = new FormControl<string>('', Validators.required);
+    control.mergeErrors({ customError: true });
+    expect(control.errors).toEqual({ required: true, customError: true });
+  });
+
   it('should setDisable', () => {
     const control = new FormControl<string>();
     control.setDisable();

diff --git a/projects/ngneat/reactive-forms/src/lib/formControl.ts b/projects/ngneat/reactive-forms/src/lib/formControl.ts
@@ -146,6 +146,16 @@ export class FormControl<T = any, E extends object = any> extends NgFormControl
     return super.setErrors(errors, opts);
   }
 
+  mergeErrors(errors: Partial<E>, opts: EmitEvent = {}): void {
+    this.setErrors(
+      {
+        ...this.errors,
+        ...errors
+      },
+      opts
+    );
+  }
+
   hasErrorAndTouched(error: ExtractStrings<E>): boolean {
     return hasErrorAndTouched(this, error);
   }

diff --git a/projects/ngneat/reactive-forms/src/lib/formGroup.spec.ts b/projects/ngneat/reactive-forms/src/lib/formGroup.spec.ts
@@ -224,6 +224,18 @@ describe('FormGroup', () => {
     expect(control.reset).toHaveBeenCalled();
   });
 
+  it('should setErrors', () => {
+    const control = createGroup(true);
+    control.setErrors({ customError: true });
+    expect(control.errors).toEqual({ customError: true });
+  });
+
+  it('should mergeErrors', () => {
+    const control = createGroup(true);
+    control.mergeErrors({ customError: true });
+    expect(control.errors).toEqual({ isInvalid: true, customError: true });
+  });
+
   it('should setValidators', () => {
     const control = createGroup();
     spyOn(control, 'setValidators');

diff --git a/projects/ngneat/reactive-forms/src/lib/formGroup.ts b/projects/ngneat/reactive-forms/src/lib/formGroup.ts
@@ -214,6 +214,16 @@ export class FormGroup<T extends Obj = any, E extends object = any> extends NgFo
     return super.setErrors(errors, opts);
   }
 
+  mergeErrors(errors: Partial<E>, opts: EmitEvent = {}): void {
+    this.setErrors(
+      {
+        ...this.errors,
+        ...errors
+      },
+      opts
+    );
+  }
+
   getError<K extends keyof E, K1 extends keyof T>(errorCode: K, path?: [K1]): E[K] | null;
   getError<K extends keyof E, K1 extends keyof T, K2 extends keyof T[K1]>(errorCode: K, path?: [K1, K2]): E[K] | null;
   getError<K extends keyof E, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(