@digigov/form 2.0.0-85c27c19 → 2.0.0-8e254888

package/validators/index.js

@@ -1,6 +1,4 @@
 import { useMemo } from "react";
-import dayjs from "dayjs";
-import customParseFormat from "dayjs/plugin/customParseFormat";
 import * as yup from "yup";
 import {
   getYupObjectShape,
@@ -13,16 +11,16 @@ import {
   TEXT_LIMIT_VALIDATOR,
   POSTALCODE_VALIDATOR,
   UUID4_VALIDATOR,
-  IMAGE_DIMENSION_VALIDATOR
+  IMAGE_DIMENSION_VALIDATOR,
+  DATE_VALIDATOR,
+  LATER_THAN_VALIDATOR,
+  EARLIER_THAN_VALIDATOR,
+  DATETIME_VALIDATOR,
+  LATER_THAN_DATETIME_VALIDATOR,
+  EARLIER_THAN_DATETIME_VALIDATOR
 } from "@digigov/form/validators/utils";
 import { INT_VALIDATOR } from "@digigov/form/validators/utils/int";
 import { NUMBER_VALIDATOR } from "@digigov/form/validators/utils/number";
-dayjs.extend(customParseFormat);
-const VALID_DATE_FORMATS = ["DD/MM/YYYY"];
-const DATE_CACHE = {};
-const getDate = (v) => {
-  return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);
-};
 const getYUPTypeMap = () => {
   const yupTypeMap = {
     file: (field) => {
@@ -33,8 +31,21 @@ const getYUPTypeMap = () => {
         return value;
       }).nullable().test(FILE_MAX_SIZE_VALIDATOR(field));
     },
-    string: yup.string,
-    boolean: yup.boolean,
+    string: (field) => {
+      if (field.trim) {
+        return yup.string().trim();
+      } else {
+        return yup.string();
+      }
+    },
+    boolean: () => {
+      return yup.boolean().nullable().transform((value) => {
+        if (value === "" || typeof value === "string") return null;
+        if (typeof value === "boolean") return value;
+        if (value === 0 || value === 1) return Boolean(value);
+        return value;
+      });
+    },
     object: (field) => {
       return getYupObjectShape(field.extra.fields, yupTypeMap);
     },
@@ -69,18 +80,18 @@ const getYUPTypeMap = () => {
         return yup.array().of(yup.string());
       }
     },
-    number: () => yup.mixed().transform((_, val) => val !== "" ? Number(val) : null).test(NUMBER_VALIDATOR()),
-    int: () => yup.mixed().transform((_, val) => val !== "" ? Number(val) : null).test(NUMBER_VALIDATOR()).test(INT_VALIDATOR()),
-    email: () => yup.string().email("form.error.email"),
-    afm: () => yup.string().test(AFM_VALIDATOR),
-    uuid4: () => yup.string().test(UUID4_VALIDATOR),
-    iban: (field) => yup.string().test(IBAN_VALIDATOR(field)),
-    otp: (field) => yup.string().test(OTP_VALIDATOR(field)),
+    number: () => yup.mixed().transform((_, val) => val !== "" ? Number(val) : void 0).test(NUMBER_VALIDATOR()),
+    int: () => yup.mixed().transform((_, val) => val !== "" ? Number(val) : void 0).test(NUMBER_VALIDATOR()).test(INT_VALIDATOR()),
+    email: (field) => field.trim ? yup.string().trim().email("form.error.email") : yup.string().email("form.error.email"),
+    afm: (field) => field.trim ? yup.string().trim().test(AFM_VALIDATOR) : yup.string().test(AFM_VALIDATOR),
+    uuid4: (field) => field.trim ? yup.string().trim().test(UUID4_VALIDATOR) : yup.string().test(UUID4_VALIDATOR),
+    iban: (field) => field.trim ? yup.string().trim().test(IBAN_VALIDATOR(field)) : yup.string().trim().test(IBAN_VALIDATOR(field)),
+    otp: (field) => yup.string().trim().test(OTP_VALIDATOR(field)),
     text: (field) => {
       if (field?.extra?.limit?.max || !!field?.extra?.limit?.min) {
-        return yup.string().test(TEXT_LIMIT_VALIDATOR(field));
+        return field.trim ? yup.string().trim().test(TEXT_LIMIT_VALIDATOR(field)) : yup.string().test(TEXT_LIMIT_VALIDATOR(field));
       } else {
-        return yup.string();
+        return field.trim ? yup.string().trim() : yup.string();
       }
     },
     image: (field) => {
@@ -91,71 +102,31 @@ const getYUPTypeMap = () => {
         return value;
       }).nullable().test(FILE_MAX_SIZE_VALIDATOR(field)).test(IMAGE_DIMENSION_VALIDATOR(field));
     },
