nox-validation 1.5.2 → 1.5.4

package/lib/constant.js

@@ -148,6 +148,7 @@ const interfaces = Object.freeze({
   MULTIPLE_DROPDOWN: "dropdown_multiple",
   TAGS: "tags",
   ARRAY_OF_VALUES: "array_of_values",
+  OBJECT: "object",
 });
 
 const API_VERSION = Object.freeze({

package/lib/helpers.js

@@ -313,6 +313,7 @@ const generateField = (
     hidden: false,
   }
 ) => {
+  const { staticType } = meta;
   childrenFields = childrenFields?.map((child) => {
     const childKey = path ? `${path}.${child.key}` : child.key;
     const childValue = path ? `${path}.${child.value}` : child.value;
@@ -320,6 +321,7 @@ const generateField = (
     return {
       ...child,
       value: childKey,
+      meta: staticType ? { ...child?.meta, staticType } : child?.meta,
       key: childValue,
       isRelationalUpdate: path.includes("update"),
     };
@@ -406,7 +408,11 @@ const generateRelationalField = (
       "existing",
       `${key}.existing`,
       constants.types.OBJECT,
-      constants.types.ARRAY
+      constants.types.ARRAY,
+      [],
+      "none",
+      [],
+      { staticType: "existing" }
     );
     existingField.children = [
       generateField(
@@ -442,7 +448,11 @@ const generateRelationalField = (
       "delete",
       `${key}.delete`,
       constants.types.OBJECT,
-      constants.types.ARRAY
+      constants.types.ARRAY,
+      [],
+      "none",
+      [],
+      { staticType: "delete" }
     );
     deleteField.children = [
       generateField(
@@ -479,7 +489,11 @@ const generateRelationalField = (
       `${key}.create`,
       constants.types.OBJECT,
       constants.types.ARRAY,
-      collectionFields
+      // collectionFields //TODO:REMOVED CHILDREN
+      [],
+      "none",
+      [],
+      { staticType: "create" }
     );
     createField.children = [
       generateField(
@@ -520,7 +534,11 @@ const generateRelationalField = (
       `${key}.update`,
       constants.types.OBJECT,
       constants.types.ARRAY,
-      collectionFields
+      // collectionFields //TODO:REMOVED CHILDREN
+      [],
+      "none",
+      [],
+      { staticType: "update" }
     );
     updateField.children = [
       generateField(
@@ -563,27 +581,41 @@ const generateRelationalField = (
         "existing",
         `${key}.existing`,
         constants.types.OBJECT_ID,
-        constants.types.ARRAY
+        constants.types.ARRAY,
+        [],
+        "none",
+        [],
+        { staticType: "existing" }
       ),
       generateField(
         "delete",
         `${key}.delete`,
         constants.types.OBJECT_ID,
-        constants.types.ARRAY
+        constants.types.ARRAY,
+        [],
+        "none",
+        [],
+        { staticType: "delete" }
       ),
       generateField(
         "create",
         `${key}.create`,
         constants.types.OBJECT,
         constants.types.ARRAY,
-        collectionFields
+        collectionFields,
+        "none",
+        [],
+        { staticType: "create" }
       ),
       generateField(
         "update",
         `${key}.update`,
         constants.types.OBJECT,
         constants.types.ARRAY,
-        collectionFields
+        collectionFields,
+        "none",
+        [],
+        { staticType: "update" }
       ),
     ];
   }
@@ -830,6 +862,8 @@ const buildNestedStructure = ({
         childFields = childFields.map((f) => {
           if (
             f.field === relationDetail.foreign_field ||
+            f.field === relationDetail.foreign_collection ||
+            f.field === relationDetail.junction_field_foreign ||
             f.field === relationDetail.junction_field_this
           ) {
             return {
@@ -1364,6 +1398,23 @@ const getSelectedNodes = ({
 }) => {
   const result = [];
 
+  function updateChildKeys(node, parentKey, newParentKey) {
+    let updatedNode = { ...node };
+    if (
+      typeof node.key === "string" &&
+      node.key.startsWith(parentKey) &&
+      !node.key.startsWith(newParentKey)
+    ) {
+      updatedNode.key = node.key.replace(parentKey, newParentKey);
+    }
+    if (Array.isArray(node.children) && node.children.length > 0) {
+      updatedNode.children = node.children.map((c) =>
+        updateChildKeys(c, parentKey, newParentKey)
+      );
+    }
+    return updatedNode;
+  }
+
   function traverse(currentNode) {
     if (conditionFn(currentNode)) {
       actionFn(currentNode);
@@ -1372,29 +1423,16 @@ const getSelectedNodes = ({
 
     if (Array.isArray(currentNode.children)) {
       currentNode.children.forEach((child) => {
-        let childNode = {
-          ...child,
-          key:
-            currentNode.type === constants.types.ARRAY
-              ? child.key.includes(`${currentNode.key}[`)
-                ? child.key
-                : child.key.replace(currentNode.key, `${currentNode.key}[0]`)
-              : child.key,
-        };
+        let childNode = { ...child };
 
-        if (Array.isArray(child.children) && child.children.length > 0) {
-          const updateChildKeys = (node, parentKey, newParentKey) => {
-            let updatedNode = {
-              ...node,
-              key: node.key.replace(parentKey, newParentKey),
-            };
-            if (Array.isArray(node.children) && node.children.length > 0) {
-              updatedNode.children = node.children.map((c) =>
-                updateChildKeys(c, parentKey, newParentKey)
-              );
-            }
-            return updatedNode;
-          };
+        if (
+          currentNode.type === constants.types.ARRAY &&
+          typeof child.key === "string"
+        ) {
+          const arrayKey = `${currentNode.key}[0]`;
+          if (!childNode.key.startsWith(arrayKey)) {
+            childNode = updateChildKeys(child, currentNode.key, arrayKey);
+          }
         }
 
         if (!skipFn(currentNode)) traverse(childNode);

package/lib/validate.js

@@ -219,12 +219,24 @@ const isEmptyRelational = ({
       case constants.interfaces.ONE_TO_MANY:
       case constants.interfaces.MANY_TO_ONE:
         return remainingItems({
-          all: existingValue?.map((item) => item._id),
+          all: Array.isArray(existingValue)
+            ? existingValue.length === 0
+              ? []
+              : typeof existingValue[0] === "string"
+              ? existingValue
+              : existingValue.map((item) => item._id)
+            : typeof existingValue === "string"
+            ? [existingValue]
+            : existingValue && typeof existingValue === "object"
+            ? [existingValue._id]
+            : [],
           obj: value,
         });
       case constants.interfaces.MANY_TO_ANY:
         return remainingItems({
-          all: existingValue?.map((item) => item.item),
+          all: Array.isArray(existingValue)
+            ? existingValue?.map((item) => item.item)
+            : [],
           obj: value,
           isM2A: true,
         });
@@ -250,7 +262,8 @@ const validateMetaRules = (
   fieldOptions,
   formData,
   language_codes = [],
-  existingForm = {}
+  existingForm = {},
+  getNodes = true
 ) => {
   const fieldValue = providedValue;
 
@@ -259,6 +272,7 @@ const validateMetaRules = (
     nullable = true,
     options,
     is_m2a_item,
+    hidden = false,
   } = field?.meta ?? {};
 
   if (field?.validations?.find((i) => i?.case === "not_empty")) {
@@ -266,7 +280,7 @@ const validateMetaRules = (
     nullable = false;
   }
 
-  if (field?.validations?.find((i) => i?.case === "empty")) {
+  if (field?.validations?.find((i) => i?.case === "empty") || hidden) {
     required = false;
     nullable = true;
   }
@@ -340,11 +354,28 @@ const validateMetaRules = (
       : true;
 
   const isEmptyVal = is_m2a_item ? !fieldValue : isEmpty(fieldValue);
-  if ((required && !onlyFormFields && isEmptyVal) || !isValidRelational) {
-    const message = error_messages.REQUIRED.replace(
-      `{field}`,
-      formatLabel(field.display_label)
-    );
+
+  let invalidRequire;
+  if (onlyFormFields) {
+    if (typeof fieldValue !== "undefined" && fieldValue !== null && required) {
+      invalidRequire = isEmptyVal;
+    } else {
+      invalidRequire = false;
+    }
+  } else {
+    invalidRequire = required && isEmptyVal;
+  }
+
+  if (invalidRequire || !isValidRelational) {
+    const message = field?.meta?.required
+      ? error_messages.REQUIRED.replace(
+          `{field}`,
+          formatLabel(field.display_label)
+        )
+      : error_messages.NOT_EMPTY.replace(
+          `{field}`,
+          formatLabel(field.display_label)
+        );
     addError(
       currentPath,
       {
@@ -376,7 +407,7 @@ const validateMetaRules = (
 
   if (
     (isEmpty(fieldValue) &&
-      !field?.meta?.hidden &&
+      required &&
       ![
         constants.interfaces.FILES,
         constants.interfaces.FILE,
@@ -389,7 +420,12 @@ const validateMetaRules = (
       ].includes(field?.meta?.interface)) ||
     (field?.meta?.interface === constants.interfaces.TRANSLATIONS &&
       language_codes?.length &&
-      !onlyFormFields)
+      !onlyFormFields) ||
+    ([constants.interfaces.OBJECT, constants.interfaces.ITEMS].includes(
+      field?.meta?.interface
+    ) &&
+      !onlyFormFields &&
+      getNodes)
   ) {
     const isTranslationChild =
       field?.meta?.interface === constants.interfaces.TRANSLATIONS;
@@ -405,11 +441,12 @@ const validateMetaRules = (
         label: node.display_label,
       }),
       actionFn: (node) => {
-        let fPath = node.key;
-        if (fPath.includes("update")) return;
-        if (fPath.includes("create") && !isTranslationChild) return;
-        if (fPath.includes("delete") && !isTranslationChild) return;
-        if (fPath.includes("existing") && !isTranslationChild) return;
+        const staticType = node?.meta?.staticType;
+        let fPath = node.key?.replace("[0][0]", "[0]");
+
+        if (staticType === "update") return;
+        if (staticType === "delete" && !isTranslationChild) return;
+        if (staticType === "existing" && !isTranslationChild) return;
 
         const label = formatLabel(node.display_label);
         const message = error_messages.REQUIRED.replace("{field}", label);
@@ -458,7 +495,12 @@ const validateMetaRules = (
             "create.",
             isTranslationChild ? "create[lang_code]." : "create[0]."
           );
-          if (isEmpty(fieldValue)) buildError(singlePath);
+          if (
+            constants.interfaces.ITEMS === field?.meta?.interface
+              ? true
+              : isEmpty(fieldValue)
+          )
+            buildError(singlePath);
         }
       },
     });
@@ -504,56 +546,86 @@ const handleRegexValidation = (
 
   let message = "";
   const fieldLabel = formatLabel(field.display_label);
-  const flags = `${rule.options.case_sensitive ? "" : "i"}${
-    rule.options.multiline ? "m" : ""
-  }${rule.options.global ? "g" : ""}`;
-  const regex = new RegExp(escapeRegex(rule.value[0]), flags);
-
-  const isValid = (() => {
-    switch (rule.options.type) {
-      case constants.regexTypes.MATCH:
-        message = custom_message ?? error_messages.REGEX_MATCH;
-        return regex.test(fieldValue);
-      case constants.regexTypes.START_WITH:
-        message = custom_message ?? error_messages.REGEX_START_WITH;
-        return fieldValue?.startsWith(
-          rule.value[0].replace(/^\//, "").replace(/\/$/, "")
-        );
-      case constants.regexTypes.ENDS_WITH:
-        message = custom_message ?? error_messages.REGEX_ENDS_WITH;
-        return fieldValue?.endsWith(
-          rule.value[0].replace(/^\//, "").replace(/\/$/, "")
-        );
-      case constants.regexTypes.CONTAINS:
-        message = custom_message ?? error_messages.REGEX_CONTAINS;
-        return regex.test(fieldValue);
-      case constants.regexTypes.EXACT:
-        message = custom_message ?? error_messages.REGEX_EXACT;
-        return (
-          fieldValue === rule.value[0].replace(/^\//, "").replace(/\/$/, "")
-        );
-      case constants.regexTypes.NOT_START_WITH:
-        message = custom_message ?? error_messages.REGEX_NOT_START_WITH;
-        return !fieldValue?.startsWith(
-          rule.value[0].replace(/^\//, "").replace(/\/$/, "")
-        );
-      case constants.regexTypes.NOT_ENDS_WITH:
-        message = custom_message ?? error_messages.REGEX_NOT_ENDS_WITH;
-        return !fieldValue?.endsWith(
-          rule.value[0].replace(/^\//, "").replace(/\/$/, "")
-        );
-      case constants.regexTypes.NOT_CONTAINS:
-        message = custom_message ?? error_messages.REGEX_NOT_CONTAINS;
-        return !regex.test(fieldValue);
-      default:
-        return false;
+
+  // Determine regex flags
+  const flags = `${rule.options?.case_sensitive ? "" : "i"}${
+    rule.options?.multiline ? "m" : ""
+  }${rule.options?.global ? "g" : ""}`;
+
+  // Build regex for MATCH/CONTAINS/NOT_CONTAINS
+  let regex;
+  if (
+    rule.options?.type === constants.regexTypes.MATCH ||
+    rule.options?.type === constants.regexTypes.CONTAINS ||
+    rule.options?.type === constants.regexTypes.NOT_CONTAINS
+  ) {
+    const pattern = rule.value[0];
+    let rawPattern = pattern;
+    if (/^\/.*\/$/.test(pattern)) {
+      rawPattern = pattern.slice(1, -1);
     }
-  })();
+    regex = new RegExp(rawPattern, flags);
+  }
+
+  // Evaluate validity based on type
+  let isValid = false;
+  switch (rule.options?.type) {
+    case constants.regexTypes.MATCH:
+      message = custom_message ?? error_messages.REGEX_MATCH;
+      isValid = regex.test(fieldValue);
+      break;
+    case constants.regexTypes.START_WITH:
+      message = custom_message ?? error_messages.REGEX_START_WITH;
+      let prefixStart = rule.value[0].replace(/^\//, "").replace(/\/$/, "");
+      isValid =
+        typeof fieldValue === "string" && fieldValue.startsWith(prefixStart);
+      break;
+    case constants.regexTypes.ENDS_WITH:
+      message = custom_message ?? error_messages.REGEX_ENDS_WITH;
+
+      let suffix = rule.value[0].replace(/^\//, "").replace(/\/$/, "");
+      isValid = typeof fieldValue === "string" && fieldValue.endsWith(suffix);
+      break;
+    case constants.regexTypes.CONTAINS:
+      message = custom_message ?? error_messages.REGEX_CONTAINS;
+      isValid = regex.test(fieldValue);
+      break;
+    case constants.regexTypes.EXACT:
+      message = custom_message ?? error_messages.REGEX_EXACT;
+      let exact = rule.value[0].replace(/^\//, "").replace(/\/$/, "");
+      isValid = fieldValue === exact;
+      break;
+    case constants.regexTypes.NOT_START_WITH:
+      message = custom_message ?? error_messages.REGEX_NOT_START_WITH;
+      let prefix = rule.value[0].replace(/^\//, "").replace(/\/$/, "");
+      isValid = !(
+        typeof fieldValue === "string" && fieldValue.startsWith(prefix)
+      );
+      break;
+    case constants.regexTypes.NOT_ENDS_WITH:
+      message = custom_message ?? error_messages.REGEX_NOT_ENDS_WITH;
+      let suffixEnd = rule.value[0].replace(/^\//, "").replace(/\/$/, "");
+      isValid = !(
+        typeof fieldValue === "string" && fieldValue.endsWith(suffixEnd)
+      );
+      break;
+    case constants.regexTypes.NOT_CONTAINS:
+      message = custom_message ?? error_messages.REGEX_NOT_CONTAINS;
+      isValid = !regex.test(fieldValue);
+      break;
+    default:
+      isValid = false;
+      break;
+  }
 
   if (!isValid) {
     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 },
@@ -911,7 +983,8 @@ const validateField = (
   apiVersion,
   fieldOptions,
   language_codes,
-  existingForm
+  existingForm,
+  getNodes = true
 ) => {
   if (onlyFormFields == true && value === undefined) return;
 
@@ -934,7 +1007,8 @@ const validateField = (
     fieldOptions,
     formData,
     language_codes,
-    existingForm
+    existingForm,
+    getNodes
   );
 
   if (
@@ -971,7 +1045,8 @@ const validateField = (
         apiVersion,
         fieldOptions,
         language_codes,
-        existingForm
+        existingForm,
+        false
       )
     );
   } else if (field.type === constants.types.ARRAY && Array.isArray(value)) {
@@ -1023,7 +1098,8 @@ const validateField = (
             apiVersion,
             fieldOptions,
             language_codes,
-            existingForm
+            existingForm,
+            false
           )
         );
       });

package/package.json

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