fix(renderer): fixed typing issues

- fixed constants not properly exporting the definitions objecs
- fixed condtion type not allowing nested condition schema
- fixed FieldArray not exporting component type with props
- fixed field schema not allowing single condition
- fixed field schema not accepting actions object
- make form renderer extend final form props
- fixed Form type net being exported as react component
- fixed schema validator not accepting any arguments
- changed useFieldApi type input value default to any type

Author: Hyperkid123

packages/react-form-renderer/src/files/component-types.d.ts

@@ -1,25 +1,27 @@
 export type ComponentType = 'text-field'|'field-array'|'checkbox'|'sub-form'|'radio'|'tabs'|'tab-item'|'date-picker'|'time-picker'|'wizard'|'switch'|'textarea'|'select'|'plain-text'|'button'|'input-addon-group'|'input-addon-button-group'|'dual-list-select'|'slider';
 
 interface componentTypes {
-  TEXT_FIELD: string;
-  FIELD_ARRAY: string;
-  CHECKBOX: string;
-  SUB_FORM: string;
-  RADIO: string;
-  TABS: string;
-  TAB_ITEM: string;
-  DATE_PICKER: string;
-  TIME_PICKER: string;
-  WIZARD: string;
-  SWITCH: string;
-  TEXTAREA: string;
-  SELECT: string;
-  PLAIN_TEXT: string;
-  BUTTON: string;
-  INPUT_ADDON_GROUP: string;
-  INPUT_ADDON_BUTTON_GROUP: string;
-  DUAL_LIST_SELECT: string;
-  SLIDER: string;
+  TEXT_FIELD: 'text-field';
+  FIELD_ARRAY: 'field-array';
+  CHECKBOX: 'checkbox';
+  SUB_FORM: 'sub-form';
+  RADIO: 'radio';
+  TABS: 'tabs';
+  TAB_ITEM: 'tab-item';
+  DATE_PICKER: 'date-picker';
+  TIME_PICKER: 'time-picker';
+  WIZARD: 'wizard';
+  SWITCH: 'switch';
+  TEXTAREA: 'textarea';
+  SELECT: 'select';
+  PLAIN_TEXT: 'plain-text';
+  BUTTON: 'button';
+  INPUT_ADDON_GROUP: 'input-addon-group';
+  INPUT_ADDON_BUTTON_GROUP: 'input-addon-button-group';
+  DUAL_LIST_SELECT: 'dual-list-select';
+  SLIDER: 'slider';
 }
 
+declare const componentTypes: componentTypes;
+
 export default componentTypes;

packages/react-form-renderer/src/files/condition.d.ts