-    postal_code: (field) => yup.string().test(POSTALCODE_VALIDATOR(field)),
-    mobile_phone: () => yup.string().test(MOBILE_PHONE_VALIDATOR),
-    phone_number: (field) => yup.string().test(PHONE_NUMBER_VALIDATOR(field)),
+    postal_code: (field) => field.trim ? yup.string().trim().test(POSTALCODE_VALIDATOR(field)) : yup.string().test(POSTALCODE_VALIDATOR(field)),
+    mobile_phone: (field) => field.trim ? yup.string().trim().test(MOBILE_PHONE_VALIDATOR) : yup.string().test(MOBILE_PHONE_VALIDATOR),
+    phone_number: (field) => field.trim ? yup.string().trim().test(PHONE_NUMBER_VALIDATOR(field)) : yup.string().test(PHONE_NUMBER_VALIDATOR(field)),
     "choice:multiple": () => yup.array().of(yup.string()).nullable(),
     "choice:single": () => yup.string().nullable(),
     date: (field) => {
-      let simpleDate = yup.string().nullable(true).test("date", "form.error.date.invalid", function(value) {
-        if (!value) return true;
-        const date = getDate(value);
-        return date.isValid();
-      });
-      const params = field.extra || {};
-      if (params.max) {
-        let maxDate;
-        if (params.max === "now") {
-          const today = /* @__PURE__ */ new Date();
-          maxDate = new Date(today);
-        } else {
-          maxDate = getDate(params.max).toDate();
-        }
-        const maxNextDate = new Date(maxDate);
-        maxNextDate.setDate(maxDate.getDate() + 1);
-        simpleDate = simpleDate.test({
-          name: "earlier-than",
-          message: {
-            key: "form.error.date.earlier_than",
-            context: {
-              maxDate: maxNextDate.toLocaleDateString()
-            }
-          },
-          test: function(value) {
-            if (!value) return true;
-            const date = getDate(value);
-            const isValid = +date.toDate() < +maxDate;
-            return isValid;
-          }
-        });
+      let schema = yup.string().nullable();
+      if (field?.extra?.min) {
+        schema = schema.test(LATER_THAN_VALIDATOR(field));
       }
-      if (params.min) {
-        let minDate;
-        if (params.min === "now") {
-          const today = /* @__PURE__ */ new Date();
-          minDate = new Date(today);
-        } else {
-          minDate = getDate(params.min).toDate();
-        }
-        const minPreviousDate = new Date(minDate);
-        minPreviousDate.setDate(minDate.getDate() - 1);
-        simpleDate = simpleDate.test({
-          name: "later-than",
-          message: {
-            key: "form.error.date.later_than",
-            context: {
-              minDate: minPreviousDate.toLocaleDateString()
-            }
-          },
-          test: function(value) {
-            if (!value) return true;
-            const date = getDate(value);
-            const isValid = +date.toDate() > +minDate;
-            return isValid;
-          }
-        });
+      if (field?.extra?.max) {
+        schema = schema.test(EARLIER_THAN_VALIDATOR(field));
+      } else {
+        schema = schema.test(DATE_VALIDATOR);
+      }
+      return schema;
+    },
+    datetime: (field) => {
+      if (field?.extra?.min) {
+        return yup.string().test(LATER_THAN_DATETIME_VALIDATOR(field));
+      }
+      if (field?.extra?.max) {
+        return yup.string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));
       }
-      return simpleDate;
+      return yup.string().test(DATETIME_VALIDATOR);
     }
   };
   return yupTypeMap;

