@newskit-render/validation 1.18.0 → 1.18.1-alpha.0
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/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.js +84 -88
- 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.js +49 -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 +2 -2
- package/dist/esm/__tests__/mocks.js.map +1 -1
- package/dist/esm/utils.js +82 -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.js +51 -68
- 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
package/dist/cjs/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
|
|
17
|
+
const validation_1 = require("./validation");
|
|
18
18
|
__exportStar(require("./types"), exports);
|
|
19
19
|
exports.default = validation_1.initializeYupSchema;
|
|
20
20
|
//# sourceMappingURL=index.js.map
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAAkD;AAClD,0CAAuB;AAEvB,kBAAe,gCAAmB,CAAA"}
|
package/dist/cjs/types.js
CHANGED
|
@@ -17,7 +17,7 @@ var ValidationFieldNames;
|
|
|
17
17
|
ValidationFieldNames[ValidationFieldNames["radioInput"] = 12] = "radioInput";
|
|
18
18
|
ValidationFieldNames[ValidationFieldNames["cancellationReason"] = 13] = "cancellationReason";
|
|
19
19
|
ValidationFieldNames[ValidationFieldNames["accountCreationPage"] = 14] = "accountCreationPage";
|
|
20
|
-
})(ValidationFieldNames
|
|
20
|
+
})(ValidationFieldNames || (exports.ValidationFieldNames = ValidationFieldNames = {}));
|
|
21
21
|
var ValidationSchemaNames;
|
|
22
22
|
(function (ValidationSchemaNames) {
|
|
23
23
|
ValidationSchemaNames["zuoraPaymentMethod"] = "zuoraPaymentMethod";
|
|
@@ -45,5 +45,5 @@ var ValidationSchemaNames;
|
|
|
45
45
|
ValidationSchemaNames["cancellationReason"] = "cancellationReason";
|
|
46
46
|
ValidationSchemaNames["commentingNotifications"] = "commenting-notifications";
|
|
47
47
|
ValidationSchemaNames["accountDeletion"] = "delete-account";
|
|
48
|
-
})(ValidationSchemaNames
|
|
48
|
+
})(ValidationSchemaNames || (exports.ValidationSchemaNames = ValidationSchemaNames = {}));
|
|
49
49
|
//# sourceMappingURL=types.js.map
|
package/dist/cjs/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":";;;AACA,IAAY,oBAeX;AAfD,WAAY,oBAAoB;IAC9B,yEAAe,CAAA;IACf,uEAAU,CAAA;IACV,mEAAQ,CAAA;IACR,6EAAa,CAAA;IACb,qEAAS,CAAA;IACT,iEAAO,CAAA;IACP,iEAAO,CAAA;IACP,+DAAM,CAAA;IACN,mEAAQ,CAAA;IACR,wEAAU,CAAA;IACV,kEAAO,CAAA;IACP,4EAAY,CAAA;IACZ,4FAAoB,CAAA;IACpB,8FAAqB,CAAA;AACvB,CAAC,EAfW,oBAAoB,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":";;;AACA,IAAY,oBAeX;AAfD,WAAY,oBAAoB;IAC9B,yEAAe,CAAA;IACf,uEAAU,CAAA;IACV,mEAAQ,CAAA;IACR,6EAAa,CAAA;IACb,qEAAS,CAAA;IACT,iEAAO,CAAA;IACP,iEAAO,CAAA;IACP,+DAAM,CAAA;IACN,mEAAQ,CAAA;IACR,wEAAU,CAAA;IACV,kEAAO,CAAA;IACP,4EAAY,CAAA;IACZ,4FAAoB,CAAA;IACpB,8FAAqB,CAAA;AACvB,CAAC,EAfW,oBAAoB,oCAApB,oBAAoB,QAe/B;AAuBD,IAAY,qBA0BX;AA1BD,WAAY,qBAAqB;IAC/B,kEAAyC,CAAA;IACzC,oEAA2C,CAAA;IAC3C,uEAA8C,CAAA;IAC9C,kEAAyC,CAAA;IACzC,kEAAyC,CAAA;IACzC,8CAAqB,CAAA;IACrB,oEAA2C,CAAA;IAC3C,yEAAgD,CAAA;IAChD,qEAA4C,CAAA;IAC5C,iFAAwD,CAAA;IACxD,gEAAuC,CAAA;IACvC,oEAA2C,CAAA;IAC3C,sCAAa,CAAA;IACb,8CAAqB,CAAA;IACrB,0CAAiB,CAAA;IACjB,oDAA2B,CAAA;IAC3B,4DAAmC,CAAA;IACnC,wCAAe,CAAA;IACf,4CAAmB,CAAA;IACnB,oDAA2B,CAAA;IAC3B,oEAA2C,CAAA;IAC3C,8CAAqB,CAAA;IACrB,kEAAyC,CAAA;IACzC,6EAAoD,CAAA;IACpD,2DAAkC,CAAA;AACpC,CAAC,EA1BW,qBAAqB,qCAArB,qBAAqB,QA0BhC"}
|
package/dist/cjs/utils.js
CHANGED
|
@@ -24,9 +24,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.generateDefaultSchema = exports.getValidation = exports.defaultRequiredFields = void 0;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
const yup = __importStar(require("yup"));
|
|
28
|
+
const types_1 = require("./types");
|
|
29
|
+
const validations_1 = require("./validations");
|
|
30
30
|
require("./yupPhone");
|
|
31
31
|
exports.defaultRequiredFields = [
|
|
32
32
|
types_1.ValidationFieldNames.firstName,
|
|
@@ -40,109 +40,105 @@ exports.defaultRequiredFields = [
|
|
|
40
40
|
types_1.ValidationFieldNames.other,
|
|
41
41
|
types_1.ValidationFieldNames.cancellationReason,
|
|
42
42
|
];
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
}
|
|
67
|
-
return validation;
|
|
68
|
-
};
|
|
43
|
+
const getValidation = (requiredFields) => ({ validationFieldName, requiredMessage, formatMessage, regex, isPhone, excludeEmptyString, }) => {
|
|
44
|
+
let validation = yup.string();
|
|
45
|
+
const isRequired = requiredFields.includes(validationFieldName);
|
|
46
|
+
if (isRequired) {
|
|
47
|
+
validation = validation.required(requiredMessage);
|
|
48
|
+
}
|
|
49
|
+
if (isPhone && isRequired) {
|
|
50
|
+
validation = validation.phone(undefined, true, formatMessage);
|
|
51
|
+
}
|
|
52
|
+
else if (isPhone && !isRequired) {
|
|
53
|
+
validation = validation.test('test-phone', formatMessage || '', (value) => {
|
|
54
|
+
if (value)
|
|
55
|
+
return yup.string().phone(undefined, true).isValidSync(value);
|
|
56
|
+
return true;
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
else if (regex) {
|
|
60
|
+
validation = validation.matches(regex, {
|
|
61
|
+
message: formatMessage,
|
|
62
|
+
excludeEmptyString: excludeEmptyString,
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
return validation;
|
|
69
66
|
};
|
|
70
67
|
exports.getValidation = getValidation;
|
|
71
|
-
|
|
72
|
-
var _a;
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
var requiredMessage = includesReuiredTemplate
|
|
68
|
+
const generateDefaultSchema = (options) => {
|
|
69
|
+
var _a, _b;
|
|
70
|
+
const requiredFields = (options === null || options === void 0 ? void 0 : options.overrideRequiredFields) || exports.defaultRequiredFields;
|
|
71
|
+
const getFieldValidation = (0, exports.getValidation)(requiredFields);
|
|
72
|
+
const DEFAULT_REQUIRED_MESSAGE = 'Please enter your ${field}';
|
|
73
|
+
const DEFAULT_WRONG_FORMAT_MESSAGE = 'Your ${field} can’t contain special characters. Please try again.';
|
|
74
|
+
const includesReuiredTemplate = (_a = options === null || options === void 0 ? void 0 : options.requiredMessage) === null || _a === void 0 ? void 0 : _a.includes('${field}');
|
|
75
|
+
const includesWrongFormatTemplate = (_b = options === null || options === void 0 ? void 0 : options.wrongFormatMessage) === null || _b === void 0 ? void 0 : _b.includes('${field}');
|
|
76
|
+
const requiredMessage = includesReuiredTemplate
|
|
81
77
|
? options === null || options === void 0 ? void 0 : options.requiredMessage
|
|
82
78
|
: DEFAULT_REQUIRED_MESSAGE;
|
|
83
|
-
|
|
79
|
+
const wrongFormatMessage = includesWrongFormatTemplate
|
|
84
80
|
? options === null || options === void 0 ? void 0 : options.wrongFormatMessage
|
|
85
81
|
: DEFAULT_WRONG_FORMAT_MESSAGE;
|
|
86
|
-
return
|
|
87
|
-
|
|
88
|
-
getFieldValidation
|
|
89
|
-
requiredMessage
|
|
90
|
-
wrongFormatMessage
|
|
82
|
+
return {
|
|
83
|
+
[types_1.ValidationSchemaNames.name]: (0, validations_1.nameValidation)({
|
|
84
|
+
getFieldValidation,
|
|
85
|
+
requiredMessage,
|
|
86
|
+
wrongFormatMessage,
|
|
91
87
|
}),
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
getFieldValidation
|
|
95
|
-
requiredMessage
|
|
88
|
+
[types_1.ValidationSchemaNames.password]: validations_1.passwordValidation,
|
|
89
|
+
[types_1.ValidationSchemaNames.mobile]: (0, validations_1.mobileValidation)({
|
|
90
|
+
getFieldValidation,
|
|
91
|
+
requiredMessage,
|
|
96
92
|
}),
|
|
97
|
-
|
|
98
|
-
getFieldValidation
|
|
99
|
-
requiredMessage
|
|
93
|
+
[types_1.ValidationSchemaNames.phoneNumber]: (0, validations_1.phoneNumberValidation)({
|
|
94
|
+
getFieldValidation,
|
|
95
|
+
requiredMessage,
|
|
100
96
|
}),
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
97
|
+
[types_1.ValidationSchemaNames.paymentMethodId]: validations_1.paymentMethodIdValidation,
|
|
98
|
+
[types_1.ValidationSchemaNames.zuoraPaymentMethod]: validations_1.zuoraPaymentMethodValidation,
|
|
99
|
+
[types_1.ValidationSchemaNames.email]: (0, validations_1.emailValidation)({ requiredMessage }),
|
|
104
100
|
// TO DO: remove this validation schema after HH V2 is fully implemented and deployed to production
|
|
105
|
-
|
|
101
|
+
[types_1.ValidationSchemaNames.inviteFamilyEmail]: (0, validations_1.emailValidation)({
|
|
106
102
|
requiredMessage: 'Please enter a valid email address',
|
|
107
|
-
}),
|
|
108
|
-
|
|
109
|
-
getFieldValidation
|
|
103
|
+
}), // we only need to validate an email field when inviting a family member
|
|
104
|
+
[types_1.ValidationSchemaNames.inviteFamilyEmailV2]: (0, validations_1.familyInviteValidation)({
|
|
105
|
+
getFieldValidation,
|
|
110
106
|
requiredMessage: requiredMessage || 'Please enter a valid email address',
|
|
111
|
-
wrongFormatMessage
|
|
107
|
+
wrongFormatMessage,
|
|
112
108
|
}),
|
|
113
|
-
|
|
114
|
-
getFieldValidation
|
|
115
|
-
requiredMessage
|
|
116
|
-
wrongFormatMessage
|
|
109
|
+
[types_1.ValidationSchemaNames.address]: (0, validations_1.addressValidation)({
|
|
110
|
+
getFieldValidation,
|
|
111
|
+
requiredMessage,
|
|
112
|
+
wrongFormatMessage,
|
|
117
113
|
}),
|
|
118
|
-
|
|
119
|
-
requiredMessage
|
|
114
|
+
[types_1.ValidationSchemaNames.displayName]: (0, validations_1.displayNameValidation)({
|
|
115
|
+
requiredMessage,
|
|
120
116
|
}),
|
|
121
|
-
|
|
122
|
-
getFieldValidation
|
|
117
|
+
[types_1.ValidationSchemaNames.confirmCancellation]: (0, validations_1.confirmCancellation)({
|
|
118
|
+
getFieldValidation,
|
|
123
119
|
}),
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
getFieldValidation
|
|
128
|
-
requiredMessage
|
|
129
|
-
wrongFormatMessage
|
|
120
|
+
[types_1.ValidationSchemaNames.commentingNotifications]: validations_1.commentingNotifications,
|
|
121
|
+
[types_1.ValidationSchemaNames.cancellationReason]: validations_1.cancellationReason,
|
|
122
|
+
[types_1.ValidationSchemaNames.postcode]: (0, validations_1.postcodeValidation)({
|
|
123
|
+
getFieldValidation,
|
|
124
|
+
requiredMessage,
|
|
125
|
+
wrongFormatMessage,
|
|
130
126
|
}),
|
|
131
|
-
|
|
132
|
-
getFieldValidation
|
|
133
|
-
requiredMessage
|
|
134
|
-
wrongFormatMessage
|
|
127
|
+
[types_1.ValidationSchemaNames.accountCreationPage]: (0, validations_1.accountCreationPage)({
|
|
128
|
+
getFieldValidation,
|
|
129
|
+
requiredMessage,
|
|
130
|
+
wrongFormatMessage,
|
|
135
131
|
}),
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
132
|
+
[types_1.ValidationSchemaNames.deliveryInstructions]: validations_1.deliveryInstructions,
|
|
133
|
+
[types_1.ValidationSchemaNames.createHolidayStop]: validations_1.holidayStopValidation,
|
|
134
|
+
[types_1.ValidationSchemaNames.updateHolidayStop]: validations_1.holidayStopValidation,
|
|
135
|
+
[types_1.ValidationSchemaNames.deleteHolidayStop]: validations_1.deleteUserHolidayStopValidation,
|
|
136
|
+
[types_1.ValidationSchemaNames.vouchers]: validations_1.vouchersValidation,
|
|
137
|
+
[types_1.ValidationSchemaNames.newsletterSubscribe]: validations_1.newsletterSubscriptionValidation,
|
|
138
|
+
[types_1.ValidationSchemaNames.newsletterUnsubscribe]: validations_1.newsletterSubscriptionValidation,
|
|
139
|
+
[types_1.ValidationSchemaNames.removeGroupAccountMember]: validations_1.removeGroupAccountMemberValidation,
|
|
140
|
+
[types_1.ValidationSchemaNames.accountDeletion]: validations_1.accountDeletionValidation,
|
|
141
|
+
};
|
|
146
142
|
};
|
|
147
143
|
exports.generateDefaultSchema = generateDefaultSchema;
|
|
148
144
|
//# sourceMappingURL=utils.js.map
|
package/dist/cjs/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA0B;AAC1B,mCAKgB;AAChB,+CAuBsB;AACtB,sBAAmB;AAEN,QAAA,qBAAqB,GAAG;IACnC,4BAAoB,CAAC,SAAS;IAC9B,4BAAoB,CAAC,QAAQ;IAC7B,4BAAoB,CAAC,MAAM;IAC3B,4BAAoB,CAAC,WAAW;IAChC,4BAAoB,CAAC,OAAO;IAC5B,4BAAoB,CAAC,KAAK;IAC1B,4BAAoB,CAAC,IAAI;IACzB,4BAAoB,CAAC,QAAQ;IAC7B,4BAAoB,CAAC,KAAK;IAC1B,4BAAoB,CAAC,kBAAkB;CACxC,CAAA;AAEM,MAAM,aAAa,GACxB,CAAC,cAAsC,EAAE,EAAE,CAC3C,CAAC,EACC,mBAAmB,EACnB,eAAe,EACf,aAAa,EACb,KAAK,EACL,OAAO,EACP,kBAAkB,GACJ,EAAE,EAAE;IAClB,IAAI,UAAU,GAAG,GAAG,CAAC,MAAM,EAAE,CAAA;IAC7B,MAAM,UAAU,GAAG,cAAc,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAA;IAE/D,IAAI,UAAU,EAAE,CAAC;QACf,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;IACnD,CAAC;IAED,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;QAC1B,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;IAC/D,CAAC;SAAM,IAAI,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,UAAU,GAAG,UAAU,CAAC,IAAI,CAC1B,YAAY,EACZ,aAAa,IAAI,EAAE,EACnB,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,KAAK;gBACP,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;YAC/D,OAAO,IAAI,CAAA;QACb,CAAC,CACF,CAAA;IACH,CAAC;SAAM,IAAI,KAAK,EAAE,CAAC;QACjB,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE;YACrC,OAAO,EAAE,aAAa;YACtB,kBAAkB,EAAE,kBAAkB;SACvC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AArCU,QAAA,aAAa,iBAqCvB;AAEI,MAAM,qBAAqB,GAAG,CAAC,OAA8B,EAAE,EAAE;;IACtE,MAAM,cAAc,GAClB,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,sBAAsB,KAAI,6BAAqB,CAAA;IAC1D,MAAM,kBAAkB,GAAG,IAAA,qBAAa,EAAC,cAAc,CAAC,CAAA;IACxD,MAAM,wBAAwB,GAAG,4BAA4B,CAAA;IAC7D,MAAM,4BAA4B,GAChC,mEAAmE,CAAA;IAErE,MAAM,uBAAuB,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,0CAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;IAC9E,MAAM,2BAA2B,GAC/B,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,0CAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;IAEnD,MAAM,eAAe,GAAG,uBAAuB;QAC7C,CAAC,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe;QAC1B,CAAC,CAAC,wBAAwB,CAAA;IAC5B,MAAM,kBAAkB,GAAG,2BAA2B;QACpD,CAAC,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB;QAC7B,CAAC,CAAC,4BAA4B,CAAA;IAEhC,OAAO;QACL,CAAC,6BAAqB,CAAC,IAAI,CAAC,EAAE,IAAA,4BAAc,EAAC;YAC3C,kBAAkB;YAClB,eAAe;YACf,kBAAkB;SACnB,CAAC;QACF,CAAC,6BAAqB,CAAC,QAAQ,CAAC,EAAE,gCAAkB;QACpD,CAAC,6BAAqB,CAAC,MAAM,CAAC,EAAE,IAAA,8BAAgB,EAAC;YAC/C,kBAAkB;YAClB,eAAe;SAChB,CAAC;QACF,CAAC,6BAAqB,CAAC,WAAW,CAAC,EAAE,IAAA,mCAAqB,EAAC;YACzD,kBAAkB;YAClB,eAAe;SAChB,CAAC;QACF,CAAC,6BAAqB,CAAC,eAAe,CAAC,EAAE,uCAAyB;QAClE,CAAC,6BAAqB,CAAC,kBAAkB,CAAC,EAAE,0CAA4B;QACxE,CAAC,6BAAqB,CAAC,KAAK,CAAC,EAAE,IAAA,6BAAe,EAAC,EAAE,eAAe,EAAE,CAAC;QACnE,mGAAmG;QACnG,CAAC,6BAAqB,CAAC,iBAAiB,CAAC,EAAE,IAAA,6BAAe,EAAC;YACzD,eAAe,EAAE,oCAAoC;SACtD,CAAC,EAAE,wEAAwE;QAC5E,CAAC,6BAAqB,CAAC,mBAAmB,CAAC,EAAE,IAAA,oCAAsB,EAAC;YAClE,kBAAkB;YAClB,eAAe,EAAE,eAAe,IAAI,oCAAoC;YACxE,kBAAkB;SACnB,CAAC;QACF,CAAC,6BAAqB,CAAC,OAAO,CAAC,EAAE,IAAA,+BAAiB,EAAC;YACjD,kBAAkB;YAClB,eAAe;YACf,kBAAkB;SACnB,CAAC;QACF,CAAC,6BAAqB,CAAC,WAAW,CAAC,EAAE,IAAA,mCAAqB,EAAC;YACzD,eAAe;SAChB,CAAC;QACF,CAAC,6BAAqB,CAAC,mBAAmB,CAAC,EAAE,IAAA,iCAAmB,EAAC;YAC/D,kBAAkB;SACnB,CAAC;QACF,CAAC,6BAAqB,CAAC,uBAAuB,CAAC,EAAE,qCAAuB;QACxE,CAAC,6BAAqB,CAAC,kBAAkB,CAAC,EAAE,gCAAkB;QAC9D,CAAC,6BAAqB,CAAC,QAAQ,CAAC,EAAE,IAAA,gCAAkB,EAAC;YACnD,kBAAkB;YAClB,eAAe;YACf,kBAAkB;SACnB,CAAC;QACF,CAAC,6BAAqB,CAAC,mBAAmB,CAAC,EAAE,IAAA,iCAAmB,EAAC;YAC/D,kBAAkB;YAClB,eAAe;YACf,kBAAkB;SACnB,CAAC;QACF,CAAC,6BAAqB,CAAC,oBAAoB,CAAC,EAAE,kCAAoB;QAClE,CAAC,6BAAqB,CAAC,iBAAiB,CAAC,EAAE,mCAAqB;QAChE,CAAC,6BAAqB,CAAC,iBAAiB,CAAC,EAAE,mCAAqB;QAChE,CAAC,6BAAqB,CAAC,iBAAiB,CAAC,EAAE,6CAA+B;QAC1E,CAAC,6BAAqB,CAAC,QAAQ,CAAC,EAAE,gCAAkB;QACpD,CAAC,6BAAqB,CAAC,mBAAmB,CAAC,EACzC,8CAAgC;QAClC,CAAC,6BAAqB,CAAC,qBAAqB,CAAC,EAC3C,8CAAgC;QAClC,CAAC,6BAAqB,CAAC,wBAAwB,CAAC,EAC9C,gDAAkC;QACpC,CAAC,6BAAqB,CAAC,eAAe,CAAC,EAAE,uCAAyB;KACnE,CAAA;AACH,CAAC,CAAA;AAlFY,QAAA,qBAAqB,yBAkFjC"}
|
package/dist/cjs/validation.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DefaultSchemaKeysType, InitializeYupOptions, OverrideYupSchemaType } from './types';
|
|
2
2
|
export declare const initializeYupSchema: ({ overrideYupSchema, options, }: {
|
|
3
|
-
overrideYupSchema?: OverrideYupSchemaType
|
|
4
|
-
options?: InitializeYupOptions
|
|
3
|
+
overrideYupSchema?: OverrideYupSchemaType;
|
|
4
|
+
options?: InitializeYupOptions;
|
|
5
5
|
}) => DefaultSchemaKeysType | OverrideYupSchemaType;
|
package/dist/cjs/validation.js
CHANGED
|
@@ -1,25 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
|
3
|
-
__assign = Object.assign || function(t) {
|
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
-
s = arguments[i];
|
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
-
t[p] = s[p];
|
|
8
|
-
}
|
|
9
|
-
return t;
|
|
10
|
-
};
|
|
11
|
-
return __assign.apply(this, arguments);
|
|
12
|
-
};
|
|
13
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
3
|
exports.initializeYupSchema = void 0;
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
var defaultSchema = (0, utils_1.generateDefaultSchema)(options);
|
|
4
|
+
const utils_1 = require("./utils");
|
|
5
|
+
const initializeYupSchema = ({ overrideYupSchema, options, }) => {
|
|
6
|
+
const defaultSchema = (0, utils_1.generateDefaultSchema)(options);
|
|
19
7
|
if (!overrideYupSchema || Object.keys(overrideYupSchema).length === 0) {
|
|
20
8
|
return defaultSchema;
|
|
21
9
|
}
|
|
22
|
-
return
|
|
10
|
+
return Object.assign(Object.assign({}, defaultSchema), overrideYupSchema);
|
|
23
11
|
};
|
|
24
12
|
exports.initializeYupSchema = initializeYupSchema;
|
|
25
13
|
//# sourceMappingURL=validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation.ts"],"names":[],"mappings":";;;AAKA,mCAA+C;AAExC,MAAM,mBAAmB,GAAG,CAAC,EAClC,iBAAiB,EACjB,OAAO,GAIR,EAAiD,EAAE;IAClD,MAAM,aAAa,GAAG,IAAA,6BAAqB,EAAC,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;AAbY,QAAA,mBAAmB,uBAa/B"}
|
|
@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.accountDeletionValidation = void 0;
|
|
27
|
-
|
|
27
|
+
const yup = __importStar(require("yup"));
|
|
28
28
|
exports.accountDeletionValidation = yup.object().shape({
|
|
29
29
|
appId: yup.string().required(),
|
|
30
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountDeletion.js","sourceRoot":"","sources":["../../../src/validations/accountDeletion.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"accountDeletion.js","sourceRoot":"","sources":["../../../src/validations/accountDeletion.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA0B;AAEb,QAAA,yBAAyB,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;IAC1D,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAA"}
|
|
@@ -24,74 +24,60 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.familyInviteValidation = exports.removeGroupAccountMemberValidation = exports.newsletterSubscriptionValidation = exports.displayNameValidation = exports.accountCreationPage = exports.nameValidation = exports.commentingNotifications = exports.emailValidation = exports.passwordValidation = void 0;
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
const types_1 = require("../types");
|
|
28
|
+
const yup = __importStar(require("yup"));
|
|
29
29
|
exports.passwordValidation = yup.object({
|
|
30
30
|
password: yup.string(),
|
|
31
31
|
});
|
|
32
32
|
//Email cannot be not required
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
var requiredMessage = _a.requiredMessage;
|
|
41
|
-
return yup.object({
|
|
42
|
-
email: emailSchema(requiredMessage),
|
|
43
|
-
});
|
|
44
|
-
};
|
|
33
|
+
const emailSchema = (requiredMessage) => yup
|
|
34
|
+
.string()
|
|
35
|
+
.email('That doesn’t look like a valid email address. Please try again.')
|
|
36
|
+
.required(requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'email address'));
|
|
37
|
+
const emailValidation = ({ requiredMessage }) => yup.object({
|
|
38
|
+
email: emailSchema(requiredMessage),
|
|
39
|
+
});
|
|
45
40
|
exports.emailValidation = emailValidation;
|
|
46
41
|
exports.commentingNotifications = yup.object({
|
|
47
42
|
likedYourMessage: yup.boolean(),
|
|
48
43
|
userMentioned: yup.boolean(),
|
|
49
44
|
repliedToMessage: yup.boolean(),
|
|
50
45
|
});
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}),
|
|
66
|
-
});
|
|
67
|
-
};
|
|
46
|
+
const nameValidation = ({ getFieldValidation, requiredMessage, wrongFormatMessage, }) => yup.object().shape({
|
|
47
|
+
firstName: getFieldValidation({
|
|
48
|
+
validationFieldName: types_1.ValidationFieldNames.firstName,
|
|
49
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'First Name'),
|
|
50
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'first name'),
|
|
51
|
+
regex: /^[a-zA-Z]+(([',. -][a-zA-Z ])?[a-zA-Z])*$/,
|
|
52
|
+
}),
|
|
53
|
+
lastName: getFieldValidation({
|
|
54
|
+
validationFieldName: types_1.ValidationFieldNames.lastname,
|
|
55
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Last Name'),
|
|
56
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'last name'),
|
|
57
|
+
regex: /^[a-zA-Z]+(([',. -][a-zA-Z ])?[a-zA-Z])*$/,
|
|
58
|
+
}),
|
|
59
|
+
});
|
|
68
60
|
exports.nameValidation = nameValidation;
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
tc: yup.string().required().oneOf(['true'], 'Required field'),
|
|
81
|
-
});
|
|
82
|
-
};
|
|
61
|
+
const accountCreationPage = ({ getFieldValidation, requiredMessage, wrongFormatMessage, }) => (0, exports.nameValidation)({
|
|
62
|
+
getFieldValidation,
|
|
63
|
+
requiredMessage,
|
|
64
|
+
wrongFormatMessage,
|
|
65
|
+
}).shape({
|
|
66
|
+
title: yup.string().required('Title is required'),
|
|
67
|
+
yyyy: yup.string().required('Year is required').min(4).max(4),
|
|
68
|
+
mm: yup.string().required('Month is required').min(2).max(2),
|
|
69
|
+
dd: yup.string().required('Day is required').min(2).max(2),
|
|
70
|
+
tc: yup.string().required().oneOf(['true'], 'Required field'),
|
|
71
|
+
});
|
|
83
72
|
exports.accountCreationPage = accountCreationPage;
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
}),
|
|
93
|
-
});
|
|
94
|
-
};
|
|
73
|
+
const displayNameValidation = ({ requiredMessage }) => yup.object().shape({
|
|
74
|
+
displayName: yup
|
|
75
|
+
.string() //Please enter your Display name'
|
|
76
|
+
.required(requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Display Name'))
|
|
77
|
+
.matches(/^[a-z\d\-\s]+$/i, {
|
|
78
|
+
message: 'Your Display name can only contain alphanumeric characters, hyphens, apostrophes and spaces',
|
|
79
|
+
}),
|
|
80
|
+
});
|
|
95
81
|
exports.displayNameValidation = displayNameValidation;
|
|
96
82
|
exports.newsletterSubscriptionValidation = yup.object({
|
|
97
83
|
bulletinId: yup.string(),
|
|
@@ -99,15 +85,12 @@ exports.newsletterSubscriptionValidation = yup.object({
|
|
|
99
85
|
exports.removeGroupAccountMemberValidation = yup.object({
|
|
100
86
|
shareId: yup.string(),
|
|
101
87
|
});
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
email: emailSchema(requiredMessage),
|
|
110
|
-
});
|
|
111
|
-
};
|
|
88
|
+
const familyInviteValidation = ({ getFieldValidation, requiredMessage, wrongFormatMessage, }) => (0, exports.nameValidation)({
|
|
89
|
+
getFieldValidation,
|
|
90
|
+
requiredMessage,
|
|
91
|
+
wrongFormatMessage,
|
|
92
|
+
}).shape({
|
|
93
|
+
email: emailSchema(requiredMessage),
|
|
94
|
+
});
|
|
112
95
|
exports.familyInviteValidation = familyInviteValidation;
|
|
113
96
|
//# sourceMappingURL=accountInfo.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountInfo.js","sourceRoot":"","sources":["../../../src/validations/accountInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"accountInfo.js","sourceRoot":"","sources":["../../../src/validations/accountInfo.ts"],"names":[],"mappings":"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"}
|