@opencrvs/toolkit 1.9.8-rc.d187100 → 1.9.8-rc.f0948d3

package/dist/notification/index.js

@@ -2379,7 +2379,7 @@ var BaseField3 = import_zod24.z.object({
     label would be "Applicant Applicant's First Name", which is redundant and awkward.
 
     By setting searchCriteriaLabelPrefix to a translation config object, we can explicitly define the desired prefix
-    in the country-config > event.advancedSearch configuration. For example: field("child.dob", { searchCriteriaLabelPrefix: TranslationConfig }).
+    in the country-config > event.advancedSearch configuration. For example: event.declaration("child.dob", { searchCriteriaLabelPrefix: TranslationConfig }).
     `
   ),
   conditionals: import_zod24.z.array(FieldConditional).default([]).optional().describe(
@@ -2643,9 +2643,9 @@ var EventConfig = import_zod27.z.object({
   )
 }).superRefine((event2, ctx) => {
   const allFields = findAllFields(event2);
-  const fieldIds = allFields.map((field3) => field3.id);
+  const fieldIds = allFields.map((field2) => field2.id);
   const advancedSearchFields = event2.advancedSearch.flatMap(
-    (section) => section.fields.flatMap((field3) => field3.fieldId)
+    (section) => section.fields.flatMap((field2) => field2.fieldId)
   );
   const advancedSearchFieldsSet = new Set(advancedSearchFields);
   if (advancedSearchFieldsSet.size !== advancedSearchFields.length) {
@@ -2660,7 +2660,7 @@ var EventConfig = import_zod27.z.object({
       // Check if the fieldId is not in the fieldIds array
       // and also not in the metadataFields array
       section.fields.filter(
-        (field3) => !(fieldIds.includes(field3.fieldId) || EventFieldId.options.includes(field3.fieldId) || field3.config.searchFields && field3.config.searchFields.length > 0 && field3.config.searchFields.every((sf) => fieldIds.includes(sf)))
+        (field2) => !(fieldIds.includes(field2.fieldId) || EventFieldId.options.includes(field2.fieldId) || field2.config.searchFields && field2.config.searchFields.length > 0 && field2.config.searchFields.every((sf) => fieldIds.includes(sf)))
       )
     )
   );
@@ -2703,6 +2703,76 @@ var defineFormPage = (formPage) => FormPageConfig.parse(formPage);
 // ../commons/src/events/WorkqueueConfig.ts
 var import_zod31 = require("zod");
 
+// ../commons/src/searchConfigs.ts
+function createSearchConfig(baseField) {
+  return {
+    /**
+     * Creates a range configuration for the specified field.
+     *
+     * @returns An object containing the field ID and a configuration object with a type of 'range'.
+     *
+     * @example event('legalStatuses.REGISTERED.acceptedAt').range()
+     * // {
+     * //   ...
+     * //   config: { type: 'range' }
+     * // }
+     */
+    range: () => ({
+      ...baseField,
+      config: { type: "range" }
+    }),
+    /**
+     * Creates a configuration for exact matching of the specified field.
+     * @returns  An object containing the field ID and a configuration object with a type of 'exact'.
+     * @example event.declaration('dob').exact()
+     * // {
+     * //   ...
+     * //   config: { type: 'exact' }
+     * // }
+     */
+    exact: () => ({
+      ...baseField,
+      config: { type: "exact" }
+    }),
+    /**
+     * Creates a configuration for fuzzy matching of the specified field.
+     * @returns  An object containing the field ID and a configuration object with a type of 'exact'.
+     * @example event.declaration('name').fuzzy()
+     * // {
+     * //   ...
+     * //   config: { type: 'fuzzy' }
+     * // }
+     */
+    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 event.declaration('createdAtLocation').within()
+     * // {
+     * //   ...
+     * //   config: { type: 'within' }
+     * // }
+     */
+    within: () => ({
+      ...baseField,
+      config: { type: "within" }
+    })
+  };
+}
+
+// ../commons/src/field-config/field-configuration.ts
+function createFieldConfig(fieldId, options) {
+  const baseField = {
+    fieldId,
+    fieldType: "field",
+    ...options
+  };
+  return createSearchConfig(baseField);
+}
+
 // ../commons/src/conditionals/conditionals.ts
 var objectHash = __toESM(require("object-hash"));
 function defineConditional(schema) {
@@ -2742,8 +2812,8 @@ function not(condition) {
 function never() {
   return not(alwaysTrue());
 }
-function jsonFieldPath(field3) {
-  return [field3.$$field, ...field3.$$subfield].join("/");
+function jsonFieldPath(field2) {
+  return [field2.$$field, ...field2.$$subfield].join("/");
 }
 function wrapToPath(condition, path) {
   if (path.length === 0) {
@@ -2826,39 +2896,39 @@ var user = Object.assign(userSerializer, {
 function isFieldReference(value) {
   return typeof value === "object" && value !== null && "$$field" in value;
 }
-function getDateRangeToFieldReference(field3, comparedField, clause) {
+function getDateRangeToFieldReference(field2, comparedField, clause) {
   return {
     type: "object",
     properties: {
-      [field3.$$field]: wrapToPath(
+      [field2.$$field]: wrapToPath(
         {
           type: "string",
           format: "date",
           [clause]: {
-            $data: `${field3.$$subfield.length + 1}/${jsonFieldPath(comparedField)}`
+            $data: `${field2.$$subfield.length + 1}/${jsonFieldPath(comparedField)}`
           }
         },
-        field3.$$subfield
+        field2.$$subfield
       ),
       [comparedField.$$field]: wrapToPath(
         { type: "string", format: "date" },
         comparedField.$$subfield
       )
     },
-    required: [field3.$$field]
+    required: [field2.$$field]
   };
 }
-function getDayRangeToFieldReference(field3, comparedField, days, clause) {
+function getDayRangeToFieldReference(field2, comparedField, days, clause) {
   return {
     type: "object",
     properties: {
-      [field3.$$field]: wrapToPath(
+      [field2.$$field]: wrapToPath(
         {
           type: "string",
           format: "date",
           daysFromDate: {
             referenceDate: {
-              $data: `${field3.$$subfield.length + 1}/${jsonFieldPath(
+              $data: `${field2.$$subfield.length + 1}/${jsonFieldPath(
                 comparedField
               )}`
             },
@@ -2866,55 +2936,55 @@ function getDayRangeToFieldReference(field3, comparedField, days, clause) {
             days
           }
         },
-        field3.$$subfield
+        field2.$$subfield
       ),
       [comparedField.$$field]: wrapToPath(
         { type: "string", format: "date" },
         comparedField.$$subfield
       )
     },
