@digigov/form 2.0.0-d0adc9fb → 2.0.0-d2ffc726

package/validators/utils/date/index.js

@@ -3,11 +3,14 @@ import customParseFormat from "dayjs/plugin/customParseFormat";
 dayjs.extend(customParseFormat);
 const VALID_DATE_FORMATS = ["DD/MM/YYYY"];
 const DATE_CACHE = {};
+const onlyNumbersRegex = /^\d+$/;
 const getDate = (v) => {
   return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);
 };
+const getDaysInMonth = (month, year) => {
+  return dayjs(`${year}-${month}-01`).daysInMonth();
+};
 const checkPartialDate = (value) => {
-  console.log("value.split('/')", value.split("/"));
   const [day, month, year] = value.split("/");
   if (day && !month && !year) {
     return "form.error.date.invalid_month_year";
@@ -26,9 +29,29 @@ const checkPartialDate = (value) => {
   }
   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 : void 0;
+    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
+        }
+      };
+    }
+    if (monthNum < 1 || monthNum > 12) {
+      return "form.error.datetime.invalid_month_range";
+    }
+  }
+  return "form.error.date.invalid";
 };
 const LATER_THAN_VALIDATOR = (field) => {
   let minDate;

package/validators/utils/date.d.ts

@@ -1,9 +1,9 @@
-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 declare const LATER_THAN_VALIDATOR: (field: FieldSpec) => ValidatorSchema;
 export declare const EARLIER_THAN_VALIDATOR: (field: FieldSpec) => ValidatorSchema;
 export declare const DATE_VALIDATOR: {
     name: string;
-    message: (v: any) => string;
+    message: (v: any) => string | object;
     test: (value: string) => any;
 };

package/validators/utils/date.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/validators/utils/date.ts"],
-  "sourcesContent": ["import dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport { FieldSpec } from '@digigov/form/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\n\ndayjs.extend(customParseFormat);\n\nconst VALID_DATE_FORMATS = ['DD/MM/YYYY'];\nconst DATE_CACHE = {};\n\nconst getDate = (v: string) => {\n  return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);\n};\n\n// Function to check partial date completion\nconst checkPartialDate = (value: string) => {\n  console.log(\"value.split('/')\", value.split('/'));\n  const [day, month, year] = value.split('/');\n  if (day && !month && !year) {\n    return 'form.error.date.invalid_month_year';\n  }\n  if (!day && month && !year) {\n    return 'form.error.date.invalid_day_year';\n  }\n  if (!day && !month && year) {\n    return 'form.error.date.invalid_day_month';\n  }\n  if (day && month && !year) {\n    return 'form.error.date.invalid_year';\n  }\n  if (day && !month && year) {\n    return 'form.error.date.invalid_month';\n  }\n  if (!day && month && year) {\n    return 'form.error.date.invalid_day';\n  } else {\n    return 'form.error.date.invalid';\n  }\n};\n\nexport const LATER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {\n  let minDate;\n  const params = field.extra || {};\n  if (params.min === 'now') {\n    const today = new Date();\n    minDate = new Date(today);\n  } else {\n    minDate = getDate(params.min).toDate();\n  }\n  const minPreviousDate = new Date(minDate);\n  minPreviousDate.setDate(minDate.getDate() - 1);\n  return {\n    name: 'later-than',\n    message: {\n      key: 'form.error.date.later_than',\n      context: {\n        minDate: minPreviousDate.toLocaleDateString(),\n      },\n    },\n    test: function (value: string) {\n      if (!value) return true;\n      const date = getDate(value);\n      const isValid = +date.toDate() > +minDate;\n      return isValid;\n    },\n  };\n};\n\nexport const EARLIER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {\n  let maxDate;\n  const params = field.extra || {};\n  if (params.max === 'now') {\n    const today = new Date();\n    maxDate = new Date(today);\n  } else {\n    maxDate = getDate(params.max).toDate();\n  }\n  const maxNextDate = new Date(maxDate);\n  maxNextDate.setDate(maxDate.getDate() + 1);\n  return {\n    name: 'earlier-than',\n    message: {\n      key: 'form.error.date.earlier_than',\n      context: {\n        maxDate: maxNextDate.toLocaleDateString(),\n      },\n    },\n    test: function (value: string) {\n      if (!value) return true;\n      const date = getDate(value);\n      const isValid = +date.toDate() < +maxDate;\n      return isValid;\n    },\n  };\n};\n\nexport const DATE_VALIDATOR = {\n  name: 'date-validator',\n  message: (v): string => {\n    return checkPartialDate(v.value);\n  },\n  test: function (value: string) {\n    if (!value) return true;\n    const date = getDate(value);\n    return date.isValid();\n  },\n};\n"],
-  "mappings": "AAAA,OAAO,WAAW;AAClB,OAAO,uBAAuB;AAI9B,MAAM,OAAO,iBAAiB;AAE9B,MAAM,qBAAqB,CAAC,YAAY;AACxC,MAAM,aAAa,CAAC;AAEpB,MAAM,UAAU,CAAC,MAAc;AAC7B,SAAO,WAAW,CAAC,IAAI,WAAW,CAAC,IAAI,MAAM,GAAG,oBAAoB,IAAI;AAC1E;AAGA,MAAM,mBAAmB,CAAC,UAAkB;AAC1C,UAAQ,IAAI,oBAAoB,MAAM,MAAM,GAAG,CAAC;AAChD,QAAM,CAAC,KAAK,OAAO,IAAI,IAAI,MAAM,MAAM,GAAG;AAC1C,MAAI,OAAO,CAAC,SAAS,CAAC,MAAM;AAC1B,WAAO;AAAA,EACT;AACA,MAAI,CAAC,OAAO,SAAS,CAAC,MAAM;AAC1B,WAAO;AAAA,EACT;AACA,MAAI,CAAC,OAAO,CAAC,SAAS,MAAM;AAC1B,WAAO;AAAA,EACT;AACA,MAAI,OAAO,SAAS,CAAC,MAAM;AACzB,WAAO;AAAA,EACT;AACA,MAAI,OAAO,CAAC,SAAS,MAAM;AACzB,WAAO;AAAA,EACT;AACA,MAAI,CAAC,OAAO,SAAS,MAAM;AACzB,WAAO;AAAA,EACT,OAAO;AACL,WAAO;AAAA,EACT;AACF;AAEO,MAAM,uBAAuB,CAAC,UAAsC;AACzE,MAAI;AACJ,QAAM,SAAS,MAAM,SAAS,CAAC;AAC/B,MAAI,OAAO,QAAQ,OAAO;AACxB,UAAM,QAAQ,oBAAI,KAAK;AACvB,cAAU,IAAI,KAAK,KAAK;AAAA,EAC1B,OAAO;AACL,cAAU,QAAQ,OAAO,GAAG,EAAE,OAAO;AAAA,EACvC;AACA,QAAM,kBAAkB,IAAI,KAAK,OAAO;AACxC,kBAAgB,QAAQ,QAAQ,QAAQ,IAAI,CAAC;AAC7C,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,MACP,KAAK;AAAA,MACL,SAAS;AAAA,QACP,SAAS,gBAAgB,mBAAmB;AAAA,MAC9C;AAAA,IACF;AAAA,IACA,MAAM,SAAU,OAAe;AAC7B,UAAI,CAAC,MAAO,QAAO;AACnB,YAAM,OAAO,QAAQ,KAAK;AAC1B,YAAM,UAAU,CAAC,KAAK,OAAO,IAAI,CAAC;AAClC,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEO,MAAM,yBAAyB,CAAC,UAAsC;AAC3E,MAAI;AACJ,QAAM,SAAS,MAAM,SAAS,CAAC;AAC/B,MAAI,OAAO,QAAQ,OAAO;AACxB,UAAM,QAAQ,oBAAI,KAAK;AACvB,cAAU,IAAI,KAAK,KAAK;AAAA,EAC1B,OAAO;AACL,cAAU,QAAQ,OAAO,GAAG,EAAE,OAAO;AAAA,EACvC;AACA,QAAM,cAAc,IAAI,KAAK,OAAO;AACpC,cAAY,QAAQ,QAAQ,QAAQ,IAAI,CAAC;AACzC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,MACP,KAAK;AAAA,MACL,SAAS;AAAA,QACP,SAAS,YAAY,mBAAmB;AAAA,MAC1C;AAAA,IACF;AAAA,IACA,MAAM,SAAU,OAAe;AAC7B,UAAI,CAAC,MAAO,QAAO;AACnB,YAAM,OAAO,QAAQ,KAAK;AAC1B,YAAM,UAAU,CAAC,KAAK,OAAO,IAAI,CAAC;AAClC,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEO,MAAM,iBAAiB;AAAA,EAC5B,MAAM;AAAA,EACN,SAAS,CAAC,MAAc;AACtB,WAAO,iBAAiB,EAAE,KAAK;AAAA,EACjC;AAAA,EACA,MAAM,SAAU,OAAe;AAC7B,QAAI,CAAC,MAAO,QAAO;AACnB,UAAM,OAAO,QAAQ,KAAK;AAC1B,WAAO,KAAK,QAAQ;AAAA,EACtB;AACF;",
+  "sourcesContent": ["import dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport type { FieldSpec } from '@digigov/form/types';\nimport type { ValidatorSchema } from '@digigov/form/validators/types';\n\ndayjs.extend(customParseFormat);\n\nconst VALID_DATE_FORMATS = ['DD/MM/YYYY'];\nconst DATE_CACHE = {};\nconst onlyNumbersRegex = /^\\d+$/;\n\nconst getDate = (v: string) => {\n  return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);\n};\n\nconst getDaysInMonth = (month: number, year: number): number => {\n  return dayjs(`${year}-${month}-01`).daysInMonth(); // e.g. 29 for Feb 2024\n};\n\n// Function to check partial date completion\nconst checkPartialDate = (value: string) => {\n  const [day, month, year] = value.split('/');\n  if (day && !month && !year) {\n    return 'form.error.date.invalid_month_year';\n  }\n  if (!day && month && !year) {\n    return 'form.error.date.invalid_day_year';\n  }\n  if (!day && !month && year) {\n    return 'form.error.date.invalid_day_month';\n  }\n  if (day && month && !year) {\n    return 'form.error.date.invalid_year';\n  }\n  if (day && !month && year) {\n    return 'form.error.date.invalid_month';\n  }\n  if (!day && month && year) {\n    return 'form.error.date.invalid_day';\n  }\n  if (day && month) {\n    const dayNum = parseInt(day);\n    const monthNum = parseInt(month);\n    const validYear = onlyNumbersRegex.test(year) ? year : undefined;\n    if (!validYear || year.length < 4) {\n      return 'form.error.date.invalid';\n    }\n    const yearNum = parseInt(validYear);\n    const maxDay = getDaysInMonth(monthNum, yearNum);\n    if (dayNum < 1 || dayNum > maxDay) {\n      return {\n        key: 'form.error.date.invalid_day_range',\n        context: {\n          maxDay: maxDay,\n        },\n      };\n    }\n    if (monthNum < 1 || monthNum > 12) {\n      return 'form.error.datetime.invalid_month_range';\n    }\n  }\n  return 'form.error.date.invalid';\n};\n\nexport const LATER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {\n  let minDate;\n  const params = field.extra || {};\n  if (params.min === 'now') {\n    const today = new Date();\n    minDate = new Date(today);\n  } else {\n    minDate = getDate(params.min).toDate();\n  }\n  const minPreviousDate = new Date(minDate);\n  minPreviousDate.setDate(minDate.getDate() - 1);\n  return {\n    name: 'later-than',\n    message: {\n      key: 'form.error.date.later_than',\n      context: {\n        minDate: minPreviousDate.toLocaleDateString(),\n      },\n    },\n    test: function (value: string) {\n      if (!value) return true;\n      const date = getDate(value);\n      const isValid = +date.toDate() > +minDate;\n      return isValid;\n    },\n  };\n};\n\nexport const EARLIER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {\n  let maxDate;\n  const params = field.extra || {};\n  if (params.max === 'now') {\n    const today = new Date();\n    maxDate = new Date(today);\n  } else {\n    maxDate = getDate(params.max).toDate();\n  }\n  const maxNextDate = new Date(maxDate);\n  maxNextDate.setDate(maxDate.getDate() + 1);\n  return {\n    name: 'earlier-than',\n    message: {\n      key: 'form.error.date.earlier_than',\n      context: {\n        maxDate: maxNextDate.toLocaleDateString(),\n      },\n    },\n    test: function (value: string) {\n      if (!value) return true;\n      const date = getDate(value);\n      const isValid = +date.toDate() < +maxDate;\n      return isValid;\n    },\n  };\n};\n\nexport const DATE_VALIDATOR = {\n  name: 'date-validator',\n  message: (v): string | object => {\n    return checkPartialDate(v.value);\n  },\n  test: function (value: string) {\n    if (!value) return true;\n    const date = getDate(value);\n    return date.isValid();\n  },\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/validators/utils/datetime/index.js

@@ -3,50 +3,144 @@ import customParseFormat from "dayjs/plugin/customParseFormat";
 dayjs.extend(customParseFormat);
 const VALID_DATETIME_FORMATS = ["DD/MM/YYYY HH:mm"];
 const DATETIME_CACHE = {};
+const onlyNumbersRegex = /^\d+$/;
 const getDateTime = (v) => {
   return DATETIME_CACHE[v] ? DATETIME_CACHE[v] : dayjs(v, VALID_DATETIME_FORMATS, true);
 };
+const getDaysInMonth = (month, year) => {
+  return dayjs(`${year}-${month}-01`).daysInMonth();
+};
 const checkPartialDateTime = (value) => {
   const [datePart, timePart] = value.split(" ");
-  const [day, month, year] = datePart.split("/");
-  const [hours, minutes] = timePart ? timePart.split(":") : [null, null];
-  if (day && !month && !year) {
+  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);
+  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 (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 : void 0;
+    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
+        }
+      };
     }
-    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 (minutesNum < 0 || minutesNum > 59) {
-        return "form.error.datetime.invalid_minutes_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";
     }
   }
   return "form.error.datetime.invalid";

