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

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

@@ -10,13 +10,10 @@ 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">;
@@ -28,14 +25,11 @@ 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, {
@@ -43,7 +37,6 @@ declare const FuzzyMatcher: z.ZodObject<z.objectUtil.extendShape<{
     options: {
         boost: number;
         fuzziness: string | number;
-        matchAgainst?: string | undefined;
     };
     fieldId: string;
 }, {
@@ -51,7 +44,6 @@ declare const FuzzyMatcher: z.ZodObject<z.objectUtil.extendShape<{
     fieldId: string;
     options?: {
         boost?: number | undefined;
-        matchAgainst?: string | undefined;
         fuzziness?: string | number | undefined;
     } | undefined;
 }>;
@@ -66,13 +58,10 @@ 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">;
@@ -82,22 +71,18 @@ 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;
 }, {
@@ -106,7 +91,6 @@ 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'];
@@ -120,13 +104,10 @@ 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">;
@@ -138,16 +119,13 @@ 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, {
@@ -155,7 +133,6 @@ declare const DateRangeMatcher: z.ZodObject<z.objectUtil.extendShape<{
     options: {
         boost: number;
         days: number;
-        matchAgainst?: string | undefined;
         pivot?: number | undefined;
     };
     fieldId: string;
@@ -164,7 +141,6 @@ 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/deduplication.d.ts

@@ -8,7 +8,6 @@ export declare function field(fieldId: string): {
         type: "fuzzy";
         options: {
             boost?: number | undefined;
-            matchAgainst?: string | undefined;
             fuzziness?: string | number | undefined;
         } | undefined;
     };
@@ -18,57 +17,14 @@ 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.d.ts

@@ -8,7 +8,6 @@ export declare function field(fieldId: string): {
         type: "fuzzy";
         options: {
             boost?: number | undefined;
-            matchAgainst?: string | undefined;
             fuzziness?: string | number | undefined;
         } | undefined;
     };
@@ -18,57 +17,14 @@ 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,47 +58,6 @@ 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

@@ -2557,8 +2557,7 @@ var Matcher = import_zod19.z.object({
    */
   fieldId: FieldReference2,
   options: import_zod19.z.object({
-    boost: import_zod19.z.number().optional(),
-    matchAgainst: FieldReference2.optional()
+    boost: import_zod19.z.number().optional()
   }).optional().default({
     boost: 1
   })
@@ -2572,8 +2571,7 @@ 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),
-    matchAgainst: FieldReference2.optional()
+    boost: import_zod19.z.number().optional().default(1)
   }).optional().default({
     fuzziness: "AUTO:4,7",
     boost: 1
@@ -2586,8 +2584,7 @@ var StrictMatcher = Matcher.extend({
     /**
      * The constant value to be present in the field for both records
      */
-    value: import_zod19.z.string().optional(),
-    matchAgainst: FieldReference2.optional()
+    value: import_zod19.z.string().optional()
   }).optional().default({
     boost: 1
   })
@@ -2601,8 +2598,7 @@ var DateRangeMatcher = Matcher.extend({
      */
     pivot: import_zod19.z.number().optional(),
     days: import_zod19.z.number(),
-    boost: import_zod19.z.number().optional().default(1),
-    matchAgainst: FieldReference2.optional()
+    boost: import_zod19.z.number().optional().default(1)
   })
 });
 var Not = import_zod19.z.object({
@@ -3900,11 +3896,14 @@ function isRequestedAction(a) {
 function isAcceptedAction(a) {
   return a.status === ActionStatus.Accepted;
 }
+function isRejectedAction(a) {
+  return a.status === ActionStatus.Rejected;
+}
 function getPendingAction(actions) {
   const requestedActions = actions.filter(isRequestedAction);
   const pendingActions = requestedActions.filter(
     ({ id }) => !actions.some(
-      (action) => isAcceptedAction(action) && action.originalActionId === id
+      (action) => (isAcceptedAction(action) || isRejectedAction(action)) && action.originalActionId === id
     )
   );
   if (pendingActions.length !== 1) {
@@ -7817,35 +7816,8 @@ 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/dist/notification/index.js

@@ -2079,8 +2079,7 @@ var Matcher = import_zod19.z.object({
    */
   fieldId: FieldReference2,
   options: import_zod19.z.object({
-    boost: import_zod19.z.number().optional(),
-    matchAgainst: FieldReference2.optional()
+    boost: import_zod19.z.number().optional()
   }).optional().default({
     boost: 1
   })
@@ -2094,8 +2093,7 @@ 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),
-    matchAgainst: FieldReference2.optional()
+    boost: import_zod19.z.number().optional().default(1)
   }).optional().default({
     fuzziness: "AUTO:4,7",
     boost: 1
@@ -2108,8 +2106,7 @@ var StrictMatcher = Matcher.extend({
     /**
      * The constant value to be present in the field for both records
      */
-    value: import_zod19.z.string().optional(),
-    matchAgainst: FieldReference2.optional()
+    value: import_zod19.z.string().optional()
   }).optional().default({
     boost: 1
   })
@@ -2123,8 +2120,7 @@ var DateRangeMatcher = Matcher.extend({
      */
     pivot: import_zod19.z.number().optional(),
     days: import_zod19.z.number(),
-    boost: import_zod19.z.number().optional().default(1),
-    matchAgainst: FieldReference2.optional()
+    boost: import_zod19.z.number().optional().default(1)
   })
 });
 var Not = import_zod19.z.object({
@@ -6070,35 +6066,8 @@ 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.e1e4717",
+  "version": "1.9.6-rc.e8f0bd3",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {