nox-validation 1.5.9 → 1.6.1

package/lib/helpers.js

@@ -1456,6 +1456,74 @@ const getSelectedNodes = ({
   return result;
 };
 
+const getParts = (date, timeZone) => {
+  const formatter = new Intl.DateTimeFormat("en-US", {
+    timeZone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: true,
+  });
+
+  const parts = {};
+  formatter.formatToParts(new Date(date)).forEach(({ type, value }) => {
+    parts[type] = value;
+  });
+
+  return {
+    year: parts.year,
+    month: parts.month,
+    day: parts.day,
+    hour: parts.hour,
+    minute: parts.minute,
+    second: parts.second,
+    dayPeriod: parts.dayPeriod, // AM/PM
+  };
+};
+
+const formatDate = ({
+  date,
+  timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone,
+  format,
+}) => {
+  const formats = [
+    "MM/DD/YYYY h:mm A",
+    "M/D/YYYY h:mm A",
+    "YYYY-MM-DD HH:mm",
+    "DD/MM/YYYY HH:mm",
+    "DD-MM-YYYY HH:mm",
+    "MM/DD/YYYY h:mm:ss A",
+    "DD/MM/YYYY HH:mm:ss",
+    "DD-MM-YYYY HH:mm:ss",
+    "YYYY-MM-DD HH:mm:ss",
+    "YYYY.MM.DD HH:mm:ss",
+  ];
+
+  if (!formats.includes(format)) format = formats[0];
+
+  const { year, month, day, hour, minute, second, dayPeriod } = getParts(
+    date,
+    timeZone
+  );
+
+  let hour24 = Number(hour);
+  if (dayPeriod === "PM" && hour24 !== 12) hour24 += 12;
+  if (dayPeriod === "AM" && hour24 === 12) hour24 = 0;
+
+  return format
+    .replace("YYYY", year)
+    .replace("MM", month)
+    .replace("DD", day)
+    .replace("HH", String(hour24).padStart(2, "0"))
+    .replace("h", String(hour24 % 12 || 12))
+    .replace("mm", minute)
+    .replace("ss", second)
+    .replace("A", dayPeriod);
+};
+
 module.exports = {
   generateModifiedRules,
   getFieldsGroupBySchemaId,
@@ -1478,4 +1546,5 @@ module.exports = {
   getM2AItemParentPath,
   getSelectedNodes,
   remainingItems,
+  formatDate,
 };

package/lib/validate.js

@@ -12,6 +12,7 @@ const {
   getM2AItemParentPath,
   getSelectedNodes,
   remainingItems,
+  formatDate,
 } = require("./helpers");
 
 const choices = ["radio", "checkboxes", "dropdown_multiple", "dropdown"];
@@ -59,9 +60,20 @@ 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.TIME]: (val, data) => {
+    if (val instanceof Date && !isNaN(val)) return true;
+    if (typeof val === "string") {
+      if (/^([01]\d|2[0-3]):([0-5]\d):([0-5]\d)$/.test(val)) return true;
+      const parsed = Date.parse(val);
+      if (!isNaN(parsed)) {
+        if (data && data?.key && data?.updateValue) {
+          data.updateValue(data.key, new Date(val));
+        }
+        return true;
+      }
+    }
+    return false;
+  },
   [constants.types.TIMESTAMP]: (val, data) => {
     if (val instanceof Date && !isNaN(val)) return true;
     if (typeof val === "string" && !isNaN(Date.parse(val))) {
@@ -410,6 +422,7 @@ const validateMetaRules = (
   if (
     (isEmpty(fieldValue) &&
       required &&
+      !field?.meta?.hidden &&
       ![
         constants.interfaces.FILES,
         constants.interfaces.FILE,
@@ -422,11 +435,13 @@ const validateMetaRules = (
         "none",
       ].includes(field?.meta?.interface)) ||
     (field?.meta?.interface === constants.interfaces.TRANSLATIONS &&
+      !field?.meta?.hidden &&
       language_codes?.length &&
       !onlyFormFields) ||
     ([constants.interfaces.OBJECT, constants.interfaces.ITEMS].includes(
       field?.meta?.interface
     ) &&
+      !field?.meta?.hidden &&
       !onlyFormFields &&
       getNodes)
   ) {
@@ -455,6 +470,7 @@ const validateMetaRules = (
         const message = error_messages.REQUIRED.replace("{field}", label);
 
         const buildError = (path, translated) => {
+          if (!isEmpty(getValue(formData, path))) return;
           let obj = {
             label,
             fieldPath: path,
@@ -625,10 +641,6 @@ const handleRegexValidation = (
     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 },
@@ -645,7 +657,8 @@ const validateOperatorRule = (
   currentPath,
   formData,
   error_messages,
-  custom_message
+  custom_message,
+  timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
 ) => {
   const { isFieldCompare = false } = rule?.options ?? {};
   let valid = false;
@@ -658,10 +671,40 @@ const validateOperatorRule = (
   const isTime = field.type === constants.types.TIME;
   const isArray = field.type === constants.types.ARRAY;
 
-  const parseTime = (timeStr) => {
-    if (!timeStr || typeof timeStr !== "string") return null;
-    const [hh, mm, ss] = timeStr.split(":").map(Number);
-    return hh * 3600 + mm * 60 + ss;
+  const parseTime = (value) => {
+    if (!value) return null;
+
+    const toSeconds = (str) => {
+      const [hh = 0, mm = 0, ss = 0] = str.split(":").map(Number);
+      return hh * 3600 + mm * 60 + ss;
+    };
+
+    if (value instanceof Date && !isNaN(value)) {
+      const timePart = formatDate({
+        date: value,
+        format: "DD/MM/YYYY HH:mm:ss",
+        timeZone,
+      }).split(" ")[1];
+      const totalSeconds = toSeconds(timePart);
+      return totalSeconds || null;
+    }
+
+    if (typeof value === "string") {
+      if (/^\d{1,2}:\d{2}:\d{2}$/.test(value)) {
+        return toSeconds(value);
+      }
+      if (!isNaN(Date.parse(value))) {
+        const timePart = formatDate({
+          date: value,
+          format: "DD/MM/YYYY HH:mm:ss",
+          timeZone,
+        }).split(" ")[1];
+        const totalSeconds = toSeconds(timePart);
+        return totalSeconds || null;
+      }
+    }
+
+    return null;
   };
 
   // Helper to parse date string to UTC midnight timestamp
@@ -698,7 +741,8 @@ const validateOperatorRule = (
     }
     if (isDateTime) {
       if (forMessage) {
-        return value;
+        const format = field?.meta?.options?.format;
+        return formatDate({ date: value, format, timeZone });
       }
       // Return UTC timestamp for comparison
       return parseDateTimeToUTC(value);
@@ -889,7 +933,8 @@ const handleRule = (
   addError,
   currentPath,
   formData,
-  error_messages
+  error_messages,
+  timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
 ) => {
   const ruleValue = rule?.value;
   let messageValue = Array.isArray(ruleValue)
@@ -990,7 +1035,8 @@ const handleRule = (
         currentPath,
         formData,
         error_messages,
-        custom_message
+        custom_message,
+        timeZone
       );
       break;
     default:
@@ -1011,7 +1057,8 @@ const validateField = (
   fieldOptions,
   language_codes,
   existingForm,
-  getNodes = true
+  getNodes = true,
+  timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
 ) => {
   if (onlyFormFields == true && value === undefined) return;
 
@@ -1073,7 +1120,8 @@ const validateField = (
         fieldOptions,
         language_codes,
         existingForm,
-        false
+        false,
+        timeZone
       )
     );
   } else if (field.type === constants.types.ARRAY && Array.isArray(value)) {
@@ -1093,7 +1141,8 @@ const validateField = (
             addError,
             itemPath,
             formData,
-            error_messages
+            error_messages,
+            timeZone
           );
         }
 
@@ -1130,7 +1179,8 @@ const validateField = (
             fieldOptions,
             language_codes,
             existingForm,
-            false
+            false,
+            timeZone
           )
         );
       });
@@ -1143,7 +1193,8 @@ const validateField = (
         addError,
         currentPath,
         formData,
-        error_messages
+        error_messages,
+        timeZone
       )
     ) {
       addError(
@@ -1166,7 +1217,8 @@ const applyValidations = (
   addError,
   currentPath,
   formData,
-  error_messages
+  error_messages,
+  timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
 ) => {
   if (
     !field.validations ||
@@ -1185,7 +1237,8 @@ const applyValidations = (
         addError,
         currentPath,
         formData,
-        error_messages
+        error_messages,
+        timeZone
       ) === false
   );
 };
@@ -1213,6 +1266,7 @@ const schema = {
     type: constants.types.ARRAY,
     array_type: constants.types.OBJECT_ID,
   },
+  timeZone: { type: constants.types.STRING, array_type: null },
 };
 
 const validate = (data) => {
@@ -1239,6 +1293,7 @@ const validate = (data) => {
     maxLevel,
     onlyFormFields,
     existingForm = {},
+    timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone,
   } = data;
 
   const error_messages =
@@ -1499,7 +1554,8 @@ const validate = (data) => {
       apiVersion,
       fieldOptions,
       data.language_codes,
-      existingForm
+      existingForm,
+      timeZone
     );
   });
   return result;

package/package.json

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