package/validators/utils/datetime.d.ts

@@ -1,9 +1,9 @@
-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 declare const LATER_THAN_DATETIME_VALIDATOR: (field: FieldSpec) => ValidatorSchema;
 export declare const EARLIER_THAN_DATETIME_VALIDATOR: (field: FieldSpec) => ValidatorSchema;
 export declare const DATETIME_VALIDATOR: {
     name: string;
-    message: (v: any) => string;
+    message: (v: any) => string | object;
     test: (value: string) => any;
 };

package/validators/utils/datetime.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/validators/utils/datetime.ts"],
-  "sourcesContent": ["import dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport { FieldSpec } from '@digigov/form/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\n\ndayjs.extend(customParseFormat);\n\nconst VALID_DATETIME_FORMATS = ['DD/MM/YYYY HH:mm'];\nconst DATETIME_CACHE = {};\n\nconst getDateTime = (v: string) => {\n  return DATETIME_CACHE[v]\n    ? DATETIME_CACHE[v]\n    : dayjs(v, VALID_DATETIME_FORMATS, true);\n};\n\n// Function to check partial datetime completion\nconst checkPartialDateTime = (value: string) => {\n  const [datePart, timePart] = value.split(' ');\n  const [day, month, year] = datePart.split('/');\n  const [hours, minutes] = timePart ? timePart.split(':') : [null, null];\n\n  // Check date part first\n  if (day && !month && !year) {\n    return 'form.error.datetime.invalid_month_year';\n  }\n  if (!day && month && !year) {\n    return 'form.error.datetime.invalid_day_year';\n  }\n  if (!day && !month && year) {\n    return 'form.error.datetime.invalid_day_month';\n  }\n  if (day && month && !year) {\n    return 'form.error.datetime.invalid_year';\n  }\n  if (day && !month && year) {\n    return 'form.error.datetime.invalid_month';\n  }\n  if (!day && month && year) {\n    return 'form.error.datetime.invalid_day';\n  }\n  // If date is complete, check time part\n  if (day && month && year) {\n    if (hours && !minutes) {\n      return 'form.error.datetime.invalid_minutes';\n    }\n    if (!hours && minutes) {\n      return 'form.error.datetime.invalid_hours';\n    }\n    if (!hours && !minutes) {\n      return 'form.error.datetime.invalid';\n    }\n    if (hours && minutes) {\n      const hoursNum = parseInt(hours);\n      const minutesNum = parseInt(minutes);\n      if (hoursNum < 0 || hoursNum > 23) {\n        return 'form.error.datetime.invalid_hours_range';\n      }\n      if (minutesNum < 0 || minutesNum > 59) {\n        return 'form.error.datetime.invalid_minutes_range';\n      }\n    }\n  }\n\n  return 'form.error.datetime.invalid';\n};\n\nexport const LATER_THAN_DATETIME_VALIDATOR = (\n  field: FieldSpec\n): ValidatorSchema => {\n  let minDateTime;\n  const params = field.extra || {};\n  if (params.min === 'now') {\n    minDateTime = dayjs();\n  } else {\n    minDateTime = getDateTime(params.min);\n  }\n  return {\n    name: 'later-than-datetime',\n    message: {\n      key: 'form.error.datetime.later_than',\n      context: {\n        minDateTime: minDateTime.format('DD/MM/YYYY HH:mm'),\n      },\n    },\n    test: function (value: string) {\n      if (!value) return true;\n      const datetime = getDateTime(value);\n      return datetime.isValid() && datetime.isAfter(minDateTime);\n    },\n  };\n};\n\nexport const EARLIER_THAN_DATETIME_VALIDATOR = (\n  field: FieldSpec\n): ValidatorSchema => {\n  let maxDateTime;\n  const params = field.extra || {};\n  if (params.max === 'now') {\n    maxDateTime = dayjs();\n  } else {\n    maxDateTime = getDateTime(params.max);\n  }\n  return {\n    name: 'earlier-than-datetime',\n    message: {\n      key: 'form.error.datetime.earlier_than',\n      context: {\n        maxDateTime: maxDateTime.format('DD/MM/YYYY HH:mm'),\n      },\n    },\n    test: function (value: string) {\n      if (!value) return true;\n      const datetime = getDateTime(value);\n      return datetime.isValid() && datetime.isBefore(maxDateTime);\n    },\n  };\n};\n\nexport const DATETIME_VALIDATOR = {\n  name: 'datetime-validator',\n  message: (v): string => {\n    return checkPartialDateTime(v.value);\n  },\n  test: function (value: string) {\n    if (!value) return true;\n    const datetime = getDateTime(value);\n    return datetime.isValid();\n  },\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport type { FieldSpec } from '@digigov/form/types';\nimport type { ValidatorSchema } from '@digigov/form/validators/types';\n\ndayjs.extend(customParseFormat);\n\nconst VALID_DATETIME_FORMATS = ['DD/MM/YYYY HH:mm'];\nconst DATETIME_CACHE = {};\nconst onlyNumbersRegex = /^\\d+$/;\n\nconst getDateTime = (v: string) => {\n  return DATETIME_CACHE[v]\n    ? DATETIME_CACHE[v]\n    : dayjs(v, VALID_DATETIME_FORMATS, true);\n};\n\nconst getDaysInMonth = (month: number, year: number): number => {\n  return dayjs(`${year}-${month}-01`).daysInMonth(); // e.g. 29 for Feb 2024\n};\n\nconst checkPartialDateTime = (value: string) => {\n  const [datePart, timePart] = value.split(' ');\n  const [day, month, year] = datePart?.split('/') ?? [];\n  const [hours, minutes] = timePart?.split(':') ?? [];\n\n  const hasDay = Boolean(day);\n  const hasMonth = Boolean(month);\n  const hasYear = Boolean(year);\n  const hasHours = Boolean(hours);\n  const hasMinutes = Boolean(minutes);\n\n  if (hasDay && !hasMonth && !hasYear && !hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_month_year_hours_minutes';\n  }\n  if (!hasDay && hasMonth && !hasYear && !hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_day_year_hours_minutes';\n  }\n  if (!hasDay && !hasMonth && hasYear && !hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_day_month_hours_minutes';\n  }\n  if (hasDay && hasMonth && !hasYear && !hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_year_hours_minutes';\n  }\n  if (hasDay && !hasMonth && hasYear && !hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_month_hours_minutes';\n  }\n  if (!hasDay && hasMonth && hasYear && !hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_day_hours_minutes';\n  }\n  if (hasDay && hasMonth && hasYear && !hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid__hours_minutes';\n  }\n  if (hasDay && hasMonth && hasYear && hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_minutes';\n  }\n  if (hasDay && hasMonth && hasYear && !hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_hours';\n  }\n  if (hasDay && !hasMonth && !hasYear && hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_month_year_minutes';\n  }\n  if (hasDay && !hasMonth && !hasYear && !hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_month_year_hours';\n  }\n  if (hasDay && !hasMonth && !hasYear && hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_month_year';\n  }\n  if (!hasDay && hasMonth && !hasYear && hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_day_year_minutes';\n  }\n  if (!hasDay && hasMonth && !hasYear && !hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_day_year_hours';\n  }\n  if (!hasDay && hasMonth && !hasYear && hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_day_year';\n  }\n  if (!hasDay && !hasMonth && hasYear && hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_day_month_minutes';\n  }\n  if (!hasDay && !hasMonth && hasYear && !hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_day_month_hours';\n  }\n  if (!hasDay && !hasMonth && hasYear && hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_day_month';\n  }\n  if (!hasDay && !hasMonth && !hasYear && hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_day_month_year';\n  }\n  if (!hasDay && !hasMonth && !hasYear && !hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_day_month_year_hours';\n  }\n  if (hasDay && hasMonth && !hasYear && hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_year_minutes';\n  }\n  if (hasDay && hasMonth && !hasYear && !hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_year_hours';\n  }\n  if (hasDay && hasMonth && !hasYear && hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_year';\n  }\n  if (hasDay && !hasMonth && hasYear && hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_month_minutes';\n  }\n  if (hasDay && !hasMonth && hasYear && !hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_month_hours';\n  }\n  if (hasDay && !hasMonth && hasYear && hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_month';\n  }\n  if (!hasDay && hasMonth && hasYear && hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_day_minutes';\n  }\n  if (!hasDay && hasMonth && hasYear && !hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_day_hours';\n  }\n  if (!hasDay && hasMonth && hasYear && hasHours && hasMinutes) {\n    return 'form.error.datetime.invalid_day';\n  }\n  if (!hasDay && !hasMonth && !hasYear && hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_day_month_year_minutes';\n  }\n  if (hasDay && hasMonth && hasYear && !hasHours && !hasMinutes) {\n    return 'form.error.datetime.invalid_hours_minutes';\n  }\n  if (day && month) {\n    const dayNum = parseInt(day);\n    const monthNum = parseInt(month);\n    const validYear = onlyNumbersRegex.test(year) ? year : undefined;\n    if (!validYear || year.length < 4) {\n      return 'form.error.datetime.invalid';\n    }\n    const yearNum = parseInt(validYear);\n    const maxDay = getDaysInMonth(monthNum, yearNum);\n    if (dayNum < 1 || dayNum > maxDay) {\n      return {\n        key: 'form.error.datetime.invalid_day_range',\n        context: {\n          maxDay: maxDay,\n        },\n      };\n    }\n    if (monthNum < 1 || monthNum > 12) {\n      return 'form.error.datetime.invalid_month_range';\n    }\n  }\n  if (hours && minutes) {\n    const hoursNum = parseInt(hours);\n    const minutesNum = parseInt(minutes);\n    if (hoursNum < 0 || hoursNum > 23) {\n      return 'form.error.datetime.invalid_hours_range';\n    }\n    if (minutesNum < 0 || minutesNum > 59) {\n      return 'form.error.datetime.invalid_minutes_range';\n    }\n  }\n  return 'form.error.datetime.invalid';\n};\n\nexport const LATER_THAN_DATETIME_VALIDATOR = (\n  field: FieldSpec\n): ValidatorSchema => {\n  let minDateTime;\n  const params = field.extra || {};\n  if (params.min === 'now') {\n    minDateTime = dayjs();\n  } else {\n    minDateTime = getDateTime(params.min);\n  }\n  return {\n    name: 'later-than-datetime',\n    message: {\n      key: 'form.error.datetime.later_than',\n      context: {\n        minDateTime: minDateTime.format('DD/MM/YYYY HH:mm'),\n      },\n    },\n    test: function (value: string) {\n      if (!value) return true;\n      const datetime = getDateTime(value);\n      return datetime.isValid() && datetime.isAfter(minDateTime);\n    },\n  };\n};\n\nexport const EARLIER_THAN_DATETIME_VALIDATOR = (\n  field: FieldSpec\n): ValidatorSchema => {\n  let maxDateTime;\n  const params = field.extra || {};\n  if (params.max === 'now') {\n    maxDateTime = dayjs();\n  } else {\n    maxDateTime = getDateTime(params.max);\n  }\n  return {\n    name: 'earlier-than-datetime',\n    message: {\n      key: 'form.error.datetime.earlier_than',\n      context: {\n        maxDateTime: maxDateTime.format('DD/MM/YYYY HH:mm'),\n      },\n    },\n    test: function (value: string) {\n      if (!value) return true;\n      const datetime = getDateTime(value);\n      return datetime.isValid() && datetime.isBefore(maxDateTime);\n    },\n  };\n};\n\nexport const DATETIME_VALIDATOR = {\n  name: 'datetime-validator',\n  message: (v): string | object => {\n    return checkPartialDateTime(v.value);\n  },\n  test: function (value: string) {\n    if (!value) return true;\n    const datetime = getDateTime(value);\n    return datetime.isValid();\n  },\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/validators/utils/email/index.js

@@ -0,0 +1,16 @@
+const EMAIL_VALIDATOR = {
+  name: "email-validator",
+  message: "form.error.email",
+  test: (value) => {
+    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);
+  }
+};
+export {
+  EMAIL_VALIDATOR
+};
+//# sourceMappingURL=email.js.map

