@digigov/form 2.0.0-a402a664 → 2.0.0-abd768eb

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 (88) hide show
  1. package/Field/FieldBase/index.js +1 -1
  2. package/Field/FieldBase.js.map +2 -2
  3. package/Field/FieldBaseContainer/index.js +36 -19
  4. package/Field/FieldBaseContainer.d.ts +1 -1
  5. package/Field/FieldBaseContainer.js.map +2 -2
  6. package/FieldArray/index.js +20 -1
  7. package/FieldArray/index.js.map +2 -2
  8. package/FormBuilder/index.js +0 -1
  9. package/FormBuilder/index.js.map +2 -2
  10. package/cjs/Field/FieldBase/index.js +1 -1
  11. package/cjs/Field/FieldBase.js.map +2 -2
  12. package/cjs/Field/FieldBaseContainer/index.js +36 -19
  13. package/cjs/Field/FieldBaseContainer.js.map +2 -2
  14. package/cjs/FieldArray/index.js +19 -0
  15. package/cjs/FieldArray/index.js.map +2 -2
  16. package/cjs/FormBuilder/index.js +0 -1
  17. package/cjs/FormBuilder/index.js.map +2 -2
  18. package/cjs/inputs/Checkboxes/index.js +1 -1
  19. package/cjs/inputs/Checkboxes/index.js.map +2 -2
  20. package/cjs/inputs/DateInput/index.js +26 -11
  21. package/cjs/inputs/DateInput/index.js.map +2 -2
  22. package/cjs/inputs/DateTimeInput/index.js +54 -33
  23. package/cjs/inputs/DateTimeInput/index.js.map +2 -2
  24. package/cjs/inputs/FileInput/index.js +42 -24
  25. package/cjs/inputs/FileInput/index.js.map +2 -2
  26. package/cjs/registry/index.js +4 -4
  27. package/cjs/registry.js.map +2 -2
  28. package/cjs/validators/index.js +1 -1
  29. package/cjs/validators/index.js.map +2 -2
  30. package/cjs/validators/utils/date/index.js +26 -3
  31. package/cjs/validators/utils/date.js.map +2 -2
  32. package/cjs/validators/utils/datetime/index.js +118 -24
  33. package/cjs/validators/utils/datetime.js.map +2 -2
  34. package/index.js +1 -1
  35. package/inputs/Checkboxes/index.js +1 -1
  36. package/inputs/Checkboxes/index.js.map +2 -2
  37. package/inputs/DateInput/DateInput.stories.d.ts +4 -0
  38. package/inputs/DateInput/__stories__/WithDefaultValue.d.ts +3 -0
  39. package/inputs/DateInput/__stories__/WithInitialValue.d.ts +3 -0
  40. package/inputs/DateInput/__stories__/WithWrongDefaultValue.d.ts +3 -0
  41. package/inputs/DateInput/__stories__/WithWrongInitialValue.d.ts +3 -0
  42. package/inputs/DateInput/index.js +27 -12
  43. package/inputs/DateInput/index.js.map +2 -2
  44. package/inputs/DateTimeInput/DateTimeInput.stories.d.ts +8 -3
  45. package/inputs/DateTimeInput/__stories__/WithDefaultValue.d.ts +3 -0
  46. package/inputs/DateTimeInput/__stories__/WithInitialValue.d.ts +3 -0
  47. package/inputs/DateTimeInput/__stories__/WithWrongDefaultValue.d.ts +3 -0
  48. package/inputs/DateTimeInput/__stories__/WithWrongInitialValue.d.ts +3 -0
  49. package/inputs/DateTimeInput/index.js +55 -34
  50. package/inputs/DateTimeInput/index.js.map +2 -2
  51. package/inputs/FileInput/index.d.ts +5 -1
  52. package/inputs/FileInput/index.js +43 -25
  53. package/inputs/FileInput/index.js.map +2 -2
  54. package/package.json +4 -4
  55. package/registry/index.js +4 -4
  56. package/src/Field/FieldBase.tsx +1 -1
  57. package/src/Field/FieldBaseContainer.tsx +67 -51
  58. package/src/FieldArray/index.tsx +28 -1
  59. package/src/FormBuilder/index.tsx +0 -1
  60. package/src/FormBuilder/scenarios.test.tsx +759 -1
  61. package/src/inputs/Checkboxes/index.tsx +1 -5
  62. package/src/inputs/DateInput/DateInput.stories.js +4 -0
  63. package/src/inputs/DateInput/__stories__/WithDefaultValue.tsx +26 -0
  64. package/src/inputs/DateInput/__stories__/WithInitialValue.tsx +28 -0
  65. package/src/inputs/DateInput/__stories__/WithWrongDefaultValue.tsx +26 -0
  66. package/src/inputs/DateInput/__stories__/WithWrongInitialValue.tsx +28 -0
  67. package/src/inputs/DateInput/index.test.tsx +16 -0
  68. package/src/inputs/DateInput/index.tsx +30 -12
  69. package/src/inputs/DateTimeInput/DateTimeInput.stories.js +9 -6
  70. package/src/inputs/DateTimeInput/__stories__/WithDefaultValue.tsx +26 -0
  71. package/src/inputs/DateTimeInput/__stories__/WithInitialValue.tsx +28 -0
  72. package/src/inputs/DateTimeInput/__stories__/WithWrongDefaultValue.tsx +26 -0
  73. package/src/inputs/DateTimeInput/__stories__/WithWrongInitialValue.tsx +28 -0
  74. package/src/inputs/DateTimeInput/index.test.tsx +16 -0
  75. package/src/inputs/DateTimeInput/index.tsx +58 -34
  76. package/src/inputs/FileInput/index.tsx +70 -39
  77. package/src/registry.js +4 -4
  78. package/src/validators/index.ts +1 -1
  79. package/src/validators/utils/date.ts +28 -4
  80. package/src/validators/utils/datetime.ts +121 -29
  81. package/validators/index.js +1 -1
  82. package/validators/index.js.map +2 -2
  83. package/validators/utils/date/index.js +26 -3
  84. package/validators/utils/date.d.ts +1 -1
  85. package/validators/utils/date.js.map +2 -2
  86. package/validators/utils/datetime/index.js +118 -24
  87. package/validators/utils/datetime.d.ts +1 -1
  88. package/validators/utils/datetime.js.map +2 -2
@@ -1,5 +1,5 @@
1
- import React, { useEffect, useState } from 'react';
2
- import { useWatch } from 'react-hook-form';
1
+ import React, { ComponentRef, useCallback, useEffect, useState } from 'react';
2
+ import { UseFormReturn, useWatch } from 'react-hook-form';
3
3
  import { UncontrolledFieldProps } from '@digigov/form/Field/types';
4
4
  import { Button, ButtonProps } from '@digigov/ui/form/Button';
5
5
  import {
@@ -31,34 +31,72 @@ export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
31
31
  resetFile?: string;
32
32
  };
33
33
  };
34
+ reset: (values?: FileList) => void;
35
+ resetField: UseFormReturn['resetField'];
36
+ onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
34
37
  }
35
38
 
36
- export const FileInput: React.FC<any> = React.forwardRef(function FileInput(
37
- { name, disabled, resetField, extra, control, onChange, ...props },
38
- ref: any
39
+ export const FileInput = React.forwardRef<
40
+ ComponentRef<typeof FileUpload>,
41
+ FileInputProps
42
+ >(function FileInput(
43
+ {
44
+ name,
45
+ disabled,
46
+ resetField,
47
+ extra,
48
+ control,
49
+ onChange,
50
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
51
+ Field,
52
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
53
+ reset,
54
+ ...props
55
+ },
56
+ ref
39
57
  ) {
40
- delete props.Field;
41
- delete props.reset;
42
58
  const { t } = useTranslation();
43
- const value: any = useWatch({ control, name });
59
+ const value: FileList = useWatch({ control, name });
44
60
 
45
- const [files, setFiles] = useState<string[] | undefined>(
46
- Object.values(value || {})?.map?.(({ name }) => name) || []
61
+ const [filenames, setFilenames] = useState<string[] | undefined>(
62
+ Object.values(value || {}).map(({ name }) => name) || []
47
63
  );
64
+
48
65
  useEffect(() => {
49
- setFiles(Object.values(value || {})?.map?.(({ name }) => name));
66
+ setFilenames(Object.values(value || {}).map(({ name }) => name));
50
67
  }, [value]);
51
68
 
69
+ const handleChange = useCallback(
70
+ (event: React.ChangeEvent<HTMLInputElement>) => {
71
+ event.preventDefault();
72
+ const target = event.target;
73
+ if (target.files && target.files.length > 0) {
74
+ setFilenames(Object.values(target.files).map(({ name }) => name));
75
+ }
76
+ onChange(event);
77
+ },
78
+ [onChange]
79
+ );
80
+
81
+ const handleReset = useCallback(
82
+ (event: React.MouseEvent<HTMLButtonElement>) => {
83
+ event.preventDefault();
84
+ resetField(name);
85
+ setFilenames(undefined);
86
+ },
87
+ [name, resetField]
88
+ );
89
+
52
90
  return (
53
91
  <>
54
92
  <FileUploadContainer
55
93
  variant={extra?.containerProps?.variant || 'default'}
56
- hasFiles={files && files.length > 0}
94
+ hasFiles={filenames && filenames.length > 0}
57
95
  >
58
- {files?.length ? (
96
+ {filenames?.length ? (
59
97
  <>
60
98
  <Paragraph>
61
- <b>{t('upload.file')}:</b> {`${files.join(', ')}`}
99
+ <b>{t('upload.file')}:</b> {`${filenames.join(', ')}`}
62
100
  </Paragraph>
63
101
  </>
64
102
  ) : (
@@ -72,38 +110,31 @@ export const FileInput: React.FC<any> = React.forwardRef(function FileInput(
72
110
  )}
73
111
  <FileUpload
74
112
  ref={ref}
75
- hasFiles={!!files?.length}
113
+ hasFiles={!!filenames?.length}
76
114
  name={name}
77
115
  variant={extra?.uploadButtonProps?.variant}
78
116
  disabled={disabled}
79
117
  id={name}
80
- onChange={(event) => {
81
- event.preventDefault();
82
- const target = event?.target as HTMLInputElement;
83
- if (target?.files && target?.files.length > 0) {
84
- setFiles(Object.values(target?.files)?.map?.(({ name }) => name));
85
- }
86
- onChange(event);
87
- }}
118
+ onChange={handleChange}
88
119
  {...{ ...props, required: undefined }}
89
120
  >
90
- {files?.length ? t('upload.change_file') : t('upload.choose_file')}
121
+ {filenames?.length
122
+ ? t('upload.change_file')
123
+ : t('upload.choose_file')}
91
124
  </FileUpload>
92
- {files !== undefined && files?.length > 0 && !extra?.noResetButton && (
93
- <>
94
- <Button
95
- variant={extra?.resetButtonProps?.variant || 'link'}
96
- onClick={(event) => {
97
- event.preventDefault();
98
- resetField(name);
99
- setFiles(undefined);
100
- }}
101
- color={extra?.resetButtonProps?.color || 'secondary'}
102
- >
103
- {t('upload.reset_file')}
104
- </Button>
105
- </>
106
- )}
125
+ {filenames !== undefined &&
126
+ filenames?.length > 0 &&
127
+ !extra?.noResetButton && (
128
+ <>
129
+ <Button
130
+ variant={extra?.resetButtonProps?.variant || 'link'}
131
+ onClick={handleReset}
132
+ color={extra?.resetButtonProps?.color || 'secondary'}
133
+ >
134
+ {t('upload.reset_file')}
135
+ </Button>
136
+ </>
137
+ )}
107
138
  </FileUploadContainer>
108
139
  </>
109
140
  );
package/src/registry.js CHANGED
@@ -45,11 +45,11 @@ import * as _digigov_form_Questions_Step_StepTitle from "@digigov/form/Questions
45
45
  import * as _digigov_form_Questions_Step_getAddMoreFields from "@digigov/form/Questions/Step/getAddMoreFields";
46
46
  import * as _digigov_form_Questions_Step from "@digigov/form/Questions/Step";
47
47
  import * as _digigov_form_Questions_Step_types from "@digigov/form/Questions/Step/types";
48
- import * as _digigov_form_inputs_Checkboxes from "@digigov/form/inputs/Checkboxes";
49
48
  import * as _digigov_form_inputs_AutoCompleteInput from "@digigov/form/inputs/AutoCompleteInput";
49
+ import * as _digigov_form_inputs_Checkboxes from "@digigov/form/inputs/Checkboxes";
50
50
  import * as _digigov_form_inputs_DateInput from "@digigov/form/inputs/DateInput";
51
- import * as _digigov_form_inputs_DateTimeInput from "@digigov/form/inputs/DateTimeInput";
52
51
  import * as _digigov_form_inputs_FileInput from "@digigov/form/inputs/FileInput";
52
+ import * as _digigov_form_inputs_DateTimeInput from "@digigov/form/inputs/DateTimeInput";
53
53
  import * as _digigov_form_inputs_ImageInput from "@digigov/form/inputs/ImageInput";
54
54
  import * as _digigov_form_inputs_Input from "@digigov/form/inputs/Input";
55
55
  import * as _digigov_form_inputs_Label from "@digigov/form/inputs/Label";
@@ -136,11 +136,11 @@ export default {
136
136
  '@digigov/form/Questions/Step/getAddMoreFields': lazyImport(_digigov_form_Questions_Step_getAddMoreFields),
137
137
  '@digigov/form/Questions/Step': lazyImport(_digigov_form_Questions_Step),
138
138
  '@digigov/form/Questions/Step/types': lazyImport(_digigov_form_Questions_Step_types),
139
- '@digigov/form/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
140
139
  '@digigov/form/inputs/AutoCompleteInput': lazyImport(_digigov_form_inputs_AutoCompleteInput),
140
+ '@digigov/form/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
141
141
  '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
142
- '@digigov/form/inputs/DateTimeInput': lazyImport(_digigov_form_inputs_DateTimeInput),
143
142
  '@digigov/form/inputs/FileInput': lazyImport(_digigov_form_inputs_FileInput),
143
+ '@digigov/form/inputs/DateTimeInput': lazyImport(_digigov_form_inputs_DateTimeInput),
144
144
  '@digigov/form/inputs/ImageInput': lazyImport(_digigov_form_inputs_ImageInput),
145
145
  '@digigov/form/inputs/Input': lazyImport(_digigov_form_inputs_Input),
146
146
  '@digigov/form/inputs/Label': lazyImport(_digigov_form_inputs_Label),
@@ -239,5 +239,5 @@ export function useValidationSchema(
239
239
  return useMemo(() => {
240
240
  const yupTypeMap = getYUPTypeMap(validatorRegistry);
241
241
  return getYupObjectShape(fields, yupTypeMap, validatorRegistry);
242
- }, []);
242
+ }, [fields, validatorRegistry]);
243
243
  }
@@ -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) {
@@ -141,7 +141,7 @@ function useValidationSchema(fields, validatorRegistry) {
141
141
  return useMemo(() => {
142
142
  const yupTypeMap = getYUPTypeMap(validatorRegistry);
143
143
  return getYupObjectShape(fields, yupTypeMap, validatorRegistry);
144
- }, []);
144
+ }, [fields, validatorRegistry]);
145
145
  }
146
146
  export {
147
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 AMKA_VALIDATOR,\n FILE_MAX_SIZE_VALIDATOR,\n IBAN_VALIDATOR,\n OTP_VALIDATOR,\n MOBILE_PHONE_VALIDATOR,\n PHONE_NUMBER_VALIDATOR,\n TEXT_LIMIT_VALIDATOR,\n POSTALCODE_VALIDATOR,\n UUID4_VALIDATOR,\n IMAGE_DIMENSION_VALIDATOR,\n DATE_VALIDATOR,\n LATER_THAN_VALIDATOR,\n EARLIER_THAN_VALIDATOR,\n DATETIME_VALIDATOR,\n LATER_THAN_DATETIME_VALIDATOR,\n EARLIER_THAN_DATETIME_VALIDATOR,\n} from '@digigov/form/validators/utils';\nimport { INT_VALIDATOR } from '@digigov/form/validators/utils/int';\nimport { NUMBER_VALIDATOR } from '@digigov/form/validators/utils/number';\n\nexport const getYUPTypeMap = (\n validatorRegistry?: Record<string, any>\n): Record<string, any> => {\n const yupTypeMap = {\n file: (field): MixedSchema => {\n return yup\n .mixed()\n .transform((value) => {\n if (!value || value.length === 0) {\n return null;\n }\n return value;\n })\n .nullable()\n .test(FILE_MAX_SIZE_VALIDATOR(field));\n },\n string: (field): yup.StringSchema => {\n if (field.trim) {\n return yup.string().trim();\n } else {\n return yup.string();\n }\n },\n boolean: (): yup.BooleanSchema<\n boolean | null | undefined,\n AnyObject,\n boolean | null | undefined\n > => {\n return yup\n .boolean()\n .nullable()\n .transform((value) => {\n if (value === '' || typeof value === 'string') return null;\n if (typeof value === 'boolean') return value;\n if (value === 0 || value === 1) return Boolean(value);\n return value;\n });\n },\n object: (\n field\n ):\n | yup.ObjectSchema<any, AnyObject, TypeOfShape<any>, AssertsShape<any>>\n | Lazy<any, unknown> => {\n return getYupObjectShape(field.extra.fields, yupTypeMap);\n },\n array: (\n field\n ):\n | yup.ArraySchema<any, AnyObject, any[] | undefined>\n | RequiredArraySchema<any, AnyObject, any[] | undefined> => {\n if (typeof field.extra.of === 'object') {\n // else if the field is an object then it is a scalar type\n // eg. number, string etc.\n if (field.required) {\n field.extra.min = 1;\n }\n let arrayValidator = yup\n .array()\n .nullable()\n .of(yupTypeMap[field.extra.of.type](field.extra.of));\n if (field.extra.length)\n arrayValidator = arrayValidator.length(field.extra.length, {\n key: 'form.error.array.length',\n context: {\n length: field.extra.length,\n },\n });\n if (field.extra.min)\n arrayValidator = arrayValidator.min(field.extra.min, {\n key: 'form.error.array.min',\n context: {\n min: field.extra.min,\n },\n });\n if (field.extra.max)\n arrayValidator = arrayValidator.max(field.extra.max, {\n key: 'form.error.array.max',\n context: {\n max: field.extra.max,\n },\n });\n return arrayValidator;\n } else if (typeof field.extra.of === 'string') {\n return yup.array().of(yupTypeMap[field.extra.of]());\n } else {\n // in any other case it will be string\n return yup.array().of(yup.string());\n }\n },\n number: (): MixedSchema =>\n yup\n .mixed()\n .transform((_, val) => (val !== '' ? Number(val) : undefined))\n .test(NUMBER_VALIDATOR()),\n int: (): MixedSchema =>\n yup\n .mixed()\n .transform((_, val) => (val !== '' ? Number(val) : undefined))\n .test(NUMBER_VALIDATOR())\n .test(INT_VALIDATOR()),\n email: (field): yup.StringSchema =>\n field.trim\n ? yup.string().trim().email('form.error.email')\n : yup.string().email('form.error.email'),\n afm: (field): yup.StringSchema =>\n field.trim\n ? yup.string().trim().test(AFM_VALIDATOR)\n : yup.string().test(AFM_VALIDATOR),\n amka: (field): yup.StringSchema =>\n field.trim\n ? yup.string().trim().test(AMKA_VALIDATOR)\n : yup.string().test(AMKA_VALIDATOR),\n uuid4: (field): yup.StringSchema =>\n field.trim\n ? yup.string().trim().test(UUID4_VALIDATOR)\n : yup.string().test(UUID4_VALIDATOR),\n iban: (field): yup.StringSchema =>\n field.trim\n ? yup.string().trim().test(IBAN_VALIDATOR(field))\n : yup.string().trim().test(IBAN_VALIDATOR(field)),\n otp: (field): yup.StringSchema =>\n yup.string().trim().test(OTP_VALIDATOR(field)),\n text: (field): yup.StringSchema => {\n if (field?.extra?.limit?.max || !!field?.extra?.limit?.min) {\n return field.trim\n ? yup.string().trim().test(TEXT_LIMIT_VALIDATOR(field))\n : yup.string().test(TEXT_LIMIT_VALIDATOR(field));\n } else {\n return field.trim ? yup.string().trim() : yup.string();\n }\n },\n image: (field): MixedSchema => {\n return yup\n .mixed()\n .transform((value) => {\n if (!value.length || value.length === 0) {\n return null;\n }\n return value;\n })\n .nullable()\n .test(FILE_MAX_SIZE_VALIDATOR(field))\n .test(IMAGE_DIMENSION_VALIDATOR(field));\n },\n postal_code: (field): yup.StringSchema =>\n field.trim\n ? yup.string().trim().test(POSTALCODE_VALIDATOR(field))\n : yup.string().test(POSTALCODE_VALIDATOR(field)),\n mobile_phone: (field): yup.StringSchema =>\n field.trim\n ? yup.string().trim().test(MOBILE_PHONE_VALIDATOR)\n : yup.string().test(MOBILE_PHONE_VALIDATOR),\n phone_number: (field): yup.StringSchema =>\n field.trim\n ? yup.string().trim().test(PHONE_NUMBER_VALIDATOR(field))\n : yup.string().test(PHONE_NUMBER_VALIDATOR(field)),\n 'choice:multiple': (): yup.ArraySchema<\n yup.StringSchema<string | undefined, AnyObject, string | undefined>,\n AnyObject,\n (string | undefined)[] | null | undefined,\n (string | undefined)[] | null | undefined\n > => yup.array().of(yup.string()).nullable(),\n 'choice:single': (): StringSchema<\n string | null | undefined,\n AnyObject,\n string | null | undefined\n > => yup.string().nullable(),\n date: (\n field\n ): yup.StringSchema<\n string | null | undefined,\n AnyObject,\n string | null | undefined\n > => {\n let schema = yup.string().nullable();\n if (field?.extra?.min) {\n schema = schema.test(LATER_THAN_VALIDATOR(field));\n }\n if (field?.extra?.max) {\n schema = schema.test(EARLIER_THAN_VALIDATOR(field));\n } else {\n schema = schema.test(DATE_VALIDATOR);\n }\n return schema;\n },\n datetime: (field): yup.StringSchema => {\n if (field?.extra?.min) {\n return yup.string().test(LATER_THAN_DATETIME_VALIDATOR(field));\n }\n if (field?.extra?.max) {\n return yup.string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));\n }\n return yup.string().test(DATETIME_VALIDATOR);\n },\n ...validatorRegistry,\n };\n return yupTypeMap;\n};\n\nexport interface MutableRefObjectProps {}\n// Create a yup validation schema from given fields input\nexport function useValidationSchema(\n fields: FieldSpec[] | MutableRefObject<MutableRefObjectProps>,\n validatorRegistry?: Record<string, ValidatorSchema[]>\n): Lazy<any, unknown> | AnyObjectSchema | void {\n return useMemo(() => {\n const yupTypeMap = getYUPTypeMap(validatorRegistry);\n return getYupObjectShape(fields, yupTypeMap, validatorRegistry);\n }, []);\n}\n"],
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
  }
@@ -3,11 +3,14 @@ import customParseFormat from "dayjs/plugin/customParseFormat";
3
3
  dayjs.extend(customParseFormat);
4
4
  const VALID_DATE_FORMATS = ["DD/MM/YYYY"];
5
5
  const DATE_CACHE = {};
6
+ const onlyNumbersRegex = /^\d+$/;
6
7
  const getDate = (v) => {
7
8
  return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);
8
9
  };
10
+ const getDaysInMonth = (month, year) => {
11
+ return dayjs(`${year}-${month}-01`).daysInMonth();
12
+ };
9
13
  const checkPartialDate = (value) => {
10
- console.log("value.split('/')", value.split("/"));
11
14
  const [day, month, year] = value.split("/");
12
15
  if (day && !month && !year) {
13
16
  return "form.error.date.invalid_month_year";
@@ -26,9 +29,29 @@ const checkPartialDate = (value) => {
26
29
  }
27
30
  if (!day && month && year) {
28
31
  return "form.error.date.invalid_day";
29
- } else {
30
- return "form.error.date.invalid";
31
32
  }
33
+ if (day && month) {
34
+ const dayNum = parseInt(day);
35
+ const monthNum = parseInt(month);
36
+ const validYear = onlyNumbersRegex.test(year) ? year : void 0;
37
+ if (!validYear || year.length < 4) {
38
+ return "form.error.date.invalid";
39
+ }
40
+ const yearNum = parseInt(validYear);
41
+ const maxDay = getDaysInMonth(monthNum, yearNum);
42
+ if (dayNum < 1 || dayNum > maxDay) {
43
+ return {
44
+ key: "form.error.date.invalid_day_range",
45
+ context: {
46
+ maxDay
47
+ }
48
+ };
49
+ }
50
+ if (monthNum < 1 || monthNum > 12) {
51
+ return "form.error.datetime.invalid_month_range";
52
+ }
53
+ }
54
+ return "form.error.date.invalid";
32
55
  };
33
56
  const LATER_THAN_VALIDATOR = (field) => {
34
57
  let minDate;
@@ -4,6 +4,6 @@ export declare const LATER_THAN_VALIDATOR: (field: FieldSpec) => ValidatorSchema
4
4
  export declare const EARLIER_THAN_VALIDATOR: (field: FieldSpec) => ValidatorSchema;
5
5
  export declare const DATE_VALIDATOR: {
6
6
  name: string;
7
- message: (v: any) => string;
7
+ message: (v: any) => string | object;
8
8
  test: (value: string) => any;
9
9
  };
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/validators/utils/date.ts"],
4
- "sourcesContent": ["import dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport { FieldSpec } from '@digigov/form/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\n\ndayjs.extend(customParseFormat);\n\nconst VALID_DATE_FORMATS = ['DD/MM/YYYY'];\nconst DATE_CACHE = {};\n\nconst getDate = (v: string) => {\n return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);\n};\n\n// Function to check partial date completion\nconst checkPartialDate = (value: string) => {\n console.log(\"value.split('/')\", value.split('/'));\n const [day, month, year] = value.split('/');\n if (day && !month && !year) {\n return 'form.error.date.invalid_month_year';\n }\n if (!day && month && !year) {\n return 'form.error.date.invalid_day_year';\n }\n if (!day && !month && year) {\n return 'form.error.date.invalid_day_month';\n }\n if (day && month && !year) {\n return 'form.error.date.invalid_year';\n }\n if (day && !month && year) {\n return 'form.error.date.invalid_month';\n }\n if (!day && month && year) {\n return 'form.error.date.invalid_day';\n } else {\n return 'form.error.date.invalid';\n }\n};\n\nexport const LATER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {\n let minDate;\n const params = field.extra || {};\n if (params.min === 'now') {\n const today = new Date();\n minDate = new Date(today);\n } else {\n minDate = getDate(params.min).toDate();\n }\n const minPreviousDate = new Date(minDate);\n minPreviousDate.setDate(minDate.getDate() - 1);\n return {\n name: 'later-than',\n message: {\n key: 'form.error.date.later_than',\n context: {\n minDate: minPreviousDate.toLocaleDateString(),\n },\n },\n test: function (value: string) {\n if (!value) return true;\n const date = getDate(value);\n const isValid = +date.toDate() > +minDate;\n return isValid;\n },\n };\n};\n\nexport const EARLIER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {\n let maxDate;\n const params = field.extra || {};\n if (params.max === 'now') {\n const today = new Date();\n maxDate = new Date(today);\n } else {\n maxDate = getDate(params.max).toDate();\n }\n const maxNextDate = new Date(maxDate);\n maxNextDate.setDate(maxDate.getDate() + 1);\n return {\n name: 'earlier-than',\n message: {\n key: 'form.error.date.earlier_than',\n context: {\n maxDate: maxNextDate.toLocaleDateString(),\n },\n },\n test: function (value: string) {\n if (!value) return true;\n const date = getDate(value);\n const isValid = +date.toDate() < +maxDate;\n return isValid;\n },\n };\n};\n\nexport const DATE_VALIDATOR = {\n name: 'date-validator',\n message: (v): string => {\n return checkPartialDate(v.value);\n },\n test: function (value: string) {\n if (!value) return true;\n const date = getDate(value);\n return date.isValid();\n },\n};\n"],
5
- "mappings": "AAAA,OAAO,WAAW;AAClB,OAAO,uBAAuB;AAI9B,MAAM,OAAO,iBAAiB;AAE9B,MAAM,qBAAqB,CAAC,YAAY;AACxC,MAAM,aAAa,CAAC;AAEpB,MAAM,UAAU,CAAC,MAAc;AAC7B,SAAO,WAAW,CAAC,IAAI,WAAW,CAAC,IAAI,MAAM,GAAG,oBAAoB,IAAI;AAC1E;AAGA,MAAM,mBAAmB,CAAC,UAAkB;AAC1C,UAAQ,IAAI,oBAAoB,MAAM,MAAM,GAAG,CAAC;AAChD,QAAM,CAAC,KAAK,OAAO,IAAI,IAAI,MAAM,MAAM,GAAG;AAC1C,MAAI,OAAO,CAAC,SAAS,CAAC,MAAM;AAC1B,WAAO;AAAA,EACT;AACA,MAAI,CAAC,OAAO,SAAS,CAAC,MAAM;AAC1B,WAAO;AAAA,EACT;AACA,MAAI,CAAC,OAAO,CAAC,SAAS,MAAM;AAC1B,WAAO;AAAA,EACT;AACA,MAAI,OAAO,SAAS,CAAC,MAAM;AACzB,WAAO;AAAA,EACT;AACA,MAAI,OAAO,CAAC,SAAS,MAAM;AACzB,WAAO;AAAA,EACT;AACA,MAAI,CAAC,OAAO,SAAS,MAAM;AACzB,WAAO;AAAA,EACT,OAAO;AACL,WAAO;AAAA,EACT;AACF;AAEO,MAAM,uBAAuB,CAAC,UAAsC;AACzE,MAAI;AACJ,QAAM,SAAS,MAAM,SAAS,CAAC;AAC/B,MAAI,OAAO,QAAQ,OAAO;AACxB,UAAM,QAAQ,oBAAI,KAAK;AACvB,cAAU,IAAI,KAAK,KAAK;AAAA,EAC1B,OAAO;AACL,cAAU,QAAQ,OAAO,GAAG,EAAE,OAAO;AAAA,EACvC;AACA,QAAM,kBAAkB,IAAI,KAAK,OAAO;AACxC,kBAAgB,QAAQ,QAAQ,QAAQ,IAAI,CAAC;AAC7C,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,MACP,KAAK;AAAA,MACL,SAAS;AAAA,QACP,SAAS,gBAAgB,mBAAmB;AAAA,MAC9C;AAAA,IACF;AAAA,IACA,MAAM,SAAU,OAAe;AAC7B,UAAI,CAAC,MAAO,QAAO;AACnB,YAAM,OAAO,QAAQ,KAAK;AAC1B,YAAM,UAAU,CAAC,KAAK,OAAO,IAAI,CAAC;AAClC,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEO,MAAM,yBAAyB,CAAC,UAAsC;AAC3E,MAAI;AACJ,QAAM,SAAS,MAAM,SAAS,CAAC;AAC/B,MAAI,OAAO,QAAQ,OAAO;AACxB,UAAM,QAAQ,oBAAI,KAAK;AACvB,cAAU,IAAI,KAAK,KAAK;AAAA,EAC1B,OAAO;AACL,cAAU,QAAQ,OAAO,GAAG,EAAE,OAAO;AAAA,EACvC;AACA,QAAM,cAAc,IAAI,KAAK,OAAO;AACpC,cAAY,QAAQ,QAAQ,QAAQ,IAAI,CAAC;AACzC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,MACP,KAAK;AAAA,MACL,SAAS;AAAA,QACP,SAAS,YAAY,mBAAmB;AAAA,MAC1C;AAAA,IACF;AAAA,IACA,MAAM,SAAU,OAAe;AAC7B,UAAI,CAAC,MAAO,QAAO;AACnB,YAAM,OAAO,QAAQ,KAAK;AAC1B,YAAM,UAAU,CAAC,KAAK,OAAO,IAAI,CAAC;AAClC,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEO,MAAM,iBAAiB;AAAA,EAC5B,MAAM;AAAA,EACN,SAAS,CAAC,MAAc;AACtB,WAAO,iBAAiB,EAAE,KAAK;AAAA,EACjC;AAAA,EACA,MAAM,SAAU,OAAe;AAC7B,QAAI,CAAC,MAAO,QAAO;AACnB,UAAM,OAAO,QAAQ,KAAK;AAC1B,WAAO,KAAK,QAAQ;AAAA,EACtB;AACF;",
4
+ "sourcesContent": ["import dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport { FieldSpec } from '@digigov/form/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\n\ndayjs.extend(customParseFormat);\n\nconst VALID_DATE_FORMATS = ['DD/MM/YYYY'];\nconst DATE_CACHE = {};\nconst onlyNumbersRegex = /^\\d+$/;\n\nconst getDate = (v: string) => {\n return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);\n};\n\nconst getDaysInMonth = (month: number, year: number): number => {\n return dayjs(`${year}-${month}-01`).daysInMonth(); // e.g. 29 for Feb 2024\n};\n\n// Function to check partial date completion\nconst checkPartialDate = (value: string) => {\n const [day, month, year] = value.split('/');\n if (day && !month && !year) {\n return 'form.error.date.invalid_month_year';\n }\n if (!day && month && !year) {\n return 'form.error.date.invalid_day_year';\n }\n if (!day && !month && year) {\n return 'form.error.date.invalid_day_month';\n }\n if (day && month && !year) {\n return 'form.error.date.invalid_year';\n }\n if (day && !month && year) {\n return 'form.error.date.invalid_month';\n }\n if (!day && month && year) {\n return 'form.error.date.invalid_day';\n }\n if (day && month) {\n const dayNum = parseInt(day);\n const monthNum = parseInt(month);\n const validYear = onlyNumbersRegex.test(year) ? year : undefined;\n if (!validYear || year.length < 4) {\n return 'form.error.date.invalid';\n }\n const yearNum = parseInt(validYear);\n const maxDay = getDaysInMonth(monthNum, yearNum);\n if (dayNum < 1 || dayNum > maxDay) {\n return {\n key: 'form.error.date.invalid_day_range',\n context: {\n maxDay: maxDay,\n },\n };\n }\n if (monthNum < 1 || monthNum > 12) {\n return 'form.error.datetime.invalid_month_range';\n }\n }\n return 'form.error.date.invalid';\n};\n\nexport const LATER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {\n let minDate;\n const params = field.extra || {};\n if (params.min === 'now') {\n const today = new Date();\n minDate = new Date(today);\n } else {\n minDate = getDate(params.min).toDate();\n }\n const minPreviousDate = new Date(minDate);\n minPreviousDate.setDate(minDate.getDate() - 1);\n return {\n name: 'later-than',\n message: {\n key: 'form.error.date.later_than',\n context: {\n minDate: minPreviousDate.toLocaleDateString(),\n },\n },\n test: function (value: string) {\n if (!value) return true;\n const date = getDate(value);\n const isValid = +date.toDate() > +minDate;\n return isValid;\n },\n };\n};\n\nexport const EARLIER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {\n let maxDate;\n const params = field.extra || {};\n if (params.max === 'now') {\n const today = new Date();\n maxDate = new Date(today);\n } else {\n maxDate = getDate(params.max).toDate();\n }\n const maxNextDate = new Date(maxDate);\n maxNextDate.setDate(maxDate.getDate() + 1);\n return {\n name: 'earlier-than',\n message: {\n key: 'form.error.date.earlier_than',\n context: {\n maxDate: maxNextDate.toLocaleDateString(),\n },\n },\n test: function (value: string) {\n if (!value) return true;\n const date = getDate(value);\n const isValid = +date.toDate() < +maxDate;\n return isValid;\n },\n };\n};\n\nexport const DATE_VALIDATOR = {\n name: 'date-validator',\n message: (v): string | object => {\n return checkPartialDate(v.value);\n },\n test: function (value: string) {\n if (!value) return true;\n const date = getDate(value);\n return date.isValid();\n },\n};\n"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }