Merge pull request #28 from thinknimble/feature/new-types

Feature/new types

Author: paribaker

dist/index.d.mts

@@ -326,4 +326,8 @@ declare class PhoneNumberValidator extends Validator {
     call(value: string): void;
 }
 
-export { DynamicMinDateValidator, EmailValidator, Form, FormArray, FormField, type FormFieldsRecord, FormLevelValidator, type FormTypeUnion, type FormValue, type GetFormFieldKeys, type GetFormFieldNames, type IDynamicFormValidators, type IForm, type IFormArray, type IFormArrayKwargs, type IFormField, type IFormFieldError, type IFormFieldKwargs, type IFormInstance, type IFormLevelValidator, type IValidator, MaxDateValidator, MaximumValueValidator, MinDateValidator, MinLengthValidator, MinimumValueValidator, MustMatchValidator, type OptionalFormArgs, PatternValidator, PhoneNumberValidator, type PickByValue, type PickFormValue, RequiredValidator, type TArrayOfFormFieldValues, type TFormFieldTypeCombos, type TFormFieldTypeOpts, type TFormInstance, type TFormInstanceFields, TrueFalseValidator, UrlValidator, Validator, fieldGetter, isFormArray, isFormField, isNumber, isNumberOrFloat, notNullOrUndefined };
+type ExtractFormFields<T> = {
+    [K in keyof T]: T[K] extends IFormField<any> | IFormArray<any> ? T[K] : never;
+};
+
+export { DynamicMinDateValidator, EmailValidator, type ExtractFormFields, Form, FormArray, FormField, type FormFieldsRecord, FormLevelValidator, type FormTypeUnion, type FormValue, type GetFormFieldKeys, type GetFormFieldNames, type IDynamicFormValidators, type IForm, type IFormArray, type IFormArrayKwargs, type IFormField, type IFormFieldError, type IFormFieldKwargs, type IFormInstance, type IFormLevelValidator, type IValidator, MaxDateValidator, MaximumValueValidator, MinDateValidator, MinLengthValidator, MinimumValueValidator, MustMatchValidator, type OptionalFormArgs, PatternValidator, PhoneNumberValidator, type PickByValue, type PickFormValue, RequiredValidator, type TArrayOfFormFieldValues, type TFormFieldTypeCombos, type TFormFieldTypeOpts, type TFormInstance, type TFormInstanceFields, TrueFalseValidator, UrlValidator, Validator, fieldGetter, isFormArray, isFormField, isNumber, isNumberOrFloat, notNullOrUndefined };

dist/index.d.ts

@@ -326,4 +326,8 @@ declare class PhoneNumberValidator extends Validator {
     call(value: string): void;
 }
 
-export { DynamicMinDateValidator, EmailValidator, Form, FormArray, FormField, type FormFieldsRecord, FormLevelValidator, type FormTypeUnion, type FormValue, type GetFormFieldKeys, type GetFormFieldNames, type IDynamicFormValidators, type IForm, type IFormArray, type IFormArrayKwargs, type IFormField, type IFormFieldError, type IFormFieldKwargs, type IFormInstance, type IFormLevelValidator, type IValidator, MaxDateValidator, MaximumValueValidator, MinDateValidator, MinLengthValidator, MinimumValueValidator, MustMatchValidator, type OptionalFormArgs, PatternValidator, PhoneNumberValidator, type PickByValue, type PickFormValue, RequiredValidator, type TArrayOfFormFieldValues, type TFormFieldTypeCombos, type TFormFieldTypeOpts, type TFormInstance, type TFormInstanceFields, TrueFalseValidator, UrlValidator, Validator, fieldGetter, isFormArray, isFormField, isNumber, isNumberOrFloat, notNullOrUndefined };
+type ExtractFormFields<T> = {
+    [K in keyof T]: T[K] extends IFormField<any> | IFormArray<any> ? T[K] : never;
+};
+
+export { DynamicMinDateValidator, EmailValidator, type ExtractFormFields, Form, FormArray, FormField, type FormFieldsRecord, FormLevelValidator, type FormTypeUnion, type FormValue, type GetFormFieldKeys, type GetFormFieldNames, type IDynamicFormValidators, type IForm, type IFormArray, type IFormArrayKwargs, type IFormField, type IFormFieldError, type IFormFieldKwargs, type IFormInstance, type IFormLevelValidator, type IValidator, MaxDateValidator, MaximumValueValidator, MinDateValidator, MinLengthValidator, MinimumValueValidator, MustMatchValidator, type OptionalFormArgs, PatternValidator, PhoneNumberValidator, type PickByValue, type PickFormValue, RequiredValidator, type TArrayOfFormFieldValues, type TFormFieldTypeCombos, type TFormFieldTypeOpts, type TFormInstance, type TFormInstanceFields, TrueFalseValidator, UrlValidator, Validator, fieldGetter, isFormArray, isFormField, isNumber, isNumberOrFloat, notNullOrUndefined };

src/index.ts

@@ -2,3 +2,4 @@ export * from './forms'
 export * from './interfaces'
 export * from './utils'
 export * from './validators'
+export * from './types'

src/types.ts

@@ -0,0 +1,6 @@
+import { IFormArray, IFormField } from "./interfaces";
+
+export type ExtractFormFields<T> = {
+    [K in keyof T]: T[K] extends IFormField<any> | IFormArray<any> ? T[K] : never;
+  };
+  

test/test-forms.ts

@@ -1,5 +1,5 @@
 import * as assert from 'assert'
-import { Equals, Expect } from './type-utils'
+import { Equals, Expect } from './type-utils';
 
 import { FormArray, FormField, Form } from '../src/forms'
 import { GetFormFieldNames, IFormArray, IFormField } from '../src/interfaces'
@@ -14,6 +14,7 @@ import {
   DynamicMinDateValidator,
   UrlValidator,
 } from '../src/validators'
+import { ExtractFormFields } from '../src'
 
 type IUserAddressForm = {
   street: IFormField
@@ -429,4 +430,24 @@ describe('Forms', () => {
       >
     })
   })
+
+  describe('# ExtractFormFields', () => {
+    class MyForm extends Form<ExtractFormFields<typeof MyForm>> {
+      static name = new FormField()
+      static age = new FormField<number>()
+    }
+    type TMyForm = MyForm & ExtractFormFields<typeof MyForm>
+    it('should extract the form fields', () => {
+      let myForm = new MyForm() as TMyForm
+      assert.equal(myForm.name instanceof FormField, true)
+      assert.equal(myForm.age instanceof FormField, true)
+    })
+    it('should have age as FormField<number>', () => {
+      let myForm = new MyForm() as TMyForm
+      type AgeFieldType = typeof myForm.age
+      type ExpectedType = FormField<number>
+      type isCorrectType = [Expect<Equals<AgeFieldType, ExpectedType>>]
+   
+    })
+  })
 })