@opengis/fastify-table 1.2.51 → 1.2.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.51",
+  "version": "1.2.52",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/crud/funcs/validateData.js

@@ -1,9 +1,20 @@
+import config from '../../../../config.js';
 
 const emailReg = /(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
 
-function checkField(key, val, options, idx) {
+function checkField(key, val, options, idx, body) {
     // validators: [required]
     if (options?.validators?.includes('required') && !val) {
+        if (options?.conditions) {
+            const allowed = JSON.parse(options?.conditions?.[2] || null);
+            const check = options?.conditions?.[1] === 'in' && Array.isArray(allowed)
+                ? allowed.includes(body[options?.conditions?.[0] || ''])
+                : body[options?.conditions?.[0] || ''] === allowed;
+            if (!check) {
+                if (config.trace) console.log('validateData', 'skip conditions', key, body[options?.conditions?.[0] || ''], allowed);
+                return { key, val, idx };
+            }
+        }
         return {
             error: 'empty required', key, idx,
         };
@@ -32,7 +43,7 @@ function checkBody({ body = {}, arr = [], idx }) {
             return acc1;
         }
 
-        const check = checkField(key, body[key], input, idx) || {};
+        const check = checkField(key, body[key], input, idx, body) || {};
         acc1.push({ key, val: body[key], ...check });
         return acc1;
     }, []);