@opengis/fastify-table 1.2.4 → 1.2.5

package/package.json

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

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

@@ -1,21 +1,36 @@
 
 const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-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-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
 
-export default function validateData({ body = {}, schema = {} }) {
-    const requiredFields = Object.keys(schema).filter(key => schema[key].validators?.includes('required'));
-
-    const emptyRequiredKey = Object.keys(body).find(key => requiredFields.includes(key) && !body[key]);
-
-    if (emptyRequiredKey) {
-        return { error: 'empty required', key: emptyRequiredKey };
+function checkField(key, val, options) {
+    // validators: [required]
+    if (options?.validators?.includes('required') && !val) {
+        return { error: 'empty required', key };
     }
 
-    const emailFields = Object.keys(schema).filter(key => schema[key].type === 'Email');
-
-    const invalidEmailKey = Object.keys(body).find(key => body[key] && emailFields.includes(key) && !body[key].match(emailReg));
+    // validators: [email] / type: Email
+    if ((options.type?.toLowerCase() === 'email' || options?.validators?.includes('email')) && val && !val.match(emailReg)) {
+        return { error: 'invalid email', key, val };
+    }
+}
 
-    if (invalidEmailKey) {
-        return { error: 'invalid email', key: emptyRequiredKey, val: body[invalidEmailKey] };
+export default function validateData({ body = {}, schema = {} }) {
+    const arr = Object.keys(schema).reduce((acc, key) => {
+        const curr = { ...schema[key], key };
+        if (curr.colModel?.length && curr.type?.toLowerCase() === 'datatable') {
+            return acc.concat(curr.colModel.map(col => {
+                const subkey = col.name || col.key;
+                const check = body[curr.key]?.reduce((acc, curr) => Object.assign(acc, checkField(subkey, curr[subkey], col)), {});
+                return { ...curr, ...col, check, key: `${curr.key}.${subkey}`, colModel: undefined };
+            }));
+        }
+        const check = checkField(curr.key, body[curr.key], schema[curr.key]);
+        return acc.concat({ ...curr, check });
+    }, []);
+
+    const invalidField = arr.find(el => el.check?.error);
+
+    if (invalidField) {
+        return { key: invalidField.key, ...invalidField.check };
     }
 
     return { message: 'ok' };