@careflair/common 1.0.32 → 1.0.33

package/dist/schemas/forms.d.ts

@@ -195,7 +195,7 @@ export declare const EducationAndTrainingFormSchema: z.ZodEffects<z.ZodEffects<z
 /**
  * Work history form schema
  */
-export declare const WorkHistoryFormSchema: z.ZodEffects<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>;
@@ -249,4 +249,16 @@ export declare const WorkHistoryFormSchema: z.ZodEffects<z.ZodEffects<z.ZodEffec
     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

@@ -199,6 +199,16 @@ exports.WorkHistoryFormSchema = zod_1.z
 }, {
     message: "End date must be after start date",
     path: ["endDate"],
+})
+    .refine((data) => {
+    // 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
@@ -216,7 +226,8 @@ exports.WorkHistoryFormSchema = zod_1.z
     if (data.endDate && data.endDate.length > 0) {
         return !data.isCurrentlyWorking;
     }
-    return (data.isCurrentlyWorking || (data.endDate && data.endDate.length > 0));
+    // 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.32",
+  "version": "1.0.33",
   "description": "Shared assets for CareFlair",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",