@opencrvs/toolkit 1.9.6-rc.78b4928 → 1.9.6-rc.7fd066c

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

@@ -1768,15 +1768,20 @@ 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.ZodObject<{
-        $$date: z.ZodLiteral<"now">;
-        $$time: z.ZodLiteral<"now">;
+    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";
-        $$time: "now";
+        $$date?: "now" | undefined;
+        $$time?: "now" | undefined;
     }, {
+        $$date?: "now" | undefined;
+        $$time?: "now" | undefined;
+    }>, {
         $$date: "now";
-        $$time: "now";
+    }, {
+        $$date?: "now" | undefined;
+        $$time?: "now" | undefined;
     }>, z.ZodString]>>;
     configuration: z.ZodOptional<z.ZodObject<{
         notice: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {
@@ -1836,7 +1841,6 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     analytics?: boolean | undefined;
     defaultValue?: string | {
         $$date: "now";
-        $$time: "now";
     } | undefined;
     configuration?: {
         notice?: TranslationConfig | undefined;
@@ -1903,8 +1907,8 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
     defaultValue?: string | {
-        $$date: "now";
-        $$time: "now";
+        $$date?: "now" | undefined;
+        $$time?: "now" | undefined;
     } | undefined;
     configuration?: {
         notice?: {
@@ -2280,15 +2284,20 @@ 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.ZodObject<{
-        $$date: z.ZodLiteral<"now">;
-        $$time: z.ZodLiteral<"now">;
+    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";
-        $$time: "now";
+        $$date?: "now" | undefined;
+        $$time?: "now" | undefined;
     }, {
-        $$date: "now";
+        $$date?: "now" | undefined;
+        $$time?: "now" | undefined;
+    }>, {
         $$time: "now";
+    }, {
+        $$date?: "now" | undefined;
+        $$time?: "now" | undefined;
     }>, z.ZodString]>>;
     configuration: z.ZodOptional<z.ZodObject<{
         use12HourFormat: z.ZodOptional<z.ZodBoolean>;
@@ -2350,7 +2359,6 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
     defaultValue?: string | {
-        $$date: "now";
         $$time: "now";
     } | undefined;
     configuration?: {
@@ -2419,8 +2427,8 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
     defaultValue?: string | {
-        $$date: "now";
-        $$time: "now";
+        $$date?: "now" | undefined;
+        $$time?: "now" | undefined;
     } | undefined;
     configuration?: {
         notice?: {
@@ -2432,6 +2440,7 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     } | undefined;
 }>;
 export type TimeField = z.infer<typeof TimeField>;
+export type TimeField2 = z.input<typeof TimeField>;
 declare const DateRangeField: z.ZodObject<z.objectUtil.extendShape<{
     id: z.ZodEffects<z.ZodString, string, string>;
     label: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {

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

@@ -8,6 +8,8 @@ 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

@@ -110,8 +110,8 @@ 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")
+  $$date: import_zod2.z.literal("now").optional(),
+  $$time: import_zod2.z.literal("now").optional()
 });
 function todayDateTimeValueSerializer() {
   return {

package/dist/events/index.js

@@ -1909,8 +1909,8 @@ 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")
+  $$date: import_zod15.z.literal("now").optional(),
+  $$time: import_zod15.z.literal("now").optional()
 });
 function todayDateTimeValueSerializer() {
   return {
@@ -2052,7 +2052,9 @@ var EmailField = BaseField.extend({
 });
 var DateField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.DATE),
-  defaultValue: SerializedNowDateTime.or(DateValue).optional(),
+  defaultValue: SerializedNowDateTime.transform(() => ({
+    $$date: "now"
+  })).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"
@@ -2070,7 +2072,9 @@ 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.or(TimeValue).optional(),
+  defaultValue: SerializedNowDateTime.transform(() => ({
+    $$time: "now"
+  })).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(
@@ -8903,7 +8907,8 @@ function isFieldValueWithoutTemplates(value) {
   if (isTemplateVariable(value)) {
     return false;
   }
-  if (typeof value === "object" && value !== null && Object.values(value).some((val) => isTemplateVariable(val))) {
+  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)))) {
     return false;
   }
   return true;

package/dist/notification/index.js

@@ -1431,8 +1431,8 @@ 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")
+  $$date: import_zod15.z.literal("now").optional(),
+  $$time: import_zod15.z.literal("now").optional()
 });
 function todayDateTimeValueSerializer() {
   return {
@@ -1574,7 +1574,9 @@ var EmailField = BaseField.extend({
 });
 var DateField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.DATE),
-  defaultValue: SerializedNowDateTime.or(DateValue).optional(),
+  defaultValue: SerializedNowDateTime.transform(() => ({
+    $$date: "now"
+  })).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"
@@ -1592,7 +1594,9 @@ 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.or(TimeValue).optional(),
+  defaultValue: SerializedNowDateTime.transform(() => ({
+    $$time: "now"
+  })).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.78b4928",
+  "version": "1.9.6-rc.7fd066c",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {