@digigov/form 2.0.0-85c27c19 → 2.0.0-aefd0709

package/src/utils.ts

@@ -43,7 +43,6 @@ export const yupResolver =
   async (values, context, options) => {
     try {
       if (schemaOptions.context && process.env.NODE_ENV === 'development') {
-        // eslint-disable-next-line no-console
         console.warn(
           "You should not used the yup options context. Please, use the 'useForm' context object instead"
         );
@@ -56,7 +55,8 @@ export const yupResolver =
         Object.assign({ abortEarly: false }, schemaOptions, { context })
       );
 
-      options.shouldUseNativeValidation && validateFieldsNatively({}, options);
+      if (options.shouldUseNativeValidation)
+        validateFieldsNatively({}, options);
 
       return {
         values: resolverOptions.rawValues ? values : result,

package/src/validators/index.ts

@@ -1,6 +1,4 @@
 import { MutableRefObject, useMemo } from 'react';
-import dayjs from 'dayjs';
-import customParseFormat from 'dayjs/plugin/customParseFormat';
 import * as yup from 'yup';
 import { AnyObjectSchema, StringSchema } from 'yup';
 import { RequiredArraySchema } from 'yup/lib/array';
@@ -22,16 +20,12 @@ import {
   POSTALCODE_VALIDATOR,
   UUID4_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);
-};
 
 export const getYUPTypeMap = (): Record<string, any> => {
   const yupTypeMap = {
@@ -48,7 +42,21 @@ export const getYUPTypeMap = (): Record<string, any> => {
         .test(FILE_MAX_SIZE_VALIDATOR(field));
     },
     string: yup.string,
-    boolean: yup.boolean,
+    boolean: (): yup.BooleanSchema<
+      boolean | null | undefined,
+      AnyObject,
+      boolean | null | undefined
+    > => {
+      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
     ):
@@ -150,69 +158,23 @@ export const getYUPTypeMap = (): Record<string, any> => {
       AnyObject,
       string | null | undefined
     > => 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;
-          },
-        });
+    date: (
+      field
+    ): yup.StringSchema<
+      string | null | undefined,
+      AnyObject,
+      string | null | undefined
+    > => {
+      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 = 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 simpleDate;
+      return schema;
     },
   };
   return yupTypeMap;

package/src/validators/utils/date.ts

@@ -0,0 +1,107 @@
+import dayjs from 'dayjs';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
+import { FieldSpec } from '@digigov/form/types';
+import { ValidatorSchema } from '@digigov/form/validators/types';
+
+dayjs.extend(customParseFormat);
+
+const VALID_DATE_FORMATS = ['DD/MM/YYYY'];
+const DATE_CACHE = {};
+
+const getDate = (v: string) => {
+  return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);
+};
+
+// Function to check partial date completion
+const checkPartialDate = (value: string) => {
+  console.log("value.split('/')", value.split('/'));
+  const [day, month, year] = value.split('/');
+  if (day && !month && !year) {
+    return 'form.error.date.invalid_month_year';
+  }
+  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';
+  }
+};
+
+export const LATER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
+  let minDate;
+  const params = field.extra || {};
+  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);
+  return {
+    name: 'later-than',
+    message: {
+      key: 'form.error.date.later_than',
+      context: {
+        minDate: minPreviousDate.toLocaleDateString(),
+      },
+    },
+    test: function (value: string) {
+      if (!value) return true;
+      const date = getDate(value);
+      const isValid = +date.toDate() > +minDate;
+      return isValid;
+    },
+  };
+};
+
+export const EARLIER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
+  let maxDate;
+  const params = field.extra || {};
+  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);
+  return {
+    name: 'earlier-than',
+    message: {
+      key: 'form.error.date.earlier_than',
+      context: {
+        maxDate: maxNextDate.toLocaleDateString(),
+      },
+    },
+    test: function (value: string) {
+      if (!value) return true;
+      const date = getDate(value);
+      const isValid = +date.toDate() < +maxDate;
+      return isValid;
+    },
+  };
+};
+
+export const DATE_VALIDATOR = {
+  name: 'date-validator',
+  message: (v): string => {
+    return checkPartialDate(v.value);
+  },
+  test: function (value: string) {
+    if (!value) return true;
+    const date = getDate(value);
+    return date.isValid();
+  },
+};

package/src/validators/utils/file.ts

@@ -6,15 +6,17 @@ const DEFAULT_FILE_MAX_SIZE = 10000000;
 export const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => ({
   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) / 1000000,
+      maxSizeToMb:
+        (field?.extra?.limit.maxSize || DEFAULT_FILE_MAX_SIZE) / 1000000,
     },
   },
   test: (value: File[]): boolean => {
     if (value) {
       for (const file of value) {
-        const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE
+        const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
         if (file.size > maxSize) {
           return false;
         }

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

@@ -138,7 +138,7 @@ function isNumberOfType(phoneNumber: string, country: string, type: string) {
 }
 export function validatePhoneNumber(
   phoneNumber: string,
-  countries: Array<string> = ['gr'],
+  countries: string[] = ['gr'],
   typeOfPhoneNumber?: PhoneNumberType
 ): boolean {
   if (!countries || countries.length === 0) {

package/src/validators/utils/postal_code.ts

@@ -4,7 +4,7 @@ import { ValidatorSchema } from '@digigov/form/validators/types';
 const CODE_REGEX = /^[12345678][0-9]{4}$/;
 export function validatePostalCode(
   number: string,
-  countries: Array<string>
+  countries: string[]
 ): boolean {
   if (!countries) {
     return false;

package/src/validators/utils/uuid4.ts

@@ -1,4 +1,5 @@
-const UUID4_PATTERN = /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
+const UUID4_PATTERN =
+  /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
 
 export function validateUUID4(uuid4: string): boolean {
   if (uuid4.length !== 36) {

package/src/validators/validators.spec.ts

@@ -75,14 +75,14 @@ it('throws if given country is not supported', () => {
   );
 });
 
-it('validates  phone number type mobile with gr country code', () => {
+it('validates phone number type mobile with gr country code', () => {
   expect(validatePhoneNumber('6934100982', ['GR'], 'mobile')).toBe(true);
 });
 
-it('validates  phone number with no type and gr country code', () => {
+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 gr country code', () => {
+it('validates invalid phone number with no type and gr country code', () => {
   expect(validatePhoneNumber('41446681800', ['gr'], null)).toBe(false);
 });

package/types.d.ts

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

package/utils/index.js

@@ -34,7 +34,8 @@ const yupResolver = (schema, schemaOptions = {}, resolverOptions = {}) => async
       values,
       Object.assign({ abortEarly: false }, schemaOptions, { context })
     );
-    options.shouldUseNativeValidation && validateFieldsNatively({}, options);
+    if (options.shouldUseNativeValidation)
+      validateFieldsNatively({}, options);
     return {
       values: resolverOptions.rawValues ? values : result,
       errors: {}

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, 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;",
+  "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        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      if (options.shouldUseNativeValidation)\n        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;AACnE,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,QAAI,QAAQ;AACV,6BAAuB,CAAC,GAAG,OAAO;AAEpC,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 * 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);
-};
 const getYUPTypeMap = () => {
   const yupTypeMap = {
     file: (field) => {
@@ -34,7 +29,14 @@ const getYUPTypeMap = () => {
       }).nullable().test(FILE_MAX_SIZE_VALIDATOR(field));
     },
     string: yup.string,
-    boolean: yup.boolean,
+    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);
     },
@@ -97,65 +99,16 @@ 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 = /* @__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 simpleDate;
+      return schema;
     }
   };
   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": "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",
+  "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} 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.string,\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().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: (\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  };\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": []
 }