package/validators/utils/email/package.json

@@ -0,0 +1,6 @@
+{
+  "sideEffects": false,
+  "module": "./index.js",
+  "types": "./index.d.ts",
+  "main": "../../../cjs/validators/utils/email/index.js"
+}

package/validators/utils/email.d.ts

@@ -0,0 +1,5 @@
+export declare const EMAIL_VALIDATOR: {
+    name: string;
+    message: string;
+    test: (value: string) => boolean;
+};

package/validators/utils/email.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/validators/utils/email.ts"],
+  "sourcesContent": ["export const EMAIL_VALIDATOR = {\n  name: 'email-validator',\n  message: 'form.error.email',\n  test: (value: string): boolean => {\n    if (!value) return true;\n    const EMAIL_REGEX =\n      // eslint-disable-next-line no-useless-escape\n      /^(([^<>()\\[\\]\\\\.,;:\\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,}))$/;\n    return EMAIL_REGEX.test(value);\n  },\n};\n"],
+  "mappings": "AAAO,MAAM,kBAAkB;AAAA,EAC7B,MAAM;AAAA,EACN,SAAS;AAAA,EACT,MAAM,CAAC,UAA2B;AAChC,QAAI,CAAC,MAAO,QAAO;AACnB,UAAM;AAAA;AAAA,MAEJ;AAAA;AACF,WAAO,YAAY,KAAK,KAAK;AAAA,EAC/B;AACF;",
+  "names": []
+}

