@digigov/form 2.0.0-7d9a8d86 → 2.0.0-834daea4

package/src/validators/utils/index.ts

@@ -11,6 +11,7 @@ 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 function getYupField(field: FieldSpec, yupTypeMap: Record<string, any>) {
   const yupField = yupTypeMap[field?.type || 'string'] || yupTypeMap['string'];

package/src/validators/utils/phone.ts

@@ -4,20 +4,20 @@ import { ValidatorSchema } from '@digigov/form/validators/types';
 export type PhoneNumberType = 'landline' | 'mobile' | null;
 // add more countries from here libphonenumber-js/metadata.full.json
 const countryPhoneData = {
-  "GR": [
-    "30",
-    "00",
-    "5005000\\d{3}|8\\d{9,11}|(?:[269]\\d|70)\\d{8}",
+  GR: [
+    '30',
+    '00',
+    '5005000\\d{3}|8\\d{9,11}|(?:[269]\\d|70)\\d{8}',
     [10, 11, 12],
     [
-      ["(\\d{2})(\\d{4})(\\d{4})", "$1 $2 $3", ["21|7"]],
+      ['(\\d{2})(\\d{4})(\\d{4})', '$1 $2 $3', ['21|7']],
       [
-        "(\\d{4})(\\d{6})",
-        "$1 $2",
-        ["2(?:2|3[2-57-9]|4[2-469]|5[2-59]|6[2-9]|7[2-69]|8[2-49])|5"]
+        '(\\d{4})(\\d{6})',
+        '$1 $2',
+        ['2(?:2|3[2-57-9]|4[2-469]|5[2-59]|6[2-9]|7[2-69]|8[2-49])|5'],
       ],
-      ["(\\d{3})(\\d{3})(\\d{4})", "$1 $2 $3", ["[2689]"]],
-      ["(\\d{3})(\\d{3,4})(\\d{5})", "$1 $2 $3", ["8"]]
+      ['(\\d{3})(\\d{3})(\\d{4})', '$1 $2 $3', ['[2689]']],
+      ['(\\d{3})(\\d{3,4})(\\d{5})', '$1 $2 $3', ['8']],
     ],
     0,
     0,
@@ -27,93 +27,77 @@ const countryPhoneData = {
     0,
     [
       [
-        "2(?:1\\d\\d|2(?:2[1-46-9]|[36][1-8]|4[1-7]|5[1-4]|7[1-5]|[89][1-9])|3(?:1\\d|2[1-57]|[35][1-3]|4[13]|7[1-7]|8[124-6]|9[1-79])|4(?:1\\d|2[1-8]|3[1-4]|4[13-5]|6[1-578]|9[1-5])|5(?:1\\d|[29][1-4]|3[1-5]|4[124]|5[1-6])|6(?:1\\d|[269][1-6]|3[1245]|4[1-7]|5[13-9]|7[14]|8[1-5])|7(?:1\\d|2[1-5]|3[1-6]|4[1-7]|5[1-57]|6[135]|9[125-7])|8(?:1\\d|2[1-5]|[34][1-4]|9[1-57]))\\d{6}",
-        [10]
+        '2(?:1\\d\\d|2(?:2[1-46-9]|[36][1-8]|4[1-7]|5[1-4]|7[1-5]|[89][1-9])|3(?:1\\d|2[1-57]|[35][1-3]|4[13]|7[1-7]|8[124-6]|9[1-79])|4(?:1\\d|2[1-8]|3[1-4]|4[13-5]|6[1-578]|9[1-5])|5(?:1\\d|[29][1-4]|3[1-5]|4[124]|5[1-6])|6(?:1\\d|[269][1-6]|3[1245]|4[1-7]|5[13-9]|7[14]|8[1-5])|7(?:1\\d|2[1-5]|3[1-6]|4[1-7]|5[1-57]|6[135]|9[125-7])|8(?:1\\d|2[1-5]|[34][1-4]|9[1-57]))\\d{6}',
+        [10],
       ],
-      ["68[57-9]\\d{7}|(?:69|94)\\d{8}", [10]],
-      ["800\\d{7,9}"],
-      ["90[19]\\d{7}", [10]],
-      ["70\\d{8}", [10]],
+      ['68[57-9]\\d{7}|(?:69|94)\\d{8}', [10]],
+      ['800\\d{7,9}'],
+      ['90[19]\\d{7}', [10]],
+      ['70\\d{8}', [10]],
       0,
-      ["5005000\\d{3}", [10]],
+      ['5005000\\d{3}', [10]],
       0,
       0,
-      ["8(?:0[16]|12|[27]5|50)\\d{7}", [10]]
-    ]
-  ]
-}
+      ['8(?:0[16]|12|[27]5|50)\\d{7}', [10]],
+    ],
+  ],
+};
 
 function expandPhoneNumberStructure(compressed) {
   const countries = Object.keys(compressed);
-  const expanded: any = {}
+  const expanded: any = {};
   for (const country of countries) {
     expanded[country] = {
       fixedLine: {
         possibleLengths: {
-          _national:
-            compressed[country][3].map(
-              String
-            ),
+          _national: compressed[country][3].map(String),
         },
-        nationalNumberPattern:
-          compressed[country][11][0][0],
+        nationalNumberPattern: compressed[country][11][0][0],
       },
       mobile: {
-        nationalNumberPattern:
-          compressed[country][11][1][0],
+        nationalNumberPattern: compressed[country][11][1][0],
       },
       tollFree: {
-        nationalNumberPattern:
-          compressed[country][11][2][0],
+        nationalNumberPattern: compressed[country][11][2][0],
       },
       premiumRate: {
-        nationalNumberPattern:
-          compressed[country][11][3][0],
+        nationalNumberPattern: compressed[country][11][3][0],
       },
       sharedCost: {
-        nationalNumberPattern:
-          compressed[country][11][9][0],
+        nationalNumberPattern: compressed[country][11][9][0],
       },
       personalNumber: {
-        nationalNumberPattern:
-          compressed[country][11][4][0],
+        nationalNumberPattern: compressed[country][11][4][0],
       },
       uan: {
-        nationalNumberPattern:
-          compressed[country][11][6][0],
+        nationalNumberPattern: compressed[country][11][6][0],
       },
       id: country,
-      countryCode:
-        compressed[country][0],
-      internationalPrefix:
-        compressed[country][1],
-
-    }
+      countryCode: compressed[country][0],
+      internationalPrefix: compressed[country][1],
+    };
   }
   return expanded;
 }
 const PHONENUMBER_SPEC = expandPhoneNumberStructure(countryPhoneData);
