badmfck-api-server 3.4.5 → 3.4.7
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.
|
@@ -95,7 +95,7 @@ async function Initializer(services) {
|
|
|
95
95
|
exports.Initializer = Initializer;
|
|
96
96
|
class APIService extends BaseService_1.BaseService {
|
|
97
97
|
static nextLogID = 0;
|
|
98
|
-
version = "3.4.
|
|
98
|
+
version = "3.4.6";
|
|
99
99
|
options;
|
|
100
100
|
monitor = null;
|
|
101
101
|
started = new Date();
|
|
@@ -20,7 +20,7 @@ export declare enum ValidationReport {
|
|
|
20
20
|
VALUE_INCORRECT = 6
|
|
21
21
|
}
|
|
22
22
|
type ExtractOptionalFieldNames<T> = {
|
|
23
|
-
[K in keyof T as K extends `$__${infer Base}
|
|
23
|
+
[K in keyof T as K extends `$__${infer Base}_optinal` ? Base extends keyof T ? T[K] extends true ? Base : never : never : never]: true;
|
|
24
24
|
};
|
|
25
25
|
type OptionalFields<T> = keyof ExtractOptionalFieldNames<T> & string;
|
|
26
26
|
type ExtractEnumValues<T> = {
|
|
@@ -31,10 +31,11 @@ type EnumFieldValues<T> = ExtractEnumValues<T>;
|
|
|
31
31
|
type CleanFields<T> = {
|
|
32
32
|
[K in keyof T as K extends `$__${string}` ? never : K]: T[K];
|
|
33
33
|
};
|
|
34
|
+
type ProcessField<F, Meta> = F extends readonly (infer Item)[] ? Item extends object ? ValidationModel<Item>[] : F : F extends object ? ValidationModel<F> : F;
|
|
34
35
|
export type ValidationModel<T> = {
|
|
35
|
-
-readonly [K in keyof CleanFields<T> as K extends OptionalFields<T> ? K : never]?: K extends EnumFieldNames<T> ? EnumFieldValues<T>[K] : CleanFields<T>[K]
|
|
36
|
+
-readonly [K in keyof CleanFields<T> as K extends OptionalFields<T> ? K : never]?: K extends EnumFieldNames<T> ? EnumFieldValues<T>[K] : ProcessField<CleanFields<T>[K], T>;
|
|
36
37
|
} & {
|
|
37
|
-
-readonly [K in keyof CleanFields<T> as K extends OptionalFields<T> ? never : K]: K extends EnumFieldNames<T> ? EnumFieldValues<T>[K] : CleanFields<T>[K]
|
|
38
|
+
-readonly [K in keyof CleanFields<T> as K extends OptionalFields<T> ? never : K]: K extends EnumFieldNames<T> ? EnumFieldValues<T>[K] : ProcessField<CleanFields<T>[K], T>;
|
|
38
39
|
};
|
|
39
40
|
export declare class Validator {
|
|
40
41
|
static validateObject(fields: string[], object: any): boolean;
|
|
@@ -38,6 +38,7 @@ class Validator {
|
|
|
38
38
|
let regex = structure['$__' + i + '_regex'] || undefined;
|
|
39
39
|
let min = structure['$__' + i + "_min"] || undefined;
|
|
40
40
|
let max = structure['$__' + i + "_max"] || undefined;
|
|
41
|
+
let values = structure['$__' + i + "_values"] || undefined;
|
|
41
42
|
if (optional === undefined)
|
|
42
43
|
optional = structure[i] === null || structure[i] === undefined;
|
|
43
44
|
if (type === "object" && Array.isArray(structure[i]))
|
|
@@ -53,6 +54,7 @@ class Validator {
|
|
|
53
54
|
regex: regex,
|
|
54
55
|
min: min,
|
|
55
56
|
max: max,
|
|
57
|
+
values: values,
|
|
56
58
|
childs: childs
|
|
57
59
|
};
|
|
58
60
|
}
|