nox-validation 1.0.6 → 1.0.7

package/lib/helpers.js

@@ -158,30 +158,6 @@ const isEmpty = (val) => {
 };
 
 const convertTypes = (field) => {
-  // array_type:
-  // item.type !== item.schema_definition.type &&
-  // item.schema_definition.type !== constants.types.ALIAS
-  //   ? item.schema_definition.type
-  //   : item.type === item.schema_definition.type &&
-  //       item.type === constants.types.ARRAY
-  //     ? constants.types.OBJECT
-  //     : null,
-
-  // type:
-  // item.type === constants.types.ALIAS ||
-  // item.schema_definition.type === constants.types.ALIAS
-  //   ? constants.types.OBJECT
-  //   : item.type,
-
-  //   'list-o2m', // alias
-  //   'list-m2o', // objectid
-  //   'list-m2m', // alias
-  //   'file', // objectid
-  //   'file-image', // objectid
-  //   'files', // alias
-  //   'list-m2a', // alias
-  //   'translations', // alias
-
   let { type, schema_definition, meta } = field;
   let array_type = schema_definition?.type ?? null;
   let interfaceType = meta?.interface;
@@ -207,7 +183,7 @@ const convertTypes = (field) => {
     return {
       type: constants.types.ARRAY,
       array_type: constants.types.OBJECT_ID,
-      find_relations: true,
+      find_relations: false,
     };
   }
 
@@ -270,90 +246,83 @@ const convertTypesV1 = (field) => {
   return { type, array_type, find_relations };
 };
 
-const generateRelationalFieldV1 = (key = "", collectionFields = [], relationType) => {
-  const generateField = (name, path, schema_definition_type, type, childrenFields = []) => {
-    const relationalPath = key ? `${key}.${path}` : path;
-
+const generateField = (name, path, schema_definition_type, type, childrenFields = []) => {
+  childrenFields = childrenFields?.map((child) => {
     return {
-      display_label: name,
-      key: relationalPath,
-      value: relationalPath,
-      children: childrenFields,
-      type: type,
-      meta: {
-        required: false,
-        nullable: false,
-        hidden: false,
-      },
-      validations: [],
-      array_type: schema_definition_type,
+      ...child,
+      value: `${path}.${child.value}`,
+      key: `${path}.${child.key}`,
     };
+  });
+
+  return {
+    display_label: name,
+    // field: name,
+    key: path,
+    value: path,
+    children: childrenFields,
+    type: type,
+    meta: {
+      required: false,
+      nullable: false,
+      hidden: false,
+    },
+    validations: [],
+    schema_definition: {
+      type: schema_definition_type,
+    },
   };
+};
 
+const generateRelationalFieldV1 = (key = "", collectionFields = [], relationType) => {
   if (relationType === constants.interfaces.MANY_TO_ANY) {
     return [
-      generateField("collection", "collection", constants.types.STRING, constants.types.STRING),
-      generateField("sort", "sort", constants.types.NUMBER, constants.types.NUMBER),
-      generateField("item", "item", constants.types.OBJECT_ID, constants.types.OBJECT_ID),
+      generateField(
+        "collection",
+        `${key}.collection`,
+        constants.types.STRING,
+        constants.types.STRING
+      ),
+      generateField("sort", `${key}.sort`, constants.types.NUMBER, constants.types.NUMBER),
+      generateField("item", `${key}.item`, constants.types.OBJECT_ID, constants.types.OBJECT_ID),
     ];
   } else {
-    return [];
+    return null;
   }
 };
 
 const generateRelationalField = (key = "", collectionFields = [], relationType) => {
-  const generateField = (name, path, schema_definition_type, type, childrenFields = []) => {
-    const relationalPath = key ? `${key}.${path}` : path;
-    childrenFields = childrenFields?.map((child) => {
-      return {
-        ...child,
-        key: `${relationalPath}.${child.key}`,
-        value: `${relationalPath}.${child.value}`,
-      };
-    });
-
-    return {
-      display_label: name,
-      key: relationalPath,
-      value: relationalPath,
-      children: childrenFields,
-      type: type,
-      meta: {
-        required: false,
-        nullable: false,
-        hidden: false,
-      },
-      validations: [],
-      array_type: schema_definition_type,
-    };
-  };
-
   if (relationType === constants.interfaces.MANY_TO_ANY) {
     const existingField = generateField(
-      `${key}.existing`,
       "existing",
+      `${key}.existing`,
       constants.types.OBJECT,
       constants.types.ARRAY
     );
     existingField.children = [
       generateField(
         "collection",
-        "existing.collection",
+        `${key}.existing.collection`,
         constants.types.STRING,
         constants.types.STRING
       ),
-      generateField("sort", "existing.sort", constants.types.NUMBER, constants.types.NUMBER),
-      generateField("item", "existing.item", constants.types.OBJECT_ID, constants.types.OBJECT_ID),
+      generateField("sort", `${key}.existing.sort`, constants.types.NUMBER, constants.types.NUMBER),
+      generateField(
+        "item",
+        `${key}.existing.item`,
+        constants.types.OBJECT_ID,
+        constants.types.OBJECT_ID
+      ),
     ];
     const deleteField = generateField(
       "delete",
-      "delete",
+      `${key}.delete`,
       constants.types.OBJECT_ID,
       constants.types.ARRAY
     );
     const createField = generateField(
       "create",
-      "create",
+      `${key}.create`,
       constants.types.OBJECT,
       constants.types.ARRAY,
       collectionFields
@@ -361,14 +330,14 @@ const generateRelationalField = (key = "", collectionFields = [], relationType)
     createField.children = [
       generateField(
         "collection",
-        "create.collection",
+        `${key}.create.collection`,
         constants.types.STRING,
         constants.types.STRING
       ),
-      generateField("sort", "create.sort", constants.types.NUMBER, constants.types.NUMBER),
+      generateField("sort", `${key}.create.sort`, constants.types.NUMBER, constants.types.NUMBER),
       generateField(
         "item",
-        "create.item",
+        `${key}.create.item`,
         constants.types.OBJECT,
         constants.types.OBJECT,
         collectionFields
@@ -376,7 +345,7 @@ const generateRelationalField = (key = "", collectionFields = [], relationType)
     ];
     const updateField = generateField(
       "update",
-      "update",
+      `${key}.update`,
       constants.types.OBJECT,
       constants.types.ARRAY,
       collectionFields
@@ -384,14 +353,14 @@ const generateRelationalField = (key = "", collectionFields = [], relationType)
     updateField.children = [
       generateField(
         "collection",
-        "update.collection",
+        `${key}.update.collection`,
         constants.types.STRING,
         constants.types.STRING
       ),
-      generateField("sort", "update.sort", constants.types.NUMBER, constants.types.NUMBER),
+      generateField("sort", `${key}.update.sort`, constants.types.NUMBER, constants.types.NUMBER),
       generateField(
         "item",
-        "update.item",
+        `${key}.update.item`,
         constants.types.OBJECT,
         constants.types.OBJECT,
         collectionFields
@@ -400,18 +369,23 @@ const generateRelationalField = (key = "", collectionFields = [], relationType)
     return [existingField, deleteField, createField, updateField];
   } else {
     return [
-      generateField("existing", "existing", constants.types.OBJECT_ID, constants.types.ARRAY),
-      generateField("delete", "delete", constants.types.OBJECT_ID, constants.types.ARRAY),
+      generateField(
+        "existing",
+        `${key}.existing`,
+        constants.types.OBJECT_ID,
+        constants.types.ARRAY
+      ),
+      generateField("delete", `${key}.delete`, constants.types.OBJECT_ID, constants.types.ARRAY),
       generateField(
         "create",
-        "create",
+        `${key}.create`,
         constants.types.OBJECT,
         constants.types.ARRAY,
         collectionFields
       ),
       generateField(
         "update",
-        "update",
+        `${key}.update`,
         constants.types.OBJECT,
         constants.types.ARRAY,
         collectionFields
@@ -573,6 +547,18 @@ const getChildFields = (relationDetail, allFields, relational_fields, isTranslat
   }
 };
 
+const default_fields = [
+  "updated_by",
+  "created_by",
+  "created_at",
+  "updated_at",
+  "nox_created_at",
+  "nox_updated_at",
+  "nox_created_by",
+  "nox_updated_by",
+  "_id",
+];
+
 const buildNestedStructure = (
   schemaFields,
   allFields,
@@ -588,13 +574,20 @@ const buildNestedStructure = (
   schemaFields.sort((a, b) => a.path.split(".").length - b.path.split(".").length);
 
   schemaFields.forEach((item) => {
+    const pathParts = item.path.split(".");
+    const key = pathParts.join(".");
+
     let childFields;
 
     const definedType =
       apiVersion === constants.API_VERSION.V1 ? convertTypesV1(item) : convertTypes(item);
-    const isUserKey = item?.path?.includes("updated_by") || item?.path?.includes("created_by");
+    // const isUserKey = default_fields.some((field) => item?.path?.includes(field));
 
-    if (definedType.find_relations && !isUserKey) {
+    if (
+      definedType.find_relations &&
+      (item?.type === constants.types.ALIAS ||
+        item?.schema_definition?.type === constants.types.ALIAS)
+    ) {
       const relationDetail = getForeignCollectionDetails({
         relations: relations,
         collection: item?.schema_id,
@@ -624,12 +617,10 @@ const buildNestedStructure = (
           relational_fields,
           isSeparatedFields
         );
+ 
       }
     }
 
-    const pathParts = item.path.split(".");
-    const key = pathParts.join(".");
-
     const node = {
       field_id: item?._id,
       display_label: pathParts[pathParts.length - 1],

package/package.json

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