@opencrvs/toolkit 1.8.1-rc.25f3d5c → 1.8.1-rc.2d48701

package/dist/events/index.js

@@ -39,7 +39,6 @@ __export(events_exports, {
   ActionConfig: () => ActionConfig,
   ActionConfigBase: () => ActionConfigBase,
   ActionCreationMetadata: () => ActionCreationMetadata,
-  ActionDetails: () => ActionDetails,
   ActionDocument: () => ActionDocument,
   ActionFormConfig: () => ActionFormConfig,
   ActionInput: () => ActionInput,
@@ -140,6 +139,7 @@ __export(events_exports, {
   PageConfig: () => PageConfig,
   PageTypes: () => PageTypes,
   PrintCertificateActionInput: () => PrintCertificateActionInput,
+  PrintContent: () => PrintContent,
   QueryExpression: () => QueryExpression,
   QueryInput: () => QueryInput,
   QueryType: () => QueryType,
@@ -198,6 +198,7 @@ __export(events_exports, {
   annotationActions: () => annotationActions,
   applyDeclarationToEventIndex: () => applyDeclarationToEventIndex,
   applyDraftsToEventIndex: () => applyDraftsToEventIndex,
+  areCertificateConditionsMet: () => areCertificateConditionsMet,
   areConditionsMet: () => areConditionsMet,
   compositeFieldTypes: () => compositeFieldTypes,
   createEmptyDraft: () => createEmptyDraft,
@@ -607,8 +608,8 @@ var UrbanAddressUpdateValue = AdminStructure.extend({
   zipCode: import_zod5.z.string().nullish()
 });
 var NameFieldValue = import_zod5.z.object({
-  firstname: import_zod5.z.string(),
-  surname: import_zod5.z.string(),
+  firstname: import_zod5.z.string().min(1),
+  surname: import_zod5.z.string().min(1),
   middlename: import_zod5.z.string().optional()
 });
 var NameFieldUpdateValue = import_zod5.z.object({
@@ -1223,7 +1224,8 @@ var CertificateConfig = import_zod11.z.object({
     delayed: import_zod11.z.number()
   }),
   svgUrl: import_zod11.z.string(),
-  fonts: import_zod11.z.record(FontFamily).optional()
+  fonts: import_zod11.z.record(FontFamily).optional(),
+  conditionals: import_zod11.z.array(ShowConditional).optional()
 });
 var CertificateTemplateConfig = CertificateConfig.extend({
   hash: import_zod11.z.string().optional(),
@@ -1341,7 +1343,7 @@ var SummaryConfig = import_zod14.z.object({
 
 // ../commons/src/events/AdvancedSearchConfig.ts
 var import_zod15 = require("zod");
-var MatchType = import_zod15.z.enum(["fuzzy", "exact", "range"]);
+var MatchType = import_zod15.z.enum(["fuzzy", "exact", "range", "within"]);
 var BaseField3 = import_zod15.z.object({
   config: import_zod15.z.object({
     type: MatchType.describe("Determines the type of field")
@@ -1883,10 +1885,6 @@ var ActionStatus = {
   Accepted: "Accepted",
   Rejected: "Rejected"
 };
-var ActionDetails = import_zod19.z.object({
-  templateId: import_zod19.z.string().optional(),
-  isImmediateCorrection: import_zod19.z.boolean().optional()
-});
 var ActionBase = import_zod19.z.object({
   id: UUID,
   transactionId: import_zod19.z.string(),
@@ -1898,7 +1896,6 @@ var ActionBase = import_zod19.z.object({
   createdAtLocation: CreatedAtLocation,
   declaration: ActionUpdate,
   annotation: ActionUpdate.optional().nullable(),
-  actionDetails: ActionDetails.optional().nullable(),
   status: import_zod19.z.enum([
     ActionStatus.Requested,
     ActionStatus.Accepted,
@@ -1908,11 +1905,15 @@ var ActionBase = import_zod19.z.object({
   originalActionId: UUID.optional().nullable().describe(
     "Reference to the original action that was asynchronously rejected or accepted by 3rd party integration."
   )
+  // 'content' field reserved for additional data
+  // Each action can define its own content specifc to the action
+  // See PrintCertificateAction
 });
 var AssignedAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.ASSIGN),
     assignedTo: import_zod19.z.string()
+    // TODO move into 'content' property
   })
 );
 var UnassignedAction = ActionBase.merge(
@@ -1924,6 +1925,7 @@ var RegisterAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.REGISTER),
     registrationNumber: import_zod19.z.string().optional()
+    // TODO move into 'content' property
   })
 );
 var DeclareAction = ActionBase.merge(
@@ -1944,6 +1946,7 @@ var RejectAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.REJECT),
     reason: RejectionReason
+    // TODO move into 'content' property
   })
 );
 var MarkAsDuplicateAction = ActionBase.merge(
@@ -1955,6 +1958,7 @@ var ArchiveAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.ARCHIVE),
     reason: RejectionReason
+    // TODO move into 'content' property
   })
 );
 var CreatedAction = ActionBase.merge(
@@ -1967,9 +1971,13 @@ var NotifiedAction = ActionBase.merge(
     type: import_zod19.z.literal(ActionType.NOTIFY)
   })
 );
+var PrintContent = import_zod19.z.object({
+  templateId: import_zod19.z.string().optional()
+});
 var PrintCertificateAction = ActionBase.merge(
   import_zod19.z.object({
-    type: import_zod19.z.literal(ActionType.PRINT_CERTIFICATE)
+    type: import_zod19.z.literal(ActionType.PRINT_CERTIFICATE),
+    content: PrintContent.optional().nullable()
   })
 );
 var RequestedCorrectionAction = ActionBase.merge(
@@ -1981,12 +1989,15 @@ var ApprovedCorrectionAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.APPROVE_CORRECTION),
     requestId: import_zod19.z.string()
+    // TODO move into 'content' property
   })
 );
 var RejectedCorrectionAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.REJECT_CORRECTION),
-    requestId: import_zod19.z.string()
+    requestId: import_zod19.z.string(),
+    // TODO move into 'content' property
+    reason: RejectionReason
   })
 );
 var ReadAction = ActionBase.merge(
@@ -2036,7 +2047,7 @@ var ResolvedUser = import_zod19.z.object({
 });
 
 // ../commons/src/conditionals/validate.ts
-var import_ajv = __toESM(require("ajv"));
+var import__ = __toESM(require("ajv/dist/2019"));
 var import_ajv_formats = __toESM(require("ajv-formats"));
 var import_date_fns = require("date-fns");
 
@@ -2250,9 +2261,11 @@ var isNonInteractiveFieldType = (field2) => {
 };
 
 // ../commons/src/conditionals/validate.ts
-var ajv = new import_ajv.default({
+var ajv = new import__.default({
   $data: true,
-  allowUnionTypes: true
+  allowUnionTypes: true,
+  strict: false
+  // Allow minContains and other newer features
 });
 (0, import_ajv_formats.default)(ajv);
 ajv.addKeyword({
@@ -2490,6 +2503,11 @@ function getValidatorsForField(fieldId, validations) {
     };
   }).filter((x) => x !== null);
 }
+function areCertificateConditionsMet(conditions, values) {
+  return conditions.every((condition) => {
+    return ajv.validate(condition.conditional, values);
+  });
+}
 
 // ../commons/src/utils.ts
 function getOrThrow(x, message) {
@@ -3180,6 +3198,19 @@ function createSearchConfig(baseField) {
     fuzzy: () => ({
       ...baseField,
       config: { type: "fuzzy" }
+    }),
+    /**
+     * Creates a configuration for matching locations and the child locations
+     * @returns  An object containing the field ID and a configuration object with a type of 'within'.
+     * @example field('createdAtLocation').within()
+     * // {
+     * //   ...
+     * //   config: { type: 'within' }
+     * // }
+     */
+    within: () => ({
+      ...baseField,
+      config: { type: "within" }
     })
   };
 }
@@ -3200,32 +3231,107 @@ function eventFn(fieldId) {
 var event = Object.assign(eventFn, {
   /**
    * Checks if the event contains a specific action type.
+   * Can be used directly as a conditional or chained with additional methods.
    * @param action - The action type to check for.
    */
-  hasAction: (action) => defineConditional({
-    type: "object",
-    properties: {
-      $event: {
+  hasAction: (action) => {
+    const basicConditional = defineConditional({
+      type: "object",
+      properties: {
+        $event: {
+          type: "object",
+          properties: {
+            actions: {
+              type: "array",
+              contains: {
+                type: "object",
+                properties: {
+                  type: {
+                    const: action
+                  }
+                },
+                required: ["type"]
+              }
+            }
+          },
+          required: ["actions"]
+        }
+      },
+      required: ["$event"]
+    });
+    const buildActionConstraints = (additionalFields) => {
+      const actionProperties = {
+        type: { const: action }
+      };
+      const requiredFields = ["type"];
+      if (additionalFields) {
+        Object.entries(additionalFields).forEach(([key, value]) => {
+          actionProperties[key] = { const: value };
+          requiredFields.push(key);
+        });
+      }
+      return { actionProperties, requiredFields };
+    };
+    const createCountConditional = (countType, count, additionalFields) => {
+      const { actionProperties, requiredFields } = buildActionConstraints(additionalFields);
+      return defineConditional({
         type: "object",
         properties: {
-          actions: {
-            type: "array",
-            contains: {
-              type: "object",
-              properties: {
-                type: {
-                  const: action
-                }
-              },
-              required: ["type"]
-            }
+          $event: {
+            type: "object",
+            properties: {
+              actions: {
+                type: "array",
+                contains: {
+                  type: "object",
+                  properties: actionProperties,
+                  required: requiredFields
+                },
+                [countType]: count
+              }
+            },
+            required: ["actions"]
           }
         },
-        required: ["actions"]
-      }
-    },
-    required: ["$event"]
-  }),
+        required: ["$event"]
+      });
+    };
+    const withMinMax = (additionalFields) => {
+      return {
+        /**
+         * Creates a conditional that checks if the event contains a specific action type
+         * with a minimum count of occurrences.
+         *
+         * @param minCount - The minimum number of actions required.
+         */
+        minCount: (minCount) => createCountConditional("minContains", minCount, additionalFields),
+        /**
+         * Builds a conditional that sets a maximum count for the number of actions.
+         * This is useful for limiting the number of actions of a specific type in a single event.
+         */
+        maxCount: (maxCount) => createCountConditional("maxContains", maxCount, additionalFields)
+      };
+    };
+    const chainableMethods = {
+      /**
+       * Adds additional field constraints to the action matching.
+       *
+       * @param fields - Object containing additional fields to match on the action.
+       */
+      withFields: (fields) => withMinMax(fields),
+      /**
+       * Adds template ID constraint to the action matching.
+       * This is a convenience method that adds content.templateId to the fields.
+       *
+       * @param id - The template ID to match against.
+       */
+      withTemplate: (id) => withMinMax({
+        content: { templateId: id }
+      }),
+      ...withMinMax()
+    };
+    return { ...basicConditional, ...chainableMethods };
+  },
   field(field2) {
     return {
       $event: field2
@@ -3529,6 +3635,9 @@ var QueryExpression = import_zod25.z.object({
   createdAt: import_zod25.z.optional(DateCondition),
   updatedAt: import_zod25.z.optional(DateCondition),
   "legalStatuses.REGISTERED.acceptedAt": import_zod25.z.optional(DateCondition),
+  "legalStatuses.DECLARED.createdAtLocation": import_zod25.z.optional(
+    import_zod25.z.union([Within, Exact])
+  ),
   "legalStatuses.REGISTERED.createdAtLocation": import_zod25.z.optional(
     import_zod25.z.union([Within, Exact])
   ),
@@ -3840,7 +3949,6 @@ var BaseActionInput = import_zod29.z.object({
   transactionId: import_zod29.z.string(),
   declaration: ActionUpdate.default({}),
   annotation: ActionUpdate.optional(),
-  actionDetails: ActionDetails.optional(),
   originalActionId: UUID.optional(),
   // should not be part of base action.
   keepAssignment: import_zod29.z.boolean().optional()
@@ -3883,7 +3991,8 @@ var DeclareActionInput = BaseActionInput.merge(
 );
 var PrintCertificateActionInput = BaseActionInput.merge(
   import_zod29.z.object({
-    type: import_zod29.z.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE)
+    type: import_zod29.z.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE),
+    content: PrintContent.optional()
   })
 );
 var RejectDeclarationActionInput = BaseActionInput.merge(
@@ -3923,7 +4032,8 @@ var RequestCorrectionActionInput = BaseActionInput.merge(
 var RejectCorrectionActionInput = BaseActionInput.merge(
   import_zod29.z.object({
     requestId: import_zod29.z.string(),
-    type: import_zod29.z.literal(ActionType.REJECT_CORRECTION).default(ActionType.REJECT_CORRECTION)
+    type: import_zod29.z.literal(ActionType.REJECT_CORRECTION).default(ActionType.REJECT_CORRECTION),
+    reason: RejectionReason
   })
 );
 var ApproveCorrectionActionInput = BaseActionInput.merge(
@@ -6762,7 +6872,7 @@ function eventPayloadGenerator(rng) {
           requestId,
           keepAssignment: input.keepAssignment
         }),
-        reject: (eventId, requestId, input = {}) => ({
+        reject: (eventId, requestId, input) => ({
           type: ActionType.REJECT_CORRECTION,
           transactionId: input.transactionId ?? getUUID(),
           declaration: {},
@@ -6773,7 +6883,8 @@ function eventPayloadGenerator(rng) {
           ),
           eventId,
           requestId,
-          keepAssignment: input.keepAssignment
+          keepAssignment: input.keepAssignment,
+          reason: input.reason ?? { message: "" }
         })
       }
     }
@@ -6823,7 +6934,11 @@ function generateActionDocument({
     case ActionType.NOTIFY:
       return { ...actionBase, type: action };
     case ActionType.PRINT_CERTIFICATE:
-      return { ...actionBase, type: action };
+      return {
+        ...actionBase,
+        type: action,
+        content: defaults.content
+      };
     case ActionType.REQUEST_CORRECTION:
       return { ...actionBase, type: action };
     case ActionType.APPROVE_CORRECTION:
@@ -6832,7 +6947,8 @@ function generateActionDocument({
       return {
         ...actionBase,
         requestId: getUUID(),
-        type: action
+        type: action,
+        reason: { message: "Correction rejection" }
       };
     case ActionType.REGISTER:
       return {

package/package.json

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