@digigov/form 2.0.0-cbc56209 → 2.0.0-d0adc9fb

package/validators/index.js

@@ -1,182 +1,138 @@
-import _typeof from "@babel/runtime/helpers/typeof";
-import { useMemo } from 'react';
-import dayjs from 'dayjs';
-import customParseFormat from 'dayjs/plugin/customParseFormat';
-import * as yup from 'yup';
-import { getYupObjectShape, AFM_VALIDATOR, FILE_MAX_SIZE_VALIDATOR, IBAN_VALIDATOR, OTP_VALIDATOR, MOBILE_PHONE_VALIDATOR, PHONE_NUMBER_VALIDATOR, TEXT_LIMIT_VALIDATOR, POSTALCODE_VALIDATOR, UUID4_VALIDATOR, IMAGE_DIMENSION_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);
-var VALID_DATE_FORMATS = ['DD/MM/YYYY'];
-var DATE_CACHE = {};
-var getDate = function getDate(v) {
-  return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);
-};
-export var getYUPTypeMap = function getYUPTypeMap() {
-  var yupTypeMap = {
-    file: function file(field) {
-      return yup.mixed().transform(function (value) {
+import { useMemo } from "react";
+import * as yup from "yup";
+import {
+  getYupObjectShape,
+  AFM_VALIDATOR,
+  FILE_MAX_SIZE_VALIDATOR,
+  IBAN_VALIDATOR,
+  OTP_VALIDATOR,
+  MOBILE_PHONE_VALIDATOR,
+  PHONE_NUMBER_VALIDATOR,
+  TEXT_LIMIT_VALIDATOR,
+  POSTALCODE_VALIDATOR,
+  UUID4_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";
+const getYUPTypeMap = () => {
+  const yupTypeMap = {
+    file: (field) => {
+      return yup.mixed().transform((value) => {
         if (!value.length) {
           return null;
         }
         return value;
       }).nullable().test(FILE_MAX_SIZE_VALIDATOR(field));
     },
-    string: yup.string,
-    "boolean": yup["boolean"],
-    object: function object(field) {
+    string: () => yup.string().trim(),
+    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);
     },
-    array: function array(field) {
-      if (_typeof(field.extra.of) === 'object') {
-        // else if the field is an object then it is a scalar type
-        // eg. number, string etc.
-        var arrayValidator = yup.array().of(yupTypeMap[field.extra.of.type](field.extra.of)).required(field.required);
-        if (field.extra.length) arrayValidator = arrayValidator.length(field.extra.length, {
-          key: 'form.error.array.length',
-          context: {
-            length: field.extra.length
-          }
-        });
-        if (field.extra.min) arrayValidator = arrayValidator.min(field.extra.min, {
-          key: 'form.error.array.min',
-          context: {
-            min: field.extra.min
-          }
-        });
-        if (field.extra.max) arrayValidator = arrayValidator.max(field.extra.max, {
-          key: 'form.error.array.max',
-          context: {
-            max: field.extra.max
-          }
-        });
+    array: (field) => {
+      if (typeof field.extra.of === "object") {
+        let arrayValidator = yup.array().of(yupTypeMap[field.extra.of.type](field.extra.of)).required(field.required);
+        if (field.extra.length)
+          arrayValidator = arrayValidator.length(field.extra.length, {
+            key: "form.error.array.length",
+            context: {
+              length: field.extra.length
+            }
+          });
+        if (field.extra.min)
+          arrayValidator = arrayValidator.min(field.extra.min, {
+            key: "form.error.array.min",
+            context: {
+              min: field.extra.min
+            }
+          });
+        if (field.extra.max)
+          arrayValidator = arrayValidator.max(field.extra.max, {
+            key: "form.error.array.max",
+            context: {
+              max: field.extra.max
+            }
+          });
         return arrayValidator;
-      } else if (typeof field.extra.of === 'string') {
+      } else if (typeof field.extra.of === "string") {
         return yup.array().of(yupTypeMap[field.extra.of]());
       } else {
-        // in any other case it will be string
         return yup.array().of(yup.string());
       }
     },
-    "int": function int() {
-      return yup.mixed().transform(function (_, val) {
-        return val !== '' ? Number(val) : null;
-      }).test(NUMBER_VALIDATOR()).test(INT_VALIDATOR());
-    },
-    email: function email() {
-      return yup.string().email('form.error.email');
-    },
-    afm: function afm() {
-      return yup.string().test(AFM_VALIDATOR);
-    },
-    uuid4: function uuid4() {
-      return yup.string().test(UUID4_VALIDATOR);
-    },
-    iban: function iban(field) {
-      return yup.string().test(IBAN_VALIDATOR(field));
-    },
-    otp: function otp(field) {
-      return yup.string().test(OTP_VALIDATOR(field));
-    },
-    text: function text(field) {
-      var _field$extra, _field$extra$limit, _field$extra2, _field$extra2$limit;
-      if (field !== null && field !== void 0 && (_field$extra = field.extra) !== null && _field$extra !== void 0 && (_field$extra$limit = _field$extra.limit) !== null && _field$extra$limit !== void 0 && _field$extra$limit.max || !!(field !== null && field !== void 0 && (_field$extra2 = field.extra) !== null && _field$extra2 !== void 0 && (_field$extra2$limit = _field$extra2.limit) !== null && _field$extra2$limit !== void 0 && _field$extra2$limit.min)) {
+    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().trim().test(AFM_VALIDATOR),
+    uuid4: () => yup.string().trim().test(UUID4_VALIDATOR),
+    iban: (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));
       } else {
         return yup.string();
       }
     },
-    image: function image(field) {
-      return yup.mixed().transform(function (value) {
+    image: (field) => {
+      return yup.mixed().transform((value) => {
         if (!value.length || value.length === 0) {
           return null;
         }
         return value;
       }).nullable().test(FILE_MAX_SIZE_VALIDATOR(field)).test(IMAGE_DIMENSION_VALIDATOR(field));
     },
-    postal_code: function postal_code(field) {
-      return yup.string().test(POSTALCODE_VALIDATOR(field));
-    },
-    mobile_phone: function mobile_phone() {
-      return yup.string().test(MOBILE_PHONE_VALIDATOR);
-    },
-    phone_number: function phone_number(field) {
-      return yup.string().test(PHONE_NUMBER_VALIDATOR(field));
-    },
-    'choice:multiple': function choiceMultiple() {
-      return yup.array().of(yup.string()).nullable();
-    },
-    'choice:single': function choiceSingle() {
-      return yup.string().nullable();
+    postal_code: (field) => yup.string().trim().test(POSTALCODE_VALIDATOR(field)),
+    mobile_phone: () => yup.string().trim().test(MOBILE_PHONE_VALIDATOR),
+    phone_number: (field) => yup.string().trim().test(PHONE_NUMBER_VALIDATOR(field)),
+    "choice:multiple": () => yup.array().of(yup.string()).nullable(),
+    "choice:single": () => yup.string().nullable(),
+    date: (field) => {
+      let schema = yup.string().nullable();
+      if (field?.extra?.min) {
+        schema = schema.test(LATER_THAN_VALIDATOR(field));
+      }
+      if (field?.extra?.max) {
+        schema = schema.test(EARLIER_THAN_VALIDATOR(field));
+      } else {
+        schema = schema.test(DATE_VALIDATOR);
+      }
+      return schema;
     },
-    date: function date(field) {
-      var simpleDate = yup.string().nullable(true).test('date', 'form.error.date.invalid', function (value) {
-        if (!value) return true;
-        var date = getDate(value);
-        return date.isValid();
-      });
-      var params = field.extra || {};
-      if (params.max) {
-        var maxDate;
-        if (params.max === 'now') {
-          var today = new Date();
-          maxDate = new Date(today);
-        } else {
-          maxDate = getDate(params.max).toDate();
-        }
-        var 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 test(value) {
-            if (!value) return true;
-            var date = getDate(value);
-            var isValid = +date.toDate() < +maxDate;
-            return isValid;
-          }
-        });
+    datetime: (field) => {
+      if (field?.extra?.min) {
+        return yup.string().test(LATER_THAN_DATETIME_VALIDATOR(field));
       }
-      if (params.min) {
-        var minDate;
-        if (params.min === 'now') {
-          var _today = new Date();
-          minDate = new Date(_today);
-        } else {
-          minDate = getDate(params.min).toDate();
-        }
-        var 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 test(value) {
-            if (!value) return true;
-            var date = getDate(value);
-            var isValid = +date.toDate() > +minDate;
-            return isValid;
-          }
-        });
+      if (field?.extra?.max) {
+        return yup.string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));
       }
-      return simpleDate;
+      return yup.string().test(DATETIME_VALIDATOR);
     }
   };
   return yupTypeMap;
 };
-// Create a yup validation schema from given fields input
-export function useValidationSchema(fields, validatorRegistry) {
-  return useMemo(function () {
-    var yupTypeMap = getYUPTypeMap();
+function useValidationSchema(fields, validatorRegistry) {
+  return useMemo(() => {
+    const yupTypeMap = getYUPTypeMap();
     return getYupObjectShape(fields, yupTypeMap, validatorRegistry);
   }, []);
-}
+}
+export {
+  getYUPTypeMap,
+  useValidationSchema
+};
+//# sourceMappingURL=index.js.map

package/validators/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/validators/index.ts"],
+  "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: (): yup.StringSchema => yup.string().trim(),\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) : 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().trim().test(AFM_VALIDATOR),\n    uuid4: (): yup.StringSchema => yup.string().trim().test(UUID4_VALIDATOR),\n    iban: (field): yup.StringSchema =>\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 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().trim().test(POSTALCODE_VALIDATOR(field)),\n    mobile_phone: (): yup.StringSchema =>\n      yup.string().trim().test(MOBILE_PHONE_VALIDATOR),\n    phone_number: (field): yup.StringSchema =>\n      yup.string().trim().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/types/index.js

@@ -1 +1 @@
-export {};
+//# sourceMappingURL=types.js.map

package/validators/types.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": [],
+  "sourcesContent": [],
+  "mappings": "",
+  "names": []
+}

package/validators/utils/afm/index.js

@@ -1,31 +1,31 @@
-export function validateAFM(afm) {
+function validateAFM(afm) {
   if (afm.length !== 9) {
-    // "afm should be 9 digits"
     return false;
   }
   if (!/^\d+$/.test(afm)) {
-    // "This is not a number"
     return false;
   }
-  if (afm === '0'.repeat(9)) {
-    // "This is zero number (000000000)"
+  if (afm === "0".repeat(9)) {
     return false;
   }
-  var sum = afm.substring(0, 8).split('').reduce(function (s, v, i) {
-    return s + (parseInt(v) << 8 - i);
-  }, 0);
-  var calc = sum % 11;
-  var d9 = parseInt(afm[8]);
-  var valid = calc % 10 === d9;
+  const sum = afm.substring(0, 8).split("").reduce((s, v, i) => s + (parseInt(v) << 8 - i), 0);
+  const calc = sum % 11;
+  const d9 = parseInt(afm[8]);
+  const valid = calc % 10 === d9;
   return valid;
 }
-export var AFM_VALIDATOR = {
-  name: 'afm-validator',
-  message: 'form.error.afm',
-  test: function test(value) {
+const AFM_VALIDATOR = {
+  name: "afm-validator",
+  message: "form.error.afm",
+  test: (value) => {
     if (value) {
       return validateAFM(value);
     }
     return true;
   }
-};
+};
+export {
+  AFM_VALIDATOR,
+  validateAFM
+};
+//# sourceMappingURL=afm.js.map

package/validators/utils/afm.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/validators/utils/afm.ts"],
+  "sourcesContent": ["export function validateAFM(afm: string): boolean {\n  if (afm.length !== 9) {\n    // \"afm should be 9 digits\"\n    return false;\n  }\n\n  if (!/^\\d+$/.test(afm)) {\n    // \"This is not a number\"\n    return false;\n  }\n\n  if (afm === '0'.repeat(9)) {\n    // \"This is zero number (000000000)\"\n    return false;\n  }\n\n  const sum = afm\n    .substring(0, 8)\n    .split('')\n    .reduce((s, v, i) => s + (parseInt(v) << (8 - i)), 0);\n\n  const calc = sum % 11;\n  const d9 = parseInt(afm[8]);\n  const valid = calc % 10 === d9;\n  return valid;\n}\n\nexport const AFM_VALIDATOR = {\n  name: 'afm-validator',\n  message: 'form.error.afm',\n  test: (value): boolean => {\n    if (value) {\n      return validateAFM(value);\n    }\n    return true;\n  },\n};\n"],
+  "mappings": "AAAO,SAAS,YAAY,KAAsB;AAChD,MAAI,IAAI,WAAW,GAAG;AAEpB,WAAO;AAAA,EACT;AAEA,MAAI,CAAC,QAAQ,KAAK,GAAG,GAAG;AAEtB,WAAO;AAAA,EACT;AAEA,MAAI,QAAQ,IAAI,OAAO,CAAC,GAAG;AAEzB,WAAO;AAAA,EACT;AAEA,QAAM,MAAM,IACT,UAAU,GAAG,CAAC,EACd,MAAM,EAAE,EACR,OAAO,CAAC,GAAG,GAAG,MAAM,KAAK,SAAS,CAAC,KAAM,IAAI,IAAK,CAAC;AAEtD,QAAM,OAAO,MAAM;AACnB,QAAM,KAAK,SAAS,IAAI,CAAC,CAAC;AAC1B,QAAM,QAAQ,OAAO,OAAO;AAC5B,SAAO;AACT;AAEO,MAAM,gBAAgB;AAAA,EAC3B,MAAM;AAAA,EACN,SAAS;AAAA,EACT,MAAM,CAAC,UAAmB;AACxB,QAAI,OAAO;AACT,aAAO,YAAY,KAAK;AAAA,IAC1B;AACA,WAAO;AAAA,EACT;AACF;",
+  "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/validators/utils/date/package.json

@@ -0,0 +1,6 @@
+{
+  "sideEffects": false,
+  "module": "./index.js",
+  "types": "./index.d.ts",
+  "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/{Questions/Questions.stories → validators/utils/datetime}/package.json

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