package/validators/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/validators/index.ts"],
-  "sourcesContent": ["import { MutableRefObject, useMemo } from 'react';\nimport dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport * as yup from 'yup';\nimport { AnyObjectSchema, StringSchema } from 'yup';\nimport { RequiredArraySchema } from 'yup/lib/array';\nimport Lazy from 'yup/lib/Lazy';\nimport { MixedSchema } from 'yup/lib/mixed';\nimport { TypeOfShape, AssertsShape } from 'yup/lib/object';\nimport { AnyObject } from 'yup/lib/types';\nimport { FieldSpec } from '@digigov/form/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\nimport {\n  getYupObjectShape,\n  AFM_VALIDATOR,\n  FILE_MAX_SIZE_VALIDATOR,\n  IBAN_VALIDATOR,\n  OTP_VALIDATOR,\n  MOBILE_PHONE_VALIDATOR,\n  PHONE_NUMBER_VALIDATOR,\n  TEXT_LIMIT_VALIDATOR,\n  POSTALCODE_VALIDATOR,\n  UUID4_VALIDATOR,\n  IMAGE_DIMENSION_VALIDATOR,\n} from '@digigov/form/validators/utils';\nimport { INT_VALIDATOR } from '@digigov/form/validators/utils/int';\nimport { NUMBER_VALIDATOR } from '@digigov/form/validators/utils/number';\ndayjs.extend(customParseFormat);\n\nconst VALID_DATE_FORMATS = ['DD/MM/YYYY'];\nconst DATE_CACHE = {};\nconst getDate = (v) => {\n  return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);\n};\n\nexport const getYUPTypeMap = (): Record<string, any> => {\n  const yupTypeMap = {\n    file: (field): MixedSchema => {\n      return yup\n        .mixed()\n        .transform((value) => {\n          if (!value.length) {\n            return null;\n          }\n          return value;\n        })\n        .nullable()\n        .test(FILE_MAX_SIZE_VALIDATOR(field));\n    },\n    string: yup.string,\n    boolean: yup.boolean,\n    object: (\n      field\n    ):\n      | yup.ObjectSchema<any, AnyObject, TypeOfShape<any>, AssertsShape<any>>\n      | Lazy<any, unknown> => {\n      return getYupObjectShape(field.extra.fields, yupTypeMap);\n    },\n    array: (\n      field\n    ):\n      | yup.ArraySchema<any, AnyObject, any[] | undefined>\n      | RequiredArraySchema<any, AnyObject, any[] | undefined> => {\n      if (typeof field.extra.of === 'object') {\n        // else if the field is an object then it is a scalar type\n        // eg. number, string etc.\n        let arrayValidator = yup\n          .array()\n          .of(yupTypeMap[field.extra.of.type](field.extra.of))\n          .required(field.required);\n        if (field.extra.length)\n          arrayValidator = arrayValidator.length(field.extra.length, {\n            key: 'form.error.array.length',\n            context: {\n              length: field.extra.length,\n            },\n          });\n        if (field.extra.min)\n          arrayValidator = arrayValidator.min(field.extra.min, {\n            key: 'form.error.array.min',\n            context: {\n              min: field.extra.min,\n            },\n          });\n        if (field.extra.max)\n          arrayValidator = arrayValidator.max(field.extra.max, {\n            key: 'form.error.array.max',\n            context: {\n              max: field.extra.max,\n            },\n          });\n        return arrayValidator;\n      } else if (typeof field.extra.of === 'string') {\n        return yup.array().of(yupTypeMap[field.extra.of]());\n      } else {\n        // in any other case it will be string\n        return yup.array().of(yup.string());\n      }\n    },\n    number: (): MixedSchema =>\n      yup\n        .mixed()\n        .transform((_, val) => (val !== '' ? Number(val) : null))\n        .test(NUMBER_VALIDATOR()),\n    int: (): MixedSchema =>\n      yup\n        .mixed()\n        .transform((_, val) => (val !== '' ? Number(val) : null))\n        .test(NUMBER_VALIDATOR())\n        .test(INT_VALIDATOR()),\n    email: (): yup.StringSchema => yup.string().email('form.error.email'),\n    afm: (): yup.StringSchema => yup.string().test(AFM_VALIDATOR),\n    uuid4: (): yup.StringSchema => yup.string().test(UUID4_VALIDATOR),\n    iban: (field): yup.StringSchema => yup.string().test(IBAN_VALIDATOR(field)),\n    otp: (field): yup.StringSchema => yup.string().test(OTP_VALIDATOR(field)),\n    text: (field): yup.StringSchema => {\n      if (field?.extra?.limit?.max || !!field?.extra?.limit?.min) {\n        return yup.string().test(TEXT_LIMIT_VALIDATOR(field));\n      } else {\n        return yup.string();\n      }\n    },\n    image: (field): MixedSchema => {\n      return yup\n        .mixed()\n        .transform((value) => {\n          if (!value.length || value.length === 0) {\n            return null;\n          }\n          return value;\n        })\n        .nullable()\n        .test(FILE_MAX_SIZE_VALIDATOR(field))\n        .test(IMAGE_DIMENSION_VALIDATOR(field));\n    },\n    postal_code: (field): yup.StringSchema =>\n      yup.string().test(POSTALCODE_VALIDATOR(field)),\n    mobile_phone: (): yup.StringSchema =>\n      yup.string().test(MOBILE_PHONE_VALIDATOR),\n    phone_number: (field): yup.StringSchema =>\n      yup.string().test(PHONE_NUMBER_VALIDATOR(field)),\n    'choice:multiple': (): yup.ArraySchema<\n      yup.StringSchema<string | undefined, AnyObject, string | undefined>,\n      AnyObject,\n      (string | undefined)[] | null | undefined,\n      (string | undefined)[] | null | undefined\n    > => yup.array().of(yup.string()).nullable(),\n    'choice:single': (): StringSchema<\n      string | null | undefined,\n      AnyObject,\n      string | null | undefined\n    > => yup.string().nullable(),\n    date: (field) => {\n      let simpleDate = yup\n        .string()\n        .nullable(true)\n        .test('date', 'form.error.date.invalid', function (value) {\n          if (!value) return true;\n          const date = getDate(value);\n          return date.isValid();\n        });\n      const params = field.extra || {};\n      if (params.max) {\n        let maxDate;\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        simpleDate = simpleDate.test({\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) {\n            if (!value) return true;\n            const date = getDate(value);\n            const isValid = +date.toDate() < +maxDate;\n            return isValid;\n          },\n        });\n      }\n      if (params.min) {\n        let minDate;\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        simpleDate = simpleDate.test({\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) {\n            if (!value) return true;\n            const date = getDate(value);\n            const isValid = +date.toDate() > +minDate;\n            return isValid;\n          },\n        });\n      }\n      return simpleDate;\n    },\n  };\n  return yupTypeMap;\n};\n\nexport interface MutableRefObjectProps {}\n// Create a yup validation schema from given fields input\nexport function useValidationSchema(\n  fields: FieldSpec[] | MutableRefObject<MutableRefObjectProps>,\n  validatorRegistry?: Record<string, ValidatorSchema[]>\n): Lazy<any, unknown> | AnyObjectSchema | void {\n  return useMemo(() => {\n    const yupTypeMap = getYUPTypeMap();\n    return getYupObjectShape(fields, yupTypeMap, validatorRegistry);\n  }, []);\n}\n"],
-  "mappings": "AAAA,SAA2B,eAAe;AAC1C,OAAO,WAAW;AAClB,OAAO,uBAAuB;AAC9B,YAAY,SAAS;AASrB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,qBAAqB;AAC9B,SAAS,wBAAwB;AACjC,MAAM,OAAO,iBAAiB;AAE9B,MAAM,qBAAqB,CAAC,YAAY;AACxC,MAAM,aAAa,CAAC;AACpB,MAAM,UAAU,CAAC,MAAM;AACrB,SAAO,WAAW,CAAC,IAAI,WAAW,CAAC,IAAI,MAAM,GAAG,oBAAoB,IAAI;AAC1E;AAEO,MAAM,gBAAgB,MAA2B;AACtD,QAAM,aAAa;AAAA,IACjB,MAAM,CAAC,UAAuB;AAC5B,aAAO,IACJ,MAAM,EACN,UAAU,CAAC,UAAU;AACpB,YAAI,CAAC,MAAM,QAAQ;AACjB,iBAAO;AAAA,QACT;AACA,eAAO;AAAA,MACT,CAAC,EACA,SAAS,EACT,KAAK,wBAAwB,KAAK,CAAC;AAAA,IACxC;AAAA,IACA,QAAQ,IAAI;AAAA,IACZ,SAAS,IAAI;AAAA,IACb,QAAQ,CACN,UAGwB;AACxB,aAAO,kBAAkB,MAAM,MAAM,QAAQ,UAAU;AAAA,IACzD;AAAA,IACA,OAAO,CACL,UAG4D;AAC5D,UAAI,OAAO,MAAM,MAAM,OAAO,UAAU;AAGtC,YAAI,iBAAiB,IAClB,MAAM,EACN,GAAG,WAAW,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,MAAM,EAAE,CAAC,EAClD,SAAS,MAAM,QAAQ;AAC1B,YAAI,MAAM,MAAM;AACd,2BAAiB,eAAe,OAAO,MAAM,MAAM,QAAQ;AAAA,YACzD,KAAK;AAAA,YACL,SAAS;AAAA,cACP,QAAQ,MAAM,MAAM;AAAA,YACtB;AAAA,UACF,CAAC;AACH,YAAI,MAAM,MAAM;AACd,2BAAiB,eAAe,IAAI,MAAM,MAAM,KAAK;AAAA,YACnD,KAAK;AAAA,YACL,SAAS;AAAA,cACP,KAAK,MAAM,MAAM;AAAA,YACnB;AAAA,UACF,CAAC;AACH,YAAI,MAAM,MAAM;AACd,2BAAiB,eAAe,IAAI,MAAM,MAAM,KAAK;AAAA,YACnD,KAAK;AAAA,YACL,SAAS;AAAA,cACP,KAAK,MAAM,MAAM;AAAA,YACnB;AAAA,UACF,CAAC;AACH,eAAO;AAAA,MACT,WAAW,OAAO,MAAM,MAAM,OAAO,UAAU;AAC7C,eAAO,IAAI,MAAM,EAAE,GAAG,WAAW,MAAM,MAAM,EAAE,EAAE,CAAC;AAAA,MACpD,OAAO;AAEL,eAAO,IAAI,MAAM,EAAE,GAAG,IAAI,OAAO,CAAC;AAAA,MACpC;AAAA,IACF;AAAA,IACA,QAAQ,MACN,IACG,MAAM,EACN,UAAU,CAAC,GAAG,QAAS,QAAQ,KAAK,OAAO,GAAG,IAAI,IAAK,EACvD,KAAK,iBAAiB,CAAC;AAAA,IAC5B,KAAK,MACH,IACG,MAAM,EACN,UAAU,CAAC,GAAG,QAAS,QAAQ,KAAK,OAAO,GAAG,IAAI,IAAK,EACvD,KAAK,iBAAiB,CAAC,EACvB,KAAK,cAAc,CAAC;AAAA,IACzB,OAAO,MAAwB,IAAI,OAAO,EAAE,MAAM,kBAAkB;AAAA,IACpE,KAAK,MAAwB,IAAI,OAAO,EAAE,KAAK,aAAa;AAAA,IAC5D,OAAO,MAAwB,IAAI,OAAO,EAAE,KAAK,eAAe;AAAA,IAChE,MAAM,CAAC,UAA4B,IAAI,OAAO,EAAE,KAAK,eAAe,KAAK,CAAC;AAAA,IAC1E,KAAK,CAAC,UAA4B,IAAI,OAAO,EAAE,KAAK,cAAc,KAAK,CAAC;AAAA,IACxE,MAAM,CAAC,UAA4B;AACjC,UAAI,OAAO,OAAO,OAAO,OAAO,CAAC,CAAC,OAAO,OAAO,OAAO,KAAK;AAC1D,eAAO,IAAI,OAAO,EAAE,KAAK,qBAAqB,KAAK,CAAC;AAAA,MACtD,OAAO;AACL,eAAO,IAAI,OAAO;AAAA,MACpB;AAAA,IACF;AAAA,IACA,OAAO,CAAC,UAAuB;AAC7B,aAAO,IACJ,MAAM,EACN,UAAU,CAAC,UAAU;AACpB,YAAI,CAAC,MAAM,UAAU,MAAM,WAAW,GAAG;AACvC,iBAAO;AAAA,QACT;AACA,eAAO;AAAA,MACT,CAAC,EACA,SAAS,EACT,KAAK,wBAAwB,KAAK,CAAC,EACnC,KAAK,0BAA0B,KAAK,CAAC;AAAA,IAC1C;AAAA,IACA,aAAa,CAAC,UACZ,IAAI,OAAO,EAAE,KAAK,qBAAqB,KAAK,CAAC;AAAA,IAC/C,cAAc,MACZ,IAAI,OAAO,EAAE,KAAK,sBAAsB;AAAA,IAC1C,cAAc,CAAC,UACb,IAAI,OAAO,EAAE,KAAK,uBAAuB,KAAK,CAAC;AAAA,IACjD,mBAAmB,MAKd,IAAI,MAAM,EAAE,GAAG,IAAI,OAAO,CAAC,EAAE,SAAS;AAAA,IAC3C,iBAAiB,MAIZ,IAAI,OAAO,EAAE,SAAS;AAAA,IAC3B,MAAM,CAAC,UAAU;AACf,UAAI,aAAa,IACd,OAAO,EACP,SAAS,IAAI,EACb,KAAK,QAAQ,2BAA2B,SAAU,OAAO;AACxD,YAAI,CAAC,MAAO,QAAO;AACnB,cAAM,OAAO,QAAQ,KAAK;AAC1B,eAAO,KAAK,QAAQ;AAAA,MACtB,CAAC;AACH,YAAM,SAAS,MAAM,SAAS,CAAC;AAC/B,UAAI,OAAO,KAAK;AACd,YAAI;AACJ,YAAI,OAAO,QAAQ,OAAO;AACxB,gBAAM,QAAQ,oBAAI,KAAK;AACvB,oBAAU,IAAI,KAAK,KAAK;AAAA,QAC1B,OAAO;AACL,oBAAU,QAAQ,OAAO,GAAG,EAAE,OAAO;AAAA,QACvC;AACA,cAAM,cAAc,IAAI,KAAK,OAAO;AACpC,oBAAY,QAAQ,QAAQ,QAAQ,IAAI,CAAC;AACzC,qBAAa,WAAW,KAAK;AAAA,UAC3B,MAAM;AAAA,UACN,SAAS;AAAA,YACP,KAAK;AAAA,YACL,SAAS;AAAA,cACP,SAAS,YAAY,mBAAmB;AAAA,YAC1C;AAAA,UACF;AAAA,UACA,MAAM,SAAU,OAAO;AACrB,gBAAI,CAAC,MAAO,QAAO;AACnB,kBAAM,OAAO,QAAQ,KAAK;AAC1B,kBAAM,UAAU,CAAC,KAAK,OAAO,IAAI,CAAC;AAClC,mBAAO;AAAA,UACT;AAAA,QACF,CAAC;AAAA,MACH;AACA,UAAI,OAAO,KAAK;AACd,YAAI;AACJ,YAAI,OAAO,QAAQ,OAAO;AACxB,gBAAM,QAAQ,oBAAI,KAAK;AACvB,oBAAU,IAAI,KAAK,KAAK;AAAA,QAC1B,OAAO;AACL,oBAAU,QAAQ,OAAO,GAAG,EAAE,OAAO;AAAA,QACvC;AACA,cAAM,kBAAkB,IAAI,KAAK,OAAO;AACxC,wBAAgB,QAAQ,QAAQ,QAAQ,IAAI,CAAC;AAC7C,qBAAa,WAAW,KAAK;AAAA,UAC3B,MAAM;AAAA,UACN,SAAS;AAAA,YACP,KAAK;AAAA,YACL,SAAS;AAAA,cACP,SAAS,gBAAgB,mBAAmB;AAAA,YAC9C;AAAA,UACF;AAAA,UACA,MAAM,SAAU,OAAO;AACrB,gBAAI,CAAC,MAAO,QAAO;AACnB,kBAAM,OAAO,QAAQ,KAAK;AAC1B,kBAAM,UAAU,CAAC,KAAK,OAAO,IAAI,CAAC;AAClC,mBAAO;AAAA,UACT;AAAA,QACF,CAAC;AAAA,MACH;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACA,SAAO;AACT;AAIO,SAAS,oBACd,QACA,mBAC6C;AAC7C,SAAO,QAAQ,MAAM;AACnB,UAAM,aAAa,cAAc;AACjC,WAAO,kBAAkB,QAAQ,YAAY,iBAAiB;AAAA,EAChE,GAAG,CAAC,CAAC;AACP;",
+  "sourcesContent": ["import { MutableRefObject, useMemo } from 'react';\nimport * as yup from 'yup';\nimport { AnyObjectSchema, StringSchema } from 'yup';\nimport { RequiredArraySchema } from 'yup/lib/array';\nimport Lazy from 'yup/lib/Lazy';\nimport { MixedSchema } from 'yup/lib/mixed';\nimport { TypeOfShape, AssertsShape } from 'yup/lib/object';\nimport { AnyObject } from 'yup/lib/types';\nimport { FieldSpec } from '@digigov/form/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\nimport {\n  getYupObjectShape,\n  AFM_VALIDATOR,\n  FILE_MAX_SIZE_VALIDATOR,\n  IBAN_VALIDATOR,\n  OTP_VALIDATOR,\n  MOBILE_PHONE_VALIDATOR,\n  PHONE_NUMBER_VALIDATOR,\n  TEXT_LIMIT_VALIDATOR,\n  POSTALCODE_VALIDATOR,\n  UUID4_VALIDATOR,\n  IMAGE_DIMENSION_VALIDATOR,\n  DATE_VALIDATOR,\n  LATER_THAN_VALIDATOR,\n  EARLIER_THAN_VALIDATOR,\n  DATETIME_VALIDATOR,\n  LATER_THAN_DATETIME_VALIDATOR,\n  EARLIER_THAN_DATETIME_VALIDATOR,\n} from '@digigov/form/validators/utils';\nimport { INT_VALIDATOR } from '@digigov/form/validators/utils/int';\nimport { NUMBER_VALIDATOR } from '@digigov/form/validators/utils/number';\n\nexport const getYUPTypeMap = (): Record<string, any> => {\n  const yupTypeMap = {\n    file: (field): MixedSchema => {\n      return yup\n        .mixed()\n        .transform((value) => {\n          if (!value.length) {\n            return null;\n          }\n          return value;\n        })\n        .nullable()\n        .test(FILE_MAX_SIZE_VALIDATOR(field));\n    },\n    string: (field): yup.StringSchema => {\n      if (field.trim) {\n        return yup.string().trim();\n      } else {\n        return yup.string();\n      }\n    },\n    boolean: (): yup.BooleanSchema<\n      boolean | null | undefined,\n      AnyObject,\n      boolean | null | undefined\n    > => {\n      return yup\n        .boolean()\n        .nullable()\n        .transform((value) => {\n          if (value === '' || typeof value === 'string') return null;\n          if (typeof value === 'boolean') return value;\n          if (value === 0 || value === 1) return Boolean(value);\n          return value;\n        });\n    },\n    object: (\n      field\n    ):\n      | yup.ObjectSchema<any, AnyObject, TypeOfShape<any>, AssertsShape<any>>\n      | Lazy<any, unknown> => {\n      return getYupObjectShape(field.extra.fields, yupTypeMap);\n    },\n    array: (\n      field\n    ):\n      | yup.ArraySchema<any, AnyObject, any[] | undefined>\n      | RequiredArraySchema<any, AnyObject, any[] | undefined> => {\n      if (typeof field.extra.of === 'object') {\n        // else if the field is an object then it is a scalar type\n        // eg. number, string etc.\n        let arrayValidator = yup\n          .array()\n          .of(yupTypeMap[field.extra.of.type](field.extra.of))\n          .required(field.required);\n        if (field.extra.length)\n          arrayValidator = arrayValidator.length(field.extra.length, {\n            key: 'form.error.array.length',\n            context: {\n              length: field.extra.length,\n            },\n          });\n        if (field.extra.min)\n          arrayValidator = arrayValidator.min(field.extra.min, {\n            key: 'form.error.array.min',\n            context: {\n              min: field.extra.min,\n            },\n          });\n        if (field.extra.max)\n          arrayValidator = arrayValidator.max(field.extra.max, {\n            key: 'form.error.array.max',\n            context: {\n              max: field.extra.max,\n            },\n          });\n        return arrayValidator;\n      } else if (typeof field.extra.of === 'string') {\n        return yup.array().of(yupTypeMap[field.extra.of]());\n      } else {\n        // in any other case it will be string\n        return yup.array().of(yup.string());\n      }\n    },\n    number: (): MixedSchema =>\n      yup\n        .mixed()\n        .transform((_, val) => (val !== '' ? Number(val) : undefined))\n        .test(NUMBER_VALIDATOR()),\n    int: (): MixedSchema =>\n      yup\n        .mixed()\n        .transform((_, val) => (val !== '' ? Number(val) : undefined))\n        .test(NUMBER_VALIDATOR())\n        .test(INT_VALIDATOR()),\n    email: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().email('form.error.email')\n        : yup.string().email('form.error.email'),\n    afm: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(AFM_VALIDATOR)\n        : yup.string().test(AFM_VALIDATOR),\n    uuid4: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(UUID4_VALIDATOR)\n        : yup.string().test(UUID4_VALIDATOR),\n    iban: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(IBAN_VALIDATOR(field))\n        : yup.string().trim().test(IBAN_VALIDATOR(field)),\n    otp: (field): yup.StringSchema =>\n      yup.string().trim().test(OTP_VALIDATOR(field)),\n    text: (field): yup.StringSchema => {\n      if (field?.extra?.limit?.max || !!field?.extra?.limit?.min) {\n        return field.trim\n          ? yup.string().trim().test(TEXT_LIMIT_VALIDATOR(field))\n          : yup.string().test(TEXT_LIMIT_VALIDATOR(field));\n      } else {\n        return field.trim ? yup.string().trim() : yup.string();\n      }\n    },\n    image: (field): MixedSchema => {\n      return yup\n        .mixed()\n        .transform((value) => {\n          if (!value.length || value.length === 0) {\n            return null;\n          }\n          return value;\n        })\n        .nullable()\n        .test(FILE_MAX_SIZE_VALIDATOR(field))\n        .test(IMAGE_DIMENSION_VALIDATOR(field));\n    },\n    postal_code: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(POSTALCODE_VALIDATOR(field))\n        : yup.string().test(POSTALCODE_VALIDATOR(field)),\n    mobile_phone: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(MOBILE_PHONE_VALIDATOR)\n        : yup.string().test(MOBILE_PHONE_VALIDATOR),\n    phone_number: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(PHONE_NUMBER_VALIDATOR(field))\n        : yup.string().test(PHONE_NUMBER_VALIDATOR(field)),\n    'choice:multiple': (): yup.ArraySchema<\n      yup.StringSchema<string | undefined, AnyObject, string | undefined>,\n      AnyObject,\n      (string | undefined)[] | null | undefined,\n      (string | undefined)[] | null | undefined\n    > => yup.array().of(yup.string()).nullable(),\n    'choice:single': (): StringSchema<\n      string | null | undefined,\n      AnyObject,\n      string | null | undefined\n    > => yup.string().nullable(),\n    date: (\n      field\n    ): yup.StringSchema<\n      string | null | undefined,\n      AnyObject,\n      string | null | undefined\n    > => {\n      let schema = yup.string().nullable();\n      if (field?.extra?.min) {\n        schema = schema.test(LATER_THAN_VALIDATOR(field));\n      }\n      if (field?.extra?.max) {\n        schema = schema.test(EARLIER_THAN_VALIDATOR(field));\n      } else {\n        schema = schema.test(DATE_VALIDATOR);\n      }\n      return schema;\n    },\n    datetime: (field): yup.StringSchema => {\n      if (field?.extra?.min) {\n        return yup.string().test(LATER_THAN_DATETIME_VALIDATOR(field));\n      }\n      if (field?.extra?.max) {\n        return yup.string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));\n      }\n      return yup.string().test(DATETIME_VALIDATOR);\n    },\n  };\n  return yupTypeMap;\n};\n\nexport interface MutableRefObjectProps {}\n// Create a yup validation schema from given fields input\nexport function useValidationSchema(\n  fields: FieldSpec[] | MutableRefObject<MutableRefObjectProps>,\n  validatorRegistry?: Record<string, ValidatorSchema[]>\n): Lazy<any, unknown> | AnyObjectSchema | void {\n  return useMemo(() => {\n    const yupTypeMap = getYUPTypeMap();\n    return getYupObjectShape(fields, yupTypeMap, validatorRegistry);\n  }, []);\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/validators/utils/date/index.js

@@ -0,0 +1,103 @@
+import dayjs from "dayjs";
+import customParseFormat from "dayjs/plugin/customParseFormat";
+dayjs.extend(customParseFormat);
+const VALID_DATE_FORMATS = ["DD/MM/YYYY"];
+const DATE_CACHE = {};
+const getDate = (v) => {
+  return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);
+};
+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";
+  }
+  if (!day && month && !year) {
+    return "form.error.date.invalid_day_year";
+  }
+  if (!day && !month && year) {
+    return "form.error.date.invalid_day_month";
+  }
+  if (day && month && !year) {
+    return "form.error.date.invalid_year";
+  }
+  if (day && !month && year) {
+    return "form.error.date.invalid_month";
+  }
+  if (!day && month && year) {
+    return "form.error.date.invalid_day";
+  } else {
+    return "form.error.date.invalid";
+  }
+};
+const LATER_THAN_VALIDATOR = (field) => {
+  let minDate;
+  const params = field.extra || {};
+  if (params.min === "now") {
+    const today = /* @__PURE__ */ new Date();
+    minDate = new Date(today);
+  } else {
+    minDate = getDate(params.min).toDate();
+  }
+  const minPreviousDate = new Date(minDate);
+  minPreviousDate.setDate(minDate.getDate() - 1);
+  return {
+    name: "later-than",
+    message: {
+      key: "form.error.date.later_than",
+      context: {
+        minDate: minPreviousDate.toLocaleDateString()
+      }
+    },
+    test: function(value) {
+      if (!value) return true;
+      const date = getDate(value);
+      const isValid = +date.toDate() > +minDate;
+      return isValid;
+    }
+  };
+};
+const EARLIER_THAN_VALIDATOR = (field) => {
+  let maxDate;
+  const params = field.extra || {};
+  if (params.max === "now") {
+    const today = /* @__PURE__ */ new Date();
+    maxDate = new Date(today);
+  } else {
+    maxDate = getDate(params.max).toDate();
+  }
+  const maxNextDate = new Date(maxDate);
+  maxNextDate.setDate(maxDate.getDate() + 1);
+  return {
+    name: "earlier-than",
+    message: {
+      key: "form.error.date.earlier_than",
+      context: {
+        maxDate: maxNextDate.toLocaleDateString()
+      }
+    },
+    test: function(value) {
+      if (!value) return true;
+      const date = getDate(value);
+      const isValid = +date.toDate() < +maxDate;
+      return isValid;
+    }
+  };
+};
+const DATE_VALIDATOR = {
+  name: "date-validator",
+  message: (v) => {
+    return checkPartialDate(v.value);
+  },
+  test: function(value) {
+    if (!value) return true;
+    const date = getDate(value);
+    return date.isValid();
+  }
+};
+export {
+  DATE_VALIDATOR,
+  EARLIER_THAN_VALIDATOR,
+  LATER_THAN_VALIDATOR
+};
+//# sourceMappingURL=date.js.map

