@opencrvs/toolkit 1.8.0-rc.ffe24c3 → 1.8.1-rc.008155b

package/dist/conditionals/index.js

@@ -22,7 +22,6 @@ var conditionals_exports = {};
 __export(conditionals_exports, {
   alwaysTrue: () => alwaysTrue,
   and: () => and,
-  createEventConditionals: () => createEventConditionals,
   createFieldConditionals: () => createFieldConditionals,
   defineConditional: () => defineConditional,
   defineFormConditional: () => defineFormConditional,
@@ -40,7 +39,8 @@ var SerializedUserField = import_zod.z.object({
     "id",
     "name",
     "role",
-    "signatureFilename",
+    "signature",
+    "avatar",
     "primaryOfficeId"
   ])
 });
@@ -112,41 +112,6 @@ var user = Object.assign(userSerializer, {
     required: ["$user"]
   })
 });
-function createEventConditionals() {
-  return {
-    /**
-     * Checks if the event contains a specific action type.
-     * @param action - The action type to check for.
-     */
-    hasAction: (action) => defineConditional({
-      type: "object",
-      properties: {
-        $event: {
-          type: "object",
-          properties: {
-            actions: {
-              type: "array",
-              contains: {
-                type: "object",
-                properties: {
-                  type: {
-                    const: action
-                  }
-                },
-                required: ["type"]
-              }
-            }
-          },
-          required: ["actions"]
-        }
-      },
-      required: ["$event"]
-    })
-  };
-}
-function getDateFromNow(days) {
-  return new Date(Date.now() - days * 24 * 60 * 60 * 1e3).toISOString().split("T")[0];
-}
 function getDateRangeToFieldReference(fieldId, comparedFieldId, clause) {
   return {
     type: "object",
@@ -165,6 +130,20 @@ function isFieldReference(value) {
   return typeof value === "object" && value !== null && "$$field" in value;
 }
 function createFieldConditionals(fieldId) {
+  const getDayRange = (days, clause) => ({
+    type: "object",
+    properties: {
+      [fieldId]: {
+        type: "string",
+        format: "date",
+        daysFromNow: {
+          days,
+          clause
+        }
+      }
+    },
+    required: [fieldId]
+  });
   const getDateRange = (date, clause) => ({
     type: "object",
     properties: {
@@ -183,12 +162,8 @@ function createFieldConditionals(fieldId) {
     $$field: fieldId,
     isAfter: () => ({
       days: (days) => ({
-        inPast: () => defineFormConditional(
-          getDateRange(getDateFromNow(days), "formatMinimum")
-        ),
-        inFuture: () => defineFormConditional(
-          getDateRange(getDateFromNow(-days), "formatMinimum")
-        )
+        inPast: () => defineFormConditional(getDayRange(-days, "after")),
+        inFuture: () => defineFormConditional(getDayRange(days, "after"))
       }),
       date: (date) => {
         if (isFieldReference(date)) {
@@ -203,16 +178,12 @@ function createFieldConditionals(fieldId) {
         }
         return defineFormConditional(getDateRange(date, "formatMinimum"));
       },
-      now: () => defineFormConditional(getDateRange(getDateFromNow(0), "formatMinimum"))
+      now: () => defineFormConditional(getDateRange({ $data: "/$now" }, "formatMinimum"))
     }),
     isBefore: () => ({
       days: (days) => ({
-        inPast: () => defineFormConditional(
-          getDateRange(getDateFromNow(days), "formatMaximum")
-        ),
-        inFuture: () => defineFormConditional(
-          getDateRange(getDateFromNow(-days), "formatMaximum")
-        )
+        inPast: () => defineFormConditional(getDayRange(days, "before")),
+        inFuture: () => defineFormConditional(getDayRange(-days, "before"))
       }),
       date: (date) => {
         if (isFieldReference(date)) {
@@ -227,7 +198,7 @@ function createFieldConditionals(fieldId) {
         }
         return defineFormConditional(getDateRange(date, "formatMaximum"));
       },
-      now: () => defineFormConditional(getDateRange(getDateFromNow(0), "formatMaximum"))
+      now: () => defineFormConditional(getDateRange({ $data: "/$now" }, "formatMaximum"))
     }),
     isEqualTo: (value) => {
       if (isFieldReference(value)) {
@@ -316,11 +287,10 @@ function createFieldConditionals(fieldId) {
       properties: {
         [fieldId]: {
           type: "string",
-          pattern: "^[\\p{Script=Latin}0-9'._-]*(\\([\\p{Script=Latin}0-9'._-]+\\))?[\\p{Script=Latin}0-9'._-]*( [\\p{Script=Latin}0-9'._-]*(\\([\\p{Script=Latin}0-9'._-]+\\))?[\\p{Script=Latin}0-9'._-]*)*$",
-          description: "Name must contain only letters, numbers, and allowed special characters ('._-). No double spaces."
+          pattern: "^[\\p{Script=Latin}0-9'.-]*(\\([\\p{Script=Latin}0-9'.-]+\\))?[\\p{Script=Latin}0-9'.-]*( [\\p{Script=Latin}0-9'.-]*(\\([\\p{Script=Latin}0-9'.-]+\\))?[\\p{Script=Latin}0-9'.-]*)*$",
+          description: "Name must contain only letters, numbers, and allowed special characters ('.-). No double spaces."
         }
-      },
-      required: [fieldId]
+      }
     }),
     /**
      * Checks if the field value matches a given regular expression pattern.