@digigov/form 2.0.0-13876dba → 2.0.0-16da9467

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (233) hide show
  1. package/Field/FieldBase/index.js +7 -3
  2. package/Field/FieldBase.js.map +2 -2
  3. package/Field/FieldBaseContainer/index.js +37 -18
  4. package/Field/FieldBaseContainer.d.ts +1 -1
  5. package/Field/FieldBaseContainer.js.map +2 -2
  6. package/Field/FieldConditional/index.js +4 -0
  7. package/Field/FieldConditional.js.map +2 -2
  8. package/Field/index.js +10 -4
  9. package/Field/index.js.map +2 -2
  10. package/Field/types.d.ts +10 -3
  11. package/Field/utils/index.js +3 -1
  12. package/Field/utils/index.js.map +2 -2
  13. package/Field/utils/useField/index.js +8 -1
  14. package/Field/utils/useField.js.map +2 -2
  15. package/FieldArray/FormDialog/index.js +314 -196
  16. package/FieldArray/FormDialog.d.ts +20 -7
  17. package/FieldArray/FormDialog.js.map +3 -3
  18. package/FieldArray/index.d.ts +1 -0
  19. package/FieldArray/index.js +32 -8
  20. package/FieldArray/index.js.map +2 -2
  21. package/FieldObject/index.d.ts +3 -0
  22. package/FieldObject/index.js +25 -14
  23. package/FieldObject/index.js.map +2 -2
  24. package/FormBuilder/index.d.ts +1 -1
  25. package/FormBuilder/index.js +11 -7
  26. package/FormBuilder/index.js.map +2 -2
  27. package/FormContext/index.js +6 -2
  28. package/FormContext.d.ts +1 -0
  29. package/FormContext.js.map +2 -2
  30. package/MultiplicityField/add-objects/index.js +2 -0
  31. package/MultiplicityField/add-objects.js.map +2 -2
  32. package/MultiplicityField/index.js +4 -1
  33. package/MultiplicityField/index.js.map +2 -2
  34. package/MultiplicityField/types.d.ts +1 -0
  35. package/cjs/Field/FieldBase/index.js +7 -3
  36. package/cjs/Field/FieldBase.js.map +2 -2
  37. package/cjs/Field/FieldBaseContainer/index.js +36 -17
  38. package/cjs/Field/FieldBaseContainer.js.map +3 -3
  39. package/cjs/Field/FieldConditional/index.js +4 -0
  40. package/cjs/Field/FieldConditional.js.map +2 -2
  41. package/cjs/Field/index.js +10 -4
  42. package/cjs/Field/index.js.map +2 -2
  43. package/cjs/Field/types.js.map +1 -1
  44. package/cjs/Field/utils/index.js +3 -1
  45. package/cjs/Field/utils/index.js.map +2 -2
  46. package/cjs/Field/utils/useField/index.js +8 -1
  47. package/cjs/Field/utils/useField.js.map +2 -2
  48. package/cjs/FieldArray/FormDialog/index.js +309 -194
  49. package/cjs/FieldArray/FormDialog.js.map +3 -3
  50. package/cjs/FieldArray/index.js +31 -7
  51. package/cjs/FieldArray/index.js.map +2 -2
  52. package/cjs/FieldObject/index.js +25 -14
  53. package/cjs/FieldObject/index.js.map +2 -2
  54. package/cjs/FormBuilder/index.js +11 -7
  55. package/cjs/FormBuilder/index.js.map +2 -2
  56. package/cjs/FormContext/index.js +7 -2
  57. package/cjs/FormContext.js.map +2 -2
  58. package/cjs/MultiplicityField/add-objects/index.js +2 -0
  59. package/cjs/MultiplicityField/add-objects.js.map +2 -2
  60. package/cjs/MultiplicityField/index.js +4 -1
  61. package/cjs/MultiplicityField/index.js.map +2 -2
  62. package/cjs/MultiplicityField/types.js.map +1 -1
  63. package/cjs/inputs/Checkboxes/index.js +2 -2
  64. package/cjs/inputs/Checkboxes/index.js.map +2 -2
  65. package/cjs/inputs/DateInput/index.js +41 -14
  66. package/cjs/inputs/DateInput/index.js.map +2 -2
  67. package/cjs/inputs/DateTimeInput/index.js +68 -34
  68. package/cjs/inputs/DateTimeInput/index.js.map +2 -2
  69. package/cjs/inputs/FileInput/index.js +52 -29
  70. package/cjs/inputs/FileInput/index.js.map +2 -2
  71. package/cjs/inputs/ImageInput/__stories__/logo.d/index.js +1 -0
  72. package/cjs/inputs/ImageInput/__stories__/logo.d.js.map +7 -0
  73. package/cjs/inputs/ImageInput/index.js +41 -10
  74. package/cjs/inputs/ImageInput/index.js.map +2 -2
  75. package/cjs/inputs/Input/index.js +4 -4
  76. package/cjs/inputs/Input/index.js.map +2 -2
  77. package/cjs/inputs/Select/index.js +4 -3
  78. package/cjs/inputs/Select/index.js.map +2 -2
  79. package/cjs/inputs/inputsScenarios/index.js +2 -2
  80. package/cjs/inputs/inputsScenarios.js.map +2 -2
  81. package/cjs/lazy/index.js +2 -1
  82. package/cjs/lazy.js.map +2 -2
  83. package/cjs/registry/index.js +4 -4
  84. package/cjs/registry.js.map +2 -2
  85. package/cjs/types.js.map +1 -1
  86. package/cjs/utils/index.js +20 -6
  87. package/cjs/utils.js.map +2 -2
  88. package/cjs/validators/index.js +11 -6
  89. package/cjs/validators/index.js.map +2 -2
  90. package/cjs/validators/utils/amka/index.js +60 -0
  91. package/cjs/validators/utils/amka.js.map +7 -0
  92. package/cjs/validators/utils/date/index.js +26 -3
  93. package/cjs/validators/utils/date.js.map +2 -2
  94. package/cjs/validators/utils/datetime/index.js +118 -24
  95. package/cjs/validators/utils/datetime.js.map +2 -2
  96. package/cjs/validators/utils/file/index.js +30 -17
  97. package/cjs/validators/utils/file.js.map +2 -2
  98. package/cjs/validators/utils/index.js +5 -1
  99. package/cjs/validators/utils/index.js.map +2 -2
  100. package/index.js +1 -1
  101. package/inputs/Checkboxes/index.js +2 -2
  102. package/inputs/Checkboxes/index.js.map +2 -2
  103. package/inputs/DateInput/DateInput.stories.d.ts +4 -0
  104. package/inputs/DateInput/__stories__/WithDefaultValue.d.ts +3 -0
  105. package/inputs/DateInput/__stories__/WithInitialValue.d.ts +3 -0
  106. package/inputs/DateInput/__stories__/WithWrongDefaultValue.d.ts +3 -0
  107. package/inputs/DateInput/__stories__/WithWrongInitialValue.d.ts +3 -0
  108. package/inputs/DateInput/index.js +42 -15
  109. package/inputs/DateInput/index.js.map +2 -2
  110. package/inputs/DateTimeInput/DateTimeInput.stories.d.ts +8 -3
  111. package/inputs/DateTimeInput/__stories__/WithDefaultValue.d.ts +3 -0
  112. package/inputs/DateTimeInput/__stories__/WithInitialValue.d.ts +3 -0
  113. package/inputs/DateTimeInput/__stories__/WithWrongDefaultValue.d.ts +3 -0
  114. package/inputs/DateTimeInput/__stories__/WithWrongInitialValue.d.ts +3 -0
  115. package/inputs/DateTimeInput/index.js +69 -35
  116. package/inputs/DateTimeInput/index.js.map +2 -2
  117. package/inputs/FileInput/FileInput.stories.d.ts +1 -0
  118. package/inputs/FileInput/__stories__/WithBorderAndLink.d.ts +3 -0
  119. package/inputs/FileInput/index.d.ts +11 -4
  120. package/inputs/FileInput/index.js +57 -31
  121. package/inputs/FileInput/index.js.map +2 -2
  122. package/inputs/ImageInput/ImageInput.stories.d.ts +2 -1
  123. package/inputs/ImageInput/__stories__/WithInitialValues.d.ts +3 -0
  124. package/inputs/ImageInput/__stories__/logo.d/index.js +1 -0
  125. package/inputs/ImageInput/__stories__/logo.d/package.json +6 -0
  126. package/inputs/ImageInput/__stories__/logo.d.js.map +7 -0
  127. package/inputs/ImageInput/index.d.ts +9 -1
  128. package/inputs/ImageInput/index.js +42 -11
  129. package/inputs/ImageInput/index.js.map +2 -2
  130. package/inputs/Input/Input.stories.d.ts +2 -0
  131. package/inputs/Input/__stories__/AMKA.d.ts +3 -0
  132. package/inputs/Input/__stories__/Email.d.ts +3 -0
  133. package/inputs/Input/index.d.ts +2 -1
  134. package/inputs/Input/index.js +4 -4
  135. package/inputs/Input/index.js.map +2 -2
  136. package/inputs/Select/index.d.ts +2 -1
  137. package/inputs/Select/index.js +4 -3
  138. package/inputs/Select/index.js.map +2 -2
  139. package/inputs/inputsScenarios/index.js +2 -2
  140. package/inputs/inputsScenarios.d.ts +1 -1
  141. package/inputs/inputsScenarios.js.map +2 -2
  142. package/lazy/index.js +2 -1
  143. package/package.json +8 -8
  144. package/registry/index.js +4 -4
  145. package/src/Field/FieldBase.tsx +6 -2
  146. package/src/Field/FieldBaseContainer.tsx +68 -48
  147. package/src/Field/FieldConditional.tsx +4 -0
  148. package/src/Field/index.tsx +15 -5
  149. package/src/Field/types.tsx +11 -3
  150. package/src/Field/utils/index.ts +2 -0
  151. package/src/Field/utils/useField.ts +9 -1
  152. package/src/FieldArray/FormDialog.tsx +430 -243
  153. package/src/FieldArray/__stories__/WithModal.tsx +3 -2
  154. package/src/FieldArray/index.tsx +53 -30
  155. package/src/FieldObject/index.tsx +29 -16
  156. package/src/FormBuilder/index.tsx +12 -7
  157. package/src/FormBuilder/scenarios.test.tsx +763 -5
  158. package/src/FormContext.tsx +5 -1
  159. package/src/MultiplicityField/add-objects.tsx +2 -0
  160. package/src/MultiplicityField/index.tsx +3 -0
  161. package/src/MultiplicityField/types.ts +1 -0
  162. package/src/inputs/Checkboxes/index.tsx +2 -6
  163. package/src/inputs/DateInput/DateInput.stories.js +4 -0
  164. package/src/inputs/DateInput/__stories__/WithDefaultValue.tsx +26 -0
  165. package/src/inputs/DateInput/__stories__/WithInitialValue.tsx +28 -0
  166. package/src/inputs/DateInput/__stories__/WithWrongDefaultValue.tsx +26 -0
  167. package/src/inputs/DateInput/__stories__/WithWrongInitialValue.tsx +28 -0
  168. package/src/inputs/DateInput/index.test.tsx +16 -0
  169. package/src/inputs/DateInput/index.tsx +46 -14
  170. package/src/inputs/DateTimeInput/DateTimeInput.stories.js +9 -6
  171. package/src/inputs/DateTimeInput/__stories__/WithDefaultValue.tsx +26 -0
  172. package/src/inputs/DateTimeInput/__stories__/WithInitialValue.tsx +28 -0
  173. package/src/inputs/DateTimeInput/__stories__/WithWrongDefaultValue.tsx +26 -0
  174. package/src/inputs/DateTimeInput/__stories__/WithWrongInitialValue.tsx +28 -0
  175. package/src/inputs/DateTimeInput/index.test.tsx +16 -0
  176. package/src/inputs/DateTimeInput/index.tsx +73 -34
  177. package/src/inputs/FileInput/FileInput.stories.js +1 -0
  178. package/src/inputs/FileInput/__stories__/WithBorderAndLink.tsx +34 -0
  179. package/src/inputs/FileInput/index.test.tsx +4 -0
  180. package/src/inputs/FileInput/index.tsx +90 -48
  181. package/src/inputs/ImageInput/ImageInput.stories.js +2 -1
  182. package/src/inputs/ImageInput/__stories__/MaxSize.tsx +2 -1
  183. package/src/inputs/ImageInput/__stories__/WithInitialValues.tsx +45 -0
  184. package/src/inputs/ImageInput/__stories__/logo.d.ts +4 -0
  185. package/src/inputs/ImageInput/__stories__/logo.png +0 -0
  186. package/src/inputs/ImageInput/index.test.tsx +21 -17
  187. package/src/inputs/ImageInput/index.tsx +100 -48
  188. package/src/inputs/Input/Input.stories.js +2 -0
  189. package/src/inputs/Input/__stories__/AMKA.tsx +23 -0
  190. package/src/inputs/Input/__stories__/Email.tsx +23 -0
  191. package/src/inputs/Input/index.test.tsx +8 -0
  192. package/src/inputs/Input/index.tsx +5 -3
  193. package/src/inputs/Select/index.tsx +7 -4
  194. package/src/inputs/inputsScenarios.ts +2 -2
  195. package/src/lazy.js +2 -1
  196. package/src/registry.js +4 -4
  197. package/src/types.tsx +2 -1
  198. package/src/utils.ts +27 -6
  199. package/src/validators/index.ts +17 -6
  200. package/src/validators/utils/amka.ts +39 -0
  201. package/src/validators/utils/date.ts +28 -4
  202. package/src/validators/utils/datetime.ts +121 -29
  203. package/src/validators/utils/file.ts +33 -19
  204. package/src/validators/utils/index.ts +4 -1
  205. package/types.d.ts +2 -1
  206. package/types.js.map +1 -1
  207. package/utils/index.js +20 -6
  208. package/utils.d.ts +2 -0
  209. package/utils.js.map +2 -2
  210. package/validators/index.d.ts +1 -1
  211. package/validators/index.js +12 -6
  212. package/validators/index.js.map +2 -2
  213. package/validators/utils/amka/index.js +36 -0
  214. package/{inputs/Input/inputsInputScenarios → validators/utils/amka}/package.json +1 -1
  215. package/validators/utils/amka.d.ts +6 -0
  216. package/validators/utils/amka.js.map +7 -0
  217. package/validators/utils/date/index.js +26 -3
  218. package/validators/utils/date.d.ts +1 -1
  219. package/validators/utils/date.js.map +2 -2
  220. package/validators/utils/datetime/index.js +118 -24
  221. package/validators/utils/datetime.d.ts +1 -1
  222. package/validators/utils/datetime.js.map +2 -2
  223. package/validators/utils/file/index.js +30 -17
  224. package/validators/utils/file.js.map +2 -2
  225. package/validators/utils/index.d.ts +1 -0
  226. package/validators/utils/index.js +4 -1
  227. package/validators/utils/index.js.map +2 -2
  228. package/cjs/inputs/Input/inputsInputScenarios/index.js +0 -439
  229. package/cjs/inputs/Input/inputsInputScenarios.js.map +0 -7
  230. package/inputs/Input/inputsInputScenarios/index.js +0 -406
  231. package/inputs/Input/inputsInputScenarios.d.ts +0 -57
  232. package/inputs/Input/inputsInputScenarios.js.map +0 -7
  233. package/src/inputs/Input/inputsInputScenarios.ts +0 -404
@@ -7,14 +7,18 @@ dayjs.extend(customParseFormat);
7
7
 
8
8
  const VALID_DATE_FORMATS = ['DD/MM/YYYY'];
9
9
  const DATE_CACHE = {};
10
+ const onlyNumbersRegex = /^\d+$/;
10
11
 
11
12
  const getDate = (v: string) => {
12
13
  return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);
13
14
  };
14
15
 
16
+ const getDaysInMonth = (month: number, year: number): number => {
17
+ return dayjs(`${year}-${month}-01`).daysInMonth(); // e.g. 29 for Feb 2024
18
+ };
19
+
15
20
  // Function to check partial date completion
16
21
  const checkPartialDate = (value: string) => {
17
- console.log("value.split('/')", value.split('/'));
18
22
  const [day, month, year] = value.split('/');
19
23
  if (day && !month && !year) {
20
24
  return 'form.error.date.invalid_month_year';
@@ -33,9 +37,29 @@ const checkPartialDate = (value: string) => {
33
37
  }
34
38
  if (!day && month && year) {
35
39
  return 'form.error.date.invalid_day';
36
- } else {
37
- return 'form.error.date.invalid';
38
40
  }
41
+ if (day && month) {
42
+ const dayNum = parseInt(day);
43
+ const monthNum = parseInt(month);
44
+ const validYear = onlyNumbersRegex.test(year) ? year : undefined;
45
+ if (!validYear || year.length < 4) {
46
+ return 'form.error.date.invalid';
47
+ }
48
+ const yearNum = parseInt(validYear);
49
+ const maxDay = getDaysInMonth(monthNum, yearNum);
50
+ if (dayNum < 1 || dayNum > maxDay) {
51
+ return {
52
+ key: 'form.error.date.invalid_day_range',
53
+ context: {
54
+ maxDay: maxDay,
55
+ },
56
+ };
57
+ }
58
+ if (monthNum < 1 || monthNum > 12) {
59
+ return 'form.error.datetime.invalid_month_range';
60
+ }
61
+ }
62
+ return 'form.error.date.invalid';
39
63
  };
40
64
 
41
65
  export const LATER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
@@ -96,7 +120,7 @@ export const EARLIER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
96
120
 
97
121
  export const DATE_VALIDATOR = {
98
122
  name: 'date-validator',
99
- message: (v): string => {
123
+ message: (v): string | object => {
100
124
  return checkPartialDate(v.value);
101
125
  },
102
126
  test: function (value: string) {
@@ -7,6 +7,7 @@ dayjs.extend(customParseFormat);
7
7
 
8
8
  const VALID_DATETIME_FORMATS = ['DD/MM/YYYY HH:mm'];
9
9
  const DATETIME_CACHE = {};
10
+ const onlyNumbersRegex = /^\d+$/;
10
11
 
11
12
  const getDateTime = (v: string) => {
12
13
  return DATETIME_CACHE[v]
@@ -14,54 +15,145 @@ const getDateTime = (v: string) => {
14
15
  : dayjs(v, VALID_DATETIME_FORMATS, true);
15
16
  };
16
17
 
17
- // Function to check partial datetime completion
18
+ const getDaysInMonth = (month: number, year: number): number => {
19
+ return dayjs(`${year}-${month}-01`).daysInMonth(); // e.g. 29 for Feb 2024
20
+ };
21
+
18
22
  const checkPartialDateTime = (value: string) => {
19
23
  const [datePart, timePart] = value.split(' ');
20
- const [day, month, year] = datePart.split('/');
21
- const [hours, minutes] = timePart ? timePart.split(':') : [null, null];
24
+ const [day, month, year] = datePart?.split('/') ?? [];
25
+ const [hours, minutes] = timePart?.split(':') ?? [];
26
+
27
+ const hasDay = Boolean(day);
28
+ const hasMonth = Boolean(month);
29
+ const hasYear = Boolean(year);
30
+ const hasHours = Boolean(hours);
31
+ const hasMinutes = Boolean(minutes);
22
32
 
23
- // Check date part first
24
- if (day && !month && !year) {
33
+ if (hasDay && !hasMonth && !hasYear && !hasHours && !hasMinutes) {
34
+ return 'form.error.datetime.invalid_month_year_hours_minutes';
35
+ }
36
+ if (!hasDay && hasMonth && !hasYear && !hasHours && !hasMinutes) {
37
+ return 'form.error.datetime.invalid_day_year_hours_minutes';
38
+ }
39
+ if (!hasDay && !hasMonth && hasYear && !hasHours && !hasMinutes) {
40
+ return 'form.error.datetime.invalid_day_month_hours_minutes';
41
+ }
42
+ if (hasDay && hasMonth && !hasYear && !hasHours && !hasMinutes) {
43
+ return 'form.error.datetime.invalid_year_hours_minutes';
44
+ }
45
+ if (hasDay && !hasMonth && hasYear && !hasHours && !hasMinutes) {
46
+ return 'form.error.datetime.invalid_month_hours_minutes';
47
+ }
48
+ if (!hasDay && hasMonth && hasYear && !hasHours && !hasMinutes) {
49
+ return 'form.error.datetime.invalid_day_hours_minutes';
50
+ }
51
+ if (hasDay && hasMonth && hasYear && !hasHours && !hasMinutes) {
52
+ return 'form.error.datetime.invalid__hours_minutes';
53
+ }
54
+ if (hasDay && hasMonth && hasYear && hasHours && !hasMinutes) {
55
+ return 'form.error.datetime.invalid_minutes';
56
+ }
57
+ if (hasDay && hasMonth && hasYear && !hasHours && hasMinutes) {
58
+ return 'form.error.datetime.invalid_hours';
59
+ }
60
+ if (hasDay && !hasMonth && !hasYear && hasHours && !hasMinutes) {
61
+ return 'form.error.datetime.invalid_month_year_minutes';
62
+ }
63
+ if (hasDay && !hasMonth && !hasYear && !hasHours && hasMinutes) {
64
+ return 'form.error.datetime.invalid_month_year_hours';
65
+ }
66
+ if (hasDay && !hasMonth && !hasYear && hasHours && hasMinutes) {
25
67
  return 'form.error.datetime.invalid_month_year';
26
68
  }
27
- if (!day && month && !year) {
69
+ if (!hasDay && hasMonth && !hasYear && hasHours && !hasMinutes) {
70
+ return 'form.error.datetime.invalid_day_year_minutes';
71
+ }
72
+ if (!hasDay && hasMonth && !hasYear && !hasHours && hasMinutes) {
73
+ return 'form.error.datetime.invalid_day_year_hours';
74
+ }
75
+ if (!hasDay && hasMonth && !hasYear && hasHours && hasMinutes) {
28
76
  return 'form.error.datetime.invalid_day_year';
29
77
  }
30
- if (!day && !month && year) {
78
+ if (!hasDay && !hasMonth && hasYear && hasHours && !hasMinutes) {
79
+ return 'form.error.datetime.invalid_day_month_minutes';
80
+ }
81
+ if (!hasDay && !hasMonth && hasYear && !hasHours && hasMinutes) {
82
+ return 'form.error.datetime.invalid_day_month_hours';
83
+ }
84
+ if (!hasDay && !hasMonth && hasYear && hasHours && hasMinutes) {
31
85
  return 'form.error.datetime.invalid_day_month';
32
86
  }
33
- if (day && month && !year) {
87
+ if (!hasDay && !hasMonth && !hasYear && hasHours && hasMinutes) {
88
+ return 'form.error.datetime.invalid_day_month_year';
89
+ }
90
+ if (!hasDay && !hasMonth && !hasYear && !hasHours && hasMinutes) {
91
+ return 'form.error.datetime.invalid_day_month_year_hours';
92
+ }
93
+ if (hasDay && hasMonth && !hasYear && hasHours && !hasMinutes) {
94
+ return 'form.error.datetime.invalid_year_minutes';
95
+ }
96
+ if (hasDay && hasMonth && !hasYear && !hasHours && hasMinutes) {
97
+ return 'form.error.datetime.invalid_year_hours';
98
+ }
99
+ if (hasDay && hasMonth && !hasYear && hasHours && hasMinutes) {
34
100
  return 'form.error.datetime.invalid_year';
35
101
  }
36
- if (day && !month && year) {
102
+ if (hasDay && !hasMonth && hasYear && hasHours && !hasMinutes) {
103
+ return 'form.error.datetime.invalid_month_minutes';
104
+ }
105
+ if (hasDay && !hasMonth && hasYear && !hasHours && hasMinutes) {
106
+ return 'form.error.datetime.invalid_month_hours';
107
+ }
108
+ if (hasDay && !hasMonth && hasYear && hasHours && hasMinutes) {
37
109
  return 'form.error.datetime.invalid_month';
38
110
  }
39
- if (!day && month && year) {
111
+ if (!hasDay && hasMonth && hasYear && hasHours && !hasMinutes) {
112
+ return 'form.error.datetime.invalid_day_minutes';
113
+ }
114
+ if (!hasDay && hasMonth && hasYear && !hasHours && hasMinutes) {
115
+ return 'form.error.datetime.invalid_day_hours';
116
+ }
117
+ if (!hasDay && hasMonth && hasYear && hasHours && hasMinutes) {
40
118
  return 'form.error.datetime.invalid_day';
41
119
  }
42
- // If date is complete, check time part
43
- if (day && month && year) {
44
- if (hours && !minutes) {
45
- return 'form.error.datetime.invalid_minutes';
120
+ if (!hasDay && !hasMonth && !hasYear && hasHours && !hasMinutes) {
121
+ return 'form.error.datetime.invalid_day_month_year_minutes';
122
+ }
123
+ if (hasDay && hasMonth && hasYear && !hasHours && !hasMinutes) {
124
+ return 'form.error.datetime.invalid_hours_minutes';
125
+ }
126
+ if (day && month) {
127
+ const dayNum = parseInt(day);
128
+ const monthNum = parseInt(month);
129
+ const validYear = onlyNumbersRegex.test(year) ? year : undefined;
130
+ if (!validYear || year.length < 4) {
131
+ return 'form.error.datetime.invalid';
46
132
  }
47
- if (!hours && minutes) {
48
- return 'form.error.datetime.invalid_hours';
133
+ const yearNum = parseInt(validYear);
134
+ const maxDay = getDaysInMonth(monthNum, yearNum);
135
+ if (dayNum < 1 || dayNum > maxDay) {
136
+ return {
137
+ key: 'form.error.datetime.invalid_day_range',
138
+ context: {
139
+ maxDay: maxDay,
140
+ },
141
+ };
49
142
  }
50
- if (!hours && !minutes) {
51
- return 'form.error.datetime.invalid';
143
+ if (monthNum < 1 || monthNum > 12) {
144
+ return 'form.error.datetime.invalid_month_range';
145
+ }
146
+ }
147
+ if (hours && minutes) {
148
+ const hoursNum = parseInt(hours);
149
+ const minutesNum = parseInt(minutes);
150
+ if (hoursNum < 0 || hoursNum > 23) {
151
+ return 'form.error.datetime.invalid_hours_range';
52
152
  }
53
- if (hours && minutes) {
54
- const hoursNum = parseInt(hours);
55
- const minutesNum = parseInt(minutes);
56
- if (hoursNum < 0 || hoursNum > 23) {
57
- return 'form.error.datetime.invalid_hours_range';
58
- }
59
- if (minutesNum < 0 || minutesNum > 59) {
60
- return 'form.error.datetime.invalid_minutes_range';
61
- }
153
+ if (minutesNum < 0 || minutesNum > 59) {
154
+ return 'form.error.datetime.invalid_minutes_range';
62
155
  }
63
156
  }
64
-
65
157
  return 'form.error.datetime.invalid';
66
158
  };
67
159
 
@@ -119,7 +211,7 @@ export const EARLIER_THAN_DATETIME_VALIDATOR = (
119
211
 
120
212
  export const DATETIME_VALIDATOR = {
121
213
  name: 'datetime-validator',
122
- message: (v): string => {
214
+ message: (v): string | object => {
123
215
  return checkPartialDateTime(v.value);
124
216
  },
125
217
  test: function (value: string) {
@@ -3,25 +3,39 @@ import { ValidatorSchema } from '@digigov/form/validators/types';
3
3
 
4
4
  const DEFAULT_FILE_MAX_SIZE = 10000000;
5
5
 
6
- export const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => ({
7
- name: 'file-max-size-validator',
8
- message: {
9
- key:
10
- field.type === 'file' ? 'form.error.file_size' : 'form.error.image_size',
11
- context: {
12
- maxSizeToMb:
13
- (field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE) / 1000000,
6
+ export const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
7
+ const maxSizeInBytes = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
8
+ let maxSizeTransformed = maxSizeInBytes / (1024 * 1024); // In MB
9
+ let maxSizeText = 'MB';
10
+ if (Math.round(maxSizeTransformed) === 0) {
11
+ maxSizeTransformed = Math.round(maxSizeInBytes / 1024);
12
+ maxSizeText = 'KB';
13
+ }
14
+ if (Math.round(maxSizeTransformed) === 0) {
15
+ maxSizeTransformed = maxSizeInBytes;
16
+ maxSizeText = 'Bytes';
17
+ }
18
+ return {
19
+ name: 'file-max-size-validator',
20
+ message: {
21
+ key:
22
+ field.type === 'file'
23
+ ? 'form.error.file_size'
24
+ : 'form.error.image_size',
25
+ context: {
26
+ maxSize: `${maxSizeTransformed} ${maxSizeText}`,
27
+ },
14
28
  },
15
- },
16
- test: (value: File[]): boolean => {
17
- if (value) {
18
- for (const file of value) {
19
- const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
20
- if (file.size > maxSize) {
21
- return false;
29
+ test: (value: File[]): boolean => {
30
+ if (value) {
31
+ for (const file of Array.from(value)) {
32
+ const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
33
+ if (file.size > maxSize) {
34
+ return false;
35
+ }
22
36
  }
23
37
  }
24
- }
25
- return true;
26
- },
27
- });
38
+ return true;
39
+ },
40
+ };
41
+ };
@@ -3,6 +3,7 @@ import { FieldSpec } from '@digigov/form/types';
3
3
  import { ValidatorSchema } from '@digigov/form/validators/types';
4
4
 
5
5
  export * from '@digigov/form/validators/utils/afm';
6
+ export * from '@digigov/form/validators/utils/amka';
6
7
  export * from '@digigov/form/validators/utils/file';
7
8
  export * from '@digigov/form/validators/utils/iban';
8
9
  export * from '@digigov/form/validators/utils/otp';
@@ -98,7 +99,9 @@ export function getYupObjectShape(
98
99
 
99
100
  return yup.lazy(function () {
100
101
  const fieldSchemas = computeShape(
101
- Object.values(fields.current),
102
+ Object.values(fields.current).filter(
103
+ (f: FieldSpec) => !f.key.includes('.')
104
+ ) as FieldSpec[],
102
105
  yupTypeMap,
103
106
  validatorRegistry
104
107
  );
package/types.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { UseFormReturn, UseFormProps } from 'react-hook-form';
1
+ import { UseFormReturn, UseFormProps, ErrorOption } from 'react-hook-form';
2
2
  import { FieldComponentRegistry, FieldLabelProps, FieldSpec, FormData } from '@digigov/form/Field/types';
3
3
  import { ValidatorSchema } from '@digigov/form/validators/types';
4
4
  export * from '@digigov/form/Field/types';
@@ -46,6 +46,7 @@ export interface FormBuilderProps {
46
46
  componentRegistry?: FieldComponentRegistry;
47
47
  grid?: boolean;
48
48
  controlledFieldsOnly?: boolean;
49
+ errors?: ErrorOption;
49
50
  }
50
51
  export interface FormBaseProps extends Omit<FormBuilderProps, 'fields' | 'fieldsets' | 'auto'> {
51
52
  fieldsetsMap?: Record<string, FieldsetSpec>;
package/types.js.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/types.tsx"],
4
- "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"],
4
+ "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"],
5
5
  "mappings": "AAQA,cAAc;",
6
6
  "names": []
7
7
  }
package/utils/index.js CHANGED
@@ -23,6 +23,20 @@ const parseErrorSchema = (error, validateAllFieldCriteria) => {
23
23
  {}
24
24
  );
25
25
  };
26
+ function isPlainObject(obj) {
27
+ return typeof obj === "object" && obj !== null && Object.prototype.toString.call(obj) === "[object Object]";
28
+ }
29
+ function flattenObject(obj, prefix = "") {
30
+ return Object.keys(obj).reduce((acc, key) => {
31
+ const prefixedKey = prefix ? `${prefix}.${key}` : key;
32
+ if (isPlainObject(obj[key])) {
33
+ Object.assign(acc, flattenObject(obj[key], prefixedKey));
34
+ } else {
35
+ acc[prefixedKey] = obj[key];
36
+ }
37
+ return acc;
38
+ }, {});
39
+ }
26
40
  const yupResolver = (schema, schemaOptions = {}, resolverOptions = {}) => async (values, context, options) => {
27
41
  try {
28
42
  if (schemaOptions.context && process.env.NODE_ENV === "development") {
@@ -31,7 +45,7 @@ const yupResolver = (schema, schemaOptions = {}, resolverOptions = {}) => async
31
45
  );
32
46
  }
33
47
  const result = await schema[resolverOptions.mode === "sync" ? "validateSync" : "validate"](
34
- values,
48
+ flattenObject(values),
35
49
  Object.assign({ abortEarly: false }, schemaOptions, { context })
36
50
  );
37
51
  if (options.shouldUseNativeValidation)
@@ -44,13 +58,13 @@ const yupResolver = (schema, schemaOptions = {}, resolverOptions = {}) => async
44
58
  if (!e.inner) {
45
59
  throw e;
46
60
  }
47
- const parsed = parseErrorSchema(
48
- e,
49
- !options.shouldUseNativeValidation && options.criteriaMode === "all"
50
- );
51
61
  return {
52
62
  values: {},
53
- errors: parsed
63
+ errors: parseErrorSchema(
64
+ e,
65
+ !options.shouldUseNativeValidation && options.criteriaMode === "all"
66
+ ),
67
+ options
54
68
  };
55
69
  }
56
70
  };
package/utils.d.ts CHANGED
@@ -2,7 +2,9 @@ import { FieldError } from 'react-hook-form';
2
2
  export declare const yupResolver: (schema: any, schemaOptions?: any, resolverOptions?: any) => (values: any, context: any, options: any) => Promise<{
3
3
  values: any;
4
4
  errors: {};
5
+ options?: undefined;
5
6
  } | {
6
7
  values: {};
7
8
  errors: Record<string, FieldError>;
9
+ options: any;
8
10
  }>;
package/utils.js.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/utils.ts"],
4
- "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"],
5
- "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;",
4
+ "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"],
5
+ "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;",
6
6
  "names": ["error"]
7
7
  }
@@ -3,7 +3,7 @@ import { AnyObjectSchema } from 'yup';
3
3
  import Lazy from 'yup/lib/Lazy';
4
4
  import { FieldSpec } from '@digigov/form/types';
5
5
  import { ValidatorSchema } from '@digigov/form/validators/types';
6
- export declare const getYUPTypeMap: () => Record<string, any>;
6
+ export declare const getYUPTypeMap: (validatorRegistry?: Record<string, any>) => Record<string, any>;
7
7
  export interface MutableRefObjectProps {
8
8
  }
9
9
  export declare function useValidationSchema(fields: FieldSpec[] | MutableRefObject<MutableRefObjectProps>, validatorRegistry?: Record<string, ValidatorSchema[]>): Lazy<any, unknown> | AnyObjectSchema | void;
@@ -3,6 +3,7 @@ import * as yup from "yup";
3
3
  import {
4
4
  getYupObjectShape,
5
5
  AFM_VALIDATOR,
6
+ AMKA_VALIDATOR,
6
7
  FILE_MAX_SIZE_VALIDATOR,
7
8
  IBAN_VALIDATOR,
8
9
  OTP_VALIDATOR,
@@ -21,11 +22,11 @@ import {
21
22
  } from "@digigov/form/validators/utils";
22
23
  import { INT_VALIDATOR } from "@digigov/form/validators/utils/int";
23
24
  import { NUMBER_VALIDATOR } from "@digigov/form/validators/utils/number";
24
- const getYUPTypeMap = () => {
25
+ const getYUPTypeMap = (validatorRegistry) => {
25
26
  const yupTypeMap = {
26
27
  file: (field) => {
27
28
  return yup.mixed().transform((value) => {
28
- if (!value.length) {
29
+ if (!value || value.length === 0) {
29
30
  return null;
30
31
  }
31
32
  return value;
@@ -51,7 +52,10 @@ const getYUPTypeMap = () => {
51
52
  },
52
53
  array: (field) => {
53
54
  if (typeof field.extra.of === "object") {
54
- let arrayValidator = yup.array().of(yupTypeMap[field.extra.of.type](field.extra.of)).required(field.required);
55
+ if (field.required) {
56
+ field.extra.min = 1;
57
+ }
58
+ let arrayValidator = yup.array().nullable().of(yupTypeMap[field.extra.of.type](field.extra.of));
55
59
  if (field.extra.length)
56
60
  arrayValidator = arrayValidator.length(field.extra.length, {
57
61
  key: "form.error.array.length",
@@ -84,6 +88,7 @@ const getYUPTypeMap = () => {
84
88
  int: () => yup.mixed().transform((_, val) => val !== "" ? Number(val) : void 0).test(NUMBER_VALIDATOR()).test(INT_VALIDATOR()),
85
89
  email: (field) => field.trim ? yup.string().trim().email("form.error.email") : yup.string().email("form.error.email"),
86
90
  afm: (field) => field.trim ? yup.string().trim().test(AFM_VALIDATOR) : yup.string().test(AFM_VALIDATOR),
91
+ amka: (field) => field.trim ? yup.string().trim().test(AMKA_VALIDATOR) : yup.string().test(AMKA_VALIDATOR),
87
92
  uuid4: (field) => field.trim ? yup.string().trim().test(UUID4_VALIDATOR) : yup.string().test(UUID4_VALIDATOR),
88
93
  iban: (field) => field.trim ? yup.string().trim().test(IBAN_VALIDATOR(field)) : yup.string().trim().test(IBAN_VALIDATOR(field)),
89
94
  otp: (field) => yup.string().trim().test(OTP_VALIDATOR(field)),
@@ -127,15 +132,16 @@ const getYUPTypeMap = () => {
127
132
  return yup.string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));
128
133
  }
129
134
  return yup.string().test(DATETIME_VALIDATOR);
130
- }
135
+ },
136
+ ...validatorRegistry
131
137
  };
132
138
  return yupTypeMap;
133
139
  };
134
140
  function useValidationSchema(fields, validatorRegistry) {
135
141
  return useMemo(() => {
136
- const yupTypeMap = getYUPTypeMap();
142
+ const yupTypeMap = getYUPTypeMap(validatorRegistry);
137
143
  return getYupObjectShape(fields, yupTypeMap, validatorRegistry);
138
- }, []);
144
+ }, [fields, validatorRegistry]);
139
145
  }
140
146
  export {
141
147
  getYUPTypeMap,
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/validators/index.ts"],
4
- "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"],
5
- "mappings": "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",
4
+ "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 }, [fields, validatorRegistry]);\n}\n"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }
@@ -0,0 +1,36 @@
1
+ function digitSum(number) {
2
+ const sum = number > 9 ? 1 : 0;
3
+ return sum + number % 10;
4
+ }
5
+ function validateAMKA(amka) {
6
+ amka = String(amka);
7
+ const checkDigitIndex = amka.length - 1;
8
+ let sum = 0;
9
+ amka.substring(0, checkDigitIndex).split("").reverse().forEach(function(value, index) {
10
+ const weight = (index + 1) % 2 + 1;
11
+ sum += digitSum(parseInt(value, 10) * weight);
12
+ });
13
+ const sumMod10 = sum % 10;
14
+ if (sumMod10 === 0) {
15
+ return amka.substring(checkDigitIndex) === "0";
16
+ } else {
17
+ return amka.substring(checkDigitIndex) === 10 - sumMod10 + "";
18
+ }
19
+ }
20
+ const AMKA_VALIDATOR = {
21
+ name: "amka-validator",
22
+ message: "form.error.amka",
23
+ test: (value) => {
24
+ if (!value) return true;
25
+ const AMKA_REGEX = /^[0-9]{11}$/;
26
+ if (!AMKA_REGEX.test(value) || value === "00000000000") {
27
+ return false;
28
+ }
29
+ return validateAMKA(value);
30
+ }
31
+ };
32
+ export {
33
+ AMKA_VALIDATOR,
34
+ validateAMKA
35
+ };
36
+ //# sourceMappingURL=amka.js.map
@@ -2,5 +2,5 @@
2
2
  "sideEffects": false,
3
3
  "module": "./index.js",
4
4
  "types": "./index.d.ts",
5
- "main": "../../../cjs/inputs/Input/inputsInputScenarios/index.js"
5
+ "main": "../../../cjs/validators/utils/amka/index.js"
6
6
  }
@@ -0,0 +1,6 @@
1
+ export declare function validateAMKA(amka: string): boolean;
2
+ export declare const AMKA_VALIDATOR: {
3
+ name: string;
4
+ message: string;
5
+ test: (value: any) => boolean;
6
+ };