badmfck-api-server 3.4.0 → 3.4.1

package/dist/apiServer/APIService.js

@@ -95,7 +95,7 @@ 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();

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.js

@@ -126,6 +126,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 +161,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 +192,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/package.json

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