-    required: [field3.$$field]
+    required: [field2.$$field]
   };
 }
-function defineComparison(field3, value, keyword) {
+function defineComparison(field2, value, keyword) {
   if (isFieldReference(value)) {
     const comparedField = value;
     return defineFormConditional({
       type: "object",
       properties: {
-        [field3.$$field]: wrapToPath(
+        [field2.$$field]: wrapToPath(
           {
             type: ["number"],
             [keyword]: {
-              $data: `${field3.$$subfield.length + 1}/${jsonFieldPath(comparedField)}`
+              $data: `${field2.$$subfield.length + 1}/${jsonFieldPath(comparedField)}`
             }
           },
-          field3.$$subfield
+          field2.$$subfield
         ),
         [comparedField.$$field]: wrapToPath(
           { type: "number" },
           comparedField.$$subfield
         )
       },
-      required: [field3.$$field]
+      required: [field2.$$field]
     });
   }
   return defineFormConditional({
     type: "object",
     properties: {
-      [field3.$$field]: wrapToPath(
+      [field2.$$field]: wrapToPath(
         { type: "number", [keyword]: value },
-        field3.$$subfield
+        field2.$$subfield
       )
     },
-    required: [field3.$$field]
+    required: [field2.$$field]
   });
 }
 function createFieldConditionals(fieldId) {
-  const getDayRange = (field3, days, clause, referenceDate) => ({
+  const getDayRange = (field2, days, clause, referenceDate) => ({
     type: "object",
     properties: {
-      [field3.$$field]: wrapToPath(
+      [field2.$$field]: wrapToPath(
         {
           type: "string",
           format: "date",
@@ -2924,24 +2994,24 @@ function createFieldConditionals(fieldId) {
             referenceDate
           }
         },
-        field3.$$subfield
+        field2.$$subfield
       )
     },
-    required: [field3.$$field]
+    required: [field2.$$field]
   });
-  const getDateRange = (field3, date, clause) => ({
+  const getDateRange = (field2, date, clause) => ({
     type: "object",
     properties: {
-      [field3.$$field]: wrapToPath(
+      [field2.$$field]: wrapToPath(
         {
           type: "string",
           format: "date",
           [clause]: date
         },
-        field3.$$subfield
+        field2.$$subfield
       )
     },
-    required: [field3.$$field]
+    required: [field2.$$field]
   });
   return {
     /**
@@ -3090,7 +3160,7 @@ function createFieldConditionals(fieldId) {
     },
     /**
      * Use case: Some fields are rendered when selection is not made, or boolean false is explicitly selected.
-     * @example field('recommender.none').isFalsy() vs not(field('recommender.none').isEqualTo(true))
+     * @example event.declaration('recommender.none').isFalsy() vs not(event.declaration('recommender.none').isEqualTo(true))
      * @returns whether the field is falsy (undefined, false, null, empty string)
      *
      * NOTE: For now, this only works with string, boolean, and null types. 0 is still allowed.
@@ -3238,11 +3308,11 @@ function createFieldConditionals(fieldId) {
     getId: () => ({ fieldId }),
     /**
      * @deprecated
-     * use field(fieldId).get(nestedProperty) instead
+     * use event.declaration(fieldId).get(nestedProperty) instead
      * with 'and' combinator e.g.
      * and(
-     *   field('child.name').get('firstname').isEqualTo('John'),
-     *   field('child.name').get('surname').isEqualTo('Doe')
+     *   event.declaration('child.name').get('firstname').isEqualTo('John'),
+     *   event.declaration('child.name').get('surname').isEqualTo('Doe')
      * )
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -3264,66 +3334,6 @@ function createFieldConditionals(fieldId) {
   };
 }
 
-// ../commons/src/searchConfigs.ts
-function createSearchConfig(baseField) {
-  return {
-    /**
-     * Creates a range configuration for the specified field.
-     *
-     * @returns An object containing the field ID and a configuration object with a type of 'range'.
-     *
-     * @example event('legalStatuses.REGISTERED.acceptedAt').range()
-     * // {
-     * //   ...
-     * //   config: { type: 'range' }
-     * // }
-     */
-    range: () => ({
-      ...baseField,
-      config: { type: "range" }
-    }),
-    /**
-     * Creates a configuration for exact matching of the specified field.
-     * @returns  An object containing the field ID and a configuration object with a type of 'exact'.
-     * @example field('dob').exact()
-     * // {
-     * //   ...
-     * //   config: { type: 'exact' }
-     * // }
-     */
-    exact: () => ({
-      ...baseField,
-      config: { type: "exact" }
-    }),
-    /**
-     * Creates a configuration for fuzzy matching of the specified field.
-     * @returns  An object containing the field ID and a configuration object with a type of 'exact'.
-     * @example field('name').fuzzy()
-     * // {
-     * //   ...
-     * //   config: { type: 'fuzzy' }
-     * // }
-     */
-    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" }
-    })
-  };
-}
-
 // ../commons/src/event-config/event-configuration.ts
 function createEventFieldConfig(fieldId) {
   const baseField = {
@@ -3441,9 +3451,30 @@ var event = Object.assign(eventFn, {
     };
     return { ...basicConditional, ...chainableMethods };
   },
-  field(field3) {
+  field(field2) {
     return {
-      $event: field3
+      $event: field2
+    };
+  },
+  /**
+   * Creates a function that acts like a callable + static method container.
+   * @param fieldId - The ID of the event metadata field to create a search config for.
+   * @example
+   * event('status') // → returns search config
+   * event.hasAction('CLICKED') // → returns conditional
+   */
+  metadata(fieldId) {
+    return createEventFieldConfig(fieldId);
+  },
+  /**
+   * Entry point for defining conditional logic or configuration for a form field.
+   * @param fieldId - The ID of the field to define rules or config for.
+   * @returns An object combining conditional methods and configuration builders.
+   */
+  declaration(fieldId, options = {}) {
+    return {
+      ...createFieldConditionals(fieldId),
+      ...createFieldConfig(fieldId, options)
     };
   }
 });
@@ -3943,24 +3974,6 @@ var defineConfig = (config) => {
 var import_lodash4 = require("lodash");
 var import_date_fns4 = require("date-fns");
 
-// ../commons/src/field-config/field-configuration.ts
-function createFieldConfig(fieldId, options) {
-  const baseField = {
-    fieldId,
-    fieldType: "field",
-    ...options
-  };
-  return createSearchConfig(baseField);
-}
-
-// ../commons/src/events/field.ts
-function field(fieldId, options = {}) {
-  return {
-    ...createFieldConditionals(fieldId),
-    ...createFieldConfig(fieldId, options)
-  };
-}
-
 // ../commons/src/fixtures/forms.ts
 var import_date_fns3 = require("date-fns");
 var PRINT_CERTIFICATE_FORM = defineActionForm({
@@ -4582,7 +4595,7 @@ var PRINT_CERTIFICATE_FORM = defineActionForm({
       id: "collector.identity.verify",
       type: PageTypes.enum.VERIFICATION,
       requireCompletionToContinue: true,
-      conditional: field("collector.requesterId").isEqualTo("INFORMANT"),
+      conditional: event.declaration("collector.requesterId").isEqualTo("INFORMANT"),
       title: {
         id: "event.tennis-club-membership.action.print.verifyIdentity",
         defaultMessage: "Verify their identity",
@@ -4654,14 +4667,14 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
 };
 function isInternationalAddress() {
   return and(
-    not(field("country").isUndefined()),
-    field("addressType").isEqualTo(AddressType.INTERNATIONAL)
+    not(event.declaration("country").isUndefined()),
+    event.declaration("addressType").isEqualTo(AddressType.INTERNATIONAL)
   );
 }
 function isDomesticAddress() {
   return and(
-    not(field("country").isUndefined()),
-    field("addressType").isEqualTo(AddressType.DOMESTIC)
+    not(event.declaration("country").isUndefined()),
+    event.declaration("addressType").isEqualTo(AddressType.DOMESTIC)
   );
 }
 var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
@@ -4699,9 +4712,9 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
           },
           validation: [
             {
-              validator: field("applicant.name").object({
-                firstname: field("firstname").isValidEnglishName(),
-                surname: field("surname").isValidEnglishName()
+              validator: event.declaration("applicant.name").object({
+                firstname: event.declaration("firstname").isValidEnglishName(),
+                surname: event.declaration("surname").isValidEnglishName()
               }),
               message: {
                 defaultMessage: "Input contains invalid characters. Please use only letters (a-z, A-Z), numbers (0-9), hyphens (-), apostrophes(') and underscores (_)",
@@ -4735,13 +4748,13 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
                 description: "This is the error message for invalid date",
                 id: "event.tennis-club-membership.action.declare.form.section.who.field.dob.error"
               },
-              validator: field("applicant.dob").isBefore().now()
+              validator: event.declaration("applicant.dob").isBefore().now()
             }
           ],
           conditionals: [
             {
               type: ConditionalType.SHOW,
-              conditional: field("applicant.dobUnknown").isFalsy()
+              conditional: event.declaration("applicant.dobUnknown").isFalsy()
             }
           ],
           label: {
@@ -4779,7 +4792,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
           conditionals: [
             {
               type: ConditionalType.SHOW,
-              conditional: field("applicant.dobUnknown").isEqualTo(true)
+              conditional: event.declaration("applicant.dobUnknown").isEqualTo(true)
             }
           ]
         },
@@ -4812,7 +4825,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
                 description: "Error message when generic field is invalid",
                 id: "error.invalid"
               },
-              validator: field("applicant.address").isValidAdministrativeLeafLevel()
+              validator: event.declaration("applicant.address").isValidAdministrativeLeafLevel()
             }
           ],
           configuration: {
@@ -4820,7 +4833,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               {
                 id: "town",
                 required: false,
-                parent: field("country"),
+                parent: event.declaration("country"),
                 label: {
                   id: "field.address.town.label",
                   defaultMessage: "Town",
@@ -4831,7 +4844,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
                     type: ConditionalType.SHOW,
                     conditional: and(
                       isDomesticAddress(),
-                      not(field("district").isUndefined())
+                      not(event.declaration("district").isUndefined())
                     )
                   }
                 ],
@@ -4840,7 +4853,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               {
                 id: "residentialArea",
                 required: false,
-                parent: field("country"),
+                parent: event.declaration("country"),
                 label: {
                   id: "field.address.residentialArea.label",
                   defaultMessage: "Residential Area",
@@ -4851,7 +4864,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
                     type: ConditionalType.SHOW,
                     conditional: and(
                       isDomesticAddress(),
-                      not(field("district").isUndefined())
+                      not(event.declaration("district").isUndefined())
                     )
                   }
                 ],
@@ -4860,7 +4873,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               {
                 id: "street",
                 required: false,
-                parent: field("country"),
+                parent: event.declaration("country"),
                 label: {
                   id: "field.address.street.label",
                   defaultMessage: "Street",
@@ -4871,7 +4884,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
                     type: ConditionalType.SHOW,
                     conditional: and(
                       isDomesticAddress(),
-                      not(field("district").isUndefined())
+                      not(event.declaration("district").isUndefined())
                     )
                   }
                 ],
@@ -4880,7 +4893,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               {
                 id: "number",
                 required: false,
-                parent: field("country"),
+                parent: event.declaration("country"),
                 label: {
                   id: "field.address.number.label",
                   defaultMessage: "Number",
@@ -4891,7 +4904,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
                     type: ConditionalType.SHOW,
                     conditional: and(
                       isDomesticAddress(),
-                      not(field("district").isUndefined())
+                      not(event.declaration("district").isUndefined())
                     )
                   }
                 ],
@@ -4900,7 +4913,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               {
                 id: "zipCode",
                 required: false,
-                parent: field("country"),
+                parent: event.declaration("country"),
                 label: {
                   id: "field.address.postcodeOrZip.label",
                   defaultMessage: "Postcode / Zip",
@@ -4911,7 +4924,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
                     type: ConditionalType.SHOW,
                     conditional: and(
                       isDomesticAddress(),
-                      not(field("district").isUndefined())
+                      not(event.declaration("district").isUndefined())
                     )
                   }
                 ],
@@ -4925,7 +4938,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
                     conditional: isInternationalAddress()
                   }
                 ],
-                parent: field("country"),
+                parent: event.declaration("country"),
                 required: true,
                 label: {
                   id: "field.address.state.label",
@@ -4936,7 +4949,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               },
               {
                 id: "district2",
-                parent: field("country"),
+                parent: event.declaration("country"),
                 conditionals: [
                   {
                     type: ConditionalType.SHOW,
@@ -4953,7 +4966,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               },
               {
                 id: "cityOrTown",
-                parent: field("country"),
+                parent: event.declaration("country"),
                 conditionals: [
                   {
                     type: ConditionalType.SHOW,
@@ -4970,7 +4983,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               },
               {
                 id: "addressLine1",
-                parent: field("country"),
+                parent: event.declaration("country"),
                 conditionals: [
                   {
                     type: ConditionalType.SHOW,
@@ -4987,7 +5000,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               },
               {
                 id: "addressLine2",
-                parent: field("country"),
+                parent: event.declaration("country"),
                 conditionals: [
                   {
                     type: ConditionalType.SHOW,
@@ -5004,7 +5017,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               },
               {
                 id: "addressLine3",
-                parent: field("country"),
+                parent: event.declaration("country"),
                 conditionals: [
                   {
                     type: ConditionalType.SHOW,
@@ -5021,7 +5034,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               },
               {
                 id: "postcodeOrZip",
-                parent: field("country"),
+                parent: event.declaration("country"),
                 conditionals: [
                   {
                     type: ConditionalType.SHOW,
@@ -5060,7 +5073,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
     },
     {
       id: "senior-pass",
-      conditional: field("applicant.dob").isBefore().date("1950-01-01"),
+      conditional: event.declaration("applicant.dob").isBefore().date("1950-01-01"),
       title: {
         id: "event.tennis-club-membership.action.declare.form.section.senior-pass.title",
         defaultMessage: "Assign senior pass for applicant",
@@ -5081,7 +5094,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
           id: "senior-pass.recommender",
           type: "CHECKBOX",
           required: true,
-          parent: field("recommender.none"),
+          parent: event.declaration("recommender.none"),
           defaultValue: false,
           conditionals: [],
           label: {
@@ -5119,7 +5132,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
           conditionals: [
             {
               type: ConditionalType.SHOW,
-              conditional: field("recommender.none").isFalsy()
+              conditional: event.declaration("recommender.none").isFalsy()
             }
           ],
           label: {
@@ -5135,7 +5148,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
           conditionals: [
             {
               type: ConditionalType.SHOW,
-              conditional: field("recommender.none").isFalsy()
+              conditional: event.declaration("recommender.none").isFalsy()
             }
           ],
           label: {
@@ -5568,10 +5581,10 @@ var tennisClubMembershipEvent = defineConfig({
         id: "advancedSearch.form.registrationDetails"
       },
       fields: [
-        event("legalStatuses.REGISTERED.createdAtLocation").exact(),
-        event("legalStatuses.REGISTERED.acceptedAt").range(),
-        event("status").exact(),
-        event("updatedAt").range()
+        event.metadata("legalStatuses.REGISTERED.createdAtLocation").exact(),
+        event.metadata("legalStatuses.REGISTERED.acceptedAt").range(),
+        event.metadata("status").exact(),
+        event.metadata("updatedAt").range()
       ]
     },
     {
@@ -5581,9 +5594,9 @@ var tennisClubMembershipEvent = defineConfig({
         id: "event.tennis-club-membership.search.applicants"
       },
       fields: [
-        field("applicant.name").fuzzy(),
-        field("applicant.dob").range(),
-        field("applicant.email").exact()
+        event.declaration("applicant.name").fuzzy(),
+        event.declaration("applicant.dob").range(),
+        event.declaration("applicant.email").exact()
       ]
     },
     {
@@ -5592,7 +5605,7 @@ var tennisClubMembershipEvent = defineConfig({
         description: "Recommender details search field section title",
         id: "event.tennis-club-membership.search.recommender"
       },
-      fields: [field("recommender.name").fuzzy()]
+      fields: [event.declaration("recommender.name").fuzzy()]
     }
   ],
   declaration: TENNIS_CLUB_DECLARATION_FORM
@@ -5927,10 +5940,10 @@ var footballClubMembershipEvent = defineConfig({
         id: "advancedSearch.form.registrationDetails"
       },
       fields: [
-        event("legalStatuses.REGISTERED.createdAtLocation").exact(),
-        event("legalStatuses.REGISTERED.acceptedAt").range(),
-        event("status").exact(),
-        event("updatedAt").range()
+        event.metadata("legalStatuses.REGISTERED.createdAtLocation").exact(),
+        event.metadata("legalStatuses.REGISTERED.acceptedAt").range(),
+        event.metadata("status").exact(),
+        event.metadata("updatedAt").range()
       ]
     },
     {
@@ -5940,9 +5953,9 @@ var footballClubMembershipEvent = defineConfig({
         id: "event.football-club-membership.search.applicants"
       },
       fields: [
-        field("applicant.name").fuzzy(),
-        field("applicant.dob").range(),
-        field("applicant.email").exact()
+        event.declaration("applicant.name").fuzzy(),
+        event.declaration("applicant.dob").range(),
+        event.declaration("applicant.email").exact()
       ]
     },
     {
@@ -5951,7 +5964,7 @@ var footballClubMembershipEvent = defineConfig({
         description: "Recommender details search field section title",
         id: "event.football-club-membership.search.recommender"
       },
-      fields: [field("recommender.name").fuzzy()]
+      fields: [event.declaration("recommender.name").fuzzy()]
     }
   ],
   declaration: TENNIS_CLUB_DECLARATION_FORM
@@ -6073,7 +6086,9 @@ var mother = defineFormPage({
       conditionals: [
         {
           type: "SHOW",
-          conditional: not(field("mother.dobUnknown").isEqualTo(true))
+          conditional: not(
+            event.declaration("mother.dobUnknown").isEqualTo(true)
+          )
         }
       ]
     },
@@ -6090,12 +6105,12 @@ var mother = defineFormPage({
       analytics: true,
       label: generateTranslationConfig("Age of mother"),
       configuration: {
-        asOfDate: field("child.dob")
+        asOfDate: event.declaration("child.dob")
       },
       conditionals: [
         {
           type: "SHOW",
-          conditional: field("mother.dobUnknown").isEqualTo(true)
+          conditional: event.declaration("mother.dobUnknown").isEqualTo(true)
         }
       ]
     },
@@ -6233,7 +6248,7 @@ var PRINT_DIGITAL_ID_CERTIFICATE_FORM = defineActionForm({
             id: "event.digital-identity.certificate.fetch.label"
           },
           configuration: {
-            trigger: field("identity.http-button"),
+            trigger: event.declaration("identity.http-button"),
             url: "/api/digital-identity/certificate",
             timeout: 5e3,
             method: "POST",
@@ -6257,15 +6272,15 @@ var PRINT_DIGITAL_ID_CERTIFICATE_FORM = defineActionForm({
             {
               type: ConditionalType.ENABLE,
               conditional: and(
-                field("identity.http-fetch").isUndefined(),
+                event.declaration("identity.http-fetch").isUndefined(),
                 user.isOnline()
               )
             },
             {
               type: ConditionalType.SHOW,
               conditional: and(
-                field("identity.http-fetch").get("loading").isFalsy(),
-                field("identity.http-fetch").get("data").isFalsy()
+                event.declaration("identity.http-fetch").get("loading").isFalsy(),
+                event.declaration("identity.http-fetch").get("data").isFalsy()
               )
             }
           ],
@@ -6293,7 +6308,7 @@ var PRINT_DIGITAL_ID_CERTIFICATE_FORM = defineActionForm({
             },
             {
               type: ConditionalType.SHOW,
-              conditional: field("identity.http-fetch").get("loading").isEqualTo(true)
+              conditional: event.declaration("identity.http-fetch").get("loading").isEqualTo(true)
             }
           ],
           configuration: {
@@ -6320,7 +6335,9 @@ var PRINT_DIGITAL_ID_CERTIFICATE_FORM = defineActionForm({
             },
             {
               type: ConditionalType.SHOW,
-              conditional: not(field("identity.certificateId").isFalsy())
+              conditional: not(
+                event.declaration("identity.certificateId").isFalsy()
+              )
             }
           ],
           configuration: {
@@ -6335,7 +6352,7 @@ var PRINT_DIGITAL_ID_CERTIFICATE_FORM = defineActionForm({
         {
           id: "identity.certificateId",
           type: FieldType.TEXT,
-          parent: field("identity.http-fetch"),
+          parent: event.declaration("identity.http-fetch"),
           label: {
             defaultMessage: "Certificate ID",
             description: "Issued digital identity certificate identifier",
@@ -6347,7 +6364,7 @@ var PRINT_DIGITAL_ID_CERTIFICATE_FORM = defineActionForm({
               conditional: never()
             }
           ],
-          value: field("identity.http-fetch").get("data.certificateId")
+          value: event.declaration("identity.http-fetch").get("data.certificateId")
         }
       ]
     }