@digigov/form 2.0.0-254f7786 → 2.0.0-2a26e869

package/validators/index.js

@@ -28,7 +28,13 @@ const getYUPTypeMap = () => {
         return value;
       }).nullable().test(FILE_MAX_SIZE_VALIDATOR(field));
     },
-    string: yup.string,
+    string: (field) => {
+      if (field.trim) {
+        return yup.string().trim().required(field.required);
+      } else {
+        return yup.string();
+      }
+    },
     boolean: () => {
       return yup.boolean().nullable().transform((value) => {
         if (value === "" || typeof value === "string") return null;
@@ -71,18 +77,18 @@ const getYUPTypeMap = () => {
         return yup.array().of(yup.string());
       }
     },
-    number: () => yup.mixed().transform((_, val) => val !== "" ? Number(val) : null).test(NUMBER_VALIDATOR()),
-    int: () => yup.mixed().transform((_, val) => val !== "" ? Number(val) : null).test(NUMBER_VALIDATOR()).test(INT_VALIDATOR()),
-    email: () => yup.string().email("form.error.email"),
-    afm: () => yup.string().test(AFM_VALIDATOR),
-    uuid4: () => yup.string().test(UUID4_VALIDATOR),
-    iban: (field) => yup.string().test(IBAN_VALIDATOR(field)),
-    otp: (field) => yup.string().test(OTP_VALIDATOR(field)),
+    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 yup.string().test(TEXT_LIMIT_VALIDATOR(field));
+        return field.trim ? yup.string().trim().test(TEXT_LIMIT_VALIDATOR(field)) : yup.string().test(TEXT_LIMIT_VALIDATOR(field));
       } else {
-        return yup.string();
+        return field.trim ? yup.string().trim() : yup.string();
       }
     },
     image: (field) => {
@@ -93,9 +99,9 @@ const getYUPTypeMap = () => {
         return value;
       }).nullable().test(FILE_MAX_SIZE_VALIDATOR(field)).test(IMAGE_DIMENSION_VALIDATOR(field));
     },
-    postal_code: (field) => yup.string().test(POSTALCODE_VALIDATOR(field)),
-    mobile_phone: () => yup.string().test(MOBILE_PHONE_VALIDATOR),
-    phone_number: (field) => yup.string().test(PHONE_NUMBER_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) => {

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} 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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",
+  "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: (field): yup.StringSchema => {\n      if (field.trim) {\n        return yup.string().trim().required(field.required);\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  };\n  return yupTypeMap;\n};\n\nexport interface MutableRefObjectProps {}\n// Create a yup validation schema from given fields input\nexport function useValidationSchema(\n  fields: FieldSpec[] | MutableRefObject<MutableRefObjectProps>,\n  validatorRegistry?: Record<string, ValidatorSchema[]>\n): Lazy<any, unknown> | AnyObjectSchema | void {\n  return useMemo(() => {\n    const yupTypeMap = getYUPTypeMap();\n    return getYupObjectShape(fields, yupTypeMap, validatorRegistry);\n  }, []);\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/validators/utils/int/index.js