package/validators/utils/file/index.js

@@ -1,24 +1,37 @@
 const DEFAULT_FILE_MAX_SIZE = 1e7;
-const FILE_MAX_SIZE_VALIDATOR = (field) => ({
-  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) / 1e6
-    }
-  },
-  test: (value) => {
-    if (value) {
-      for (const file of value) {
-        const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
-        if (file.size > maxSize) {
-          return false;
+const FILE_MAX_SIZE_VALIDATOR = (field) => {
+  const maxSizeInBytes = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
+  let maxSizeTransformed = maxSizeInBytes / (1024 * 1024);
+  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) => {
+      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;
-  }
-});
+  };
+};
 export {
   FILE_MAX_SIZE_VALIDATOR
 };

package/validators/utils/file.d.ts

@@ -1,3 +1,3 @@
-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 declare const FILE_MAX_SIZE_VALIDATOR: (field: FieldSpec) => ValidatorSchema;

package/validators/utils/file.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/validators/utils/file.ts"],
-  "sourcesContent": ["import { FieldSpec } from '@digigov/form/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\n\nconst DEFAULT_FILE_MAX_SIZE = 10000000;\n\nexport const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => ({\n  name: 'file-max-size-validator',\n  message: {\n    key:\n      field.type === 'file' ? 'form.error.file_size' : 'form.error.image_size',\n    context: {\n      maxSizeToMb:\n        (field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE) / 1000000,\n    },\n  },\n  test: (value: File[]): boolean => {\n    if (value) {\n      for (const file of value) {\n        const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;\n        if (file.size > maxSize) {\n          return false;\n        }\n      }\n    }\n    return true;\n  },\n});\n"],
-  "mappings": "AAGA,MAAM,wBAAwB;AAEvB,MAAM,0BAA0B,CAAC,WAAuC;AAAA,EAC7E,MAAM;AAAA,EACN,SAAS;AAAA,IACP,KACE,MAAM,SAAS,SAAS,yBAAyB;AAAA,IACnD,SAAS;AAAA,MACP,cACG,OAAO,OAAO,OAAO,WAAW,yBAAyB;AAAA,IAC9D;AAAA,EACF;AAAA,EACA,MAAM,CAAC,UAA2B;AAChC,QAAI,OAAO;AACT,iBAAW,QAAQ,OAAO;AACxB,cAAM,UAAU,OAAO,OAAO,OAAO,WAAW;AAChD,YAAI,KAAK,OAAO,SAAS;AACvB,iBAAO;AAAA,QACT;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AACF;",
+  "sourcesContent": ["import type { FieldSpec } from '@digigov/form/types';\nimport type { ValidatorSchema } from '@digigov/form/validators/types';\n\nconst DEFAULT_FILE_MAX_SIZE = 10000000;\n\nexport const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => {\n  const maxSizeInBytes = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;\n  let maxSizeTransformed = maxSizeInBytes / (1024 * 1024); // In MB\n  let maxSizeText = 'MB';\n  if (Math.round(maxSizeTransformed) === 0) {\n    maxSizeTransformed = Math.round(maxSizeInBytes / 1024);\n    maxSizeText = 'KB';\n  }\n  if (Math.round(maxSizeTransformed) === 0) {\n    maxSizeTransformed = maxSizeInBytes;\n    maxSizeText = 'Bytes';\n  }\n  return {\n    name: 'file-max-size-validator',\n    message: {\n      key:\n        field.type === 'file'\n          ? 'form.error.file_size'\n          : 'form.error.image_size',\n      context: {\n        maxSize: `${maxSizeTransformed} ${maxSizeText}`,\n      },\n    },\n    test: (value: File[]): boolean => {\n      if (value) {\n        for (const file of Array.from(value)) {\n          const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;\n          if (file.size > maxSize) {\n            return false;\n          }\n        }\n      }\n      return true;\n    },\n  };\n};\n"],
+  "mappings": "AAGA,MAAM,wBAAwB;AAEvB,MAAM,0BAA0B,CAAC,UAAsC;AAC5E,QAAM,iBAAiB,OAAO,OAAO,OAAO,WAAW;AACvD,MAAI,qBAAqB,kBAAkB,OAAO;AAClD,MAAI,cAAc;AAClB,MAAI,KAAK,MAAM,kBAAkB,MAAM,GAAG;AACxC,yBAAqB,KAAK,MAAM,iBAAiB,IAAI;AACrD,kBAAc;AAAA,EAChB;AACA,MAAI,KAAK,MAAM,kBAAkB,MAAM,GAAG;AACxC,yBAAqB;AACrB,kBAAc;AAAA,EAChB;AACA,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,MACP,KACE,MAAM,SAAS,SACX,yBACA;AAAA,MACN,SAAS;AAAA,QACP,SAAS,GAAG,kBAAkB,IAAI,WAAW;AAAA,MAC/C;AAAA,IACF;AAAA,IACA,MAAM,CAAC,UAA2B;AAChC,UAAI,OAAO;AACT,mBAAW,QAAQ,MAAM,KAAK,KAAK,GAAG;AACpC,gBAAM,UAAU,OAAO,OAAO,OAAO,WAAW;AAChD,cAAI,KAAK,OAAO,SAAS;AACvB,mBAAO;AAAA,UACT;AAAA,QACF;AAAA,MACF;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACF;",
   "names": []
 }

package/validators/utils/iban.d.ts

@@ -1,4 +1,4 @@
-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 declare function validateIban(value: string, countryCode: string): boolean;
 export declare const IBAN_VALIDATOR: (field: FieldSpec) => ValidatorSchema;

