@nattyjs/entity 0.0.1-beta.4 → 0.0.1-beta.41
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/index.cjs +9 -3
- package/dist/index.mjs +9 -3
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
|
@@ -160,14 +160,20 @@ const ValidatorNames = {
|
|
|
160
160
|
|
|
161
161
|
class ValidationMessage {
|
|
162
162
|
static getValidatorErrorMessage(name) {
|
|
163
|
-
const
|
|
163
|
+
const validator = common.commonContainer.nattyConfig.modelBinding?.errorMessage?.validator;
|
|
164
|
+
const message = validator ? validator[name] : "";
|
|
164
165
|
return message;
|
|
165
166
|
}
|
|
166
167
|
static toJson(key, config, values) {
|
|
167
168
|
let message = config ? config.message : null;
|
|
169
|
+
let messageKey = void 0;
|
|
168
170
|
if (!message && config && config.messageKey)
|
|
169
|
-
config.messageKey;
|
|
170
|
-
let messageText =
|
|
171
|
+
messageKey = config.messageKey;
|
|
172
|
+
let messageText = "";
|
|
173
|
+
if (messageKey) {
|
|
174
|
+
messageText = ValidationMessage.getValidatorErrorMessage(config.messageKey);
|
|
175
|
+
} else
|
|
176
|
+
messageText = message || ValidationMessage.getValidatorErrorMessage(key);
|
|
171
177
|
messageText = messageText || common.BLANK;
|
|
172
178
|
values.forEach((t, index) => {
|
|
173
179
|
messageText = messageText.replace(`{{${index}}}`, t);
|
package/dist/index.mjs
CHANGED
|
@@ -158,14 +158,20 @@ const ValidatorNames = {
|
|
|
158
158
|
|
|
159
159
|
class ValidationMessage {
|
|
160
160
|
static getValidatorErrorMessage(name) {
|
|
161
|
-
const
|
|
161
|
+
const validator = commonContainer.nattyConfig.modelBinding?.errorMessage?.validator;
|
|
162
|
+
const message = validator ? validator[name] : "";
|
|
162
163
|
return message;
|
|
163
164
|
}
|
|
164
165
|
static toJson(key, config, values) {
|
|
165
166
|
let message = config ? config.message : null;
|
|
167
|
+
let messageKey = void 0;
|
|
166
168
|
if (!message && config && config.messageKey)
|
|
167
|
-
config.messageKey;
|
|
168
|
-
let messageText =
|
|
169
|
+
messageKey = config.messageKey;
|
|
170
|
+
let messageText = "";
|
|
171
|
+
if (messageKey) {
|
|
172
|
+
messageText = ValidationMessage.getValidatorErrorMessage(config.messageKey);
|
|
173
|
+
} else
|
|
174
|
+
messageText = message || ValidationMessage.getValidatorErrorMessage(key);
|
|
169
175
|
messageText = messageText || BLANK;
|
|
170
176
|
values.forEach((t, index) => {
|
|
171
177
|
messageText = messageText.replace(`{{${index}}}`, t);
|