@@ -27,9 +27,10 @@ export interface GetArrayValidatorParams extends CommonValidatorParams {
2727export const getArrayValidator = ( params : GetArrayValidatorParams = { } ) => {
2828 const { ignoreRequiredCheck, ignoreMaxLengthCheck, ignoreMinLengthCheck, customErrorMessages} =
2929 params ;
30- const errorMessages = { ...ErrorMessages , ...customErrorMessages } ;
3130
3231 return ( spec : ArraySpec , value ?: ArrayValue ) => {
32+ const errorMessages = { ...ErrorMessages , ...customErrorMessages } ;
33+
3334 const valueLength = value ?. length || 0 ;
3435
3536 if ( ! ignoreRequiredCheck && spec . required && ! _ . isArray ( value ) ) {
@@ -60,9 +61,10 @@ export interface GetBooleanValidatorParams extends CommonValidatorParams {}
6061
6162export const getBooleanValidator = ( params : GetBooleanValidatorParams = { } ) => {
6263 const { ignoreRequiredCheck, customErrorMessages} = params ;
63- const errorMessages = { ...ErrorMessages , ...customErrorMessages } ;
6464
6565 return ( spec : BooleanSpec , value ?: boolean ) => {
66+ const errorMessages = { ...ErrorMessages , ...customErrorMessages } ;
67+
6668 if ( ! ignoreRequiredCheck && spec . required && ! value ) {
6769 return errorMessages . REQUIRED ;
6870 }
@@ -95,10 +97,11 @@ export const getNumberValidator = (params: GetNumberValidatorParams = {}) => {
9597 ignoreZeroStart,
9698 customErrorMessages,
9799 } = params ;
98- const errorMessages = { ...ErrorMessages , ...customErrorMessages } ;
99100
100101 // eslint-disable-next-line complexity
101102 return ( spec : NumberSpec , value : string | number = '' ) => {
103+ const errorMessages = { ...ErrorMessages , ...customErrorMessages } ;
104+
102105 const stringValue = String ( value ) ;
103106
104107 if ( ! ignoreRequiredCheck && spec . required && ! stringValue . length ) {
@@ -165,9 +168,10 @@ export interface GetObjectValidatorParams extends CommonValidatorParams {}
165168
166169export const getObjectValidator = ( params : GetObjectValidatorParams = { } ) => {
167170 const { ignoreRequiredCheck, customErrorMessages} = params ;
168- const errorMessages = { ...ErrorMessages , ...customErrorMessages } ;
169171
170172 return ( spec : ObjectSpec , value ?: ObjectValue ) => {
173+ const errorMessages = { ...ErrorMessages , ...customErrorMessages } ;
174+
171175 if ( ! ignoreRequiredCheck && spec . required && ! value ) {
172176 return errorMessages . REQUIRED ;
173177 }
@@ -194,10 +198,11 @@ export const getStringValidator = (params: GetStringValidatorParams = {}) => {
194198 ignoreRegExpCheck,
195199 customErrorMessages,
196200 } = params ;
197- const errorMessages = { ...ErrorMessages , ...customErrorMessages } ;
198201
199202 // eslint-disable-next-line complexity
200203 return ( spec : StringSpec , value = '' ) => {
204+ const errorMessages = { ...ErrorMessages , ...customErrorMessages } ;
205+
201206 const valueLength = value ?. length ;
202207
203208 if ( ! ignoreRequiredCheck && spec . required && ! valueLength ) {
0 commit comments