package/validators/utils/iban.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/validators/utils/iban.ts"],
-  "sourcesContent": ["import { FieldSpec } from '@digigov/form/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\nexport function validateIban(value: string, countryCode: string): boolean {\n  value = value.replace(/\\s/g, '').replace(/-/g, '');\n  if (value.match(/^[0-9]*$/i)) {\n    // this is for greek iban without the country code\n    if (value.length !== 25) {\n      return false;\n    }\n  } else {\n    value = value.toUpperCase();\n    if (countryCode) {\n      if (!value.startsWith(countryCode.toUpperCase())) {\n        return false;\n      }\n      if (value.length === ibanCountryCodesLengths[countryCode.toUpperCase()]) {\n        return true;\n      }\n    }\n    if (value.length !== 27) {\n      // this is for greek iban\n      return false;\n    }\n  }\n  return true;\n}\n\nexport const IBAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {\n  const countryCode = field?.extra?.country;\n  return {\n    name: 'iban-validator',\n    message: 'form.error.iban',\n    test: (value: string): boolean => {\n      if (!value) {\n        return true;\n      }\n      return validateIban(value, countryCode);\n    },\n  };\n};\n\nconst ibanCountryCodesLengths = {\n  AD: 24,\n  AT: 20,\n  AZ: 28,\n  BH: 22,\n  BY: 28,\n  BE: 16,\n  BA: 20,\n  BR: 29,\n  BG: 22,\n  CR: 22,\n  HR: 21,\n  CY: 28,\n  CZ: 24,\n  DK: 18,\n  DO: 28,\n  EG: 29,\n  SV: 28,\n  EE: 20,\n  FO: 18,\n  FI: 18,\n  FR: 27,\n  GE: 22,\n  DE: 22,\n  GI: 23,\n  GR: 27,\n  GL: 18,\n  GT: 28,\n  VA: 22,\n  HU: 28,\n  IS: 26,\n  IQ: 23,\n  IE: 22,\n  IL: 23,\n  IT: 27,\n  JO: 30,\n  KZ: 20,\n  XK: 20,\n  KW: 30,\n  LV: 21,\n  LB: 28,\n  LI: 21,\n  LT: 20,\n  LU: 20,\n  MT: 31,\n  MR: 27,\n  MU: 30,\n  MD: 24,\n  MC: 27,\n  ME: 22,\n  NL: 18,\n  MK: 19,\n  NO: 15,\n  PK: 24,\n  PS: 29,\n  PL: 28,\n  PT: 25,\n  QA: 29,\n  RO: 24,\n  LC: 32,\n  SM: 27,\n  ST: 25,\n  SA: 24,\n  RS: 22,\n  SC: 31,\n  SK: 24,\n  SI: 19,\n  ES: 24,\n  SE: 24,\n  CH: 21,\n  TL: 23,\n  TN: 24,\n  TR: 26,\n  UA: 29,\n  AE: 23,\n  GB: 22,\n  VG: 24,\n};\n"],
+  "sourcesContent": ["import type { FieldSpec } from '@digigov/form/types';\nimport type { ValidatorSchema } from '@digigov/form/validators/types';\nexport function validateIban(value: string, countryCode: string): boolean {\n  value = value.replace(/\\s/g, '').replace(/-/g, '');\n  if (value.match(/^[0-9]*$/i)) {\n    // this is for greek iban without the country code\n    if (value.length !== 25) {\n      return false;\n    }\n  } else {\n    value = value.toUpperCase();\n    if (countryCode) {\n      if (!value.startsWith(countryCode.toUpperCase())) {\n        return false;\n      }\n      if (value.length === ibanCountryCodesLengths[countryCode.toUpperCase()]) {\n        return true;\n      }\n    }\n    if (value.length !== 27) {\n      // this is for greek iban\n      return false;\n    }\n  }\n  return true;\n}\n\nexport const IBAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {\n  const countryCode = field?.extra?.country;\n  return {\n    name: 'iban-validator',\n    message: 'form.error.iban',\n    test: (value: string): boolean => {\n      if (!value) {\n        return true;\n      }\n      return validateIban(value, countryCode);\n    },\n  };\n};\n\nconst ibanCountryCodesLengths = {\n  AD: 24,\n  AT: 20,\n  AZ: 28,\n  BH: 22,\n  BY: 28,\n  BE: 16,\n  BA: 20,\n  BR: 29,\n  BG: 22,\n  CR: 22,\n  HR: 21,\n  CY: 28,\n  CZ: 24,\n  DK: 18,\n  DO: 28,\n  EG: 29,\n  SV: 28,\n  EE: 20,\n  FO: 18,\n  FI: 18,\n  FR: 27,\n  GE: 22,\n  DE: 22,\n  GI: 23,\n  GR: 27,\n  GL: 18,\n  GT: 28,\n  VA: 22,\n  HU: 28,\n  IS: 26,\n  IQ: 23,\n  IE: 22,\n  IL: 23,\n  IT: 27,\n  JO: 30,\n  KZ: 20,\n  XK: 20,\n  KW: 30,\n  LV: 21,\n  LB: 28,\n  LI: 21,\n  LT: 20,\n  LU: 20,\n  MT: 31,\n  MR: 27,\n  MU: 30,\n  MD: 24,\n  MC: 27,\n  ME: 22,\n  NL: 18,\n  MK: 19,\n  NO: 15,\n  PK: 24,\n  PS: 29,\n  PL: 28,\n  PT: 25,\n  QA: 29,\n  RO: 24,\n  LC: 32,\n  SM: 27,\n  ST: 25,\n  SA: 24,\n  RS: 22,\n  SC: 31,\n  SK: 24,\n  SI: 19,\n  ES: 24,\n  SE: 24,\n  CH: 21,\n  TL: 23,\n  TN: 24,\n  TR: 26,\n  UA: 29,\n  AE: 23,\n  GB: 22,\n  VG: 24,\n};\n"],
   "mappings": "AAEO,SAAS,aAAa,OAAe,aAA8B;AACxE,UAAQ,MAAM,QAAQ,OAAO,EAAE,EAAE,QAAQ,MAAM,EAAE;AACjD,MAAI,MAAM,MAAM,WAAW,GAAG;AAE5B,QAAI,MAAM,WAAW,IAAI;AACvB,aAAO;AAAA,IACT;AAAA,EACF,OAAO;AACL,YAAQ,MAAM,YAAY;AAC1B,QAAI,aAAa;AACf,UAAI,CAAC,MAAM,WAAW,YAAY,YAAY,CAAC,GAAG;AAChD,eAAO;AAAA,MACT;AACA,UAAI,MAAM,WAAW,wBAAwB,YAAY,YAAY,CAAC,GAAG;AACvE,eAAO;AAAA,MACT;AAAA,IACF;AACA,QAAI,MAAM,WAAW,IAAI;AAEvB,aAAO;AAAA,IACT;AAAA,EACF;AACA,SAAO;AACT;AAEO,MAAM,iBAAiB,CAAC,UAAsC;AACnE,QAAM,cAAc,OAAO,OAAO;AAClC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,MAAM,CAAC,UAA2B;AAChC,UAAI,CAAC,OAAO;AACV,eAAO;AAAA,MACT;AACA,aAAO,aAAa,OAAO,WAAW;AAAA,IACxC;AAAA,EACF;AACF;AAEA,MAAM,0BAA0B;AAAA,EAC9B,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AACN;",
   "names": []
 }

package/validators/utils/image.d.ts

@@ -1,3 +1,3 @@
-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 declare const IMAGE_DIMENSION_VALIDATOR: (field: FieldSpec) => ValidatorSchema;

package/validators/utils/image.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/validators/utils/image.ts"],
-  "sourcesContent": ["import { FieldSpec } from '@digigov/form/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\n\nconst DEFAULT_IMAGE_MAX_HEIGHT_SIZE = 2000;\nconst DEFAULT_IMAGE_MAX_WIDTH_SIZE = 2000;\nconst DEFAULT_IMAGE_MIN_HEIGHT_SIZE = 100;\nconst DEFAULT_IMAGE_MIN_WIDTH_SIZE = 100;\n\nfunction getImageDimensions(\n  file: File\n): Promise<{ width: number; height: number }> {\n  return new Promise((resolve, reject) => {\n    const reader = new FileReader();\n    reader.onload = (event) => {\n      const img = new Image();\n      img.onload = () => {\n        resolve({ width: img.width, height: img.height });\n      };\n      img.onerror = reject;\n      const result = event?.target?.result;\n      if (result && typeof result === 'string') {\n        img.src = result;\n      } else {\n        reject(new Error('Invalid file format'));\n      }\n    };\n    reader.onerror = reject;\n    reader.readAsDataURL(file);\n  });\n}\n\nexport const IMAGE_DIMENSION_VALIDATOR = (\n  field: FieldSpec\n): ValidatorSchema => ({\n  name: 'image-dimension-validator',\n  message: (value: any) => {\n    const minHeight =\n      field?.extra?.limit?.minHeight || DEFAULT_IMAGE_MIN_HEIGHT_SIZE;\n    const minWidth =\n      field?.extra?.limit?.minWidth || DEFAULT_IMAGE_MIN_WIDTH_SIZE;\n    const maxHeight =\n      field?.extra?.limit?.maxHeight || DEFAULT_IMAGE_MAX_HEIGHT_SIZE;\n    const maxWidth =\n      field?.extra?.limit?.maxWidth || DEFAULT_IMAGE_MAX_WIDTH_SIZE;\n    if (!value || value.length === 0) {\n      return {\n        name: 'image-validator',\n        message: 'form.error.required',\n      };\n    } else {\n      return {\n        key: 'form.error.image.image_dimension_size',\n        context: {\n          maxHeight: maxHeight,\n          maxWidth: maxWidth,\n          minHeight: minHeight,\n          minWidth: minWidth,\n        },\n      };\n    }\n  },\n  test: async (value: File[]): Promise<boolean> => {\n    if (!value || value.length === 0) {\n      return true;\n    }\n    const file = value[0];\n    const { width, height } = await getImageDimensions(file);\n    const maxHeight =\n      field?.extra?.limit?.maxHeight || DEFAULT_IMAGE_MAX_HEIGHT_SIZE;\n    const maxWidth =\n      field?.extra?.limit?.maxWidth || DEFAULT_IMAGE_MAX_WIDTH_SIZE;\n    const minHeight =\n      field?.extra?.limit?.minHeight || DEFAULT_IMAGE_MIN_HEIGHT_SIZE;\n    const minWidth =\n      field?.extra?.limit?.minWidth || DEFAULT_IMAGE_MIN_WIDTH_SIZE;\n    if (!file) {\n      return true;\n    }\n    try {\n      if (height > maxHeight || width > maxWidth) {\n        return false;\n      }\n      if (height < minHeight || width < minWidth) {\n        return false;\n      }\n      return true;\n    } catch (error) {\n      console.error('Error getting image dimensions:', error);\n      return false; // Return false in case of an error.\n    }\n  },\n});\n"],
+  "sourcesContent": ["import type { FieldSpec } from '@digigov/form/types';\nimport type { ValidatorSchema } from '@digigov/form/validators/types';\n\nconst DEFAULT_IMAGE_MAX_HEIGHT_SIZE = 2000;\nconst DEFAULT_IMAGE_MAX_WIDTH_SIZE = 2000;\nconst DEFAULT_IMAGE_MIN_HEIGHT_SIZE = 100;\nconst DEFAULT_IMAGE_MIN_WIDTH_SIZE = 100;\n\nfunction getImageDimensions(\n  file: File\n): Promise<{ width: number; height: number }> {\n  return new Promise((resolve, reject) => {\n    const reader = new FileReader();\n    reader.onload = (event) => {\n      const img = new Image();\n      img.onload = () => {\n        resolve({ width: img.width, height: img.height });\n      };\n      img.onerror = reject;\n      const result = event?.target?.result;\n      if (result && typeof result === 'string') {\n        img.src = result;\n      } else {\n        reject(new Error('Invalid file format'));\n      }\n    };\n    reader.onerror = reject;\n    reader.readAsDataURL(file);\n  });\n}\n\nexport const IMAGE_DIMENSION_VALIDATOR = (\n  field: FieldSpec\n): ValidatorSchema => ({\n  name: 'image-dimension-validator',\n  message: (value: any) => {\n    const minHeight =\n      field?.extra?.limit?.minHeight || DEFAULT_IMAGE_MIN_HEIGHT_SIZE;\n    const minWidth =\n      field?.extra?.limit?.minWidth || DEFAULT_IMAGE_MIN_WIDTH_SIZE;\n    const maxHeight =\n      field?.extra?.limit?.maxHeight || DEFAULT_IMAGE_MAX_HEIGHT_SIZE;\n    const maxWidth =\n      field?.extra?.limit?.maxWidth || DEFAULT_IMAGE_MAX_WIDTH_SIZE;\n    if (!value || value.length === 0) {\n      return {\n        name: 'image-validator',\n        message: 'form.error.required',\n      };\n    } else {\n      return {\n        key: 'form.error.image.image_dimension_size',\n        context: {\n          maxHeight: maxHeight,\n          maxWidth: maxWidth,\n          minHeight: minHeight,\n          minWidth: minWidth,\n        },\n      };\n    }\n  },\n  test: async (value: File[]): Promise<boolean> => {\n    if (!value || value.length === 0) {\n      return true;\n    }\n    const file = value[0];\n    const { width, height } = await getImageDimensions(file);\n    const maxHeight =\n      field?.extra?.limit?.maxHeight || DEFAULT_IMAGE_MAX_HEIGHT_SIZE;\n    const maxWidth =\n      field?.extra?.limit?.maxWidth || DEFAULT_IMAGE_MAX_WIDTH_SIZE;\n    const minHeight =\n      field?.extra?.limit?.minHeight || DEFAULT_IMAGE_MIN_HEIGHT_SIZE;\n    const minWidth =\n      field?.extra?.limit?.minWidth || DEFAULT_IMAGE_MIN_WIDTH_SIZE;\n    if (!file) {\n      return true;\n    }\n    try {\n      if (height > maxHeight || width > maxWidth) {\n        return false;\n      }\n      if (height < minHeight || width < minWidth) {\n        return false;\n      }\n      return true;\n    } catch (error) {\n      console.error('Error getting image dimensions:', error);\n      return false; // Return false in case of an error.\n    }\n  },\n});\n"],
   "mappings": "AAGA,MAAM,gCAAgC;AACtC,MAAM,+BAA+B;AACrC,MAAM,gCAAgC;AACtC,MAAM,+BAA+B;AAErC,SAAS,mBACP,MAC4C;AAC5C,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,UAAM,SAAS,IAAI,WAAW;AAC9B,WAAO,SAAS,CAAC,UAAU;AACzB,YAAM,MAAM,IAAI,MAAM;AACtB,UAAI,SAAS,MAAM;AACjB,gBAAQ,EAAE,OAAO,IAAI,OAAO,QAAQ,IAAI,OAAO,CAAC;AAAA,MAClD;AACA,UAAI,UAAU;AACd,YAAM,SAAS,OAAO,QAAQ;AAC9B,UAAI,UAAU,OAAO,WAAW,UAAU;AACxC,YAAI,MAAM;AAAA,MACZ,OAAO;AACL,eAAO,IAAI,MAAM,qBAAqB,CAAC;AAAA,MACzC;AAAA,IACF;AACA,WAAO,UAAU;AACjB,WAAO,cAAc,IAAI;AAAA,EAC3B,CAAC;AACH;AAEO,MAAM,4BAA4B,CACvC,WACqB;AAAA,EACrB,MAAM;AAAA,EACN,SAAS,CAAC,UAAe;AACvB,UAAM,YACJ,OAAO,OAAO,OAAO,aAAa;AACpC,UAAM,WACJ,OAAO,OAAO,OAAO,YAAY;AACnC,UAAM,YACJ,OAAO,OAAO,OAAO,aAAa;AACpC,UAAM,WACJ,OAAO,OAAO,OAAO,YAAY;AACnC,QAAI,CAAC,SAAS,MAAM,WAAW,GAAG;AAChC,aAAO;AAAA,QACL,MAAM;AAAA,QACN,SAAS;AAAA,MACX;AAAA,IACF,OAAO;AACL,aAAO;AAAA,QACL,KAAK;AAAA,QACL,SAAS;AAAA,UACP;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EACA,MAAM,OAAO,UAAoC;AAC/C,QAAI,CAAC,SAAS,MAAM,WAAW,GAAG;AAChC,aAAO;AAAA,IACT;AACA,UAAM,OAAO,MAAM,CAAC;AACpB,UAAM,EAAE,OAAO,OAAO,IAAI,MAAM,mBAAmB,IAAI;AACvD,UAAM,YACJ,OAAO,OAAO,OAAO,aAAa;AACpC,UAAM,WACJ,OAAO,OAAO,OAAO,YAAY;AACnC,UAAM,YACJ,OAAO,OAAO,OAAO,aAAa;AACpC,UAAM,WACJ,OAAO,OAAO,OAAO,YAAY;AACnC,QAAI,CAAC,MAAM;AACT,aAAO;AAAA,IACT;AACA,QAAI;AACF,UAAI,SAAS,aAAa,QAAQ,UAAU;AAC1C,eAAO;AAAA,MACT;AACA,UAAI,SAAS,aAAa,QAAQ,UAAU;AAC1C,eAAO;AAAA,MACT;AACA,aAAO;AAAA,IACT,SAAS,OAAO;AACd,cAAQ,MAAM,mCAAmC,KAAK;AACtD,aAAO;AAAA,IACT;AAAA,EACF;AACF;",
   "names": []
 }

package/validators/utils/index.d.ts

@@ -1,7 +1,8 @@
 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';
 export * from '@digigov/form/validators/utils/file';
 export * from '@digigov/form/validators/utils/iban';
 export * from '@digigov/form/validators/utils/otp';

package/validators/utils/index.js

@@ -1,5 +1,6 @@
 import * as yup from "yup";
 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";
