@digigov/form 2.0.0-a32ad9b2 → 2.0.0-abd768eb

package/src/inputs/inputsScenarios.ts

@@ -432,7 +432,7 @@ export const scenarios = [
         type: 'error',
         fieldKey: 'image',
         args: {
-          maxSizeToMb: 0.0003,
+          maxSize: 0.0003,
         },
         text: el.form.error.file_size,
       },
@@ -440,7 +440,7 @@ export const scenarios = [
         type: 'error',
         fieldKey: 'file',
         args: {
-          maxSizeToMb: 0.0003,
+          maxSize: 0.0003,
         },
         text: el.form.error.file_size,
       },

package/src/lazy.js

@@ -9,12 +9,12 @@ export default {
   'FieldBase': lazy(() => import('@digigov/form/Field/FieldBase').then((module) => ({ default: module['FieldBase'] }))),
   'FieldBaseContainer': lazy(() => import('@digigov/form/Field/FieldBaseContainer').then((module) => ({ default: module['FieldBaseContainer'] }))),
   'FieldConditional': lazy(() => import('@digigov/form/Field/FieldConditional').then((module) => ({ default: module['FieldConditional'] }))),
-  'FieldObject': lazy(() => import('@digigov/form/FieldObject').then((module) => ({ default: module['FieldObject'] }))),
   'FormDialog': lazy(() => import('@digigov/form/FieldArray/FormDialog').then((module) => ({ default: module['FormDialog'] }))),
   'ArrayItemModal': lazy(() => import('@digigov/form/FieldArray/FormDialog').then((module) => ({ default: module['ArrayItemModal'] }))),
   'ArrayItemHeader': lazy(() => import('@digigov/form/FieldArray/FormDialog').then((module) => ({ default: module['ArrayItemHeader'] }))),
   'ArrayItemDisplay': lazy(() => import('@digigov/form/FieldArray/FormDialog').then((module) => ({ default: module['ArrayItemDisplay'] }))),
   'FieldArray': lazy(() => import('@digigov/form/FieldArray').then((module) => ({ default: module['FieldArray'] }))),
+  'FieldObject': lazy(() => import('@digigov/form/FieldObject').then((module) => ({ default: module['FieldObject'] }))),
   'FieldsetWithContext': lazy(() => import('@digigov/form/Fieldset/FieldsetWithContext').then((module) => ({ default: module['FieldsetWithContext'] }))),
   'FieldsetLabel': lazy(() => import('@digigov/form/Fieldset').then((module) => ({ default: module['FieldsetLabel'] }))),
   'FieldsetCaption': lazy(() => import('@digigov/form/Fieldset').then((module) => ({ default: module['FieldsetCaption'] }))),
@@ -57,6 +57,7 @@ export default {
   'RadioButtonsGroup': lazy(() => import('@digigov/form/inputs/Radio').then((module) => ({ default: module['RadioButtonsGroup'] }))),
   'ControlledRadioButtonsGroup': lazy(() => import('@digigov/form/inputs/Radio').then((module) => ({ default: module['ControlledRadioButtonsGroup'] }))),
   'AFM_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['AFM_VALIDATOR'] }))),
+  'AMKA_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['AMKA_VALIDATOR'] }))),
   'LATER_THAN_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['LATER_THAN_VALIDATOR'] }))),
   'EARLIER_THAN_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['EARLIER_THAN_VALIDATOR'] }))),
   'DATE_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['DATE_VALIDATOR'] }))),

package/src/registry.js

@@ -10,9 +10,9 @@ 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_FieldObject from "@digigov/form/FieldObject";
 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";
@@ -48,16 +48,16 @@ import * as _digigov_form_Questions_Step_types from "@digigov/form/Questions/Ste
 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_DateTimeInput from "@digigov/form/inputs/DateTimeInput";
 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";
@@ -101,9 +101,9 @@ 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/FieldObject': lazyImport(_digigov_form_FieldObject),
   '@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),
@@ -139,16 +139,16 @@ export default {
   '@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/DateTimeInput': lazyImport(_digigov_form_inputs_DateTimeInput),
   '@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),

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,
@@ -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,6 +38,26 @@ 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 = {}) =>
@@ -51,7 +72,7 @@ export const yupResolver =
       const result = await schema[
         resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'
       ](
-        values,
+        flattenObject(values),
         Object.assign({ abortEarly: false }, schemaOptions, { context })
       );
 
@@ -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,
@@ -30,13 +31,15 @@ import {
 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()
         .transform((value) => {
-          if (!value.length) {
+          if (!value || value.length === 0) {
             return null;
           }
           return value;
@@ -81,10 +84,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',
@@ -133,6 +139,10 @@ export const getYUPTypeMap = (): Record<string, any> => {
       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)
@@ -215,6 +225,7 @@ export const getYUPTypeMap = (): Record<string, any> => {
       }
       return yup.string().test(DATETIME_VALIDATOR);
     },
+    ...validatorRegistry,
   };
   return yupTypeMap;
 };
@@ -226,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);
-  }, []);
+  }, [fields, 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);
+  },
+};

package/src/validators/utils/date.ts

@@ -7,14 +7,18 @@ 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

@@ -7,6 +7,7 @@ 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/file.ts

@@ -3,25 +3,39 @@ import { ValidatorSchema } from '@digigov/form/validators/types';
 
 const DEFAULT_FILE_MAX_SIZE = 10000000;
 
-export const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => ({
-  name: 'file-max-size-validator',
-  message: {
-    key:
-      field.type === 'file' ? 'form.error.file_size' : 'form.error.image_size',
-    context: {
-      maxSizeToMb:
-        (field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE) / 1000000,
+export const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
+  const maxSizeInBytes = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
+  let maxSizeTransformed = maxSizeInBytes / (1024 * 1024); // In MB
+  let maxSizeText = 'MB';
+  if (Math.round(maxSizeTransformed) === 0) {
+    maxSizeTransformed = Math.round(maxSizeInBytes / 1024);
+    maxSizeText = 'KB';
+  }
+  if (Math.round(maxSizeTransformed) === 0) {
+    maxSizeTransformed = maxSizeInBytes;
+    maxSizeText = 'Bytes';
+  }
+  return {
+    name: 'file-max-size-validator',
+    message: {
+      key:
+        field.type === 'file'
+          ? 'form.error.file_size'
+          : 'form.error.image_size',
+      context: {
+        maxSize: `${maxSizeTransformed} ${maxSizeText}`,
+      },
     },
-  },
-  test: (value: File[]): boolean => {
-    if (value) {
-      for (const file of value) {
-        const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
-        if (file.size > maxSize) {
-          return false;
+    test: (value: File[]): boolean => {
+      if (value) {
+        for (const file of Array.from(value)) {
+          const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
+          if (file.size > maxSize) {
+            return false;
+          }
         }
       }
-    }
-    return true;
-  },
-});
+      return true;
+    },
+  };
+};

package/src/validators/utils/index.ts

@@ -3,6 +3,7 @@ import { FieldSpec } from '@digigov/form/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 
 export * from '@digigov/form/validators/utils/afm';
+export * from '@digigov/form/validators/utils/amka';
 export * from '@digigov/form/validators/utils/file';
 export * from '@digigov/form/validators/utils/iban';
 export * from '@digigov/form/validators/utils/otp';
@@ -98,7 +99,9 @@ export function getYupObjectShape(
 
   return yup.lazy(function () {
     const fieldSchemas = computeShape(
-      Object.values(fields.current),
+      Object.values(fields.current).filter(
+        (f: FieldSpec) => !f.key.includes('.')
+      ) as FieldSpec[],
       yupTypeMap,
       validatorRegistry
     );

package/types.d.ts

@@ -1,4 +1,4 @@
-import { UseFormReturn, UseFormProps } from 'react-hook-form';
+import { UseFormReturn, UseFormProps, ErrorOption } from 'react-hook-form';
 import { FieldComponentRegistry, FieldLabelProps, FieldSpec, FormData } from '@digigov/form/Field/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 export * from '@digigov/form/Field/types';
@@ -46,6 +46,7 @@ export interface FormBuilderProps {
     componentRegistry?: FieldComponentRegistry;
     grid?: boolean;
     controlledFieldsOnly?: boolean;
+    errors?: ErrorOption;
 }
 export interface FormBaseProps extends Omit<FormBuilderProps, 'fields' | 'fieldsets' | 'auto'> {
     fieldsetsMap?: Record<string, FieldsetSpec>;

package/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/types.tsx"],
-  "sourcesContent": ["import { UseFormReturn, UseFormProps } from 'react-hook-form';\nimport {\n  FieldComponentRegistry,\n  FieldLabelProps,\n  FieldSpec,\n  FormData,\n} from '@digigov/form/Field/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\nexport * from '@digigov/form/Field/types';\nexport interface FieldError {\n  message: string;\n}\n\nexport interface FieldsetSpec {\n  key: string;\n  fields: string[];\n  label?: FieldLabelProps;\n  body?: React.ReactNode;\n}\n\nexport interface FormContextProps {\n  fieldsetsMap?: Record<string, FieldsetSpec>;\n  fieldsMap: Record<string, FieldSpec>;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  trigger: UseFormReturn['trigger'];\n  clearErrors: UseFormReturn['clearErrors'];\n  watch: UseFormReturn['watch'];\n  getFieldState: UseFormReturn['getFieldState'];\n  setValue: UseFormReturn['setValue'];\n  getValues: UseFormReturn['getValues'];\n  unregister: UseFormReturn['unregister'];\n  formState: UseFormReturn['formState'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  registerField: (field: FieldSpec) => void;\n  errors: UseFormReturn['formState']['errors'];\n  componentRegistry?: FieldComponentRegistry;\n  submit: () => Promise<void>;\n}\n\nexport interface FormBuilderProps {\n  fields?: FieldSpec[];\n  fieldsets?: FieldsetSpec[];\n  initial?: FormData;\n  onSubmit?: (data: FormData) => void | null | FieldError[];\n  mode?: UseFormProps['mode'];\n  reValidateMode?: UseFormProps['reValidateMode'];\n  criteriaMode?: UseFormProps['criteriaMode'];\n  children?: React.ReactNode;\n  shouldFocusError?: boolean;\n  auto?: boolean;\n  validatorRegistry?: Record<string, ValidatorSchema[]>;\n  componentRegistry?: FieldComponentRegistry;\n  grid?: boolean;\n  controlledFieldsOnly?: boolean;\n}\n\nexport interface FormBaseProps\n  extends Omit<FormBuilderProps, 'fields' | 'fieldsets' | 'auto'> {\n  fieldsetsMap?: Record<string, FieldsetSpec>;\n  fieldsMap: Record<string, FieldSpec>;\n  registerField: (field: FieldSpec) => void;\n  resolver: any;\n}\n"],
+  "sourcesContent": ["import { UseFormReturn, UseFormProps, ErrorOption } from 'react-hook-form';\nimport {\n  FieldComponentRegistry,\n  FieldLabelProps,\n  FieldSpec,\n  FormData,\n} from '@digigov/form/Field/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\nexport * from '@digigov/form/Field/types';\nexport interface FieldError {\n  message: string;\n}\n\nexport interface FieldsetSpec {\n  key: string;\n  fields: string[];\n  label?: FieldLabelProps;\n  body?: React.ReactNode;\n}\n\nexport interface FormContextProps {\n  fieldsetsMap?: Record<string, FieldsetSpec>;\n  fieldsMap: Record<string, FieldSpec>;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  trigger: UseFormReturn['trigger'];\n  clearErrors: UseFormReturn['clearErrors'];\n  watch: UseFormReturn['watch'];\n  getFieldState: UseFormReturn['getFieldState'];\n  setValue: UseFormReturn['setValue'];\n  getValues: UseFormReturn['getValues'];\n  unregister: UseFormReturn['unregister'];\n  formState: UseFormReturn['formState'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  registerField: (field: FieldSpec) => void;\n  errors: UseFormReturn['formState']['errors'];\n  componentRegistry?: FieldComponentRegistry;\n  submit: () => Promise<void>;\n}\n\nexport interface FormBuilderProps {\n  fields?: FieldSpec[];\n  fieldsets?: FieldsetSpec[];\n  initial?: FormData;\n  onSubmit?: (data: FormData) => void | null | FieldError[];\n  mode?: UseFormProps['mode'];\n  reValidateMode?: UseFormProps['reValidateMode'];\n  criteriaMode?: UseFormProps['criteriaMode'];\n  children?: React.ReactNode;\n  shouldFocusError?: boolean;\n  auto?: boolean;\n  validatorRegistry?: Record<string, ValidatorSchema[]>;\n  componentRegistry?: FieldComponentRegistry;\n  grid?: boolean;\n  controlledFieldsOnly?: boolean;\n  errors?: ErrorOption;\n}\n\nexport interface FormBaseProps\n  extends Omit<FormBuilderProps, 'fields' | 'fieldsets' | 'auto'> {\n  fieldsetsMap?: Record<string, FieldsetSpec>;\n  fieldsMap: Record<string, FieldSpec>;\n  registerField: (field: FieldSpec) => void;\n  resolver: any;\n}\n"],
   "mappings": "AAQA,cAAc;",
   "names": []
 }