@newskit-render/validation 0.0.0-7aee3c884 → 0.0.0-800a29f98
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.
- package/dist/cjs/__tests__/mocks.js +31 -0
- package/dist/cjs/__tests__/mocks.js.map +1 -1
- package/dist/cjs/index.js +1 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/types.js +2 -2
- package/dist/cjs/types.js.map +1 -1
- package/dist/cjs/utils.d.ts +14 -7
- package/dist/cjs/utils.js +86 -87
- package/dist/cjs/utils.js.map +1 -1
- package/dist/cjs/validation.d.ts +2 -2
- package/dist/cjs/validation.js +4 -16
- package/dist/cjs/validation.js.map +1 -1
- package/dist/cjs/validations/accountDeletion.js +1 -1
- package/dist/cjs/validations/accountDeletion.js.map +1 -1
- package/dist/cjs/validations/accountInfo.d.ts +20 -11
- package/dist/cjs/validations/accountInfo.js +51 -66
- package/dist/cjs/validations/accountInfo.js.map +1 -1
- package/dist/cjs/validations/address.js +60 -66
- package/dist/cjs/validations/address.js.map +1 -1
- package/dist/cjs/validations/cancellation.js +13 -16
- package/dist/cjs/validations/cancellation.js.map +1 -1
- package/dist/cjs/validations/holidayStop.js +1 -1
- package/dist/cjs/validations/holidayStop.js.map +1 -1
- package/dist/cjs/validations/payment.js +1 -1
- package/dist/cjs/validations/payment.js.map +1 -1
- package/dist/cjs/validations/phoneNumber.js +21 -27
- package/dist/cjs/validations/phoneNumber.js.map +1 -1
- package/dist/cjs/yupPhone.js +16 -20
- package/dist/cjs/yupPhone.js.map +1 -1
- package/dist/esm/__tests__/mocks.js +33 -2
- package/dist/esm/__tests__/mocks.js.map +1 -1
- package/dist/esm/utils.d.ts +14 -7
- package/dist/esm/utils.js +84 -85
- package/dist/esm/utils.js.map +1 -1
- package/dist/esm/validation.d.ts +2 -2
- package/dist/esm/validation.js +3 -15
- package/dist/esm/validation.js.map +1 -1
- package/dist/esm/validations/accountDeletion.js +1 -1
- package/dist/esm/validations/accountDeletion.js.map +1 -1
- package/dist/esm/validations/accountInfo.d.ts +20 -11
- package/dist/esm/validations/accountInfo.js +51 -66
- package/dist/esm/validations/accountInfo.js.map +1 -1
- package/dist/esm/validations/address.js +59 -65
- package/dist/esm/validations/address.js.map +1 -1
- package/dist/esm/validations/cancellation.js +12 -15
- package/dist/esm/validations/cancellation.js.map +1 -1
- package/dist/esm/validations/holidayStop.js +3 -3
- package/dist/esm/validations/holidayStop.js.map +1 -1
- package/dist/esm/validations/payment.js +2 -2
- package/dist/esm/validations/payment.js.map +1 -1
- package/dist/esm/validations/phoneNumber.js +19 -25
- package/dist/esm/validations/phoneNumber.js.map +1 -1
- package/dist/esm/yupPhone.js +14 -18
- package/dist/esm/yupPhone.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,70 +1,64 @@
|
|
|
1
1
|
import { ValidationFieldNames } from '../types';
|
|
2
2
|
import * as yup from 'yup';
|
|
3
3
|
// Reference: https://stackoverflow.com/a/70273329
|
|
4
|
-
|
|
5
|
-
export
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
requiredMessage: requiredMessage,
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
isPhone: false,
|
|
63
|
-
excludeEmptyString: true,
|
|
64
|
-
}),
|
|
65
|
-
});
|
|
66
|
-
};
|
|
67
|
-
export var deliveryInstructions = yup.object({
|
|
4
|
+
const addressRegex = /^['/&#.\d\p{Letter}\p{Mark}\s,-]+$/u;
|
|
5
|
+
export const postcodeValidation = ({ getFieldValidation, requiredMessage, wrongFormatMessage, }) => yup.object({
|
|
6
|
+
postcode: getFieldValidation({
|
|
7
|
+
validationFieldName: ValidationFieldNames.postcode,
|
|
8
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Postcode'),
|
|
9
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'postcode'),
|
|
10
|
+
addressRegex,
|
|
11
|
+
}),
|
|
12
|
+
});
|
|
13
|
+
export const addressValidation = ({ getFieldValidation, requiredMessage, wrongFormatMessage, }) => postcodeValidation({
|
|
14
|
+
getFieldValidation,
|
|
15
|
+
requiredMessage,
|
|
16
|
+
wrongFormatMessage,
|
|
17
|
+
}).shape({
|
|
18
|
+
country: getFieldValidation({
|
|
19
|
+
validationFieldName: ValidationFieldNames.country,
|
|
20
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Country'),
|
|
21
|
+
formatMessage: 'This is not a valid Country code',
|
|
22
|
+
regex: /^[A-Z]{2,3}$/,
|
|
23
|
+
}),
|
|
24
|
+
line1: getFieldValidation({
|
|
25
|
+
validationFieldName: ValidationFieldNames.line1,
|
|
26
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'first line of your address'),
|
|
27
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'address'),
|
|
28
|
+
regex: addressRegex,
|
|
29
|
+
}),
|
|
30
|
+
line2: getFieldValidation({
|
|
31
|
+
validationFieldName: ValidationFieldNames.line2,
|
|
32
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'second line of your address'),
|
|
33
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'address'),
|
|
34
|
+
regex: addressRegex,
|
|
35
|
+
isPhone: false,
|
|
36
|
+
excludeEmptyString: true,
|
|
37
|
+
}),
|
|
38
|
+
line3: getFieldValidation({
|
|
39
|
+
validationFieldName: ValidationFieldNames.line2,
|
|
40
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'third line of your address'),
|
|
41
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'address'),
|
|
42
|
+
regex: addressRegex,
|
|
43
|
+
isPhone: false,
|
|
44
|
+
excludeEmptyString: true,
|
|
45
|
+
}),
|
|
46
|
+
city: getFieldValidation({
|
|
47
|
+
validationFieldName: ValidationFieldNames.city,
|
|
48
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Town/City'),
|
|
49
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'town/city'),
|
|
50
|
+
regex: addressRegex,
|
|
51
|
+
}),
|
|
52
|
+
county: getFieldValidation({
|
|
53
|
+
validationFieldName: ValidationFieldNames.county,
|
|
54
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'County'),
|
|
55
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'county'),
|
|
56
|
+
regex: addressRegex,
|
|
57
|
+
isPhone: false,
|
|
58
|
+
excludeEmptyString: true,
|
|
59
|
+
}),
|
|
60
|
+
});
|
|
61
|
+
export const deliveryInstructions = yup.object({
|
|
68
62
|
deliveryInformation: yup
|
|
69
63
|
.string()
|
|
70
64
|
.required('Please, select one option')
|
|
@@ -73,7 +67,7 @@ export var deliveryInstructions = yup.object({
|
|
|
73
67
|
other: yup
|
|
74
68
|
.string()
|
|
75
69
|
.when('deliveryInformation', {
|
|
76
|
-
is:
|
|
70
|
+
is: (val) => val === 'Other (Please state)',
|
|
77
71
|
then: yup.string().required('Please enter your delivery instructions.'),
|
|
78
72
|
otherwise: yup.string().notRequired(),
|
|
79
73
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"address.js","sourceRoot":"","sources":["../../../src/validations/address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,kDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"address.js","sourceRoot":"","sources":["../../../src/validations/address.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,21 @@
|
|
|
1
1
|
import { ValidationFieldNames } from '../types';
|
|
2
2
|
import * as yup from 'yup';
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
export
|
|
3
|
+
const extraInfoRegex = /^[&!?#'.:0-9a-zA-Z\s]+$/;
|
|
4
|
+
const extraInfoMessage = "Sorry there are some charaters we don't allow in this field";
|
|
5
|
+
export const cancellationReason = yup.object({
|
|
6
6
|
radioInput: yup.string().required('Please, select one option').nullable(),
|
|
7
7
|
other: yup.string().when('radioInput', {
|
|
8
|
-
is:
|
|
8
|
+
is: (val) => val === 'Other',
|
|
9
9
|
then: yup.string().required('This field cannot be empty.'),
|
|
10
10
|
otherwise: yup.string().notRequired(),
|
|
11
11
|
}),
|
|
12
12
|
});
|
|
13
|
-
export
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
}),
|
|
22
|
-
});
|
|
23
|
-
};
|
|
13
|
+
export const confirmCancellation = ({ getFieldValidation }) => yup.object({
|
|
14
|
+
cancellationReason: getFieldValidation({
|
|
15
|
+
validationFieldName: ValidationFieldNames.cancellationReason,
|
|
16
|
+
requiredMessage: 'This field cannot be empty.',
|
|
17
|
+
formatMesage: extraInfoMessage,
|
|
18
|
+
extraInfoRegex: extraInfoRegex,
|
|
19
|
+
}),
|
|
20
|
+
});
|
|
24
21
|
//# sourceMappingURL=cancellation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancellation.js","sourceRoot":"","sources":["../../../src/validations/cancellation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,
|
|
1
|
+
{"version":3,"file":"cancellation.js","sourceRoot":"","sources":["../../../src/validations/cancellation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,MAAM,cAAc,GAAG,yBAAyB,CAAA;AAChD,MAAM,gBAAgB,GACpB,6DAA6D,CAAA;AAE/D,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAC;IAC3C,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,QAAQ,EAAE;IACzE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE;QACrC,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,OAAO;QAC5B,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,6BAA6B,CAAC;QAC1D,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE;KACtC,CAAC;CACH,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAC5D,GAAG,CAAC,MAAM,CAAC;IACT,kBAAkB,EAAE,kBAAkB,CAAC;QACrC,mBAAmB,EAAE,oBAAoB,CAAC,kBAAkB;QAC5D,eAAe,EAAE,6BAA6B;QAC9C,YAAY,EAAE,gBAAgB;QAC9B,cAAc,EAAE,cAAc;KAC/B,CAAC;CACH,CAAC,CAAA"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import * as yup from 'yup';
|
|
2
|
-
export
|
|
2
|
+
export const holidayStopValidation = yup.object({
|
|
3
3
|
startDate: yup.date().required('StartDate is required'),
|
|
4
4
|
endDate: yup
|
|
5
5
|
.date()
|
|
6
6
|
.required('EndDate is required')
|
|
7
7
|
.min(yup.ref('startDate'), "End date can't be before start date"),
|
|
8
8
|
});
|
|
9
|
-
export
|
|
9
|
+
export const vouchersValidation = yup.object({
|
|
10
10
|
code: yup.string().required('need a subscription id'),
|
|
11
11
|
});
|
|
12
|
-
export
|
|
12
|
+
export const deleteUserHolidayStopValidation = yup.object({
|
|
13
13
|
id: yup.string().required('Holiday stop Id is required'),
|
|
14
14
|
});
|
|
15
15
|
//# sourceMappingURL=holidayStop.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"holidayStop.js","sourceRoot":"","sources":["../../../src/validations/holidayStop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"holidayStop.js","sourceRoot":"","sources":["../../../src/validations/holidayStop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,CAAC,MAAM,CAAC;IAC9C,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC;IACvD,OAAO,EAAE,GAAG;SACT,IAAI,EAAE;SACN,QAAQ,CAAC,qBAAqB,CAAC;SAC/B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,qCAAqC,CAAC;CACpE,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAC;IAC3C,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC;CACtD,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAAG,CAAC,MAAM,CAAC;IACxD,EAAE,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,6BAA6B,CAAC;CACzD,CAAC,CAAA"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import * as yup from 'yup';
|
|
2
2
|
//Payment cannot be not required
|
|
3
|
-
export
|
|
3
|
+
export const paymentMethodIdValidation = yup.object({
|
|
4
4
|
paymentMethodId: yup.string().required(),
|
|
5
5
|
});
|
|
6
|
-
export
|
|
6
|
+
export const zuoraPaymentMethodValidation = yup.object({
|
|
7
7
|
refId: yup.string().required(),
|
|
8
8
|
responseSignature: yup.string().required(),
|
|
9
9
|
token: yup.string().required(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../src/validations/payment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,gCAAgC;AAChC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../src/validations/payment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,gCAAgC;AAChC,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,CAAC,MAAM,CAAC;IAClD,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACzC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,CAAC,MAAM,CAAC;IACrD,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1C,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,EAAE,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAA"}
|
|
@@ -1,28 +1,22 @@
|
|
|
1
1
|
import { ValidationFieldNames } from '../types';
|
|
2
2
|
import * as yup from 'yup';
|
|
3
|
-
|
|
4
|
-
export
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
isPhone: true,
|
|
23
|
-
formatMessage: phoneMessage,
|
|
24
|
-
excludeEmptyString: true,
|
|
25
|
-
}),
|
|
26
|
-
});
|
|
27
|
-
};
|
|
3
|
+
const phoneMessage = 'That doesn’t look like a valid phone number. Please try again.';
|
|
4
|
+
export const phoneNumberValidation = ({ getFieldValidation, requiredMessage, }) => yup.object().shape({
|
|
5
|
+
phoneNumber: getFieldValidation({
|
|
6
|
+
validationFieldName: ValidationFieldNames.phoneNumber,
|
|
7
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'landline number'),
|
|
8
|
+
isPhone: true,
|
|
9
|
+
formatMessage: phoneMessage,
|
|
10
|
+
excludeEmptyString: true,
|
|
11
|
+
}),
|
|
12
|
+
});
|
|
13
|
+
export const mobileValidation = ({ getFieldValidation, requiredMessage }) => yup.object().shape({
|
|
14
|
+
mobile: getFieldValidation({
|
|
15
|
+
validationFieldName: ValidationFieldNames.mobile,
|
|
16
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'mobile number'),
|
|
17
|
+
isPhone: true,
|
|
18
|
+
formatMessage: phoneMessage,
|
|
19
|
+
excludeEmptyString: true,
|
|
20
|
+
}),
|
|
21
|
+
});
|
|
28
22
|
//# sourceMappingURL=phoneNumber.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phoneNumber.js","sourceRoot":"","sources":["../../../src/validations/phoneNumber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,
|
|
1
|
+
{"version":3,"file":"phoneNumber.js","sourceRoot":"","sources":["../../../src/validations/phoneNumber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,MAAM,YAAY,GAChB,gEAAgE,CAAA;AAElE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,EACpC,kBAAkB,EAClB,eAAe,GAChB,EAAE,EAAE,CACH,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;IACjB,WAAW,EAAE,kBAAkB,CAAC;QAC9B,mBAAmB,EAAE,oBAAoB,CAAC,WAAW;QACrD,eAAe,EAAE,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,OAAO,CAAC,UAAU,EAAE,iBAAiB,CAAC;QACxE,OAAO,EAAE,IAAI;QACb,aAAa,EAAE,YAAY;QAC3B,kBAAkB,EAAE,IAAI;KACzB,CAAC;CACH,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAAE,kBAAkB,EAAE,eAAe,EAAE,EAAE,EAAE,CAC1E,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;IACjB,MAAM,EAAE,kBAAkB,CAAC;QACzB,mBAAmB,EAAE,oBAAoB,CAAC,MAAM;QAChD,eAAe,EAAE,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,OAAO,CAAC,UAAU,EAAE,eAAe,CAAC;QACtE,OAAO,EAAE,IAAI;QACb,aAAa,EAAE,YAAY;QAC3B,kBAAkB,EAAE,IAAI;KACzB,CAAC;CACH,CAAC,CAAA"}
|
package/dist/esm/yupPhone.js
CHANGED
|
@@ -1,39 +1,35 @@
|
|
|
1
1
|
import * as Yup from 'yup';
|
|
2
2
|
import gPhoneNumber from 'google-libphonenumber';
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
};
|
|
10
|
-
var isValid10DigitUKPhoneNumber = function (number) {
|
|
3
|
+
const phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
|
|
4
|
+
const YUP_PHONE_METHOD = 'phone';
|
|
5
|
+
const CLDR_REGION_CODE_SIZE = 2;
|
|
6
|
+
const isValidCountryCode = (countryCode) => typeof countryCode === 'string' &&
|
|
7
|
+
countryCode.length === CLDR_REGION_CODE_SIZE;
|
|
8
|
+
const isValid10DigitUKPhoneNumber = (number) => {
|
|
11
9
|
var _a;
|
|
12
|
-
|
|
10
|
+
const countryCode = `+${number.getCountryCode()}`;
|
|
13
11
|
return (countryCode === '+44' &&
|
|
14
|
-
|
|
12
|
+
`0${(_a = number.getRawInput()) === null || _a === void 0 ? void 0 : _a.replace(countryCode, '')}`.length === 10);
|
|
15
13
|
};
|
|
16
|
-
Yup.addMethod(Yup.string, YUP_PHONE_METHOD, function yupPhone(countryCode, strict, errorMessage) {
|
|
17
|
-
|
|
18
|
-
if (errorMessage === void 0) { errorMessage = ''; }
|
|
19
|
-
var errMsg = typeof errorMessage === 'string' && errorMessage
|
|
14
|
+
Yup.addMethod(Yup.string, YUP_PHONE_METHOD, function yupPhone(countryCode, strict = false, errorMessage = '') {
|
|
15
|
+
const errMsg = typeof errorMessage === 'string' && errorMessage
|
|
20
16
|
? errorMessage
|
|
21
17
|
: isValidCountryCode(countryCode)
|
|
22
|
-
?
|
|
18
|
+
? `\${path} must be a valid phone number for region ${countryCode}`
|
|
23
19
|
: '${path} must be a valid phone number.';
|
|
24
20
|
// @ts-ignore
|
|
25
|
-
return this.test(YUP_PHONE_METHOD, errMsg,
|
|
21
|
+
return this.test(YUP_PHONE_METHOD, errMsg, (value) => {
|
|
26
22
|
if (!isValidCountryCode(countryCode)) {
|
|
27
23
|
// if not valid countryCode, then set default country to Great Britain (GB)
|
|
28
24
|
countryCode = 'GB';
|
|
29
25
|
strict = false;
|
|
30
26
|
}
|
|
31
27
|
try {
|
|
32
|
-
|
|
28
|
+
const phoneNumber = phoneUtil.parseAndKeepRawInput(value, countryCode);
|
|
33
29
|
if (!phoneUtil.isPossibleNumber(phoneNumber)) {
|
|
34
30
|
return false;
|
|
35
31
|
}
|
|
36
|
-
|
|
32
|
+
const regionCodeFromPhoneNumber = phoneUtil.getRegionCodeForNumber(phoneNumber);
|
|
37
33
|
/** check if the countryCode provided should be used as
|
|
38
34
|
* default country code or strictly followed, if both checks fail
|
|
39
35
|
* it checks if it's valid 10 digit UK number
|
package/dist/esm/yupPhone.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yupPhone.js","sourceRoot":"","sources":["../../src/yupPhone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,YAAY,MAAM,uBAAuB,CAAA;AAEhD,
|
|
1
|
+
{"version":3,"file":"yupPhone.js","sourceRoot":"","sources":["../../src/yupPhone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,YAAY,MAAM,uBAAuB,CAAA;AAEhD,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,CAAC,WAAW,EAAE,CAAA;AAmB5D,MAAM,gBAAgB,GAAG,OAAO,CAAA;AAChC,MAAM,qBAAqB,GAAG,CAAC,CAAA;AAE/B,MAAM,kBAAkB,GAAG,CAAC,WAA+B,EAAW,EAAE,CACtE,OAAO,WAAW,KAAK,QAAQ;IAC/B,WAAW,CAAC,MAAM,KAAK,qBAAqB,CAAA;AAE9C,MAAM,2BAA2B,GAAG,CAAC,MAAgC,EAAE,EAAE;;IACvE,MAAM,WAAW,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,EAAE,CAAA;IAEjD,OAAO,CACL,WAAW,KAAK,KAAK;QACrB,IAAI,MAAA,MAAM,CAAC,WAAW,EAAE,0CAAE,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,EAAE,CACnE,CAAA;AACH,CAAC,CAAA;AAED,GAAG,CAAC,SAAS,CACX,GAAG,CAAC,MAAM,EACV,gBAAgB,EAChB,SAAS,QAAQ,CAAC,WAAoB,EAAE,MAAM,GAAG,KAAK,EAAE,YAAY,GAAG,EAAE;IACvE,MAAM,MAAM,GACV,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY;QAC9C,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC;YACjC,CAAC,CAAC,oDAAoD,WAAW,EAAE;YACnE,CAAC,CAAC,uCAAuC,CAAA;IAC7C,aAAa;IACb,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;QAC3D,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;YACrC,2EAA2E;YAC3E,WAAW,GAAG,IAAI,CAAA;YAClB,MAAM,GAAG,KAAK,CAAA;QAChB,CAAC;QAED,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,SAAS,CAAC,oBAAoB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;YAEtE,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC7C,OAAO,KAAK,CAAA;YACd,CAAC;YAED,MAAM,yBAAyB,GAC7B,SAAS,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAA;YAE/C;;;eAGG;YACH,OAAO,CACL,CAAC,MAAM;gBACL,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,WAAW,EAAE,WAAW,CAAC;gBAC5D,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAC9B,WAAW,EACX,yBAAyB,CAC1B,CAAC,IAAI,2BAA2B,CAAC,WAAW,CAAC,CACnD,CAAA;QACH,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CACF,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@newskit-render/validation",
|
|
3
|
-
"version": "0.0.0-
|
|
3
|
+
"version": "0.0.0-800a29f98",
|
|
4
4
|
"description": "Newskit Render",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"react": "18.2.0",
|
|
58
58
|
"react-dom": "18.2.0",
|
|
59
59
|
"ts-jest": "29.1.1",
|
|
60
|
-
"typescript": "
|
|
60
|
+
"typescript": "5.6.3"
|
|
61
61
|
},
|
|
62
62
|
"peerDependencies": {
|
|
63
63
|
"react": ">= 17.0.2 <= 18.2.0",
|