badmfck-api-server 3.9.5 → 3.9.7

package/dist/apiServer/APIService.js

@@ -93,7 +93,7 @@ async function Initializer(services) {
 }
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
-    version = "3.9.5";
+    version = "3.9.7";
     options;
     monitor = null;
     started = new Date();

package/dist/apiServer/helper/Validator.d.ts

@@ -1,9 +1,3 @@
-type SyncOptions = {
-    fillOnlyWhenNull?: boolean;
-    resetOnTypeMismatch?: boolean;
-    repairArrayItems?: "coerce";
-    coerceArrayFromObject?: "values" | "numericKeys" | "wrap" | "off";
-};
 export type TValidatorType = "string" | "number" | "boolean" | "date" | "array" | "object" | "email" | "phone";
 export interface IStructureOptions {
     optional?: boolean;
@@ -39,9 +33,9 @@ type WidenLiteral<T> = T extends string ? string : T extends number ? number : T
 type WidenLiterals<T> = {
     [K in keyof T]: T[K] extends readonly (infer R)[] ? readonly WidenLiteral<R>[] : T[K] extends (infer R)[] ? WidenLiteral<R>[] : T[K] extends object ? WidenLiterals<T[K]> : WidenLiteral<T[K]>;
 };
-type DeepMutable<T> = {
-    -readonly [K in keyof T]: T[K] extends object ? T[K] extends (...args: any[]) => any ? T[K] : DeepMutable<T[K]> : T[K];
-};
+type DeepMutable<T> = T extends ReadonlyArray<infer U> ? DeepMutable<U>[] : T extends Array<infer U> ? DeepMutable<U>[] : T extends (...args: any[]) => any ? T : T extends object ? {
+    -readonly [K in keyof T]: DeepMutable<T[K]>;
+} : T;
 type IsNever<T> = [T] extends [never] ? true : false;
 type Or<A, B> = A extends true ? true : (B extends true ? true : false);
 type CleanFields<T> = WidenLiterals<{
@@ -62,7 +56,7 @@ type ExtractEnumValues<T> = {
 };
 type EnumFieldNames<T> = keyof ExtractEnumValues<T> & string;
 type EnumFieldValues<T> = ExtractEnumValues<T>;
-type ProcessField<F, Meta> = F extends readonly (infer Item)[] ? Item extends object ? ValidationModel<Item>[] : F : F extends (infer Item)[] ? Item extends object ? ValidationModel<Item>[] : F : F extends object ? ValidationModel<F> : F;
+type ProcessField<F, Meta> = F extends ReadonlyArray<infer Item> ? Item extends object ? ValidationModel<Item>[] : WidenLiteral<Item>[] : F extends Array<infer Item> ? Item extends object ? ValidationModel<Item>[] : WidenLiteral<Item>[] : F extends object ? ValidationModel<F> : WidenLiteral<F>;
 export type ValidationModel<T> = DeepMutable<{
     [K in keyof CleanFields<T> as K extends OptionalFields<T> ? K : never]?: K extends EnumFieldNames<T> ? EnumFieldValues<T>[K] : ProcessField<CleanFields<T>[K], T>;
 } & {
@@ -76,7 +70,7 @@ export declare class Validator {
     static filterStructure(structure: any, object: any): void;
     static isPlainObject(v: any): boolean;
     static clone<T>(v: T): T;
-    static syncStructure(structure: any, object: any, opts?: SyncOptions): any;
+    static syncStructure(structure: any, node: any): any;
     static convertToType<T>(value: any, type: "string" | "number" | "boolean" | "date"): T | null;
     static validateValue(value: string | number | boolean, opt?: IValidatorOptions): ValidationReport;
 }

package/dist/apiServer/helper/Validator.js

@@ -301,114 +301,85 @@ class Validator {
             return structuredClone(v);
         return JSON.parse(JSON.stringify(v));
     }
-    static syncStructure(structure, object, opts = {
-        fillOnlyWhenNull: true,
-        resetOnTypeMismatch: true,
-        repairArrayItems: "coerce",
-        coerceArrayFromObject: "values"
-    }) {
+    static syncStructure(structure, node) {
         if (structure === null || typeof structure !== "object")
-            return object;
+            return node;
         if (Array.isArray(structure)) {
             const tmpl = structure[0];
-            if (!Array.isArray(object) && this.isPlainObject(object)) {
-                const mode = opts.coerceArrayFromObject ?? "values";
-                if (mode === "numericKeys") {
-                    const numeric = Object.keys(object).filter(k => String(+k) === k).map(k => +k).sort((a, b) => a - b);
-                    object = numeric.map(i => object[String(i)]);
-                }
-                else if (mode === "wrap" && this.isPlainObject(tmpl)) {
-                    object = [object];
-                }
-                else if (mode === "values") {
-                    object = Object.values(object);
-                }
-                else {
-                    return object;
-                }
+            if (!Array.isArray(node) && this.isPlainObject(node)) {
+                const numericKeys = Object.keys(node)
+                    .filter((k) => String(+k) === k)
+                    .map((k) => +k)
+                    .sort((a, b) => a - b);
+                const items = numericKeys.length > 0
+                    ? numericKeys.map((i) => node[String(i)])
+                    : Object.values(node);
+                node = items.map((it) => this.syncStructure(tmpl, it));
+                return node;
             }
-            if (!Array.isArray(object))
-                return object;
+            if (!Array.isArray(node))
+                return node;
             if (tmpl !== undefined) {
-                for (let i = 0; i < object.length; i++) {
-                    let item = object[i];
+                for (let i = 0; i < node.length; i++) {
+                    const item = node[i];
                     if (item === null || item === undefined) {
-                        object[i] = this.clone(tmpl);
-                        this.syncStructure(tmpl, object[i], opts);
+                        node[i] = this.clone(tmpl);
+                        node[i] = this.syncStructure(tmpl, node[i]);
                         continue;
                     }
                     if (this.isPlainObject(tmpl) && this.isPlainObject(item)) {
-                        this.syncStructure(tmpl, item, opts);
+                        node[i] = this.syncStructure(tmpl, item);
                         continue;
                     }
                     if (Array.isArray(tmpl) && Array.isArray(item)) {
-                        this.syncStructure(tmpl, item, opts);
+                        node[i] = this.syncStructure(tmpl, item);
                         continue;
                     }
-                    if (opts.repairArrayItems === "coerce") {
-                        object[i] = this.clone(tmpl);
-                        this.syncStructure(tmpl, object[i], opts);
-                    }
+                    node[i] = this.clone(tmpl);
+                    node[i] = this.syncStructure(tmpl, node[i]);
                 }
             }
-            return object;
+            return node;
         }
-        if (!this.isPlainObject(object))
-            return object;
-        for (const key in object) {
-            if (!(key in structure))
-                delete object[key];
+        if (!this.isPlainObject(node))
+            return node;
+        for (const k of Object.keys(node)) {
+            if (!(k in structure))
+                delete node[k];
         }
-        for (const key in structure) {
-            const structureValue = structure[key];
-            const hasKey = Object.prototype.hasOwnProperty.call(object, key);
-            const { optional = false, skip_validation = false } = (Validator.parseStructureOptions(key, structure) || {});
-            const objectValue = object[key];
-            if (!hasKey) {
-                object[key] = this.clone(structureValue);
+        for (const k of Object.keys(structure)) {
+            const sv = structure[k];
+            if (k.startsWith("$__")) {
+                node[k] = this.clone(sv);
                 continue;
             }
-            if (key.startsWith("$__")) {
-                object[key] = this.clone(structureValue);
-                continue;
-            }
-            if ((objectValue === null || objectValue === undefined) && structureValue !== null) {
-                if (!optional || skip_validation) {
-                    object[key] = this.clone(structureValue);
-                }
+            const has = Object.prototype.hasOwnProperty.call(node, k);
+            const ov = has ? node[k] : undefined;
+            if (!has) {
+                node[k] = this.clone(sv);
+                if (sv && typeof sv === "object")
+                    node[k] = this.syncStructure(sv, node[k]);
                 continue;
             }
-            const svIsObj = this.isPlainObject(structureValue);
-            const ovIsObj = this.isPlainObject(objectValue);
-            const svIsArr = Array.isArray(structureValue);
-            const ovIsArr = Array.isArray(objectValue);
-            if (svIsObj || svIsArr) {
-                if ((svIsObj && !ovIsObj) || (svIsArr && !ovIsArr)) {
-                    if (opts.resetOnTypeMismatch && svIsObj) {
-                        const base = this.clone(structureValue);
-                        if (this.isPlainObject(objectValue)) {
-                            for (const k in objectValue)
-                                base[k] = objectValue[k];
-                            this.syncStructure(structureValue, base, opts);
-                            object[key] = base;
-                        }
-                        else {
-                            object[key] = base;
-                        }
-                    }
+            const { optional, default: def } = this.parseStructureOptions(k, structure);
+            if (ov === null || ov === undefined) {
+                if (def !== undefined && !optional) {
+                    node[k] = this.clone(def);
+                    continue;
                 }
-                else {
-                    this.syncStructure(structureValue, objectValue, opts);
+                if (!optional) {
+                    node[k] = this.clone(sv);
+                    if (sv && typeof sv === "object")
+                        node[k] = this.syncStructure(sv, node[k]);
+                    continue;
                 }
-                continue;
             }
-            if (typeof objectValue !== typeof structureValue) {
-                if (opts.resetOnTypeMismatch) {
-                    object[key] = this.clone(structureValue);
-                }
+            if (sv && typeof sv === "object") {
+                node[k] = this.syncStructure(sv, ov);
+                continue;
             }
         }
-        return object;
+        return node;
     }
     static convertToType(value, type) {
         if (value === null || value === undefined)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badmfck-api-server",
-  "version": "3.9.5",
+  "version": "3.9.7",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",