@digigov/form 2.0.0-8e254888 → 2.0.0-a402a664

package/src/validators/utils/file.ts

@@ -3,25 +3,39 @@ import { ValidatorSchema } from '@digigov/form/validators/types';
 
 const DEFAULT_FILE_MAX_SIZE = 10000000;
 
-export const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => ({
-  name: 'file-max-size-validator',
-  message: {
-    key:
-      field.type === 'file' ? 'form.error.file_size' : 'form.error.image_size',
-    context: {
-      maxSizeToMb:
-        (field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE) / 1000000,
+export const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
+  const maxSizeInBytes = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
+  let maxSizeTransformed = maxSizeInBytes / (1024 * 1024); // In MB
+  let maxSizeText = 'MB';
+  if (Math.round(maxSizeTransformed) === 0) {
+    maxSizeTransformed = Math.round(maxSizeInBytes / 1024);
+    maxSizeText = 'KB';
+  }
+  if (Math.round(maxSizeTransformed) === 0) {
+    maxSizeTransformed = maxSizeInBytes;
+    maxSizeText = 'Bytes';
+  }
+  return {
+    name: 'file-max-size-validator',
+    message: {
+      key:
+        field.type === 'file'
+          ? 'form.error.file_size'
+          : 'form.error.image_size',
+      context: {
+        maxSize: `${maxSizeTransformed} ${maxSizeText}`,
+      },
     },
-  },
-  test: (value: File[]): boolean => {
-    if (value) {
-      for (const file of value) {
-        const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
-        if (file.size > maxSize) {
-          return false;
+    test: (value: File[]): boolean => {
+      if (value) {
+        for (const file of Array.from(value)) {
+          const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
+          if (file.size > maxSize) {
+            return false;
+          }
         }
       }
-    }
-    return true;
-  },
-});
+      return true;
+    },
+  };
+};

package/src/validators/utils/index.ts

@@ -3,6 +3,7 @@ import { FieldSpec } from '@digigov/form/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 
 export * from '@digigov/form/validators/utils/afm';
+export * from '@digigov/form/validators/utils/amka';
 export * from '@digigov/form/validators/utils/file';
 export * from '@digigov/form/validators/utils/iban';
 export * from '@digigov/form/validators/utils/otp';
@@ -98,7 +99,9 @@ export function getYupObjectShape(
 
   return yup.lazy(function () {
     const fieldSchemas = computeShape(
-      Object.values(fields.current),
+      Object.values(fields.current).filter(
+        (f: FieldSpec) => !f.key.includes('.')
+      ) as FieldSpec[],
       yupTypeMap,
       validatorRegistry
     );

package/types.d.ts

@@ -1,4 +1,4 @@
-import { UseFormReturn, UseFormProps } from 'react-hook-form';
+import { UseFormReturn, UseFormProps, ErrorOption } 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';
@@ -46,6 +46,7 @@ export interface FormBuilderProps {
     componentRegistry?: FieldComponentRegistry;
     grid?: boolean;
     controlledFieldsOnly?: boolean;
+    errors?: ErrorOption;
 }
 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 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"],
+  "sourcesContent": ["import { UseFormReturn, UseFormProps, ErrorOption } 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  errors?: ErrorOption;\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

@@ -23,6 +23,20 @@ const parseErrorSchema = (error, validateAllFieldCriteria) => {
     {}
   );
 };
+function isPlainObject(obj) {
+  return typeof obj === "object" && obj !== null && Object.prototype.toString.call(obj) === "[object Object]";
+}
+function flattenObject(obj, prefix = "") {
+  return Object.keys(obj).reduce((acc, key) => {
+    const prefixedKey = prefix ? `${prefix}.${key}` : key;
+    if (isPlainObject(obj[key])) {
+      Object.assign(acc, flattenObject(obj[key], prefixedKey));
+    } else {
+      acc[prefixedKey] = obj[key];
+    }
+    return acc;
+  }, {});
+}
 const yupResolver = (schema, schemaOptions = {}, resolverOptions = {}) => async (values, context, options) => {
   try {
     if (schemaOptions.context && process.env.NODE_ENV === "development") {
@@ -31,7 +45,7 @@ const yupResolver = (schema, schemaOptions = {}, resolverOptions = {}) => async
       );
     }
     const result = await schema[resolverOptions.mode === "sync" ? "validateSync" : "validate"](
-      values,
+      flattenObject(values),
       Object.assign({ abortEarly: false }, schemaOptions, { context })
     );
     if (options.shouldUseNativeValidation)
@@ -44,13 +58,13 @@ const yupResolver = (schema, schemaOptions = {}, resolverOptions = {}) => async
     if (!e.inner) {
       throw e;
     }
-    const parsed = parseErrorSchema(
-      e,
-      !options.shouldUseNativeValidation && options.criteriaMode === "all"
-    );
     return {
       values: {},
-      errors: parsed
+      errors: parseErrorSchema(
+        e,
+        !options.shouldUseNativeValidation && options.criteriaMode === "all"
+      ),
+      options
     };
   }
 };

package/utils.d.ts

@@ -2,7 +2,9 @@ import { FieldError } from 'react-hook-form';
 export declare const yupResolver: (schema: any, schemaOptions?: any, resolverOptions?: any) => (values: any, context: any, options: any) => Promise<{
     values: any;
     errors: {};
+    options?: undefined;
 } | {
     values: {};
     errors: Record<string, FieldError>;
+    options: any;
 }>;

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        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;",
+  "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      // error.path = error.path?.replace(/\\[\"(.*?)\"\\]/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};\nfunction isPlainObject(obj) {\n  return (\n    typeof obj === 'object' &&\n    obj !== null &&\n    Object.prototype.toString.call(obj) === '[object Object]'\n  );\n}\nfunction flattenObject(obj, prefix = '') {\n  return Object.keys(obj).reduce((acc, key) => {\n    const prefixedKey = prefix ? `${prefix}.${key}` : key;\n\n    if (isPlainObject(obj[key])) {\n      Object.assign(acc, flattenObject(obj[key], prefixedKey));\n    } else {\n      acc[prefixedKey] = obj[key];\n    }\n\n    return acc;\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        flattenObject(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      return {\n        values: {},\n        errors: parseErrorSchema(\n          e,\n          !options.shouldUseNativeValidation && options.criteriaMode === 'all'\n        ),\n        options,\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;AAEvD,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;AACA,SAAS,cAAc,KAAK;AAC1B,SACE,OAAO,QAAQ,YACf,QAAQ,QACR,OAAO,UAAU,SAAS,KAAK,GAAG,MAAM;AAE5C;AACA,SAAS,cAAc,KAAK,SAAS,IAAI;AACvC,SAAO,OAAO,KAAK,GAAG,EAAE,OAAO,CAAC,KAAK,QAAQ;AAC3C,UAAM,cAAc,SAAS,GAAG,MAAM,IAAI,GAAG,KAAK;AAElD,QAAI,cAAc,IAAI,GAAG,CAAC,GAAG;AAC3B,aAAO,OAAO,KAAK,cAAc,IAAI,GAAG,GAAG,WAAW,CAAC;AAAA,IACzD,OAAO;AACL,UAAI,WAAW,IAAI,IAAI,GAAG;AAAA,IAC5B;AAEA,WAAO;AAAA,EACT,GAAG,CAAC,CAAC;AACP;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,cAAc,MAAM;AAAA,MACpB,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,WAAO;AAAA,MACL,QAAQ,CAAC;AAAA,MACT,QAAQ;AAAA,QACN;AAAA,QACA,CAAC,QAAQ,6BAA6B,QAAQ,iBAAiB;AAAA,MACjE;AAAA,MACA;AAAA,IACF;AAAA,EACF;AACF;",
   "names": ["error"]
 }

package/validators/index.d.ts

@@ -3,7 +3,7 @@ import { AnyObjectSchema } from 'yup';
 import Lazy from 'yup/lib/Lazy';
 import { FieldSpec } from '@digigov/form/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
-export declare const getYUPTypeMap: () => Record<string, any>;
+export declare const getYUPTypeMap: (validatorRegistry?: Record<string, any>) => Record<string, any>;
 export interface MutableRefObjectProps {
 }
 export declare function useValidationSchema(fields: FieldSpec[] | MutableRefObject<MutableRefObjectProps>, validatorRegistry?: Record<string, ValidatorSchema[]>): Lazy<any, unknown> | AnyObjectSchema | void;

package/validators/index.js

@@ -3,6 +3,7 @@ import * as yup from "yup";
 import {
   getYupObjectShape,
   AFM_VALIDATOR,
+  AMKA_VALIDATOR,
   FILE_MAX_SIZE_VALIDATOR,
   IBAN_VALIDATOR,
   OTP_VALIDATOR,
@@ -21,11 +22,11 @@ import {
 } 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 getYUPTypeMap = (validatorRegistry) => {
   const yupTypeMap = {
     file: (field) => {
       return yup.mixed().transform((value) => {
-        if (!value.length) {
+        if (!value || value.length === 0) {
           return null;
         }
         return value;
@@ -51,7 +52,10 @@ const getYUPTypeMap = () => {
     },
     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.required) {
+          field.extra.min = 1;
+        }
+        let arrayValidator = yup.array().nullable().of(yupTypeMap[field.extra.of.type](field.extra.of));
         if (field.extra.length)
           arrayValidator = arrayValidator.length(field.extra.length, {
             key: "form.error.array.length",
@@ -84,6 +88,7 @@ const getYUPTypeMap = () => {
     int: () => yup.mixed().transform((_, val) => val !== "" ? Number(val) : void 0).test(NUMBER_VALIDATOR()).test(INT_VALIDATOR()),
     email: (field) => field.trim ? yup.string().trim().email("form.error.email") : yup.string().email("form.error.email"),
     afm: (field) => field.trim ? yup.string().trim().test(AFM_VALIDATOR) : yup.string().test(AFM_VALIDATOR),
+    amka: (field) => field.trim ? yup.string().trim().test(AMKA_VALIDATOR) : yup.string().test(AMKA_VALIDATOR),
     uuid4: (field) => field.trim ? yup.string().trim().test(UUID4_VALIDATOR) : yup.string().test(UUID4_VALIDATOR),
     iban: (field) => field.trim ? yup.string().trim().test(IBAN_VALIDATOR(field)) : yup.string().trim().test(IBAN_VALIDATOR(field)),
     otp: (field) => yup.string().trim().test(OTP_VALIDATOR(field)),
@@ -127,13 +132,14 @@ const getYUPTypeMap = () => {
         return yup.string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));
       }
       return yup.string().test(DATETIME_VALIDATOR);
-    }
+    },
+    ...validatorRegistry
   };
   return yupTypeMap;
 };
 function useValidationSchema(fields, validatorRegistry) {
   return useMemo(() => {
-    const yupTypeMap = getYUPTypeMap();
+    const yupTypeMap = getYUPTypeMap(validatorRegistry);
     return getYupObjectShape(fields, yupTypeMap, validatorRegistry);
   }, []);
 }

package/validators/index.js.map

@@ -1,7 +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: (field): yup.StringSchema => {\n      if (field.trim) {\n        return yup.string().trim();\n      } else {\n        return yup.string();\n      }\n    },\n    boolean: (): yup.BooleanSchema<\n      boolean | null | undefined,\n      AnyObject,\n      boolean | null | undefined\n    > => {\n      return yup\n        .boolean()\n        .nullable()\n        .transform((value) => {\n          if (value === '' || typeof value === 'string') return null;\n          if (typeof value === 'boolean') return value;\n          if (value === 0 || value === 1) return Boolean(value);\n          return value;\n        });\n    },\n    object: (\n      field\n    ):\n      | yup.ObjectSchema<any, AnyObject, TypeOfShape<any>, AssertsShape<any>>\n      | Lazy<any, unknown> => {\n      return getYupObjectShape(field.extra.fields, yupTypeMap);\n    },\n    array: (\n      field\n    ):\n      | yup.ArraySchema<any, AnyObject, any[] | undefined>\n      | RequiredArraySchema<any, AnyObject, any[] | undefined> => {\n      if (typeof field.extra.of === 'object') {\n        // else if the field is an object then it is a scalar type\n        // eg. number, string etc.\n        let arrayValidator = yup\n          .array()\n          .of(yupTypeMap[field.extra.of.type](field.extra.of))\n          .required(field.required);\n        if (field.extra.length)\n          arrayValidator = arrayValidator.length(field.extra.length, {\n            key: 'form.error.array.length',\n            context: {\n              length: field.extra.length,\n            },\n          });\n        if (field.extra.min)\n          arrayValidator = arrayValidator.min(field.extra.min, {\n            key: 'form.error.array.min',\n            context: {\n              min: field.extra.min,\n            },\n          });\n        if (field.extra.max)\n          arrayValidator = arrayValidator.max(field.extra.max, {\n            key: 'form.error.array.max',\n            context: {\n              max: field.extra.max,\n            },\n          });\n        return arrayValidator;\n      } else if (typeof field.extra.of === 'string') {\n        return yup.array().of(yupTypeMap[field.extra.of]());\n      } else {\n        // in any other case it will be string\n        return yup.array().of(yup.string());\n      }\n    },\n    number: (): MixedSchema =>\n      yup\n        .mixed()\n        .transform((_, val) => (val !== '' ? Number(val) : undefined))\n        .test(NUMBER_VALIDATOR()),\n    int: (): MixedSchema =>\n      yup\n        .mixed()\n        .transform((_, val) => (val !== '' ? Number(val) : undefined))\n        .test(NUMBER_VALIDATOR())\n        .test(INT_VALIDATOR()),\n    email: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().email('form.error.email')\n        : yup.string().email('form.error.email'),\n    afm: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(AFM_VALIDATOR)\n        : yup.string().test(AFM_VALIDATOR),\n    uuid4: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(UUID4_VALIDATOR)\n        : yup.string().test(UUID4_VALIDATOR),\n    iban: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(IBAN_VALIDATOR(field))\n        : yup.string().trim().test(IBAN_VALIDATOR(field)),\n    otp: (field): yup.StringSchema =>\n      yup.string().trim().test(OTP_VALIDATOR(field)),\n    text: (field): yup.StringSchema => {\n      if (field?.extra?.limit?.max || !!field?.extra?.limit?.min) {\n        return field.trim\n          ? yup.string().trim().test(TEXT_LIMIT_VALIDATOR(field))\n          : yup.string().test(TEXT_LIMIT_VALIDATOR(field));\n      } else {\n        return field.trim ? yup.string().trim() : yup.string();\n      }\n    },\n    image: (field): MixedSchema => {\n      return yup\n        .mixed()\n        .transform((value) => {\n          if (!value.length || value.length === 0) {\n            return null;\n          }\n          return value;\n        })\n        .nullable()\n        .test(FILE_MAX_SIZE_VALIDATOR(field))\n        .test(IMAGE_DIMENSION_VALIDATOR(field));\n    },\n    postal_code: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(POSTALCODE_VALIDATOR(field))\n        : yup.string().test(POSTALCODE_VALIDATOR(field)),\n    mobile_phone: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(MOBILE_PHONE_VALIDATOR)\n        : yup.string().test(MOBILE_PHONE_VALIDATOR),\n    phone_number: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(PHONE_NUMBER_VALIDATOR(field))\n        : yup.string().test(PHONE_NUMBER_VALIDATOR(field)),\n    'choice:multiple': (): yup.ArraySchema<\n      yup.StringSchema<string | undefined, AnyObject, string | undefined>,\n      AnyObject,\n      (string | undefined)[] | null | undefined,\n      (string | undefined)[] | null | undefined\n    > => yup.array().of(yup.string()).nullable(),\n    'choice:single': (): StringSchema<\n      string | null | undefined,\n      AnyObject,\n      string | null | undefined\n    > => yup.string().nullable(),\n    date: (\n      field\n    ): yup.StringSchema<\n      string | null | undefined,\n      AnyObject,\n      string | null | undefined\n    > => {\n      let schema = yup.string().nullable();\n      if (field?.extra?.min) {\n        schema = schema.test(LATER_THAN_VALIDATOR(field));\n      }\n      if (field?.extra?.max) {\n        schema = schema.test(EARLIER_THAN_VALIDATOR(field));\n      } else {\n        schema = schema.test(DATE_VALIDATOR);\n      }\n      return schema;\n    },\n    datetime: (field): yup.StringSchema => {\n      if (field?.extra?.min) {\n        return yup.string().test(LATER_THAN_DATETIME_VALIDATOR(field));\n      }\n      if (field?.extra?.max) {\n        return yup.string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));\n      }\n      return yup.string().test(DATETIME_VALIDATOR);\n    },\n  };\n  return yupTypeMap;\n};\n\nexport interface MutableRefObjectProps {}\n// Create a yup validation schema from given fields input\nexport function useValidationSchema(\n  fields: FieldSpec[] | MutableRefObject<MutableRefObjectProps>,\n  validatorRegistry?: Record<string, ValidatorSchema[]>\n): Lazy<any, unknown> | AnyObjectSchema | void {\n  return useMemo(() => {\n    const yupTypeMap = getYUPTypeMap();\n    return getYupObjectShape(fields, yupTypeMap, validatorRegistry);\n  }, []);\n}\n"],
-  "mappings": "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",
+  "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  AMKA_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 = (\n  validatorRegistry?: Record<string, any>\n): Record<string, any> => {\n  const yupTypeMap = {\n    file: (field): MixedSchema => {\n      return yup\n        .mixed()\n        .transform((value) => {\n          if (!value || value.length === 0) {\n            return null;\n          }\n          return value;\n        })\n        .nullable()\n        .test(FILE_MAX_SIZE_VALIDATOR(field));\n    },\n    string: (field): yup.StringSchema => {\n      if (field.trim) {\n        return yup.string().trim();\n      } else {\n        return yup.string();\n      }\n    },\n    boolean: (): yup.BooleanSchema<\n      boolean | null | undefined,\n      AnyObject,\n      boolean | null | undefined\n    > => {\n      return yup\n        .boolean()\n        .nullable()\n        .transform((value) => {\n          if (value === '' || typeof value === 'string') return null;\n          if (typeof value === 'boolean') return value;\n          if (value === 0 || value === 1) return Boolean(value);\n          return value;\n        });\n    },\n    object: (\n      field\n    ):\n      | yup.ObjectSchema<any, AnyObject, TypeOfShape<any>, AssertsShape<any>>\n      | Lazy<any, unknown> => {\n      return getYupObjectShape(field.extra.fields, yupTypeMap);\n    },\n    array: (\n      field\n    ):\n      | yup.ArraySchema<any, AnyObject, any[] | undefined>\n      | RequiredArraySchema<any, AnyObject, any[] | undefined> => {\n      if (typeof field.extra.of === 'object') {\n        // else if the field is an object then it is a scalar type\n        // eg. number, string etc.\n        if (field.required) {\n          field.extra.min = 1;\n        }\n        let arrayValidator = yup\n          .array()\n          .nullable()\n          .of(yupTypeMap[field.extra.of.type](field.extra.of));\n        if (field.extra.length)\n          arrayValidator = arrayValidator.length(field.extra.length, {\n            key: 'form.error.array.length',\n            context: {\n              length: field.extra.length,\n            },\n          });\n        if (field.extra.min)\n          arrayValidator = arrayValidator.min(field.extra.min, {\n            key: 'form.error.array.min',\n            context: {\n              min: field.extra.min,\n            },\n          });\n        if (field.extra.max)\n          arrayValidator = arrayValidator.max(field.extra.max, {\n            key: 'form.error.array.max',\n            context: {\n              max: field.extra.max,\n            },\n          });\n        return arrayValidator;\n      } else if (typeof field.extra.of === 'string') {\n        return yup.array().of(yupTypeMap[field.extra.of]());\n      } else {\n        // in any other case it will be string\n        return yup.array().of(yup.string());\n      }\n    },\n    number: (): MixedSchema =>\n      yup\n        .mixed()\n        .transform((_, val) => (val !== '' ? Number(val) : undefined))\n        .test(NUMBER_VALIDATOR()),\n    int: (): MixedSchema =>\n      yup\n        .mixed()\n        .transform((_, val) => (val !== '' ? Number(val) : undefined))\n        .test(NUMBER_VALIDATOR())\n        .test(INT_VALIDATOR()),\n    email: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().email('form.error.email')\n        : yup.string().email('form.error.email'),\n    afm: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(AFM_VALIDATOR)\n        : yup.string().test(AFM_VALIDATOR),\n    amka: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(AMKA_VALIDATOR)\n        : yup.string().test(AMKA_VALIDATOR),\n    uuid4: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(UUID4_VALIDATOR)\n        : yup.string().test(UUID4_VALIDATOR),\n    iban: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(IBAN_VALIDATOR(field))\n        : yup.string().trim().test(IBAN_VALIDATOR(field)),\n    otp: (field): yup.StringSchema =>\n      yup.string().trim().test(OTP_VALIDATOR(field)),\n    text: (field): yup.StringSchema => {\n      if (field?.extra?.limit?.max || !!field?.extra?.limit?.min) {\n        return field.trim\n          ? yup.string().trim().test(TEXT_LIMIT_VALIDATOR(field))\n          : yup.string().test(TEXT_LIMIT_VALIDATOR(field));\n      } else {\n        return field.trim ? yup.string().trim() : yup.string();\n      }\n    },\n    image: (field): MixedSchema => {\n      return yup\n        .mixed()\n        .transform((value) => {\n          if (!value.length || value.length === 0) {\n            return null;\n          }\n          return value;\n        })\n        .nullable()\n        .test(FILE_MAX_SIZE_VALIDATOR(field))\n        .test(IMAGE_DIMENSION_VALIDATOR(field));\n    },\n    postal_code: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(POSTALCODE_VALIDATOR(field))\n        : yup.string().test(POSTALCODE_VALIDATOR(field)),\n    mobile_phone: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(MOBILE_PHONE_VALIDATOR)\n        : yup.string().test(MOBILE_PHONE_VALIDATOR),\n    phone_number: (field): yup.StringSchema =>\n      field.trim\n        ? yup.string().trim().test(PHONE_NUMBER_VALIDATOR(field))\n        : yup.string().test(PHONE_NUMBER_VALIDATOR(field)),\n    'choice:multiple': (): yup.ArraySchema<\n      yup.StringSchema<string | undefined, AnyObject, string | undefined>,\n      AnyObject,\n      (string | undefined)[] | null | undefined,\n      (string | undefined)[] | null | undefined\n    > => yup.array().of(yup.string()).nullable(),\n    'choice:single': (): StringSchema<\n      string | null | undefined,\n      AnyObject,\n      string | null | undefined\n    > => yup.string().nullable(),\n    date: (\n      field\n    ): yup.StringSchema<\n      string | null | undefined,\n      AnyObject,\n      string | null | undefined\n    > => {\n      let schema = yup.string().nullable();\n      if (field?.extra?.min) {\n        schema = schema.test(LATER_THAN_VALIDATOR(field));\n      }\n      if (field?.extra?.max) {\n        schema = schema.test(EARLIER_THAN_VALIDATOR(field));\n      } else {\n        schema = schema.test(DATE_VALIDATOR);\n      }\n      return schema;\n    },\n    datetime: (field): yup.StringSchema => {\n      if (field?.extra?.min) {\n        return yup.string().test(LATER_THAN_DATETIME_VALIDATOR(field));\n      }\n      if (field?.extra?.max) {\n        return yup.string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));\n      }\n      return yup.string().test(DATETIME_VALIDATOR);\n    },\n    ...validatorRegistry,\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(validatorRegistry);\n    return getYupObjectShape(fields, yupTypeMap, validatorRegistry);\n  }, []);\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/validators/utils/amka/index.js

@@ -0,0 +1,36 @@
+function digitSum(number) {
+  const sum = number > 9 ? 1 : 0;
+  return sum + number % 10;
+}
+function validateAMKA(amka) {
+  amka = String(amka);
+  const checkDigitIndex = amka.length - 1;
+  let sum = 0;
+  amka.substring(0, checkDigitIndex).split("").reverse().forEach(function(value, index) {
+    const weight = (index + 1) % 2 + 1;
+    sum += digitSum(parseInt(value, 10) * weight);
+  });
+  const sumMod10 = sum % 10;
+  if (sumMod10 === 0) {
+    return amka.substring(checkDigitIndex) === "0";
+  } else {
+    return amka.substring(checkDigitIndex) === 10 - sumMod10 + "";
+  }
+}
+const AMKA_VALIDATOR = {
+  name: "amka-validator",
+  message: "form.error.amka",
+  test: (value) => {
+    if (!value) return true;
+    const AMKA_REGEX = /^[0-9]{11}$/;
+    if (!AMKA_REGEX.test(value) || value === "00000000000") {
+      return false;
+    }
+    return validateAMKA(value);
+  }
+};
+export {
+  AMKA_VALIDATOR,
+  validateAMKA
+};
+//# sourceMappingURL=amka.js.map

package/{inputs/Input/inputsInputScenarios → validators/utils/amka}/package.json

@@ -2,5 +2,5 @@
   "sideEffects": false,
   "module": "./index.js",
   "types": "./index.d.ts",
-  "main": "../../../cjs/inputs/Input/inputsInputScenarios/index.js"
+  "main": "../../../cjs/validators/utils/amka/index.js"
 }

package/validators/utils/amka.d.ts

@@ -0,0 +1,6 @@
+export declare function validateAMKA(amka: string): boolean;
+export declare const AMKA_VALIDATOR: {
+    name: string;
+    message: string;
+    test: (value: any) => boolean;
+};

package/validators/utils/amka.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/validators/utils/amka.ts"],
+  "sourcesContent": ["function digitSum(number) {\n  const sum = number > 9 ? 1 : 0;\n  return sum + (number % 10);\n}\n\nexport function validateAMKA(amka: string): boolean {\n  // Validate that the last digit is the correct check digit (created using the\n  // Luhn algorithm https://en.wikipedia.org/wiki/Luhn_algorithm).\n  amka = String(amka);\n  const checkDigitIndex = amka.length - 1;\n  let sum = 0;\n  amka\n    .substring(0, checkDigitIndex)\n    .split('')\n    .reverse()\n    .forEach(function (value, index) {\n      const weight = ((index + 1) % 2) + 1;\n      sum += digitSum(parseInt(value, 10) * weight);\n    });\n  const sumMod10 = sum % 10;\n  if (sumMod10 === 0) {\n    return amka.substring(checkDigitIndex) === '0';\n  } else {\n    return amka.substring(checkDigitIndex) === 10 - sumMod10 + '';\n  }\n}\n\nexport const AMKA_VALIDATOR = {\n  name: 'amka-validator',\n  message: 'form.error.amka',\n  test: (value): boolean => {\n    if (!value) return true;\n    const AMKA_REGEX = /^[0-9]{11}$/;\n    if (!AMKA_REGEX.test(value) || value === '00000000000') {\n      return false;\n    }\n    return validateAMKA(value);\n  },\n};\n"],
+  "mappings": "AAAA,SAAS,SAAS,QAAQ;AACxB,QAAM,MAAM,SAAS,IAAI,IAAI;AAC7B,SAAO,MAAO,SAAS;AACzB;AAEO,SAAS,aAAa,MAAuB;AAGlD,SAAO,OAAO,IAAI;AAClB,QAAM,kBAAkB,KAAK,SAAS;AACtC,MAAI,MAAM;AACV,OACG,UAAU,GAAG,eAAe,EAC5B,MAAM,EAAE,EACR,QAAQ,EACR,QAAQ,SAAU,OAAO,OAAO;AAC/B,UAAM,UAAW,QAAQ,KAAK,IAAK;AACnC,WAAO,SAAS,SAAS,OAAO,EAAE,IAAI,MAAM;AAAA,EAC9C,CAAC;AACH,QAAM,WAAW,MAAM;AACvB,MAAI,aAAa,GAAG;AAClB,WAAO,KAAK,UAAU,eAAe,MAAM;AAAA,EAC7C,OAAO;AACL,WAAO,KAAK,UAAU,eAAe,MAAM,KAAK,WAAW;AAAA,EAC7D;AACF;AAEO,MAAM,iBAAiB;AAAA,EAC5B,MAAM;AAAA,EACN,SAAS;AAAA,EACT,MAAM,CAAC,UAAmB;AACxB,QAAI,CAAC,MAAO,QAAO;AACnB,UAAM,aAAa;AACnB,QAAI,CAAC,WAAW,KAAK,KAAK,KAAK,UAAU,eAAe;AACtD,aAAO;AAAA,IACT;AACA,WAAO,aAAa,KAAK;AAAA,EAC3B;AACF;",
+  "names": []
+}

package/validators/utils/file/index.js

@@ -1,24 +1,37 @@
 const DEFAULT_FILE_MAX_SIZE = 1e7;
-const FILE_MAX_SIZE_VALIDATOR = (field) => ({
-  name: "file-max-size-validator",
-  message: {
-    key: field.type === "file" ? "form.error.file_size" : "form.error.image_size",
-    context: {
-      maxSizeToMb: (field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE) / 1e6
-    }
-  },
-  test: (value) => {
-    if (value) {
-      for (const file of value) {
-        const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
-        if (file.size > maxSize) {
-          return false;
+const FILE_MAX_SIZE_VALIDATOR = (field) => {
+  const maxSizeInBytes = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
+  let maxSizeTransformed = maxSizeInBytes / (1024 * 1024);
+  let maxSizeText = "MB";
+  if (Math.round(maxSizeTransformed) === 0) {
+    maxSizeTransformed = Math.round(maxSizeInBytes / 1024);
+    maxSizeText = "KB";
+  }
+  if (Math.round(maxSizeTransformed) === 0) {
+    maxSizeTransformed = maxSizeInBytes;
+    maxSizeText = "Bytes";
+  }
+  return {
+    name: "file-max-size-validator",
+    message: {
+      key: field.type === "file" ? "form.error.file_size" : "form.error.image_size",
+      context: {
+        maxSize: `${maxSizeTransformed} ${maxSizeText}`
+      }
+    },
+    test: (value) => {
+      if (value) {
+        for (const file of Array.from(value)) {
+          const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
+          if (file.size > maxSize) {
+            return false;
+          }
         }
       }
+      return true;
     }
-    return true;
-  }
-});
+  };
+};
 export {
   FILE_MAX_SIZE_VALIDATOR
 };

package/validators/utils/file.js.map

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

package/validators/utils/index.d.ts

@@ -2,6 +2,7 @@ import * as yup from 'yup';
 import { FieldSpec } from '@digigov/form/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 export * from '@digigov/form/validators/utils/afm';
+export * from '@digigov/form/validators/utils/amka';
 export * from '@digigov/form/validators/utils/file';
 export * from '@digigov/form/validators/utils/iban';
 export * from '@digigov/form/validators/utils/otp';

package/validators/utils/index.js

@@ -1,5 +1,6 @@
 import * as yup from "yup";
 export * from "@digigov/form/validators/utils/afm";
+export * from "@digigov/form/validators/utils/amka";
 export * from "@digigov/form/validators/utils/file";
 export * from "@digigov/form/validators/utils/iban";
 export * from "@digigov/form/validators/utils/otp";
@@ -82,7 +83,9 @@ function getYupObjectShape(fields, yupTypeMap, validatorRegistry) {
   }
   return yup.lazy(function() {
     const fieldSchemas = computeShape(
-      Object.values(fields.current),
+      Object.values(fields.current).filter(
+        (f) => !f.key.includes(".")
+      ),
       yupTypeMap,
       validatorRegistry
     );

package/validators/utils/index.js.map

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