badmfck-api-server 3.3.3 → 3.3.5

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.3.2";
+    version = "3.3.5";
     options;
     monitor = null;
     started = new Date();

package/dist/apiServer/helper/Validator.js

@@ -181,8 +181,15 @@ class Validator {
             return;
         if (typeof structure !== "object" || typeof object !== "object")
             return;
-        if (Array.isArray(structure))
+        if (Array.isArray(structure)) {
+            if (!Array.isArray(object))
+                return;
+            if (structure.length < 1)
+                return;
+            for (let i of object)
+                this.filterStructure(structure[0], i);
             return;
+        }
         for (let key in object) {
             if (!(key in structure)) {
                 delete object[key];
@@ -196,26 +203,38 @@ class Validator {
     static syncStructure(structure, object) {
         if (typeof structure !== "object")
             return;
-        if (typeof object !== "object")
-            return;
         for (const key in object) {
             if (!(key in structure)) {
                 delete object[key];
             }
         }
         for (const key in structure) {
-            const tVal = structure[key];
-            const bVal = object[key];
+            const structureValue = structure[key];
+            const objectValue = object[key];
             if (!(key in object)) {
-                object[key] = tVal;
+                object[key] = structureValue;
+                continue;
+            }
+            if (objectValue === null && structureValue !== null) {
+                if (!structure["$__" + key + "_optional"])
+                    object[key] = structureValue;
+                continue;
+            }
+            if (key.startsWith("$__")) {
+                object[key] = structure[key];
+                continue;
             }
-            else if (typeof tVal === "object" &&
-                tVal !== null &&
-                !Array.isArray(tVal) &&
-                typeof bVal === "object" &&
-                bVal !== null &&
-                !Array.isArray(bVal)) {
-                this.syncStructure(bVal, tVal);
+            if (objectValue && typeof objectValue === "object") {
+                if (Array.isArray(objectValue) && Array.isArray(structureValue) && structureValue.length > 0) {
+                    for (let i of objectValue) {
+                        if (typeof i === "object")
+                            this.syncStructure(structureValue[0], i);
+                    }
+                }
+                else {
+                    this.syncStructure(structureValue, objectValue);
+                }
+                continue;
             }
         }
         return object;

package/package.json

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