package/{FieldArray/FieldArray.stories → validators/utils/date}/package.json

@@ -2,5 +2,5 @@
   "sideEffects": false,
   "module": "./index.js",
   "types": "./index.d.ts",
-  "main": "../../cjs/FieldArray/FieldArray.stories/index.js"
+  "main": "../../../cjs/validators/utils/date/index.js"
 }

package/validators/utils/date.d.ts

@@ -0,0 +1,9 @@
+import { FieldSpec } from '@digigov/form/types';
+import { 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;
+    test: (value: string) => any;
+};

package/validators/utils/date.js.map

@@ -0,0 +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;",
+  "names": []
+}

package/validators/utils/datetime/index.js

@@ -0,0 +1,116 @@
+import dayjs from "dayjs";
+import customParseFormat from "dayjs/plugin/customParseFormat";
+dayjs.extend(customParseFormat);
+const VALID_DATETIME_FORMATS = ["DD/MM/YYYY HH:mm"];
+const DATETIME_CACHE = {};
+const getDateTime = (v) => {
+  return DATETIME_CACHE[v] ? DATETIME_CACHE[v] : dayjs(v, VALID_DATETIME_FORMATS, true);
+};
+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) {
+    return "form.error.datetime.invalid_month_year";
+  }
+  if (!day && month && !year) {
+    return "form.error.datetime.invalid_day_year";
+  }
+  if (!day && !month && year) {
+    return "form.error.datetime.invalid_day_month";
+  }
+  if (day && month && !year) {
+    return "form.error.datetime.invalid_year";
+  }
+  if (day && !month && year) {
+    return "form.error.datetime.invalid_month";
+  }
+  if (!day && month && year) {
+    return "form.error.datetime.invalid_day";
+  }
+  if (day && month && year) {
+    if (hours && !minutes) {
+      return "form.error.datetime.invalid_minutes";
+    }
+    if (!hours && minutes) {
+      return "form.error.datetime.invalid_hours";
+    }
+    if (!hours && !minutes) {
+      return "form.error.datetime.invalid";
+    }
+    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";
+};
+const LATER_THAN_DATETIME_VALIDATOR = (field) => {
+  let minDateTime;
+  const params = field.extra || {};
+  if (params.min === "now") {
+    minDateTime = dayjs();
+  } else {
+    minDateTime = getDateTime(params.min);
+  }
+  return {
+    name: "later-than-datetime",
+    message: {
+      key: "form.error.datetime.later_than",
+      context: {
+        minDateTime: minDateTime.format("DD/MM/YYYY HH:mm")
+      }
+    },
+    test: function(value) {
+      if (!value) return true;
+      const datetime = getDateTime(value);
+      return datetime.isValid() && datetime.isAfter(minDateTime);
+    }
+  };
+};
+const EARLIER_THAN_DATETIME_VALIDATOR = (field) => {
+  let maxDateTime;
+  const params = field.extra || {};
+  if (params.max === "now") {
+    maxDateTime = dayjs();
+  } else {
+    maxDateTime = getDateTime(params.max);
+  }
+  return {
+    name: "earlier-than-datetime",
+    message: {
+      key: "form.error.datetime.earlier_than",
+      context: {
+        maxDateTime: maxDateTime.format("DD/MM/YYYY HH:mm")
+      }
+    },
+    test: function(value) {
+      if (!value) return true;
+      const datetime = getDateTime(value);
+      return datetime.isValid() && datetime.isBefore(maxDateTime);
+    }
+  };
+};
+const DATETIME_VALIDATOR = {
+  name: "datetime-validator",
+  message: (v) => {
+    return checkPartialDateTime(v.value);
+  },
+  test: function(value) {
+    if (!value) return true;
+    const datetime = getDateTime(value);
+    return datetime.isValid();
+  }
+};
+export {
+  DATETIME_VALIDATOR,
+  EARLIER_THAN_DATETIME_VALIDATOR,
+  LATER_THAN_DATETIME_VALIDATOR
+};
+//# sourceMappingURL=datetime.js.map

