@opencrvs/toolkit 1.8.0-rc.f7910f3 → 1.8.0-rc.f876361

package/dist/conditionals/index.js

@@ -126,6 +126,10 @@ function field(fieldId) {
     required: ["$form"]
   });
   return {
+    /**
+     * @private Internal property used for field reference tracking.
+     */
+    _returning: fieldId,
     isAfter: () => ({
       days: (days) => ({
         inPast: () => defineConditional(
@@ -150,25 +154,54 @@ function field(fieldId) {
       date: (date) => defineConditional(getDateRange(date, "formatMaximum")),
       now: () => defineConditional(getDateRange(getDateFromNow(0), "formatMaximum"))
     }),
-    isEqualTo: (value) => defineConditional({
-      type: "object",
-      properties: {
-        $form: {
+    // TODO CIHAN: typing
+    isEqualTo: (value) => {
+      if (typeof value === "object" && value._returning) {
+        const comparedFieldId = value._returning;
+        return defineConditional({
           type: "object",
           properties: {
-            [fieldId]: {
-              oneOf: [
-                { type: "string", const: value },
-                { type: "boolean", const: value }
-              ],
-              const: value
+            $form: {
+              type: "object",
+              properties: {
+                [fieldId]: { type: ["string", "boolean"] },
+                [comparedFieldId]: { type: ["string", "boolean"] }
+              },
+              required: [fieldId, comparedFieldId],
+              allOf: [
+                {
+                  properties: {
+                    [fieldId]: {
+                      const: { $data: `1/${comparedFieldId}` }
+                    }
+                  }
+                }
+              ]
             }
           },
-          required: [fieldId]
-        }
-      },
-      required: ["$form"]
-    }),
+          required: ["$form"]
+        });
+      }
+      return defineConditional({
+        type: "object",
+        properties: {
+          $form: {
+            type: "object",
+            properties: {
+              [fieldId]: {
+                oneOf: [
+                  { type: "string", const: value },
+                  { type: "boolean", const: value }
+                ],
+                const: value
+              }
+            },
+            required: [fieldId]
+          }
+        },
+        required: ["$form"]
+      });
+    },
     /**
      * Use case: Some fields are rendered when selection is not made, or boolean false is explicitly selected.
      * @example field('recommender.none').isFalsy() vs not(field('recommender.none').isEqualTo(true))
@@ -256,6 +289,61 @@ function field(fieldId) {
         }
       },
       required: ["$form"]
+    }),
+    isValidNationalId: () => defineConditional({
+      type: "object",
+      properties: {
+        $form: {
+          type: "object",
+          properties: {
+            [fieldId]: {
+              type: "string",
+              pattern: "^[0-9]{9}$",
+              description: "The National ID can only be numeric and must be 9 digits long."
+            }
+          },
+          required: [fieldId]
+        }
+      },
+      required: ["$form"]
+    }),
+    /**
+     * Checks if the field value matches a given regular expression pattern.
+     * @param pattern - The regular expression pattern to match the field value against.
+     * @returns A JSONSchema conditional that validates the field value against the pattern.
+     */
+    matches: (pattern) => defineConditional({
+      type: "object",
+      properties: {
+        $form: {
+          type: "object",
+          properties: {
+            [fieldId]: {
+              type: "string",
+              pattern
+            }
+          },
+          required: [fieldId]
+        }
+      },
+      required: ["$form"]
+    }),
+    isBetween: (min, max) => defineConditional({
+      type: "object",
+      properties: {
+        $form: {
+          type: "object",
+          properties: {
+            [fieldId]: {
+              type: "number",
+              minimum: min,
+              maximum: max
+            }
+          },
+          required: [fieldId]
+        }
+      },
+      required: ["$form"]
     })
   };
 }