@opencrvs/toolkit 1.9.6-rc.cb62364 → 1.9.6-rc.d73f8b6

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

@@ -1768,7 +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<{
+    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
         $$date: z.ZodOptional<z.ZodLiteral<"now">>;
         $$time: z.ZodOptional<z.ZodLiteral<"now">>;
     }, "strip", z.ZodTypeAny, {
@@ -1777,9 +1777,7 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     }, {
         $$date?: "now" | undefined;
         $$time?: "now" | undefined;
-    }>, {
-        $$date: "now";
-    }, {
+    }>, z.ZodLiteral<"$$date">]>, z.ZodLiteral<"$$time">]>, "$$date", "$$date" | "$$time" | {
         $$date?: "now" | undefined;
         $$time?: "now" | undefined;
     }>, z.ZodString]>>;
@@ -1839,9 +1837,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;
@@ -2284,7 +2280,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<{
+    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
         $$date: z.ZodOptional<z.ZodLiteral<"now">>;
         $$time: z.ZodOptional<z.ZodLiteral<"now">>;
     }, "strip", z.ZodTypeAny, {
@@ -2293,9 +2289,7 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     }, {
         $$date?: "now" | undefined;
         $$time?: "now" | undefined;
-    }>, {
-        $$time: "now";
-    }, {
+    }>, z.ZodLiteral<"$$date">]>, z.ZodLiteral<"$$time">]>, "$$time", "$$date" | "$$time" | {
         $$date?: "now" | undefined;
         $$time?: "now" | undefined;
     }>, z.ZodString]>>;
@@ -2358,9 +2352,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;

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/conditionals/index.js

@@ -112,7 +112,7 @@ var import_zod2 = require("zod");
 var SerializedNowDateTime = import_zod2.z.object({
   $$date: import_zod2.z.literal("now").optional(),
   $$time: import_zod2.z.literal("now").optional()
-});
+}).or(import_zod2.z.literal("$$date")).or(import_zod2.z.literal("$$time"));
 function todayDateTimeValueSerializer() {
   return {
     $$date: "now",

package/dist/events/index.js

@@ -1911,7 +1911,7 @@ var import_zod15 = require("zod");
 var SerializedNowDateTime = import_zod15.z.object({
   $$date: import_zod15.z.literal("now").optional(),
   $$time: import_zod15.z.literal("now").optional()
-});
+}).or(import_zod15.z.literal("$$date")).or(import_zod15.z.literal("$$time"));
 function todayDateTimeValueSerializer() {
   return {
     $$date: "now",
@@ -2052,9 +2052,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: "object" }).describe("Default date value(yyyy-MM-dd)"),
+  defaultValue: SerializedNowDateTime.transform(() => "$$date").or(DateValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default date value(yyyy-MM-dd)"),
   configuration: import_zod16.z.object({
     notice: TranslationConfig.describe(
       "Text to display above the date input"
@@ -2072,9 +2070,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: "object" }).describe("Default time value (HH-mm)"),
+  defaultValue: SerializedNowDateTime.transform(() => "$$time").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(
@@ -8897,8 +8893,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;
@@ -8907,8 +8907,7 @@ function isFieldValueWithoutTemplates(value) {
   if (isTemplateVariable(value)) {
     return false;
   }
-  if (typeof value === "object" && value !== null && // template variable can exist in both keys and values of an object
-  (Object.values(value).some((val) => isTemplateVariable(val)) || Object.keys(value).some((val) => isTemplateVariable(val)))) {
+  if (typeof value === "object" && value !== null && Object.values(value).some((val) => isTemplateVariable(val))) {
     return false;
   }
   return true;

package/dist/notification/index.js

@@ -1433,7 +1433,7 @@ var import_zod15 = require("zod");
 var SerializedNowDateTime = import_zod15.z.object({
   $$date: import_zod15.z.literal("now").optional(),
   $$time: import_zod15.z.literal("now").optional()
-});
+}).or(import_zod15.z.literal("$$date")).or(import_zod15.z.literal("$$time"));
 function todayDateTimeValueSerializer() {
   return {
     $$date: "now",
@@ -1574,9 +1574,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: "object" }).describe("Default date value(yyyy-MM-dd)"),
+  defaultValue: SerializedNowDateTime.transform(() => "$$date").or(DateValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default date value(yyyy-MM-dd)"),
   configuration: import_zod16.z.object({
     notice: TranslationConfig.describe(
       "Text to display above the date input"
@@ -1594,9 +1592,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: "object" }).describe("Default time value (HH-mm)"),
+  defaultValue: SerializedNowDateTime.transform(() => "$$time").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(

package/package.json

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