@careflair/common 1.0.26 → 1.0.28

package/dist/schemas/forms.d.ts

@@ -125,42 +125,72 @@ export declare const ContactDetailsFormSchema: z.ZodObject<{
 /**
  * Education and training form schema
  */
-export declare const EducationAndTrainingFormSchema: z.ZodObject<{
-    type: z.ZodObject<{
-        label: z.ZodString;
-        value: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        value: string;
-        label: string;
-    }, {
-        value: string;
-        label: string;
-    }>;
+export declare const EducationAndTrainingFormSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodObject<{
+    type: z.ZodString;
     school: z.ZodString;
     degree: z.ZodString;
-    startDate: z.ZodDate;
-    endDate: z.ZodNullable<z.ZodOptional<z.ZodDate>>;
-    isCurrentlyStudying: z.ZodOptional<z.ZodUnion<[z.ZodBoolean, z.ZodLiteral<false>]>>;
+    startDate: z.ZodOptional<z.ZodDate>;
+    endDate: z.ZodOptional<z.ZodDate>;
 }, "strip", z.ZodTypeAny, {
-    type: {
-        value: string;
-        label: string;
-    };
+    type: string;
     school: string;
     degree: string;
-    startDate: Date;
-    endDate?: Date | null | undefined;
-    isCurrentlyStudying?: boolean | undefined;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
 }, {
-    type: {
-        value: string;
-        label: string;
-    };
+    type: string;
+    school: string;
+    degree: string;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
+}>, {
+    type: string;
+    school: string;
+    degree: string;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
+}, {
+    type: string;
+    school: string;
+    degree: string;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
+}>, {
+    type: string;
+    school: string;
+    degree: string;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
+}, {
+    type: string;
+    school: string;
+    degree: string;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
+}>, {
+    type: string;
+    school: string;
+    degree: string;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
+}, {
+    type: string;
+    school: string;
+    degree: string;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
+}>, {
+    type: string;
+    school: string;
+    degree: string;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
+}, {
+    type: string;
     school: string;
     degree: string;
-    startDate: Date;
-    endDate?: Date | null | undefined;
-    isCurrentlyStudying?: boolean | undefined;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
 }>;
 /**
  * Work history form schema
@@ -169,42 +199,35 @@ export declare const WorkHistoryFormSchema: z.ZodEffects<z.ZodEffects<z.ZodObjec
     jobTitle: z.ZodString;
     organisation: z.ZodString;
     startDate: z.ZodEffects<z.ZodString, string, string>;
-    endDate: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, string | undefined>;
-    isCurrentlyWorking: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
+    endDate: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     startDate: string;
+    endDate: string;
     jobTitle: string;
     organisation: string;
-    endDate?: string | undefined;
-    isCurrentlyWorking?: boolean | undefined;
 }, {
     startDate: string;
+    endDate: string;
     jobTitle: string;
     organisation: string;
-    endDate?: string | undefined;
-    isCurrentlyWorking?: boolean | undefined;
 }>, {
     startDate: string;
+    endDate: string;
     jobTitle: string;
     organisation: string;
-    endDate?: string | undefined;
-    isCurrentlyWorking?: boolean | undefined;
 }, {
     startDate: string;
+    endDate: string;
     jobTitle: string;
     organisation: string;
-    endDate?: string | undefined;
-    isCurrentlyWorking?: boolean | undefined;
 }>, {
     startDate: string;
+    endDate: string;
     jobTitle: string;
     organisation: string;
-    endDate?: string | undefined;
-    isCurrentlyWorking?: boolean | undefined;
 }, {
     startDate: string;
+    endDate: string;
     jobTitle: string;
     organisation: string;
-    endDate?: string | undefined;
-    isCurrentlyWorking?: boolean | undefined;
 }>;

package/dist/schemas/forms.js

@@ -96,11 +96,9 @@ exports.ContactDetailsFormSchema = zod_1.z.object({
 /**
  * Education and training form schema
  */
-exports.EducationAndTrainingFormSchema = zod_1.z.object({
-    type: zod_1.z.object({
-        label: zod_1.z.string(),
-        value: zod_1.z.string(),
-    }),
+exports.EducationAndTrainingFormSchema = zod_1.z
+    .object({
+    type: zod_1.z.string().min(1, "Type is required"),
     school: zod_1.z
         .string()
         .min(1, "School/Instituation is required")
@@ -109,11 +107,48 @@ exports.EducationAndTrainingFormSchema = zod_1.z.object({
         .string()
         .min(1, "Degree is required")
         .max(limits_1.EDUTRAINING_DEGREE_MAX_LENGTH, "Degree is too long"),
-    startDate: zod_1.z.date({
-        required_error: "Start date is required",
-    }),
-    endDate: zod_1.z.date().optional().nullable(),
-    isCurrentlyStudying: zod_1.z.boolean().or(zod_1.z.literal(false)).optional(),
+    startDate: zod_1.z
+        .date({
+        invalid_type_error: "Please select a start date",
+    })
+        .optional(),
+    endDate: zod_1.z
+        .date({
+        invalid_type_error: "Please select an end date",
+    })
+        .optional(),
+})
+    .refine((data) => data.startDate !== undefined && data.startDate !== null, {
+    message: "Start date is required",
+    path: ["startDate"],
+})
+    .refine((data) => data.endDate !== undefined && data.endDate !== null, {
+    message: "End date is required",
+    path: ["endDate"],
+})
+    .refine((data) => {
+    // Check if end date is after start date
+    const startDate = data.startDate;
+    const endDate = data.endDate;
+    if (!startDate || !endDate)
+        return true; // Skip if dates are not set yet
+    return endDate > startDate;
+}, {
+    message: "End date must be after start date",
+    path: ["endDate"],
+})
+    .refine((data) => {
+    // Check if there's at least 1 month difference
+    const startDate = data.startDate;
+    const endDate = data.endDate;
+    if (!startDate || !endDate)
+        return true; // Skip if dates are not set yet
+    const diffInMonths = (endDate.getFullYear() - startDate.getFullYear()) * 12 +
+        (endDate.getMonth() - startDate.getMonth());
+    return diffInMonths >= 1;
+}, {
+    message: "There must be at least 1 month between start and end date",
+    path: ["endDate"],
 });
 // Helper function to check if date is in the future
 const isDateInFuture = (date) => {
@@ -150,18 +185,9 @@ exports.WorkHistoryFormSchema = zod_1.z
         .refine((date) => !isDateInFuture(date), {
         message: "Start date cannot be in the future",
     }),
-    endDate: zod_1.z
-        .string()
-        .optional()
-        .refine((date) => !date || !isDateInFuture(date), {
-        message: "End date cannot be in the future",
-    }),
-    isCurrentlyWorking: zod_1.z.boolean().default(false).optional(),
+    endDate: zod_1.z.string().min(1, "End date is required"),
 })
     .refine((data) => {
-    // Skip validation if currently working or no end date
-    if (data.isCurrentlyWorking || !data.endDate)
-        return true;
     // Check if end date is after start date
     const startDate = new Date(data.startDate);
     const endDate = new Date(data.endDate);
@@ -171,9 +197,6 @@ exports.WorkHistoryFormSchema = zod_1.z
     path: ["endDate"],
 })
     .refine((data) => {
-    // Skip validation if currently working or no end date
-    if (data.isCurrentlyWorking || !data.endDate)
-        return true;
     // Check if there's at least 1 month difference
     return isAtLeastOneMonthDifference(data.startDate, data.endDate);
 }, {

package/package.json

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