@digigov/form 2.0.0-a402a664 → 2.0.0-a64dc016

package/{registry/index.js → src/registry.ts}

@@ -10,7 +10,7 @@ import * as _digigov_form_Field_FieldBaseContainer from "@digigov/form/Field/Fie
 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_BaseFieldArray from "@digigov/form/FieldArray/BaseFieldArray";
 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";
@@ -25,15 +25,17 @@ import * as _digigov_form_Questions_QuestionsContext from "@digigov/form/Questio
 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_hooks_useFieldFocusManager from "@digigov/form/hooks/useFieldFocusManager";
+import * as _digigov_form_hooks_utils from "@digigov/form/hooks/utils";
 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_inputs_registry from "@digigov/form/inputs/registry";
 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_resolveField from "@digigov/form/Field/utils/resolveField";
 import * as _digigov_form_Field_utils_useField from "@digigov/form/Field/utils/useField";
+import * as _digigov_form_FieldArray_FormDialog_ArrayEditModal from "@digigov/form/FieldArray/FormDialog/ArrayEditModal";
+import * as _digigov_form_FieldArray_FormDialog from "@digigov/form/FieldArray/FormDialog";
 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";
@@ -45,21 +47,22 @@ import * as _digigov_form_Questions_Step_StepTitle from "@digigov/form/Questions
 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_Checkboxes from "@digigov/form/inputs/Checkboxes";
 import * as _digigov_form_inputs_AutoCompleteInput from "@digigov/form/inputs/AutoCompleteInput";
 import * as _digigov_form_inputs_DateInput from "@digigov/form/inputs/DateInput";
+import * as _digigov_form_inputs_Checkboxes from "@digigov/form/inputs/Checkboxes";
 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_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_inputs_Radio from "@digigov/form/inputs/Radio";
 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_email from "@digigov/form/validators/utils/email";
 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";
@@ -71,6 +74,10 @@ import * as _digigov_form_validators_utils_phone from "@digigov/form/validators/
 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_FieldArray_FormDialog_ArrayDisplay_ArrayContainerDisplay from "@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayContainerDisplay";
