@newskit-render/validation 0.0.0-13f98ebc0 → 0.0.0-5038176a6

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 (53) hide show
  1. package/dist/cjs/__tests__/mocks.js +3 -3
  2. package/dist/cjs/__tests__/mocks.js.map +1 -1
  3. package/dist/cjs/index.js +1 -1
  4. package/dist/cjs/index.js.map +1 -1
  5. package/dist/cjs/types.js +2 -2
  6. package/dist/cjs/types.js.map +1 -1
  7. package/dist/cjs/utils.js +86 -89
  8. package/dist/cjs/utils.js.map +1 -1
  9. package/dist/cjs/validation.d.ts +2 -2
  10. package/dist/cjs/validation.js +4 -16
  11. package/dist/cjs/validation.js.map +1 -1
  12. package/dist/cjs/validations/accountDeletion.js +1 -1
  13. package/dist/cjs/validations/accountDeletion.js.map +1 -1
  14. package/dist/cjs/validations/accountInfo.d.ts +4 -2
  15. package/dist/cjs/validations/accountInfo.js +47 -53
  16. package/dist/cjs/validations/accountInfo.js.map +1 -1
  17. package/dist/cjs/validations/address.js +60 -66
  18. package/dist/cjs/validations/address.js.map +1 -1
  19. package/dist/cjs/validations/cancellation.js +13 -16
  20. package/dist/cjs/validations/cancellation.js.map +1 -1
  21. package/dist/cjs/validations/holidayStop.js +1 -1
  22. package/dist/cjs/validations/holidayStop.js.map +1 -1
  23. package/dist/cjs/validations/payment.js +1 -1
  24. package/dist/cjs/validations/payment.js.map +1 -1
  25. package/dist/cjs/validations/phoneNumber.js +21 -27
  26. package/dist/cjs/validations/phoneNumber.js.map +1 -1
  27. package/dist/cjs/yupPhone.js +16 -20
  28. package/dist/cjs/yupPhone.js.map +1 -1
  29. package/dist/esm/__tests__/mocks.js +5 -5
  30. package/dist/esm/__tests__/mocks.js.map +1 -1
  31. package/dist/esm/utils.js +84 -87
  32. package/dist/esm/utils.js.map +1 -1
  33. package/dist/esm/validation.d.ts +2 -2
  34. package/dist/esm/validation.js +3 -15
  35. package/dist/esm/validation.js.map +1 -1
  36. package/dist/esm/validations/accountDeletion.js +1 -1
  37. package/dist/esm/validations/accountDeletion.js.map +1 -1
  38. package/dist/esm/validations/accountInfo.d.ts +4 -2
  39. package/dist/esm/validations/accountInfo.js +49 -55
  40. package/dist/esm/validations/accountInfo.js.map +1 -1
  41. package/dist/esm/validations/address.js +59 -65
  42. package/dist/esm/validations/address.js.map +1 -1
  43. package/dist/esm/validations/cancellation.js +12 -15
  44. package/dist/esm/validations/cancellation.js.map +1 -1
  45. package/dist/esm/validations/holidayStop.js +3 -3
  46. package/dist/esm/validations/holidayStop.js.map +1 -1
  47. package/dist/esm/validations/payment.js +2 -2
  48. package/dist/esm/validations/payment.js.map +1 -1
  49. package/dist/esm/validations/phoneNumber.js +19 -25
  50. package/dist/esm/validations/phoneNumber.js.map +1 -1
  51. package/dist/esm/yupPhone.js +14 -18
  52. package/dist/esm/yupPhone.js.map +1 -1
  53. package/package.json +4 -4
package/dist/esm/utils.js CHANGED
@@ -2,7 +2,7 @@ import * as yup from 'yup';
2
2
  import { ValidationFieldNames, ValidationSchemaNames, } from './types';
3
3
  import { nameValidation, displayNameValidation, mobileValidation, phoneNumberValidation, holidayStopValidation, vouchersValidation, deleteUserHolidayStopValidation, addressValidation, postcodeValidation, passwordValidation, paymentMethodIdValidation, zuoraPaymentMethodValidation, emailValidation, confirmCancellation, commentingNotifications, cancellationReason, accountCreationPage, deliveryInstructions, newsletterSubscriptionValidation, removeGroupAccountMemberValidation, accountDeletionValidation, familyInviteValidation, } from './validations';
