@opencrvs/toolkit 1.9.6-rc.3c3bfa8 → 1.9.6-rc.3f7d879

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

@@ -1768,21 +1768,7 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     analytics: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
 }, {
     type: z.ZodLiteral<"DATE">;
-    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
-        $$date: z.ZodLiteral<"now">;
-        $$time: z.ZodLiteral<"now">;
-    }, "strip", z.ZodTypeAny, {
-        $$date: "now";
-        $$time: "now";
-    }, {
-        $$date: "now";
-        $$time: "now";
-    }>, {
-        $$date: "now";
-    }, {
-        $$date: "now";
-        $$time: "now";
-    }>, z.ZodString]>>;
+    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"$$now">, z.ZodString]>>;
     configuration: z.ZodOptional<z.ZodObject<{
         notice: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {
             id: string;
@@ -1839,9 +1825,7 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
-    defaultValue?: string | {
-        $$date: "now";
-    } | undefined;
+    defaultValue?: string | undefined;
     configuration?: {
         notice?: TranslationConfig | undefined;
     } | undefined;
@@ -1906,10 +1890,7 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
-    defaultValue?: string | {
-        $$date: "now";
-        $$time: "now";
-    } | undefined;
+    defaultValue?: string | undefined;
     configuration?: {
         notice?: {
             id: string;
@@ -2284,21 +2265,7 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     analytics: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
 }, {
     type: z.ZodLiteral<"TIME">;
-    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
-        $$date: z.ZodLiteral<"now">;
-        $$time: z.ZodLiteral<"now">;
-    }, "strip", z.ZodTypeAny, {
-        $$date: "now";
-        $$time: "now";
-    }, {
-        $$date: "now";
-        $$time: "now";
-    }>, {
-        $$time: "now";
-    }, {
-        $$date: "now";
-        $$time: "now";
-    }>, z.ZodString]>>;
+    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"$$now">, z.ZodString]>>;
     configuration: z.ZodOptional<z.ZodObject<{
         use12HourFormat: z.ZodOptional<z.ZodBoolean>;
         notice: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {
@@ -2358,9 +2325,7 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
-    defaultValue?: string | {
-        $$time: "now";
-    } | undefined;
+    defaultValue?: string | undefined;
     configuration?: {
         notice?: TranslationConfig | undefined;
         use12HourFormat?: boolean | undefined;
@@ -2426,10 +2391,7 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
-    defaultValue?: string | {
-        $$date: "now";
-        $$time: "now";
-    } | undefined;
+    defaultValue?: string | undefined;
     configuration?: {
         notice?: {
             id: string;

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

@@ -38,6 +38,7 @@ export declare const AgeUpdateValue: z.ZodNullable<z.ZodOptional<z.ZodObject<{
     asOfDateRef: string;
 }>>>;
 export declare const TimeValue: z.ZodString;
+export type TimeValue = z.infer<typeof TimeValue>;
 export declare const DatetimeValue: z.ZodString;
 export declare const SelectDateRangeValue: z.ZodEnum<["last7Days", "last30Days", "last90Days", "last365Days"]>;
 export declare const DateRangeFieldValue: z.ZodUnion<[z.ZodObject<{

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

@@ -8,8 +8,6 @@ import { FieldValue } from './FieldValue';
  * Available system variables for configuration.
  */
 export type SystemVariables = {
-    $$date: string;
-    $$time: string;
     user: {
         id: string;
         province?: string;

package/dist/conditionals/index.js

@@ -109,15 +109,9 @@ function omitKeyDeep(obj, keyToRemove) {
 
 // ../commons/src/events/serializers/date/serializer.ts
 var import_zod2 = require("zod");
-var SerializedNowDateTime = import_zod2.z.object({
-  $$date: import_zod2.z.literal("now"),
-  $$time: import_zod2.z.literal("now")
-});
+var SerializedNowDateTime = import_zod2.z.literal("$$now");
 function todayDateTimeValueSerializer() {
-  return {
-    $$date: "now",
-    $$time: "now"
-  };
+  return "$$now";
 }
 
 // ../commons/src/conditionals/conditionals.ts

package/dist/events/index.js

@@ -1908,15 +1908,9 @@ var SearchScopeAccessLevels = {
 
 // ../commons/src/events/serializers/date/serializer.ts
 var import_zod15 = require("zod");
-var SerializedNowDateTime = import_zod15.z.object({
-  $$date: import_zod15.z.literal("now"),
-  $$time: import_zod15.z.literal("now")
-});
+var SerializedNowDateTime = import_zod15.z.literal("$$now");
 function todayDateTimeValueSerializer() {
-  return {
-    $$date: "now",
-    $$time: "now"
-  };
+  return "$$now";
 }
 
 // ../commons/src/events/FieldConfig.ts
@@ -2052,9 +2046,7 @@ var EmailField = BaseField.extend({
 });
 var DateField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.DATE),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$date: "now"
-  })).or(DateValue).optional().openapi({ effectType: "input", type: "string" }).describe("A single time input (HH-mm)"),
+  defaultValue: SerializedNowDateTime.or(DateValue).optional().openapi({ effectType: "input", type: "string" }).describe("Default date value(yyyy-MM-dd)"),
   configuration: import_zod16.z.object({
     notice: TranslationConfig.describe(
       "Text to display above the date input"
@@ -2072,9 +2064,7 @@ var AgeField = BaseField.extend({
 }).describe("An age input field which uses the current date as the asOfDate");
 var TimeField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.TIME),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$time: "now"
-  })).or(TimeValue).optional().openapi({ effectType: "input", type: "string" }).describe("A single time input (HH-mm)"),
+  defaultValue: SerializedNowDateTime.or(TimeValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default time value (HH-mm)"),
   configuration: import_zod16.z.object({
     use12HourFormat: import_zod16.z.boolean().optional().describe("Whether to use 12-hour format"),
     notice: TranslationConfig.describe(
@@ -5714,7 +5704,7 @@ function field(fieldId, options = {}) {
 
 // ../commons/src/fixtures/forms.ts
 var import_date_fns3 = require("date-fns");
-var PRINT_CERTIFICATE_FORM = {
+var PRINT_CERTIFICATE_FORM = defineActionForm({
   label: {
     id: "event.tennis-club-membership.action.certificate.form.label",
     defaultMessage: "Tennis club membership certificate collector",
@@ -6370,7 +6360,7 @@ var PRINT_CERTIFICATE_FORM = {
       }
     }
   ]
-};
+});
 var TENNIS_CLUB_DECLARATION_REVIEW = {
   title: {
     id: "event.tennis-club-membership.action.declare.form.review.title",
@@ -6415,7 +6405,7 @@ function isDomesticAddress() {
     field("addressType").isEqualTo(AddressType.DOMESTIC)
   );
 }
-var TENNIS_CLUB_DECLARATION_FORM = {
+var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
   label: {
     id: "event.tennis-club-membership.action.declare.form.label",
     defaultMessage: "Tennis club membership application",
@@ -6900,7 +6890,7 @@ var TENNIS_CLUB_DECLARATION_FORM = {
       // Intentional always-true page conditional to exercise interactions between page-level and field-level conditionals in tests
     }
   ]
-};
+});
 var statusOptions = [
   {
     value: "ALL",
@@ -7709,7 +7699,7 @@ var footballClubMembershipEvent = defineConfig({
 });
 
 // ../commons/src/fixtures/library-membership-event.ts
-var libraryMembershipForm = {
+var libraryMembershipForm = defineDeclarationForm({
   label: {
     id: "event.library-membership.action.declare.form.label",
     defaultMessage: "Library membership application",
@@ -7749,7 +7739,7 @@ var libraryMembershipForm = {
       ]
     }
   ]
-};
+});
 var libraryMembershipEvent = defineConfig({
   id: "library-membership",
   label: {
@@ -7775,7 +7765,7 @@ function generateTranslationConfig(message) {
     id: message
   };
 }
-var child = {
+var child = defineFormPage({
   id: "child",
   type: PageTypes.enum.FORM,
   title: generateTranslationConfig("Child's details"),
@@ -7798,8 +7788,8 @@ var child = {
       label: generateTranslationConfig("Date of birth")
     }
   ]
-};
-var mother = {
+});
+var mother = defineFormPage({
   id: "mother",
   type: PageTypes.enum.FORM,
   title: generateTranslationConfig("Mother's details"),
@@ -7871,7 +7861,7 @@ var mother = {
       validation: []
     }
   ]
-};
+});
 var BIRTH_DECLARATION_REVIEW = {
   title: generateTranslationConfig(
     "{child.name.firstname, select, __EMPTY__ {Birth declaration} other {{child.name.surname, select, __EMPTY__ {Birth declaration for {child.name.firstname}} other {Birth declaration for {child.name.firstname} {child.name.surname}}}}}"
@@ -7892,10 +7882,10 @@ var BIRTH_DECLARATION_REVIEW = {
     }
   ]
 };
-var BIRTH_DECLARATION_FORM = {
+var BIRTH_DECLARATION_FORM = defineDeclarationForm({
   label: generateTranslationConfig("Birth decalration form"),
   pages: [child, mother]
-};
+});
 var v2BirthEvent = defineConfig({
   id: BIRTH_EVENT,
   title: generateTranslationConfig(
@@ -7932,7 +7922,7 @@ var v2BirthEvent = defineConfig({
 });
 
 // ../commons/src/fixtures/digital-identity-issuance-event.ts
-var PRINT_DIGITAL_ID_CERTIFICATE_FORM = {
+var PRINT_DIGITAL_ID_CERTIFICATE_FORM = defineActionForm({
   label: {
     id: "event.digital-identity.action.certificate.form.label",
     defaultMessage: "Digital identity certificate printer",
@@ -8076,8 +8066,8 @@ var PRINT_DIGITAL_ID_CERTIFICATE_FORM = {
       ]
     }
   ]
-};
-var digitalIdentityForm = {
+});
+var digitalIdentityForm = defineDeclarationForm({
   label: {
     id: "event.digital-identity.action.declare.form.label",
     defaultMessage: "Digital identity issuance",
@@ -8117,7 +8107,7 @@ var digitalIdentityForm = {
       ]
     }
   ]
-};
+});
 var digitalIdentityEvent = defineConfig({
   id: "digital-identity",
   label: {
@@ -8897,8 +8887,12 @@ var window2 = () => ({
     }
   }
 });
+var KNOWN_SYSTEM_KEYS = ["$$date", "$$time"];
 function isTemplateVariable(value) {
-  return typeof value === "string" && value.startsWith("$");
+  if (typeof value === "string" && KNOWN_SYSTEM_KEYS.includes(value)) {
+    return true;
+  }
+  return false;
 }
 function isFieldValue(value) {
   return FieldValue.safeParse(value).success;

package/dist/notification/index.js

@@ -1430,15 +1430,9 @@ var SearchQuery = import_zod14.z.object({
 
 // ../commons/src/events/serializers/date/serializer.ts
 var import_zod15 = require("zod");
-var SerializedNowDateTime = import_zod15.z.object({
-  $$date: import_zod15.z.literal("now"),
-  $$time: import_zod15.z.literal("now")
-});
+var SerializedNowDateTime = import_zod15.z.literal("$$now");
 function todayDateTimeValueSerializer() {
-  return {
-    $$date: "now",
-    $$time: "now"
-  };
+  return "$$now";
 }
 
 // ../commons/src/events/FieldConfig.ts
@@ -1574,9 +1568,7 @@ var EmailField = BaseField.extend({
 });
 var DateField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.DATE),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$date: "now"
-  })).or(DateValue).optional().openapi({ effectType: "input", type: "string" }).describe("A single time input (HH-mm)"),
+  defaultValue: SerializedNowDateTime.or(DateValue).optional().openapi({ effectType: "input", type: "string" }).describe("Default date value(yyyy-MM-dd)"),
   configuration: import_zod16.z.object({
     notice: TranslationConfig.describe(
       "Text to display above the date input"
@@ -1594,9 +1586,7 @@ var AgeField = BaseField.extend({
 }).describe("An age input field which uses the current date as the asOfDate");
 var TimeField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.TIME),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$time: "now"
-  })).or(TimeValue).optional().openapi({ effectType: "input", type: "string" }).describe("A single time input (HH-mm)"),
+  defaultValue: SerializedNowDateTime.or(TimeValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default time value (HH-mm)"),
   configuration: import_zod16.z.object({
     use12HourFormat: import_zod16.z.boolean().optional().describe("Whether to use 12-hour format"),
     notice: TranslationConfig.describe(
@@ -2699,6 +2689,11 @@ var EventConfig = import_zod27.z.object({
   ref: "EventConfig"
 }).describe("Configuration defining an event type.");
 
+// ../commons/src/events/EventConfigInput.ts
+var defineDeclarationForm = (form) => DeclarationFormConfig.parse(form);
+var defineActionForm = (actionForm) => ActionFormConfig.parse(actionForm);
+var defineFormPage = (formPage) => FormPageConfig.parse(formPage);
+
 // ../commons/src/events/WorkqueueConfig.ts
 var import_zod31 = require("zod");
 
@@ -3962,7 +3957,7 @@ function field(fieldId, options = {}) {
 
 // ../commons/src/fixtures/forms.ts
 var import_date_fns3 = require("date-fns");
-var PRINT_CERTIFICATE_FORM = {
+var PRINT_CERTIFICATE_FORM = defineActionForm({
   label: {
     id: "event.tennis-club-membership.action.certificate.form.label",
     defaultMessage: "Tennis club membership certificate collector",
@@ -4618,7 +4613,7 @@ var PRINT_CERTIFICATE_FORM = {
       }
     }
   ]
-};
+});
 var TENNIS_CLUB_DECLARATION_REVIEW = {
   title: {
     id: "event.tennis-club-membership.action.declare.form.review.title",
@@ -4663,7 +4658,7 @@ function isDomesticAddress() {
     field("addressType").isEqualTo(AddressType.DOMESTIC)
   );
 }
-var TENNIS_CLUB_DECLARATION_FORM = {
+var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
   label: {
     id: "event.tennis-club-membership.action.declare.form.label",
     defaultMessage: "Tennis club membership application",
@@ -5148,7 +5143,7 @@ var TENNIS_CLUB_DECLARATION_FORM = {
       // Intentional always-true page conditional to exercise interactions between page-level and field-level conditionals in tests
     }
   ]
-};
+});
 var statusOptions = [
   {
     value: "ALL",
@@ -5957,7 +5952,7 @@ var footballClubMembershipEvent = defineConfig({
 });
 
 // ../commons/src/fixtures/library-membership-event.ts
-var libraryMembershipForm = {
+var libraryMembershipForm = defineDeclarationForm({
   label: {
     id: "event.library-membership.action.declare.form.label",
     defaultMessage: "Library membership application",
@@ -5997,7 +5992,7 @@ var libraryMembershipForm = {
       ]
     }
   ]
-};
+});
 var libraryMembershipEvent = defineConfig({
   id: "library-membership",
   label: {
@@ -6023,7 +6018,7 @@ function generateTranslationConfig(message) {
     id: message
   };
 }
-var child = {
+var child = defineFormPage({
   id: "child",
   type: PageTypes.enum.FORM,
   title: generateTranslationConfig("Child's details"),
@@ -6046,8 +6041,8 @@ var child = {
       label: generateTranslationConfig("Date of birth")
     }
   ]
-};
-var mother = {
+});
+var mother = defineFormPage({
   id: "mother",
   type: PageTypes.enum.FORM,
   title: generateTranslationConfig("Mother's details"),
@@ -6119,7 +6114,7 @@ var mother = {
       validation: []
     }
   ]
-};
+});
 var BIRTH_DECLARATION_REVIEW = {
   title: generateTranslationConfig(
     "{child.name.firstname, select, __EMPTY__ {Birth declaration} other {{child.name.surname, select, __EMPTY__ {Birth declaration for {child.name.firstname}} other {Birth declaration for {child.name.firstname} {child.name.surname}}}}}"
@@ -6140,10 +6135,10 @@ var BIRTH_DECLARATION_REVIEW = {
     }
   ]
 };
-var BIRTH_DECLARATION_FORM = {
+var BIRTH_DECLARATION_FORM = defineDeclarationForm({
   label: generateTranslationConfig("Birth decalration form"),
   pages: [child, mother]
-};
+});
 var v2BirthEvent = defineConfig({
   id: BIRTH_EVENT,
   title: generateTranslationConfig(
@@ -6180,7 +6175,7 @@ var v2BirthEvent = defineConfig({
 });
 
 // ../commons/src/fixtures/digital-identity-issuance-event.ts
-var PRINT_DIGITAL_ID_CERTIFICATE_FORM = {
+var PRINT_DIGITAL_ID_CERTIFICATE_FORM = defineActionForm({
   label: {
     id: "event.digital-identity.action.certificate.form.label",
     defaultMessage: "Digital identity certificate printer",
@@ -6324,8 +6319,8 @@ var PRINT_DIGITAL_ID_CERTIFICATE_FORM = {
       ]
     }
   ]
-};
-var digitalIdentityForm = {
+});
+var digitalIdentityForm = defineDeclarationForm({
   label: {
     id: "event.digital-identity.action.declare.form.label",
     defaultMessage: "Digital identity issuance",
@@ -6365,7 +6360,7 @@ var digitalIdentityForm = {
       ]
     }
   ]
-};
+});
 var digitalIdentityEvent = defineConfig({
   id: "digital-identity",
   label: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/toolkit",
-  "version": "1.9.6-rc.3c3bfa8",
+  "version": "1.9.6-rc.3f7d879",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {