@opencrvs/toolkit 1.9.2-rc.fd254a6 → 1.9.3-rc.1cf6bbd

package/dist/conditionals/index.js

@@ -251,6 +251,34 @@ function getDateRangeToFieldReference(field, comparedField, clause) {
     required: [field.$$field]
   };
 }
+function getDayRangeToFieldReference(field, comparedField, days, clause) {
+  return {
+    type: "object",
+    properties: {
+      [field.$$field]: wrapToPath(
+        {
+          type: "string",
+          format: "date",
+          daysFromDate: {
+            referenceDate: {
+              $data: `${field.$$subfield.length + 1}/${jsonFieldPath(
+                comparedField
+              )}`
+            },
+            clause,
+            days
+          }
+        },
+        field.$$subfield
+      ),
+      [comparedField.$$field]: wrapToPath(
+        { type: "string", format: "date" },
+        comparedField.$$subfield
+      )
+    },
+    required: [field.$$field]
+  };
+}
 function defineComparison(field, value, keyword) {
   if (isFieldReference(value)) {
     const comparedField = value;
@@ -286,16 +314,17 @@ function defineComparison(field, value, keyword) {
   });
 }
 function createFieldConditionals(fieldId) {
-  const getDayRange = (field, days, clause) => ({
+  const getDayRange = (field, days, clause, referenceDate) => ({
     type: "object",
     properties: {
       [field.$$field]: wrapToPath(
         {
           type: "string",
           format: "date",
-          daysFromNow: {
+          daysFromDate: {
             days,
-            clause
+            clause,
+            referenceDate
           }
         },
         field.$$subfield
@@ -348,7 +377,19 @@ function createFieldConditionals(fieldId) {
       return {
         days: (days) => ({
           inPast: () => defineFormConditional(getDayRange(this, -days, "after")),
-          inFuture: () => defineFormConditional(getDayRange(this, days, "after"))
+          inFuture: () => defineFormConditional(getDayRange(this, days, "after")),
+          fromDate: (date) => {
+            if (isFieldReference(date)) {
+              const comparedField = date;
+              return defineFormConditional(
+                getDayRangeToFieldReference(this, comparedField, days, "after")
+              );
+            }
+            return defineFormConditional(getDayRange(this, days, "after", date));
+          },
+          fromNow: () => {
+            return defineFormConditional(getDayRange(this, days, "after"));
+          }
         }),
         date: (date) => {
           if (isFieldReference(date)) {
@@ -370,7 +411,26 @@ function createFieldConditionals(fieldId) {
       return {
         days: (days) => ({
           inPast: () => defineFormConditional(getDayRange(this, -days, "before")),
-          inFuture: () => defineFormConditional(getDayRange(this, days, "before"))
+          inFuture: () => defineFormConditional(getDayRange(this, days, "before")),
+          fromDate: (date) => {
+            if (isFieldReference(date)) {
+              const comparedField = date;
+              return defineFormConditional(
+                getDayRangeToFieldReference(
+                  this,
+                  comparedField,
+                  -days,
+                  "before"
+                )
+              );
+            }
+            return defineFormConditional(
+              getDayRange(this, -days, "before", date)
+            );
+          },
+          fromNow: () => {
+            return defineFormConditional(getDayRange(this, -days, "before"));
+          }
         }),
         date: (date) => {
           if (isFieldReference(date)) {

package/dist/events/index.js

@@ -2443,6 +2443,9 @@ var PageTypes = import_zod16.z.enum(["FORM", "VERIFICATION"]);
 var PageConfigBase = import_zod16.z.object({
   id: import_zod16.z.string().describe("Unique identifier for the page"),
   title: TranslationConfig.describe("Header title of the page"),
+  requireCompletionToContinue: import_zod16.z.boolean().default(false).describe(
+    "If true, all required fields must be filled before continuing to the next page"
+  ),
   fields: import_zod16.z.array(FieldConfig).describe("Fields to be rendered on the page"),
   conditional: Conditional.optional().describe(
     "Page will be shown if condition is met. If conditional is not defined, the page will be always shown."
@@ -3182,9 +3185,30 @@ var DataContext = import_zod25.z.object({
     $leafAdminStructureLocationIds: import_zod25.z.array(import_zod25.z.object({ id: UUID }))
   })
 });
+function resolveDataPath(rootData, dataPath, instancePath) {
+  const pathParts = dataPath.split("/");
+  const levels = parseInt(pathParts[0], 10);
+  const referencePath = pathParts.slice(1);
+  const instanceParts = instancePath.split("/").filter(Boolean);
+  const traversedParts = instanceParts.slice(0, -levels);
+  let current = rootData;
+  for (const part of traversedParts) {
+    if (current === null || current === void 0) {
+      return void 0;
+    }
+    current = current[part];
+  }
+  for (const part of referencePath) {
+    if (current === null || current === void 0) {
+      return void 0;
+    }
+    current = current[part];
+  }
+  return current;
+}
 (0, import_ajv_formats.default)(ajv);
 ajv.addKeyword({
-  keyword: "daysFromNow",
+  keyword: "daysFromDate",
   type: "string",
   schemaType: "object",
   $data: true,
@@ -3201,8 +3225,22 @@ ajv.addKeyword({
     if (isNaN(date.getTime())) {
       return false;
     }
-    const now = new Date(dataContext.rootData.$now);
-    const offsetDate = new Date(now.getTime() + days * 24 * 60 * 60 * 1e3);
+    let referenceDate = schema.referenceDate;
+    if (referenceDate && typeof referenceDate === "object" && "$data" in referenceDate) {
+      referenceDate = resolveDataPath(
+        dataContext.rootData,
+        referenceDate.$data,
+        dataContext.instancePath
+      );
+    }
+    if (!referenceDate) {
+      referenceDate = dataContext.rootData.$now;
+    }
+    const baseDate = new Date(referenceDate);
+    if (isNaN(baseDate.getTime())) {
+      return false;
+    }
+    const offsetDate = new Date(baseDate.getTime() + days * 24 * 60 * 60 * 1e3);
     return clause === "after" ? (0, import_date_fns.isAfter)(date, offsetDate) : (0, import_date_fns.isBefore)(date, offsetDate);
   }
 });
@@ -3265,7 +3303,8 @@ function isConditionMet(conditional, values, context) {
     $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
     $online: isOnline(),
     $user: context.user,
-    $leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? []
+    $leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? [],
+    $event: context.event
   });
 }
 function getConditionalActionsForField(field3, values) {
@@ -3291,7 +3330,8 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
     $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
     $online: isOnline(),
     $user: context.user,
-    $leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? []
+    $leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? [],
+    $event: context.event
   });
   return validConditionals.includes(conditionalType);
 }
@@ -4113,6 +4153,34 @@ function getDateRangeToFieldReference(field3, comparedField, clause) {
     required: [field3.$$field]
   };
 }
+function getDayRangeToFieldReference(field3, comparedField, days, clause) {
+  return {
+    type: "object",
+    properties: {
+      [field3.$$field]: wrapToPath(
+        {
+          type: "string",
+          format: "date",
+          daysFromDate: {
+            referenceDate: {
+              $data: `${field3.$$subfield.length + 1}/${jsonFieldPath(
+                comparedField
+              )}`
+            },
+            clause,
+            days
+          }
+        },
+        field3.$$subfield
+      ),
+      [comparedField.$$field]: wrapToPath(
+        { type: "string", format: "date" },
+        comparedField.$$subfield
+      )
+    },
+    required: [field3.$$field]
+  };
+}
 function defineComparison(field3, value, keyword) {
   if (isFieldReference(value)) {
     const comparedField = value;
@@ -4148,16 +4216,17 @@ function defineComparison(field3, value, keyword) {
   });
 }
 function createFieldConditionals(fieldId) {
-  const getDayRange = (field3, days, clause) => ({
+  const getDayRange = (field3, days, clause, referenceDate) => ({
     type: "object",
     properties: {
       [field3.$$field]: wrapToPath(
         {
           type: "string",
           format: "date",
-          daysFromNow: {
+          daysFromDate: {
             days,
-            clause
+            clause,
+            referenceDate
           }
         },
         field3.$$subfield
@@ -4210,7 +4279,19 @@ function createFieldConditionals(fieldId) {
       return {
         days: (days) => ({
           inPast: () => defineFormConditional(getDayRange(this, -days, "after")),
-          inFuture: () => defineFormConditional(getDayRange(this, days, "after"))
+          inFuture: () => defineFormConditional(getDayRange(this, days, "after")),
+          fromDate: (date) => {
+            if (isFieldReference(date)) {
+              const comparedField = date;
+              return defineFormConditional(
+                getDayRangeToFieldReference(this, comparedField, days, "after")
+              );
+            }
+            return defineFormConditional(getDayRange(this, days, "after", date));
+          },
+          fromNow: () => {
+            return defineFormConditional(getDayRange(this, days, "after"));
+          }
         }),
         date: (date) => {
           if (isFieldReference(date)) {
@@ -4232,7 +4313,26 @@ function createFieldConditionals(fieldId) {
       return {
         days: (days) => ({
           inPast: () => defineFormConditional(getDayRange(this, -days, "before")),
-          inFuture: () => defineFormConditional(getDayRange(this, days, "before"))
+          inFuture: () => defineFormConditional(getDayRange(this, days, "before")),
+          fromDate: (date) => {
+            if (isFieldReference(date)) {
+              const comparedField = date;
+              return defineFormConditional(
+                getDayRangeToFieldReference(
+                  this,
+                  comparedField,
+                  -days,
+                  "before"
+                )
+              );
+            }
+            return defineFormConditional(
+              getDayRange(this, -days, "before", date)
+            );
+          },
+          fromNow: () => {
+            return defineFormConditional(getDayRange(this, -days, "before"));
+          }
         }),
         date: (date) => {
           if (isFieldReference(date)) {

package/dist/notification/index.js

@@ -1969,6 +1969,9 @@ var PageTypes = import_zod16.z.enum(["FORM", "VERIFICATION"]);
 var PageConfigBase = import_zod16.z.object({
   id: import_zod16.z.string().describe("Unique identifier for the page"),
   title: TranslationConfig.describe("Header title of the page"),
+  requireCompletionToContinue: import_zod16.z.boolean().default(false).describe(
+    "If true, all required fields must be filled before continuing to the next page"
+  ),
   fields: import_zod16.z.array(FieldConfig).describe("Fields to be rendered on the page"),
   conditional: Conditional.optional().describe(
     "Page will be shown if condition is met. If conditional is not defined, the page will be always shown."
@@ -2421,9 +2424,30 @@ var DataContext = import_zod25.z.object({
     $leafAdminStructureLocationIds: import_zod25.z.array(import_zod25.z.object({ id: UUID }))
   })
 });
+function resolveDataPath(rootData, dataPath, instancePath) {
+  const pathParts = dataPath.split("/");
+  const levels = parseInt(pathParts[0], 10);
+  const referencePath = pathParts.slice(1);
+  const instanceParts = instancePath.split("/").filter(Boolean);
+  const traversedParts = instanceParts.slice(0, -levels);
+  let current = rootData;
+  for (const part of traversedParts) {
+    if (current === null || current === void 0) {
+      return void 0;
+    }
+    current = current[part];
+  }
+  for (const part of referencePath) {
+    if (current === null || current === void 0) {
+      return void 0;
+    }
+    current = current[part];
+  }
+  return current;
+}
 (0, import_ajv_formats.default)(ajv);
 ajv.addKeyword({
-  keyword: "daysFromNow",
+  keyword: "daysFromDate",
   type: "string",
   schemaType: "object",
   $data: true,
@@ -2440,8 +2464,22 @@ ajv.addKeyword({
     if (isNaN(date.getTime())) {
       return false;
     }
-    const now = new Date(dataContext.rootData.$now);
-    const offsetDate = new Date(now.getTime() + days * 24 * 60 * 60 * 1e3);
+    let referenceDate = schema.referenceDate;
+    if (referenceDate && typeof referenceDate === "object" && "$data" in referenceDate) {
+      referenceDate = resolveDataPath(
+        dataContext.rootData,
+        referenceDate.$data,
+        dataContext.instancePath
+      );
+    }
+    if (!referenceDate) {
+      referenceDate = dataContext.rootData.$now;
+    }
+    const baseDate = new Date(referenceDate);
+    if (isNaN(baseDate.getTime())) {
+      return false;
+    }
+    const offsetDate = new Date(baseDate.getTime() + days * 24 * 60 * 60 * 1e3);
     return clause === "after" ? (0, import_date_fns.isAfter)(date, offsetDate) : (0, import_date_fns.isBefore)(date, offsetDate);
   }
 });
@@ -2756,6 +2794,34 @@ function getDateRangeToFieldReference(field3, comparedField, clause) {
     required: [field3.$$field]
   };
 }
+function getDayRangeToFieldReference(field3, comparedField, days, clause) {
+  return {
+    type: "object",
+    properties: {
+      [field3.$$field]: wrapToPath(
+        {
+          type: "string",
+          format: "date",
+          daysFromDate: {
+            referenceDate: {
+              $data: `${field3.$$subfield.length + 1}/${jsonFieldPath(
+                comparedField
+              )}`
+            },
+            clause,
+            days
+          }
+        },
+        field3.$$subfield
+      ),
+      [comparedField.$$field]: wrapToPath(
+        { type: "string", format: "date" },
+        comparedField.$$subfield
+      )
+    },
+    required: [field3.$$field]
+  };
+}
 function defineComparison(field3, value, keyword) {
   if (isFieldReference(value)) {
     const comparedField = value;
@@ -2791,16 +2857,17 @@ function defineComparison(field3, value, keyword) {
   });
 }
 function createFieldConditionals(fieldId) {
-  const getDayRange = (field3, days, clause) => ({
+  const getDayRange = (field3, days, clause, referenceDate) => ({
     type: "object",
     properties: {
       [field3.$$field]: wrapToPath(
         {
           type: "string",
           format: "date",
-          daysFromNow: {
+          daysFromDate: {
             days,
-            clause
+            clause,
+            referenceDate
           }
         },
         field3.$$subfield
@@ -2853,7 +2920,19 @@ function createFieldConditionals(fieldId) {
       return {
         days: (days) => ({
           inPast: () => defineFormConditional(getDayRange(this, -days, "after")),
-          inFuture: () => defineFormConditional(getDayRange(this, days, "after"))
+          inFuture: () => defineFormConditional(getDayRange(this, days, "after")),
+          fromDate: (date) => {
+            if (isFieldReference(date)) {
+              const comparedField = date;
+              return defineFormConditional(
+                getDayRangeToFieldReference(this, comparedField, days, "after")
+              );
+            }
+            return defineFormConditional(getDayRange(this, days, "after", date));
+          },
+          fromNow: () => {
+            return defineFormConditional(getDayRange(this, days, "after"));
+          }
         }),
         date: (date) => {
           if (isFieldReference(date)) {
@@ -2875,7 +2954,26 @@ function createFieldConditionals(fieldId) {
       return {
         days: (days) => ({
           inPast: () => defineFormConditional(getDayRange(this, -days, "before")),
-          inFuture: () => defineFormConditional(getDayRange(this, days, "before"))
+          inFuture: () => defineFormConditional(getDayRange(this, days, "before")),
+          fromDate: (date) => {
+            if (isFieldReference(date)) {
+              const comparedField = date;
+              return defineFormConditional(
+                getDayRangeToFieldReference(
+                  this,
+                  comparedField,
+                  -days,
+                  "before"
+                )
+              );
+            }
+            return defineFormConditional(
+              getDayRange(this, -days, "before", date)
+            );
+          },
+          fromNow: () => {
+            return defineFormConditional(getDayRange(this, -days, "before"));
+          }
         }),
         date: (date) => {
           if (isFieldReference(date)) {

package/package.json

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