almighty-tool 0.0.33 → 0.0.35
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.
|
@@ -12,16 +12,12 @@ export interface GetErrorsOptions {
|
|
|
12
12
|
fieldValue?: ValidateValue;
|
|
13
13
|
}
|
|
14
14
|
export interface ValidateError extends OriginalValidateError {
|
|
15
|
-
/** 错误码 */
|
|
16
|
-
code?: string;
|
|
17
15
|
/** 模型 */
|
|
18
16
|
model?: string;
|
|
19
17
|
}
|
|
20
18
|
export interface ValidateResponse {
|
|
21
19
|
/** 是否成功 */
|
|
22
20
|
success: boolean;
|
|
23
|
-
/** 数据 */
|
|
24
|
-
values: ValidateValues;
|
|
25
21
|
/** 错误信息 */
|
|
26
22
|
errors?: ValidateError[];
|
|
27
23
|
}
|
|
@@ -35,25 +31,19 @@ declare const validateUtil: {
|
|
|
35
31
|
* @returns 校验器
|
|
36
32
|
*/
|
|
37
33
|
getSchema: (rules: ValidateRules | ValidateSchema) => ValidateSchema;
|
|
38
|
-
/**
|
|
39
|
-
* 获取错误信息
|
|
40
|
-
* @param error 错误信息
|
|
41
|
-
* @returns 错误信息
|
|
42
|
-
*/
|
|
43
34
|
getErrorMessage: (error: unknown) => any;
|
|
44
|
-
/**
|
|
45
|
-
* 获取错误码
|
|
46
|
-
* @param error 错误信息
|
|
47
|
-
* @returns 错误码
|
|
48
|
-
*/
|
|
49
|
-
getErrorCode: (error: unknown) => any;
|
|
50
35
|
/**
|
|
51
36
|
* 获取错误信息
|
|
52
37
|
* @param error 错误信息
|
|
53
38
|
* @param options 选项
|
|
54
39
|
* @returns 错误信息
|
|
55
40
|
*/
|
|
56
|
-
getErrors: (error: unknown, options?: GetErrorsOptions | undefined) => ValidateError[]
|
|
41
|
+
getErrors: (error: unknown, options?: GetErrorsOptions | undefined) => ValidateError[] | {
|
|
42
|
+
message: any;
|
|
43
|
+
model: string;
|
|
44
|
+
field?: string | undefined;
|
|
45
|
+
fieldValue?: any;
|
|
46
|
+
}[];
|
|
57
47
|
/**
|
|
58
48
|
* 校验数据
|
|
59
49
|
* @param rules 校验规则
|
|
@@ -2,10 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ValidateSchema = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
-
var inflection = (0, tslib_1.__importStar)(require("inflection"));
|
|
6
|
-
var lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
|
|
7
5
|
var async_validator_1 = (0, tslib_1.__importDefault)(require("async-validator"));
|
|
8
6
|
exports.ValidateSchema = async_validator_1.default;
|
|
7
|
+
var lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
|
|
9
8
|
/** 校验工具 */
|
|
10
9
|
var validateUtil = {
|
|
11
10
|
/**
|
|
@@ -19,30 +18,20 @@ var validateUtil = {
|
|
|
19
18
|
}
|
|
20
19
|
return new async_validator_1.default(rules);
|
|
21
20
|
},
|
|
22
|
-
/**
|
|
23
|
-
* 获取错误信息
|
|
24
|
-
* @param error 错误信息
|
|
25
|
-
* @returns 错误信息
|
|
26
|
-
*/
|
|
27
21
|
getErrorMessage: function (error) {
|
|
28
|
-
|
|
29
|
-
|
|
22
|
+
var _a;
|
|
23
|
+
if (typeof error === 'object' && error !== null && ('message' in error || 'msg' in error)) {
|
|
24
|
+
return (_a = Reflect.get(error, 'message')) !== null && _a !== void 0 ? _a : Reflect.get(error, 'msg');
|
|
30
25
|
}
|
|
31
26
|
if (typeof error === 'string') {
|
|
32
27
|
return error;
|
|
33
28
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
* @returns 错误码
|
|
40
|
-
*/
|
|
41
|
-
getErrorCode: function (error) {
|
|
42
|
-
if (typeof error === 'object' && error !== null && 'name' in error && typeof Reflect.get(error, 'name') === 'string') {
|
|
43
|
-
return Reflect.get(error, 'name');
|
|
29
|
+
try {
|
|
30
|
+
return JSON.stringify(error);
|
|
31
|
+
}
|
|
32
|
+
catch (err) {
|
|
33
|
+
return error;
|
|
44
34
|
}
|
|
45
|
-
return 'ValidateError.Failed';
|
|
46
35
|
},
|
|
47
36
|
/**
|
|
48
37
|
* 获取错误信息
|
|
@@ -51,28 +40,19 @@ var validateUtil = {
|
|
|
51
40
|
* @returns 错误信息
|
|
52
41
|
*/
|
|
53
42
|
getErrors: function (error, options) {
|
|
43
|
+
var _a;
|
|
44
|
+
var model = (_a = options === null || options === void 0 ? void 0 : options.model) !== null && _a !== void 0 ? _a : 'Base';
|
|
54
45
|
if (typeof error === 'object' && error !== null && 'errors' in error) {
|
|
55
|
-
var messageToCode_1 = function (str) {
|
|
56
|
-
var regex = /[a-zA-Z0-9]+/g;
|
|
57
|
-
var matches = str.match(regex) || [];
|
|
58
|
-
return matches.map(function (word) { return word.toLowerCase(); }).join('_');
|
|
59
|
-
};
|
|
60
46
|
return Reflect.get(error, 'errors').map(function (err) {
|
|
61
|
-
|
|
62
|
-
var parts = ((_a = Reflect.get(err, 'message')) !== null && _a !== void 0 ? _a : '').split('.').map(function (part) {
|
|
63
|
-
return inflection.camelize(messageToCode_1(part));
|
|
64
|
-
});
|
|
65
|
-
var code = "ValidateError.".concat(parts.length ? parts.join('.') : 'Failed');
|
|
66
|
-
return (0, tslib_1.__assign)((0, tslib_1.__assign)({}, lodash_1.default.pick(err, ['message', 'field', 'fieldValue'])), { code: code, model: options === null || options === void 0 ? void 0 : options.model });
|
|
47
|
+
return (0, tslib_1.__assign)((0, tslib_1.__assign)({}, lodash_1.default.pick(err, ['field', 'fieldValue'])), { message: validateUtil.getErrorMessage(err.message), model: model });
|
|
67
48
|
});
|
|
68
49
|
}
|
|
69
50
|
return [
|
|
70
51
|
{
|
|
71
52
|
message: validateUtil.getErrorMessage(error),
|
|
72
|
-
code: validateUtil.getErrorCode(error),
|
|
73
53
|
fieldValue: options === null || options === void 0 ? void 0 : options.fieldValue,
|
|
74
54
|
field: options === null || options === void 0 ? void 0 : options.field,
|
|
75
|
-
model:
|
|
55
|
+
model: model,
|
|
76
56
|
},
|
|
77
57
|
];
|
|
78
58
|
},
|
|
@@ -83,7 +63,7 @@ var validateUtil = {
|
|
|
83
63
|
* @returns 校验结果
|
|
84
64
|
*/
|
|
85
65
|
validate: function (rules, data, options, callback) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
|
|
86
|
-
var model,
|
|
66
|
+
var model, error_1;
|
|
87
67
|
var _a;
|
|
88
68
|
return (0, tslib_1.__generator)(this, function (_b) {
|
|
89
69
|
switch (_b.label) {
|
|
@@ -94,16 +74,14 @@ var validateUtil = {
|
|
|
94
74
|
_b.trys.push([1, 3, , 4]);
|
|
95
75
|
return [4 /*yield*/, validateUtil.getSchema(rules).validate(data, options, callback)];
|
|
96
76
|
case 2:
|
|
97
|
-
|
|
77
|
+
_b.sent();
|
|
98
78
|
return [2 /*return*/, {
|
|
99
79
|
success: true,
|
|
100
|
-
values: values,
|
|
101
80
|
}];
|
|
102
81
|
case 3:
|
|
103
82
|
error_1 = _b.sent();
|
|
104
83
|
return [2 /*return*/, {
|
|
105
84
|
success: false,
|
|
106
|
-
values: data,
|
|
107
85
|
errors: validateUtil.getErrors(error_1, { model: model }),
|
|
108
86
|
}];
|
|
109
87
|
case 4: return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.util.js","sourceRoot":"","sources":["../../src/utils/validate.util.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"validate.util.js","sourceRoot":"","sources":["../../src/utils/validate.util.ts"],"names":[],"mappings":";;;;AAAA,iFAkByB;AA6BhB,yBA/CF,yBAAc,CA+CE;AA5BvB,+DAAuB;AAgDvB,WAAW;AACX,IAAM,YAAY,GAAG;IACnB;;;;OAIG;IACH,SAAS,EAAE,UAAC,KAAqC;QAC/C,IAAI,KAAK,YAAY,yBAAc,EAAE;YACnC,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,yBAAc,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,eAAe,EAAE,UAAC,KAAc;;QAC9B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,SAAS,IAAI,KAAK,IAAI,KAAK,IAAI,KAAK,CAAC,EAAE;YACzF,OAAO,MAAA,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,mCAAI,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACnE;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,OAAO,KAAK,CAAC;SACd;QAED,IAAI;YACF,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC9B;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAED;;;;;OAKG;IACH,SAAS,EAAE,UAAC,KAAc,EAAE,OAA0B;;QACpD,IAAM,KAAK,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,mCAAI,MAAM,CAAC;QAEvC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,QAAQ,IAAI,KAAK,EAAE;YACpE,OAAQ,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAqB,CAAC,GAAG,CAAC,UAAC,GAAG;gBAC/D,uDACK,gBAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,KACvC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAClD,KAAK,OAAA,IACL;YACJ,CAAC,CAAC,CAAC;SACJ;QAED,OAAO;YACL;gBACE,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,KAAK,CAAC;gBAC5C,UAAU,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU;gBAC/B,KAAK,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK;gBACrB,KAAK,OAAA;aACN;SACiB,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,QAAQ,EAAE,UACR,KAAqC,EACrC,IAAoB,EACpB,OAAwB,EACxB,QAA2B;;;;;;oBAErB,KAAK,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,mCAAI,MAAM,CAAC;;;;oBAGrC,qBAAM,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAA;;oBAArE,SAAqE,CAAC;oBACtE,sBAAO;4BACL,OAAO,EAAE,IAAI;yBACd,EAAC;;;oBAEF,sBAAO;4BACL,OAAO,EAAE,KAAK;4BACd,MAAM,EAAE,YAAY,CAAC,SAAS,CAAC,OAAK,EAAE,EAAE,KAAK,OAAA,EAAE,CAAC;yBACjD,EAAC;;;;SAEL;CACF,CAAC;AAEF,kBAAe,YAAY,CAAC"}
|