@newskit-render/validation 0.0.0-84baf4c1e → 0.0.0-89db4c385
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.d.ts +8 -3
- package/dist/cjs/types.js +8 -3
- package/dist/cjs/types.js.map +1 -1
- package/dist/cjs/utils.d.ts +35 -11
- package/dist/cjs/utils.js +94 -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 +44 -12
- package/dist/cjs/validations/accountInfo.js +64 -53
- 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/cancelSubscription.d.ts +7 -0
- package/dist/cjs/validations/cancelSubscription.js +32 -0
- package/dist/cjs/validations/cancelSubscription.js.map +1 -0
- 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/index.d.ts +1 -0
- package/dist/cjs/validations/index.js +1 -0
- package/dist/cjs/validations/index.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/types.d.ts +8 -3
- package/dist/esm/types.js +6 -1
- package/dist/esm/types.js.map +1 -1
- package/dist/esm/utils.d.ts +35 -11
- package/dist/esm/utils.js +93 -86
- 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 +44 -12
- package/dist/esm/validations/accountInfo.js +62 -53
- 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/cancelSubscription.d.ts +7 -0
- package/dist/esm/validations/cancelSubscription.js +6 -0
- package/dist/esm/validations/cancelSubscription.js.map +1 -0
- 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/index.d.ts +1 -0
- package/dist/esm/validations/index.js +1 -0
- package/dist/esm/validations/index.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 +3 -3
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-89db4c385",
|
|
4
4
|
"description": "Newskit Render",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -51,13 +51,13 @@
|
|
|
51
51
|
"jest": "29.7.0",
|
|
52
52
|
"jest-environment-jsdom": "29.7.0",
|
|
53
53
|
"jest-junit": "15.0.0",
|
|
54
|
-
"next": "13.
|
|
54
|
+
"next": "13.5.10",
|
|
55
55
|
"preact": "10.11.3",
|
|
56
56
|
"prettier": "2.8.1",
|
|
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",
|