nox-validation 1.6.0 → 1.6.2

package/lib/helpers.js

@@ -319,7 +319,7 @@ const generateField = (
     hidden: false,
   }
 ) => {
-  const { staticType } = meta;
+  const { staticType = null, parentInterface = null } = meta;
   childrenFields = childrenFields?.map((child) => {
     const childKey = path ? `${path}.${child.key}` : child.key;
     const childValue = path ? `${path}.${child.value}` : child.value;
@@ -327,7 +327,10 @@ const generateField = (
     return {
       ...child,
       value: childKey,
-      meta: staticType ? { ...child?.meta, staticType } : child?.meta,
+      meta:
+        staticType || parentInterface
+          ? { ...child?.meta, staticType, parentInterface }
+          : child?.meta,
       key: childValue,
       isRelationalUpdate: path.includes("update"),
     };
@@ -418,7 +421,7 @@ const generateRelationalField = (
       [],
       "none",
       [],
-      { staticType: "existing" }
+      { staticType: "existing", parentInterface: relationType }
     );
     existingField.children = [
       generateField(
@@ -458,7 +461,7 @@ const generateRelationalField = (
       [],
       "none",
       [],
-      { staticType: "delete" }
+      { staticType: "delete", parentInterface: relationType }
     );
     deleteField.children = [
       generateField(
@@ -499,7 +502,7 @@ const generateRelationalField = (
       [],
       "none",
       [],
-      { staticType: "create" }
+      { staticType: "create", parentInterface: relationType }
     );
     createField.children = [
       generateField(
@@ -544,7 +547,7 @@ const generateRelationalField = (
       [],
       "none",
       [],
-      { staticType: "update" }
+      { staticType: "update", parentInterface: relationType }
     );
     updateField.children = [
       generateField(
@@ -591,7 +594,7 @@ const generateRelationalField = (
         [],
         "none",
         [],
-        { staticType: "existing" }
+        { staticType: "existing", parentInterface: relationType }
       ),
       generateField(
         "delete",
@@ -601,7 +604,7 @@ const generateRelationalField = (
         [],
         "none",
         [],
-        { staticType: "delete" }
+        { staticType: "delete", parentInterface: relationType }
       ),
       generateField(
         "create",
@@ -611,7 +614,7 @@ const generateRelationalField = (
         collectionFields,
         "none",
         [],
-        { staticType: "create" }
+        { staticType: "create", parentInterface: relationType }
       ),
       generateField(
         "update",
@@ -621,7 +624,7 @@ const generateRelationalField = (
         collectionFields,
         "none",
         [],
-        { staticType: "update" }
+        { staticType: "update", parentInterface: relationType }
       ),
     ];
   }
@@ -1427,10 +1430,40 @@ const getSelectedNodes = ({
     return updatedNode;
   }
 
-  function traverse(currentNode) {
+  function traverse(currentNode, parentKey = null) {
+    function mergePathLevels(currentPath, parentPath) {
+      const cur = currentPath.split(".");
+      const par = parentPath.split(".");
+
+      let matchIndex = -1;
+
+      // Find the first matching level
+      for (let i = 0; i < par.length; i++) {
+        if (par[i].replace(/\[\d+\]/, "") === cur[0].replace(/\[\d+\]/, "")) {
+          matchIndex = i;
+          break;
+        }
+      }
+
+      // If match found
+      if (matchIndex !== -1) {
+        const parentPart = par.slice(0, matchIndex + 1);
+        const currentTail = cur.slice(1); // everything after the matched level
+        return [...parentPart, ...currentTail].join(".");
+      }
+
+      // No match → normal join
+      return [...par, ...cur].join(".");
+    }
+
+    if (parentKey)
+      currentNode.key = mergePathLevels(currentNode.key, parentKey);
+
     if (conditionFn(currentNode)) {
       actionFn(currentNode);
-      result.push(mapFn(currentNode));
+      const mapped = mapFn(currentNode);
+
+      result.push(mapped);
     }
 
     if (Array.isArray(currentNode.children)) {
@@ -1447,12 +1480,15 @@ const getSelectedNodes = ({
           }
         }
 
-        if (!skipFn(currentNode)) traverse(childNode);
+        if (!skipFn(currentNode)) {
+          traverse(childNode, currentNode?.key);
+        }
       });
     }
   }
 
-  traverse(node);
+  traverse(node, node?.key);
+
   return result;
 };
 
@@ -1503,12 +1539,9 @@ const formatDate = ({
   ];
 
   if (!formats.includes(format)) format = formats[0];
-  if (!date || isNaN(new Date(date).getTime())) {
-    throw new RangeError("Invalid time value");
-  }
-  const dateObj = date instanceof Date ? date : new Date(date);
+
   const { year, month, day, hour, minute, second, dayPeriod } = getParts(
-    dateObj,
+    date,
     timeZone
   );
 
@@ -1527,6 +1560,23 @@ const formatDate = ({
     .replace("A", dayPeriod);
 };
 
+const rebuildFullPath = (nodePath, fullPath, modifierFn) => {
+  // 1. Find parent path
+  const index = fullPath.lastIndexOf(nodePath);
+  if (index === -1) {
+    throw new Error("nodePath not found inside fullPath");
+  }
+
+  const parentPath = fullPath.slice(0, index).replace(/\.$/, "");
+
+  // 2. Modify node path (if function provided)
+  const modifiedNodePath =
+    typeof modifierFn === "function" ? modifierFn(nodePath) : nodePath;
+
+  // 3. Rebuild final full path
+  return `${parentPath}.${modifiedNodePath}`.replace(/\.+/g, ".");
+};
+
 module.exports = {
   generateModifiedRules,
   getFieldsGroupBySchemaId,
@@ -1550,4 +1600,5 @@ module.exports = {
   getSelectedNodes,
   remainingItems,
   formatDate,
+  rebuildFullPath,
 };

package/lib/validate.js

@@ -13,6 +13,7 @@ const {
   getSelectedNodes,
   remainingItems,
   formatDate,
+  rebuildFullPath,
 } = require("./helpers");
 
 const choices = ["radio", "checkboxes", "dropdown_multiple", "dropdown"];
@@ -60,9 +61,20 @@ const typeChecks = {
     }
     return false;
   },
-  [constants.types.TIME]: (val) =>
-    typeof val === "string" &&
-    /^([01]\d|2[0-3]):([0-5]\d):([0-5]\d)$/.test(val),
+  [constants.types.TIME]: (val, data) => {
+    if (val instanceof Date && !isNaN(val)) return true;
+    if (typeof val === "string") {
+      if (/^([01]\d|2[0-3]):([0-5]\d):([0-5]\d)$/.test(val)) return true;
+      const parsed = Date.parse(val);
+      if (!isNaN(parsed)) {
+        if (data && data?.key && data?.updateValue) {
+          data.updateValue(data.key, new Date(val));
+        }
+        return true;
+      }
+    }
+    return false;
+  },
   [constants.types.TIMESTAMP]: (val, data) => {
     if (val instanceof Date && !isNaN(val)) return true;
     if (typeof val === "string" && !isNaN(Date.parse(val))) {
@@ -411,6 +423,7 @@ const validateMetaRules = (
   if (
     (isEmpty(fieldValue) &&
       required &&
+      !field?.meta?.hidden &&
       ![
         constants.interfaces.FILES,
         constants.interfaces.FILE,
@@ -419,21 +432,22 @@ const validateMetaRules = (
         constants.interfaces.ONE_TO_MANY,
         constants.interfaces.MANY_TO_ONE,
         constants.interfaces.MANY_TO_ANY,
-        constants.interfaces.SEO,
+
         "none",
       ].includes(field?.meta?.interface)) ||
     (field?.meta?.interface === constants.interfaces.TRANSLATIONS &&
+      !field?.meta?.hidden &&
       language_codes?.length &&
       !onlyFormFields) ||
-    ([constants.interfaces.OBJECT, constants.interfaces.ITEMS].includes(
-      field?.meta?.interface
-    ) &&
+    ([
+      constants.interfaces.OBJECT,
+      constants.interfaces.SEO,
+      constants.interfaces.ITEMS,
+    ].includes(field?.meta?.interface) &&
+      !field?.meta?.hidden &&
       !onlyFormFields &&
       getNodes)
   ) {
-    const isTranslationChild =
-      field?.meta?.interface === constants.interfaces.TRANSLATIONS;
-
     getSelectedNodes({
       node: field,
       skipFn: (node) =>
@@ -445,17 +459,36 @@ const validateMetaRules = (
         label: node.display_label,
       }),
       actionFn: (node) => {
-        const staticType = node?.meta?.staticType;
+        const isTranslationNode =
+          node?.meta?.parentInterface === constants.interfaces.TRANSLATIONS ||
+          field?.meta?.interface === constants.interfaces.TRANSLATIONS;
         let fPath = node.key?.replace("[0][0]", "[0]");
+        const types = ["update", "delete", "existing", "create"];
+
+        const extractFirstType = (key) => {
+          const regex = new RegExp(`(${types.join("|")})\\[`, "i");
+          const match = key.match(regex);
+          return match ? match[1] : null;
+        };
+
+        const staticType =
+          node?.meta?.staticType && types.includes(node?.meta?.staticType)
+            ? extractFirstType(node.key)
+            : null;
+
+        if (!fPath.includes(currentPath)) {
+          fPath = `${currentPath}.${fPath}`;
+        }
 
         if (staticType === "update") return;
-        if (staticType === "delete" && !isTranslationChild) return;
-        if (staticType === "existing" && !isTranslationChild) return;
+        if (staticType === "delete" && !isTranslationNode) return;
+        if (staticType === "existing" && !isTranslationNode) return;
 
         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,
@@ -469,7 +502,7 @@ const validateMetaRules = (
         };
 
         const isMultiLang =
-          isTranslationChild &&
+          isTranslationNode &&
           Array.isArray(language_codes) &&
           language_codes.length > 1;
 
@@ -479,17 +512,24 @@ const validateMetaRules = (
               transformedPath,
               isAdded = false;
 
-            if (fPath.includes("create[0].")) {
+            if (node?.value?.includes("create[0].")) {
               const exist = fieldValue?.create?.find(
                 (item) => item.languages_code === lang
               );
               if (exist) isAdded = true;
-
-              langPath = fPath.replace("create[0].", `create[${index}].`);
-              transformedPath = fPath.replace("create[0].", `${lang}.`);
+              langPath = rebuildFullPath(node.value, node.key, (path) =>
+                path.replace("create[0].", `create[${index}].`)
+              );
+              transformedPath = rebuildFullPath(node.value, node.key, (path) =>
+                path.replace("create[0].", `${lang}.`)
+              );
             } else {
-              langPath = fPath.replace("create.", `create[${index}].`);
-              transformedPath = fPath.replace("create.", `${lang}.`);
+              langPath = rebuildFullPath(node.value, node.key, (path) =>
+                path.replace("create.", `create[${index}].`)
+              );
+              transformedPath = rebuildFullPath(node.value, node.key, (path) =>
+                path.replace("create.", `${lang}.`)
+              );
             }
 
             if (!isAdded) buildError(langPath, transformedPath);
@@ -497,7 +537,7 @@ const validateMetaRules = (
         } else {
           const singlePath = fPath.replace(
             "create.",
-            isTranslationChild ? "create[lang_code]." : "create[0]."
+            isTranslationNode ? "create[lang_code]." : "create[0]."
           );
           if (
             constants.interfaces.ITEMS === field?.meta?.interface
@@ -626,10 +666,6 @@ const handleRegexValidation = (
     message = message
       ?.replace(`{field}`, fieldLabel)
       ?.replace(`{value}`, rule.value[0]);
-    console.log(
-      "[handleRegexValidation] Validation failed. Adding error. Message:",
-      message
-    );
     addError(
       currentPath,
       { label: fieldLabel, fieldPath: currentPath, description: "", message },
@@ -660,10 +696,40 @@ const validateOperatorRule = (
   const isTime = field.type === constants.types.TIME;
   const isArray = field.type === constants.types.ARRAY;
 
-  const parseTime = (timeStr) => {
-    if (!timeStr || typeof timeStr !== "string") return null;
-    const [hh, mm, ss] = timeStr.split(":").map(Number);
-    return hh * 3600 + mm * 60 + ss;
+  const parseTime = (value) => {
+    if (!value) return null;
+
+    const toSeconds = (str) => {
+      const [hh = 0, mm = 0, ss = 0] = str.split(":").map(Number);
+      return hh * 3600 + mm * 60 + ss;
+    };
+
+    if (value instanceof Date && !isNaN(value)) {
+      const timePart = formatDate({
+        date: value,
+        format: "DD/MM/YYYY HH:mm:ss",
+        timeZone,
+      }).split(" ")[1];
+      const totalSeconds = toSeconds(timePart);
+      return totalSeconds || null;
+    }
+
+    if (typeof value === "string") {
+      if (/^\d{1,2}:\d{2}:\d{2}$/.test(value)) {
+        return toSeconds(value);
+      }
+      if (!isNaN(Date.parse(value))) {
+        const timePart = formatDate({
+          date: value,
+          format: "DD/MM/YYYY HH:mm:ss",
+          timeZone,
+        }).split(" ")[1];
+        const totalSeconds = toSeconds(timePart);
+        return totalSeconds || null;
+      }
+    }
+
+    return null;
   };
 
   // Helper to parse date string to UTC midnight timestamp
@@ -700,7 +766,7 @@ const validateOperatorRule = (
     }
     if (isDateTime) {
       if (forMessage) {
-        const format = field?.options?.format;
+        const format = field?.meta?.options?.format;
         return formatDate({ date: value, format, timeZone });
       }
       // Return UTC timestamp for comparison
@@ -1514,6 +1580,7 @@ const validate = (data) => {
       fieldOptions,
       data.language_codes,
       existingForm,
+      true,
       timeZone
     );
   });

package/package.json

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