nox-validation 1.4.0 → 1.4.1

package/lib/constant.js

@@ -128,6 +128,7 @@ const types = Object.freeze({
   MIXED: "Mixed",
   DATE_TIME: "datetime",
   TIME: "time",
+  TIMESTAMP: "timestamp",
 });
 
 const interfaces = Object.freeze({
@@ -154,14 +155,14 @@ const API_VERSIONS = Object.freeze(Object.values(API_VERSION));
 const LANGUAGES = Object.freeze({
   en: "en",
   nl: "nl",
-  lv:"lv",
-  pl:"pl",
-  ro:"ro",
-  ru:"ru",
+  lv: "lv",
+  pl: "pl",
+  ro: "ro",
+  ru: "ru",
 });
 
 const LOCALE_NL_MESSAGES = Object.freeze({
-  ADD_CHOICE: `Voeg minstens één optie toe voor {field}.`, 
+  ADD_CHOICE: `Voeg minstens één optie toe voor {field}.`,
   INVALID_VALUE: `{field} bevat een ongeldige waarde.`,
   EMPTY: `{field} moet leeg zijn.`,
   NOT_EMPTY: `{field} mag niet leeg zijn.`,
@@ -170,7 +171,8 @@ const LOCALE_NL_MESSAGES = Object.freeze({
   REQUIRED: `{field} is verplicht.`,
   OPTIONAL: `{field} is optioneel.`,
   NOT_NULLABLE: `{field} mag niet null zijn.`,
-  INVALID_TYPE: "{field} bevat een ongeldig invoertype. Alleen {type} is toegestaan.",
+  INVALID_TYPE:
+    "{field} bevat een ongeldig invoertype. Alleen {type} is toegestaan.",
   NOT_ALLOWED_FIELD: `{field} is niet toegestaan.`,
   COMPARE: `{field} komt niet overeen met de verwachte waarde.`,
   RULES_COMPARE: `{field} voldoet niet aan de vergelijkingsregels.`,
@@ -206,7 +208,7 @@ const LOCALE_NL_MESSAGES = Object.freeze({
 });
 
 const LOCALE_EN_MESSAGES = Object.freeze({
-  ADD_CHOICE:`Please add at least one choice for {field}.`,
+  ADD_CHOICE: `Please add at least one choice for {field}.`,
   INVALID_VALUE: `{field} contains invalid value.`,
   EMPTY: `{field} should be empty.`,
   NOT_EMPTY: `{field} should not be empty.`,
@@ -251,7 +253,7 @@ const LOCALE_EN_MESSAGES = Object.freeze({
 });
 
 const LOCALE_LV_MESSAGES = Object.freeze({
-  ADD_CHOICE: `Lūdzu, pievienojiet vismaz vienu izvēli laukam {field}.`, 
+  ADD_CHOICE: `Lūdzu, pievienojiet vismaz vienu izvēli laukam {field}.`,
   INVALID_VALUE: `{field} satur nederīgu vērtību.`,
   EMPTY: `{field} jābūt tukšam.`,
   NOT_EMPTY: `{field} nedrīkst būt tukšs.`,
@@ -341,7 +343,7 @@ const LOCALE_PL_MESSAGES = Object.freeze({
 });
 
 const LOCALE_RO_MESSAGES = Object.freeze({
-  ADD_CHOICE: `Vă rugăm să adăugați cel puțin o opțiune pentru {field}.`, 
+  ADD_CHOICE: `Vă rugăm să adăugați cel puțin o opțiune pentru {field}.`,
   INVALID_VALUE: `{field} conține o valoare invalidă.`,
   EMPTY: `{field} trebuie să fie gol.`,
   NOT_EMPTY: `{field} nu trebuie să fie gol.`,
@@ -431,13 +433,13 @@ const LOCALE_RU_MESSAGES = Object.freeze({
 });
 
 const LOCALE_MESSAGES = Object.freeze({
-  [LANGUAGES.en]:LOCALE_EN_MESSAGES,
-  [LANGUAGES.nl]:LOCALE_NL_MESSAGES,
-  [LANGUAGES.lv]:LOCALE_LV_MESSAGES,
-  [LANGUAGES.pl]:LOCALE_PL_MESSAGES,
-  [LANGUAGES.ro]:LOCALE_RO_MESSAGES,
-  [LANGUAGES.ru]:LOCALE_RU_MESSAGES
-})
+  [LANGUAGES.en]: LOCALE_EN_MESSAGES,
+  [LANGUAGES.nl]: LOCALE_NL_MESSAGES,
+  [LANGUAGES.lv]: LOCALE_LV_MESSAGES,
+  [LANGUAGES.pl]: LOCALE_PL_MESSAGES,
+  [LANGUAGES.ro]: LOCALE_RO_MESSAGES,
+  [LANGUAGES.ru]: LOCALE_RU_MESSAGES,
+});
 
 module.exports = {
   dataTypes,
@@ -451,5 +453,5 @@ module.exports = {
   API_VERSIONS,
   API_VERSION,
   LANGUAGES,
-  LOCALE_MESSAGES
+  LOCALE_MESSAGES,
 };

package/lib/validate.js

@@ -14,6 +14,16 @@ const {
 } = require("./helpers");
 
 const choices = ["radio", "checkboxes", "dropdown_multiple", "dropdown"];
+const relational_interfaces = [
+  constants.interfaces.FILES,
+  constants.interfaces.FILE,
+  constants.interfaces.FILE_IMAGE,
+  constants.interfaces.MANY_TO_MANY,
+  constants.interfaces.ONE_TO_MANY,
+  constants.interfaces.MANY_TO_ONE,
+  constants.interfaces.MANY_TO_ANY,
+  constants.interfaces.TRANSLATIONS,
+];
 
 const typeChecks = {
   date: (val, data) => {
@@ -26,6 +36,7 @@ const typeChecks = {
     }
     return false;
   },
+
   [constants.types.DATE]: (val, data) => {
     if (val instanceof Date && !isNaN(val)) return true;
     if (typeof val === "string" && !isNaN(Date.parse(val))) {
@@ -36,6 +47,23 @@ const typeChecks = {
     }
     return false;
   },
+  [constants.types.DATE_TIME]: (val, data) => {
+    if (val instanceof Date && !isNaN(val)) return true;
+    if (typeof val === "string" && !isNaN(Date.parse(val))) {
+      if (data && data?.key && data?.updateValue) {
+        data.updateValue(data.key, new Date(val));
+      }
+      return true;
+    }
+    return false;
+  },
+  [constants.types.TIME]: (val) =>
+    typeof val === "string" &&
+    /^([01]\d|2[0-3]):([0-5]\d):([0-5]\d)$/.test(val),
+  [constants.types.TIMESTAMP]: (val) =>
+    typeof val === "string" &&
+    /^([01]\d|2[0-3]):([0-5]\d):([0-5]\d)$/.test(val),
+
   [constants.types.BOOLEAN]: (val, data) => {
     if (typeof val === "boolean") return true;
     if (typeof val === "string") {
@@ -49,16 +77,6 @@ const typeChecks = {
     }
     return false;
   },
-  [constants.types.DATE_TIME]: (val, data) => {
-    if (val instanceof Date && !isNaN(val)) return true;
-    if (typeof val === "string" && !isNaN(Date.parse(val))) {
-      if (data && data?.key && data?.updateValue) {
-        data.updateValue(data.key, new Date(val));
-      }
-      return true;
-    }
-    return false;
-  },
   [constants.types.NUMBER]: (val, data) => {
     if (typeof val === "number" && !isNaN(val)) return true;
     if (typeof val === "string" && !isNaN(parseFloat(val))) {
@@ -69,10 +87,6 @@ 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.STRING]: (val) => typeof val === "string",
   [constants.types.OBJECT]: (val) =>
     typeof val === "object" && val !== null && !Array.isArray(val),
@@ -198,16 +212,7 @@ const validateMetaRules = (
   const fieldValue = providedValue;
 
   const { required = false, nullable = false, options } = field?.meta ?? {};
-  const relational_interfaces = [
-    constants.interfaces.FILES,
-    constants.interfaces.FILE,
-    constants.interfaces.FILE_IMAGE,
-    constants.interfaces.MANY_TO_MANY,
-    constants.interfaces.ONE_TO_MANY,
-    constants.interfaces.MANY_TO_ONE,
-    constants.interfaces.MANY_TO_ANY,
-    constants.interfaces.TRANSLATIONS,
-  ];
+
   const isRelational = relational_interfaces.includes(field?.meta?.interface);
 
   if (
@@ -284,7 +289,7 @@ const validateMetaRules = (
       constants.interfaces.ONE_TO_MANY,
       constants.interfaces.MANY_TO_ONE,
       constants.interfaces.MANY_TO_ANY,
-      "none"
+      "none",
     ].includes(field?.meta?.interface)
   ) {
     const isTranslationChild =
@@ -304,7 +309,6 @@ const validateMetaRules = (
         if (fPath.includes("delete.") && !isTranslationChild) return;
         if (fPath.includes("existing.") && !isTranslationChild) return;
 
-
         const label = formatLabel(node.display_label);
         const message = error_messages.REQUIRED.replace("{field}", label);
 
@@ -787,12 +791,20 @@ const validateField = (
   fieldOptions,
   language_codes
 ) => {
-  if (onlyFormFields == true && (value === undefined || value === null)) return;
+  const isRelational = relational_interfaces.includes(field?.meta?.interface);
+
+  if (
+    onlyFormFields == true &&
+    isRelational &&
+    (value === undefined || value === null)
+  )
+    return;
 
   const { is_m2a_item } = field?.meta;
   const currentPath = fieldPath
     ? `${fieldPath}.${field.key.split(".").pop()}`
     : field.key;
+
   const fieldLabel = formatLabel(field.display_label);
 
   validateMetaRules(
@@ -816,15 +828,17 @@ const validateField = (
     typeChecks[constants.types.OBJECT](value)
   ) {
     let itemSchemaId = null;
-    let childrenToValidate = field.children
+    let childrenToValidate = field.children;
     if (is_m2a_item) {
       const fieldPath = getM2AItemParentPath(currentPath);
       if (fieldPath) {
         itemSchemaId = getValue(formData, fieldPath)?.collection_id;
-        if(!itemSchemaId){
-          childrenToValidate = []
-        }else{
-          childrenToValidate = field.children.filter((child) => child.schema_id === itemSchemaId)
+        if (!itemSchemaId) {
+          childrenToValidate = [];
+        } else {
+          childrenToValidate = field.children.filter(
+            (child) => child.schema_id === itemSchemaId
+          );
         }
       }
     }
@@ -1011,7 +1025,7 @@ const validate = (data) => {
   };
 
   const addError = (fieldPath, obj, field) => {
-    if (byPassKeys.some((key) => fieldPath.startsWith(key))) return;
+    if (byPassKeys.some((key) => fieldPath.includes(key))) return;
     if (!result.errors[fieldPath] && !field?.meta?.hidden) {
       const pathResult = extractRelationalParents(fieldPath);
       if (pathResult) {
@@ -1217,7 +1231,8 @@ const validate = (data) => {
   findDisallowedKeys(formData, fieldOptions, maxLevel).forEach((fieldPath) => {
     if (abortEarly && !result.status) return result;
     const fieldKey = getLastChildKey(fieldPath);
-    if (fieldKey && !result.errors[fieldPath]) {
+    const isBypass = byPassKeys?.some((key) => fieldPath?.includes(key));
+    if (fieldKey && !result.errors[fieldPath] && !isBypass) {
       addError(fieldPath, {
         label: formatLabel(fieldKey),
         fieldPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nox-validation",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "validate dynamic schema",
   "main": "index.js",
   "scripts": {
@@ -18,4 +18,4 @@
   ],
   "author": "NowOnline Team",
   "license": "ISC"
-}
+}