+import * as _digigov_form_FieldArray_FormDialog_ArrayDisplay_ArrayItemDisplay from "@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayItemDisplay";
+import * as _digigov_form_FieldArray_FormDialog_ArrayDisplay_ArrayItemHeader from "@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayItemHeader";
+import * as _digigov_form_FieldArray_FormDialog_ArrayDisplay from "@digigov/form/FieldArray/FormDialog/ArrayDisplay";
 function lazyImport(pkgImport) {
   return new Proxy(
     {},
@@ -101,7 +108,7 @@ export default {
   '@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/FieldArray/FormDialog': lazyImport(_digigov_form_FieldArray_FormDialog),
+  '@digigov/form/FieldArray/BaseFieldArray': lazyImport(_digigov_form_FieldArray_BaseFieldArray),
   '@digigov/form/FieldArray': lazyImport(_digigov_form_FieldArray),
   '@digigov/form/FieldObject': lazyImport(_digigov_form_FieldObject),
   '@digigov/form/Fieldset/FieldsetWithContext': lazyImport(_digigov_form_Fieldset_FieldsetWithContext),
@@ -116,15 +123,17 @@ export default {
   '@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/hooks/useFieldFocusManager': lazyImport(_digigov_form_hooks_useFieldFocusManager),
+  '@digigov/form/hooks/utils': lazyImport(_digigov_form_hooks_utils),
   '@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/inputs/registry': lazyImport(_digigov_form_inputs_registry),
   '@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/resolveField': lazyImport(_digigov_form_Field_utils_resolveField),
   '@digigov/form/Field/utils/useField': lazyImport(_digigov_form_Field_utils_useField),
+  '@digigov/form/FieldArray/FormDialog/ArrayEditModal': lazyImport(_digigov_form_FieldArray_FormDialog_ArrayEditModal),
+  '@digigov/form/FieldArray/FormDialog': lazyImport(_digigov_form_FieldArray_FormDialog),
   '@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,21 +145,22 @@ export default {
   '@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/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
   '@digigov/form/inputs/AutoCompleteInput': lazyImport(_digigov_form_inputs_AutoCompleteInput),
   '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
+  '@digigov/form/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
   '@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/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/inputs/Radio': lazyImport(_digigov_form_inputs_Radio),
   '@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/email': lazyImport(_digigov_form_validators_utils_email),
   '@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),
@@ -161,5 +171,9 @@ export default {
   '@digigov/form/validators/utils/phone': lazyImport(_digigov_form_validators_utils_phone),
   '@digigov/form/validators/utils/postal_code': lazyImport(_digigov_form_validators_utils_postal_code),
   '@digigov/form/validators/utils/text_limit': lazyImport(_digigov_form_validators_utils_text_limit),
-  '@digigov/form/validators/utils/uuid4': lazyImport(_digigov_form_validators_utils_uuid4)
+  '@digigov/form/validators/utils/uuid4': lazyImport(_digigov_form_validators_utils_uuid4),
+  '@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayContainerDisplay': lazyImport(_digigov_form_FieldArray_FormDialog_ArrayDisplay_ArrayContainerDisplay),
+  '@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayItemDisplay': lazyImport(_digigov_form_FieldArray_FormDialog_ArrayDisplay_ArrayItemDisplay),
+  '@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayItemHeader': lazyImport(_digigov_form_FieldArray_FormDialog_ArrayDisplay_ArrayItemHeader),
+  '@digigov/form/FieldArray/FormDialog/ArrayDisplay': lazyImport(_digigov_form_FieldArray_FormDialog_ArrayDisplay)
 };

package/src/types.tsx

@@ -1,11 +1,11 @@
-import { UseFormReturn, UseFormProps, ErrorOption } from 'react-hook-form';
-import {
-  FieldComponentRegistry,
+import type { UseFormReturn, UseFormProps, ErrorOption } from 'react-hook-form';
+import type {
   FieldLabelProps,
   FieldSpec,
   FormData,
 } from '@digigov/form/Field/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldComponentRegistry } from '@digigov/form/inputs/registry';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 export * from '@digigov/form/Field/types';
 export interface FieldError {
   message: string;
@@ -18,25 +18,33 @@ export interface FieldsetSpec {
   body?: React.ReactNode;
 }
 
+export type registerFieldFocus = (
+  fieldName: string,
+  element: HTMLElement
+) => (name: string) => void;
+
 export interface FormContextProps {
   fieldsetsMap?: Record<string, FieldsetSpec>;
   fieldsMap: Record<string, FieldSpec>;
   control: UseFormReturn['control'];
   register: UseFormReturn['register'];
   trigger: UseFormReturn['trigger'];
+  setError: UseFormReturn['setError'];
   clearErrors: UseFormReturn['clearErrors'];
   watch: UseFormReturn['watch'];
   getFieldState: UseFormReturn['getFieldState'];
   setValue: UseFormReturn['setValue'];
   getValues: UseFormReturn['getValues'];
+  getValuesFromParentForm?: UseFormReturn['getValues'];
   unregister: UseFormReturn['unregister'];
   formState: UseFormReturn['formState'];
   reset: UseFormReturn['reset'];
   resetField: UseFormReturn['resetField'];
   registerField: (field: FieldSpec) => void;
+  registerFieldFocus: registerFieldFocus;
   errors: UseFormReturn['formState']['errors'];
   componentRegistry?: FieldComponentRegistry;
-  submit: () => Promise<void>;
+  submit: () => Promise<void> | void;
 }
 
 export interface FormBuilderProps {

package/src/utils.ts

@@ -1,6 +1,7 @@
 import { validateFieldsNatively } from '@hookform/resolvers';
-import { appendErrors, FieldError } from 'react-hook-form';
-import * as Yup from 'yup';
+import type { FieldError } from 'react-hook-form';
+import { appendErrors } from 'react-hook-form';
+import type * as Yup from 'yup';
 
 /**
  * Why `path!` ? because it could be `undefined` in some case
@@ -98,3 +99,14 @@ export const yupResolver =
       };
     }
   };
+
+export function omit<T extends Record<string, unknown>, K extends keyof T>(
+  obj: T,
+  keys: K[]
+): Omit<T, K> {
+  const result = { ...obj };
+  for (const key of keys) {
+    delete result[key];
+  }
+  return result;
+}

package/src/validators/index.ts

@@ -1,13 +1,14 @@
-import { MutableRefObject, useMemo } from 'react';
+import type { MutableRefObject } from 'react';
+import { useMemo } from 'react';
 import * as yup from 'yup';
-import { AnyObjectSchema, StringSchema } from 'yup';
-import { RequiredArraySchema } from 'yup/lib/array';
-import Lazy from 'yup/lib/Lazy';
-import { MixedSchema } from 'yup/lib/mixed';
-import { TypeOfShape, AssertsShape } from 'yup/lib/object';
-import { AnyObject } from 'yup/lib/types';
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { AnyObjectSchema, StringSchema } from 'yup';
+import type { RequiredArraySchema } from 'yup/lib/array';
+import type Lazy from 'yup/lib/Lazy';
+import type { MixedSchema } from 'yup/lib/mixed';
+import type { TypeOfShape, AssertsShape } from 'yup/lib/object';
+import type { AnyObject } from 'yup/lib/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 import {
   getYupObjectShape,
   AFM_VALIDATOR,
@@ -28,6 +29,7 @@ import {
   LATER_THAN_DATETIME_VALIDATOR,
   EARLIER_THAN_DATETIME_VALIDATOR,
 } from '@digigov/form/validators/utils';
+import { EMAIL_VALIDATOR } from '@digigov/form/validators/utils/email';
 import { INT_VALIDATOR } from '@digigov/form/validators/utils/int';
 import { NUMBER_VALIDATOR } from '@digigov/form/validators/utils/number';
 
@@ -76,6 +78,24 @@ export const getYUPTypeMap = (
       | Lazy<any, unknown> => {
       return getYupObjectShape(field.extra.fields, yupTypeMap);
     },
+    rate: (field) => {
+      const min = field?.min ? field.min : 0;
+      const max = field?.max ? field.max : 100;
+      return yup
+        .number()
+        .transform((v, o) => (o === '' ? null : v))
+        .nullable()
+        .notRequired()
+        .integer({ key: 'form.error.positive_integer_number' })
+        .min(min, {
+          key: 'form.error.rate.rate_percent',
+          context: { min: min, max: max },
+        })
+        .max(max, {
+          key: 'form.error.rate.rate_percent',
+          context: { min: min, max: max },
+        });
+    },
     array: (
       field
     ):
@@ -103,12 +123,14 @@ export const getYUPTypeMap = (
             key: 'form.error.array.min',
             context: {
               min: field.extra.min,
+              max: field.extra.max || undefined,
             },
           });
         if (field.extra.max)
           arrayValidator = arrayValidator.max(field.extra.max, {
             key: 'form.error.array.max',
             context: {
+              min: field.extra.min || undefined,
               max: field.extra.max,
             },
           });
@@ -133,8 +155,8 @@ export const getYUPTypeMap = (
         .test(INT_VALIDATOR()),
     email: (field): yup.StringSchema =>
       field.trim
-        ? yup.string().trim().email('form.error.email')
-        : yup.string().email('form.error.email'),
+        ? yup.string().trim().test(EMAIL_VALIDATOR)
+        : yup.string().test(EMAIL_VALIDATOR),
     afm: (field): yup.StringSchema =>
       field.trim
         ? yup.string().trim().test(AFM_VALIDATOR)
@@ -239,5 +261,5 @@ export function useValidationSchema(
   return useMemo(() => {
     const yupTypeMap = getYUPTypeMap(validatorRegistry);
     return getYupObjectShape(fields, yupTypeMap, validatorRegistry);
-  }, []);
+  }, [fields, validatorRegistry]);
 }

package/src/validators/types.ts

@@ -1,2 +1,2 @@
-import * as yup from 'yup';
+import type * as yup from 'yup';
 export type ValidatorSchema = yup.TestConfig;

package/src/validators/utils/date.ts

@@ -1,20 +1,24 @@
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 dayjs.extend(customParseFormat);
 
 const VALID_DATE_FORMATS = ['DD/MM/YYYY'];
 const DATE_CACHE = {};
+const onlyNumbersRegex = /^\d+$/;
 
 const getDate = (v: string) => {
   return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);
 };
 
+const getDaysInMonth = (month: number, year: number): number => {
+  return dayjs(`${year}-${month}-01`).daysInMonth(); // e.g. 29 for Feb 2024
+};
+
 // Function to check partial date completion
 const checkPartialDate = (value: string) => {
-  console.log("value.split('/')", value.split('/'));
   const [day, month, year] = value.split('/');
   if (day && !month && !year) {
     return 'form.error.date.invalid_month_year';
@@ -33,9 +37,29 @@ const checkPartialDate = (value: string) => {
   }
   if (!day && month && year) {
     return 'form.error.date.invalid_day';
-  } else {
-    return 'form.error.date.invalid';
   }
+  if (day && month) {
+    const dayNum = parseInt(day);
+    const monthNum = parseInt(month);
+    const validYear = onlyNumbersRegex.test(year) ? year : undefined;
+    if (!validYear || year.length < 4) {
+      return 'form.error.date.invalid';
+    }
+    const yearNum = parseInt(validYear);
+    const maxDay = getDaysInMonth(monthNum, yearNum);
+    if (dayNum < 1 || dayNum > maxDay) {
+      return {
+        key: 'form.error.date.invalid_day_range',
+        context: {
+          maxDay: maxDay,
+        },
+      };
+    }
+    if (monthNum < 1 || monthNum > 12) {
+      return 'form.error.datetime.invalid_month_range';
+    }
+  }
+  return 'form.error.date.invalid';
 };
 
 export const LATER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
@@ -96,7 +120,7 @@ export const EARLIER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
 
 export const DATE_VALIDATOR = {
   name: 'date-validator',
-  message: (v): string => {
+  message: (v): string | object => {
     return checkPartialDate(v.value);
   },
   test: function (value: string) {

package/src/validators/utils/datetime.ts

@@ -1,12 +1,13 @@
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 dayjs.extend(customParseFormat);
 
 const VALID_DATETIME_FORMATS = ['DD/MM/YYYY HH:mm'];
 const DATETIME_CACHE = {};
+const onlyNumbersRegex = /^\d+$/;
 
 const getDateTime = (v: string) => {
   return DATETIME_CACHE[v]
@@ -14,54 +15,145 @@ const getDateTime = (v: string) => {
     : dayjs(v, VALID_DATETIME_FORMATS, true);
 };
 
-// Function to check partial datetime completion
+const getDaysInMonth = (month: number, year: number): number => {
+  return dayjs(`${year}-${month}-01`).daysInMonth(); // e.g. 29 for Feb 2024
+};
+
 const checkPartialDateTime = (value: string) => {
   const [datePart, timePart] = value.split(' ');
-  const [day, month, year] = datePart.split('/');
-  const [hours, minutes] = timePart ? timePart.split(':') : [null, null];
+  const [day, month, year] = datePart?.split('/') ?? [];
+  const [hours, minutes] = timePart?.split(':') ?? [];
+
+  const hasDay = Boolean(day);
+  const hasMonth = Boolean(month);
+  const hasYear = Boolean(year);
+  const hasHours = Boolean(hours);
+  const hasMinutes = Boolean(minutes);
 
-  // Check date part first
-  if (day && !month && !year) {
+  if (hasDay && !hasMonth && !hasYear && !hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_month_year_hours_minutes';
+  }
+  if (!hasDay && hasMonth && !hasYear && !hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_day_year_hours_minutes';
+  }
+  if (!hasDay && !hasMonth && hasYear && !hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_day_month_hours_minutes';
+  }
+  if (hasDay && hasMonth && !hasYear && !hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_year_hours_minutes';
+  }
+  if (hasDay && !hasMonth && hasYear && !hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_month_hours_minutes';
+  }
+  if (!hasDay && hasMonth && hasYear && !hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_day_hours_minutes';
+  }
+  if (hasDay && hasMonth && hasYear && !hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid__hours_minutes';
+  }
+  if (hasDay && hasMonth && hasYear && hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_minutes';
+  }
+  if (hasDay && hasMonth && hasYear && !hasHours && hasMinutes) {
+    return 'form.error.datetime.invalid_hours';
+  }
+  if (hasDay && !hasMonth && !hasYear && hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_month_year_minutes';
+  }
+  if (hasDay && !hasMonth && !hasYear && !hasHours && hasMinutes) {
+    return 'form.error.datetime.invalid_month_year_hours';
+  }
+  if (hasDay && !hasMonth && !hasYear && hasHours && hasMinutes) {
     return 'form.error.datetime.invalid_month_year';
   }
-  if (!day && month && !year) {
+  if (!hasDay && hasMonth && !hasYear && hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_day_year_minutes';
+  }
+  if (!hasDay && hasMonth && !hasYear && !hasHours && hasMinutes) {
+    return 'form.error.datetime.invalid_day_year_hours';
+  }
+  if (!hasDay && hasMonth && !hasYear && hasHours && hasMinutes) {
     return 'form.error.datetime.invalid_day_year';
   }
-  if (!day && !month && year) {
+  if (!hasDay && !hasMonth && hasYear && hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_day_month_minutes';
+  }
+  if (!hasDay && !hasMonth && hasYear && !hasHours && hasMinutes) {
+    return 'form.error.datetime.invalid_day_month_hours';
+  }
+  if (!hasDay && !hasMonth && hasYear && hasHours && hasMinutes) {
     return 'form.error.datetime.invalid_day_month';
   }
-  if (day && month && !year) {
+  if (!hasDay && !hasMonth && !hasYear && hasHours && hasMinutes) {
+    return 'form.error.datetime.invalid_day_month_year';
+  }
+  if (!hasDay && !hasMonth && !hasYear && !hasHours && hasMinutes) {
+    return 'form.error.datetime.invalid_day_month_year_hours';
+  }
+  if (hasDay && hasMonth && !hasYear && hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_year_minutes';
+  }
+  if (hasDay && hasMonth && !hasYear && !hasHours && hasMinutes) {
+    return 'form.error.datetime.invalid_year_hours';
+  }
+  if (hasDay && hasMonth && !hasYear && hasHours && hasMinutes) {
     return 'form.error.datetime.invalid_year';
   }
-  if (day && !month && year) {
+  if (hasDay && !hasMonth && hasYear && hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_month_minutes';
+  }
+  if (hasDay && !hasMonth && hasYear && !hasHours && hasMinutes) {
+    return 'form.error.datetime.invalid_month_hours';
+  }
+  if (hasDay && !hasMonth && hasYear && hasHours && hasMinutes) {
     return 'form.error.datetime.invalid_month';
   }
-  if (!day && month && year) {
+  if (!hasDay && hasMonth && hasYear && hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_day_minutes';
+  }
+  if (!hasDay && hasMonth && hasYear && !hasHours && hasMinutes) {
+    return 'form.error.datetime.invalid_day_hours';
+  }
+  if (!hasDay && hasMonth && hasYear && hasHours && hasMinutes) {
     return 'form.error.datetime.invalid_day';
   }
-  // If date is complete, check time part
-  if (day && month && year) {
-    if (hours && !minutes) {
-      return 'form.error.datetime.invalid_minutes';
+  if (!hasDay && !hasMonth && !hasYear && hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_day_month_year_minutes';
+  }
+  if (hasDay && hasMonth && hasYear && !hasHours && !hasMinutes) {
+    return 'form.error.datetime.invalid_hours_minutes';
+  }
+  if (day && month) {
+    const dayNum = parseInt(day);
+    const monthNum = parseInt(month);
+    const validYear = onlyNumbersRegex.test(year) ? year : undefined;
+    if (!validYear || year.length < 4) {
+      return 'form.error.datetime.invalid';
     }
-    if (!hours && minutes) {
-      return 'form.error.datetime.invalid_hours';
+    const yearNum = parseInt(validYear);
+    const maxDay = getDaysInMonth(monthNum, yearNum);
+    if (dayNum < 1 || dayNum > maxDay) {
+      return {
+        key: 'form.error.datetime.invalid_day_range',
+        context: {
+          maxDay: maxDay,
+        },
+      };
     }
-    if (!hours && !minutes) {
-      return 'form.error.datetime.invalid';
+    if (monthNum < 1 || monthNum > 12) {
+      return 'form.error.datetime.invalid_month_range';
+    }
+  }
+  if (hours && minutes) {
+    const hoursNum = parseInt(hours);
+    const minutesNum = parseInt(minutes);
+    if (hoursNum < 0 || hoursNum > 23) {
+      return 'form.error.datetime.invalid_hours_range';
     }
-    if (hours && minutes) {
-      const hoursNum = parseInt(hours);
-      const minutesNum = parseInt(minutes);
-      if (hoursNum < 0 || hoursNum > 23) {
-        return 'form.error.datetime.invalid_hours_range';
-      }
-      if (minutesNum < 0 || minutesNum > 59) {
-        return 'form.error.datetime.invalid_minutes_range';
-      }
+    if (minutesNum < 0 || minutesNum > 59) {
+      return 'form.error.datetime.invalid_minutes_range';
     }
   }
-
   return 'form.error.datetime.invalid';
 };
 
@@ -119,7 +211,7 @@ export const EARLIER_THAN_DATETIME_VALIDATOR = (
 
 export const DATETIME_VALIDATOR = {
   name: 'datetime-validator',
-  message: (v): string => {
+  message: (v): string | object => {
     return checkPartialDateTime(v.value);
   },
   test: function (value: string) {

package/src/validators/utils/email.ts

@@ -0,0 +1,11 @@
+export const EMAIL_VALIDATOR = {
+  name: 'email-validator',
+  message: 'form.error.email',
+  test: (value: string): boolean => {
+    if (!value) return true;
+    const EMAIL_REGEX =
+      // eslint-disable-next-line no-useless-escape
+      /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return EMAIL_REGEX.test(value);
+  },
+};

package/src/validators/utils/file.ts

@@ -1,5 +1,5 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 const DEFAULT_FILE_MAX_SIZE = 10000000;
 

package/src/validators/utils/iban.ts

@@ -1,5 +1,5 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 export function validateIban(value: string, countryCode: string): boolean {
   value = value.replace(/\s/g, '').replace(/-/g, '');
   if (value.match(/^[0-9]*$/i)) {

package/src/validators/utils/image.ts

@@ -1,5 +1,5 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 const DEFAULT_IMAGE_MAX_HEIGHT_SIZE = 2000;
 const DEFAULT_IMAGE_MAX_WIDTH_SIZE = 2000;

package/src/validators/utils/index.ts

@@ -1,6 +1,6 @@
 import * as yup from 'yup';
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 export * from '@digigov/form/validators/utils/afm';
 export * from '@digigov/form/validators/utils/amka';
@@ -65,9 +65,13 @@ export function computeShape(
       yupField = yupField.nullable().required('form.error.required');
     }
     if (validatorRegistry && field.type && validatorRegistry[field.type]) {
-      validatorRegistry[field.type].forEach((validator: any) => {
-        yupField = yupField.test(validator);
-      });
+      if (Array.isArray(validatorRegistry[field.type])) {
+        validatorRegistry[field.type].forEach((validator: any) => {
+          yupField = yupField.test(validator);
+        });
+      } else {
+        yupField = yupField.test(validatorRegistry[field.type]);
+      }
     }
     if (field.validators) {
       field.validators.forEach((validator) => {

package/src/validators/utils/int.ts

@@ -1,4 +1,4 @@
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 export function validateIntNumber(number: number): boolean {
   if (number === undefined) {