nox-validation 1.5.8 → 1.6.0

package/lib/helpers.js

@@ -1456,6 +1456,77 @@ 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];
+  if (!date || isNaN(new Date(date).getTime())) {
+    throw new RangeError("Invalid time value");
+  }
+  const dateObj = date instanceof Date ? date : new Date(date);
+  const { year, month, day, hour, minute, second, dayPeriod } = getParts(
+    dateObj,
+    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 +1549,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"];
@@ -645,14 +646,17 @@ const validateOperatorRule = (
   currentPath,
   formData,
   error_messages,
-  custom_message
+  custom_message,
+  timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
 ) => {
   const { isFieldCompare = false } = rule?.options ?? {};
   let valid = false;
 
   const isNumber = field.type === constants.types.NUMBER;
   const isDate = field.type === constants.types.DATE || field.type === "date";
-  const isDateTime = field.type === constants.types.DATE_TIME;
+  const isDateTime =
+    field.type === constants.types.DATE_TIME ||
+    field.type === constants.types.TIMESTAMP;
   const isTime = field.type === constants.types.TIME;
   const isArray = field.type === constants.types.ARRAY;
 
@@ -696,7 +700,8 @@ const validateOperatorRule = (
     }
     if (isDateTime) {
       if (forMessage) {
-        return value;
+        const format = field?.options?.format;
+        return formatDate({ date: value, format, timeZone });
       }
       // Return UTC timestamp for comparison
       return parseDateTimeToUTC(value);
@@ -887,7 +892,8 @@ const handleRule = (
   addError,
   currentPath,
   formData,
-  error_messages
+  error_messages,
+  timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
 ) => {
   const ruleValue = rule?.value;
   let messageValue = Array.isArray(ruleValue)
@@ -988,7 +994,8 @@ const handleRule = (
         currentPath,
         formData,
         error_messages,
-        custom_message
+        custom_message,
+        timeZone
       );
       break;
     default:
@@ -1009,7 +1016,8 @@ const validateField = (
   fieldOptions,
   language_codes,
   existingForm,
-  getNodes = true
+  getNodes = true,
+  timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
 ) => {
   if (onlyFormFields == true && value === undefined) return;
 
@@ -1071,7 +1079,8 @@ const validateField = (
         fieldOptions,
         language_codes,
         existingForm,
-        false
+        false,
+        timeZone
       )
     );
   } else if (field.type === constants.types.ARRAY && Array.isArray(value)) {
@@ -1091,7 +1100,8 @@ const validateField = (
             addError,
             itemPath,
             formData,
-            error_messages
+            error_messages,
+            timeZone
           );
         }
 
@@ -1128,7 +1138,8 @@ const validateField = (
             fieldOptions,
             language_codes,
             existingForm,
-            false
+            false,
+            timeZone
           )
         );
       });
@@ -1141,7 +1152,8 @@ const validateField = (
         addError,
         currentPath,
         formData,
-        error_messages
+        error_messages,
+        timeZone
       )
     ) {
       addError(
@@ -1164,7 +1176,8 @@ const applyValidations = (
   addError,
   currentPath,
   formData,
-  error_messages
+  error_messages,
+  timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
 ) => {
   if (
     !field.validations ||
@@ -1183,7 +1196,8 @@ const applyValidations = (
         addError,
         currentPath,
         formData,
-        error_messages
+        error_messages,
+        timeZone
       ) === false
   );
 };
@@ -1211,6 +1225,7 @@ const schema = {
     type: constants.types.ARRAY,
     array_type: constants.types.OBJECT_ID,
   },
+  timeZone: { type: constants.types.STRING, array_type: null },
 };
 
 const validate = (data) => {
@@ -1237,6 +1252,7 @@ const validate = (data) => {
     maxLevel,
     onlyFormFields,
     existingForm = {},
+    timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone,
   } = data;
 
   const error_messages =
@@ -1497,7 +1513,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.8",
+  "version": "1.6.0",
   "description": "validate dynamic schema",
   "main": "index.js",
   "scripts": {