@opencrvs/toolkit 1.8.0-rc.fb5b9fe → 1.8.0-rc.fb8e005

package/dist/conditionals/index.js

@@ -144,9 +144,6 @@ function createEventConditionals() {
     })
   };
 }
-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 +162,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 +194,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 +210,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 +230,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)) {
@@ -237,7 +240,7 @@ function createFieldConditionals(fieldId) {
           properties: {
             [fieldId]: {
               type: ["string", "boolean"],
-              const: { $data: `1/${comparedFieldId}` }
+              const: { $data: `/$form/${comparedFieldId}` }
             },
             [comparedFieldId]: { type: ["string", "boolean"] }
           },
@@ -347,6 +350,23 @@ function createFieldConditionals(fieldId) {
         }
       },
       required: [fieldId]
+    }),
+    getId: () => ({ fieldId }),
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    object: (options) => defineFormConditional({
+      type: "object",
+      properties: {
+        [fieldId]: {
+          type: "object",
+          properties: Object.fromEntries(
+            Object.entries(options).map(([key, value]) => {
+              return [key, value.properties.$form.properties[key]];
+            })
+          ),
+          required: Object.keys(options)
+        }
+      },
+      required: [fieldId]
     })
   };
 }