@ecrvs/opencrvs-toolkit 1.9.0-rc.a4498ac → 1.9.0-rc.b385861

package/dist/commons/conditionals/conditionals.d.ts

@@ -133,6 +133,7 @@ export declare function createFieldConditionals(fieldId: string): {
             isLessThan(value: number | FieldReference): JSONSchema;
             isEqualTo(value: string | boolean | number | FieldReference): JSONSchema;
             isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+            isValidDeceasedAge(dobField: FieldReference, dodField: FieldReference, todField: FieldReference, format: "years" | "months" | "days" | "hours"): JSONSchema;
             isAbbreviation(): JSONSchema;
             isIllDefined(causesOfDeathFields: FieldReference[], threshold: number): JSONSchema;
             /**
@@ -191,6 +192,7 @@ export declare function createFieldConditionals(fieldId: string): {
         isLessThan(value: number | FieldReference): JSONSchema;
         isEqualTo(value: string | boolean | number | FieldReference): JSONSchema;
         isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+        isValidDeceasedAge(dobField: FieldReference, dodField: FieldReference, todField: FieldReference, format: "years" | "months" | "days" | "hours"): JSONSchema;
         isAbbreviation(): JSONSchema;
         isIllDefined(causesOfDeathFields: FieldReference[], threshold: number): JSONSchema;
         /**
@@ -263,6 +265,7 @@ export declare function createFieldConditionals(fieldId: string): {
             isLessThan(value: number | FieldReference): JSONSchema;
             isEqualTo(value: string | boolean | number | FieldReference): JSONSchema;
             isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+            isValidDeceasedAge(dobField: FieldReference, dodField: FieldReference, todField: FieldReference, format: "years" | "months" | "days" | "hours"): JSONSchema;
             isAbbreviation(): JSONSchema;
             isIllDefined(causesOfDeathFields: FieldReference[], threshold: number): JSONSchema;
             /**
@@ -330,6 +333,7 @@ export declare function createFieldConditionals(fieldId: string): {
             isLessThan(value: number | FieldReference): JSONSchema;
             isEqualTo(value: string | boolean | number | FieldReference): JSONSchema;
             isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+            isValidDeceasedAge(dobField: FieldReference, dodField: FieldReference, todField: FieldReference, format: "years" | "months" | "days" | "hours"): JSONSchema;
             isAbbreviation(): JSONSchema;
             isIllDefined(causesOfDeathFields: FieldReference[], threshold: number): JSONSchema;
             /**
@@ -396,6 +400,7 @@ export declare function createFieldConditionals(fieldId: string): {
             isLessThan(value: number | FieldReference): JSONSchema;
             isEqualTo(value: string | boolean | number | FieldReference): JSONSchema;
             isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+            isValidDeceasedAge(dobField: FieldReference, dodField: FieldReference, todField: FieldReference, format: "years" | "months" | "days" | "hours"): JSONSchema;
             isAbbreviation(): JSONSchema;
             isIllDefined(causesOfDeathFields: FieldReference[], threshold: number): JSONSchema;
             /**
@@ -452,6 +457,7 @@ export declare function createFieldConditionals(fieldId: string): {
         isLessThan(value: number | FieldReference): JSONSchema;
         isEqualTo(value: string | boolean | number | FieldReference): JSONSchema;
         isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+        isValidDeceasedAge(dobField: FieldReference, dodField: FieldReference, todField: FieldReference, format: "years" | "months" | "days" | "hours"): JSONSchema;
         isAbbreviation(): JSONSchema;
         isIllDefined(causesOfDeathFields: FieldReference[], threshold: number): JSONSchema;
         /**
@@ -525,6 +531,7 @@ export declare function createFieldConditionals(fieldId: string): {
             isLessThan(value: number | FieldReference): JSONSchema;
             isEqualTo(value: string | boolean | number | FieldReference): JSONSchema;
             isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+            isValidDeceasedAge(dobField: FieldReference, dodField: FieldReference, todField: FieldReference, format: "years" | "months" | "days" | "hours"): JSONSchema;
             isAbbreviation(): JSONSchema;
             isIllDefined(causesOfDeathFields: FieldReference[], threshold: number): JSONSchema;
             /**
@@ -583,6 +590,7 @@ export declare function createFieldConditionals(fieldId: string): {
         isLessThan(value: number | FieldReference): JSONSchema;
         isEqualTo(value: string | boolean | number | FieldReference): JSONSchema;
         isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+        isValidDeceasedAge(dobField: FieldReference, dodField: FieldReference, todField: FieldReference, format: "years" | "months" | "days" | "hours"): JSONSchema;
         isAbbreviation(): JSONSchema;
         isIllDefined(causesOfDeathFields: FieldReference[], threshold: number): JSONSchema;
         /**
@@ -656,6 +664,7 @@ export declare function createFieldConditionals(fieldId: string): {
             isLessThan(value: number | FieldReference): JSONSchema;
             isEqualTo(value: string | boolean | number | FieldReference): JSONSchema;
             isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+            isValidDeceasedAge(dobField: FieldReference, dodField: FieldReference, todField: FieldReference, format: "years" | "months" | "days" | "hours"): JSONSchema;
             isAbbreviation(): JSONSchema;
             isIllDefined(causesOfDeathFields: FieldReference[], threshold: number): JSONSchema;
             /**
@@ -714,6 +723,7 @@ export declare function createFieldConditionals(fieldId: string): {
         isLessThan(value: number | FieldReference): JSONSchema;
         isEqualTo(value: string | boolean | number | FieldReference): JSONSchema;
         isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+        isValidDeceasedAge(dobField: FieldReference, dodField: FieldReference, todField: FieldReference, format: "years" | "months" | "days" | "hours"): JSONSchema;
         isAbbreviation(): JSONSchema;
         isIllDefined(causesOfDeathFields: FieldReference[], threshold: number): JSONSchema;
         /**
@@ -770,6 +780,7 @@ export declare function createFieldConditionals(fieldId: string): {
     isLessThan(value: number | FieldReference): JSONSchema;
     isEqualTo(value: string | boolean | number | FieldReference): JSONSchema;
     isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+    isValidDeceasedAge(dobField: FieldReference, dodField: FieldReference, todField: FieldReference, format: "years" | "months" | "days" | "hours"): JSONSchema;
     isAbbreviation(): JSONSchema;
     isIllDefined(causesOfDeathFields: FieldReference[], threshold: number): JSONSchema;
     /**

package/dist/commons/conditionals/validate.d.ts

@@ -7,6 +7,7 @@ import { TranslationConfig } from '../events/TranslationConfig';
 import { ITokenPayload } from '../authentication';
 import { UUID } from '../uuid';
 import { ActionType } from '../client';
+export declare const isValidDateFormat: (date: string) => boolean;
 export declare function validate(schema: JSONSchema, data: ConditionalParameters): boolean;
 export declare function validateValue(schema: JSONSchema, data: unknown): boolean;
 export declare function isOnline(): boolean;

package/dist/commons/events/DeduplicationConfig.d.ts

@@ -120,8 +120,8 @@ declare const DateRangeMatcher: z.ZodObject<z.objectUtil.extendShape<{
         days: z.ZodNumber;
         boost: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     }, "strip", z.ZodTypeAny, {
-        boost: number;
         days: number;
+        boost: number;
         pivot?: number | undefined;
     }, {
         days: number;
@@ -131,8 +131,8 @@ declare const DateRangeMatcher: z.ZodObject<z.objectUtil.extendShape<{
 }>, "strip", z.ZodTypeAny, {
     type: "dateRange";
     options: {
-        boost: number;
         days: number;
+        boost: number;
         pivot?: number | undefined;
     };
     fieldId: string;

package/dist/commons/events/field.d.ts

@@ -114,6 +114,16 @@ export declare function field(fieldId: string, options?: {
                 $$field: string;
                 $$subfield: string[];
             }): import("../conditionals/conditionals").JSONSchema;
+            isValidDeceasedAge(dobField: {
+                $$field: string;
+                $$subfield: string[];
+            }, dodField: {
+                $$field: string;
+                $$subfield: string[];
+            }, todField: {
+                $$field: string;
+                $$subfield: string[];
+            }, format: "years" | "months" | "days" | "hours"): import("../conditionals/conditionals").JSONSchema;
             isAbbreviation(): import("../conditionals/conditionals").JSONSchema;
             isIllDefined(causesOfDeathFields: {
                 $$field: string;
@@ -174,6 +184,16 @@ export declare function field(fieldId: string, options?: {
             $$field: string;
             $$subfield: string[];
         }): import("../conditionals/conditionals").JSONSchema;
+        isValidDeceasedAge(dobField: {
+            $$field: string;
+            $$subfield: string[];
+        }, dodField: {
+            $$field: string;
+            $$subfield: string[];
+        }, todField: {
+            $$field: string;
+            $$subfield: string[];
+        }, format: "years" | "months" | "days" | "hours"): import("../conditionals/conditionals").JSONSchema;
         isAbbreviation(): import("../conditionals/conditionals").JSONSchema;
         isIllDefined(causesOfDeathFields: {
             $$field: string;
@@ -242,6 +262,16 @@ export declare function field(fieldId: string, options?: {
                 $$field: string;
                 $$subfield: string[];
             }): import("../conditionals/conditionals").JSONSchema;
+            isValidDeceasedAge(dobField: {
+                $$field: string;
+                $$subfield: string[];
+            }, dodField: {
+                $$field: string;
+                $$subfield: string[];
+            }, todField: {
+                $$field: string;
+                $$subfield: string[];
+            }, format: "years" | "months" | "days" | "hours"): import("../conditionals/conditionals").JSONSchema;
             isAbbreviation(): import("../conditionals/conditionals").JSONSchema;
             isIllDefined(causesOfDeathFields: {
                 $$field: string;
@@ -308,6 +338,16 @@ export declare function field(fieldId: string, options?: {
                 $$field: string;
                 $$subfield: string[];
             }): import("../conditionals/conditionals").JSONSchema;
+            isValidDeceasedAge(dobField: {
+                $$field: string;
+                $$subfield: string[];
+            }, dodField: {
+                $$field: string;
+                $$subfield: string[];
+            }, todField: {
+                $$field: string;
+                $$subfield: string[];
+            }, format: "years" | "months" | "days" | "hours"): import("../conditionals/conditionals").JSONSchema;
             isAbbreviation(): import("../conditionals/conditionals").JSONSchema;
             isIllDefined(causesOfDeathFields: {
                 $$field: string;
@@ -373,6 +413,16 @@ export declare function field(fieldId: string, options?: {
                 $$field: string;
                 $$subfield: string[];
             }): import("../conditionals/conditionals").JSONSchema;
+            isValidDeceasedAge(dobField: {
+                $$field: string;
+                $$subfield: string[];
+            }, dodField: {
+                $$field: string;
+                $$subfield: string[];
+            }, todField: {
+                $$field: string;
+                $$subfield: string[];
+            }, format: "years" | "months" | "days" | "hours"): import("../conditionals/conditionals").JSONSchema;
             isAbbreviation(): import("../conditionals/conditionals").JSONSchema;
             isIllDefined(causesOfDeathFields: {
                 $$field: string;
@@ -431,6 +481,16 @@ export declare function field(fieldId: string, options?: {
             $$field: string;
             $$subfield: string[];
         }): import("../conditionals/conditionals").JSONSchema;
+        isValidDeceasedAge(dobField: {
+            $$field: string;
+            $$subfield: string[];
+        }, dodField: {
+            $$field: string;
+            $$subfield: string[];
+        }, todField: {
+            $$field: string;
+            $$subfield: string[];
+        }, format: "years" | "months" | "days" | "hours"): import("../conditionals/conditionals").JSONSchema;
         isAbbreviation(): import("../conditionals/conditionals").JSONSchema;
         isIllDefined(causesOfDeathFields: {
             $$field: string;
@@ -500,6 +560,16 @@ export declare function field(fieldId: string, options?: {
                 $$field: string;
                 $$subfield: string[];
             }): import("../conditionals/conditionals").JSONSchema;
+            isValidDeceasedAge(dobField: {
+                $$field: string;
+                $$subfield: string[];
+            }, dodField: {
+                $$field: string;
+                $$subfield: string[];
+            }, todField: {
+                $$field: string;
+                $$subfield: string[];
+            }, format: "years" | "months" | "days" | "hours"): import("../conditionals/conditionals").JSONSchema;
             isAbbreviation(): import("../conditionals/conditionals").JSONSchema;
             isIllDefined(causesOfDeathFields: {
                 $$field: string;
@@ -560,6 +630,16 @@ export declare function field(fieldId: string, options?: {
             $$field: string;
             $$subfield: string[];
         }): import("../conditionals/conditionals").JSONSchema;
+        isValidDeceasedAge(dobField: {
+            $$field: string;
+            $$subfield: string[];
+        }, dodField: {
+            $$field: string;
+            $$subfield: string[];
+        }, todField: {
+            $$field: string;
+            $$subfield: string[];
+        }, format: "years" | "months" | "days" | "hours"): import("../conditionals/conditionals").JSONSchema;
         isAbbreviation(): import("../conditionals/conditionals").JSONSchema;
         isIllDefined(causesOfDeathFields: {
             $$field: string;
@@ -629,6 +709,16 @@ export declare function field(fieldId: string, options?: {
                 $$field: string;
                 $$subfield: string[];
             }): import("../conditionals/conditionals").JSONSchema;
+            isValidDeceasedAge(dobField: {
+                $$field: string;
+                $$subfield: string[];
+            }, dodField: {
+                $$field: string;
+                $$subfield: string[];
+            }, todField: {
+                $$field: string;
+                $$subfield: string[];
+            }, format: "years" | "months" | "days" | "hours"): import("../conditionals/conditionals").JSONSchema;
             isAbbreviation(): import("../conditionals/conditionals").JSONSchema;
             isIllDefined(causesOfDeathFields: {
                 $$field: string;
@@ -689,6 +779,16 @@ export declare function field(fieldId: string, options?: {
             $$field: string;
             $$subfield: string[];
         }): import("../conditionals/conditionals").JSONSchema;
+        isValidDeceasedAge(dobField: {
+            $$field: string;
+            $$subfield: string[];
+        }, dodField: {
+            $$field: string;
+            $$subfield: string[];
+        }, todField: {
+            $$field: string;
+            $$subfield: string[];
+        }, format: "years" | "months" | "days" | "hours"): import("../conditionals/conditionals").JSONSchema;
         isAbbreviation(): import("../conditionals/conditionals").JSONSchema;
         isIllDefined(causesOfDeathFields: {
             $$field: string;
@@ -747,6 +847,16 @@ export declare function field(fieldId: string, options?: {
         $$field: string;
         $$subfield: string[];
     }): import("../conditionals/conditionals").JSONSchema;
+    isValidDeceasedAge(dobField: {
+        $$field: string;
+        $$subfield: string[];
+    }, dodField: {
+        $$field: string;
+        $$subfield: string[];
+    }, todField: {
+        $$field: string;
+        $$subfield: string[];
+    }, format: "years" | "months" | "days" | "hours"): import("../conditionals/conditionals").JSONSchema;
     isAbbreviation(): import("../conditionals/conditionals").JSONSchema;
     isIllDefined(causesOfDeathFields: {
         $$field: string;

package/dist/conditionals/index.js

@@ -437,18 +437,39 @@ function createFieldConditionals(fieldId) {
       return defineFormConditional({
         type: "object",
         properties: {
-          [fieldId]: { type: "number" },
+          [this.$$field]: { type: "number" },
           [field1Id]: { type: "number" },
           [field2Id]: { type: "number" }
         },
-        required: [fieldId, field1Id, field2Id],
+        required: [this.$$field, field1Id, field2Id],
         sumOf: {
-          sum: fieldId,
+          sum: this.$$field,
           field1: field1Id,
           field2: field2Id
         }
       });
     },
+    isValidDeceasedAge(dobField, dodField, todField, format) {
+      const dobFieldId = dobField.$$field;
+      const dodFieldId = dodField.$$field;
+      const todFieldId = todField.$$field;
+      return defineFormConditional({
+        type: "object",
+        properties: {
+          [this.$$field]: { type: "string" },
+          [dobFieldId]: { type: "string" },
+          [dodFieldId]: { type: "string" },
+          [todFieldId]: { type: "string" }
+        },
+        isValidAgeOfDeceased: {
+          ageField: this.$$field,
+          dateOfBirthField: dobFieldId,
+          deathDateField: dodFieldId,
+          deathTimeField: todFieldId,
+          format
+        }
+      });
+    },
     isAbbreviation() {
       return defineFormConditional({
         type: "object",

package/dist/events/index.js

@@ -349,6 +349,7 @@ __export(events_exports, {
   isTextFieldType: () => isTextFieldType,
   isTimeFieldType: () => isTimeFieldType,
   isUndeclaredDraft: () => isUndeclaredDraft,
+  isValidDateFormat: () => isValidDateFormat,
   isVerificationPage: () => isVerificationPage,
   isVerificationStatusType: () => isVerificationStatusType,
   isWriteAction: () => isWriteAction,
@@ -4404,6 +4405,66 @@ ajv.addKeyword({
     return locations.some((location) => location.id === locationIdInput);
   }
 });
+var datePattern = /^\d{4}-\d{1,2}-\d{1,2}$/;
+var isValidDateFormat = (date) => {
+  if (!datePattern.test(date)) return false;
+  const d = new Date(date);
+  return !isNaN(d.getTime());
+};
+var MS_PER_DAY = 1e3 * 60 * 60 * 24;
+var MS_PER_HOUR = 1e3 * 60 * 60;
+function getAgeOfDeceased(dateOfBirth, dateOfDeath, format3 = "years") {
+  if (dateOfDeath < dateOfBirth) {
+    return 0;
+  }
+  if (format3 === "years") {
+    let age = dateOfDeath.getFullYear() - dateOfBirth.getFullYear();
+    const monthDiff = dateOfDeath.getMonth() - dateOfBirth.getMonth();
+    const dayDiff = dateOfDeath.getDate() - dateOfBirth.getDate();
+    if (monthDiff < 0 || monthDiff === 0 && dayDiff < 0) age--;
+    return age;
+  }
+  if (format3 === "months") {
+    let months = (dateOfDeath.getFullYear() - dateOfBirth.getFullYear()) * 12;
+    months += dateOfDeath.getMonth() - dateOfBirth.getMonth();
+    if (dateOfDeath.getDate() < dateOfBirth.getDate()) months--;
+    return months;
+  }
+  if (format3 === "days") {
+    const diffTime2 = dateOfDeath.getTime() - dateOfBirth.getTime();
+    return Math.floor(diffTime2 / MS_PER_DAY);
+  }
+  const diffTime = dateOfDeath.getTime() - dateOfBirth.getTime();
+  const remainingMs = diffTime - MS_PER_DAY;
+  return remainingMs < 0 ? Math.floor(diffTime / MS_PER_HOUR) : Math.floor(remainingMs / MS_PER_HOUR);
+}
+ajv.addKeyword({
+  keyword: "isValidAgeOfDeceased",
+  type: "object",
+  schemaType: "object",
+  errors: true,
+  validate(schema, data) {
+    const {
+      ageField,
+      dateOfBirthField,
+      deathDateField,
+      deathTimeField,
+      format: format3
+    } = schema;
+    const dob = data?.[dateOfBirthField];
+    const dod = data?.[deathDateField];
+    const tod = data?.[deathTimeField];
+    const ageValue = data?.[ageField];
+    if (!ageValue || !isValidDateFormat(dob) || !isValidDateFormat(dod)) {
+      return true;
+    }
+    const dateOfBirth = /* @__PURE__ */ new Date(`${dob}T00:00:00+00:00`);
+    const dateOfDeath = tod ? /* @__PURE__ */ new Date(`${dod}T${tod}:00+00:00`) : /* @__PURE__ */ new Date(`${dod}T00:00:00+00:00`);
+    const deceasedAge = getAgeOfDeceased(dateOfBirth, dateOfDeath, format3);
+    const sameDay = dateOfBirth.toISOString().slice(0, 10) === dateOfDeath.toISOString().slice(0, 10);
+    return Number(ageValue) === deceasedAge && !(format3 === "hours" && !sameDay) || format3 === "days" && deceasedAge - Number(ageValue) === 1 || format3 === "hours" && !sameDay && deceasedAge < Number(ageValue);
+  }
+});
 ajv.addKeyword({
   keyword: "sumOf",
   type: "object",
@@ -4427,7 +4488,9 @@ ajv.addKeyword({
   schemaType: "boolean",
   errors: true,
   validate(schema, data) {
-    if (!schema) return true;
+    if (!schema) {
+      return true;
+    }
     if (typeof data !== "string") {
       return true;
     }
@@ -4448,11 +4511,15 @@ ajv.addKeyword({
   errors: true,
   validate(schema, data) {
     const { fields, threshold } = schema;
-    if (!data || typeof data !== "object") return true;
+    if (!data || typeof data !== "object") {
+      return true;
+    }
     const causesOfDeath = fields.flatMap(
       (field3) => (data?.[field3] || "").split(",").map((v) => v.trim()).filter(Boolean)
     ).filter((val, index, self) => self.indexOf(val) === index);
-    if (causesOfDeath.length === 0) return true;
+    if (causesOfDeath.length === 0) {
+      return true;
+    }
     let hasNonIllDefined = false;
     for (const term of causesOfDeath) {
       const results = fuzzySearch(term, illDefinedConditions, threshold).filter(
@@ -4791,7 +4858,9 @@ function fuzzySearch(query, list, threshold, limit = 3) {
   const normalize = (str) => str.toLowerCase().replace(/[^\w\s]/g, "").trim();
   const tokenize = (str) => normalize(str).split(/\s+/).filter((w) => w.length >= 3);
   const queryWords = tokenize(query);
-  if (queryWords.length === 0) return [];
+  if (queryWords.length === 0) {
+    return [];
+  }
   const results = [];
   for (const item of list) {
     const itemWords = tokenize(item);
@@ -4807,7 +4876,9 @@ function fuzzySearch(query, list, threshold, limit = 3) {
       for (const iWord of itemWords) {
         const dist = levenshtein(qWord, iWord);
         const normDist = dist / Math.max(qWord.length, iWord.length);
-        if (normDist < bestScore) bestScore = normDist;
+        if (normDist < bestScore) {
+          bestScore = normDist;
+        }
       }
       if (bestScore !== Infinity) {
         const weight = COMMON_WORDS.has(qWord) ? 0.5 : 1;
@@ -5623,18 +5694,39 @@ function createFieldConditionals(fieldId) {
       return defineFormConditional({
         type: "object",
         properties: {
-          [fieldId]: { type: "number" },
+          [this.$$field]: { type: "number" },
           [field1Id]: { type: "number" },
           [field2Id]: { type: "number" }
         },
-        required: [fieldId, field1Id, field2Id],
+        required: [this.$$field, field1Id, field2Id],
         sumOf: {
-          sum: fieldId,
+          sum: this.$$field,
           field1: field1Id,
           field2: field2Id
         }
       });
     },
+    isValidDeceasedAge(dobField, dodField, todField, format3) {
+      const dobFieldId = dobField.$$field;
+      const dodFieldId = dodField.$$field;
+      const todFieldId = todField.$$field;
+      return defineFormConditional({
+        type: "object",
+        properties: {
+          [this.$$field]: { type: "string" },
+          [dobFieldId]: { type: "string" },
+          [dodFieldId]: { type: "string" },
+          [todFieldId]: { type: "string" }
+        },
+        isValidAgeOfDeceased: {
+          ageField: this.$$field,
+          dateOfBirthField: dobFieldId,
+          deathDateField: dodFieldId,
+          deathTimeField: todFieldId,
+          format: format3
+        }
+      });
+    },
     isAbbreviation() {
       return defineFormConditional({
         type: "object",

package/dist/notification/index.js

@@ -3644,6 +3644,66 @@ ajv.addKeyword({
     return locations.some((location) => location.id === locationIdInput);
   }
 });
+var datePattern = /^\d{4}-\d{1,2}-\d{1,2}$/;
+var isValidDateFormat = (date) => {
+  if (!datePattern.test(date)) return false;
+  const d = new Date(date);
+  return !isNaN(d.getTime());
+};
+var MS_PER_DAY = 1e3 * 60 * 60 * 24;
+var MS_PER_HOUR = 1e3 * 60 * 60;
+function getAgeOfDeceased(dateOfBirth, dateOfDeath, format3 = "years") {
+  if (dateOfDeath < dateOfBirth) {
+    return 0;
+  }
+  if (format3 === "years") {
+    let age = dateOfDeath.getFullYear() - dateOfBirth.getFullYear();
+    const monthDiff = dateOfDeath.getMonth() - dateOfBirth.getMonth();
+    const dayDiff = dateOfDeath.getDate() - dateOfBirth.getDate();
+    if (monthDiff < 0 || monthDiff === 0 && dayDiff < 0) age--;
+    return age;
+  }
+  if (format3 === "months") {
+    let months = (dateOfDeath.getFullYear() - dateOfBirth.getFullYear()) * 12;
+    months += dateOfDeath.getMonth() - dateOfBirth.getMonth();
+    if (dateOfDeath.getDate() < dateOfBirth.getDate()) months--;
+    return months;
+  }
+  if (format3 === "days") {
+    const diffTime2 = dateOfDeath.getTime() - dateOfBirth.getTime();
+    return Math.floor(diffTime2 / MS_PER_DAY);
+  }
+  const diffTime = dateOfDeath.getTime() - dateOfBirth.getTime();
+  const remainingMs = diffTime - MS_PER_DAY;
+  return remainingMs < 0 ? Math.floor(diffTime / MS_PER_HOUR) : Math.floor(remainingMs / MS_PER_HOUR);
+}
+ajv.addKeyword({
+  keyword: "isValidAgeOfDeceased",
+  type: "object",
+  schemaType: "object",
+  errors: true,
+  validate(schema, data) {
+    const {
+      ageField,
+      dateOfBirthField,
+      deathDateField,
+      deathTimeField,
+      format: format3
+    } = schema;
+    const dob = data?.[dateOfBirthField];
+    const dod = data?.[deathDateField];
+    const tod = data?.[deathTimeField];
+    const ageValue = data?.[ageField];
+    if (!ageValue || !isValidDateFormat(dob) || !isValidDateFormat(dod)) {
+      return true;
+    }
+    const dateOfBirth = /* @__PURE__ */ new Date(`${dob}T00:00:00+00:00`);
+    const dateOfDeath = tod ? /* @__PURE__ */ new Date(`${dod}T${tod}:00+00:00`) : /* @__PURE__ */ new Date(`${dod}T00:00:00+00:00`);
+    const deceasedAge = getAgeOfDeceased(dateOfBirth, dateOfDeath, format3);
+    const sameDay = dateOfBirth.toISOString().slice(0, 10) === dateOfDeath.toISOString().slice(0, 10);
+    return Number(ageValue) === deceasedAge && !(format3 === "hours" && !sameDay) || format3 === "days" && deceasedAge - Number(ageValue) === 1 || format3 === "hours" && !sameDay && deceasedAge < Number(ageValue);
+  }
+});
 ajv.addKeyword({
   keyword: "sumOf",
   type: "object",
@@ -3667,7 +3727,9 @@ ajv.addKeyword({
   schemaType: "boolean",
   errors: true,
   validate(schema, data) {
-    if (!schema) return true;
+    if (!schema) {
+      return true;
+    }
     if (typeof data !== "string") {
       return true;
     }
@@ -3688,11 +3750,15 @@ ajv.addKeyword({
   errors: true,
   validate(schema, data) {
     const { fields, threshold } = schema;
-    if (!data || typeof data !== "object") return true;
+    if (!data || typeof data !== "object") {
+      return true;
+    }
     const causesOfDeath = fields.flatMap(
       (field3) => (data?.[field3] || "").split(",").map((v) => v.trim()).filter(Boolean)
     ).filter((val, index, self) => self.indexOf(val) === index);
-    if (causesOfDeath.length === 0) return true;
+    if (causesOfDeath.length === 0) {
+      return true;
+    }
     let hasNonIllDefined = false;
     for (const term of causesOfDeath) {
       const results = fuzzySearch(term, illDefinedConditions, threshold).filter(
@@ -3742,7 +3808,9 @@ function fuzzySearch(query, list, threshold, limit = 3) {
   const normalize = (str) => str.toLowerCase().replace(/[^\w\s]/g, "").trim();
   const tokenize = (str) => normalize(str).split(/\s+/).filter((w) => w.length >= 3);
   const queryWords = tokenize(query);
-  if (queryWords.length === 0) return [];
+  if (queryWords.length === 0) {
+    return [];
+  }
   const results = [];
   for (const item of list) {
     const itemWords = tokenize(item);
@@ -3758,7 +3826,9 @@ function fuzzySearch(query, list, threshold, limit = 3) {
       for (const iWord of itemWords) {
         const dist = levenshtein(qWord, iWord);
         const normDist = dist / Math.max(qWord.length, iWord.length);
-        if (normDist < bestScore) bestScore = normDist;
+        if (normDist < bestScore) {
+          bestScore = normDist;
+        }
       }
       if (bestScore !== Infinity) {
         const weight = COMMON_WORDS.has(qWord) ? 0.5 : 1;
@@ -4267,18 +4337,39 @@ function createFieldConditionals(fieldId) {
       return defineFormConditional({
         type: "object",
         properties: {
-          [fieldId]: { type: "number" },
+          [this.$$field]: { type: "number" },
           [field1Id]: { type: "number" },
           [field2Id]: { type: "number" }
         },
-        required: [fieldId, field1Id, field2Id],
+        required: [this.$$field, field1Id, field2Id],
         sumOf: {
-          sum: fieldId,
+          sum: this.$$field,
           field1: field1Id,
           field2: field2Id
         }
       });
     },
+    isValidDeceasedAge(dobField, dodField, todField, format3) {
+      const dobFieldId = dobField.$$field;
+      const dodFieldId = dodField.$$field;
+      const todFieldId = todField.$$field;
+      return defineFormConditional({
+        type: "object",
+        properties: {
+          [this.$$field]: { type: "string" },
+          [dobFieldId]: { type: "string" },
+          [dodFieldId]: { type: "string" },
+          [todFieldId]: { type: "string" }
+        },
+        isValidAgeOfDeceased: {
+          ageField: this.$$field,
+          dateOfBirthField: dobFieldId,
+          deathDateField: dodFieldId,
+          deathTimeField: todFieldId,
+          format: format3
+        }
+      });
+    },
     isAbbreviation() {
       return defineFormConditional({
         type: "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecrvs/opencrvs-toolkit",
-  "version": "1.9.0-rc.a4498ac",
+  "version": "1.9.0-rc.b385861",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {