waltronics-types 1.0.5 → 1.0.7

package/Validate.ts

@@ -1,6 +1,10 @@
 import { z } from "zod";
 import validator from "validator";
 
+export const VIN = /^[A-HJ-NPR-Z0-9]{17}$/;
+export const UUID = /^[A-Z0-9]{8}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{12}$/;
+export const SQL_DATE = /^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}(:[0-9]{2}$|:[0-9]{2}.[0-9]{3}$)/;
+
 export const isName = z.string().trim().min(2, "Must enter a name.").max(50, "Must enter a name less than 50 characters.").regex(/^[A-Za-z\s'-]*$/, "Must enter a name without symbols.").transform(s => {
         return s
             .replace(/\s+/g, ' ')
@@ -12,30 +16,30 @@ export const isName = z.string().trim().min(2, "Must enter a name.").max(50, "Mu
     })
 ;
 
-export const isEmail: z.ZodType = z.email("Must be a valid email.").trim().max(320, "Must enter an email less than 320 characters.").toLowerCase();
+export const isEmail = z.string().trim().toLowerCase().email().max(320);
 
-export const isPhone: z.ZodType = z.string().trim().refine(s => {
+export const isPhone = z.string().trim().refine(s => {
         const hasFormat = !!s.match(/[0-9]{3}-[0-9]{3}-[0-9]{4}/);
         const isMobilePhone = validator.isMobilePhone("1" + s.replaceAll("-", ""), "en-US")
         return hasFormat && isMobilePhone;
     }, "Must enter a phone number in the format 123-456-7890.")
 ;
 
-export const isDate: z.ZodType = z.string().trim().regex(/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}(:[0-9]{2}$|:[0-9]{2}.[0-9]{3}$)/);
-export const isMoney: z.ZodType = z.coerce.number();
-export const isVIN: z.ZodType = z.string().trim().regex(/^[A-HJ-NPR-Z0-9]{17}$/, "Must enter a valid VIN.")
-export const isInteger: z.ZodType = z.coerce.number().int();
-export const isIntegerArray: z.ZodType = z.array(z.coerce.number().int());
-export const isUUID: z.ZodType = z.uuid();
-export const isUUIDArray: z.ZodType = z.array(z.uuid());
-export const isBit: z.ZodType = z.string().trim().refine(s => s === "0" || s === "1");
+export const isDate = z.string().trim().regex(/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}(:[0-9]{2}$|:[0-9]{2}.[0-9]{3}$)/);
+export const isMoney = z.coerce.number();
+export const isVIN = z.string().trim().regex(/^[A-HJ-NPR-Z0-9]{17}$/, "Must enter a valid VIN.")
+export const isInteger = z.coerce.number().int();
+export const isIntegerArray = z.array(z.coerce.number().int());
+export const isUUID = z.string().refine(s => !!s.match(UUID));
+export const isUUIDArray = z.array(z.string()).refine(ids => ids.every(id => !!id.match(UUID)));
+export const isBit = z.string().trim().refine(s => s === "0" || s === "1");
 
-export const isID: z.ZodType = z.union([
+export const isID = z.union([
     z.literal(""), 
     z.coerce.number()
 ]);
 
-export const hasLengthAndClean = (data: {min: number; max: number; name: string}): z.ZodType => {
+export const hasLengthAndClean = (data: {min: number; max: number; name: string}) => {
     return z
         .string()
         .trim()
@@ -46,43 +50,43 @@ export const hasLengthAndClean = (data: {min: number; max: number; name: string}
     ;
 }
 
-export const isCode: z.ZodType = hasLengthAndClean({
+export const isCode = hasLengthAndClean({
     min: 1,
     max: 100,
     name: "code"
 });
 
-export const isMessage: z.ZodType = hasLengthAndClean({
+export const isMessage = hasLengthAndClean({
     min: 1,
     max: 500,
     name: "message"
 });
 
-export const isHead: z.ZodType = hasLengthAndClean({
+export const isHead = hasLengthAndClean({
     min: 1,
     max: 100,
     name: "value"
 });
 
-export const isBody: z.ZodType = hasLengthAndClean({
+export const isBody = hasLengthAndClean({
     min: 1,
     max: 500,
     name: "value"
 });
 
-export const isPartName: z.ZodType = hasLengthAndClean({
+export const isPartName = hasLengthAndClean({
     min: 1,
     max: 100,
     name: "name"
 });
 
-export const isPartNumber: z.ZodType = hasLengthAndClean({
+export const isPartNumber = hasLengthAndClean({
     min: 1,
     max: 100,
     name: "name"
 });
 
-export const isCCN: z.ZodType = z.string().trim().refine(s => {
+export const isCCN = z.string().trim().refine(s => {
         const validLength = s.length >= 13 && s.length <= 16;
         
         const providers = ["visa", "amex", "mastercard"] as any;
@@ -100,7 +104,7 @@ export const isCCN: z.ZodType = z.string().trim().refine(s => {
     }, "Must enter a valid credit card number.")
 ;
 
-export const isEXP: z.ZodType = z.string().trim().regex(/^(0[1-9]|1[0-2])[0-9]{2}$/, "Must enter a valid expiration date.").refine(s => {
+export const isEXP = z.string().trim().regex(/^(0[1-9]|1[0-2])[0-9]{2}$/, "Must enter a valid expiration date.").refine(s => {
         const month = parseInt(s.substring(0, 2));
         const year = 2000 + parseInt(s.substring(2, 4));
         
@@ -116,27 +120,27 @@ export const isEXP: z.ZodType = z.string().trim().regex(/^(0[1-9]|1[0-2])[0-9]{2
     }, "Card has expired.");
 ;
 
-export const isCreditCardType: z.ZodType = z.enum(['VISA', 'MASTERCARD', 'AMEX']);
+export const isCreditCardType = z.enum(['VISA', 'MASTERCARD', 'AMEX']);
 
-export const isRepair: z.ZodType = hasLengthAndClean({
+export const isRepair = hasLengthAndClean({
     min: 1,
     max: 500,
     name: "repair"
 });
 
-export const isClass: z.ZodType = hasLengthAndClean({
+export const isClass = hasLengthAndClean({
     min: 1,
     max: 500,
     name: "repair"
 });
 
-export const isDivision: z.ZodType = hasLengthAndClean({
+export const isDivision = hasLengthAndClean({
     min: 1,
     max: 50,
     name: "value"
 });
 
-export const isService: z.ZodType = hasLengthAndClean({
+export const isService = hasLengthAndClean({
     min: 1,
     max: 50,
     name: "value"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waltronics-types",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Contains the types used in the Waltronics application.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "validator": "^13.15.26",
-    "zod": "^4.3.5"
+    "zod": "^3.24.1"
   },
   "devDependencies": {
     "@types/validator": "^13.15.10"