badmfck-api-server 3.4.0 → 3.4.2

package/dist/apiServer/APIService.d.ts

@@ -65,7 +65,6 @@ export declare class APIService extends BaseService {
     private monitor;
     private started;
     private requestsCount;
-    private server;
     netLog: APIServiceNetworkLogItem[];
     constructor(options?: APIServiceOptions | null);
     init(): Promise<void>;

package/dist/apiServer/APIService.js

@@ -95,12 +95,11 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "3.4.0";
+    version = "3.4.1";
     options;
     monitor = null;
     started = new Date();
     requestsCount = 0;
-    server = http_1.default;
     netLog = [];
     constructor(options) {
         super('HTTP Service');
@@ -157,7 +156,7 @@ class APIService extends BaseService_1.BaseService {
         };
         const app = (0, express_1.default)();
         const server = http_1.default.createServer(app);
-        exports.REQ_HTTP_SERVER.listener = async (ignore) => { return { express: app, http: server }; };
+        exports.REQ_HTTP_SERVER.listener = async (_) => { return { express: app, http: server }; };
         if (this.options.isProductionEnvironment)
             app.set("env", 'production');
         app.use(express_1.default.json({ limit: '10mb' }));

package/dist/apiServer/db/MysqlAdapter.js

@@ -386,6 +386,8 @@ class MysqlAdapter {
         if (fields) {
             for (let i in fields) {
                 const name = i;
+                if (name.startsWith("$__"))
+                    continue;
                 let queryField = fields[i];
                 if (queryField === undefined)
                     continue;
@@ -409,6 +411,8 @@ class MysqlAdapter {
             let insertFieldValues = [];
             for (let i in fields) {
                 let f = fields[i];
+                if (f.name?.startsWith("$__"))
+                    continue;
                 if (f.ignoreInInsert)
                     continue;
                 insertFieldNames.push('`' + f.name + '`');
@@ -423,6 +427,8 @@ class MysqlAdapter {
             let oninsertValues = [];
             for (let i in fields) {
                 let f = fields[i];
+                if (f.name?.startsWith("$__"))
+                    continue;
                 if (f.ignoreInInsert)
                     continue;
                 oninsertNames.push(f.name);
@@ -434,6 +440,8 @@ class MysqlAdapter {
             let onUpdate = [];
             for (let i in fields) {
                 let f = fields[i];
+                if (f.name?.startsWith("$__"))
+                    continue;
                 if (f.ignoreInUpdate)
                     continue;
                 onUpdate.push('`' + f.name + '` = ' + f.__parsedValue);
@@ -444,6 +452,8 @@ class MysqlAdapter {
             let onDuplicate = [];
             for (let i in fields) {
                 let f = fields[i];
+                if (f.name?.startsWith("$__"))
+                    continue;
                 if (!f.useInReplace)
                     continue;
                 onDuplicate.push('`' + f.name + f.__parsedValue);

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

@@ -19,6 +19,18 @@ export declare enum ValidationReport {
     VALUE_TOO_SHORT = 5,
     VALUE_INCORRECT = 6
 }
+type ExtractOptionalFieldNames<T> = {
+    [K in keyof T as K extends `$__${infer Base}_optinal` ? Base extends keyof T ? T[K] extends true ? Base : never : never : never]: true;
+};
+type OptionalFields<T> = keyof ExtractOptionalFieldNames<T> & string;
+type CleanFields<T> = {
+    [K in keyof T as K extends `$__${string}` ? never : K]: T[K];
+};
+export type ValidationModel<T> = {
+    [K in keyof CleanFields<T> as K extends OptionalFields<T> ? K : never]?: CleanFields<T>[K];
+} & {
+    [K in keyof CleanFields<T> as K extends OptionalFields<T> ? never : K]: CleanFields<T>[K];
+};
 export declare class Validator {
     static validateObject(fields: string[], object: any): boolean;
     static documentStructure(structure: any): Record<string, any> | undefined;
@@ -28,3 +40,4 @@ export declare class Validator {
     static convertToType<T>(value: any, type: "string" | "number" | "boolean" | "date"): T | null;
     static validateValue(value: string | number | boolean, opt?: IValidatorOptions): ValidationReport;
 }
+export {};

package/dist/apiServer/helper/Validator.js

@@ -91,11 +91,16 @@ class Validator {
             }
             let optional = structure['$__' + i + "_optional"] || false;
             if (!(i in object)) {
-                if (!optional)
-                    errors.push("no field '" + i + "'");
+                if (structure["$__" + i + "_default"]) {
+                    object[i] = structure["$__" + i + "_default"];
+                }
                 else {
-                    foundKeys.push(i);
-                    continue;
+                    if (!optional)
+                        errors.push("no field '" + i + "'");
+                    else {
+                        foundKeys.push(i);
+                        continue;
+                    }
                 }
             }
             if (typeof structure[i] === "number" && typeof object[i] === "string") {
@@ -126,6 +131,22 @@ class Validator {
                         errors.push("wrong value for field '" + i + "', expected " + expected.join(", ") + " got: " + value);
                 }
             }
+            if (structure['$__' + i + "_values"]) {
+                const values = structure['$__' + i + "_values"];
+                if (Array.isArray(values) && values.length) {
+                    if (!values.includes(object[i])) {
+                        let caseValue = null;
+                        for (let i of values) {
+                            const v = i.toLowerCase();
+                            if (v === (object[i] + "").toLowerCase()) {
+                                caseValue = object[i];
+                                break;
+                            }
+                        }
+                        errors.push("Wrong value for field '" + i + "'" + (caseValue ? ", check case for: " + caseValue : ""));
+                    }
+                }
+            }
             if (typeof structure[i] === "string" && structure["$__" + i + "_regex"]) {
                 const regex = structure["$__" + i + "_regex"];
                 const reg = new RegExp(regex);
@@ -145,6 +166,12 @@ class Validator {
                 }
             }
             if (typeof structure[i] === "number") {
+                if (typeof object[i] === "string") {
+                    if (object[i].indexOf("."))
+                        object[i] = parseFloat(object[i]);
+                    else
+                        object[i] = parseInt(object[i]);
+                }
                 if (isNaN(object[i]))
                     errors.push("wrong value for field '" + i + "', expected number got " + object[i]);
                 if (structure[i] != 0) {
@@ -170,6 +197,16 @@ class Validator {
                 if (object[i] > max)
                     errors.push("value for field '" + i + "' is too big, expected less than " + max + " got: " + object[i]);
             }
+            if (typeof object[i] === "string" && structure["$__" + i + "_min"]) {
+                const min = structure["$__" + i + "_min"];
+                if (object[i].length < min)
+                    errors.push("value length for field '" + i + "' is too small, expected more than " + min + " got: " + object[i].length);
+            }
+            if (typeof object[i] === "string" && structure["$__" + i + "_max"]) {
+                const max = structure["$__" + i + "_max"];
+                if (object[i].length > max)
+                    errors.push("value length for field '" + i + "' is too big, expected less than " + max + " got: " + object[i].length);
+            }
             foundKeys.push(i);
         }
         if (errors.length > 0)

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { APIService, Initializer } from "./apiServer/APIService";
 import { LocalRequest } from "./apiServer/LocalRequest";
 import { MysqlService } from "./apiServer/MysqlService";
-import { Validator } from "./apiServer/helper/Validator";
+import { Validator, ValidationModel } from "./apiServer/helper/Validator";
 import { LogService } from "./apiServer/LogService";
 import { ErrorUtils } from "./apiServer/structures/DefaultErrors";
 import { S_MONITOR_REGISTRATE_ACTION } from "./apiServer/monitor/Monitor";
@@ -9,4 +9,4 @@ import { DataProvider } from "./apiServer/helper/DataProvider";
 import { UID } from "./apiServer/helper/UID";
 import { ExternalService } from "./apiServer/external/ExternalService";
 import { DBService } from "./apiServer/DBService";
-export { UID, APIService, Initializer, LocalRequest, MysqlService, Validator, LogService, DataProvider, ErrorUtils, ExternalService, DBService, S_MONITOR_REGISTRATE_ACTION };
+export { UID, APIService, Initializer, LocalRequest, ValidationModel, MysqlService, Validator, LogService, DataProvider, ErrorUtils, ExternalService, DBService, S_MONITOR_REGISTRATE_ACTION };

package/package.json

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