nox-validation 1.2.9 → 1.3.1

package/lib/helpers.js

@@ -267,101 +267,14 @@ const generateType = (field, api) => {
   }
 };
 
-const convertTypes = (field) => {
-  let { type, schema_definition, meta } = field;
-  let array_type = schema_definition?.type ?? null;
-  let interfaceType = meta?.interface;
-  let find_relations = false;
-
-  if (
-    [
-      constants.interfaces.ONE_TO_MANY,
-      constants.interfaces.MANY_TO_MANY,
-      constants.interfaces.MANY_TO_ANY,
-      constants.interfaces.MANY_TO_ONE,
-      constants.interfaces.TRANSLATIONS,
-    ].includes(interfaceType)
-  ) {
-    return {
-      type: constants.types.OBJECT,
-      array_type: null,
-      find_relations: true,
-    };
-  }
-
-  if (interfaceType === constants.interfaces.FILES) {
-    return {
-      type: constants.types.ARRAY,
-      array_type: constants.types.OBJECT_ID,
-      find_relations: false,
-    };
-  }
-
-  if (type !== schema_definition?.type && schema_definition?.type !== constants.types.ALIAS) {
-    array_type = schema_definition.type;
-  }
-  return { type, array_type, find_relations };
-};
-
-const convertTypesV1 = (field) => {
-  let { type, schema_definition, meta } = field;
-  let array_type = schema_definition?.type ?? null;
-  let interfaceType = meta?.interface;
-  let find_relations = false;
-
-  if ([constants.interfaces.TRANSLATIONS].includes(interfaceType)) {
-    return {
-      type: constants.types.OBJECT,
-      array_type: null,
-      find_relations: true,
-    };
-  }
-
-  if ([constants.interfaces.MANY_TO_ANY].includes(interfaceType)) {
-    return {
-      type: constants.types.ARRAY,
-      array_type: constants.types.OBJECT,
-      find_relations: true,
-    };
-  }
-
-  if ([constants.interfaces.MANY_TO_ONE].includes(interfaceType)) {
-    return {
-      type: constants.types.OBJECT_ID,
-      array_type: null,
-      find_relations: false,
-    };
-  }
-
-  if (
-    [
-      constants.interfaces.ONE_TO_MANY,
-      constants.interfaces.MANY_TO_MANY,
-      constants.interfaces.FILES,
-    ].includes(interfaceType)
-  ) {
-    return {
-      type: constants.types.ARRAY,
-      array_type: constants.types.OBJECT_ID,
-      find_relations: false,
-    };
-  }
-
-  if (type !== schema_definition?.type && schema_definition?.type !== constants.types.ALIAS) {
-    array_type = schema_definition.type;
-    find_relations = false;
-  }
-
-  return { type, array_type, find_relations };
-};
-
 const generateField = (
   name,
   path,
   schema_definition_type,
   type,
   childrenFields = [],
-  relationType = "none"
+  relationType = "none",
+  alternateType=[]
 ) => {
   childrenFields = childrenFields?.map((child) => {
     return {
@@ -378,6 +291,7 @@ const generateField = (
     value: path,
     children: childrenFields,
     type: type,
+    alternateType,
     meta: {
       required: false,
       nullable: false,
@@ -489,7 +403,8 @@ const generateRelationalField = (key = "", collectionFields = [], relationType)
         constants.types.OBJECT,
         constants.types.OBJECT,
         collectionFields,
-        relationType
+        'none',
+        [constants.types.OBJECT_ID]
       ),
     ];
     const updateField = generateField(
@@ -513,7 +428,8 @@ const generateRelationalField = (key = "", collectionFields = [], relationType)
         constants.types.OBJECT,
         constants.types.OBJECT,
         collectionFields,
-        relationType
+        "none",
+        [constants.types.OBJECT_ID]
       ),
     ];
     return [existingField, deleteField, createField, updateField];
@@ -789,6 +705,49 @@ const buildNestedStructure = ({
       childFields = createChildrenFieldsFiles(key);
     }
 
+    const isArray =
+      item.type === item?.schema_definition.type && 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);
+      } else {
+        children = generateRelationalField(key, childFields, item.meta?.interface);
+      }
+    }
+
+    if (isArray) {
+      const idField = {
+        field_id: `${key}._id`,
+        schema_id: item?.schema_id,
+        display_label: "_id",
+        key: `${key}._id`,
+        value: `${key}._id`,
+        alternateType:[],
+        meta: {
+          interface: "none",
+          required: false,
+          nullable: false,
+          hidden: false,
+          options: {},
+        },
+        validations: [],
+        custom_error_message: null,
+        children: [],
+        type: constants.types.OBJECT_ID,
+        array_type: definedType.array_type,
+        default_value: null,
+      };
+      children.push(idField);
+    }
+
     const node = {
       field_id: item?._id,
       schema_id: item?.schema_id,
@@ -804,15 +763,15 @@ const buildNestedStructure = ({
       },
       validations: generateModifiedRules(item?.meta, item?.meta?.validations?.validation_msg),
       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)
-          : [],
+      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,
@@ -1168,16 +1127,17 @@ const getDefaultValues = (tree) => {
   return defaultValues;
 };
 
-const extractRelationalParents=(path)=> {
+const extractRelationalParents = (path) => {
   const match = path?.match(/^([^.\[\]]+)\.(create|update|delete|existing)\[(\d+)\](?:\.(.*))?/);
   if (match) {
-    const secondParent = match[1];             
-    const firstParent = match[0].split('.')[0] + '.' + match[2] + '[' + path.match(/\[(\d+)\]/)[1] + ']'; // 
-    const afterKey = match[3] || '';     
+    const secondParent = match[1];
+    const firstParent =
+      match[0].split(".")[0] + "." + match[2] + "[" + path.match(/\[(\d+)\]/)[1] + "]"; //
+    const afterKey = match[3] || "";
     return { firstParent, secondParent, afterKey };
   }
   return null;
-}
+};
 
 module.exports = {
   generateModifiedRules,
@@ -1197,5 +1157,5 @@ module.exports = {
   getAllFields,
   getForeignCollectionDetails,
   getDefaultValues,
-  extractRelationalParents
+  extractRelationalParents,
 };

package/lib/validate.js

@@ -157,7 +157,7 @@ const isEmptyRelational = ({ api_version, value, interface }) => {
       return value?.length > 0;
     }
   } else {
-    return value?.create?.length > 0 || value?.existing?.length > 0 ||  value?.update?.length > 0;
+    return value?.create?.length > 0 || value?.existing?.length > 0 || value?.update?.length > 0;
   }
   return false;
 };
@@ -244,10 +244,14 @@ const validateMetaRules = (
     );
   }
 
+  const validType =
+    field?.alternateType?.length > 0
+      ? [field.type, ...field?.alternateType].some((type) => typeChecks[type](fieldValue)) 
+      : typeChecks[field.type](fieldValue,{ key: currentPath, updateValue });
+
   if (
     !isEmpty(fieldValue) &&
-    typeChecks[field.type] &&
-    !typeChecks[field.type](fieldValue, { key: currentPath, updateValue })
+    !validType
   ) {
     const message = error_messages.INVALID_TYPE.replace(
       `{field}`,

package/package.json

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