@opencrvs/toolkit 1.9.6-rc.e1907dc → 1.9.6-rc.e1e4717

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

@@ -10,10 +10,13 @@ declare const FuzzyMatcher: z.ZodObject<z.objectUtil.extendShape<{
     fieldId: z.ZodString;
     options: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         boost: z.ZodOptional<z.ZodNumber>;
+        matchAgainst: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
     }, {
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
     }>>>;
 }, {
     type: z.ZodLiteral<"fuzzy">;
@@ -25,11 +28,14 @@ declare const FuzzyMatcher: z.ZodObject<z.objectUtil.extendShape<{
          */
         fuzziness: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>>;
         boost: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+        matchAgainst: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         boost: number;
         fuzziness: string | number;
+        matchAgainst?: string | undefined;
     }, {
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
         fuzziness?: string | number | undefined;
     }>>>;
 }>, "strip", z.ZodTypeAny, {
@@ -37,6 +43,7 @@ declare const FuzzyMatcher: z.ZodObject<z.objectUtil.extendShape<{
     options: {
         boost: number;
         fuzziness: string | number;
+        matchAgainst?: string | undefined;
     };
     fieldId: string;
 }, {
@@ -44,6 +51,7 @@ declare const FuzzyMatcher: z.ZodObject<z.objectUtil.extendShape<{
     fieldId: string;
     options?: {
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
         fuzziness?: string | number | undefined;
     } | undefined;
 }>;
@@ -58,10 +66,13 @@ declare const StrictMatcher: z.ZodObject<z.objectUtil.extendShape<{
     fieldId: z.ZodString;
     options: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         boost: z.ZodOptional<z.ZodNumber>;
+        matchAgainst: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
     }, {
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
     }>>>;
 }, {
     type: z.ZodLiteral<"strict">;
@@ -71,18 +82,22 @@ declare const StrictMatcher: z.ZodObject<z.objectUtil.extendShape<{
          * The constant value to be present in the field for both records
          */
         value: z.ZodOptional<z.ZodString>;
+        matchAgainst: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         boost: number;
         value?: string | undefined;
+        matchAgainst?: string | undefined;
     }, {
         value?: string | undefined;
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
     }>>>;
 }>, "strip", z.ZodTypeAny, {
     type: "strict";
     options: {
         boost: number;
         value?: string | undefined;
+        matchAgainst?: string | undefined;
     };
     fieldId: string;
 }, {
@@ -91,6 +106,7 @@ declare const StrictMatcher: z.ZodObject<z.objectUtil.extendShape<{
     options?: {
         value?: string | undefined;
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
     } | undefined;
 }>;
 export type StrictMatcherOptions = z.input<typeof StrictMatcher>['options'];
@@ -104,10 +120,13 @@ declare const DateRangeMatcher: z.ZodObject<z.objectUtil.extendShape<{
     fieldId: z.ZodString;
     options: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         boost: z.ZodOptional<z.ZodNumber>;
+        matchAgainst: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
     }, {
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
     }>>>;
 }, {
     type: z.ZodLiteral<"dateRange">;
@@ -119,13 +138,16 @@ declare const DateRangeMatcher: z.ZodObject<z.objectUtil.extendShape<{
         pivot: z.ZodOptional<z.ZodNumber>;
         days: z.ZodNumber;
         boost: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+        matchAgainst: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         boost: number;
         days: number;
+        matchAgainst?: string | undefined;
         pivot?: number | undefined;
     }, {
         days: number;
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
         pivot?: number | undefined;
     }>;
 }>, "strip", z.ZodTypeAny, {
@@ -133,6 +155,7 @@ declare const DateRangeMatcher: z.ZodObject<z.objectUtil.extendShape<{
     options: {
         boost: number;
         days: number;
+        matchAgainst?: string | undefined;
         pivot?: number | undefined;
     };
     fieldId: string;
@@ -141,6 +164,7 @@ declare const DateRangeMatcher: z.ZodObject<z.objectUtil.extendShape<{
     options: {
         days: number;
         boost?: number | undefined;
+        matchAgainst?: string | undefined;
         pivot?: number | undefined;
     };
     fieldId: string;

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

@@ -1768,20 +1768,12 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     analytics: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
 }, {
     type: z.ZodLiteral<"DATE">;
-    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
-        $$date: z.ZodOptional<z.ZodLiteral<"now">>;
-        $$time: z.ZodOptional<z.ZodLiteral<"now">>;
+    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
+        $$now: z.ZodLiteral<true>;
     }, "strip", z.ZodTypeAny, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, {
-        $$date: "now";
+        $$now: true;
     }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
+        $$now: true;
     }>, z.ZodString]>>;
     configuration: z.ZodOptional<z.ZodObject<{
         notice: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {
@@ -1840,7 +1832,7 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
     defaultValue?: string | {
-        $$date: "now";
+        $$now: true;
     } | undefined;
     configuration?: {
         notice?: TranslationConfig | undefined;
@@ -1907,8 +1899,7 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
     defaultValue?: string | {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
+        $$now: true;
     } | undefined;
     configuration?: {
         notice?: {
@@ -2284,20 +2275,12 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     analytics: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
 }, {
     type: z.ZodLiteral<"TIME">;
-    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
-        $$date: z.ZodOptional<z.ZodLiteral<"now">>;
-        $$time: z.ZodOptional<z.ZodLiteral<"now">>;
+    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
+        $$now: z.ZodLiteral<true>;
     }, "strip", z.ZodTypeAny, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, {
-        $$time: "now";
+        $$now: true;
     }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
+        $$now: true;
     }>, z.ZodString]>>;
     configuration: z.ZodOptional<z.ZodObject<{
         use12HourFormat: z.ZodOptional<z.ZodBoolean>;
@@ -2359,7 +2342,7 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
     defaultValue?: string | {
-        $$time: "now";
+        $$now: true;
     } | undefined;
     configuration?: {
         notice?: TranslationConfig | undefined;
@@ -2427,8 +2410,7 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
     defaultValue?: string | {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
+        $$now: true;
     } | undefined;
     configuration?: {
         notice?: {
@@ -2440,7 +2422,6 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     } | undefined;
 }>;
 export type TimeField = z.infer<typeof TimeField>;
-export type TimeField2 = z.input<typeof TimeField>;
 declare const DateRangeField: z.ZodObject<z.objectUtil.extendShape<{
     id: z.ZodEffects<z.ZodString, string, string>;
     label: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {

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

@@ -230,6 +230,15 @@ export declare function mapFieldTypeToZod(field: FieldConfig, actionType?: Actio
 }, {
     data?: any;
 }>>> | z.ZodObject<{
+    numericValue: z.ZodNumber;
+    unit: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    numericValue: number;
+    unit: string;
+}, {
+    numericValue: number;
+    unit: string;
+}> | z.ZodObject<{
     numericValue: z.ZodOptional<z.ZodNumber>;
     unit: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
@@ -239,6 +248,15 @@ export declare function mapFieldTypeToZod(field: FieldConfig, actionType?: Actio
     numericValue?: number | undefined;
     unit?: string | undefined;
 }> | z.ZodOptional<z.ZodNullable<z.ZodObject<{
+    numericValue: z.ZodNumber;
+    unit: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    numericValue: number;
+    unit: string;
+}, {
+    numericValue: number;
+    unit: string;
+}>>> | z.ZodOptional<z.ZodNullable<z.ZodObject<{
     numericValue: z.ZodOptional<z.ZodNumber>;
     unit: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {

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

@@ -38,6 +38,7 @@ export declare const AgeUpdateValue: z.ZodNullable<z.ZodOptional<z.ZodObject<{
     asOfDateRef: string;
 }>>>;
 export declare const TimeValue: z.ZodString;
+export type TimeValue = z.infer<typeof TimeValue>;
 export declare const DatetimeValue: z.ZodString;
 export declare const SelectDateRangeValue: z.ZodEnum<["last7Days", "last30Days", "last90Days", "last365Days"]>;
 export declare const DateRangeFieldValue: z.ZodUnion<[z.ZodObject<{

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

@@ -8,8 +8,6 @@ import { FieldValue } from './FieldValue';
  * Available system variables for configuration.
  */
 export type SystemVariables = {
-    $$date: string;
-    $$time: string;
     user: {
         id: string;
         province?: string;

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

@@ -8,6 +8,7 @@ export declare function field(fieldId: string): {
         type: "fuzzy";
         options: {
             boost?: number | undefined;
+            matchAgainst?: string | undefined;
             fuzziness?: string | number | undefined;
         } | undefined;
     };
@@ -17,14 +18,57 @@ export declare function field(fieldId: string): {
         options: {
             value?: string | undefined;
             boost?: number | undefined;
+            matchAgainst?: string | undefined;
         } | undefined;
     };
+    /**
+     * Creates a date range matcher that finds records where date fields fall within a specified range.
+     *
+     * By default, matches against the field specified in `field()` (e.g., 'mother.dob').
+     * When `matchAgainst` is provided, it overwrites the default field and searches across multiple fields with OR logic .
+     *
+     * @param options - Configuration for the date range matching
+     * @param options.days - Number of days before and after the target date to search (creates a ±days range)
+     * @param options.pivot - Optional. Distance in days where relevance scoring drops by 50%. Defaults to ⌊(days * 2) / 3⌋
+     * @param options.boost - Optional. Scoring boost multiplier for matching results. Defaults to 1
+     * @param options.matchAgainst - Optional. Additional fields to match against. When provided,
+     * the query matches if any of these fields fall within the date range. The default field is always excluded in the search in that case.
+     * If you want to add the default field, you have to explicitly add that field in `matchAgainst` option
+     *
+     * @returns A clause that matches records where at least one of the specified date fields is within the range
+     *
+     * @example
+     * // Matches only against mother.dob (±365 days)
+     * field('mother.dob').dateRangeMatches({ days: 365 })
+     *
+     * @example
+     * // Matches against mother.age OR spouse.dob, not mother.dob
+     * field('mother.dob').dateRangeMatches({
+     *   days: 365,
+     *   matchAgainst: [$field('mother.age'), $field('spouse.dob')]
+     * })
+     *
+     * If you want to add mother.dob, then
+     * field('mother.dob').dateRangeMatches({
+     *   days: 365,
+     *   matchAgainst: [$field('mother.age'), $field('spouse.dob'), $field('mother.dob')]
+     * })
+     *
+     * @example
+     * // With custom pivot and boost
+     * field('mother.dob').dateRangeMatches({
+     *   days: 730,
+     *   pivot: 365,
+     *   boost: 2
+     * })
+     */
     dateRangeMatches: (options: DateRangeMatcherOptions) => {
         fieldId: string;
         type: "dateRange";
         options: {
             days: number;
             boost?: number | undefined;
+            matchAgainst?: string | undefined;
             pivot?: number | undefined;
         };
     };

package/dist/conditionals/index.js

@@ -110,14 +110,10 @@ function omitKeyDeep(obj, keyToRemove) {
 // ../commons/src/events/serializers/date/serializer.ts
 var import_zod2 = require("zod");
 var SerializedNowDateTime = import_zod2.z.object({
-  $$date: import_zod2.z.literal("now").optional(),
-  $$time: import_zod2.z.literal("now").optional()
+  $$now: import_zod2.z.literal(true)
 });
 function todayDateTimeValueSerializer() {
-  return {
-    $$date: "now",
-    $$time: "now"
-  };
+  return { $$now: true };
 }
 
 // ../commons/src/conditionals/conditionals.ts

package/dist/events/deduplication.d.ts

@@ -8,6 +8,7 @@ export declare function field(fieldId: string): {
         type: "fuzzy";
         options: {
             boost?: number | undefined;
+            matchAgainst?: string | undefined;
             fuzziness?: string | number | undefined;
         } | undefined;
     };
@@ -17,14 +18,57 @@ export declare function field(fieldId: string): {
         options: {
             value?: string | undefined;
             boost?: number | undefined;
+            matchAgainst?: string | undefined;
         } | undefined;
     };
+    /**
+     * Creates a date range matcher that finds records where date fields fall within a specified range.
+     *
+     * By default, matches against the field specified in `field()` (e.g., 'mother.dob').
+     * When `matchAgainst` is provided, it overwrites the default field and searches across multiple fields with OR logic .
+     *
+     * @param options - Configuration for the date range matching
+     * @param options.days - Number of days before and after the target date to search (creates a ±days range)
+     * @param options.pivot - Optional. Distance in days where relevance scoring drops by 50%. Defaults to ⌊(days * 2) / 3⌋
+     * @param options.boost - Optional. Scoring boost multiplier for matching results. Defaults to 1
+     * @param options.matchAgainst - Optional. Additional fields to match against. When provided,
+     * the query matches if any of these fields fall within the date range. The default field is always excluded in the search in that case.
+     * If you want to add the default field, you have to explicitly add that field in `matchAgainst` option
+     *
+     * @returns A clause that matches records where at least one of the specified date fields is within the range
+     *
+     * @example
+     * // Matches only against mother.dob (±365 days)
+     * field('mother.dob').dateRangeMatches({ days: 365 })
+     *
+     * @example
+     * // Matches against mother.age OR spouse.dob, not mother.dob
+     * field('mother.dob').dateRangeMatches({
+     *   days: 365,
+     *   matchAgainst: [$field('mother.age'), $field('spouse.dob')]
+     * })
+     *
+     * If you want to add mother.dob, then
+     * field('mother.dob').dateRangeMatches({
+     *   days: 365,
+     *   matchAgainst: [$field('mother.age'), $field('spouse.dob'), $field('mother.dob')]
+     * })
+     *
+     * @example
+     * // With custom pivot and boost
+     * field('mother.dob').dateRangeMatches({
+     *   days: 730,
+     *   pivot: 365,
+     *   boost: 2
+     * })
+     */
     dateRangeMatches: (options: DateRangeMatcherOptions) => {
         fieldId: string;
         type: "dateRange";
         options: {
             days: number;
             boost?: number | undefined;
+            matchAgainst?: string | undefined;
             pivot?: number | undefined;
         };
     };

package/dist/events/deduplication.js

@@ -58,6 +58,47 @@ function field(fieldId) {
       type: "strict",
       options
     }),
+    /**
+     * Creates a date range matcher that finds records where date fields fall within a specified range.
+     *
+     * By default, matches against the field specified in `field()` (e.g., 'mother.dob').
+     * When `matchAgainst` is provided, it overwrites the default field and searches across multiple fields with OR logic .
+     *
+     * @param options - Configuration for the date range matching
+     * @param options.days - Number of days before and after the target date to search (creates a ±days range)
+     * @param options.pivot - Optional. Distance in days where relevance scoring drops by 50%. Defaults to ⌊(days * 2) / 3⌋
+     * @param options.boost - Optional. Scoring boost multiplier for matching results. Defaults to 1
+     * @param options.matchAgainst - Optional. Additional fields to match against. When provided,
+     * the query matches if any of these fields fall within the date range. The default field is always excluded in the search in that case.
+     * If you want to add the default field, you have to explicitly add that field in `matchAgainst` option
+     *
+     * @returns A clause that matches records where at least one of the specified date fields is within the range
+     *
+     * @example
+     * // Matches only against mother.dob (±365 days)
+     * field('mother.dob').dateRangeMatches({ days: 365 })
+     *
+     * @example
+     * // Matches against mother.age OR spouse.dob, not mother.dob
+     * field('mother.dob').dateRangeMatches({
+     *   days: 365,
+     *   matchAgainst: [$field('mother.age'), $field('spouse.dob')]
+     * })
+     *
+     * If you want to add mother.dob, then
+     * field('mother.dob').dateRangeMatches({
+     *   days: 365,
+     *   matchAgainst: [$field('mother.age'), $field('spouse.dob'), $field('mother.dob')]
+     * })
+     *
+     * @example
+     * // With custom pivot and boost
+     * field('mother.dob').dateRangeMatches({
+     *   days: 730,
+     *   pivot: 365,
+     *   boost: 2
+     * })
+     */
     dateRangeMatches: (options) => ({
       fieldId,
       type: "dateRange",

package/dist/events/index.js

@@ -1909,14 +1909,10 @@ var SearchScopeAccessLevels = {
 // ../commons/src/events/serializers/date/serializer.ts
 var import_zod15 = require("zod");
 var SerializedNowDateTime = import_zod15.z.object({
-  $$date: import_zod15.z.literal("now").optional(),
-  $$time: import_zod15.z.literal("now").optional()
+  $$now: import_zod15.z.literal(true)
 });
 function todayDateTimeValueSerializer() {
-  return {
-    $$date: "now",
-    $$time: "now"
-  };
+  return { $$now: true };
 }
 
 // ../commons/src/events/FieldConfig.ts
@@ -2052,9 +2048,7 @@ var EmailField = BaseField.extend({
 });
 var DateField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.DATE),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$date: "now"
-  })).or(DateValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default date value(yyyy-MM-dd)"),
+  defaultValue: SerializedNowDateTime.or(DateValue).optional().openapi({ effectType: "input", type: "string" }).describe("Default date value(yyyy-MM-dd)"),
   configuration: import_zod16.z.object({
     notice: TranslationConfig.describe(
       "Text to display above the date input"
@@ -2072,9 +2066,7 @@ var AgeField = BaseField.extend({
 }).describe("An age input field which uses the current date as the asOfDate");
 var TimeField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.TIME),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$time: "now"
-  })).or(TimeValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default time value (HH-mm)"),
+  defaultValue: SerializedNowDateTime.or(TimeValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default time value (HH-mm)"),
   configuration: import_zod16.z.object({
     use12HourFormat: import_zod16.z.boolean().optional().describe("Whether to use 12-hour format"),
     notice: TranslationConfig.describe(
@@ -2565,7 +2557,8 @@ var Matcher = import_zod19.z.object({
    */
   fieldId: FieldReference2,
   options: import_zod19.z.object({
-    boost: import_zod19.z.number().optional()
+    boost: import_zod19.z.number().optional(),
+    matchAgainst: FieldReference2.optional()
   }).optional().default({
     boost: 1
   })
@@ -2579,7 +2572,8 @@ var FuzzyMatcher = Matcher.extend({
      * Names of length >7 characters = 2 edits allowed
      */
     fuzziness: import_zod19.z.union([import_zod19.z.string(), import_zod19.z.number()]).optional().default("AUTO:4,7"),
-    boost: import_zod19.z.number().optional().default(1)
+    boost: import_zod19.z.number().optional().default(1),
+    matchAgainst: FieldReference2.optional()
   }).optional().default({
     fuzziness: "AUTO:4,7",
     boost: 1
@@ -2592,7 +2586,8 @@ var StrictMatcher = Matcher.extend({
     /**
      * The constant value to be present in the field for both records
      */
-    value: import_zod19.z.string().optional()
+    value: import_zod19.z.string().optional(),
+    matchAgainst: FieldReference2.optional()
   }).optional().default({
     boost: 1
   })
@@ -2606,7 +2601,8 @@ var DateRangeMatcher = Matcher.extend({
      */
     pivot: import_zod19.z.number().optional(),
     days: import_zod19.z.number(),
-    boost: import_zod19.z.number().optional().default(1)
+    boost: import_zod19.z.number().optional().default(1),
+    matchAgainst: FieldReference2.optional()
   })
 });
 var Not = import_zod19.z.object({
@@ -3017,7 +3013,7 @@ function mapFieldTypeToZod(field3, actionType) {
       schema = NumberFieldValue;
       break;
     case FieldType.NUMBER_WITH_UNIT:
-      schema = NumberWithUnitFieldUpdateValue;
+      schema = field3.required ? NumberWithUnitFieldValue : NumberWithUnitFieldUpdateValue;
       break;
     case FieldType.CHECKBOX:
       schema = CheckboxFieldValue;
@@ -3408,7 +3404,7 @@ function isFieldVisible(field3, form, context) {
 }
 function isFieldEmptyAndNotRequired(field3, form) {
   const fieldValue = form[field3.id];
-  return !field3.required && (fieldValue === void 0 || fieldValue === "");
+  return !field3.required && (fieldValue === void 0 || fieldValue === "" || fieldValue && typeof fieldValue === "object" && Object.values(fieldValue).every((v) => v === void 0 || v === ""));
 }
 function isFieldEnabled(field3, form, context) {
   return isFieldConditionMet(field3, form, ConditionalType.ENABLE, context);
@@ -7821,8 +7817,35 @@ var mother = defineFormPage({
       secured: true,
       validation: [],
       label: generateTranslationConfig("Date of birth"),
+      conditionals: [
+        {
+          type: "SHOW",
+          conditional: not(field("mother.dobUnknown").isEqualTo(true))
+        }
+      ]
+    },
+    {
+      id: "mother.dobUnknown",
+      type: "CHECKBOX",
+      label: generateTranslationConfig("Exact date of birth unknown"),
       conditionals: []
     },
+    {
+      id: "mother.age",
+      type: FieldType.AGE,
+      required: true,
+      analytics: true,
+      label: generateTranslationConfig("Age of mother"),
+      configuration: {
+        asOfDate: field("child.dob")
+      },
+      conditionals: [
+        {
+          type: "SHOW",
+          conditional: field("mother.dobUnknown").isEqualTo(true)
+        }
+      ]
+    },
     {
       id: "mother.idType",
       type: FieldType.SELECT,
@@ -8907,8 +8930,7 @@ function isFieldValueWithoutTemplates(value) {
   if (isTemplateVariable(value)) {
     return false;
   }
-  if (typeof value === "object" && value !== null && // template variable can exist in both keys and values of an object
-  (Object.values(value).some((val) => isTemplateVariable(val)) || Object.keys(value).some((val) => isTemplateVariable(val)))) {
+  if (typeof value === "object" && value !== null && Object.values(value).some((val) => isTemplateVariable(val))) {
     return false;
   }
   return true;

package/dist/notification/index.js

@@ -1431,14 +1431,10 @@ var SearchQuery = import_zod14.z.object({
 // ../commons/src/events/serializers/date/serializer.ts
 var import_zod15 = require("zod");
 var SerializedNowDateTime = import_zod15.z.object({
-  $$date: import_zod15.z.literal("now").optional(),
-  $$time: import_zod15.z.literal("now").optional()
+  $$now: import_zod15.z.literal(true)
 });
 function todayDateTimeValueSerializer() {
-  return {
-    $$date: "now",
-    $$time: "now"
-  };
+  return { $$now: true };
 }
 
 // ../commons/src/events/FieldConfig.ts
@@ -1574,9 +1570,7 @@ var EmailField = BaseField.extend({
 });
 var DateField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.DATE),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$date: "now"
-  })).or(DateValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default date value(yyyy-MM-dd)"),
+  defaultValue: SerializedNowDateTime.or(DateValue).optional().openapi({ effectType: "input", type: "string" }).describe("Default date value(yyyy-MM-dd)"),
   configuration: import_zod16.z.object({
     notice: TranslationConfig.describe(
       "Text to display above the date input"
@@ -1594,9 +1588,7 @@ var AgeField = BaseField.extend({
 }).describe("An age input field which uses the current date as the asOfDate");
 var TimeField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.TIME),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$time: "now"
-  })).or(TimeValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default time value (HH-mm)"),
+  defaultValue: SerializedNowDateTime.or(TimeValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default time value (HH-mm)"),
   configuration: import_zod16.z.object({
     use12HourFormat: import_zod16.z.boolean().optional().describe("Whether to use 12-hour format"),
     notice: TranslationConfig.describe(
@@ -2087,7 +2079,8 @@ var Matcher = import_zod19.z.object({
    */
   fieldId: FieldReference2,
   options: import_zod19.z.object({
-    boost: import_zod19.z.number().optional()
+    boost: import_zod19.z.number().optional(),
+    matchAgainst: FieldReference2.optional()
   }).optional().default({
     boost: 1
   })
@@ -2101,7 +2094,8 @@ var FuzzyMatcher = Matcher.extend({
      * Names of length >7 characters = 2 edits allowed
      */
     fuzziness: import_zod19.z.union([import_zod19.z.string(), import_zod19.z.number()]).optional().default("AUTO:4,7"),
-    boost: import_zod19.z.number().optional().default(1)
+    boost: import_zod19.z.number().optional().default(1),
+    matchAgainst: FieldReference2.optional()
   }).optional().default({
     fuzziness: "AUTO:4,7",
     boost: 1
@@ -2114,7 +2108,8 @@ var StrictMatcher = Matcher.extend({
     /**
      * The constant value to be present in the field for both records
      */
-    value: import_zod19.z.string().optional()
+    value: import_zod19.z.string().optional(),
+    matchAgainst: FieldReference2.optional()
   }).optional().default({
     boost: 1
   })
@@ -2128,7 +2123,8 @@ var DateRangeMatcher = Matcher.extend({
      */
     pivot: import_zod19.z.number().optional(),
     days: import_zod19.z.number(),
-    boost: import_zod19.z.number().optional().default(1)
+    boost: import_zod19.z.number().optional().default(1),
+    matchAgainst: FieldReference2.optional()
   })
 });
 var Not = import_zod19.z.object({
@@ -6074,8 +6070,35 @@ var mother = defineFormPage({
       secured: true,
       validation: [],
       label: generateTranslationConfig("Date of birth"),
+      conditionals: [
+        {
+          type: "SHOW",
+          conditional: not(field("mother.dobUnknown").isEqualTo(true))
+        }
+      ]
+    },
+    {
+      id: "mother.dobUnknown",
+      type: "CHECKBOX",
+      label: generateTranslationConfig("Exact date of birth unknown"),
       conditionals: []
     },
+    {
+      id: "mother.age",
+      type: FieldType.AGE,
+      required: true,
+      analytics: true,
+      label: generateTranslationConfig("Age of mother"),
+      configuration: {
+        asOfDate: field("child.dob")
+      },
+      conditionals: [
+        {
+          type: "SHOW",
+          conditional: field("mother.dobUnknown").isEqualTo(true)
+        }
+      ]
+    },
     {
       id: "mother.idType",
       type: FieldType.SELECT,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/toolkit",
-  "version": "1.9.6-rc.e1907dc",
+  "version": "1.9.6-rc.e1e4717",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {