@ciwergrp/nuxid 1.9.0 → 1.10.0

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@ciwergrp/nuxid",
   "configKey": "nuxid",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "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' | '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 type ValidationRule = 'required' | 'time' | 'datetime' | '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,17 +84,43 @@ const isAcceptedValue = (value) => {
 const isBooleanValue = (value) => {
   return value === true || value === false || value === 0 || value === 1 || value === "0" || value === "1";
 };
-const parseTimeToMinutes = (value) => {
+const parseTimeToComparable = (value) => {
   if (typeof value !== "string") {
     return null;
   }
-  const match = value.match(/^([01]\d|2[0-3]):([0-5]\d)$/);
+  const match = value.match(
+    /^([01]\d|2[0-3]):([0-5]\d)(?::([0-5]\d)(?:\.(\d{1,3}))?)?(?:(z)|([+-])([01]\d|2[0-3]):?([0-5]\d))?$/i
+  );
   if (!match) {
     return null;
   }
   const hours = Number(match[1]);
   const minutes = Number(match[2]);
-  return hours * 60 + minutes;
+  const seconds = match[3] ? Number(match[3]) : 0;
+  const milliseconds = match[4] ? Number(match[4].padEnd(3, "0")) : 0;
+  const hasZuluOffset = Boolean(match[5]);
+  const offsetSign = match[6];
+  const offsetHours = match[7] ? Number(match[7]) : 0;
+  const offsetMinutes = match[8] ? Number(match[8]) : 0;
+  const localComparableValue = hours * 36e5 + minutes * 6e4 + seconds * 1e3 + milliseconds;
+  if (hasZuluOffset) {
+    return {
+      comparableValue: localComparableValue,
+      hasOffset: true
+    };
+  }
+  if (offsetSign) {
+    const offsetComparable = (offsetHours * 60 + offsetMinutes) * 6e4;
+    const direction = offsetSign === "+" ? 1 : -1;
+    return {
+      comparableValue: localComparableValue - direction * offsetComparable,
+      hasOffset: true
+    };
+  }
+  return {
+    comparableValue: localComparableValue,
+    hasOffset: false
+  };
 };
 const parseDateToTimestamp = (value) => {
   if (typeof value !== "string") {
@@ -109,14 +135,53 @@ const parseDateToTimestamp = (value) => {
   }
   return date.getTime();
 };
+const parseDateTimeToTimestamp = (value) => {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const match = value.match(
+    /^(\d{4})-(\d{2})-(\d{2})[T ]([01]\d|2[0-3]):([0-5]\d)(?::([0-5]\d)(?:\.(\d{1,3}))?)?(?:([zZ])|([+-])([01]\d|2[0-3]):?([0-5]\d))?$/
+  );
+  if (!match) {
+    return null;
+  }
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const day = Number(match[3]);
+  const hours = Number(match[4]);
+  const minutes = Number(match[5]);
+  const seconds = match[6] ? Number(match[6]) : 0;
+  const milliseconds = match[7] ? Number(match[7].padEnd(3, "0")) : 0;
+  const utcCandidate = Date.UTC(year, month - 1, day, hours, minutes, seconds, milliseconds);
+  const utcDate = new Date(utcCandidate);
+  if (utcDate.getUTCFullYear() !== year || utcDate.getUTCMonth() !== month - 1 || utcDate.getUTCDate() !== day || utcDate.getUTCHours() !== hours || utcDate.getUTCMinutes() !== minutes || utcDate.getUTCSeconds() !== seconds || utcDate.getUTCMilliseconds() !== milliseconds) {
+    return null;
+  }
+  const hasZuluOffset = Boolean(match[8]);
+  const offsetSign = match[9];
+  const offsetHour = match[10] ? Number(match[10]) : 0;
+  const offsetMinute = match[11] ? Number(match[11]) : 0;
+  if (hasZuluOffset) {
+    return utcCandidate;
+  }
+  if (offsetSign) {
+    const totalOffsetMinutes = offsetHour * 60 + offsetMinute;
+    const direction = offsetSign === "+" ? 1 : -1;
+    return utcCandidate - direction * totalOffsetMinutes * 6e4;
+  }
+  return utcCandidate;
+};
 const compareFieldValues = (left, right, compare) => {
-  const leftTime = parseTimeToMinutes(left);
-  const rightTime = parseTimeToMinutes(right);
+  const leftTime = parseTimeToComparable(left);
+  const rightTime = parseTimeToComparable(right);
   if (leftTime !== null || rightTime !== null) {
     if (leftTime === null || rightTime === null) {
       return false;
     }
-    return compare(leftTime, rightTime);
+    if (leftTime.hasOffset !== rightTime.hasOffset) {
+      return false;
+    }
+    return compare(leftTime.comparableValue, rightTime.comparableValue);
   }
   const leftDate = parseDateToTimestamp(left);
   const rightDate = parseDateToTimestamp(right);
@@ -126,6 +191,14 @@ const compareFieldValues = (left, right, compare) => {
     }
     return compare(leftDate, rightDate);
   }
+  const leftDateTime = parseDateTimeToTimestamp(left);
+  const rightDateTime = parseDateTimeToTimestamp(right);
+  if (leftDateTime !== null || rightDateTime !== null) {
+    if (leftDateTime === null || rightDateTime === null) {
+      return false;
+    }
+    return compare(leftDateTime, rightDateTime);
+  }
   const leftNumber = Number(left);
   const rightNumber = Number(right);
   if (Number.isNaN(leftNumber) || Number.isNaN(rightNumber)) {
@@ -173,7 +246,7 @@ const createTimeValidator = (message) => {
     if (isEmptyValue(value)) {
       return callback();
     }
-    if (parseTimeToMinutes(value) === null) {
+    if (parseTimeToComparable(value) === null) {
       return callback(new Error(message));
     }
     callback();
@@ -232,6 +305,17 @@ const createDateValidator = (message) => {
     callback();
   };
 };
+const createDateTimeValidator = (message) => {
+  return (_rule, value, callback) => {
+    if (isEmptyValue(value)) {
+      return callback();
+    }
+    if (parseDateTimeToTimestamp(value) === null) {
+      return callback(new Error(message));
+    }
+    callback();
+  };
+};
 const createDateComparisonValidator = (compareDate, message, compare) => {
   return (_rule, value, callback) => {
     if (!value) {
@@ -665,7 +749,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           break;
         case "time":
           fieldRules.push({
-            validator: createTimeValidator(getMessage(fieldName, "time", `${attributeName} must be a valid time in HH:mm format`)),
+            validator: createTimeValidator(getMessage(fieldName, "time", `${attributeName} must be a valid time`)),
             trigger: pickTrigger(fieldName, "blur")
           });
           break;
@@ -784,6 +868,12 @@ export const createValidationRules = (definitions, formState, options = {}) => {
             trigger: pickTrigger(fieldName, "blur")
           });
           break;
+        case "datetime":
+          fieldRules.push({
+            validator: createDateTimeValidator(getMessage(fieldName, "datetime", `${attributeName} must be a valid datetime`)),
+            trigger: pickTrigger(fieldName, "blur")
+          });
+          break;
         case "before":
           if (!firstParam) {
             return;

package/package.json

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