@digigov/form 2.0.0-07ee8440 → 2.0.0-0b806366

package/src/validators/utils/iban.ts

@@ -1,5 +1,5 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 export function validateIban(value: string, countryCode: string): boolean {
   value = value.replace(/\s/g, '').replace(/-/g, '');
   if (value.match(/^[0-9]*$/i)) {

package/src/validators/utils/image.ts

@@ -1,5 +1,5 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 const DEFAULT_IMAGE_MAX_HEIGHT_SIZE = 2000;
 const DEFAULT_IMAGE_MAX_WIDTH_SIZE = 2000;

package/src/validators/utils/index.ts

@@ -1,8 +1,9 @@
 import * as yup from 'yup';
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { 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';
@@ -64,9 +65,13 @@ export function computeShape(
       yupField = yupField.nullable().required('form.error.required');
     }
     if (validatorRegistry && field.type && validatorRegistry[field.type]) {
-      validatorRegistry[field.type].forEach((validator: any) => {
-        yupField = yupField.test(validator);
-      });
+      if (Array.isArray(validatorRegistry[field.type])) {
+        validatorRegistry[field.type].forEach((validator: any) => {
+          yupField = yupField.test(validator);
+        });
+      } else {
+        yupField = yupField.test(validatorRegistry[field.type]);
+      }
     }
     if (field.validators) {
       field.validators.forEach((validator) => {
@@ -98,7 +103,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/src/validators/utils/int.ts

@@ -1,4 +1,4 @@
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 export function validateIntNumber(number: number): boolean {
   if (number === undefined) {

package/src/validators/utils/number.ts

@@ -1,4 +1,4 @@
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 export function validateNumber(number: number): boolean {
   return !Number.isNaN(number);

package/src/validators/utils/otp.ts

@@ -1,5 +1,5 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 export function validateOtp(value: string, maxLength: number): boolean {
   if (value.length === maxLength) {
     return true;

package/src/validators/utils/phone.ts

@@ -1,5 +1,5 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 export type PhoneNumberType = 'landline' | 'mobile' | null;
 // add more countries from here libphonenumber-js/metadata.full.json

package/src/validators/utils/postal_code.ts

@@ -1,5 +1,5 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 const CODE_REGEX = /^[12345678][0-9]{4}$/;
 export function validatePostalCode(

package/src/validators/utils/text_limit.ts

@@ -1,5 +1,5 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 export function validateText(value: string, min: number, max: number): boolean {
   let validator;

package/types.d.ts

@@ -1,7 +1,8 @@
-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';
+import type { UseFormReturn, UseFormProps, ErrorOption } from 'react-hook-form';
+import type { FieldLabelProps, FieldSpec, FormData } from './Field/types.js';
+import type { FieldComponentRegistry } from './inputs/registry.js';
+import type { ValidatorSchema } from './validators/types.js';
+export * from './Field/types.js';
 export interface FieldError {
     message: string;
 }
@@ -11,25 +12,29 @@ export interface FieldsetSpec {
     label?: FieldLabelProps;
     body?: React.ReactNode;
 }
+export type registerFieldFocus = (fieldName: string, element: HTMLElement) => (name: string) => void;
 export interface FormContextProps {
     fieldsetsMap?: Record<string, FieldsetSpec>;
     fieldsMap: Record<string, FieldSpec>;
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
     trigger: UseFormReturn['trigger'];
+    setError: UseFormReturn['setError'];
     clearErrors: UseFormReturn['clearErrors'];
     watch: UseFormReturn['watch'];
     getFieldState: UseFormReturn['getFieldState'];
     setValue: UseFormReturn['setValue'];
     getValues: UseFormReturn['getValues'];
+    getValuesFromParentForm?: UseFormReturn['getValues'];
     unregister: UseFormReturn['unregister'];
     formState: UseFormReturn['formState'];
     reset: UseFormReturn['reset'];
     resetField: UseFormReturn['resetField'];
     registerField: (field: FieldSpec) => void;
+    registerFieldFocus: registerFieldFocus;
     errors: UseFormReturn['formState']['errors'];
     componentRegistry?: FieldComponentRegistry;
-    submit: () => Promise<void>;
+    submit: () => Promise<void> | void;
 }
 export interface FormBuilderProps {
     fields?: FieldSpec[];
@@ -46,6 +51,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

@@ -0,0 +1 @@
+export * from "./Field/types.js";

package/utils.d.ts

@@ -1,8 +1,11 @@
-import { FieldError } from 'react-hook-form';
+import type { 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;
 }>;
+export declare function omit<T extends Record<string, unknown>, K extends keyof T>(obj: T, keys: K[]): Omit<T, K>;

package/utils.js

@@ -0,0 +1,56 @@
+import { validateFieldsNatively } from "@hookform/resolvers";
+import { appendErrors } from "react-hook-form";
+const parseErrorSchema = (error, validateAllFieldCriteria)=>(error.inner || []).reduce((previous, error)=>{
+        error.path = error.path?.replace(/\[([0-9]+)\]/g, '.$1');
+        if (!previous[error.path]) previous[error.path] = {
+            message: error.message,
+            type: error.type
+        };
+        if (validateAllFieldCriteria) {
+            const types = previous[error.path].types;
+            const messages = types && types[error.type];
+            previous[error.path] = appendErrors(error.path, validateAllFieldCriteria, previous, error.type, messages ? [].concat(messages, error.message) : error.message);
+        }
+        return previous;
+    }, {});
+function isPlainObject(obj) {
+    return 'object' == typeof obj && null !== obj && '[object Object]' === Object.prototype.toString.call(obj);
+}
+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 && 'development' === process.env.NODE_ENV) console.warn("You should not used the yup options context. Please, use the 'useForm' context object instead");
+            const result = await schema['sync' === resolverOptions.mode ? 'validateSync' : 'validate'](flattenObject(values), Object.assign({
+                abortEarly: false
+            }, schemaOptions, {
+                context
+            }));
+            if (options.shouldUseNativeValidation) validateFieldsNatively({}, options);
+            return {
+                values: resolverOptions.rawValues ? values : result,
+                errors: {}
+            };
+        } catch (e) {
+            if (!e.inner) throw e;
+            return {
+                values: {},
+                errors: parseErrorSchema(e, !options.shouldUseNativeValidation && 'all' === options.criteriaMode),
+                options
+            };
+        }
+    };
+function omit(obj, keys) {
+    const result = {
+        ...obj
+    };
+    for (const key of keys)delete result[key];
+    return result;
+}
+export { omit, yupResolver };

package/validators/index.d.ts

@@ -1,9 +1,9 @@
-import { MutableRefObject } from 'react';
-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>;
+import type { MutableRefObject } from 'react';
+import type { AnyObjectSchema } from 'yup';
+import type Lazy from 'yup/lib/Lazy';
+import type { FieldSpec } from '../types.js';
+import type { ValidatorSchema } from './types.js';
+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

@@ -1,144 +1,117 @@
 import { useMemo } from "react";
-import * as yup from "yup";
-import {
-  getYupObjectShape,
-  AFM_VALIDATOR,
-  FILE_MAX_SIZE_VALIDATOR,
-  IBAN_VALIDATOR,
-  OTP_VALIDATOR,
-  MOBILE_PHONE_VALIDATOR,
-  PHONE_NUMBER_VALIDATOR,
-  TEXT_LIMIT_VALIDATOR,
-  POSTALCODE_VALIDATOR,
-  UUID4_VALIDATOR,
-  IMAGE_DIMENSION_VALIDATOR,
-  DATE_VALIDATOR,
-  LATER_THAN_VALIDATOR,
-  EARLIER_THAN_VALIDATOR,
-  DATETIME_VALIDATOR,
-  LATER_THAN_DATETIME_VALIDATOR,
-  EARLIER_THAN_DATETIME_VALIDATOR
-} from "@digigov/form/validators/utils";
-import { INT_VALIDATOR } from "@digigov/form/validators/utils/int";
-import { NUMBER_VALIDATOR } from "@digigov/form/validators/utils/number";
-const getYUPTypeMap = () => {
-  const yupTypeMap = {
-    file: (field) => {
-      return yup.mixed().transform((value) => {
-        if (!value.length) {
-          return null;
-        }
-        return value;
-      }).nullable().test(FILE_MAX_SIZE_VALIDATOR(field));
-    },
-    string: (field) => {
-      if (field.trim) {
-        return yup.string().trim();
-      } else {
-        return yup.string();
-      }
-    },
-    boolean: () => {
-      return yup.boolean().nullable().transform((value) => {
-        if (value === "" || typeof value === "string") return null;
-        if (typeof value === "boolean") return value;
-        if (value === 0 || value === 1) return Boolean(value);
-        return value;
-      });
-    },
-    object: (field) => {
-      return getYupObjectShape(field.extra.fields, yupTypeMap);
-    },
-    array: (field) => {
-      if (typeof field.extra.of === "object") {
-        let arrayValidator = yup.array().of(yupTypeMap[field.extra.of.type](field.extra.of)).required(field.required);
-        if (field.extra.length)
-          arrayValidator = arrayValidator.length(field.extra.length, {
-            key: "form.error.array.length",
-            context: {
-              length: field.extra.length
+import { array, boolean as external_yup_boolean, mixed, number, string } from "yup";
+import { AFM_VALIDATOR, AMKA_VALIDATOR, DATETIME_VALIDATOR, DATE_VALIDATOR, EARLIER_THAN_DATETIME_VALIDATOR, EARLIER_THAN_VALIDATOR, FILE_MAX_SIZE_VALIDATOR, IBAN_VALIDATOR, IMAGE_DIMENSION_VALIDATOR, LATER_THAN_DATETIME_VALIDATOR, LATER_THAN_VALIDATOR, MOBILE_PHONE_VALIDATOR, OTP_VALIDATOR, PHONE_NUMBER_VALIDATOR, POSTALCODE_VALIDATOR, TEXT_LIMIT_VALIDATOR, UUID4_VALIDATOR, getYupObjectShape } from "./utils/index.js";
+import { EMAIL_VALIDATOR } from "./utils/email.js";
+import { INT_VALIDATOR } from "./utils/int.js";
+import { NUMBER_VALIDATOR } from "./utils/number.js";
+const getYUPTypeMap = (validatorRegistry)=>{
+    const yupTypeMap = {
+        file: (field)=>mixed().transform((value)=>{
+                if (!value || 0 === value.length) return null;
+                return value;
+            }).nullable().test(FILE_MAX_SIZE_VALIDATOR(field)),
+        string: (field)=>{
+            if (field.trim) return string().trim();
+            return string();
+        },
+        boolean: ()=>external_yup_boolean().nullable().transform((value)=>{
+                if ('' === value || 'string' == typeof value) return null;
+                if ('boolean' == typeof value) return value;
+                if (0 === value || 1 === value) return Boolean(value);
+                return value;
+            }),
+        object: (field)=>getYupObjectShape(field.extra.fields, yupTypeMap),
+        rate: (field)=>{
+            const min = field?.min ? field.min : 0;
+            const max = field?.max ? field.max : 100;
+            return number().transform((v, o)=>'' === o ? null : v).nullable().notRequired().integer({
+                key: 'form.error.positive_integer_number'
+            }).min(min, {
+                key: 'form.error.rate.rate_percent',
+                context: {
+                    min: min,
+                    max: max
+                }
+            }).max(max, {
+                key: 'form.error.rate.rate_percent',
+                context: {
+                    min: min,
+                    max: max
+                }
+            });
+        },
+        array: (field)=>{
+            if ('object' == typeof field.extra.of) {
+                if (field.required) field.extra.min = 1;
+                let arrayValidator = 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',
+                    context: {
+                        length: field.extra.length
+                    }
+                });
+                if (field.extra.min) arrayValidator = arrayValidator.min(field.extra.min, {
+                    key: 'form.error.array.min',
+                    context: {
+                        min: field.extra.min,
+                        max: field.extra.max || void 0
+                    }
+                });
+                if (field.extra.max) arrayValidator = arrayValidator.max(field.extra.max, {
+                    key: 'form.error.array.max',
+                    context: {
+                        min: field.extra.min || void 0,
+                        max: field.extra.max
+                    }
+                });
+                return arrayValidator;
             }
-          });
-        if (field.extra.min)
-          arrayValidator = arrayValidator.min(field.extra.min, {
-            key: "form.error.array.min",
-            context: {
-              min: field.extra.min
-            }
-          });
-        if (field.extra.max)
-          arrayValidator = arrayValidator.max(field.extra.max, {
-            key: "form.error.array.max",
-            context: {
-              max: field.extra.max
-            }
-          });
-        return arrayValidator;
-      } else if (typeof field.extra.of === "string") {
-        return yup.array().of(yupTypeMap[field.extra.of]());
-      } else {
-        return yup.array().of(yup.string());
-      }
-    },
-    number: () => yup.mixed().transform((_, val) => val !== "" ? Number(val) : void 0).test(NUMBER_VALIDATOR()),
-    int: () => yup.mixed().transform((_, val) => val !== "" ? Number(val) : void 0).test(NUMBER_VALIDATOR()).test(INT_VALIDATOR()),
-    email: (field) => field.trim ? yup.string().trim().email("form.error.email") : yup.string().email("form.error.email"),
-    afm: (field) => field.trim ? yup.string().trim().test(AFM_VALIDATOR) : yup.string().test(AFM_VALIDATOR),
-    uuid4: (field) => field.trim ? yup.string().trim().test(UUID4_VALIDATOR) : yup.string().test(UUID4_VALIDATOR),
-    iban: (field) => field.trim ? yup.string().trim().test(IBAN_VALIDATOR(field)) : yup.string().trim().test(IBAN_VALIDATOR(field)),
-    otp: (field) => yup.string().trim().test(OTP_VALIDATOR(field)),
-    text: (field) => {
-      if (field?.extra?.limit?.max || !!field?.extra?.limit?.min) {
-        return field.trim ? yup.string().trim().test(TEXT_LIMIT_VALIDATOR(field)) : yup.string().test(TEXT_LIMIT_VALIDATOR(field));
-      } else {
-        return field.trim ? yup.string().trim() : yup.string();
-      }
-    },
-    image: (field) => {
-      return yup.mixed().transform((value) => {
-        if (!value.length || value.length === 0) {
-          return null;
-        }
-        return value;
-      }).nullable().test(FILE_MAX_SIZE_VALIDATOR(field)).test(IMAGE_DIMENSION_VALIDATOR(field));
-    },
-    postal_code: (field) => field.trim ? yup.string().trim().test(POSTALCODE_VALIDATOR(field)) : yup.string().test(POSTALCODE_VALIDATOR(field)),
-    mobile_phone: (field) => field.trim ? yup.string().trim().test(MOBILE_PHONE_VALIDATOR) : yup.string().test(MOBILE_PHONE_VALIDATOR),
-    phone_number: (field) => field.trim ? yup.string().trim().test(PHONE_NUMBER_VALIDATOR(field)) : yup.string().test(PHONE_NUMBER_VALIDATOR(field)),
-    "choice:multiple": () => yup.array().of(yup.string()).nullable(),
-    "choice:single": () => yup.string().nullable(),
-    date: (field) => {
-      let schema = yup.string().nullable();
-      if (field?.extra?.min) {
-        schema = schema.test(LATER_THAN_VALIDATOR(field));
-      }
-      if (field?.extra?.max) {
-        schema = schema.test(EARLIER_THAN_VALIDATOR(field));
-      } else {
-        schema = schema.test(DATE_VALIDATOR);
-      }
-      return schema;
-    },
-    datetime: (field) => {
-      if (field?.extra?.min) {
-        return yup.string().test(LATER_THAN_DATETIME_VALIDATOR(field));
-      }
-      if (field?.extra?.max) {
-        return yup.string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));
-      }
-      return yup.string().test(DATETIME_VALIDATOR);
-    }
-  };
-  return yupTypeMap;
+            if ('string' == typeof field.extra.of) return array().of(yupTypeMap[field.extra.of]());
+            return array().of(string());
+        },
+        number: ()=>mixed().transform((_, val)=>'' !== val ? Number(val) : void 0).test(NUMBER_VALIDATOR()),
+        int: ()=>mixed().transform((_, val)=>'' !== val ? Number(val) : void 0).test(NUMBER_VALIDATOR()).test(INT_VALIDATOR()),
+        email: (field)=>field.trim ? string().trim().test(EMAIL_VALIDATOR) : string().test(EMAIL_VALIDATOR),
+        afm: (field)=>field.trim ? string().trim().test(AFM_VALIDATOR) : string().test(AFM_VALIDATOR),
+        amka: (field)=>field.trim ? string().trim().test(AMKA_VALIDATOR) : string().test(AMKA_VALIDATOR),
+        uuid4: (field)=>field.trim ? string().trim().test(UUID4_VALIDATOR) : string().test(UUID4_VALIDATOR),
+        iban: (field)=>field.trim ? string().trim().test(IBAN_VALIDATOR(field)) : string().trim().test(IBAN_VALIDATOR(field)),
+        otp: (field)=>string().trim().test(OTP_VALIDATOR(field)),
+        text: (field)=>{
+            if (field?.extra?.limit?.max || !!field?.extra?.limit?.min) return field.trim ? string().trim().test(TEXT_LIMIT_VALIDATOR(field)) : string().test(TEXT_LIMIT_VALIDATOR(field));
+            return field.trim ? string().trim() : string();
+        },
+        image: (field)=>mixed().transform((value)=>{
+                if (!value.length || 0 === value.length) return null;
+                return value;
+            }).nullable().test(FILE_MAX_SIZE_VALIDATOR(field)).test(IMAGE_DIMENSION_VALIDATOR(field)),
+        postal_code: (field)=>field.trim ? string().trim().test(POSTALCODE_VALIDATOR(field)) : string().test(POSTALCODE_VALIDATOR(field)),
+        mobile_phone: (field)=>field.trim ? string().trim().test(MOBILE_PHONE_VALIDATOR) : string().test(MOBILE_PHONE_VALIDATOR),
+        phone_number: (field)=>field.trim ? string().trim().test(PHONE_NUMBER_VALIDATOR(field)) : string().test(PHONE_NUMBER_VALIDATOR(field)),
+        'choice:multiple': ()=>array().of(string()).nullable(),
+        'choice:single': ()=>string().nullable(),
+        date: (field)=>{
+            let schema = string().nullable();
+            if (field?.extra?.min) schema = schema.test(LATER_THAN_VALIDATOR(field));
+            schema = field?.extra?.max ? schema.test(EARLIER_THAN_VALIDATOR(field)) : schema.test(DATE_VALIDATOR);
+            return schema;
+        },
+        datetime: (field)=>{
+            if (field?.extra?.min) return string().test(LATER_THAN_DATETIME_VALIDATOR(field));
+            if (field?.extra?.max) return string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));
+            return string().test(DATETIME_VALIDATOR);
+        },
+        ...validatorRegistry
+    };
+    return yupTypeMap;
 };
 function useValidationSchema(fields, validatorRegistry) {
-  return useMemo(() => {
-    const yupTypeMap = getYUPTypeMap();
-    return getYupObjectShape(fields, yupTypeMap, validatorRegistry);
-  }, []);
+    return useMemo(()=>{
+        const yupTypeMap = getYUPTypeMap(validatorRegistry);
+        return getYupObjectShape(fields, yupTypeMap, validatorRegistry);
+    }, [
+        fields,
+        validatorRegistry
+    ]);
 }
-export {
-  getYUPTypeMap,
-  useValidationSchema
-};
-//# sourceMappingURL=index.js.map
+export { getYUPTypeMap, useValidationSchema };

package/validators/types.d.ts

@@ -1,2 +1,2 @@
-import * as yup from 'yup';
+import type * as yup from 'yup';
 export type ValidatorSchema = yup.TestConfig;

package/validators/utils/afm.js

@@ -0,0 +1,19 @@
+function validateAFM(afm) {
+    if (9 !== afm.length) return false;
+    if (!/^\d+$/.test(afm)) return false;
+    if (afm === '0'.repeat(9)) return false;
+    const sum = afm.substring(0, 8).split('').reduce((s, v, i)=>s + (parseInt(v) << 8 - i), 0);
+    const calc = sum % 11;
+    const d9 = parseInt(afm[8]);
+    const valid = calc % 10 === d9;
+    return valid;
+}
+const AFM_VALIDATOR = {
+    name: 'afm-validator',
+    message: 'form.error.afm',
+    test: (value)=>{
+        if (value) return validateAFM(value);
+        return true;
+    }
+};
+export { AFM_VALIDATOR, validateAFM };

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

@@ -0,0 +1,27 @@
+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 (0 === sumMod10) return '0' === amka.substring(checkDigitIndex);
+    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) || '00000000000' === value) return false;
+        return validateAMKA(value);
+    }
+};
+export { AMKA_VALIDATOR, validateAMKA };

package/validators/utils/date.d.ts

@@ -1,9 +1,9 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '../../types.js';
+import type { ValidatorSchema } from '../types.js';
 export declare const LATER_THAN_VALIDATOR: (field: FieldSpec) => ValidatorSchema;
 export declare const EARLIER_THAN_VALIDATOR: (field: FieldSpec) => ValidatorSchema;
 export declare const DATE_VALIDATOR: {
     name: string;
-    message: (v: any) => string;
+    message: (v: any) => string | object;
     test: (value: string) => any;
 };