4
4
  import './yupPhone';
5
- export var defaultRequiredFields = [
5
+ export const defaultRequiredFields = [
6
6
  ValidationFieldNames.firstName,
7
7
  ValidationFieldNames.lastname,
8
8
  ValidationFieldNames.mobile,
@@ -14,107 +14,104 @@ export var defaultRequiredFields = [
14
14
  ValidationFieldNames.other,
15
15
  ValidationFieldNames.cancellationReason,
16
16
  ];
17
- export var getValidation = function (requiredFields) {
18
- return function (_a) {
19
- var validationFieldName = _a.validationFieldName, requiredMessage = _a.requiredMessage, formatMessage = _a.formatMessage, regex = _a.regex, isPhone = _a.isPhone, excludeEmptyString = _a.excludeEmptyString;
20
- var validation = yup.string();
21
- var isRequired = requiredFields.includes(validationFieldName);
22
- if (isRequired) {
23
- validation = validation.required(requiredMessage);
24
- }
25
- if (isPhone && isRequired) {
26
- validation = validation.phone(undefined, true, formatMessage);
27
- }
28
- else if (isPhone && !isRequired) {
29
- validation = validation.test('test-phone', formatMessage || '', function (value) {
30
- if (value)
31
- return yup.string().phone(undefined, true).isValidSync(value);
32
- return true;
33
- });
34
- }
35
- else if (regex) {
36
- validation = validation.matches(regex, {
37
- message: formatMessage,
38
- excludeEmptyString: excludeEmptyString,
39
- });
40
- }
41
- return validation;
42
- };
17
+ export const getValidation = (requiredFields) => ({ validationFieldName, requiredMessage, formatMessage, regex, isPhone, excludeEmptyString, }) => {
18
+ let validation = yup.string();
19
+ const isRequired = requiredFields.includes(validationFieldName);
20
+ if (isRequired) {
21
+ validation = validation.required(requiredMessage);
22
+ }
23
+ if (isPhone && isRequired) {
24
+ validation = validation.phone(undefined, true, formatMessage);
25
+ }
26
+ else if (isPhone && !isRequired) {
27
+ validation = validation.test('test-phone', formatMessage || '', (value) => {
28
+ if (value)
29
+ return yup.string().phone(undefined, true).isValidSync(value);
30
+ return true;
31
+ });
32
+ }
33
+ else if (regex) {
34
+ validation = validation.matches(regex, {
35
+ message: formatMessage,
36
+ excludeEmptyString: excludeEmptyString,
37
+ });
38
+ }
39
+ return validation;
43
40
  };
44
- export var generateDefaultSchema = function (options) {
45
- var _a;
46
- var _b, _c;
47
- var requiredFields = (options === null || options === void 0 ? void 0 : options.overrideRequiredFields) || defaultRequiredFields;
48
- var getFieldValidation = getValidation(requiredFields);
49
- var DEFAULT_REQUIRED_MESSAGE = 'Please enter your ${field}';
50
- var DEFAULT_WRONG_FORMAT_MESSAGE = 'Your ${field} can’t contain special characters. Please try again.';
51
- var includesReuiredTemplate = (_b = options === null || options === void 0 ? void 0 : options.requiredMessage) === null || _b === void 0 ? void 0 : _b.includes('${field}');
52
- var includesWrongFormatTemplate = (_c = options === null || options === void 0 ? void 0 : options.wrongFormatMessage) === null || _c === void 0 ? void 0 : _c.includes('${field}');
53
- var requiredMessage = includesReuiredTemplate
41
+ export const generateDefaultSchema = (options) => {
42
+ var _a, _b;
43
+ const requiredFields = (options === null || options === void 0 ? void 0 : options.overrideRequiredFields) || defaultRequiredFields;
44
+ const getFieldValidation = getValidation(requiredFields);
45
+ const DEFAULT_REQUIRED_MESSAGE = 'Please enter your ${field}';
46
+ const DEFAULT_WRONG_FORMAT_MESSAGE = 'Your ${field} can’t contain special characters. Please try again.';
47
+ const includesReuiredTemplate = (_a = options === null || options === void 0 ? void 0 : options.requiredMessage) === null || _a === void 0 ? void 0 : _a.includes('${field}');
48
+ const includesWrongFormatTemplate = (_b = options === null || options === void 0 ? void 0 : options.wrongFormatMessage) === null || _b === void 0 ? void 0 : _b.includes('${field}');
49
+ const requiredMessage = includesReuiredTemplate
54
50
  ? options === null || options === void 0 ? void 0 : options.requiredMessage
55
51
  : DEFAULT_REQUIRED_MESSAGE;
56
- var wrongFormatMessage = includesWrongFormatTemplate
52
+ const wrongFormatMessage = includesWrongFormatTemplate
57
53
  ? options === null || options === void 0 ? void 0 : options.wrongFormatMessage
58
54
  : DEFAULT_WRONG_FORMAT_MESSAGE;
59
- return _a = {},
60
- _a[ValidationSchemaNames.name] = nameValidation({
61
- getFieldValidation: getFieldValidation,
62
- requiredMessage: requiredMessage,
63
- wrongFormatMessage: wrongFormatMessage,
55
+ return {
56
+ [ValidationSchemaNames.name]: nameValidation({
57
+ getFieldValidation,
58
+ requiredMessage,
59
+ wrongFormatMessage,
64
60
  }),
65
- _a[ValidationSchemaNames.password] = passwordValidation,
66
- _a[ValidationSchemaNames.mobile] = mobileValidation({
67
- getFieldValidation: getFieldValidation,
68
- requiredMessage: requiredMessage,
61
+ [ValidationSchemaNames.password]: passwordValidation,
62
+ [ValidationSchemaNames.mobile]: mobileValidation({
63
+ getFieldValidation,
64
+ requiredMessage,
69
65
  }),
70
- _a[ValidationSchemaNames.phoneNumber] = phoneNumberValidation({
71
- getFieldValidation: getFieldValidation,
72
- requiredMessage: requiredMessage,
66
+ [ValidationSchemaNames.phoneNumber]: phoneNumberValidation({
67
+ getFieldValidation,
68
+ requiredMessage,
73
69
  }),
74
- _a[ValidationSchemaNames.paymentMethodId] = paymentMethodIdValidation,
75
- _a[ValidationSchemaNames.zuoraPaymentMethod] = zuoraPaymentMethodValidation,
76
- _a[ValidationSchemaNames.email] = emailValidation({ requiredMessage: requiredMessage }),
70
+ [ValidationSchemaNames.paymentMethodId]: paymentMethodIdValidation,
71
+ [ValidationSchemaNames.zuoraPaymentMethod]: zuoraPaymentMethodValidation,
72
+ [ValidationSchemaNames.email]: emailValidation({ requiredMessage }),
77
73
  // TO DO: remove this validation schema after HH V2 is fully implemented and deployed to production
78
- _a[ValidationSchemaNames.inviteFamilyEmail] = emailValidation({
74
+ [ValidationSchemaNames.inviteFamilyEmail]: emailValidation({
79
75
  requiredMessage: 'Please enter a valid email address',
76
+ }), // we only need to validate an email field when inviting a family member
77
+ [ValidationSchemaNames.inviteFamilyEmailV2]: familyInviteValidation({
78
+ getFieldValidation,
79
+ requiredMessage: 'Please enter a ${field}',
80
+ requiredMessageEmail: 'Please enter an ${field}',
81
+ wrongFormatMessage,
80
82
  }),
81
- _a[ValidationSchemaNames.inviteFamilyEmailV2] = familyInviteValidation({
82
- getFieldValidation: getFieldValidation,
83
- requiredMessage: requiredMessage || 'Please enter a valid email address',
84
- wrongFormatMessage: wrongFormatMessage,
85
- }),
86
- _a[ValidationSchemaNames.address] = addressValidation({
87
- getFieldValidation: getFieldValidation,
88
- requiredMessage: requiredMessage,
89
- wrongFormatMessage: wrongFormatMessage,
83
+ [ValidationSchemaNames.address]: addressValidation({
84
+ getFieldValidation,
85
+ requiredMessage,
86
+ wrongFormatMessage,
90
87
  }),
91
- _a[ValidationSchemaNames.displayName] = displayNameValidation({
92
- requiredMessage: requiredMessage,
88
+ [ValidationSchemaNames.displayName]: displayNameValidation({
89
+ requiredMessage,
93
90
  }),
94
- _a[ValidationSchemaNames.confirmCancellation] = confirmCancellation({
95
- getFieldValidation: getFieldValidation,
91
+ [ValidationSchemaNames.confirmCancellation]: confirmCancellation({
92
+ getFieldValidation,
96
93
  }),
97
- _a[ValidationSchemaNames.commentingNotifications] = commentingNotifications,
98
- _a[ValidationSchemaNames.cancellationReason] = cancellationReason,
99
- _a[ValidationSchemaNames.postcode] = postcodeValidation({
100
- getFieldValidation: getFieldValidation,
101
- requiredMessage: requiredMessage,
102
- wrongFormatMessage: wrongFormatMessage,
94
+ [ValidationSchemaNames.commentingNotifications]: commentingNotifications,
95
+ [ValidationSchemaNames.cancellationReason]: cancellationReason,
96
+ [ValidationSchemaNames.postcode]: postcodeValidation({
97
+ getFieldValidation,
98
+ requiredMessage,
99
+ wrongFormatMessage,
103
100
  }),
104
- _a[ValidationSchemaNames.accountCreationPage] = accountCreationPage({
105
- getFieldValidation: getFieldValidation,
106
- requiredMessage: requiredMessage,
107
- wrongFormatMessage: wrongFormatMessage,
101
+ [ValidationSchemaNames.accountCreationPage]: accountCreationPage({
102
+ getFieldValidation,
103
+ requiredMessage,
104
+ wrongFormatMessage,
108
105
  }),
109
- _a[ValidationSchemaNames.deliveryInstructions] = deliveryInstructions,
110
- _a[ValidationSchemaNames.createHolidayStop] = holidayStopValidation,
111
- _a[ValidationSchemaNames.updateHolidayStop] = holidayStopValidation,
112
- _a[ValidationSchemaNames.deleteHolidayStop] = deleteUserHolidayStopValidation,
113
- _a[ValidationSchemaNames.vouchers] = vouchersValidation,
114
- _a[ValidationSchemaNames.newsletterSubscribe] = newsletterSubscriptionValidation,
115
- _a[ValidationSchemaNames.newsletterUnsubscribe] = newsletterSubscriptionValidation,
116
- _a[ValidationSchemaNames.removeGroupAccountMember] = removeGroupAccountMemberValidation,
117
- _a[ValidationSchemaNames.accountDeletion] = accountDeletionValidation,
118
- _a;
106
+ [ValidationSchemaNames.deliveryInstructions]: deliveryInstructions,
107
+ [ValidationSchemaNames.createHolidayStop]: holidayStopValidation,
108
+ [ValidationSchemaNames.updateHolidayStop]: holidayStopValidation,
109
+ [ValidationSchemaNames.deleteHolidayStop]: deleteUserHolidayStopValidation,
110
+ [ValidationSchemaNames.vouchers]: vouchersValidation,
111
+ [ValidationSchemaNames.newsletterSubscribe]: newsletterSubscriptionValidation,
112
+ [ValidationSchemaNames.newsletterUnsubscribe]: newsletterSubscriptionValidation,
113
+ [ValidationSchemaNames.removeGroupAccountMember]: removeGroupAccountMemberValidation,
114
+ [ValidationSchemaNames.accountDeletion]: accountDeletionValidation,
115
+ };
119
116
  };
120
117
  //# sourceMappingURL=utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { DefaultSchemaKeysType, InitializeYupOptions, OverrideYupSchemaType } from './types';
2
2
  export declare const initializeYupSchema: ({ overrideYupSchema, options, }: {
3
- overrideYupSchema?: OverrideYupSchemaType | undefined;
4
- options?: InitializeYupOptions | undefined;
3
+ overrideYupSchema?: OverrideYupSchemaType;
4
+ options?: InitializeYupOptions;
5
5
  }) => DefaultSchemaKeysType | OverrideYupSchemaType;
@@ -1,21 +1,9 @@
1
- var __assign = (this && this.__assign) || function () {
2
- __assign = Object.assign || function(t) {
3
- for (var s, i = 1, n = arguments.length; i < n; i++) {
4
- s = arguments[i];
5
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
6
- t[p] = s[p];
7
- }
8
- return t;
9
- };
10
- return __assign.apply(this, arguments);
11
- };
12
1
  import { generateDefaultSchema } from './utils';
13
- export var initializeYupSchema = function (_a) {
14
- var overrideYupSchema = _a.overrideYupSchema, options = _a.options;
15
- var defaultSchema = generateDefaultSchema(options);
2
+ export const initializeYupSchema = ({ overrideYupSchema, options, }) => {
3
+ const defaultSchema = generateDefaultSchema(options);
16
4
  if (!overrideYupSchema || Object.keys(overrideYupSchema).length === 0) {
17
5
  return defaultSchema;
18
6
  }
19
- return __assign(__assign({}, defaultSchema), overrideYupSchema);
7
+ return Object.assign(Object.assign({}, defaultSchema), overrideYupSchema);
20
8
  };
21
9
  //# sourceMappingURL=validation.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation.ts"],"names":[],"mappings":";;;;;;;;;;;AAKA,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAE/C,MAAM,CAAC,IAAM,mBAAmB,GAAG,UAAC,EAMnC;QALC,iBAAiB,uBAAA,EACjB,OAAO,aAAA;IAKP,IAAM,aAAa,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;IACpD,IAAI,CAAC,iBAAiB,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACrE,OAAO,aAAa,CAAA;KACrB;IAED,6BAAY,aAAa,GAAK,iBAAiB,EAAE;AACnD,CAAC,CAAA"}
1
+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAE/C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,iBAAiB,EACjB,OAAO,GAIR,EAAiD,EAAE;IAClD,MAAM,aAAa,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;IACpD,IAAI,CAAC,iBAAiB,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtE,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,uCAAY,aAAa,GAAK,iBAAiB,EAAE;AACnD,CAAC,CAAA"}
@@ -1,5 +1,5 @@
1
1
  import * as yup from 'yup';
2
- export var accountDeletionValidation = yup.object().shape({
2
+ export const accountDeletionValidation = yup.object().shape({
3
3
  appId: yup.string().required(),
4
4
  });
5
5
  //# sourceMappingURL=accountDeletion.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"accountDeletion.js","sourceRoot":"","sources":["../../../src/validations/accountDeletion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,MAAM,CAAC,IAAM,yBAAyB,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;IAC1D,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAA"}
1
+ {"version":3,"file":"accountDeletion.js","sourceRoot":"","sources":["../../../src/validations/accountDeletion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;IAC1D,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAA"}
@@ -20,10 +20,11 @@ export declare const commentingNotifications: import("yup/lib/object").OptionalO
20
20
  userMentioned: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
21
21
  repliedToMessage: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
22
22
  }>>;
23
- export declare const nameValidation: ({ getFieldValidation, requiredMessage, wrongFormatMessage, }: {
23
+ export declare const nameValidation: ({ getFieldValidation, requiredMessage, wrongFormatMessage, useLowerCaseRequiredMessage, }: {
24
24
  getFieldValidation: any;
25
25
  requiredMessage: any;
26
26
  wrongFormatMessage: any;
27
+ useLowerCaseRequiredMessage?: boolean | undefined;
27
28
  }) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
28
29
  firstName: any;
29
30
  lastName: any;
@@ -85,9 +86,10 @@ export declare const removeGroupAccountMemberValidation: import("yup/lib/object"
85
86
  }, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<{
86
87
  shareId: yup.default<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
87
88
  }>>;
88
- export declare const familyInviteValidation: ({ getFieldValidation, requiredMessage, wrongFormatMessage, }: {
89
+ export declare const familyInviteValidation: ({ getFieldValidation, requiredMessage, requiredMessageEmail, wrongFormatMessage, }: {
89
90
  getFieldValidation: any;
90
91
  requiredMessage: any;
92
+ requiredMessageEmail: any;
91
93
  wrongFormatMessage: any;
92
94
  }) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
93
95
  firstName: any;
@@ -1,82 +1,76 @@
1
1
  import { ValidationFieldNames } from '../types';
2
2
  import * as yup from 'yup';
3
- export var passwordValidation = yup.object({
3
+ export const passwordValidation = yup.object({
4
4
  password: yup.string(),
5
5
  });
6
6
  //Email cannot be not required
7
- var emailSchema = function (requiredMessage) {
8
- return yup
9
- .string()
10
- .email('That doesn’t look like a valid email address. Please try again.')
11
- .required(requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'email address'));
12
- };
13
- export var emailValidation = function (_a) {
14
- var requiredMessage = _a.requiredMessage;
15
- return yup.object({
16
- email: emailSchema(requiredMessage),
17
- });
18
- };
19
- export var commentingNotifications = yup.object({
7
+ const emailSchema = (requiredMessage) => yup
8
+ .string()
9
+ .email('That doesn’t look like a valid email address. Please try again.')
10
+ .required(requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'email address'));
11
+ export const emailValidation = ({ requiredMessage }) => yup.object({
12
+ email: emailSchema(requiredMessage),
13
+ });
14
+ export const commentingNotifications = yup.object({
20
15
  likedYourMessage: yup.boolean(),
21
16
  userMentioned: yup.boolean(),
22
17
  repliedToMessage: yup.boolean(),
23
18
  });
24
- export var nameValidation = function (_a) {
25
- var getFieldValidation = _a.getFieldValidation, requiredMessage = _a.requiredMessage, wrongFormatMessage = _a.wrongFormatMessage;
19
+ export const nameValidation = ({ getFieldValidation, requiredMessage, wrongFormatMessage, useLowerCaseRequiredMessage = false, }) => {
20
+ const firstName = 'First Name';
21
+ const lastName = 'Last Name';
22
+ const firstNameReplaceWith = useLowerCaseRequiredMessage
23
+ ? firstName.toLocaleLowerCase()
24
+ : firstName;
25
+ const lastNameReplaceWith = useLowerCaseRequiredMessage
26
+ ? lastName.toLocaleLowerCase()
27
+ : lastName;
26
28
  return yup.object().shape({
27
29
  firstName: getFieldValidation({
28
30
  validationFieldName: ValidationFieldNames.firstName,
29
- requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'First Name'),
31
+ requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', firstNameReplaceWith),
30
32
  formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'first name'),
31
33
  regex: /^[a-zA-Z]+(([',. -][a-zA-Z ])?[a-zA-Z])*$/,
32
34
  }),
33
35
  lastName: getFieldValidation({
34
36
  validationFieldName: ValidationFieldNames.lastname,
35
- requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Last Name'),
37
+ requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', lastNameReplaceWith),
36
38
  formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'last name'),
37
39
  regex: /^[a-zA-Z]+(([',. -][a-zA-Z ])?[a-zA-Z])*$/,
38
40
  }),
39
41
  });
40
42
  };
41
- export var accountCreationPage = function (_a) {
42
- var getFieldValidation = _a.getFieldValidation, requiredMessage = _a.requiredMessage, wrongFormatMessage = _a.wrongFormatMessage;
43
- return nameValidation({
44
- getFieldValidation: getFieldValidation,
45
- requiredMessage: requiredMessage,
46
- wrongFormatMessage: wrongFormatMessage,
47
- }).shape({
48
- title: yup.string().required('Title is required'),
49
- yyyy: yup.string().required('Year is required').min(4).max(4),
50
- mm: yup.string().required('Month is required').min(2).max(2),
51
- dd: yup.string().required('Day is required').min(2).max(2),
52
- tc: yup.string().required().oneOf(['true'], 'Required field'),
53
- });
54
- };
55
- export var displayNameValidation = function (_a) {
56
- var requiredMessage = _a.requiredMessage;
57
- return yup.object().shape({
58
- displayName: yup
59
- .string() //Please enter your Display name'
60
- .required(requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Display Name'))
61
- .matches(/^[a-z\d\-\s]+$/i, {
62
- message: 'Your Display name can only contain alphanumeric characters, hyphens, apostrophes and spaces',
63
- }),
64
- });
65
- };
66
- export var newsletterSubscriptionValidation = yup.object({
43
+ export const accountCreationPage = ({ getFieldValidation, requiredMessage, wrongFormatMessage, }) => nameValidation({
44
+ getFieldValidation,
45
+ requiredMessage,
46
+ wrongFormatMessage,
47
+ }).shape({
48
+ title: yup.string().required('Title is required'),
49
+ yyyy: yup.string().required('Year is required').min(4).max(4),
50
+ mm: yup.string().required('Month is required').min(2).max(2),
51
+ dd: yup.string().required('Day is required').min(2).max(2),
52
+ tc: yup.string().required().oneOf(['true'], 'Required field'),
53
+ });
54
+ export const displayNameValidation = ({ requiredMessage }) => yup.object().shape({
55
+ displayName: yup
56
+ .string() //Please enter your Display name'
57
+ .required(requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Display Name'))
58
+ .matches(/^[a-z\d\-\s]+$/i, {
59
+ message: 'Your Display name can only contain alphanumeric characters, hyphens, apostrophes and spaces',
60
+ }),
61
+ });
62
+ export const newsletterSubscriptionValidation = yup.object({
67
63
  bulletinId: yup.string(),
68
64
  });
69
- export var removeGroupAccountMemberValidation = yup.object({
65
+ export const removeGroupAccountMemberValidation = yup.object({
70
66
  shareId: yup.string(),
71
67
  });
72
- export var familyInviteValidation = function (_a) {
73
- var getFieldValidation = _a.getFieldValidation, requiredMessage = _a.requiredMessage, wrongFormatMessage = _a.wrongFormatMessage;
74
- return nameValidation({
75
- getFieldValidation: getFieldValidation,
76
- requiredMessage: requiredMessage,
77
- wrongFormatMessage: wrongFormatMessage,
78
- }).shape({
79
- email: emailSchema(requiredMessage),
80
- });
81
- };
68
+ export const familyInviteValidation = ({ getFieldValidation, requiredMessage, requiredMessageEmail, wrongFormatMessage, }) => nameValidation({
69
+ getFieldValidation,
70
+ requiredMessage,
71
+ wrongFormatMessage,
72
+ useLowerCaseRequiredMessage: true,
73
+ }).shape({
74
+ email: emailSchema(requiredMessageEmail),
75
+ });
82
76
  //# sourceMappingURL=accountInfo.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"accountInfo.js","sourceRoot":"","sources":["../../../src/validations/accountInfo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"accountInfo.js","sourceRoot":"","sources":["../../../src/validations/accountInfo.ts"],"names":[],"mappings":"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"}
@@ -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
- var addressRegex = /^['/&#.\d\p{Letter}\p{Mark}\s,-]+$/u;
5
- export var postcodeValidation = function (_a) {
6
- var getFieldValidation = _a.getFieldValidation, requiredMessage = _a.requiredMessage, wrongFormatMessage = _a.wrongFormatMessage;
7
- return yup.object({
8
- postcode: getFieldValidation({
9
- validationFieldName: ValidationFieldNames.postcode,
10
- requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Postcode'),
11
- formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'postcode'),
12
- addressRegex: addressRegex,
13
- }),
14
- });
15
- };
16
- export var addressValidation = function (_a) {
17
- var getFieldValidation = _a.getFieldValidation, requiredMessage = _a.requiredMessage, wrongFormatMessage = _a.wrongFormatMessage;
18
- return postcodeValidation({
19
- getFieldValidation: getFieldValidation,
20
- requiredMessage: requiredMessage,
21
- wrongFormatMessage: wrongFormatMessage,
22
- }).shape({
23
- country: getFieldValidation({
24
- validationFieldName: ValidationFieldNames.country,
25
- requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Country'),
26
- formatMessage: 'This is not a valid Country code',
27
- regex: /^[A-Z]{2,3}$/,
28
- }),
29
- line1: getFieldValidation({
30
- validationFieldName: ValidationFieldNames.line1,
31
- requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'first line of your address'),
32
- formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'address'),
33
- regex: addressRegex,
34
- }),
35
- line2: getFieldValidation({
36
- validationFieldName: ValidationFieldNames.line2,
37
- requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'second line of your address'),
38
- formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'address'),
39
- regex: addressRegex,
40
- isPhone: false,
41
- excludeEmptyString: true,
42
- }),
43
- line3: getFieldValidation({
44
- validationFieldName: ValidationFieldNames.line2,
45
- requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'third line of your address'),
46
- formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'address'),
47
- regex: addressRegex,
48
- isPhone: false,
49
- excludeEmptyString: true,
50
- }),
51
- city: getFieldValidation({
52
- validationFieldName: ValidationFieldNames.city,
53
- requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Town/City'),
54
- formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'town/city'),
55
- regex: addressRegex,
56
- }),
57
- county: getFieldValidation({
58
- validationFieldName: ValidationFieldNames.county,
59
- requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'County'),
60
- formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'county'),
61
- regex: addressRegex,
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: function (val) { return val === 'Other (Please state)'; },
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
  })