-export function discoverPhoneType(
-  phoneNumber: string,
-  config: any
-): string {
+export function discoverPhoneType(phoneNumber: string, config: any): string {
   const cleanNumber = phoneNumber
-    .replace(/\D/g, "")
-    .replace(/\s/g, "")
-    .replace(/^\+/, "")
-    .replace(new RegExp("^" + config.internationalPrefix, ""), "")
-    .replace(new RegExp("^" + config.countryCode, ""), "");
+    .replace(/\D/g, '')
+    .replace(/\s/g, '')
+    .replace(/^\+/, '')
+    .replace(new RegExp('^' + config.internationalPrefix, ''), '')
+    .replace(new RegExp('^' + config.countryCode, ''), '');
   const categories = {
-    "landline": config.fixedLine,
+    landline: config.fixedLine,
     mobile: config.mobile,
-    "toll-free": config.tollFree,
-    "premium-rate": config.premiumRate,
+    'toll-free': config.tollFree,
+    'premium-rate': config.premiumRate,
   };
 
   for (const [categoryName, categoryDetails] of Object.entries(categories)) {
     const pattern = new RegExp(
-      "^(" + categoryDetails.nationalNumberPattern.replace(/\s/g, "") + ")$",
-      ""
+      '^(' + categoryDetails.nationalNumberPattern.replace(/\s/g, '') + ')$',
+      ''
     );
     if (cleanNumber.match(pattern)) {
       return categoryName; // Returns the category name if the number matches the pattern
@@ -121,32 +105,36 @@ export function discoverPhoneType(
   }
 
   // If no category matches, return 'Unknown'
-  return "unknown";
+  return 'unknown';
 }
 function getNumberType(phoneNumber: string, country: string) {
   const spec = PHONENUMBER_SPEC[country.toUpperCase()];
-  if(!spec) {
+  if (!spec) {
     throw new Error(`Country ${country} is not supported`);
   }
   const type = discoverPhoneType(phoneNumber, spec);
   return type;
 }
 
-function isPhoneNumberValid(phoneNumber: string, countries: string[], types=['mobile', 'landline']) {
+function isPhoneNumberValid(
+  phoneNumber: string,
+  countries: string[],
+  types = ['mobile', 'landline']
+) {
   return countries.some((country) => {
     const numberType = getNumberType(phoneNumber, country);
     if (numberType && types.includes(numberType)) {
-      return true
+      return true;
     }
-    return false
-  })
+    return false;
+  });
 }
 function isNumberOfType(phoneNumber: string, country: string, type: string) {
   const numberType = getNumberType(phoneNumber, country);
   if (numberType === type) {
-    return true
+    return true;
   }
-  return false
+  return false;
 }
 export function validatePhoneNumber(
   phoneNumber: string,
@@ -156,12 +144,15 @@ export function validatePhoneNumber(
   if (!countries || countries.length === 0) {
     return true;
   }
-  return isPhoneNumberValid(phoneNumber, countries, typeOfPhoneNumber? [typeOfPhoneNumber] : undefined);
+  return isPhoneNumberValid(
+    phoneNumber,
+    countries,
+    typeOfPhoneNumber ? [typeOfPhoneNumber] : undefined
+  );
 }
 
-
 function validateMobile(value): boolean {
-  return isNumberOfType(value, 'gr','mobile');
+  return isNumberOfType(value, 'gr', 'mobile');
 }
 
 export const MOBILE_PHONE_VALIDATOR = {

package/src/validators/validators.spec.ts

@@ -69,54 +69,20 @@ it('validates phone number type landline with greek country code', () => {
   expect(validatePhoneNumber('2102934896', ['GR'], 'landline')).toBe(true);
 });
 
-it('validates phone number type landline with ch country code', () => {
-  expect(validatePhoneNumber('2102934896', ['CH'], 'landline')).toBe(false);
-});
-
-it('validates phone number type landline with ch  and  gr countries code', () => {
-  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'landline')).toBe(
-    true
-  );
-});
-
-it('validatesphone number type landline with ch  and  gr countries code', () => {
-  expect(validatePhoneNumber('41446681800', ['GR', 'CH'], 'landline')).toBe(
-    true
+it('throws if given country is not supported', () => {
+  expect(() => validatePhoneNumber('2102934896', ['CH'], 'landline')).toThrow(
+    'Country CH is not supported'
   );
 });
 
-it('validates phone number type landline with ch  and  gr countries code but phone number is mobile', () => {
-  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'mobile')).toBe(false);
-});
-
-it('validates phone number type mobile with ch  and  gr countries code', () => {
-  expect(validatePhoneNumber('6934100982', ['GR', 'CH'], 'mobile')).toBe(true);
-});
-
 it('validates  phone number type mobile with gr country code', () => {
   expect(validatePhoneNumber('6934100982', ['GR'], 'mobile')).toBe(true);
 });
 
-it('validates  phone number type mobile with ch country code', () => {
-  expect(validatePhoneNumber('6934100982', ['CH'], 'mobile')).toBe(false);
-});
-
-it('validates  phone number with no type and ch country code', () => {
-  expect(validatePhoneNumber('6934100982', ['CH'], null)).toBe(false);
-});
-
 it('validates  phone number with no type and gr country code', () => {
   expect(validatePhoneNumber('6934100982', ['gr'], null)).toBe(true);
 });
 
-it('validates  phone number with no type and ch country code', () => {
-  expect(validatePhoneNumber('41446681800', ['CH'], null)).toBe(true);
-});
-
 it('validates  phone number with no type and gr country code', () => {
   expect(validatePhoneNumber('41446681800', ['gr'], null)).toBe(false);
 });
-
-it('validates  phone number with no type and gr and ch countries code', () => {
-  expect(validatePhoneNumber('41446681800', ['gr', 'ch'], null)).toBe(true);
-});

package/types/index.js

@@ -1 +1,2 @@
+export * from "@digigov/form/Field/types";
 //# sourceMappingURL=types.js.map

package/types.d.ts

@@ -1,48 +1,16 @@
-/// <reference types="react" />
 import { UseFormReturn, UseFormProps } from 'react-hook-form';
-import { FieldComponentRegistry } from '@digigov/form/Field/types';
+import { FieldComponentRegistry, FieldLabelProps, FieldSpec, FormData } from '@digigov/form/Field/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
-import { GridProps } from '@digigov/ui/layouts/Grid';
+export * from '@digigov/form/Field/types';
 export type FieldError = {
     message: string;
 };
-export type FieldLabelProps = {
-    primary?: string;
-    secondary?: string;
-};
-export interface FieldCondition {
-    is: string | string[] | number | number[] | boolean | boolean[];
-    then?: Partial<FieldSpec>;
-    else?: Partial<FieldSpec>;
-}
-export interface FieldSpec {
-    key: string;
-    type?: 'int' | 'string' | 'text' | 'boolean' | 'email' | 'uuid4' | 'choice:multiple' | 'choice:single' | 'mobile_phone' | 'date' | 'otp' | 'afm' | 'iban' | 'file' | 'image' | 'postal_code' | 'phone_number' | 'array' | 'object';
-    component?: any;
-    maxLength?: number;
-    condition?: Record<string, FieldCondition>;
-    controlled?: boolean;
-    label?: FieldLabelProps;
-    extra?: {
-        [key: string]: any;
-    };
-    editable?: boolean;
-    required?: boolean;
-    enabled?: boolean;
-    layout?: Record<string, GridProps['xs'] | GridProps['sm'] | GridProps['md'] | GridProps['lg'] | GridProps['xl']>;
-    validators?: ValidatorSchema[];
-    wrapper?: 'label' | 'fieldset';
-    maxWidth?: string;
-    maxHeight?: string;
-    width?: string;
-}
 export interface FieldsetSpec {
     key: string;
     fields: string[];
     label?: FieldLabelProps;
     body?: React.ReactNode;
 }
-export type FormData = UseFormProps['defaultValues'];
 export interface FormContextProps {
     fieldsetsMap?: Record<string, FieldsetSpec>;
     fieldsMap: Record<string, FieldSpec>;
@@ -57,9 +25,11 @@ export interface FormContextProps {
     unregister: UseFormReturn['unregister'];
     formState: UseFormReturn['formState'];
     reset: UseFormReturn['reset'];
+    resetField: UseFormReturn['resetField'];
     registerField: (field: FieldSpec) => void;
     errors: UseFormReturn['formState']['errors'];
     componentRegistry?: FieldComponentRegistry;
+    submit: () => Promise<void>;
 }
 export interface FormBuilderProps {
     fields?: FieldSpec[];
@@ -75,6 +45,7 @@ export interface FormBuilderProps {
     validatorRegistry?: Record<string, ValidatorSchema[]>;
     componentRegistry?: FieldComponentRegistry;
     grid?: boolean;
+    controlledFieldsOnly?: boolean;
 }
 export interface FormBaseProps extends Omit<FormBuilderProps, 'fields' | 'fieldsets' | 'auto'> {
     fieldsetsMap?: Record<string, FieldsetSpec>;

package/types.js.map

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

package/utils/index.js

@@ -1,25 +1,39 @@
-import {validateFieldsNatively} from "@hookform/resolvers";
-import {appendErrors} from "react-hook-form";
+import { validateFieldsNatively } from "@hookform/resolvers";
+import { appendErrors } from "react-hook-form";
 const parseErrorSchema = (error, validateAllFieldCriteria) => {
-  return (error.inner || []).reduce((previous, error2) => {
-    error2.path = error2.path?.replace(/\[([0-9]+)\]/g, ".$1");
-    if (!previous[error2.path]) {
-      previous[error2.path] = {message: error2.message, type: error2.type};
-    }
-    if (validateAllFieldCriteria) {
-      const types = previous[error2.path].types;
-      const messages = types && types[error2.type];
-      previous[error2.path] = appendErrors(error2.path, validateAllFieldCriteria, previous, error2.type, messages ? [].concat(messages, error2.message) : error2.message);
-    }
-    return previous;
-  }, {});
+  return (error.inner || []).reduce(
+    (previous, error2) => {
+      error2.path = error2.path?.replace(/\[([0-9]+)\]/g, ".$1");
+      if (!previous[error2.path]) {
+        previous[error2.path] = { message: error2.message, type: error2.type };
+      }
+      if (validateAllFieldCriteria) {
+        const types = previous[error2.path].types;
+        const messages = types && types[error2.type];
+        previous[error2.path] = appendErrors(
+          error2.path,
+          validateAllFieldCriteria,
+          previous,
+          error2.type,
+          messages ? [].concat(messages, error2.message) : error2.message
+        );
+      }
+      return previous;
+    },
+    {}
+  );
 };
 const yupResolver = (schema, schemaOptions = {}, resolverOptions = {}) => async (values, context, options) => {
   try {
     if (schemaOptions.context && process.env.NODE_ENV === "development") {
-      console.warn("You should not used the yup options context. Please, use the 'useForm' context object instead");
+      console.warn(
+        "You should not used the yup options context. Please, use the 'useForm' context object instead"
+      );
     }
-    const result = await schema[resolverOptions.mode === "sync" ? "validateSync" : "validate"](values, Object.assign({abortEarly: false}, schemaOptions, {context}));
+    const result = await schema[resolverOptions.mode === "sync" ? "validateSync" : "validate"](
+      values,
+      Object.assign({ abortEarly: false }, schemaOptions, { context })
+    );
     options.shouldUseNativeValidation && validateFieldsNatively({}, options);
     return {
       values: resolverOptions.rawValues ? values : result,
@@ -29,7 +43,10 @@ const yupResolver = (schema, schemaOptions = {}, resolverOptions = {}) => async
     if (!e.inner) {
       throw e;
     }
-    const parsed = parseErrorSchema(e, !options.shouldUseNativeValidation && options.criteriaMode === "all");
+    const parsed = parseErrorSchema(
+      e,
+      !options.shouldUseNativeValidation && options.criteriaMode === "all"
+    );
     return {
       values: {},
       errors: parsed

package/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/utils.ts"],
-  "sourcesContent": ["import { validateFieldsNatively } from '@hookform/resolvers';\nimport { appendErrors, FieldError } from 'react-hook-form';\nimport * as Yup from 'yup';\n\n/**\n * Why `path!` ? because it could be `undefined` in some case\n * https://github.com/jquense/yup#validationerrorerrors-string--arraystring-value-any-path-string\n */\nconst parseErrorSchema = (\n  error: Yup.ValidationError,\n  validateAllFieldCriteria: boolean\n) => {\n  return (error.inner || []).reduce<Record<string, FieldError>>(\n    (previous, error) => {\n      error.path = error.path?.replace(/\\[([0-9]+)\\]/g, '.$1');\n      if (!previous[error.path!]) {\n        previous[error.path!] = { message: error.message, type: error.type! };\n      }\n\n      if (validateAllFieldCriteria) {\n        const types = previous[error.path!].types;\n        const messages = types && types[error.type!];\n\n        previous[error.path!] = appendErrors(\n          error.path!,\n          validateAllFieldCriteria,\n          previous,\n          error.type!,\n          messages\n            ? ([] as string[]).concat(messages as string[], error.message)\n            : error.message\n        ) as FieldError;\n      }\n\n      return previous;\n    },\n    {}\n  );\n};\n\nexport const yupResolver = (\n  schema: any,\n  schemaOptions: any = {},\n  resolverOptions: any = {}\n) => async (values, context, options) => {\n  try {\n    if (schemaOptions.context && process.env.NODE_ENV === 'development') {\n      // eslint-disable-next-line no-console\n      console.warn(\n        \"You should not used the yup options context. Please, use the 'useForm' context object instead\"\n      );\n    }\n\n    const result = await schema[\n      resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'\n    ](values, Object.assign({ abortEarly: false }, schemaOptions, { context }));\n\n    options.shouldUseNativeValidation && validateFieldsNatively({}, options);\n\n    return {\n      values: resolverOptions.rawValues ? values : result,\n      errors: {},\n    };\n  } catch (e) {\n    if (!e.inner) {\n      throw e;\n    }\n\n    const parsed = parseErrorSchema(\n      e,\n      !options.shouldUseNativeValidation && options.criteriaMode === 'all'\n    );\n    return {\n      values: {},\n      errors: parsed,\n    };\n  }\n};\n"],
-  "mappings": "AAAA;AACA;AAOA,MAAM,mBAAmB,CACvB,OACA,6BACG;AACH,SAAQ,OAAM,SAAS,IAAI,OACzB,CAAC,UAAU,WAAU;AACnB,WAAM,OAAO,OAAM,MAAM,QAAQ,iBAAiB;AAClD,QAAI,CAAC,SAAS,OAAM,OAAQ;AAC1B,eAAS,OAAM,QAAS,CAAE,SAAS,OAAM,SAAS,MAAM,OAAM;AAAA;AAGhE,QAAI,0BAA0B;AAC5B,YAAM,QAAQ,SAAS,OAAM,MAAO;AACpC,YAAM,WAAW,SAAS,MAAM,OAAM;AAEtC,eAAS,OAAM,QAAS,aACtB,OAAM,MACN,0BACA,UACA,OAAM,MACN,WACK,GAAgB,OAAO,UAAsB,OAAM,WACpD,OAAM;AAAA;AAId,WAAO;AAAA,KAET;AAAA;AAIG,MAAM,cAAc,CACzB,QACA,gBAAqB,IACrB,kBAAuB,OACpB,OAAO,QAAQ,SAAS,YAAY;AACvC,MAAI;AACF,QAAI,cAAc,WAAW,QAAQ,IAAI,aAAa,eAAe;AAEnE,cAAQ,KACN;AAAA;AAIJ,UAAM,SAAS,MAAM,OACnB,gBAAgB,SAAS,SAAS,iBAAiB,YACnD,QAAQ,OAAO,OAAO,CAAE,YAAY,QAAS,eAAe,CAAE;AAEhE,YAAQ,6BAA6B,uBAAuB,IAAI;AAEhE,WAAO;AAAA,MACL,QAAQ,gBAAgB,YAAY,SAAS;AAAA,MAC7C,QAAQ;AAAA;AAAA,WAEH,GAAP;AACA,QAAI,CAAC,EAAE,OAAO;AACZ,YAAM;AAAA;AAGR,UAAM,SAAS,iBACb,GACA,CAAC,QAAQ,6BAA6B,QAAQ,iBAAiB;AAEjE,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA;AAAA;AAAA;",
-  "names": []
+  "sourcesContent": ["import { validateFieldsNatively } from '@hookform/resolvers';\nimport { appendErrors, FieldError } from 'react-hook-form';\nimport * as Yup from 'yup';\n\n/**\n * Why `path!` ? because it could be `undefined` in some case\n * https://github.com/jquense/yup#validationerrorerrors-string--arraystring-value-any-path-string\n */\nconst parseErrorSchema = (\n  error: Yup.ValidationError,\n  validateAllFieldCriteria: boolean\n) => {\n  return (error.inner || []).reduce<Record<string, FieldError>>(\n    (previous, error) => {\n      error.path = error.path?.replace(/\\[([0-9]+)\\]/g, '.$1');\n      if (!previous[error.path!]) {\n        previous[error.path!] = { message: error.message, type: error.type! };\n      }\n\n      if (validateAllFieldCriteria) {\n        const types = previous[error.path!].types;\n        const messages = types && types[error.type!];\n\n        previous[error.path!] = appendErrors(\n          error.path!,\n          validateAllFieldCriteria,\n          previous,\n          error.type!,\n          messages\n            ? ([] as string[]).concat(messages as string[], error.message)\n            : error.message\n        ) as FieldError;\n      }\n\n      return previous;\n    },\n    {}\n  );\n};\n\nexport const yupResolver =\n  (schema: any, schemaOptions: any = {}, resolverOptions: any = {}) =>\n  async (values, context, options) => {\n    try {\n      if (schemaOptions.context && process.env.NODE_ENV === 'development') {\n        // eslint-disable-next-line no-console\n        console.warn(\n          \"You should not used the yup options context. Please, use the 'useForm' context object instead\"\n        );\n      }\n\n      const result = await schema[\n        resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'\n      ](\n        values,\n        Object.assign({ abortEarly: false }, schemaOptions, { context })\n      );\n\n      options.shouldUseNativeValidation && validateFieldsNatively({}, options);\n\n      return {\n        values: resolverOptions.rawValues ? values : result,\n        errors: {},\n      };\n    } catch (e) {\n      if (!e.inner) {\n        throw e;\n      }\n\n      const parsed = parseErrorSchema(\n        e,\n        !options.shouldUseNativeValidation && options.criteriaMode === 'all'\n      );\n      return {\n        values: {},\n        errors: parsed,\n      };\n    }\n  };\n"],
+  "mappings": "AAAA,SAAS,8BAA8B;AACvC,SAAS,oBAAgC;AAOzC,MAAM,mBAAmB,CACvB,OACA,6BACG;AACH,UAAQ,MAAM,SAAS,CAAC,GAAG;AAAA,IACzB,CAAC,UAAUA,WAAU;AACnB,MAAAA,OAAM,OAAOA,OAAM,MAAM,QAAQ,iBAAiB,KAAK;AACvD,UAAI,CAAC,SAASA,OAAM,IAAK,GAAG;AAC1B,iBAASA,OAAM,IAAK,IAAI,EAAE,SAASA,OAAM,SAAS,MAAMA,OAAM,KAAM;AAAA,MACtE;AAEA,UAAI,0BAA0B;AAC5B,cAAM,QAAQ,SAASA,OAAM,IAAK,EAAE;AACpC,cAAM,WAAW,SAAS,MAAMA,OAAM,IAAK;AAE3C,iBAASA,OAAM,IAAK,IAAI;AAAA,UACtBA,OAAM;AAAA,UACN;AAAA,UACA;AAAA,UACAA,OAAM;AAAA,UACN,WACK,CAAC,EAAe,OAAO,UAAsBA,OAAM,OAAO,IAC3DA,OAAM;AAAA,QACZ;AAAA,MACF;AAEA,aAAO;AAAA,IACT;AAAA,IACA,CAAC;AAAA,EACH;AACF;AAEO,MAAM,cACX,CAAC,QAAa,gBAAqB,CAAC,GAAG,kBAAuB,CAAC,MAC/D,OAAO,QAAQ,SAAS,YAAY;AAClC,MAAI;AACF,QAAI,cAAc,WAAW,QAAQ,IAAI,aAAa,eAAe;AAEnE,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAEA,UAAM,SAAS,MAAM,OACnB,gBAAgB,SAAS,SAAS,iBAAiB,UACrD;AAAA,MACE;AAAA,MACA,OAAO,OAAO,EAAE,YAAY,MAAM,GAAG,eAAe,EAAE,QAAQ,CAAC;AAAA,IACjE;AAEA,YAAQ,6BAA6B,uBAAuB,CAAC,GAAG,OAAO;AAEvE,WAAO;AAAA,MACL,QAAQ,gBAAgB,YAAY,SAAS;AAAA,MAC7C,QAAQ,CAAC;AAAA,IACX;AAAA,EACF,SAAS,GAAG;AACV,QAAI,CAAC,EAAE,OAAO;AACZ,YAAM;AAAA,IACR;AAEA,UAAM,SAAS;AAAA,MACb;AAAA,MACA,CAAC,QAAQ,6BAA6B,QAAQ,iBAAiB;AAAA,IACjE;AACA,WAAO;AAAA,MACL,QAAQ,CAAC;AAAA,MACT,QAAQ;AAAA,IACV;AAAA,EACF;AACF;",
+  "names": ["error"]
 }

package/validators/index.js

@@ -1,6 +1,4 @@
-import {useMemo} from "react";
-import dayjs from "dayjs";
-import customParseFormat from "dayjs/plugin/customParseFormat";
+import { useMemo } from "react";
 import * as yup from "yup";
 import {
   getYupObjectShape,
@@ -13,16 +11,13 @@ import {
   TEXT_LIMIT_VALIDATOR,
   POSTALCODE_VALIDATOR,
   UUID4_VALIDATOR,
-  IMAGE_DIMENSION_VALIDATOR
+  IMAGE_DIMENSION_VALIDATOR,
+  DATE_VALIDATOR,
+  LATER_THAN_VALIDATOR,
+  EARLIER_THAN_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);
-};
+import { INT_VALIDATOR } from "@digigov/form/validators/utils/int";
+import { NUMBER_VALIDATOR } from "@digigov/form/validators/utils/number";
 const getYUPTypeMap = () => {
   const yupTypeMap = {
     file: (field) => {
@@ -69,6 +64,7 @@ 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),
@@ -96,68 +92,14 @@ const getYUPTypeMap = () => {
     "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 = 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;
-          }
-        });
+      if (field?.extra?.min) {
+        return yup.string().test(LATER_THAN_VALIDATOR(field));
       }
-      if (params.min) {
-        let minDate;
-        if (params.min === "now") {
-          const today = 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) {
+        return yup.string().test(EARLIER_THAN_VALIDATOR(field));
+      } else {
+        return yup.string().test(DATE_VALIDATOR);
       }
-      return simpleDate;
     }
   };
   return yupTypeMap;