@opencrvs/toolkit 1.9.7-rc.24a6eae → 1.9.7-rc.26c1876

package/dist/events/index.js

@@ -3591,31 +3591,30 @@ ajv.addKeyword({
     return locations.some((location) => location.id === locationIdInput);
   }
 });
+function isAgeValue(value) {
+  return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
+}
 function validate(schema, data) {
   const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
   if ("$form" in data) {
-    data.$form = Object.fromEntries(
-      Object.entries(data.$form).map(([key, value]) => {
-        const maybeAgeValue = AgeValue.safeParse(value);
-        if (maybeAgeValue.success) {
-          const age = maybeAgeValue.data.age;
-          const maybeAsOfDate = DateValue.safeParse(
-            data.$form[maybeAgeValue.data.asOfDateRef]
-          );
-          return [
-            key,
-            {
-              age,
-              dob: ageToDate(
-                age,
-                maybeAsOfDate.success ? maybeAsOfDate.data : data.$now
-              )
-            }
-          ];
-        }
+    const entries = Object.entries(data.$form).map(([key, value]) => {
+      if (!isAgeValue(value)) {
         return [key, value];
-      })
-    );
+      }
+      const age = value.age;
+      const maybeAsOfDate = DateValue.safeParse(data.$form[value.asOfDateRef]);
+      return [
+        key,
+        {
+          age,
+          dob: ageToDate(
+            age,
+            maybeAsOfDate.success ? maybeAsOfDate.data : data.$now
+          )
+        }
+      ];
+    });
+    data.$form = Object.fromEntries(entries);
   }
   const result = validator(data);
   return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/toolkit",
-  "version": "1.9.7-rc.24a6eae",
+  "version": "1.9.7-rc.26c1876",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {