@digigov/form 2.0.0-834daea4 → 2.0.0-87b6232d

package/src/registry.js

@@ -1,74 +1,78 @@
 
-import * as _digigov_form_Field_FieldBase from '@digigov/form/Field/FieldBase';
-import * as _digigov_form_Field_FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';
-import * as _digigov_form_Field_FieldConditional from '@digigov/form/Field/FieldConditional';
-import * as _digigov_form_Field from '@digigov/form/Field';
-import * as _digigov_form_Field_types from '@digigov/form/Field/types';
-import * as _digigov_form_Field_utils_calculateField from '@digigov/form/Field/utils/calculateField';
-import * as _digigov_form_Field_utils_evaluateFieldWithConditions from '@digigov/form/Field/utils/evaluateFieldWithConditions';
-import * as _digigov_form_Field_utils from '@digigov/form/Field/utils';
-import * as _digigov_form_Field_utils_useField from '@digigov/form/Field/utils/useField';
-import * as _digigov_form_FieldArray from '@digigov/form/FieldArray';
-import * as _digigov_form_FieldObject from '@digigov/form/FieldObject';
-import * as _digigov_form_Fieldset_FieldsetWithContext from '@digigov/form/Fieldset/FieldsetWithContext';
-import * as _digigov_form_Fieldset from '@digigov/form/Fieldset';
-import * as _digigov_form_Fieldset_types from '@digigov/form/Fieldset/types';
-import * as _digigov_form_FormBuilder from '@digigov/form/FormBuilder';
-import * as _digigov_form_FormContext from '@digigov/form/FormContext';
-import * as _digigov_form from '@digigov/form';
-import * as _digigov_form_inputs_AutoCompleteInput from '@digigov/form/inputs/AutoCompleteInput';
-import * as _digigov_form_inputs_Checkboxes from '@digigov/form/inputs/Checkboxes';
-import * as _digigov_form_inputs_DateInput from '@digigov/form/inputs/DateInput';
-import * as _digigov_form_inputs_FileInput from '@digigov/form/inputs/FileInput';
-import * as _digigov_form_inputs_ImageInput from '@digigov/form/inputs/ImageInput';
-import * as _digigov_form_inputs from '@digigov/form/inputs';
-import * as _digigov_form_inputs_Input from '@digigov/form/inputs/Input';
-import * as _digigov_form_inputs_Input_inputsInputScenarios from '@digigov/form/inputs/Input/inputsInputScenarios';
-import * as _digigov_form_inputs_inputsScenarios from '@digigov/form/inputs/inputsScenarios';
-import * as _digigov_form_inputs_Label from '@digigov/form/inputs/Label';
-import * as _digigov_form_inputs_OtpInput from '@digigov/form/inputs/OtpInput';
-import * as _digigov_form_inputs_Radio from '@digigov/form/inputs/Radio';
-import * as _digigov_form_inputs_Select from '@digigov/form/inputs/Select';
-import * as _digigov_form_internal from '@digigov/form/internal';
-import * as _digigov_form_locales_el from '@digigov/form/locales/el';
-import * as _digigov_form_MultiplicityField_add_objects from '@digigov/form/MultiplicityField/add-objects';
-import * as _digigov_form_MultiplicityField from '@digigov/form/MultiplicityField';
-import * as _digigov_form_MultiplicityField_types from '@digigov/form/MultiplicityField/types';
-import * as _digigov_form_Questions_getNextStep from '@digigov/form/Questions/getNextStep';
-import * as _digigov_form_Questions from '@digigov/form/Questions';
-import * as _digigov_form_Questions_Questions from '@digigov/form/Questions/Questions';
-import * as _digigov_form_Questions_QuestionsContext from '@digigov/form/Questions/QuestionsContext';
-import * as _digigov_form_Questions_Step_getAddMoreFields from '@digigov/form/Questions/Step/getAddMoreFields';
-import * as _digigov_form_Questions_Step from '@digigov/form/Questions/Step';
-import * as _digigov_form_Questions_Step_ReviewStep from '@digigov/form/Questions/Step/ReviewStep';
-import * as _digigov_form_Questions_Step_Step from '@digigov/form/Questions/Step/Step';
-import * as _digigov_form_Questions_Step_StepArrayReview from '@digigov/form/Questions/Step/StepArrayReview';
-import * as _digigov_form_Questions_Step_StepContext from '@digigov/form/Questions/Step/StepContext';
-import * as _digigov_form_Questions_Step_StepDescription from '@digigov/form/Questions/Step/StepDescription';
-import * as _digigov_form_Questions_Step_StepForm from '@digigov/form/Questions/Step/StepForm';
-import * as _digigov_form_Questions_Step_StepQuote from '@digigov/form/Questions/Step/StepQuote';
-import * as _digigov_form_Questions_Step_StepTitle from '@digigov/form/Questions/Step/StepTitle';
-import * as _digigov_form_Questions_Step_types from '@digigov/form/Questions/Step/types';
-import * as _digigov_form_Questions_types from '@digigov/form/Questions/types';
-import * as _digigov_form_types from '@digigov/form/types';
-import * as _digigov_form_utils from '@digigov/form/utils';
-import * as _digigov_form_validators from '@digigov/form/validators';
-import * as _digigov_form_validators_types from '@digigov/form/validators/types';
-import * as _digigov_form_validators_utils_afm from '@digigov/form/validators/utils/afm';
-import * as _digigov_form_validators_utils_date from '@digigov/form/validators/utils/date';
-import * as _digigov_form_validators_utils_file from '@digigov/form/validators/utils/file';
-import * as _digigov_form_validators_utils_iban from '@digigov/form/validators/utils/iban';
-import * as _digigov_form_validators_utils_image from '@digigov/form/validators/utils/image';
-import * as _digigov_form_validators_utils from '@digigov/form/validators/utils';
-import * as _digigov_form_validators_utils_int from '@digigov/form/validators/utils/int';
-import * as _digigov_form_validators_utils_number from '@digigov/form/validators/utils/number';
-import * as _digigov_form_validators_utils_otp from '@digigov/form/validators/utils/otp';
-import * as _digigov_form_validators_utils_phone from '@digigov/form/validators/utils/phone';
-import * as _digigov_form_validators_utils_postal_code from '@digigov/form/validators/utils/postal_code';
-import * as _digigov_form_validators_utils_text_limit from '@digigov/form/validators/utils/text_limit';
-import * as _digigov_form_validators_utils_uuid4 from '@digigov/form/validators/utils/uuid4'
+import * as _digigov_form_FormContext from "@digigov/form/FormContext";
+import * as _digigov_form from "@digigov/form";
+import * as _digigov_form_internal from "@digigov/form/internal";
+import * as _digigov_form_types from "@digigov/form/types";
+import * as _digigov_form_utils from "@digigov/form/utils";
+import * as _digigov_form_Field_ErrorGroup from "@digigov/form/Field/ErrorGroup";
+import * as _digigov_form_Field_FieldBase from "@digigov/form/Field/FieldBase";
+import * as _digigov_form_Field_FieldBaseContainer from "@digigov/form/Field/FieldBaseContainer";
+import * as _digigov_form_Field_FieldConditional from "@digigov/form/Field/FieldConditional";
+import * as _digigov_form_Field from "@digigov/form/Field";
+import * as _digigov_form_Field_types from "@digigov/form/Field/types";
+import * as _digigov_form_FieldArray_FormDialog from "@digigov/form/FieldArray/FormDialog";
+import * as _digigov_form_FieldArray from "@digigov/form/FieldArray";
+import * as _digigov_form_FieldObject from "@digigov/form/FieldObject";
+import * as _digigov_form_Fieldset_FieldsetWithContext from "@digigov/form/Fieldset/FieldsetWithContext";
+import * as _digigov_form_Fieldset from "@digigov/form/Fieldset";
+import * as _digigov_form_Fieldset_types from "@digigov/form/Fieldset/types";
+import * as _digigov_form_FormBuilder from "@digigov/form/FormBuilder";
+import * as _digigov_form_MultiplicityField_add_objects from "@digigov/form/MultiplicityField/add-objects";
+import * as _digigov_form_MultiplicityField from "@digigov/form/MultiplicityField";
+import * as _digigov_form_MultiplicityField_types from "@digigov/form/MultiplicityField/types";
+import * as _digigov_form_Questions_Questions from "@digigov/form/Questions/Questions";
+import * as _digigov_form_Questions_QuestionsContext from "@digigov/form/Questions/QuestionsContext";
+import * as _digigov_form_Questions_getNextStep from "@digigov/form/Questions/getNextStep";
+import * as _digigov_form_Questions from "@digigov/form/Questions";
+import * as _digigov_form_Questions_types from "@digigov/form/Questions/types";
+import * as _digigov_form_inputs from "@digigov/form/inputs";
+import * as _digigov_form_inputs_inputsScenarios from "@digigov/form/inputs/inputsScenarios";
+import * as _digigov_form_locales_el from "@digigov/form/locales/el";
+import * as _digigov_form_validators from "@digigov/form/validators";
+import * as _digigov_form_validators_types from "@digigov/form/validators/types";
+import * as _digigov_form_Field_utils_calculateField from "@digigov/form/Field/utils/calculateField";
+import * as _digigov_form_Field_utils_evaluateFieldWithConditions from "@digigov/form/Field/utils/evaluateFieldWithConditions";
+import * as _digigov_form_Field_utils from "@digigov/form/Field/utils";
+import * as _digigov_form_Field_utils_useField from "@digigov/form/Field/utils/useField";
+import * as _digigov_form_Questions_Step_ReviewStep from "@digigov/form/Questions/Step/ReviewStep";
+import * as _digigov_form_Questions_Step_Step from "@digigov/form/Questions/Step/Step";
+import * as _digigov_form_Questions_Step_StepArrayReview from "@digigov/form/Questions/Step/StepArrayReview";
+import * as _digigov_form_Questions_Step_StepContext from "@digigov/form/Questions/Step/StepContext";
+import * as _digigov_form_Questions_Step_StepDescription from "@digigov/form/Questions/Step/StepDescription";
+import * as _digigov_form_Questions_Step_StepForm from "@digigov/form/Questions/Step/StepForm";
+import * as _digigov_form_Questions_Step_StepQuote from "@digigov/form/Questions/Step/StepQuote";
+import * as _digigov_form_Questions_Step_StepTitle from "@digigov/form/Questions/Step/StepTitle";
+import * as _digigov_form_Questions_Step_getAddMoreFields from "@digigov/form/Questions/Step/getAddMoreFields";
+import * as _digigov_form_Questions_Step from "@digigov/form/Questions/Step";
+import * as _digigov_form_Questions_Step_types from "@digigov/form/Questions/Step/types";
+import * as _digigov_form_inputs_AutoCompleteInput from "@digigov/form/inputs/AutoCompleteInput";
+import * as _digigov_form_inputs_Checkboxes from "@digigov/form/inputs/Checkboxes";
+import * as _digigov_form_inputs_DateInput from "@digigov/form/inputs/DateInput";
+import * as _digigov_form_inputs_DateTimeInput from "@digigov/form/inputs/DateTimeInput";
+import * as _digigov_form_inputs_FileInput from "@digigov/form/inputs/FileInput";
+import * as _digigov_form_inputs_ImageInput from "@digigov/form/inputs/ImageInput";
+import * as _digigov_form_inputs_Input from "@digigov/form/inputs/Input";
+import * as _digigov_form_inputs_Input_inputsInputScenarios from "@digigov/form/inputs/Input/inputsInputScenarios";
+import * as _digigov_form_inputs_Label from "@digigov/form/inputs/Label";
+import * as _digigov_form_inputs_OtpInput from "@digigov/form/inputs/OtpInput";
+import * as _digigov_form_inputs_Radio from "@digigov/form/inputs/Radio";
+import * as _digigov_form_inputs_Select from "@digigov/form/inputs/Select";
+import * as _digigov_form_validators_utils_afm from "@digigov/form/validators/utils/afm";
+import * as _digigov_form_validators_utils_amka from "@digigov/form/validators/utils/amka";
+import * as _digigov_form_validators_utils_date from "@digigov/form/validators/utils/date";
+import * as _digigov_form_validators_utils_datetime from "@digigov/form/validators/utils/datetime";
+import * as _digigov_form_validators_utils_file from "@digigov/form/validators/utils/file";
+import * as _digigov_form_validators_utils_iban from "@digigov/form/validators/utils/iban";
+import * as _digigov_form_validators_utils_image from "@digigov/form/validators/utils/image";
+import * as _digigov_form_validators_utils from "@digigov/form/validators/utils";
+import * as _digigov_form_validators_utils_int from "@digigov/form/validators/utils/int";
+import * as _digigov_form_validators_utils_number from "@digigov/form/validators/utils/number";
+import * as _digigov_form_validators_utils_otp from "@digigov/form/validators/utils/otp";
+import * as _digigov_form_validators_utils_phone from "@digigov/form/validators/utils/phone";
+import * as _digigov_form_validators_utils_postal_code from "@digigov/form/validators/utils/postal_code";
+import * as _digigov_form_validators_utils_text_limit from "@digigov/form/validators/utils/text_limit";
+import * as _digigov_form_validators_utils_uuid4 from "@digigov/form/validators/utils/uuid4";
 function lazyImport(pkgImport) {
-  // eslint-disable-next-line no-undef
   return new Proxy(
     {},
     {
@@ -87,47 +91,41 @@ function lazyImport(pkgImport) {
   )
 }
 export default {
+  '@digigov/form/FormContext': lazyImport(_digigov_form_FormContext),
+  '@digigov/form': lazyImport(_digigov_form),
+  '@digigov/form/internal': lazyImport(_digigov_form_internal),
+  '@digigov/form/types': lazyImport(_digigov_form_types),
+  '@digigov/form/utils': lazyImport(_digigov_form_utils),
+  '@digigov/form/Field/ErrorGroup': lazyImport(_digigov_form_Field_ErrorGroup),
   '@digigov/form/Field/FieldBase': lazyImport(_digigov_form_Field_FieldBase),
   '@digigov/form/Field/FieldBaseContainer': lazyImport(_digigov_form_Field_FieldBaseContainer),
   '@digigov/form/Field/FieldConditional': lazyImport(_digigov_form_Field_FieldConditional),
   '@digigov/form/Field': lazyImport(_digigov_form_Field),
   '@digigov/form/Field/types': lazyImport(_digigov_form_Field_types),
-  '@digigov/form/Field/utils/calculateField': lazyImport(_digigov_form_Field_utils_calculateField),
-  '@digigov/form/Field/utils/evaluateFieldWithConditions': lazyImport(_digigov_form_Field_utils_evaluateFieldWithConditions),
-  '@digigov/form/Field/utils': lazyImport(_digigov_form_Field_utils),
-  '@digigov/form/Field/utils/useField': lazyImport(_digigov_form_Field_utils_useField),
+  '@digigov/form/FieldArray/FormDialog': lazyImport(_digigov_form_FieldArray_FormDialog),
   '@digigov/form/FieldArray': lazyImport(_digigov_form_FieldArray),
   '@digigov/form/FieldObject': lazyImport(_digigov_form_FieldObject),
   '@digigov/form/Fieldset/FieldsetWithContext': lazyImport(_digigov_form_Fieldset_FieldsetWithContext),
   '@digigov/form/Fieldset': lazyImport(_digigov_form_Fieldset),
   '@digigov/form/Fieldset/types': lazyImport(_digigov_form_Fieldset_types),
   '@digigov/form/FormBuilder': lazyImport(_digigov_form_FormBuilder),
-  '@digigov/form/FormContext': lazyImport(_digigov_form_FormContext),
-  '@digigov/form': lazyImport(_digigov_form),
-  '@digigov/form/inputs/AutoCompleteInput': lazyImport(_digigov_form_inputs_AutoCompleteInput),
-  '@digigov/form/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
-  '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
-  '@digigov/form/inputs/FileInput': lazyImport(_digigov_form_inputs_FileInput),
-  '@digigov/form/inputs/ImageInput': lazyImport(_digigov_form_inputs_ImageInput),
-  '@digigov/form/inputs': lazyImport(_digigov_form_inputs),
-  '@digigov/form/inputs/Input': lazyImport(_digigov_form_inputs_Input),
-  '@digigov/form/inputs/Input/inputsInputScenarios': lazyImport(_digigov_form_inputs_Input_inputsInputScenarios),
-  '@digigov/form/inputs/inputsScenarios': lazyImport(_digigov_form_inputs_inputsScenarios),
-  '@digigov/form/inputs/Label': lazyImport(_digigov_form_inputs_Label),
-  '@digigov/form/inputs/OtpInput': lazyImport(_digigov_form_inputs_OtpInput),
-  '@digigov/form/inputs/Radio': lazyImport(_digigov_form_inputs_Radio),
-  '@digigov/form/inputs/Select': lazyImport(_digigov_form_inputs_Select),
-  '@digigov/form/internal': lazyImport(_digigov_form_internal),
-  '@digigov/form/locales/el': lazyImport(_digigov_form_locales_el),
   '@digigov/form/MultiplicityField/add-objects': lazyImport(_digigov_form_MultiplicityField_add_objects),
   '@digigov/form/MultiplicityField': lazyImport(_digigov_form_MultiplicityField),
   '@digigov/form/MultiplicityField/types': lazyImport(_digigov_form_MultiplicityField_types),
-  '@digigov/form/Questions/getNextStep': lazyImport(_digigov_form_Questions_getNextStep),
-  '@digigov/form/Questions': lazyImport(_digigov_form_Questions),
   '@digigov/form/Questions/Questions': lazyImport(_digigov_form_Questions_Questions),
   '@digigov/form/Questions/QuestionsContext': lazyImport(_digigov_form_Questions_QuestionsContext),
-  '@digigov/form/Questions/Step/getAddMoreFields': lazyImport(_digigov_form_Questions_Step_getAddMoreFields),
-  '@digigov/form/Questions/Step': lazyImport(_digigov_form_Questions_Step),
+  '@digigov/form/Questions/getNextStep': lazyImport(_digigov_form_Questions_getNextStep),
+  '@digigov/form/Questions': lazyImport(_digigov_form_Questions),
+  '@digigov/form/Questions/types': lazyImport(_digigov_form_Questions_types),
+  '@digigov/form/inputs': lazyImport(_digigov_form_inputs),
+  '@digigov/form/inputs/inputsScenarios': lazyImport(_digigov_form_inputs_inputsScenarios),
+  '@digigov/form/locales/el': lazyImport(_digigov_form_locales_el),
+  '@digigov/form/validators': lazyImport(_digigov_form_validators),
+  '@digigov/form/validators/types': lazyImport(_digigov_form_validators_types),
+  '@digigov/form/Field/utils/calculateField': lazyImport(_digigov_form_Field_utils_calculateField),
+  '@digigov/form/Field/utils/evaluateFieldWithConditions': lazyImport(_digigov_form_Field_utils_evaluateFieldWithConditions),
+  '@digigov/form/Field/utils': lazyImport(_digigov_form_Field_utils),
+  '@digigov/form/Field/utils/useField': lazyImport(_digigov_form_Field_utils_useField),
   '@digigov/form/Questions/Step/ReviewStep': lazyImport(_digigov_form_Questions_Step_ReviewStep),
   '@digigov/form/Questions/Step/Step': lazyImport(_digigov_form_Questions_Step_Step),
   '@digigov/form/Questions/Step/StepArrayReview': lazyImport(_digigov_form_Questions_Step_StepArrayReview),
@@ -136,14 +134,25 @@ export default {
   '@digigov/form/Questions/Step/StepForm': lazyImport(_digigov_form_Questions_Step_StepForm),
   '@digigov/form/Questions/Step/StepQuote': lazyImport(_digigov_form_Questions_Step_StepQuote),
   '@digigov/form/Questions/Step/StepTitle': lazyImport(_digigov_form_Questions_Step_StepTitle),
+  '@digigov/form/Questions/Step/getAddMoreFields': lazyImport(_digigov_form_Questions_Step_getAddMoreFields),
+  '@digigov/form/Questions/Step': lazyImport(_digigov_form_Questions_Step),
   '@digigov/form/Questions/Step/types': lazyImport(_digigov_form_Questions_Step_types),
-  '@digigov/form/Questions/types': lazyImport(_digigov_form_Questions_types),
-  '@digigov/form/types': lazyImport(_digigov_form_types),
-  '@digigov/form/utils': lazyImport(_digigov_form_utils),
-  '@digigov/form/validators': lazyImport(_digigov_form_validators),
-  '@digigov/form/validators/types': lazyImport(_digigov_form_validators_types),
+  '@digigov/form/inputs/AutoCompleteInput': lazyImport(_digigov_form_inputs_AutoCompleteInput),
+  '@digigov/form/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
+  '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
+  '@digigov/form/inputs/DateTimeInput': lazyImport(_digigov_form_inputs_DateTimeInput),
+  '@digigov/form/inputs/FileInput': lazyImport(_digigov_form_inputs_FileInput),
+  '@digigov/form/inputs/ImageInput': lazyImport(_digigov_form_inputs_ImageInput),
+  '@digigov/form/inputs/Input': lazyImport(_digigov_form_inputs_Input),
+  '@digigov/form/inputs/Input/inputsInputScenarios': lazyImport(_digigov_form_inputs_Input_inputsInputScenarios),
+  '@digigov/form/inputs/Label': lazyImport(_digigov_form_inputs_Label),
+  '@digigov/form/inputs/OtpInput': lazyImport(_digigov_form_inputs_OtpInput),
+  '@digigov/form/inputs/Radio': lazyImport(_digigov_form_inputs_Radio),
+  '@digigov/form/inputs/Select': lazyImport(_digigov_form_inputs_Select),
   '@digigov/form/validators/utils/afm': lazyImport(_digigov_form_validators_utils_afm),
+  '@digigov/form/validators/utils/amka': lazyImport(_digigov_form_validators_utils_amka),
   '@digigov/form/validators/utils/date': lazyImport(_digigov_form_validators_utils_date),
+  '@digigov/form/validators/utils/datetime': lazyImport(_digigov_form_validators_utils_datetime),
   '@digigov/form/validators/utils/file': lazyImport(_digigov_form_validators_utils_file),
   '@digigov/form/validators/utils/iban': lazyImport(_digigov_form_validators_utils_iban),
   '@digigov/form/validators/utils/image': lazyImport(_digigov_form_validators_utils_image),
@@ -156,4 +165,3 @@ export default {
   '@digigov/form/validators/utils/text_limit': lazyImport(_digigov_form_validators_utils_text_limit),
   '@digigov/form/validators/utils/uuid4': lazyImport(_digigov_form_validators_utils_uuid4)
 };
-  

package/src/types.tsx

@@ -1,4 +1,4 @@
-import { UseFormReturn, UseFormProps } from 'react-hook-form';
+import { UseFormReturn, UseFormProps, ErrorOption } from 'react-hook-form';
 import {
   FieldComponentRegistry,
   FieldLabelProps,
@@ -7,9 +7,9 @@ import {
 } from '@digigov/form/Field/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 export * from '@digigov/form/Field/types';
-export type FieldError = {
+export interface FieldError {
   message: string;
-};
+}
 
 export interface FieldsetSpec {
   key: string;
@@ -54,6 +54,7 @@ export interface FormBuilderProps {
   componentRegistry?: FieldComponentRegistry;
   grid?: boolean;
   controlledFieldsOnly?: boolean;
+  errors?: ErrorOption;
 }
 
 export interface FormBaseProps

package/src/utils.ts

@@ -13,6 +13,7 @@ const parseErrorSchema = (
   return (error.inner || []).reduce<Record<string, FieldError>>(
     (previous, error) => {
       error.path = error.path?.replace(/\[([0-9]+)\]/g, '.$1');
+      // error.path = error.path?.replace(/\["(.*?)"\]/g, '$1');
       if (!previous[error.path!]) {
         previous[error.path!] = { message: error.message, type: error.type! };
       }
@@ -37,13 +38,32 @@ const parseErrorSchema = (
     {}
   );
 };
+function isPlainObject(obj) {
+  return (
+    typeof obj === 'object' &&
+    obj !== null &&
+    Object.prototype.toString.call(obj) === '[object Object]'
+  );
+}
+function flattenObject(obj, prefix = '') {
+  return Object.keys(obj).reduce((acc, key) => {
+    const prefixedKey = prefix ? `${prefix}.${key}` : key;
+
+    if (isPlainObject(obj[key])) {
+      Object.assign(acc, flattenObject(obj[key], prefixedKey));
+    } else {
+      acc[prefixedKey] = obj[key];
+    }
+
+    return acc;
+  }, {});
+}
 
 export const yupResolver =
   (schema: any, schemaOptions: any = {}, resolverOptions: any = {}) =>
   async (values, context, options) => {
     try {
       if (schemaOptions.context && process.env.NODE_ENV === 'development') {
-        // eslint-disable-next-line no-console
         console.warn(
           "You should not used the yup options context. Please, use the 'useForm' context object instead"
         );
@@ -52,11 +72,12 @@ export const yupResolver =
       const result = await schema[
         resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'
       ](
-        values,
+        flattenObject(values),
         Object.assign({ abortEarly: false }, schemaOptions, { context })
       );
 
-      options.shouldUseNativeValidation && validateFieldsNatively({}, options);
+      if (options.shouldUseNativeValidation)
+        validateFieldsNatively({}, options);
 
       return {
         values: resolverOptions.rawValues ? values : result,
@@ -67,13 +88,13 @@ export const yupResolver =
         throw e;
       }
 
-      const parsed = parseErrorSchema(
-        e,
-        !options.shouldUseNativeValidation && options.criteriaMode === 'all'
-      );
       return {
         values: {},
-        errors: parsed,
+        errors: parseErrorSchema(
+          e,
+          !options.shouldUseNativeValidation && options.criteriaMode === 'all'
+        ),
+        options,
       };
     }
   };

package/src/validators/index.ts

@@ -11,6 +11,7 @@ import { ValidatorSchema } from '@digigov/form/validators/types';
 import {
   getYupObjectShape,
   AFM_VALIDATOR,
+  AMKA_VALIDATOR,
   FILE_MAX_SIZE_VALIDATOR,
   IBAN_VALIDATOR,
   OTP_VALIDATOR,
@@ -23,26 +24,42 @@ import {
   DATE_VALIDATOR,
   LATER_THAN_VALIDATOR,
   EARLIER_THAN_VALIDATOR,
+  DATETIME_VALIDATOR,
+  LATER_THAN_DATETIME_VALIDATOR,
+  EARLIER_THAN_DATETIME_VALIDATOR,
 } from '@digigov/form/validators/utils';
 import { INT_VALIDATOR } from '@digigov/form/validators/utils/int';
 import { NUMBER_VALIDATOR } from '@digigov/form/validators/utils/number';
 
-export const getYUPTypeMap = (): Record<string, any> => {
+export const getYUPTypeMap = (
+  validatorRegistry?: Record<string, any>
+): Record<string, any> => {
   const yupTypeMap = {
     file: (field): MixedSchema => {
+      return yup.mixed().nullable().test(FILE_MAX_SIZE_VALIDATOR(field));
+    },
+    string: (field): yup.StringSchema => {
+      if (field.trim) {
+        return yup.string().trim();
+      } else {
+        return yup.string();
+      }
+    },
+    boolean: (): yup.BooleanSchema<
+      boolean | null | undefined,
+      AnyObject,
+      boolean | null | undefined
+    > => {
       return yup
-        .mixed()
+        .boolean()
+        .nullable()
         .transform((value) => {
-          if (!value.length) {
-            return null;
-          }
+          if (value === '' || typeof value === 'string') return null;
+          if (typeof value === 'boolean') return value;
+          if (value === 0 || value === 1) return Boolean(value);
           return value;
-        })
-        .nullable()
-        .test(FILE_MAX_SIZE_VALIDATOR(field));
+        });
     },
-    string: yup.string,
-    boolean: yup.boolean,
     object: (
       field
     ):
@@ -58,10 +75,13 @@ export const getYUPTypeMap = (): Record<string, any> => {
       if (typeof field.extra.of === 'object') {
         // else if the field is an object then it is a scalar type
         // eg. number, string etc.
+        if (field.required) {
+          field.extra.min = 1;
+        }
         let arrayValidator = yup
           .array()
-          .of(yupTypeMap[field.extra.of.type](field.extra.of))
-          .required(field.required);
+          .nullable()
+          .of(yupTypeMap[field.extra.of.type](field.extra.of));
         if (field.extra.length)
           arrayValidator = arrayValidator.length(field.extra.length, {
             key: 'form.error.array.length',
@@ -94,24 +114,43 @@ export const getYUPTypeMap = (): Record<string, any> => {
     number: (): MixedSchema =>
       yup
         .mixed()
-        .transform((_, val) => (val !== '' ? Number(val) : null))
+        .transform((_, val) => (val !== '' ? Number(val) : undefined))
         .test(NUMBER_VALIDATOR()),
     int: (): MixedSchema =>
       yup
         .mixed()
-        .transform((_, val) => (val !== '' ? Number(val) : null))
+        .transform((_, val) => (val !== '' ? Number(val) : undefined))
         .test(NUMBER_VALIDATOR())
         .test(INT_VALIDATOR()),
-    email: (): yup.StringSchema => yup.string().email('form.error.email'),
-    afm: (): yup.StringSchema => yup.string().test(AFM_VALIDATOR),
-    uuid4: (): yup.StringSchema => yup.string().test(UUID4_VALIDATOR),
-    iban: (field): yup.StringSchema => yup.string().test(IBAN_VALIDATOR(field)),
-    otp: (field): yup.StringSchema => yup.string().test(OTP_VALIDATOR(field)),
+    email: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().email('form.error.email')
+        : yup.string().email('form.error.email'),
+    afm: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().test(AFM_VALIDATOR)
+        : yup.string().test(AFM_VALIDATOR),
+    amka: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().test(AMKA_VALIDATOR)
+        : yup.string().test(AMKA_VALIDATOR),
+    uuid4: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().test(UUID4_VALIDATOR)
+        : yup.string().test(UUID4_VALIDATOR),
+    iban: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().test(IBAN_VALIDATOR(field))
+        : yup.string().trim().test(IBAN_VALIDATOR(field)),
+    otp: (field): yup.StringSchema =>
+      yup.string().trim().test(OTP_VALIDATOR(field)),
     text: (field): yup.StringSchema => {
       if (field?.extra?.limit?.max || !!field?.extra?.limit?.min) {
-        return yup.string().test(TEXT_LIMIT_VALIDATOR(field));
+        return field.trim
+          ? yup.string().trim().test(TEXT_LIMIT_VALIDATOR(field))
+          : yup.string().test(TEXT_LIMIT_VALIDATOR(field));
       } else {
-        return yup.string();
+        return field.trim ? yup.string().trim() : yup.string();
       }
     },
     image: (field): MixedSchema => {
@@ -128,32 +167,65 @@ export const getYUPTypeMap = (): Record<string, any> => {
         .test(IMAGE_DIMENSION_VALIDATOR(field));
     },
     postal_code: (field): yup.StringSchema =>
-      yup.string().test(POSTALCODE_VALIDATOR(field)),
-    mobile_phone: (): yup.StringSchema =>
-      yup.string().test(MOBILE_PHONE_VALIDATOR),
+      field.trim
+        ? yup.string().trim().test(POSTALCODE_VALIDATOR(field))
+        : yup.string().test(POSTALCODE_VALIDATOR(field)),
+    mobile_phone: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().test(MOBILE_PHONE_VALIDATOR)
+        : yup.string().test(MOBILE_PHONE_VALIDATOR),
     phone_number: (field): yup.StringSchema =>
-      yup.string().test(PHONE_NUMBER_VALIDATOR(field)),
-    'choice:multiple': (): yup.ArraySchema<
+      field.trim
+        ? yup.string().trim().test(PHONE_NUMBER_VALIDATOR(field))
+        : yup.string().test(PHONE_NUMBER_VALIDATOR(field)),
+    'choice:multiple': (
+      field
+    ): yup.ArraySchema<
       yup.StringSchema<string | undefined, AnyObject, string | undefined>,
       AnyObject,
       (string | undefined)[] | null | undefined,
       (string | undefined)[] | null | undefined
-    > => yup.array().of(yup.string()).nullable(),
+    > => {
+      if (field.required) {
+        return yup.array().of(yup.string()).min(1, {
+          key: 'form.error.required',
+        });
+      }
+      return yup.array().of(yup.string()).nullable();
+    },
     'choice:single': (): StringSchema<
       string | null | undefined,
       AnyObject,
       string | null | undefined
     > => yup.string().nullable(),
-    date: (field): yup.StringSchema => {
+    date: (
+      field
+    ): yup.StringSchema<
+      string | null | undefined,
+      AnyObject,
+      string | null | undefined
+    > => {
+      let schema = yup.string().nullable();
       if (field?.extra?.min) {
-        return yup.string().test(LATER_THAN_VALIDATOR(field));
+        schema = schema.test(LATER_THAN_VALIDATOR(field));
       }
       if (field?.extra?.max) {
-        return yup.string().test(EARLIER_THAN_VALIDATOR(field));
+        schema = schema.test(EARLIER_THAN_VALIDATOR(field));
       } else {
-        return yup.string().test(DATE_VALIDATOR);
+        schema = schema.test(DATE_VALIDATOR);
+      }
+      return schema;
+    },
+    datetime: (field): yup.StringSchema => {
+      if (field?.extra?.min) {
+        return yup.string().test(LATER_THAN_DATETIME_VALIDATOR(field));
+      }
+      if (field?.extra?.max) {
+        return yup.string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));
       }
+      return yup.string().test(DATETIME_VALIDATOR);
     },
+    ...validatorRegistry,
   };
   return yupTypeMap;
 };
@@ -165,7 +237,7 @@ export function useValidationSchema(
   validatorRegistry?: Record<string, ValidatorSchema[]>
 ): Lazy<any, unknown> | AnyObjectSchema | void {
   return useMemo(() => {
-    const yupTypeMap = getYUPTypeMap();
+    const yupTypeMap = getYUPTypeMap(validatorRegistry);
     return getYupObjectShape(fields, yupTypeMap, validatorRegistry);
   }, []);
 }

package/src/validators/utils/amka.ts

@@ -0,0 +1,39 @@
+function digitSum(number) {
+  const sum = number > 9 ? 1 : 0;
+  return sum + (number % 10);
+}
+
+export function validateAMKA(amka: string): boolean {
+  // Validate that the last digit is the correct check digit (created using the
+  // Luhn algorithm https://en.wikipedia.org/wiki/Luhn_algorithm).
+  amka = String(amka);
+  const checkDigitIndex = amka.length - 1;
+  let sum = 0;
+  amka
+    .substring(0, checkDigitIndex)
+    .split('')
+    .reverse()
+    .forEach(function (value, index) {
+      const weight = ((index + 1) % 2) + 1;
+      sum += digitSum(parseInt(value, 10) * weight);
+    });
+  const sumMod10 = sum % 10;
+  if (sumMod10 === 0) {
+    return amka.substring(checkDigitIndex) === '0';
+  } else {
+    return amka.substring(checkDigitIndex) === 10 - sumMod10 + '';
+  }
+}
+
+export const AMKA_VALIDATOR = {
+  name: 'amka-validator',
+  message: 'form.error.amka',
+  test: (value): boolean => {
+    if (!value) return true;
+    const AMKA_REGEX = /^[0-9]{11}$/;
+    if (!AMKA_REGEX.test(value) || value === '00000000000') {
+      return false;
+    }
+    return validateAMKA(value);
+  },
+};