package/validators/utils/datetime/package.json

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

package/validators/utils/datetime.d.ts

@@ -0,0 +1,9 @@
+import { FieldSpec } from '@digigov/form/types';
+import { 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;
+    test: (value: string) => any;
+};

package/validators/utils/datetime.js.map

@@ -0,0 +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": "AAAA,OAAO,WAAW;AAClB,OAAO,uBAAuB;AAI9B,MAAM,OAAO,iBAAiB;AAE9B,MAAM,yBAAyB,CAAC,kBAAkB;AAClD,MAAM,iBAAiB,CAAC;AAExB,MAAM,cAAc,CAAC,MAAc;AACjC,SAAO,eAAe,CAAC,IACnB,eAAe,CAAC,IAChB,MAAM,GAAG,wBAAwB,IAAI;AAC3C;AAGA,MAAM,uBAAuB,CAAC,UAAkB;AAC9C,QAAM,CAAC,UAAU,QAAQ,IAAI,MAAM,MAAM,GAAG;AAC5C,QAAM,CAAC,KAAK,OAAO,IAAI,IAAI,SAAS,MAAM,GAAG;AAC7C,QAAM,CAAC,OAAO,OAAO,IAAI,WAAW,SAAS,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI;AAGrE,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;AAEA,MAAI,OAAO,SAAS,MAAM;AACxB,QAAI,SAAS,CAAC,SAAS;AACrB,aAAO;AAAA,IACT;AACA,QAAI,CAAC,SAAS,SAAS;AACrB,aAAO;AAAA,IACT;AACA,QAAI,CAAC,SAAS,CAAC,SAAS;AACtB,aAAO;AAAA,IACT;AACA,QAAI,SAAS,SAAS;AACpB,YAAM,WAAW,SAAS,KAAK;AAC/B,YAAM,aAAa,SAAS,OAAO;AACnC,UAAI,WAAW,KAAK,WAAW,IAAI;AACjC,eAAO;AAAA,MACT;AACA,UAAI,aAAa,KAAK,aAAa,IAAI;AACrC,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEO,MAAM,gCAAgC,CAC3C,UACoB;AACpB,MAAI;AACJ,QAAM,SAAS,MAAM,SAAS,CAAC;AAC/B,MAAI,OAAO,QAAQ,OAAO;AACxB,kBAAc,MAAM;AAAA,EACtB,OAAO;AACL,kBAAc,YAAY,OAAO,GAAG;AAAA,EACtC;AACA,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,MACP,KAAK;AAAA,MACL,SAAS;AAAA,QACP,aAAa,YAAY,OAAO,kBAAkB;AAAA,MACpD;AAAA,IACF;AAAA,IACA,MAAM,SAAU,OAAe;AAC7B,UAAI,CAAC,MAAO,QAAO;AACnB,YAAM,WAAW,YAAY,KAAK;AAClC,aAAO,SAAS,QAAQ,KAAK,SAAS,QAAQ,WAAW;AAAA,IAC3D;AAAA,EACF;AACF;AAEO,MAAM,kCAAkC,CAC7C,UACoB;AACpB,MAAI;AACJ,QAAM,SAAS,MAAM,SAAS,CAAC;AAC/B,MAAI,OAAO,QAAQ,OAAO;AACxB,kBAAc,MAAM;AAAA,EACtB,OAAO;AACL,kBAAc,YAAY,OAAO,GAAG;AAAA,EACtC;AACA,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,MACP,KAAK;AAAA,MACL,SAAS;AAAA,QACP,aAAa,YAAY,OAAO,kBAAkB;AAAA,MACpD;AAAA,IACF;AAAA,IACA,MAAM,SAAU,OAAe;AAC7B,UAAI,CAAC,MAAO,QAAO;AACnB,YAAM,WAAW,YAAY,KAAK;AAClC,aAAO,SAAS,QAAQ,KAAK,SAAS,SAAS,WAAW;AAAA,IAC5D;AAAA,EACF;AACF;AAEO,MAAM,qBAAqB;AAAA,EAChC,MAAM;AAAA,EACN,SAAS,CAAC,MAAc;AACtB,WAAO,qBAAqB,EAAE,KAAK;AAAA,EACrC;AAAA,EACA,MAAM,SAAU,OAAe;AAC7B,QAAI,CAAC,MAAO,QAAO;AACnB,UAAM,WAAW,YAAY,KAAK;AAClC,WAAO,SAAS,QAAQ;AAAA,EAC1B;AACF;",
+  "names": []
+}

