nox-validation 1.5.6 → 1.5.8

package/lib/validate.js

@@ -662,34 +662,44 @@ const validateOperatorRule = (
     return hh * 3600 + mm * 60 + ss;
   };
 
+  // Helper to parse date string to UTC midnight timestamp
+  const parseDateToUTC = (value) => {
+    if (!value) return NaN;
+    const date = new Date(value);
+    // Set to UTC midnight
+    return Date.UTC(
+      date.getUTCFullYear(),
+      date.getUTCMonth(),
+      date.getUTCDate()
+    );
+  };
+
+  // Helper to parse datetime string to UTC timestamp (seconds/milliseconds)
+  const parseDateTimeToUTC = (value) => {
+    if (!value) return NaN;
+    const date = new Date(value);
+    return date.getTime();
+  };
+
   const getComparableValue = (value, forMessage = false) => {
     if (isNumber) return Number(value);
     if (isDate) {
-      const date = new Date(value);
-      date.setHours(0, 0, 0, 0);
       if (forMessage) {
+        // Format as YYYY-MM-DD
+        const date = new Date(value);
         return `${date.getUTCFullYear()}-${String(
           date.getUTCMonth() + 1
         ).padStart(2, "0")}-${String(date.getUTCDate()).padStart(2, "0")}`;
       }
-      return Math.floor(date.getTime() / 1000);
+      // Return UTC midnight timestamp for comparison
+      return parseDateToUTC(value);
     }
     if (isDateTime) {
-      const date = new Date(value);
-
       if (forMessage) {
-        return (
-          `${date.getUTCFullYear()}-${String(date.getUTCMonth() + 1).padStart(
-            2,
-            "0"
-          )}-${String(date.getUTCDate()).padStart(2, "0")} ` +
-          `${String(date.getUTCHours()).padStart(2, "0")}:${String(
-            date.getUTCMinutes()
-          ).padStart(2, "0")}:${String(date.getUTCSeconds()).padStart(2, "0")}`
-        );
+        return value;
       }
-
-      return Math.floor(date.getTime() / 1000);
+      // Return UTC timestamp for comparison
+      return parseDateTimeToUTC(value);
     }
     if (isTime) {
       if (forMessage) {
@@ -700,20 +710,23 @@ const validateOperatorRule = (
     return value;
   };
 
-  rule.value = rule.value?.map((key) => {
-    const value = isFieldCompare
-      ? getComparableValue(getValue(formData, key), true)
-      : getComparableValue(key, true);
-    return value ? value : key;
-  });
-
+  // For date/datetime, parse to comparable value (timestamp)
   const fieldValueParsed = getComparableValue(fieldValue);
 
   const messageValue = Array.isArray(rule.value)
-    ? rule.value.join(", ")
-    : String(rule.value);
+    ? rule.value?.map((key) => getComparableValue(key, true)).join(", ")
+    : String(getComparableValue(rule.value, true));
   let message = "";
 
+  // For date/datetime, rule.value should be parsed to comparable value (timestamp)
+  rule.value = rule.value?.map((key) => {
+    const value = isFieldCompare
+      ? getComparableValue(getValue(formData, key), false)
+      : getComparableValue(key, false);
+    // For date/datetime, allow 0 as valid value
+    return value !== undefined && value !== null ? value : key;
+  });
+
   switch (rule.options.operator) {
     case constants.operatorTypes.AND:
       message = custom_message ?? error_messages.AND;
@@ -737,57 +750,66 @@ const validateOperatorRule = (
       message = custom_message ?? error_messages.EQUAL;
       message = message
         ?.replace(`{field}`, formatLabel(field.display_label))
-        ?.replace("{value}", rule.value[0]);
-      valid = fieldValueParsed === getComparableValue(rule.value[0]);
+        ?.replace("{value}", messageValue);
+      valid = fieldValueParsed === rule.value[0];
       break;
     case constants.operatorTypes.NOT_EQUAL:
       message = custom_message ?? error_messages.NOT_EQUAL;
       message = message
         ?.replace(`{field}`, formatLabel(field.display_label))
-        ?.replace("{value}", rule.value[0]);
-      valid = fieldValueParsed !== getComparableValue(rule.value[0]);
+        ?.replace("{value}", messageValue);
+      valid = fieldValueParsed !== rule.value[0];
       break;
     case constants.operatorTypes.LESS_THAN:
       message = custom_message ?? error_messages.LESS_THAN;
       message = message
         ?.replace(`{field}`, formatLabel(field.display_label))
-        ?.replace("{value}", rule.value[0]);
-      valid = fieldValueParsed < getComparableValue(rule.value[0]);
+        ?.replace("{value}", messageValue);
+      valid = fieldValueParsed < rule.value[0];
       break;
     case constants.operatorTypes.LESS_THAN_EQUAL:
       message = custom_message ?? error_messages.LESS_THAN_EQUAL;
       message = message
         ?.replace(`{field}`, formatLabel(field.display_label))
-        ?.replace("{value}", rule.value[0]);
-      valid = fieldValueParsed <= getComparableValue(rule.value[0]);
+        ?.replace("{value}", messageValue);
+      valid = fieldValueParsed <= rule.value[0];
       break;
     case constants.operatorTypes.GREATER_THAN:
       message = custom_message ?? error_messages.GREATER_THAN;
       message = message
         ?.replace(`{field}`, formatLabel(field.display_label))
-        ?.replace("{value}", rule.value[0]);
-      valid = fieldValueParsed > getComparableValue(rule.value[0]);
+        ?.replace("{value}", messageValue);
+      valid = fieldValueParsed > rule.value[0];
       break;
     case constants.operatorTypes.GREATER_THAN_EQUAL:
       message = custom_message ?? error_messages.GREATER_THAN_EQUAL;
       message = message
         ?.replace(`{field}`, formatLabel(field.display_label))
-        ?.replace("{value}", rule.value[0]);
-      valid = fieldValueParsed >= getComparableValue(rule.value[0]);
+        ?.replace("{value}", messageValue);
+      valid = fieldValueParsed >= rule.value[0];
       break;
     case constants.operatorTypes.IN:
       message = custom_message ?? error_messages.IN;
       message = message
         ?.replace(`{field}`, formatLabel(field.display_label))
         ?.replace("{value}", messageValue);
-      valid = rule.value.includes(fieldValue);
+      // For date/datetime, compare timestamps
+      if (isDate || isDateTime) {
+        valid = rule.value.includes(fieldValueParsed);
+      } else {
+        valid = rule.value.includes(fieldValue);
+      }
       break;
     case constants.operatorTypes.NOT_IN:
       message = custom_message ?? error_messages.NOT_IN;
       message = message
         ?.replace(`{field}`, formatLabel(field.display_label))
         ?.replace("{value}", messageValue);
-      valid = !rule.value.includes(fieldValue);
+      if (isDate || isDateTime) {
+        valid = !rule.value.includes(fieldValueParsed);
+      } else {
+        valid = !rule.value.includes(fieldValue);
+      }
       break;
     case constants.operatorTypes.EXISTS:
       message = custom_message ?? error_messages.EXISTS;
@@ -800,7 +822,7 @@ const validateOperatorRule = (
       message = custom_message ?? error_messages.TYPE;
       message = message
         ?.replace(`{field}`, formatLabel(field.display_label))
-        ?.replace("{value}", rule.value[0]);
+        ?.replace("{value}", messageValue);
       valid = typeChecks[rule.value[0]](fieldValue);
       break;
     case constants.operatorTypes.MOD:

package/package.json

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