badmfck-api-server 3.4.6 → 3.4.8

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.
@@ -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}_optional` ? Base extends keyof T ? T[K] extends true ? Base : never : never : never]: true;
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,11 +31,15 @@ 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
- 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
- } & {
37
- -readonly [K in keyof CleanFields<T> as K extends OptionalFields<T> ? never : K]: K extends EnumFieldNames<T> ? EnumFieldValues<T>[K] : CleanFields<T>[K];
34
+ type ProcessField<F, Meta> = F extends readonly (infer Item)[] ? Item extends object ? ValidationModel<Item>[] : F : F extends object ? ValidationModel<F> : F;
35
+ type DeepMutable<T> = {
36
+ -readonly [P in keyof T]: T[P] extends object ? T[P] extends (...args: any[]) => any ? T[P] : DeepMutable<T[P]> : T[P];
38
37
  };
38
+ export type ValidationModel<T> = DeepMutable<{
39
+ [K in keyof CleanFields<T> as K extends OptionalFields<T> ? K : never]?: K extends EnumFieldNames<T> ? EnumFieldValues<T>[K] : ProcessField<CleanFields<T>[K], T>;
40
+ } & {
41
+ [K in keyof CleanFields<T> as K extends OptionalFields<T> ? never : K]: K extends EnumFieldNames<T> ? EnumFieldValues<T>[K] : ProcessField<CleanFields<T>[K], T>;
42
+ }>;
39
43
  export declare class Validator {
40
44
  static validateObject(fields: string[], object: any): boolean;
41
45
  static documentStructure(structure: any): Record<string, any> | undefined;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "badmfck-api-server",
3
- "version": "3.4.6",
3
+ "version": "3.4.8",
4
4
  "description": "Simple API http server based on express",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",