package/validators/utils/file/index.js

@@ -2,9 +2,9 @@ const DEFAULT_FILE_MAX_SIZE = 1e7;
 const FILE_MAX_SIZE_VALIDATOR = (field) => ({
   name: "file-max-size-validator",
   message: {
-    key: "form.error.file_size",
+    key: field.type === "file" ? "form.error.file_size" : "form.error.image_size",
     context: {
-      maxSizeToMb: (field?.extra?.limit.maxSize || DEFAULT_FILE_MAX_SIZE) / 1e6
+      maxSizeToMb: (field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE) / 1e6
     }
   },
   test: (value) => {

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: 'form.error.file_size',\n    context: {\n      maxSizeToMb: (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,KAAK;AAAA,IACL,SAAS;AAAA,MACP,cAAc,OAAO,OAAO,MAAM,WAAW,yBAAyB;AAAA,IACxE;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 { 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;",
   "names": []
 }

package/validators/utils/index.d.ts

@@ -10,6 +10,8 @@ export * from '@digigov/form/validators/utils/phone';
 export * from '@digigov/form/validators/utils/postal_code';
 export * from '@digigov/form/validators/utils/uuid4';
 export * from '@digigov/form/validators/utils/text_limit';
+export * from '@digigov/form/validators/utils/date';
+export * from '@digigov/form/validators/utils/datetime';
 export declare function getYupField(field: FieldSpec, yupTypeMap: Record<string, any>): any;
 export declare function computeShape(fields: FieldSpec[], yupTypeMap: Record<string, ValidatorSchema>, validatorRegistry: Record<string, ValidatorSchema[]> | undefined): {};
 export declare function getYupObjectShape(fields: FieldSpec[] | any, yupTypeMap: Record<string, any>, validatorRegistry?: Record<string, ValidatorSchema[]>): yup.ObjectSchema<{

package/validators/utils/index.js

@@ -8,6 +8,8 @@ export * from "@digigov/form/validators/utils/phone";
 export * from "@digigov/form/validators/utils/postal_code";
 export * from "@digigov/form/validators/utils/uuid4";
 export * from "@digigov/form/validators/utils/text_limit";
+export * from "@digigov/form/validators/utils/date";
+export * from "@digigov/form/validators/utils/datetime";
 function getYupField(field, yupTypeMap) {
   const yupField = yupTypeMap[field?.type || "string"] || yupTypeMap["string"];
   return yupField(field);

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';\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;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 { 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;",
   "names": []
 }