(feat) Expose dayjs for date calculate expressions

Author: pirupius

src/utils/common-expression-helpers.ts

@@ -20,6 +20,7 @@ export class CommonExpressionHelpers {
   allFieldValues: Record<string, any> = {};
   api = apiFunctions;
   isEmpty = isValueEmpty;
+  dayjs = dayjs;
 
   constructor(node: FormNode, patient: any, allFields: FormField[], allFieldValues: Record<string, any>) {
     this.allFields = allFields;
@@ -101,7 +102,12 @@ export class CommonExpressionHelpers {
    * @returns true if left is before right
    */
   isDateBefore = (left: Date, right: string | Date, format?: string): boolean => {
-    const otherDate: Date = right instanceof Date ? right : (format ? dayjs(right, format, true).toDate() : dayjs(right, 'YYYY-MM-DD', true).toDate());
+    const otherDate: Date =
+      right instanceof Date
+        ? right
+        : format
+        ? dayjs(right, format, true).toDate()
+        : dayjs(right, 'YYYY-MM-DD', true).toDate();
     return left?.getTime() < otherDate.getTime();
   };
 
@@ -113,7 +119,12 @@ export class CommonExpressionHelpers {
    * @param timePeriod - The time unit: 'days', 'weeks', 'months', or 'years'
    * @returns true if selectedDate >= (baseDate + duration)
    */
-  isDateAfter = (selectedDate: Date, baseDate: Date, duration: number, timePeriod: 'days' | 'weeks' | 'months' | 'years'): boolean => {
+  isDateAfter = (
+    selectedDate: Date,
+    baseDate: Date,
+    duration: number,
+    timePeriod: 'days' | 'weeks' | 'months' | 'years',
+  ): boolean => {
     const parsedBaseDate = dayjs(baseDate);
 
     let calculatedDate: Date;
@@ -165,7 +176,12 @@ export class CommonExpressionHelpers {
    * @returns true if left is after right
    */
   isDateAfterSimple = (left: Date, right: string | Date, format?: string): boolean => {
-    const otherDate: Date = right instanceof Date ? right : (format ? dayjs(right, format, true).toDate() : dayjs(right, 'YYYY-MM-DD', true).toDate());
+    const otherDate: Date =
+      right instanceof Date
+        ? right
+        : format
+        ? dayjs(right, format, true).toDate()
+        : dayjs(right, 'YYYY-MM-DD', true).toDate();
     return left?.getTime() > otherDate.getTime();
   };
 

src/utils/expression-runner.test.ts

@@ -76,6 +76,24 @@ export const testFields: Array<FormField> = [
     },
     id: 'bodyTemperature',
   },
+  {
+    label: 'Date of Birth',
+    type: 'obs',
+    questionOptions: {
+      rendering: 'date',
+      concept: 'date_of_birth_concept',
+    },
+    id: 'dateOfBirth',
+  },
+  {
+    label: 'Age in Days',
+    type: 'obs',
+    questionOptions: {
+      rendering: 'number',
+      concept: 'age_in_days_concept',
+    },
+    id: 'ageInDays',
+  },
 ];
 
 export const fields: Array<FormField> = [
@@ -180,6 +198,8 @@ describe('Expression runner', () => {
     htsProviderRemarks: '',
     referredToPreventionServices: [],
     bodyTemperature: 0,
+    dateOfBirth: '',
+    ageInDays: 0,
     no_interest: '',
     depressed: '',
     bad_sleep: '',
@@ -199,6 +219,8 @@ describe('Expression runner', () => {
       htsProviderRemarks: '',
       referredToPreventionServices: [],
       bodyTemperature: 0,
+      dateOfBirth: '',
+      ageInDays: 0,
       no_interest: '',
       depressed: '',
       bad_sleep: '',
@@ -360,4 +382,25 @@ describe('Expression runner', () => {
     );
     expect(result).toEqual(5);
   });
+
+  it('should calculate age in days using dayjs diff expression', () => {
+    // setup - use a known date 30 days ago
+    const thirtyDaysAgo = new Date();
+    thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30);
+    const dateOfBirthString = thirtyDaysAgo.toISOString().split('T')[0];
+    valuesMap['dateOfBirth'] = dateOfBirthString;
+
+    // Calculate days difference
+    const result = evaluateExpression(
+      "dayjs().diff(dayjs(dateOfBirth), 'day')",
+      { value: allFields[6], type: 'field' },
+      allFields,
+      valuesMap,
+      context,
+    );
+
+    // Should be approximately 30 days (allowing for time-of-day variations)
+    expect(result).toBeGreaterThanOrEqual(29);
+    expect(result).toBeLessThanOrEqual(31);
+  });
 });