@careflair/common 1.0.31 → 1.0.33

package/dist/schemas/forms.d.ts

@@ -195,39 +195,70 @@ export declare const EducationAndTrainingFormSchema: z.ZodEffects<z.ZodEffects<z
 /**
  * Work history form schema
  */
-export declare const WorkHistoryFormSchema: z.ZodEffects<z.ZodEffects<z.ZodObject<{
+export declare const WorkHistoryFormSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodObject<{
     jobTitle: z.ZodString;
     organisation: z.ZodString;
     startDate: z.ZodEffects<z.ZodString, string, string>;
-    endDate: z.ZodString;
+    endDate: z.ZodOptional<z.ZodString>;
+    isCurrentlyWorking: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     startDate: string;
-    endDate: string;
     jobTitle: string;
     organisation: string;
+    isCurrentlyWorking: boolean;
+    endDate?: string | undefined;
 }, {
     startDate: string;
-    endDate: string;
     jobTitle: string;
     organisation: string;
+    endDate?: string | undefined;
+    isCurrentlyWorking?: boolean | undefined;
 }>, {
     startDate: string;
-    endDate: string;
     jobTitle: string;
     organisation: string;
+    isCurrentlyWorking: boolean;
+    endDate?: string | undefined;
 }, {
     startDate: string;
-    endDate: string;
     jobTitle: string;
     organisation: string;
+    endDate?: string | undefined;
+    isCurrentlyWorking?: boolean | undefined;
 }>, {
     startDate: string;
-    endDate: string;
     jobTitle: string;
     organisation: string;
+    isCurrentlyWorking: boolean;
+    endDate?: string | undefined;
 }, {
     startDate: string;
-    endDate: string;
     jobTitle: string;
     organisation: string;
+    endDate?: string | undefined;
+    isCurrentlyWorking?: boolean | undefined;
+}>, {
+    startDate: string;
+    jobTitle: string;
+    organisation: string;
+    isCurrentlyWorking: boolean;
+    endDate?: string | undefined;
+}, {
+    startDate: string;
+    jobTitle: string;
+    organisation: string;
+    endDate?: string | undefined;
+    isCurrentlyWorking?: boolean | undefined;
+}>, {
+    startDate: string;
+    jobTitle: string;
+    organisation: string;
+    isCurrentlyWorking: boolean;
+    endDate?: string | undefined;
+}, {
+    startDate: string;
+    jobTitle: string;
+    organisation: string;
+    endDate?: string | undefined;
+    isCurrentlyWorking?: boolean | undefined;
 }>;

package/dist/schemas/forms.js

@@ -185,21 +185,50 @@ exports.WorkHistoryFormSchema = zod_1.z
         .refine((date) => !isDateInFuture(date), {
         message: "Start date cannot be in the future",
     }),
-    endDate: zod_1.z.string().min(1, "End date is required"),
+    endDate: zod_1.z.string().optional(),
+    isCurrentlyWorking: zod_1.z.boolean().default(false),
 })
     .refine((data) => {
-    // Check if end date is after start date
-    const startDate = new Date(data.startDate);
-    const endDate = new Date(data.endDate);
-    return endDate > startDate;
+    // If endDate is provided, validate it's after start date
+    if (data.endDate && data.endDate.length > 0) {
+        const startDate = new Date(data.startDate);
+        const endDate = new Date(data.endDate);
+        return endDate > startDate;
+    }
+    return true;
 }, {
     message: "End date must be after start date",
     path: ["endDate"],
 })
     .refine((data) => {
-    // Check if there's at least 1 month difference
-    return isAtLeastOneMonthDifference(data.startDate, data.endDate);
+    // If endDate is provided, validate it's not in the future
+    if (data.endDate && data.endDate.length > 0) {
+        return !isDateInFuture(data.endDate);
+    }
+    return true;
+}, {
+    message: "End date cannot be in the future",
+    path: ["endDate"],
+})
+    .refine((data) => {
+    // If endDate is provided, validate there's at least 1 month difference
+    if (data.endDate && data.endDate.length > 0) {
+        return isAtLeastOneMonthDifference(data.startDate, data.endDate);
+    }
+    return true;
 }, {
     message: "There must be at least 1 month between start and end date",
     path: ["endDate"],
+})
+    .refine((data) => {
+    // If there is an endDate, isCurrentlyWorking must be false
+    // If isCurrentlyWorking is false, endDate must be provided
+    if (data.endDate && data.endDate.length > 0) {
+        return !data.isCurrentlyWorking;
+    }
+    // If no endDate, isCurrentlyWorking must be true
+    return data.isCurrentlyWorking;
+}, {
+    message: "If there is an endDate, Currently Working must be false. If Currently Working is false, endDate must be provided.",
+    path: ["endDate", "isCurrentlyWorking"],
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@careflair/common",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "Shared assets for CareFlair",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",