@@ -82,7 +83,9 @@ function getYupObjectShape(fields, yupTypeMap, validatorRegistry) {
   }
   return yup.lazy(function() {
     const fieldSchemas = computeShape(
-      Object.values(fields.current),
+      Object.values(fields.current).filter(
+        (f) => !f.key.includes(".")
+      ),
       yupTypeMap,
       validatorRegistry
     );

package/validators/utils/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/validators/utils/index.ts"],
-  "sourcesContent": ["import * as yup from 'yup';\nimport { FieldSpec } from '@digigov/form/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\n\nexport * from '@digigov/form/validators/utils/afm';\nexport * from '@digigov/form/validators/utils/file';\nexport * from '@digigov/form/validators/utils/iban';\nexport * from '@digigov/form/validators/utils/otp';\nexport * from '@digigov/form/validators/utils/image';\nexport * from '@digigov/form/validators/utils/phone';\nexport * from '@digigov/form/validators/utils/postal_code';\nexport * from '@digigov/form/validators/utils/uuid4';\nexport * from '@digigov/form/validators/utils/text_limit';\nexport * from '@digigov/form/validators/utils/date';\nexport * from '@digigov/form/validators/utils/datetime';\n\nexport function getYupField(field: FieldSpec, yupTypeMap: Record<string, any>) {\n  const yupField = yupTypeMap[field?.type || 'string'] || yupTypeMap['string'];\n  return yupField(field);\n}\nexport function computeShape(\n  fields: FieldSpec[],\n  yupTypeMap: Record<string, ValidatorSchema>,\n  validatorRegistry: Record<string, ValidatorSchema[]> | undefined\n) {\n  const fieldSchemas = {};\n  const objectFields: Record<string, FieldSpec[]> = {};\n  fields.forEach((field) => {\n    let yupField = getYupField(field, yupTypeMap);\n    if (field.condition) {\n      for (const key in field.condition) {\n        let then: any, otherwise: any;\n        if (field.condition[key].then) {\n          if (field.condition[key].then?.required === false) {\n            then = yupField.nullable();\n          } else if (field.condition[key].then?.required === true) {\n            then = yupField.nullable().required('form.error.required');\n          }\n        }\n        if (field.condition[key].else) {\n          if (field.condition[key].else?.required === false) {\n            otherwise = yupField.nullable();\n          } else if (field.condition[key].else?.required === true) {\n            otherwise = yupField.nullable().required('form.error.required');\n          }\n        }\n        if (then || otherwise) {\n          yupField = yupField.when(key, {\n            is: (val) => {\n              //@ts-ignore\n              const is = field.condition[key].is;\n              if (is === val || (Array.isArray(val) && val.includes(is))) {\n                return true;\n              } else {\n                return false;\n              }\n            },\n            then,\n            otherwise,\n          });\n        }\n      }\n    } else if (field.required) {\n      yupField = yupField.nullable().required('form.error.required');\n    }\n    if (validatorRegistry && field.type && validatorRegistry[field.type]) {\n      validatorRegistry[field.type].forEach((validator: any) => {\n        yupField = yupField.test(validator);\n      });\n    }\n    if (field.validators) {\n      field.validators.forEach((validator) => {\n        yupField = yupField.test(validator);\n      });\n    }\n    fieldSchemas[field.key] = yupField;\n  });\n  for (const objectKey in objectFields) {\n    fieldSchemas[objectKey] = getYupObjectShape(\n      objectFields[objectKey],\n      yupTypeMap,\n      validatorRegistry\n    );\n  }\n  return fieldSchemas;\n}\n\nexport function getYupObjectShape(\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  fields: FieldSpec[] | any,\n  yupTypeMap: Record<string, any>,\n  validatorRegistry?: Record<string, ValidatorSchema[]>\n) {\n  if (!fields.current) {\n    const fieldSchemas = computeShape(fields, yupTypeMap, validatorRegistry);\n    return yup.object().shape(fieldSchemas);\n  }\n\n  return yup.lazy(function () {\n    const fieldSchemas = computeShape(\n      Object.values(fields.current),\n      yupTypeMap,\n      validatorRegistry\n    );\n    return yup.object().shape(fieldSchemas);\n  });\n}\n"],
-  "mappings": "AAAA,YAAY,SAAS;AAIrB,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEP,SAAS,YAAY,OAAkB,YAAiC;AAC7E,QAAM,WAAW,WAAW,OAAO,QAAQ,QAAQ,KAAK,WAAW,QAAQ;AAC3E,SAAO,SAAS,KAAK;AACvB;AACO,SAAS,aACd,QACA,YACA,mBACA;AACA,QAAM,eAAe,CAAC;AACtB,QAAM,eAA4C,CAAC;AACnD,SAAO,QAAQ,CAAC,UAAU;AACxB,QAAI,WAAW,YAAY,OAAO,UAAU;AAC5C,QAAI,MAAM,WAAW;AACnB,iBAAW,OAAO,MAAM,WAAW;AACjC,YAAI,MAAW;AACf,YAAI,MAAM,UAAU,GAAG,EAAE,MAAM;AAC7B,cAAI,MAAM,UAAU,GAAG,EAAE,MAAM,aAAa,OAAO;AACjD,mBAAO,SAAS,SAAS;AAAA,UAC3B,WAAW,MAAM,UAAU,GAAG,EAAE,MAAM,aAAa,MAAM;AACvD,mBAAO,SAAS,SAAS,EAAE,SAAS,qBAAqB;AAAA,UAC3D;AAAA,QACF;AACA,YAAI,MAAM,UAAU,GAAG,EAAE,MAAM;AAC7B,cAAI,MAAM,UAAU,GAAG,EAAE,MAAM,aAAa,OAAO;AACjD,wBAAY,SAAS,SAAS;AAAA,UAChC,WAAW,MAAM,UAAU,GAAG,EAAE,MAAM,aAAa,MAAM;AACvD,wBAAY,SAAS,SAAS,EAAE,SAAS,qBAAqB;AAAA,UAChE;AAAA,QACF;AACA,YAAI,QAAQ,WAAW;AACrB,qBAAW,SAAS,KAAK,KAAK;AAAA,YAC5B,IAAI,CAAC,QAAQ;AAEX,oBAAM,KAAK,MAAM,UAAU,GAAG,EAAE;AAChC,kBAAI,OAAO,OAAQ,MAAM,QAAQ,GAAG,KAAK,IAAI,SAAS,EAAE,GAAI;AAC1D,uBAAO;AAAA,cACT,OAAO;AACL,uBAAO;AAAA,cACT;AAAA,YACF;AAAA,YACA;AAAA,YACA;AAAA,UACF,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IACF,WAAW,MAAM,UAAU;AACzB,iBAAW,SAAS,SAAS,EAAE,SAAS,qBAAqB;AAAA,IAC/D;AACA,QAAI,qBAAqB,MAAM,QAAQ,kBAAkB,MAAM,IAAI,GAAG;AACpE,wBAAkB,MAAM,IAAI,EAAE,QAAQ,CAAC,cAAmB;AACxD,mBAAW,SAAS,KAAK,SAAS;AAAA,MACpC,CAAC;AAAA,IACH;AACA,QAAI,MAAM,YAAY;AACpB,YAAM,WAAW,QAAQ,CAAC,cAAc;AACtC,mBAAW,SAAS,KAAK,SAAS;AAAA,MACpC,CAAC;AAAA,IACH;AACA,iBAAa,MAAM,GAAG,IAAI;AAAA,EAC5B,CAAC;AACD,aAAW,aAAa,cAAc;AACpC,iBAAa,SAAS,IAAI;AAAA,MACxB,aAAa,SAAS;AAAA,MACtB;AAAA,MACA;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;AAEO,SAAS,kBAEd,QACA,YACA,mBACA;AACA,MAAI,CAAC,OAAO,SAAS;AACnB,UAAM,eAAe,aAAa,QAAQ,YAAY,iBAAiB;AACvE,WAAO,IAAI,OAAO,EAAE,MAAM,YAAY;AAAA,EACxC;AAEA,SAAO,IAAI,KAAK,WAAY;AAC1B,UAAM,eAAe;AAAA,MACnB,OAAO,OAAO,OAAO,OAAO;AAAA,MAC5B;AAAA,MACA;AAAA,IACF;AACA,WAAO,IAAI,OAAO,EAAE,MAAM,YAAY;AAAA,EACxC,CAAC;AACH;",
+  "sourcesContent": ["import * as yup from 'yup';\nimport type { FieldSpec } from '@digigov/form/types';\nimport type { ValidatorSchema } from '@digigov/form/validators/types';\n\nexport * from '@digigov/form/validators/utils/afm';\nexport * from '@digigov/form/validators/utils/amka';\nexport * from '@digigov/form/validators/utils/file';\nexport * from '@digigov/form/validators/utils/iban';\nexport * from '@digigov/form/validators/utils/otp';\nexport * from '@digigov/form/validators/utils/image';\nexport * from '@digigov/form/validators/utils/phone';\nexport * from '@digigov/form/validators/utils/postal_code';\nexport * from '@digigov/form/validators/utils/uuid4';\nexport * from '@digigov/form/validators/utils/text_limit';\nexport * from '@digigov/form/validators/utils/date';\nexport * from '@digigov/form/validators/utils/datetime';\n\nexport function getYupField(field: FieldSpec, yupTypeMap: Record<string, any>) {\n  const yupField = yupTypeMap[field?.type || 'string'] || yupTypeMap['string'];\n  return yupField(field);\n}\nexport function computeShape(\n  fields: FieldSpec[],\n  yupTypeMap: Record<string, ValidatorSchema>,\n  validatorRegistry: Record<string, ValidatorSchema[]> | undefined\n) {\n  const fieldSchemas = {};\n  const objectFields: Record<string, FieldSpec[]> = {};\n  fields.forEach((field) => {\n    let yupField = getYupField(field, yupTypeMap);\n    if (field.condition) {\n      for (const key in field.condition) {\n        let then: any, otherwise: any;\n        if (field.condition[key].then) {\n          if (field.condition[key].then?.required === false) {\n            then = yupField.nullable();\n          } else if (field.condition[key].then?.required === true) {\n            then = yupField.nullable().required('form.error.required');\n          }\n        }\n        if (field.condition[key].else) {\n          if (field.condition[key].else?.required === false) {\n            otherwise = yupField.nullable();\n          } else if (field.condition[key].else?.required === true) {\n            otherwise = yupField.nullable().required('form.error.required');\n          }\n        }\n        if (then || otherwise) {\n          yupField = yupField.when(key, {\n            is: (val) => {\n              //@ts-ignore\n              const is = field.condition[key].is;\n              if (is === val || (Array.isArray(val) && val.includes(is))) {\n                return true;\n              } else {\n                return false;\n              }\n            },\n            then,\n            otherwise,\n          });\n        }\n      }\n    } else if (field.required) {\n      yupField = yupField.nullable().required('form.error.required');\n    }\n    if (validatorRegistry && field.type && validatorRegistry[field.type]) {\n      validatorRegistry[field.type].forEach((validator: any) => {\n        yupField = yupField.test(validator);\n      });\n    }\n    if (field.validators) {\n      field.validators.forEach((validator) => {\n        yupField = yupField.test(validator);\n      });\n    }\n    fieldSchemas[field.key] = yupField;\n  });\n  for (const objectKey in objectFields) {\n    fieldSchemas[objectKey] = getYupObjectShape(\n      objectFields[objectKey],\n      yupTypeMap,\n      validatorRegistry\n    );\n  }\n  return fieldSchemas;\n}\n\nexport function getYupObjectShape(\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  fields: FieldSpec[] | any,\n  yupTypeMap: Record<string, any>,\n  validatorRegistry?: Record<string, ValidatorSchema[]>\n) {\n  if (!fields.current) {\n    const fieldSchemas = computeShape(fields, yupTypeMap, validatorRegistry);\n    return yup.object().shape(fieldSchemas);\n  }\n\n  return yup.lazy(function () {\n    const fieldSchemas = computeShape(\n      Object.values(fields.current).filter(\n        (f: FieldSpec) => !f.key.includes('.')\n      ) as FieldSpec[],\n      yupTypeMap,\n      validatorRegistry\n    );\n    return yup.object().shape(fieldSchemas);\n  });\n}\n"],
+  "mappings": "AAAA,YAAY,SAAS;AAIrB,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEP,SAAS,YAAY,OAAkB,YAAiC;AAC7E,QAAM,WAAW,WAAW,OAAO,QAAQ,QAAQ,KAAK,WAAW,QAAQ;AAC3E,SAAO,SAAS,KAAK;AACvB;AACO,SAAS,aACd,QACA,YACA,mBACA;AACA,QAAM,eAAe,CAAC;AACtB,QAAM,eAA4C,CAAC;AACnD,SAAO,QAAQ,CAAC,UAAU;AACxB,QAAI,WAAW,YAAY,OAAO,UAAU;AAC5C,QAAI,MAAM,WAAW;AACnB,iBAAW,OAAO,MAAM,WAAW;AACjC,YAAI,MAAW;AACf,YAAI,MAAM,UAAU,GAAG,EAAE,MAAM;AAC7B,cAAI,MAAM,UAAU,GAAG,EAAE,MAAM,aAAa,OAAO;AACjD,mBAAO,SAAS,SAAS;AAAA,UAC3B,WAAW,MAAM,UAAU,GAAG,EAAE,MAAM,aAAa,MAAM;AACvD,mBAAO,SAAS,SAAS,EAAE,SAAS,qBAAqB;AAAA,UAC3D;AAAA,QACF;AACA,YAAI,MAAM,UAAU,GAAG,EAAE,MAAM;AAC7B,cAAI,MAAM,UAAU,GAAG,EAAE,MAAM,aAAa,OAAO;AACjD,wBAAY,SAAS,SAAS;AAAA,UAChC,WAAW,MAAM,UAAU,GAAG,EAAE,MAAM,aAAa,MAAM;AACvD,wBAAY,SAAS,SAAS,EAAE,SAAS,qBAAqB;AAAA,UAChE;AAAA,QACF;AACA,YAAI,QAAQ,WAAW;AACrB,qBAAW,SAAS,KAAK,KAAK;AAAA,YAC5B,IAAI,CAAC,QAAQ;AAEX,oBAAM,KAAK,MAAM,UAAU,GAAG,EAAE;AAChC,kBAAI,OAAO,OAAQ,MAAM,QAAQ,GAAG,KAAK,IAAI,SAAS,EAAE,GAAI;AAC1D,uBAAO;AAAA,cACT,OAAO;AACL,uBAAO;AAAA,cACT;AAAA,YACF;AAAA,YACA;AAAA,YACA;AAAA,UACF,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IACF,WAAW,MAAM,UAAU;AACzB,iBAAW,SAAS,SAAS,EAAE,SAAS,qBAAqB;AAAA,IAC/D;AACA,QAAI,qBAAqB,MAAM,QAAQ,kBAAkB,MAAM,IAAI,GAAG;AACpE,wBAAkB,MAAM,IAAI,EAAE,QAAQ,CAAC,cAAmB;AACxD,mBAAW,SAAS,KAAK,SAAS;AAAA,MACpC,CAAC;AAAA,IACH;AACA,QAAI,MAAM,YAAY;AACpB,YAAM,WAAW,QAAQ,CAAC,cAAc;AACtC,mBAAW,SAAS,KAAK,SAAS;AAAA,MACpC,CAAC;AAAA,IACH;AACA,iBAAa,MAAM,GAAG,IAAI;AAAA,EAC5B,CAAC;AACD,aAAW,aAAa,cAAc;AACpC,iBAAa,SAAS,IAAI;AAAA,MACxB,aAAa,SAAS;AAAA,MACtB;AAAA,MACA;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;AAEO,SAAS,kBAEd,QACA,YACA,mBACA;AACA,MAAI,CAAC,OAAO,SAAS;AACnB,UAAM,eAAe,aAAa,QAAQ,YAAY,iBAAiB;AACvE,WAAO,IAAI,OAAO,EAAE,MAAM,YAAY;AAAA,EACxC;AAEA,SAAO,IAAI,KAAK,WAAY;AAC1B,UAAM,eAAe;AAAA,MACnB,OAAO,OAAO,OAAO,OAAO,EAAE;AAAA,QAC5B,CAAC,MAAiB,CAAC,EAAE,IAAI,SAAS,GAAG;AAAA,MACvC;AAAA,MACA;AAAA,MACA;AAAA,IACF;AACA,WAAO,IAAI,OAAO,EAAE,MAAM,YAAY;AAAA,EACxC,CAAC;AACH;",
   "names": []
 }

package/validators/utils/int/index.js

@@ -10,7 +10,7 @@ const INT_VALIDATOR = () => {
     name: "int-validator",
     message: "form.error.positive_integer_number",
     test: (value) => {
-      if (value === null) {
+      if (value === void 0) {
         return true;
       }
       return validateIntNumber(value);

package/validators/utils/int.d.ts

@@ -1,3 +1,3 @@
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 export declare function validateIntNumber(number: number): boolean;
 export declare const INT_VALIDATOR: () => ValidatorSchema;