ph-utils 0.11.1 → 0.11.2
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/lib/dom.d.ts +1 -0
- package/lib/validator.js +13 -9
- package/package.json +1 -1
package/lib/dom.d.ts
CHANGED
package/lib/validator.js
CHANGED
@@ -32,11 +32,11 @@ const ruleFns = {
|
|
32
32
|
},
|
33
33
|
};
|
34
34
|
class ValidateError extends Error {
|
35
|
-
constructor(
|
36
|
-
super(
|
35
|
+
constructor(detail, key, message) {
|
36
|
+
super(message);
|
37
37
|
this.name = "ValidateError";
|
38
|
-
this.key =
|
39
|
-
this.
|
38
|
+
this.key = key;
|
39
|
+
this.detail = detail;
|
40
40
|
}
|
41
41
|
}
|
42
42
|
/**
|
@@ -80,21 +80,25 @@ class Validator {
|
|
80
80
|
*/
|
81
81
|
async validate(data, all = false) {
|
82
82
|
return new Promise((resolve, reject) => {
|
83
|
-
const
|
83
|
+
const detail = {};
|
84
|
+
let currentKey = undefined;
|
85
|
+
let currentMessage = undefined;
|
84
86
|
for (let key in this.rules) {
|
85
87
|
let errMsg = this._validateRule(this.rules[key], data[key], data);
|
86
88
|
if (errMsg !== "") {
|
87
89
|
errMsg = errMsg.replace("%s", key);
|
88
|
-
|
90
|
+
detail[key] = errMsg;
|
91
|
+
currentKey = key;
|
92
|
+
currentMessage = errMsg;
|
89
93
|
if (all)
|
90
94
|
break;
|
91
95
|
}
|
92
96
|
}
|
93
|
-
if (
|
97
|
+
if (currentKey == null) {
|
94
98
|
resolve(true);
|
95
99
|
}
|
96
100
|
else {
|
97
|
-
reject(new ValidateError(
|
101
|
+
reject(new ValidateError(detail, currentKey, currentMessage));
|
98
102
|
}
|
99
103
|
});
|
100
104
|
}
|
@@ -114,7 +118,7 @@ class Validator {
|
|
114
118
|
let errMsg = this._validateRule(keyRules, value, data);
|
115
119
|
if (errMsg !== "") {
|
116
120
|
errMsg = errMsg.replace("%s", key);
|
117
|
-
reject(new ValidateError(
|
121
|
+
reject(new ValidateError({ [key]: errMsg }, key, errMsg));
|
118
122
|
}
|
119
123
|
else {
|
120
124
|
resolve(true);
|