@opencrvs/toolkit 1.8.1-rc.6e305c5 → 1.8.1-rc.6eacccb

package/dist/events/index.js

@@ -341,7 +341,7 @@ var TENNIS_CLUB_MEMBERSHIP = "tennis-club-membership";
 var BIRTH_EVENT = "v2-birth";
 
 // ../commons/src/events/ActionConfig.ts
-var import_zod10 = require("zod");
+var import_zod11 = require("zod");
 
 // ../commons/src/events/Conditional.ts
 var import_zod = require("zod");
@@ -1114,91 +1114,168 @@ var ActionFormConfig = import_zod9.z.object({
 });
 var FormConfig = import_zod9.z.union([DeclarationFormConfig, ActionFormConfig]);
 
-// ../commons/src/events/ActionConfig.ts
+// ../commons/src/events/DeduplicationConfig.ts
+var import_zod10 = require("zod");
 var import_zod_openapi6 = require("zod-openapi");
 (0, import_zod_openapi6.extendZodWithOpenApi)(import_zod10.z);
-var ActionConditional2 = import_zod10.z.discriminatedUnion("type", [
+var FieldReference2 = import_zod10.z.string();
+var Matcher = import_zod10.z.object({
+  /**
+   * The reference to the field to match against.
+   *
+   * For `dateDistance` type matcher the value of this field will
+   * be used as the origin date to calculate the distance from.
+   */
+  fieldId: FieldReference2,
+  options: import_zod10.z.object({
+    boost: import_zod10.z.number().optional()
+  }).optional().default({
+    boost: 1
+  })
+});
+var FuzzyMatcher = Matcher.extend({
+  type: import_zod10.z.literal("fuzzy"),
+  options: import_zod10.z.object({
+    /**
+     * Names of length 3 or less characters = 0 edits allowed
+     * Names of length 4 - 6 characters = 1 edit allowed
+     * Names of length >7 characters = 2 edits allowed
+     */
+    fuzziness: import_zod10.z.union([import_zod10.z.string(), import_zod10.z.number()]).optional().default("AUTO:4,7"),
+    boost: import_zod10.z.number().optional().default(1)
+  }).optional().default({
+    fuzziness: "AUTO:4,7",
+    boost: 1
+  })
+});
+var StrictMatcher = Matcher.extend({
+  type: import_zod10.z.literal("strict"),
+  options: import_zod10.z.object({
+    boost: import_zod10.z.number().optional().default(1)
+  }).optional().default({
+    boost: 1
+  })
+});
+var DateDistanceMatcher = Matcher.extend({
+  type: import_zod10.z.literal("dateDistance"),
+  options: import_zod10.z.object({
+    days: import_zod10.z.number(),
+    boost: import_zod10.z.number().optional().default(1)
+  })
+});
+var And = import_zod10.z.object({
+  type: import_zod10.z.literal("and"),
+  // eslint-disable-next-line @typescript-eslint/no-use-before-define
+  clauses: import_zod10.z.lazy(() => Clause.array())
+});
+var Or = import_zod10.z.object({
+  type: import_zod10.z.literal("or"),
+  // eslint-disable-next-line @typescript-eslint/no-use-before-define
+  clauses: import_zod10.z.lazy(() => Clause.array())
+});
+var Clause = import_zod10.z.lazy(
+  () => import_zod10.z.discriminatedUnion("type", [
+    And,
+    Or,
+    FuzzyMatcher,
+    StrictMatcher,
+    DateDistanceMatcher
+  ])
+).openapi({
+  ref: "Clause"
+});
+var DeduplicationConfig = import_zod10.z.object({
+  id: import_zod10.z.string(),
+  label: TranslationConfig,
+  query: Clause
+});
+
+// ../commons/src/events/ActionConfig.ts
+var import_zod_openapi7 = require("zod-openapi");
+(0, import_zod_openapi7.extendZodWithOpenApi)(import_zod11.z);
+var ActionConditional2 = import_zod11.z.discriminatedUnion("type", [
   /** If conditional is defined, the action is shown to the user only if the condition is met */
   ShowConditional,
   /** If conditional is defined, the action is enabled only if the condition is met */
   EnableConditional
 ]);
-var DeclarationReviewConfig = import_zod10.z.object({
+var DeclarationReviewConfig = import_zod11.z.object({
   title: TranslationConfig.describe("Title of the review page"),
-  fields: import_zod10.z.array(FieldConfig).describe("Fields to be rendered on the review page for annotations.")
+  fields: import_zod11.z.array(FieldConfig).describe("Fields to be rendered on the review page for annotations.")
 }).describe("Configuration for **declaration** review page.");
-var ActionConfigBase = import_zod10.z.object({
+var ActionConfigBase = import_zod11.z.object({
   label: TranslationConfig,
-  conditionals: import_zod10.z.array(ActionConditional2).optional().default([]),
-  draft: import_zod10.z.boolean().optional()
+  conditionals: import_zod11.z.array(ActionConditional2).optional().default([]),
+  deduplication: DeduplicationConfig.optional(),
+  draft: import_zod11.z.boolean().optional()
 });
 var ReadActionConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.READ),
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.READ),
     review: DeclarationReviewConfig
   })
 );
 var DeclareConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.DECLARE),
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.DECLARE),
     review: DeclarationReviewConfig
   })
 );
 var ValidateConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.VALIDATE),
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.VALIDATE),
     review: DeclarationReviewConfig
   })
 );
 var RegisterConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.REGISTER),
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.REGISTER),
     review: DeclarationReviewConfig
   })
 );
 var RejectDeclarationConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.REJECT)
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.REJECT)
   })
 );
 var MarkedAsDuplicateConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.MARKED_AS_DUPLICATE)
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.MARKED_AS_DUPLICATE)
   })
 );
 var ArchiveConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.ARCHIVE)
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.ARCHIVE)
   })
 );
 var DeleteConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.DELETE)
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.DELETE)
   })
 );
 var PrintCertificateActionConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.PRINT_CERTIFICATE),
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.PRINT_CERTIFICATE),
     printForm: ActionFormConfig
   })
 );
 var RequestCorrectionConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.REQUEST_CORRECTION),
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.REQUEST_CORRECTION),
     correctionForm: ActionFormConfig
   })
 );
 var RejectCorrectionConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.REJECT_CORRECTION)
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.REJECT_CORRECTION)
   })
 );
 var ApproveCorrectionConfig = ActionConfigBase.merge(
-  import_zod10.z.object({
-    type: import_zod10.z.literal(ActionType.APPROVE_CORRECTION)
+  import_zod11.z.object({
+    type: import_zod11.z.literal(ActionType.APPROVE_CORRECTION)
   })
 );
-var ActionConfig = import_zod10.z.discriminatedUnion("type", [
+var ActionConfig = import_zod11.z.discriminatedUnion("type", [
   /*
    * OpenAPI references are defined here so our generated OpenAPI spec knows to reuse the models
    * and treat them as "models" instead of duplicating the data structure in each endpoint.
@@ -1218,125 +1295,52 @@ var ActionConfig = import_zod10.z.discriminatedUnion("type", [
   RejectCorrectionConfig.openapi({ ref: "RejectCorrectionActionConfig" }),
   ApproveCorrectionConfig.openapi({ ref: "ApproveCorrectionActionConfig" })
 ]).openapi({ ref: "ActionConfig" });
-var DeclarationActionConfig = import_zod10.z.discriminatedUnion("type", [
+var DeclarationActionConfig = import_zod11.z.discriminatedUnion("type", [
   DeclareConfig,
   ValidateConfig,
   RegisterConfig
 ]);
 
 // ../commons/src/events/offline/CertificateConfig.ts
-var import_zod11 = require("zod");
-var FontFamily = import_zod11.z.object({
-  normal: import_zod11.z.string(),
-  bold: import_zod11.z.string(),
-  italics: import_zod11.z.string(),
-  bolditalics: import_zod11.z.string()
+var import_zod12 = require("zod");
+var FontFamily = import_zod12.z.object({
+  normal: import_zod12.z.string(),
+  bold: import_zod12.z.string(),
+  italics: import_zod12.z.string(),
+  bolditalics: import_zod12.z.string()
 });
-var CertificateConfig = import_zod11.z.object({
-  id: import_zod11.z.string(),
-  event: import_zod11.z.string(),
+var CertificateConfig = import_zod12.z.object({
+  id: import_zod12.z.string(),
+  event: import_zod12.z.string(),
   label: TranslationConfig,
-  isDefault: import_zod11.z.boolean(),
-  fee: import_zod11.z.object({
-    onTime: import_zod11.z.number(),
-    late: import_zod11.z.number(),
-    delayed: import_zod11.z.number()
+  isDefault: import_zod12.z.boolean(),
+  fee: import_zod12.z.object({
+    onTime: import_zod12.z.number(),
+    late: import_zod12.z.number(),
+    delayed: import_zod12.z.number()
   }),
-  svgUrl: import_zod11.z.string(),
-  fonts: import_zod11.z.record(FontFamily).optional(),
-  conditionals: import_zod11.z.array(ShowConditional).optional()
+  svgUrl: import_zod12.z.string(),
+  fonts: import_zod12.z.record(FontFamily).optional(),
+  conditionals: import_zod12.z.array(ShowConditional).optional()
 });
 var CertificateTemplateConfig = CertificateConfig.extend({
-  hash: import_zod11.z.string().optional(),
-  svg: import_zod11.z.string()
+  hash: import_zod12.z.string().optional(),
+  svg: import_zod12.z.string()
 });
 
 // ../commons/src/events/offline/LanguageConfig.ts
-var import_zod12 = require("zod");
-var LanguageConfig = import_zod12.z.object({
-  lang: import_zod12.z.string(),
+var import_zod13 = require("zod");
+var LanguageConfig = import_zod13.z.object({
+  lang: import_zod13.z.string(),
   /**
    * client.csv contents
    */
-  messages: import_zod12.z.record(import_zod12.z.string())
+  messages: import_zod13.z.record(import_zod13.z.string())
 });
 
 // ../commons/src/events/EventConfig.ts
 var import_zod21 = require("zod");
 
-// ../commons/src/events/DeduplicationConfig.ts
-var import_zod13 = require("zod");
-var import_zod_openapi7 = require("zod-openapi");
-(0, import_zod_openapi7.extendZodWithOpenApi)(import_zod13.z);
-var FieldReference2 = import_zod13.z.string();
-var Matcher = import_zod13.z.object({
-  fieldId: import_zod13.z.string(),
-  options: import_zod13.z.object({
-    boost: import_zod13.z.number().optional()
-  }).optional().default({})
-});
-var FuzzyMatcher = Matcher.extend({
-  type: import_zod13.z.literal("fuzzy"),
-  options: import_zod13.z.object({
-    /**
-     * Names of length 3 or less characters = 0 edits allowed
-     * Names of length 4 - 6 characters = 1 edit allowed
-     * Names of length >7 characters = 2 edits allowed
-     */
-    fuzziness: import_zod13.z.union([import_zod13.z.string(), import_zod13.z.number()]).optional().default("AUTO:4,7"),
-    boost: import_zod13.z.number().optional().default(1)
-  }).optional().default({})
-});
-var StrictMatcher = Matcher.extend({
-  type: import_zod13.z.literal("strict"),
-  options: import_zod13.z.object({
-    boost: import_zod13.z.number().optional().default(1)
-  }).optional().default({})
-});
-var DateRangeMatcher = Matcher.extend({
-  type: import_zod13.z.literal("dateRange"),
-  options: import_zod13.z.object({
-    days: import_zod13.z.number(),
-    origin: FieldReference2,
-    boost: import_zod13.z.number().optional().default(1)
-  })
-});
-var DateDistanceMatcher = Matcher.extend({
-  type: import_zod13.z.literal("dateDistance"),
-  options: import_zod13.z.object({
-    days: import_zod13.z.number(),
-    origin: FieldReference2,
-    boost: import_zod13.z.number().optional().default(1)
-  })
-});
-var And = import_zod13.z.object({
-  type: import_zod13.z.literal("and"),
-  // eslint-disable-next-line @typescript-eslint/no-use-before-define
-  clauses: import_zod13.z.lazy(() => Clause.array())
-});
-var Or = import_zod13.z.object({
-  type: import_zod13.z.literal("or"),
-  // eslint-disable-next-line @typescript-eslint/no-use-before-define
-  clauses: import_zod13.z.lazy(() => Clause.array())
-});
-var Clause = import_zod13.z.lazy(
-  () => import_zod13.z.discriminatedUnion("type", [
-    And,
-    Or,
-    FuzzyMatcher,
-    StrictMatcher,
-    DateRangeMatcher,
-    DateDistanceMatcher
-  ])
-).openapi({
-  ref: "Clause"
-});
-var DeduplicationConfig = import_zod13.z.object({
-  id: import_zod13.z.string(),
-  label: TranslationConfig,
-  query: Clause
-});
-
 // ../commons/src/events/SummaryConfig.ts
 var import_zod14 = require("zod");
 var BaseField2 = import_zod14.z.object({
@@ -2806,7 +2810,6 @@ var EventConfig = import_zod21.z.object({
   label: TranslationConfig,
   actions: import_zod21.z.array(ActionConfig),
   declaration: DeclarationFormConfig,
-  deduplication: import_zod21.z.array(DeduplicationConfig).optional().default([]),
   advancedSearch: import_zod21.z.array(AdvancedSearchConfig).optional().default([])
 }).superRefine((event2, ctx) => {
   const allFields = findAllFields(event2);
@@ -4258,9 +4261,6 @@ function isPendingCertification(actions) {
     if (type === ActionType.PRINT_CERTIFICATE) {
       return false;
     }
-    if (type === ActionType.REQUEST_CORRECTION) {
-      return false;
-    }
     if (type === ActionType.APPROVE_CORRECTION) {
       return true;
     }
@@ -6447,33 +6447,24 @@ var child = defineFormPage({
   },
   fields: [
     {
-      id: "child.firstNames",
-      type: FieldType.TEXT,
-      required: true,
-      configuration: { maxLength: 32 },
-      hideLabel: true,
-      label: {
-        defaultMessage: "Child's  first name",
-        description: "This is the label for the field",
-        id: "v2.event.birth.action.declare.form.section.child.field.name.label"
-      }
-    },
-    {
-      id: "child.familyName",
-      type: FieldType.TEXT,
+      id: "child.name",
+      type: FieldType.NAME,
       required: true,
       configuration: { maxLength: 32 },
       hideLabel: true,
       label: {
-        defaultMessage: "Child's last name",
+        defaultMessage: "Child's name",
         description: "This is the label for the field",
         id: "v2.event.birth.action.declare.form.section.child.field.name.label"
-      }
+      },
+      validation: []
     },
     {
-      id: "child.DoB",
+      id: "child.dob",
       type: "DATE",
       required: true,
+      secured: true,
+      validation: [],
       label: {
         defaultMessage: "Date of birth",
         description: "This is the label for the field",
@@ -6492,46 +6483,43 @@ var mother = defineFormPage({
   },
   fields: [
     {
-      id: "mother.firstNames",
-      configuration: { maxLength: 32 },
-      type: FieldType.TEXT,
+      id: "mother.name",
+      type: FieldType.NAME,
       required: true,
-      label: {
-        defaultMessage: "First name(s)",
-        description: "This is the label for the field",
-        id: `v2.event.birth.action.declare.form.section.person.field.firstname.label`
-      }
-    },
-    {
-      id: `mother.familyName`,
       configuration: { maxLength: 32 },
-      type: FieldType.TEXT,
-      required: true,
+      hideLabel: true,
       label: {
-        defaultMessage: "Last name",
+        defaultMessage: "Mother's name",
         description: "This is the label for the field",
-        id: `v2.event.birth.action.declare.form.section.person.field.surname.label`
-      }
+        id: "v2.event.birth.action.declare.form.section.mother.field.name.label"
+      },
+      conditionals: [],
+      validation: []
     },
     {
-      id: `mother.DoB`,
+      id: "mother.dob",
       type: "DATE",
       required: true,
+      secured: true,
+      validation: [],
       label: {
         defaultMessage: "Date of birth",
         description: "This is the label for the field",
-        id: `v2.event.birth.action.declare.form.section.person.field.dob.label`
-      }
+        id: "v2.event.birth.action.declare.form.section.person.field.dob.label"
+      },
+      conditionals: []
     },
     {
-      id: "mother.identifier",
+      id: "mother.nid",
       type: FieldType.ID,
       required: true,
       label: {
         defaultMessage: "ID Number",
         description: "This is the label for the field",
-        id: `v2.event.birth.action.declare.form.section.person.field.nid.label`
-      }
+        id: "v2.event.birth.action.declare.form.section.person.field.nid.label"
+      },
+      conditionals: [],
+      validation: []
     }
   ]
 });

package/package.json

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