@opencrvs/toolkit 1.9.6-rc.f6a6a64 → 1.9.6

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

@@ -3009,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;
@@ -3400,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);
@@ -8889,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/package.json

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