@opencrvs/toolkit 1.9.6-rc.489ac9f → 1.9.6-rc.5fa8b99

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.ZodOptional<z.ZodLiteral<"now">>;
-        $$time: z.ZodOptional<z.ZodLiteral<"now">>;
-    }, "strip", z.ZodTypeAny, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, {
-        $$date: "now";
-    }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, 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" | undefined;
-        $$time?: "now" | undefined;
-    } | 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.ZodOptional<z.ZodLiteral<"now">>;
-        $$time: z.ZodOptional<z.ZodLiteral<"now">>;
-    }, "strip", z.ZodTypeAny, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, {
-        $$time: "now";
-    }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, 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" | undefined;
-        $$time?: "now" | undefined;
-    } | 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").optional(),
-  $$time: import_zod2.z.literal("now").optional()
-});
+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").optional(),
-  $$time: import_zod15.z.literal("now").optional()
-});
+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: "object" }).describe("Default date value(yyyy-MM-dd)"),
+  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: "object" }).describe("Default time value (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(
@@ -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;
@@ -8907,8 +8901,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

@@ -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").optional(),
-  $$time: import_zod15.z.literal("now").optional()
-});
+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: "object" }).describe("Default date value(yyyy-MM-dd)"),
+  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: "object" }).describe("Default time value (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(

package/package.json

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