waltronics-types 1.0.2 → 1.0.4

package/Validate.ts

@@ -1,54 +1,41 @@
 import { z } from "zod";
 import validator from "validator";
 
-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 => {
+export const isName: z.ZodType = 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, ' ')
             .split(/\s/)
+            .filter(w => w.length > 0)
             .map(w => w[0].toUpperCase() + w.slice(1).toLowerCase())
             .join(" ")
         ;
     })
 ;
 
-export const isEmail = z
-    .email("Must be a valid email.")
-    .trim()
-    .max(320, "Must enter an email less than 320 characters.")
-    .toLowerCase()
-;
+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 isPhone = z
-    .string()
-    .trim()
-    .refine(s => {
+export const isPhone: z.ZodType = 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.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.uuid();
-export const isUUIDArray = z.array(z.uuid());
-export const isBit = z.string().trim().refine(s => s === "0" || s === "1");
+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 isID = z.union([
+export const isID: z.ZodType = z.union([
     z.literal(""), 
     z.coerce.number()
 ]);
 
-export const hasLengthAndClean = (data: {min: number; max: number; name: string}) => {
+export const hasLengthAndClean = (data: {min: number; max: number; name: string}): z.ZodType => {
     return z
         .string()
         .trim()
@@ -59,46 +46,43 @@ export const hasLengthAndClean = (data: {min: number; max: number; name: string}
     ;
 }
 
-export const isCode = hasLengthAndClean({
+export const isCode: z.ZodType = hasLengthAndClean({
     min: 1,
     max: 100,
     name: "code"
 });
 
-export const isMessage = hasLengthAndClean({
+export const isMessage: z.ZodType = hasLengthAndClean({
     min: 1,
     max: 500,
     name: "message"
 });
 
-export const isHead = hasLengthAndClean({
+export const isHead: z.ZodType = hasLengthAndClean({
     min: 1,
     max: 100,
     name: "value"
 });
 
-export const isBody = hasLengthAndClean({
+export const isBody: z.ZodType = hasLengthAndClean({
     min: 1,
     max: 500,
     name: "value"
 });
 
-export const isPartName = hasLengthAndClean({
+export const isPartName: z.ZodType = hasLengthAndClean({
     min: 1,
     max: 100,
     name: "name"
 });
 
-export const isPartNumber = hasLengthAndClean({
+export const isPartNumber: z.ZodType = hasLengthAndClean({
     min: 1,
     max: 100,
     name: "name"
 });
 
-export const isCCN = z
-    .string()
-    .trim()
-    .refine(s => {
+export const isCCN: z.ZodType = z.string().trim().refine(s => {
         const validLength = s.length >= 13 && s.length <= 16;
         
         const providers = ["visa", "amex", "mastercard"] as any;
@@ -116,11 +100,7 @@ export const isCCN = z
     }, "Must enter a valid credit card number.")
 ;
 
-export const isEXP = 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.ZodType = 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));
         
@@ -136,9 +116,9 @@ export const isEXP = z
     }, "Card has expired.");
 ;
 
-export const isCreditCardType = z.enum(['VISA', 'MASTERCARD', 'AMEX']);
+export const isCreditCardType: z.ZodType = z.enum(['VISA', 'MASTERCARD', 'AMEX']);
 
-export const isRepair = hasLengthAndClean({
+export const isRepair: z.ZodType = hasLengthAndClean({
     min: 1,
     max: 500,
     name: "repair"

package/index.d.ts

@@ -10,4 +10,5 @@ export * from "./Part.ts";
 export * from "./Payment.ts";
 export * from "./ProtectedAppointment.ts";
 export * from "./Repair.ts";
-export * from "./Service.ts";
+export * from "./Service.ts";
+export * from "./Validate.ts"

package/index.js

@@ -10,4 +10,5 @@ export * from "./Part.ts";
 export * from "./Payment.ts";
 export * from "./ProtectedAppointment.ts";
 export * from "./Repair.ts";
-export * from "./Service.ts";
+export * from "./Service.ts";
+export * from "./Validate.ts"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waltronics-types",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Contains the types used in the Waltronics application.",
   "main": "index.js",
   "types": "index.d.ts",