@ciwergrp/nuxid 1.6.5 → 1.6.6

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@ciwergrp/nuxid",
   "configKey": "nuxid",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/validator.d.ts

@@ -1,5 +1,5 @@
 import type { FormRules } from 'element-plus';
-export type ValidationRule = 'required' | 'string' | 'nullable' | 'email' | 'accepted' | `accepted_if:${string}` | 'boolean' | 'filled' | 'present' | `required_if:${string}` | `required_unless:${string}` | `required_with:${string}` | `required_with_all:${string}` | `required_without:${string}` | `required_without_all:${string}` | 'prohibited' | `prohibited_if:${string}` | `prohibited_unless:${string}` | `prohibits:${string}` | `min:${number}` | `max:${number}` | `between:${number},${number}` | `size:${number}` | `same:${string}` | 'alpha' | 'alpha_num' | 'alpha_dash' | 'alphanumeric_space' | 'alpha_space' | 'numeric' | 'integer' | 'confirmed' | `digits:${number}` | `digits_between:${number},${number}` | 'bail' | `different:${string}` | `gt:${string}` | `gte:${string}` | `lt:${string}` | `lte:${string}` | `starts_with:${string}` | `ends_with:${string}` | `regex:${string}` | `date_format:${string}` | 'date' | `before:${string}` | `after:${string}` | `before_or_equal:${string}` | `after_or_equal:${string}` | 'array' | 'distinct' | `in_array:${string}` | `required_array_keys:${string}` | 'list' | 'url' | 'ip' | 'hex_color' | `in:${string}` | `multiple_of:${number}` | `decimal:${number}` | `decimal:${number},${number}` | 'lowercase' | 'uppercase' | 'uuid' | 'ulid' | `timezone:${string}` | 'timezone';
+export type ValidationRule = 'required' | 'time' | 'string' | 'nullable' | 'email' | 'accepted' | `accepted_if:${string}` | 'boolean' | 'filled' | 'present' | `required_if:${string}` | `required_unless:${string}` | `required_with:${string}` | `required_with_all:${string}` | `required_without:${string}` | `required_without_all:${string}` | 'prohibited' | `prohibited_if:${string}` | `prohibited_unless:${string}` | `prohibits:${string}` | `min:${number}` | `max:${number}` | `between:${number},${number}` | `size:${number}` | `same:${string}` | 'alpha' | 'alpha_num' | 'alpha_dash' | 'alphanumeric_space' | 'alpha_space' | 'numeric' | 'integer' | 'confirmed' | `digits:${number}` | `digits_between:${number},${number}` | 'bail' | `different:${string}` | `gt:${string}` | `gte:${string}` | `lt:${string}` | `lte:${string}` | `starts_with:${string}` | `ends_with:${string}` | `regex:${string}` | `date_format:${string}` | 'date' | `before:${string}` | `after:${string}` | `before_or_equal:${string}` | `after_or_equal:${string}` | 'array' | 'distinct' | `in_array:${string}` | `required_array_keys:${string}` | 'list' | 'url' | 'ip' | 'hex_color' | `in:${string}` | `multiple_of:${number}` | `decimal:${number}` | `decimal:${number},${number}` | 'lowercase' | 'uppercase' | 'uuid' | 'ulid' | `timezone:${string}` | 'timezone';
 export interface ValidationOptions {
     messages?: Record<string, string>;
     attributes?: Record<string, string>;

package/dist/runtime/validator.js

@@ -84,6 +84,55 @@ const isAcceptedValue = (value) => {
 const isBooleanValue = (value) => {
   return value === true || value === false || value === 0 || value === 1 || value === "0" || value === "1";
 };
+const parseTimeToMinutes = (value) => {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const match = value.match(/^([01]\d|2[0-3]):([0-5]\d)$/);
+  if (!match) {
+    return null;
+  }
+  const hours = Number(match[1]);
+  const minutes = Number(match[2]);
+  return hours * 60 + minutes;
+};
+const parseDateToTimestamp = (value) => {
+  if (typeof value !== "string") {
+    return null;
+  }
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) {
+    return null;
+  }
+  const date = /* @__PURE__ */ new Date(`${value}T00:00:00.000Z`);
+  if (Number.isNaN(date.getTime()) || date.toISOString().slice(0, 10) !== value) {
+    return null;
+  }
+  return date.getTime();
+};
+const compareFieldValues = (left, right, compare) => {
+  const leftTime = parseTimeToMinutes(left);
+  const rightTime = parseTimeToMinutes(right);
+  if (leftTime !== null || rightTime !== null) {
+    if (leftTime === null || rightTime === null) {
+      return false;
+    }
+    return compare(leftTime, rightTime);
+  }
+  const leftDate = parseDateToTimestamp(left);
+  const rightDate = parseDateToTimestamp(right);
+  if (leftDate !== null || rightDate !== null) {
+    if (leftDate === null || rightDate === null) {
+      return false;
+    }
+    return compare(leftDate, rightDate);
+  }
+  const leftNumber = Number(left);
+  const rightNumber = Number(right);
+  if (Number.isNaN(leftNumber) || Number.isNaN(rightNumber)) {
+    return false;
+  }
+  return compare(leftNumber, rightNumber);
+};
 const createDateFormatValidator = (format, message) => {
   const tokenMap = {
     Y: "\\d{4}",
@@ -119,6 +168,17 @@ const createDateFormatValidator = (format, message) => {
     callback();
   };
 };
+const createTimeValidator = (message) => {
+  return (_rule, value, callback) => {
+    if (isEmptyValue(value)) {
+      return callback();
+    }
+    if (parseTimeToMinutes(value) === null) {
+      return callback(new Error(message));
+    }
+    callback();
+  };
+};
 const createPatternValidator = (pattern, message) => {
   return (_rule, value, callback) => {
     if (value && !pattern.test(value)) {
@@ -148,7 +208,7 @@ const createIntegerValidator = (message) => {
 };
 const createComparisonValidator = (otherField, formState, message, compare) => {
   return (_rule, value, callback) => {
-    const otherValue = formState[otherField];
+    const otherValue = getNestedValue(formState, otherField);
     if (value && otherValue && !compare(value, otherValue)) {
       callback(new Error(message));
     } else {
@@ -599,6 +659,12 @@ export const createValidationRules = (definitions, formState, options = {}) => {
             trigger: pickTrigger(fieldName, "blur")
           });
           break;
+        case "time":
+          fieldRules.push({
+            validator: createTimeValidator(getMessage(fieldName, "time", `${attributeName} must be a valid time in HH:mm format`)),
+            trigger: pickTrigger(fieldName, "blur")
+          });
+          break;
         case "nullable":
           break;
         case "email":
@@ -1144,7 +1210,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           }
           const gtOtherAttr = attributes[firstParam] || firstParam;
           fieldRules.push({
-            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "gt", `${attributeName} must be greater than ${gtOtherAttr}`), (a, b) => Number(a) > Number(b)),
+            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "gt", `${attributeName} must be greater than ${gtOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x > y)),
             trigger: pickTrigger(fieldName, "blur")
           });
           break;
@@ -1155,7 +1221,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           }
           const gteOtherAttr = attributes[firstParam] || firstParam;
           fieldRules.push({
-            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "gte", `${attributeName} must be greater than or equal to ${gteOtherAttr}`), (a, b) => Number(a) >= Number(b)),
+            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "gte", `${attributeName} must be greater than or equal to ${gteOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x >= y)),
             trigger: "blur"
           });
           break;
@@ -1166,7 +1232,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           }
           const ltOtherAttr = attributes[firstParam] || firstParam;
           fieldRules.push({
-            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "lt", `${attributeName} must be less than ${ltOtherAttr}`), (a, b) => Number(a) < Number(b)),
+            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "lt", `${attributeName} must be less than ${ltOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x < y)),
             trigger: "blur"
           });
           break;
@@ -1177,7 +1243,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           }
           const lteOtherAttr = attributes[firstParam] || firstParam;
           fieldRules.push({
-            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "lte", `${attributeName} must be less than or equal to ${lteOtherAttr}`), (a, b) => Number(a) <= Number(b)),
+            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "lte", `${attributeName} must be less than or equal to ${lteOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x <= y)),
             trigger: "blur"
           });
           break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ciwergrp/nuxid",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "description": "All-in-one essential modules for Nuxt",
   "repository": {
     "type": "git",