fix: handle 'any' values properly in 'ControlOf' (#60)

projects/ngneat/reactive-forms/src/lib/type-tests/formGroup.spec.ts

@@ -17,7 +17,7 @@ import {
  NestedFormControls
 } from './mocks.spec';
 import { Validators } from '@angular/forms';
-import { ControlsOf } from '../types';
+import { AbstractControl, ControlsOf } from '../types';
 
 test('control should be constructed with abstract controls', () => {
  expectTypeOf(FormGroup).toBeConstructibleWith({ name: new FormControl() });
@@ -136,7 +136,8 @@ describe('with generic', () => {
  a: new FormControl<number>()
  })
  ]),
- d: new FormControl<boolean>()
+ d: new FormControl<boolean>(),
+ e: new FormControl()
  });
  expectTypeOf<{
  a: FormControl<number>;
@@ -146,6 +147,7 @@ describe('with generic', () => {
  }>;
  c: FormArray<FormGroup<{ a: FormControl<number> }>>;
  d: FormControl<boolean>;
+ e: AbstractControl;
  }>(a.controls);
  });
 
@@ -164,7 +166,8 @@ describe('with generic', () => {
  c: new FormArray<FormControl<number>>([])
  }),
  c: new FormControl<{ a: number }[]>(),
- d: new FormControl<boolean>()
+ d: new FormControl<boolean>(),
+ e: new FormControl()
  });
  expectTypeOf<{
  a: FormControl<number>;
@@ -174,6 +177,7 @@ describe('with generic', () => {
  }>;
  c: FormControl<{ a: number }[]>;
  d: FormControl<boolean>;
+ e: AbstractControl;
  }>(a.controls);
  });
 

projects/ngneat/reactive-forms/src/lib/type-tests/mocks.spec.ts

@@ -11,6 +11,7 @@ export interface NestedForm {
  };
  c?: { a: number }[];
  d?: boolean;
+ e?: any;
 }
 
 export interface NestedFormControls {

projects/ngneat/reactive-forms/src/lib/types.ts

@@ -8,7 +8,6 @@ import { FormArray } from './formArray';
 import { FormControl } from './formControl';
 import { FormGroup } from './formGroup';
 import { PersistManager } from './persistManager';
-import { NestedForm } from './type-tests/mocks.spec';
 
 export type ValidationErrors<T = NgValidationErrors> = T;
 export type ValidatorFn<T = any, E = any> = (control: AbstractControl<T>) => ValidationErrors<E> | null;
@@ -93,9 +92,8 @@ type ExcludeControls<T> = Exclude<T, FormControl | FormGroup | FormArray>;
 type AbstractControlOfWithPotentialUnion<T> = [T] extends [AbstractControl]
  ? T
  : [T] extends [Primitive]
- ? FormControl<T>
- : // in case we got no generic in the constructor, resolve the type as Abstract<T>.
- T extends unknown
+ ? FormControl<T> // in case we got no generic in the constructor, resolve the type as Abstract<T>.
+ : T extends unknown
  ? AbstractControl<ExcludeControls<T>>
  : AbstractControl<T>;
 export type AbstractControlOf<T> = AbstractControl extends AbstractControlOfWithPotentialUnion<T>
@@ -133,7 +131,10 @@ export type AbstractControlsOf<T extends Obj> = {
  * ])
  * });
  * */
-export type ControlOf<T> = [T] extends [any[]]
+type ExtractAny<T> = T extends Extract<T, string & number & boolean & object & null & undefined> ? any : never;
+export type ControlOf<T> = [T] extends ExtractAny<T>
+ ? AbstractControl<T>
+ : [T] extends [any[]]
  ? FormArray<ControlOf<UnwrapArray<T>>>
  : [T] extends [object]
  ? FormGroup<ControlsOf<T>>
@@ -142,7 +143,7 @@ export type ControlsOf<T extends Object, TOverrides extends Partial<AbstractCont
  [key in keyof T]: unknown extends TOverrides[key] ? ControlOf<T[key]> : TOverrides[key];
 };
 
-export type ArrayKeys<T> = { [K in keyof T]: T[K] extends Array<any> ? K : never }[keyof T];
+export type ArrayKeys<T> = { [K in keyof T]: T[K] extends any[] ? K : never }[keyof T];
 export type ControlFactory<T> = (value: T) => AbstractControl<T>;
 export type ControlFactoryMap<T> = {
  [K in ArrayKeys<T>]?: ControlFactory<ArrayType<T[K]>>;