nox-validation 1.7.3 → 1.7.5

package/lib/helpers.js

@@ -1604,6 +1604,23 @@ const rebuildFullPath = (nodePath, fullPath, modifierFn) => {
     : `${modifiedNodePath}`.replace(/\.+/g, ".");
 };
 
+const trimBasicPath = (basePath, staticType = "update") => {
+  const regex = new RegExp(`${staticType}\\[\\d+\\]`, "g");
+  const matches = [...basePath.matchAll(regex)];
+
+  if (matches.length === 0) return basePath; // no update/create/delete/etc found
+
+  // Last matched dynamic segment (e.g. "update[3]")
+  const lastSegment = matches[matches.length - 1][0];
+
+  // Find starting index of this last segment
+  const idx = basePath.lastIndexOf(lastSegment);
+
+  // Return everything BEFORE this segment (and remove trailing dot)
+  const result = basePath.substring(0, idx).replace(/\.$/, "");
+  return result;
+};
+
 module.exports = {
   generateModifiedRules,
   getFieldsGroupBySchemaId,
@@ -1628,4 +1645,5 @@ module.exports = {
   remainingItems,
   formatDate,
   rebuildFullPath,
+  trimBasicPath,
 };

package/lib/validate.js

@@ -14,6 +14,7 @@ const {
   remainingItems,
   formatDate,
   rebuildFullPath,
+  trimBasicPath,
 } = require("./helpers");
 
 const choices = ["radio", "checkboxes", "dropdown_multiple", "dropdown"];
@@ -228,13 +229,13 @@ const isEmptyRelational = ({
       ? existingValue.length === 0
         ? []
         : typeof existingValue[0] === "string"
-          ? existingValue
-          : existingValue.map((item) => item._id)
+        ? existingValue
+        : existingValue.map((item) => item._id)
       : typeof existingValue === "string"
-        ? [existingValue]
-        : existingValue && typeof existingValue === "object"
-          ? [existingValue._id]
-          : [];
+      ? [existingValue]
+      : existingValue && typeof existingValue === "object"
+      ? [existingValue._id]
+      : [];
     all = Array.isArray(all) ? all?.filter(Boolean) : all;
     switch (interface) {
       case constants.interfaces.FILE:
@@ -359,21 +360,21 @@ const validateMetaRules = (
   const isValidRelational =
     required && isRelational
       ? isEmptyRelational({
-        api_version: apiVersion,
-        value: fieldValue,
-        interface: field?.meta?.interface,
-        onlyFormFields,
-        existingValue:
-          getValue(existingForm, currentPath) ||
-          getValue(
-            existingForm,
-            currentPath
-              ?.replace(".create", "")
-              ?.replace(".update", "")
-              ?.replace(".existing", "")
-              ?.replace(".delete", "")
-          ), // TODO: Need to Generate Form Path Without create, update, existing, delete
-      })
+          api_version: apiVersion,
+          value: fieldValue,
+          interface: field?.meta?.interface,
+          onlyFormFields,
+          existingValue:
+            getValue(existingForm, currentPath) ||
+            getValue(
+              existingForm,
+              currentPath
+                ?.replace(".create", "")
+                ?.replace(".update", "")
+                ?.replace(".existing", "")
+                ?.replace(".delete", "")
+            ), // TODO: Need to Generate Form Path Without create, update, existing, delete
+        })
       : true;
 
   const isEmptyVal = is_m2a_item ? !fieldValue : isEmpty(fieldValue);
@@ -392,29 +393,30 @@ const validateMetaRules = (
   if (invalidRequire || !isValidRelational) {
     const message = field?.meta?.required
       ? error_messages.REQUIRED.replace(
-        `{field}`,
-        formatLabel(field.display_label)
-      )
+          `{field}`,
+          formatLabel(field.display_label)
+        )
       : error_messages.NOT_EMPTY.replace(
-        `{field}`,
-        formatLabel(field.display_label)
-      );
+          `{field}`,
+          formatLabel(field.display_label)
+        );
+
     addError(
       currentPath,
       translatedPath
         ? {
-          label: formatLabel(field.display_label),
-          fieldPath: currentPath,
-          description: "",
-          translation_path: translatedPath,
-          message,
-        }
+            label: formatLabel(field.display_label),
+            fieldPath: currentPath,
+            description: "",
+            translation_path: translatedPath,
+            message,
+          }
         : {
-          label: formatLabel(field.display_label),
-          fieldPath: currentPath,
-          description: "",
-          message,
-        },
+            label: formatLabel(field.display_label),
+            fieldPath: currentPath,
+            description: "",
+            message,
+          },
       field
     );
   }
@@ -472,16 +474,20 @@ const validateMetaRules = (
       node: field,
       skipFn: (node) => {
         let status = false;
+        if (node.meta?.interface === constants.interfaces.MANY_TO_ANY)
+          status = true;
+
         if (
-          node.meta?.interface === constants.interfaces.MANY_TO_ANY
-        ) status = true
-
-        if ([constants.interfaces.MANY_TO_MANY,
-        constants.interfaces.ONE_TO_MANY,
-        constants.interfaces.MANY_TO_ONE,
-        constants.interfaces.SEO,
-        ].includes(node.meta?.interface) && (!node.meta?.required || !node.meta?.hidden)) status = true
-        return status
+          [
+            constants.interfaces.MANY_TO_MANY,
+            constants.interfaces.ONE_TO_MANY,
+            constants.interfaces.MANY_TO_ONE,
+            constants.interfaces.SEO,
+          ].includes(node.meta?.interface) &&
+          (!node.meta?.required || !node.meta?.hidden)
+        )
+          status = true;
+        return status;
       },
       conditionFn: (node) =>
         node.meta?.required === true && !node.isRelationalUpdate,
@@ -490,6 +496,24 @@ const validateMetaRules = (
         label: node.display_label,
       }),
       actionFn: (node) => {
+        const normalize = (path) => path.replace(/\[\d+\]/g, "");
+
+        const getRoot = (path) => normalize(path).split(".")[0];
+
+        const buildError = (path, translated) => {
+          if (!isEmpty(getValue(formData, path))) return;
+          let obj = {
+            label,
+            fieldPath: path,
+            description: "",
+            message,
+          };
+          if (translated) {
+            obj.translation_path = translated;
+          }
+          addError(path, obj, node);
+        };
+
         const isTranslationNode =
           node?.meta?.parentInterface === constants.interfaces.TRANSLATIONS ||
           field?.meta?.interface === constants.interfaces.TRANSLATIONS;
@@ -509,12 +533,27 @@ const validateMetaRules = (
 
         if (
           currentPath &&
-          currentPath?.trim() !== "" &&
-          !fPath.includes(currentPath)
+          currentPath.trim() !== "" &&
+          !normalize(fPath).startsWith(normalize(currentPath)) &&
+          getRoot(fPath) !== getRoot(currentPath)
         ) {
-          fPath = `${currentPath}.${fPath}`;
+          if (!currentPath.includes(fPath)) {
+            fPath = `${currentPath}.${fPath}`;
+          }
+        } else if (fPath !== currentPath) {
+          fPath = currentPath;
         }
 
+        // if (
+        //   currentPath &&
+        //   currentPath?.trim() !== "" &&
+        //   !fPath.includes(currentPath)
+        //   // TODO: Need to Optimize This fPath => group.items.dropdown currentPath => group.items[0].dropdown final path becomes => group.items[0].dropdown.group.items.dropdown
+        //   // also translations.create[0].meta_description <=fPath  condition currentPath => seo.create[0].translations.create[0].meta_description then condition becomes true but parent is not same then need to merge
+        // ) {
+        //   fPath = `${currentPath}.${fPath}`;
+        // }
+
         if (staticType === "update") return;
         if (staticType === "delete" && !isTranslationNode) return;
         if (staticType === "existing" && !isTranslationNode) return;
@@ -522,34 +561,21 @@ const validateMetaRules = (
         const label = formatLabel(node.display_label);
         const message = error_messages.REQUIRED.replace("{field}", label);
 
-        const buildError = (path, translated) => {
-          if (!isEmpty(getValue(formData, path))) return;
-          let obj = {
-            label,
-            fieldPath: path,
-            description: "",
-            message,
-          };
-          if (translated) {
-            obj.translation_path = translated;
-          }
-          addError(path, obj, node);
-        };
-
         const isMultiLang =
           isTranslationNode &&
           Array.isArray(language_codes) &&
           language_codes.length > 1;
+
         if (isMultiLang) {
+          const fullPath = fPath;
+
           language_codes.forEach((lang, index) => {
             let langPath, transformedPath;
             let isAdded = false;
-
             // Check if current language entry exists in fieldValue.create
             if (
               Array.isArray(fieldValue?.create) &&
               fieldValue?.create.some((item, idx) => {
-                // Check by languages_code or by index match
                 return item.languages_code === lang || idx === index;
               })
             ) {
@@ -560,25 +586,21 @@ const validateMetaRules = (
               node?.value?.includes("create[0].") ||
               node?.value?.includes("create[0]")
             ) {
-              langPath = rebuildFullPath(node.value, node.key, (path) =>
+              langPath = rebuildFullPath(node.value, fPath, (path) =>
                 path.replace(/create\[0\]\./, `create[${index}].`)
               );
-              transformedPath = rebuildFullPath(
-                node.value,
-                node.key,
-                (path) => {
-                  const newPath = path
-                    .replace(/\[0\]\./, `.${lang}.`)
-                    ?.replace("create", "");
-                  return newPath;
-                }
-              );
+              transformedPath = rebuildFullPath(node.value, fPath, (path) => {
+                const newPath = path
+                  .replace(/\[0\]\./, `.${lang}.`)
+                  ?.replace("create", "");
+                return newPath;
+              });
             } else {
-              langPath = rebuildFullPath(node.value, node.key, (path) => {
+              langPath = rebuildFullPath(node.value, fPath, (path) => {
                 return path.replace(/create\./, `create[${index}].`);
               });
 
-              transformedPath = rebuildFullPath(node.value, node.key, (path) =>
+              transformedPath = rebuildFullPath(node.value, fPath, (path) =>
                 path.replace(/\[0\]\./, `.${lang}.`)?.replace("create", "")
               );
             }
@@ -606,8 +628,8 @@ const validateMetaRules = (
   const validType =
     field?.alternateType?.length > 0
       ? [field.type, ...field?.alternateType].some((type) =>
-        typeChecks[type](fieldValue)
-      )
+          typeChecks[type](fieldValue)
+        )
       : typeChecks[field.type](fieldValue, { key: currentPath, updateValue });
 
   if (!isEmpty(fieldValue) && !validType) {
@@ -645,8 +667,9 @@ const handleRegexValidation = (
   const fieldLabel = formatLabel(field.display_label);
 
   // Determine regex flags
-  const flags = `${rule.options?.case_sensitive ? "" : "i"}${rule.options?.multiline ? "m" : ""
-    }${rule.options?.global ? "g" : ""}`;
+  const flags = `${rule.options?.case_sensitive ? "" : "i"}${
+    rule.options?.multiline ? "m" : ""
+  }${rule.options?.global ? "g" : ""}`;
 
   // Build regex for MATCH/CONTAINS/NOT_CONTAINS
   let regex;
@@ -1138,16 +1161,7 @@ const validateField = (
   timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone,
   translatedPath = null
 ) => {
-  if (
-    onlyFormFields == true &&
-    value === undefined &&
-    ![constants.interfaces.TRANSLATIONS, constants.interfaces.SEO].includes(
-      field?.meta?.interface
-    )
-  )
-    return;
-
-  const { is_m2a_item } = field?.meta;
+  const { is_m2a_item, staticType = null, parentInterface } = field?.meta;
   const currentPath = fieldPath
     ? `${fieldPath}.${field.key.split(".").pop()}`
     : field.key;
@@ -1157,6 +1171,50 @@ const validateField = (
       ? `${translatedPath}.${field.key.split(".").pop()}`
       : field.key;
   }
+
+  if (
+    onlyFormFields == true &&
+    value === undefined &&
+    ![constants.interfaces.TRANSLATIONS, constants.interfaces.SEO].includes(
+      field?.meta?.interface
+    )
+  ) {
+    if (
+      onlyFormFields == true &&
+      value === undefined &&
+      staticType === "update" &&
+      parentInterface === constants.interfaces.TRANSLATIONS &&
+      field?.meta.required
+    ) {
+      const langCode = getValue(formData, fieldPath)?.languages_code;
+      const translationFieldPath = trimBasicPath(currentPath, staticType);
+      const existingItemValue = getValue(
+        existingForm,
+        translationFieldPath
+      )?.find((item) => item.languages_code === langCode)?.[
+        `${field.key.split(".").pop()}`
+      ];
+
+      if (isEmpty(existingItemValue)) {
+        const message = error_messages.REQUIRED.replace(
+          `{field}`,
+          formatLabel(`${field.key.split(".").pop()}`)
+        );
+        addError(
+          currentPath,
+          {
+            label: formatLabel(`${field.key.split(".").pop()}`),
+            fieldPath: currentPath,
+            translation_path: translatedPath,
+            description: "",
+            message,
+          },
+          field
+        );
+      }
+    } else return;
+  }
+
   const fieldLabel = formatLabel(field.display_label);
 
   validateMetaRules(
@@ -1273,6 +1331,13 @@ const validateField = (
           )
             trPath = trPath.replace(".update.", ".");
 
+          if (
+            trPath &&
+            field.meta?.staticType === "create" &&
+            trPath.includes(".create.")
+          )
+            trPath = trPath.replace(".create.", ".");
+
           validateField(
             child,
             item[child.key.split(".").pop()],
@@ -1445,7 +1510,7 @@ const validate = (data) => {
         if (
           secondParentField &&
           secondParentField?.meta?.interface ===
-          constants.interfaces.TRANSLATIONS
+            constants.interfaces.TRANSLATIONS
         ) {
           const languageKey = secondParentField?.meta?.options?.language_field;
           const firstParentValue = getValue(formData, firstParent);
@@ -1470,7 +1535,7 @@ const validate = (data) => {
         }
       }
 
-      result.errors[fieldPath] = obj;
+      result.errors[fieldPath] = { ...obj, fieldId: field?.field_id };
       result.status = false;
     }
     if (abortEarly && !result.status) return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nox-validation",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "validate dynamic schema",
   "main": "index.js",
   "scripts": {