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

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

@@ -1768,7 +1768,13 @@ 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.ZodLiteral<"$$now">, z.ZodString]>>;
+    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
+        $$now: z.ZodLiteral<true>;
+    }, "strip", z.ZodTypeAny, {
+        $$now: true;
+    }, {
+        $$now: true;
+    }>, z.ZodString]>>;
     configuration: z.ZodOptional<z.ZodObject<{
         notice: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {
             id: string;
@@ -1825,7 +1831,9 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
-    defaultValue?: string | undefined;
+    defaultValue?: string | {
+        $$now: true;
+    } | undefined;
     configuration?: {
         notice?: TranslationConfig | undefined;
     } | undefined;
@@ -1890,7 +1898,9 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
-    defaultValue?: string | undefined;
+    defaultValue?: string | {
+        $$now: true;
+    } | undefined;
     configuration?: {
         notice?: {
             id: string;
@@ -2265,7 +2275,13 @@ 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.ZodLiteral<"$$now">, z.ZodString]>>;
+    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
+        $$now: z.ZodLiteral<true>;
+    }, "strip", z.ZodTypeAny, {
+        $$now: true;
+    }, {
+        $$now: true;
+    }>, z.ZodString]>>;
     configuration: z.ZodOptional<z.ZodObject<{
         use12HourFormat: z.ZodOptional<z.ZodBoolean>;
         notice: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {
@@ -2325,7 +2341,9 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
-    defaultValue?: string | undefined;
+    defaultValue?: string | {
+        $$now: true;
+    } | undefined;
     configuration?: {
         notice?: TranslationConfig | undefined;
         use12HourFormat?: boolean | undefined;
@@ -2391,7 +2409,9 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
-    defaultValue?: string | undefined;
+    defaultValue?: string | {
+        $$now: true;
+    } | undefined;
     configuration?: {
         notice?: {
             id: string;

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

@@ -230,6 +230,15 @@ export declare function mapFieldTypeToZod(field: FieldConfig, actionType?: Actio
 }, {
     data?: any;
 }>>> | z.ZodObject<{
+    numericValue: z.ZodNumber;
+    unit: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    numericValue: number;
+    unit: string;
+}, {
+    numericValue: number;
+    unit: string;
+}> | z.ZodObject<{
     numericValue: z.ZodOptional<z.ZodNumber>;
     unit: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
@@ -239,6 +248,15 @@ export declare function mapFieldTypeToZod(field: FieldConfig, actionType?: Actio
     numericValue?: number | undefined;
     unit?: string | undefined;
 }> | z.ZodOptional<z.ZodNullable<z.ZodObject<{
+    numericValue: z.ZodNumber;
+    unit: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    numericValue: number;
+    unit: string;
+}, {
+    numericValue: number;
+    unit: string;
+}>>> | z.ZodOptional<z.ZodNullable<z.ZodObject<{
     numericValue: z.ZodOptional<z.ZodNumber>;
     unit: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {

package/dist/conditionals/index.js

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

package/dist/events/index.js

@@ -1908,9 +1908,11 @@ var SearchScopeAccessLevels = {
 
 // ../commons/src/events/serializers/date/serializer.ts
 var import_zod15 = require("zod");
-var SerializedNowDateTime = import_zod15.z.literal("$$now");
+var SerializedNowDateTime = import_zod15.z.object({
+  $$now: import_zod15.z.literal(true)
+});
 function todayDateTimeValueSerializer() {
-  return "$$now";
+  return { $$now: true };
 }
 
 // ../commons/src/events/FieldConfig.ts
@@ -3007,7 +3009,7 @@ function mapFieldTypeToZod(field3, actionType) {
       schema = NumberFieldValue;
       break;
     case FieldType.NUMBER_WITH_UNIT:
-      schema = NumberWithUnitFieldUpdateValue;
+      schema = field3.required ? NumberWithUnitFieldValue : NumberWithUnitFieldUpdateValue;
       break;
     case FieldType.CHECKBOX:
       schema = CheckboxFieldValue;
@@ -3398,7 +3400,7 @@ function isFieldVisible(field3, form, context) {
 }
 function isFieldEmptyAndNotRequired(field3, form) {
   const fieldValue = form[field3.id];
-  return !field3.required && (fieldValue === void 0 || fieldValue === "");
+  return !field3.required && (fieldValue === void 0 || fieldValue === "" || fieldValue && typeof fieldValue === "object" && Object.values(fieldValue).every((v) => v === void 0 || v === ""));
 }
 function isFieldEnabled(field3, form, context) {
   return isFieldConditionMet(field3, form, ConditionalType.ENABLE, context);
@@ -8887,12 +8889,8 @@ var window2 = () => ({
     }
   }
 });
-var KNOWN_SYSTEM_KEYS = ["$$date", "$$time"];
 function isTemplateVariable(value) {
-  if (typeof value === "string" && KNOWN_SYSTEM_KEYS.includes(value)) {
-    return true;
-  }
-  return false;
+  return typeof value === "string" && value.startsWith("$");
 }
 function isFieldValue(value) {
   return FieldValue.safeParse(value).success;

package/dist/notification/index.js

@@ -1430,9 +1430,11 @@ var SearchQuery = import_zod14.z.object({
 
 // ../commons/src/events/serializers/date/serializer.ts
 var import_zod15 = require("zod");
-var SerializedNowDateTime = import_zod15.z.literal("$$now");
+var SerializedNowDateTime = import_zod15.z.object({
+  $$now: import_zod15.z.literal(true)
+});
 function todayDateTimeValueSerializer() {
-  return "$$now";
+  return { $$now: true };
 }
 
 // ../commons/src/events/FieldConfig.ts

package/package.json

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