@@ -10,7 +10,7 @@ const INT_VALIDATOR = () => {
     name: "int-validator",
     message: "form.error.positive_integer_number",
     test: (value) => {
-      if (value === null) {
+      if (value === void 0) {
         return true;
       }
       return validateIntNumber(value);

package/validators/utils/int.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/validators/utils/int.ts"],
-  "sourcesContent": ["import { ValidatorSchema } from '@digigov/form/validators/types';\n\nexport function validateIntNumber(number: number): boolean {\n  if (number === undefined) {\n    return false;\n  } else {\n    return Number.isInteger(number) && Number(number) > 0;\n  }\n}\n\nexport const INT_VALIDATOR = (): ValidatorSchema => {\n  return {\n    name: 'int-validator',\n    message: 'form.error.positive_integer_number',\n    test: (value: number): boolean => {\n      if (value === null) {\n        return true;\n      }\n      return validateIntNumber(value);\n    },\n  };\n};\n"],
-  "mappings": "AAEO,SAAS,kBAAkB,QAAyB;AACzD,MAAI,WAAW,QAAW;AACxB,WAAO;AAAA,EACT,OAAO;AACL,WAAO,OAAO,UAAU,MAAM,KAAK,OAAO,MAAM,IAAI;AAAA,EACtD;AACF;AAEO,MAAM,gBAAgB,MAAuB;AAClD,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,MAAM,CAAC,UAA2B;AAChC,UAAI,UAAU,MAAM;AAClB,eAAO;AAAA,MACT;AACA,aAAO,kBAAkB,KAAK;AAAA,IAChC;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { ValidatorSchema } from '@digigov/form/validators/types';\n\nexport function validateIntNumber(number: number): boolean {\n  if (number === undefined) {\n    return false;\n  } else {\n    return Number.isInteger(number) && Number(number) > 0;\n  }\n}\n\nexport const INT_VALIDATOR = (): ValidatorSchema => {\n  return {\n    name: 'int-validator',\n    message: 'form.error.positive_integer_number',\n    test: (value: number): boolean => {\n      if (value === undefined) {\n        return true;\n      }\n      return validateIntNumber(value);\n    },\n  };\n};\n"],
+  "mappings": "AAEO,SAAS,kBAAkB,QAAyB;AACzD,MAAI,WAAW,QAAW;AACxB,WAAO;AAAA,EACT,OAAO;AACL,WAAO,OAAO,UAAU,MAAM,KAAK,OAAO,MAAM,IAAI;AAAA,EACtD;AACF;AAEO,MAAM,gBAAgB,MAAuB;AAClD,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,MAAM,CAAC,UAA2B;AAChC,UAAI,UAAU,QAAW;AACvB,eAAO;AAAA,MACT;AACA,aAAO,kBAAkB,KAAK;AAAA,IAChC;AAAA,EACF;AACF;",
   "names": []
 }

package/validators/utils/number/index.js

@@ -6,7 +6,7 @@ const NUMBER_VALIDATOR = () => {
     name: "number-validator",
     message: "form.error.number",
     test: (value) => {
-      if (value === null) {
+      if (value === void 0) {
         return true;
       }
       return validateNumber(value);

package/validators/utils/number.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/validators/utils/number.ts"],
-  "sourcesContent": ["import { ValidatorSchema } from '@digigov/form/validators/types';\n\nexport function validateNumber(number: number): boolean {\n  return !Number.isNaN(number);\n}\n\nexport const NUMBER_VALIDATOR = (): ValidatorSchema => {\n  return {\n    name: 'number-validator',\n    message: 'form.error.number',\n    test: (value: number): boolean => {\n      if (value === null) {\n        return true;\n      }\n      return validateNumber(value);\n    },\n  };\n};\n"],
-  "mappings": "AAEO,SAAS,eAAe,QAAyB;AACtD,SAAO,CAAC,OAAO,MAAM,MAAM;AAC7B;AAEO,MAAM,mBAAmB,MAAuB;AACrD,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,MAAM,CAAC,UAA2B;AAChC,UAAI,UAAU,MAAM;AAClB,eAAO;AAAA,MACT;AACA,aAAO,eAAe,KAAK;AAAA,IAC7B;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { ValidatorSchema } from '@digigov/form/validators/types';\n\nexport function validateNumber(number: number): boolean {\n  return !Number.isNaN(number);\n}\n\nexport const NUMBER_VALIDATOR = (): ValidatorSchema => {\n  return {\n    name: 'number-validator',\n    message: 'form.error.number',\n    test: (value: number): boolean => {\n      if (value === undefined) {\n        return true;\n      }\n      return validateNumber(value);\n    },\n  };\n};\n"],
+  "mappings": "AAEO,SAAS,eAAe,QAAyB;AACtD,SAAO,CAAC,OAAO,MAAM,MAAM;AAC7B;AAEO,MAAM,mBAAmB,MAAuB;AACrD,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,MAAM,CAAC,UAA2B;AAChC,UAAI,UAAU,QAAW;AACvB,eAAO;AAAA,MACT;AACA,aAAO,eAAe,KAAK;AAAA,IAC7B;AAAA,EACF;AACF;",
   "names": []
 }