@opencrvs/toolkit 1.8.1-rc.2d48701 → 1.8.1-rc.30d472b

package/dist/commons/api/router.d.ts

@@ -10805,7 +10805,6 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
         set: import("@trpc/server").TRPCMutationProcedure<{
             input: {
                 id: string;
-                externalId: string | null;
                 name: string;
                 partOf: string | null;
             }[];
@@ -10816,7 +10815,6 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             input: void;
             output: {
                 id: string & import("zod").BRAND<"UUID">;
-                externalId: string | null;
                 name: string;
                 partOf: (string & import("zod").BRAND<"UUID">) | null;
             }[];

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

@@ -1,9 +1,9 @@
 import { ConditionalParameters, JSONSchema } from './conditionals';
-import { ActionUpdate, EventState } from '../events/ActionDocument';
-import { FieldConditional } from '../events/Conditional';
+import { EventState, ActionUpdate } from '../events/ActionDocument';
 import { FieldConfig } from '../events/FieldConfig';
 import { FieldUpdateValue } from '../events/FieldValue';
 import { TranslationConfig } from '../events/TranslationConfig';
+import { FieldConditional } from '../events/Conditional';
 export declare function validate(schema: JSONSchema, data: ConditionalParameters): boolean;
 export declare function isConditionMet(conditional: JSONSchema, values: Record<string, unknown>): boolean;
 export declare function areConditionsMet(conditions: FieldConditional[], values: Record<string, unknown>): boolean;
@@ -77,5 +77,4 @@ export declare function runFieldValidations({ field, values }: {
     }[];
 };
 export declare function getValidatorsForField(fieldId: FieldConfig['id'], validations: NonNullable<FieldConfig['validation']>): NonNullable<FieldConfig['validation']>;
-export declare function areCertificateConditionsMet(conditions: FieldConditional[], values: Record<string, unknown>): boolean;
 //# sourceMappingURL=validate.d.ts.map

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

@@ -45,63 +45,9 @@ declare function eventFn(fieldId: EventFieldId): {
 declare const event: typeof 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: ActionType) => {
-        /**
-         * 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: number) => import("../conditionals/conditionals").JSONSchema;
-        /**
-         * 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: number) => import("../conditionals/conditionals").JSONSchema;
-        /**
-         * Adds additional field constraints to the action matching.
-         *
-         * @param fields - Object containing additional fields to match on the action.
-         */
-        withFields: (fields: Record<string, unknown>) => {
-            /**
-             * 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: number) => import("../conditionals/conditionals").JSONSchema;
-            /**
-             * 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: number) => import("../conditionals/conditionals").JSONSchema;
-        };
-        /**
-         * 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: string) => {
-            /**
-             * 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: number) => import("../conditionals/conditionals").JSONSchema;
-            /**
-             * 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: number) => import("../conditionals/conditionals").JSONSchema;
-        };
-        __nominal__type: "JSONSchema";
-    };
+    hasAction: (action: ActionType) => import("../conditionals/conditionals").JSONSchema;
     field(field: WorkqueueColumnKeys): WorkqueueColumnValue;
 };
 export { event };

package/dist/events/index.js

@@ -198,7 +198,6 @@ __export(events_exports, {
   annotationActions: () => annotationActions,
   applyDeclarationToEventIndex: () => applyDeclarationToEventIndex,
   applyDraftsToEventIndex: () => applyDraftsToEventIndex,
-  areCertificateConditionsMet: () => areCertificateConditionsMet,
   areConditionsMet: () => areConditionsMet,
   compositeFieldTypes: () => compositeFieldTypes,
   createEmptyDraft: () => createEmptyDraft,
@@ -1224,8 +1223,7 @@ var CertificateConfig = import_zod11.z.object({
     delayed: import_zod11.z.number()
   }),
   svgUrl: import_zod11.z.string(),
-  fonts: import_zod11.z.record(FontFamily).optional(),
-  conditionals: import_zod11.z.array(ShowConditional).optional()
+  fonts: import_zod11.z.record(FontFamily).optional()
 });
 var CertificateTemplateConfig = CertificateConfig.extend({
   hash: import_zod11.z.string().optional(),
@@ -2047,7 +2045,7 @@ var ResolvedUser = import_zod19.z.object({
 });
 
 // ../commons/src/conditionals/validate.ts
-var import__ = __toESM(require("ajv/dist/2019"));
+var import_ajv = __toESM(require("ajv"));
 var import_ajv_formats = __toESM(require("ajv-formats"));
 var import_date_fns = require("date-fns");
 
@@ -2261,11 +2259,9 @@ var isNonInteractiveFieldType = (field2) => {
 };
 
 // ../commons/src/conditionals/validate.ts
-var ajv = new import__.default({
+var ajv = new import_ajv.default({
   $data: true,
-  allowUnionTypes: true,
-  strict: false
-  // Allow minContains and other newer features
+  allowUnionTypes: true
 });
 (0, import_ajv_formats.default)(ajv);
 ajv.addKeyword({
@@ -2503,11 +2499,6 @@ 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) {
@@ -3231,107 +3222,32 @@ 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) => {
-    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({
+  hasAction: (action) => defineConditional({
+    type: "object",
+    properties: {
+      $event: {
         type: "object",
         properties: {
-          $event: {
-            type: "object",
-            properties: {
-              actions: {
-                type: "array",
-                contains: {
-                  type: "object",
-                  properties: actionProperties,
-                  required: requiredFields
-                },
-                [countType]: count
-              }
-            },
-            required: ["actions"]
+          actions: {
+            type: "array",
+            contains: {
+              type: "object",
+              properties: {
+                type: {
+                  const: action
+                }
+              },
+              required: ["type"]
+            }
           }
         },
-        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 };
-  },
+        required: ["actions"]
+      }
+    },
+    required: ["$event"]
+  }),
   field(field2) {
     return {
       $event: field2
@@ -6934,11 +6850,7 @@ function generateActionDocument({
     case ActionType.NOTIFY:
       return { ...actionBase, type: action };
     case ActionType.PRINT_CERTIFICATE:
-      return {
-        ...actionBase,
-        type: action,
-        content: defaults.content
-      };
+      return { ...actionBase, type: action };
     case ActionType.REQUEST_CORRECTION:
       return { ...actionBase, type: action };
     case ActionType.APPROVE_CORRECTION:

package/package.json

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