nox-validation 1.3.6 → 1.3.8

package/lib/helpers.js

@@ -505,7 +505,8 @@ const generateRelationalField = (
         constants.types.OBJECT,
         [...collectionFields],
         "none",
-        [constants.types.OBJECT_ID]
+        [constants.types.OBJECT_ID],
+        { ...collection_id_meta, is_m2a_item: true }
       ),
     ];
     return [existingField, deleteField, createField, updateField];
@@ -730,6 +731,7 @@ const buildNestedStructure = ({
   currentDepthMap,
   rootPath,
   isRoot,
+  modifyChild = true,
 }) => {
   const root = {};
   const nodeMap = new Map();
@@ -777,6 +779,14 @@ const buildNestedStructure = ({
       } else {
         childFields = getCachedFields(relationDetail, relational_fields);
       }
+      if (item.meta.interface === constants.interfaces.TRANSLATIONS) {
+        childFields = childFields.filter(
+          (f) =>
+            f.field !== relationDetail.foreign_field &&
+            f.field !== relationDetail.junction_field_this &&
+            f.field !== relationDetail.junction_field_foreign
+        );
+      }
 
       if (childFields) {
         if (!isRoot) currentDepthMap.set(rootPath, currentDepth + 1);
@@ -792,6 +802,7 @@ const buildNestedStructure = ({
           currentDepthMap,
           rootPath: isRoot ? item.path : rootPath,
           isRoot: false,
+          modifyChild,
         });
       }
     }
@@ -807,25 +818,41 @@ const buildNestedStructure = ({
       item.type === constants.types.ARRAY;
 
     let children = [];
-
     if (childFields?.length > 0) {
-      if (isV2File) {
-        children = childFields;
-      } else if (
-        apiVersion === constants.API_VERSION.V1 &&
-        item.meta?.interface !== constants.interfaces.TRANSLATIONS
-      ) {
-        children = generateRelationalFieldV1(
-          key,
-          childFields,
-          item.meta?.interface
-        );
+      if (modifyChild && !isV2File) {
+        const isTranslationInterface =
+          item.meta?.interface === constants.interfaces.TRANSLATIONS;
+        children =
+          apiVersion === constants.API_VERSION.V1 && !isTranslationInterface
+            ? generateRelationalFieldV1(key, childFields, item.meta?.interface)
+            : generateRelationalField(key, childFields, item.meta?.interface);
       } else {
-        children = generateRelationalField(
-          key,
-          childFields,
-          item.meta?.interface
-        );
+        // if (!modifyChild) {
+        //   if (Array.isArray(childFields) && item.meta?.interface === constants.interfaces.TRANSLATIONS) {
+        //     function prefixChildKeys(child, parentKey) {
+        //       // If the key already starts with parentKey, return as is
+        //       if (child.key && child.key.startsWith(`${parentKey}.`)) {
+        //         return {
+        //           ...child,
+        //           children: Array.isArray(child.children)
+        //             ? child.children.map(grandChild => prefixChildKeys(grandChild, child.key))
+        //             : child.children
+        //         };
+        //       }
+        //       // Otherwise, prefix the key and value, and recurse into children
+        //       return {
+        //         ...child,
+        //         key: `${parentKey}.${child.key}`,
+        //         value: `${parentKey}.${child.key}`,
+        //         children: Array.isArray(child.children)
+        //           ? child.children.map(grandChild => prefixChildKeys(grandChild, parentKey))
+        //           : child.children
+        //       };
+        //     }
+        //     childFields = childFields.map(child => prefixChildKeys(child, key));
+        //   }
+        // }
+        children = childFields;
       }
     }
 
@@ -873,29 +900,27 @@ const buildNestedStructure = ({
       ),
       custom_error_message: item?.meta?.validations?.validation_msg,
       children,
-      // childFields?.length > 0
-      //   ? isV2File
-      //     ? childFields
-      //     : apiVersion === constants.API_VERSION.V1 &&
-      //       item.meta?.interface !== constants.interfaces.TRANSLATIONS
-      //     ? generateRelationalFieldV1(key, childFields, item.meta?.interface)
-      //     : generateRelationalField(key, childFields, item.meta?.interface)
-      //   : [],
       type: definedType.type,
       array_type: definedType.array_type,
       default_value: item?.schema_definition?.default,
     };
 
-    nodeMap.set(key, node);
+    const compositeKey = `${key}::${node.schema_id}`;
+    nodeMap.set(compositeKey, node);
 
     if (pathParts.length === 1) {
-      root[key] = node;
+      root[compositeKey] = node;
     } else {
       const parentPath = pathParts.slice(0, -1).join(".");
-
-      if (nodeMap.has(parentPath)) {
-        nodeMap.get(parentPath).children.push(node);
-      }
+      const parentCompositeKey = `${parentPath}::${node.schema_id}`;
+      const parentNode = nodeMap.get(parentCompositeKey);
+
+      if (parentNode) {
+        parentNode.children.push(node);
+      } 
+      // else {
+      //   console.warn("[WARN] Parent node not found for:", node);
+      // }
     }
   });
 
@@ -1276,21 +1301,23 @@ const getM2AItemParentPath = (path) => {
 
 const getSelectedNodes = ({
   node,
-  skipFn= (node)=> node.meta?.interface === constants.interfaces.MANY_TO_ANY,
+  skipFn = (node) => node.meta?.interface === constants.interfaces.MANY_TO_ANY,
   conditionFn = (node) => node.meta?.required === true,
   mapFn = (node) => ({ key: node.key, label: node.display_label }),
   actionFn = (node) => {},
 }) => {
   const result = [];
 
-  function traverse(currentNode) {    
+  function traverse(currentNode) {
     if (conditionFn(currentNode)) {
       actionFn(currentNode);
       result.push(mapFn(currentNode));
     }
 
     if (Array.isArray(currentNode.children)) {
-      currentNode.children.forEach((child) =>{ if(!skipFn(currentNode)) traverse(child,)});
+      currentNode.children.forEach((child) => {
+        if (!skipFn(currentNode)) traverse(child);
+      });
     }
   }
 

package/package.json

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