@@ -12,6 +12,9 @@ export interface ConditionProp {
   notMatch?: any;
   then?: ActionResolution;
   else?: ActionResolution;
+  or?: ConditionProp | ConditionProp[];
+  and?: ConditionProp | ConditionProp[];
+  not?: ConditionProp | ConditionProp[];
 }
 
 export interface ConditionDefinition extends ConditionProp {

packages/react-form-renderer/src/files/data-types.d.ts

@@ -1,11 +1,13 @@
 export type DataType = 'integer'|'float'|'number'|'boolean'|'string';
 
 interface dataTypes {
-  INTEGER: string;
-  FLOAT: string;
-  NUMBER: string;
-  BOOLEAN: string;
-  STRING: string;
+  INTEGER: 'integer';
+  FLOAT: 'float';
+  NUMBER: 'number';
+  BOOLEAN: 'boolean';
+  STRING: 'string';
 }
 
+declare const dataTypes: dataTypes;
+
 export default dataTypes;

packages/react-form-renderer/src/files/field-array.d.ts

@@ -1,3 +1,5 @@
 import { FieldArrayProps } from 'react-final-form-arrays';
 
-export default FieldArrayProps;
+declare const FieldArray: React.ComponentType<FieldArrayProps<any, HTMLElement>>;
+
+export default FieldArray;

packages/react-form-renderer/src/files/field.d.ts

@@ -5,17 +5,21 @@ import { AnyObject } from "./common";
 
 export type FieldAction = [string, ...any[]];
 
+export interface FieldActions {
+  [key: string]: FieldAction;
+}
+
 interface Field extends AnyObject {
   name: string;
   component: string;
   validate?: Validator[];
-  condition?: ConditionDefinition[];
+  condition?: ConditionDefinition | ConditionDefinition[];
   initializeOnMount?: boolean;
   dataType?: DataType;
   initialValue?: any;
   clearedValue?: any;
   clearOnUnmount?: boolean;
-  actions?: FieldAction;
+  actions?: FieldActions;
 }
 
 export default Field;

packages/react-form-renderer/src/files/form-renderer.d.ts

@@ -1,24 +1,20 @@
 import { ComponentType, FunctionComponent } from 'react';
-import { FormApi } from 'final-form';
+import { FormApi, SubmissionErrors } from 'final-form';
+import { FormProps } from 'react-final-form';
 import Schema from './schema';
 import ComponentMapper from './component-mapper';
 import ValidatorMapper from './validator-mapper';
 import ActionMapper from './action-mapper';
 import SchemaValidatorMapper from './schema-validator-mapper';
 import { FormTemplateRenderProps } from '../../dist/cjs';
+import { AnyObject } from './common';
 
-export interface FormSubscription {
-  [key: string]: boolean;
-}
-
-export interface FormRendererProps {
+export interface FormRendererProps extends FormProps {
   initialValues?: object;
-  onSubmit: (values: object, formApi: FormApi, callback: () => void) => Promise<any>;
-  onCancel?: () => void;
+  onCancel?: (values: AnyObject, ...args: any[]) => void;
   onReset?: () => void;
   schema: Schema;
   clearOnUnmount?: boolean;
-  subscription?: FormSubscription;
   clearedValue?: any;
   componentMapper: ComponentMapper;
   FormTemplate: ComponentType<FormTemplateRenderProps> | FunctionComponent<FormTemplateRenderProps>;

packages/react-form-renderer/src/files/form.d.ts

@@ -1,3 +1,5 @@
 import { FormProps } from 'react-final-form';
 
-export default FormProps;
+declare const Form: React.ComponentType<FormProps<{}>>;
+
+export default Form;

packages/react-form-renderer/src/files/schema-validator-mapper.d.ts

@@ -1,5 +1,5 @@
 export interface PartialValidator {
-  [key: string]: () => void;
+  [key: string]: (...args: any[]) => void;
 }
 
 interface SchemaValidatorMapper {

packages/react-form-renderer/src/files/use-field-api.d.ts

@@ -20,4 +20,4 @@ T extends HTMLElement = HTMLElement> extends AnyObject {
   meta: FieldMetaState<FieldValue>;
 }
 
-export default function(options: UseFieldApiConfig): UseFieldApiProps<string>;
+export default function(options: UseFieldApiConfig): UseFieldApiProps<any>;

packages/react-form-renderer/src/files/validator-types.d.ts

@@ -1,13 +1,15 @@
 interface validatorTypes {
-  REQUIRED: string;
-  MIN_LENGTH: string;
-  MAX_LENGTH: string;
-  EXACT_LENGTH: string;
-  MIN_ITEMS: string;
-  MIN_NUMBER_VALUE: string;
-  MAX_NUMBER_VALUE: string;
-  PATTERN: string;
-  URL: string;
+  REQUIRED: 'required';
+  MIN_LENGTH: 'min-length';
+  MAX_LENGTH: 'max-length';
+  EXACT_LENGTH: 'exact-length';
+  MIN_ITEMS: 'min-items';
+  MIN_NUMBER_VALUE: 'min-number-value';
+  MAX_NUMBER_VALUE: 'max-number-value';
+  PATTERN: 'pattern';
+  URL: 'url';
 }
 
+declare const validatorTypes: validatorTypes;
+
 export default validatorTypes;