fix: handle 'any' values properly in 'patchValue' (#59)

ngneat · Nov 29, 2020 · 0ccdd2e · 0ccdd2e
1 parent ceede84
commit 0ccdd2e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/projects/ngneat/reactive-forms/src/lib/formGroup.ts b/projects/ngneat/reactive-forms/src/lib/formGroup.ts
@@ -343,7 +343,7 @@ export class FormGroup<T extends Obj = any, E extends object = any> extends NgFo
   }
 
   private restore(key: string, manager: PersistManager<T>, arrControlFactory: ControlFactoryMap<T>): Observable<T> {
-    return wrapIntoObservable<T>(manager.getValue(key)).pipe(
+    return wrapIntoObservable(manager.getValue(key)).pipe(
       take(1),
       tap(value => {
         if (!value) return;

diff --git a/projects/ngneat/reactive-forms/src/lib/type-tests/formGroup.spec.ts b/projects/ngneat/reactive-forms/src/lib/type-tests/formGroup.spec.ts
@@ -282,6 +282,19 @@ describe('with generic', () => {
     control.setValidators([required, pattern]);
   });
 
+  test('control patchValue should accept any', () => {
+    const control = new FormGroup<NestedForm>({
+      a: new FormControl(22),
+      b: new FormControl({
+        a: '',
+        c: [3]
+      }),
+      d: new FormControl<boolean>(),
+      e: new FormControl('')
+    });
+    expectTypeOf(control.patchValue(of({ e: 2 }))).toEqualTypeOf(new Subscription());
+  });
+
   test('control patchValue should accept nested partials', () => {
     const control = new FormGroup<NestedForm>({
       a: new FormControl(22),

diff --git a/projects/ngneat/reactive-forms/src/lib/types.ts b/projects/ngneat/reactive-forms/src/lib/types.ts
@@ -61,10 +61,7 @@ export interface NgValidatorsErrors {
 
 export type BoxedValue<T> = { value: T; disabled?: boolean };
 export type OrBoxedValue<T> = T | BoxedValue<T>;
-export type DeepPartial<T> = {
-  [P in keyof T]?: DeepPartial<T[P]>;
-};
-
+export type DeepPartial<T> = { [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K] };
 export type Obj = { [key: string]: any };
 type ArrayType<T> = T extends Array<infer R> ? R : any;