almighty-tool 0.0.32 → 0.0.34
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.
|
@@ -1,15 +1,32 @@
|
|
|
1
|
-
import ValidateSchema, { ValidateError as OriginalValidateError, ExecuteRule as ValidateExecuteRule, ExecuteValidator as ValidateExecuteValidator, InternalRuleItem as ValidateInternalRuleItem, InternalValidateMessages as ValidateInternalValidateMessages, Rule as ValidateRule, RuleItem as ValidateRuleItem, Rules as ValidateRules, RuleType as ValidateRuleType, RuleValuePackage as ValidateRuleValuePackage,
|
|
2
|
-
export
|
|
3
|
-
|
|
1
|
+
import ValidateSchema, { ValidateError as OriginalValidateError, ValidateOption as OriginalValidateOption, ValidateCallback, ExecuteRule as ValidateExecuteRule, ExecuteValidator as ValidateExecuteValidator, ValidateFieldsError, InternalRuleItem as ValidateInternalRuleItem, InternalValidateMessages as ValidateInternalValidateMessages, ValidateMessages, ValidateResult, Rule as ValidateRule, RuleItem as ValidateRuleItem, Rules as ValidateRules, RuleType as ValidateRuleType, RuleValuePackage as ValidateRuleValuePackage, Value as ValidateValue, Values as ValidateValues } from 'async-validator';
|
|
2
|
+
export interface ValidateOption extends OriginalValidateOption {
|
|
3
|
+
/** 模型 */
|
|
4
|
+
model?: string;
|
|
5
|
+
}
|
|
6
|
+
export interface GetErrorsOptions {
|
|
7
|
+
/** 模型 */
|
|
8
|
+
model?: string;
|
|
9
|
+
/** 字段 */
|
|
10
|
+
field?: string;
|
|
11
|
+
/** 字段值 */
|
|
12
|
+
fieldValue?: ValidateValue;
|
|
13
|
+
}
|
|
4
14
|
export interface ValidateError extends OriginalValidateError {
|
|
15
|
+
/** 错误码 */
|
|
5
16
|
code?: string;
|
|
17
|
+
/** 模型 */
|
|
18
|
+
model?: string;
|
|
6
19
|
}
|
|
7
20
|
export interface ValidateResponse {
|
|
8
21
|
/** 是否成功 */
|
|
9
22
|
success: boolean;
|
|
23
|
+
/** 数据 */
|
|
24
|
+
values: ValidateValues;
|
|
10
25
|
/** 错误信息 */
|
|
11
26
|
errors?: ValidateError[];
|
|
12
27
|
}
|
|
28
|
+
export { ValidateSchema };
|
|
29
|
+
export type { ValidateCallback, ValidateExecuteRule, ValidateExecuteValidator, ValidateFieldsError, ValidateInternalRuleItem, ValidateInternalValidateMessages, ValidateMessages, ValidateResult, ValidateRule, ValidateRuleItem, ValidateRules, ValidateRuleType, ValidateRuleValuePackage, ValidateValue, ValidateValues, };
|
|
13
30
|
/** 校验工具 */
|
|
14
31
|
declare const validateUtil: {
|
|
15
32
|
/**
|
|
@@ -36,16 +53,13 @@ declare const validateUtil: {
|
|
|
36
53
|
* @param options 选项
|
|
37
54
|
* @returns 错误信息
|
|
38
55
|
*/
|
|
39
|
-
getErrors: (error: unknown, options?:
|
|
40
|
-
field?: string | undefined;
|
|
41
|
-
fieldValue?: any;
|
|
42
|
-
} | undefined) => ValidateError[];
|
|
56
|
+
getErrors: (error: unknown, options?: GetErrorsOptions | undefined) => ValidateError[];
|
|
43
57
|
/**
|
|
44
58
|
* 校验数据
|
|
45
59
|
* @param rules 校验规则
|
|
46
60
|
* @param data 数据
|
|
47
61
|
* @returns 校验结果
|
|
48
62
|
*/
|
|
49
|
-
validate: (rules: ValidateRules | ValidateSchema, data: ValidateValues) => Promise<ValidateResponse>;
|
|
63
|
+
validate: (rules: ValidateRules | ValidateSchema, data: ValidateValues, options?: ValidateOption | undefined, callback?: ValidateCallback | undefined) => Promise<ValidateResponse>;
|
|
50
64
|
};
|
|
51
65
|
export default validateUtil;
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ValidateSchema = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
-
var lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
|
|
6
5
|
var inflection = (0, tslib_1.__importStar)(require("inflection"));
|
|
6
|
+
var lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
|
|
7
7
|
var async_validator_1 = (0, tslib_1.__importDefault)(require("async-validator"));
|
|
8
8
|
exports.ValidateSchema = async_validator_1.default;
|
|
9
9
|
/** 校验工具 */
|
|
@@ -51,7 +51,6 @@ var validateUtil = {
|
|
|
51
51
|
* @returns 错误信息
|
|
52
52
|
*/
|
|
53
53
|
getErrors: function (error, options) {
|
|
54
|
-
var _a, _b;
|
|
55
54
|
if (typeof error === 'object' && error !== null && 'errors' in error) {
|
|
56
55
|
var messageToCode_1 = function (str) {
|
|
57
56
|
var regex = /[a-zA-Z0-9]+/g;
|
|
@@ -60,19 +59,21 @@ var validateUtil = {
|
|
|
60
59
|
};
|
|
61
60
|
return Reflect.get(error, 'errors').map(function (err) {
|
|
62
61
|
var _a;
|
|
63
|
-
var
|
|
62
|
+
var errMessage = (_a = Reflect.get(err, 'message')) !== null && _a !== void 0 ? _a : '';
|
|
63
|
+
var parts = (typeof errMessage === 'string' ? errMessage : '').split('.').map(function (part) {
|
|
64
64
|
return inflection.camelize(messageToCode_1(part));
|
|
65
65
|
});
|
|
66
66
|
var code = "ValidateError.".concat(parts.length ? parts.join('.') : 'Failed');
|
|
67
|
-
return (0, tslib_1.__assign)((0, tslib_1.__assign)({}, lodash_1.default.pick(err, ['message', 'field', 'fieldValue'])), { code: code });
|
|
67
|
+
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 });
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
70
|
return [
|
|
71
71
|
{
|
|
72
72
|
message: validateUtil.getErrorMessage(error),
|
|
73
73
|
code: validateUtil.getErrorCode(error),
|
|
74
|
-
fieldValue:
|
|
75
|
-
field:
|
|
74
|
+
fieldValue: options === null || options === void 0 ? void 0 : options.fieldValue,
|
|
75
|
+
field: options === null || options === void 0 ? void 0 : options.field,
|
|
76
|
+
model: options === null || options === void 0 ? void 0 : options.model,
|
|
76
77
|
},
|
|
77
78
|
];
|
|
78
79
|
},
|
|
@@ -82,25 +83,31 @@ var validateUtil = {
|
|
|
82
83
|
* @param data 数据
|
|
83
84
|
* @returns 校验结果
|
|
84
85
|
*/
|
|
85
|
-
validate: function (rules, data) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
|
|
86
|
-
var error_1;
|
|
87
|
-
|
|
88
|
-
|
|
86
|
+
validate: function (rules, data, options, callback) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
|
|
87
|
+
var model, values, error_1;
|
|
88
|
+
var _a;
|
|
89
|
+
return (0, tslib_1.__generator)(this, function (_b) {
|
|
90
|
+
switch (_b.label) {
|
|
89
91
|
case 0:
|
|
90
|
-
_a.
|
|
91
|
-
|
|
92
|
+
model = (_a = options === null || options === void 0 ? void 0 : options.model) !== null && _a !== void 0 ? _a : 'Base';
|
|
93
|
+
_b.label = 1;
|
|
92
94
|
case 1:
|
|
93
|
-
|
|
95
|
+
_b.trys.push([1, 3, , 4]);
|
|
96
|
+
return [4 /*yield*/, validateUtil.getSchema(rules).validate(data, options, callback)];
|
|
97
|
+
case 2:
|
|
98
|
+
values = _b.sent();
|
|
94
99
|
return [2 /*return*/, {
|
|
95
100
|
success: true,
|
|
101
|
+
values: values,
|
|
96
102
|
}];
|
|
97
|
-
case
|
|
98
|
-
error_1 =
|
|
103
|
+
case 3:
|
|
104
|
+
error_1 = _b.sent();
|
|
99
105
|
return [2 /*return*/, {
|
|
100
106
|
success: false,
|
|
101
|
-
|
|
107
|
+
values: data,
|
|
108
|
+
errors: validateUtil.getErrors(error_1, { model: model }),
|
|
102
109
|
}];
|
|
103
|
-
case
|
|
110
|
+
case 4: return [2 /*return*/];
|
|
104
111
|
}
|
|
105
112
|
});
|
|
106
113
|
}); },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.util.js","sourceRoot":"","sources":["../../src/utils/validate.util.ts"],"names":[],"mappings":";;;;AAAA,+DAAuB;
|
|
1
|
+
{"version":3,"file":"validate.util.js","sourceRoot":"","sources":["../../src/utils/validate.util.ts"],"names":[],"mappings":"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"}
|