@ecrvs/opencrvs-toolkit 1.8.1-rc.a7ee8fb → 1.8.1-rc.b48c48d

package/dist/commons/conditionals/conditionals.d.ts

@@ -121,6 +121,8 @@ export declare function createFieldConditionals(fieldId: string): {
         isGreaterThan: (value: number | FieldReference) => JSONSchema;
         isLessThan: (value: number | FieldReference) => JSONSchema;
         isEqualTo(value: string | boolean | FieldReference): JSONSchema;
+        isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+        isGreaterThanOrEqualTo(value: number | string | FieldReference): JSONSchema;
         /**
          * 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))
@@ -165,6 +167,8 @@ export declare function createFieldConditionals(fieldId: string): {
     isGreaterThan: (value: number | FieldReference) => JSONSchema;
     isLessThan: (value: number | FieldReference) => JSONSchema;
     isEqualTo(value: string | boolean | FieldReference): JSONSchema;
+    isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+    isGreaterThanOrEqualTo(value: number | string | FieldReference): JSONSchema;
     /**
      * 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))

package/dist/commons/events/field.d.ts

@@ -95,6 +95,14 @@ export declare function field(fieldId: string, options?: {
         isEqualTo(value: string | boolean | {
             $$field: string;
         }): import("../conditionals/conditionals").JSONSchema;
+        isEqualToSumOf(val1: {
+            $$field: string;
+        }, val2: {
+            $$field: string;
+        }): import("../conditionals/conditionals").JSONSchema;
+        isGreaterThanOrEqualTo(value: number | string | {
+            $$field: string;
+        }): import("../conditionals/conditionals").JSONSchema;
         isFalsy(): import("../conditionals/conditionals").JSONSchema;
         isUndefined(): import("../conditionals/conditionals").JSONSchema;
         inArray: (values: string[]) => import("../conditionals/conditionals").JSONSchema;
@@ -136,6 +144,14 @@ export declare function field(fieldId: string, options?: {
     isEqualTo(value: string | boolean | {
         $$field: string;
     }): import("../conditionals/conditionals").JSONSchema;
+    isEqualToSumOf(val1: {
+        $$field: string;
+    }, val2: {
+        $$field: string;
+    }): import("../conditionals/conditionals").JSONSchema;
+    isGreaterThanOrEqualTo(value: number | string | {
+        $$field: string;
+    }): import("../conditionals/conditionals").JSONSchema;
     isFalsy(): import("../conditionals/conditionals").JSONSchema;
     isUndefined(): import("../conditionals/conditionals").JSONSchema;
     inArray: (values: string[]) => import("../conditionals/conditionals").JSONSchema;

package/dist/conditionals/index.js

@@ -355,6 +355,48 @@ function createFieldConditionals(fieldId) {
         required: [fieldId]
       });
     },
+    isEqualToSumOf(val1, val2) {
+      const field1Id = val1.$$field;
+      const field2Id = val2.$$field;
+      return defineFormConditional({
+        type: "object",
+        properties: {
+          [fieldId]: { type: "number" },
+          [field1Id]: { type: "number" },
+          [field2Id]: { type: "number" }
+        },
+        required: [fieldId, field1Id, field2Id],
+        sumOf: {
+          sum: { $data: `/$form/${fieldId}` },
+          field1: { $data: `/$form/${field1Id}` },
+          field2: { $data: `/$form/${field2Id}` }
+        }
+      });
+    },
+    isGreaterThanOrEqualTo(value) {
+      const fieldSchema = { type: "number" };
+      const properties = {};
+      const required = [fieldId];
+      if (typeof value === "number") {
+        fieldSchema.minimum = value;
+      } else {
+        let refField = "";
+        if (isFieldReference(value)) {
+          refField = value.$$field;
+        } else {
+          refField = value;
+        }
+        fieldSchema.minimum = { $data: `/$form/${refField}` };
+        properties[refField] = { type: "number" };
+        required.push(refField);
+      }
+      properties[fieldId] = fieldSchema;
+      return defineFormConditional({
+        type: "object",
+        properties,
+        required
+      });
+    },
     /**
      * 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))

package/dist/events/index.js

@@ -2540,6 +2540,30 @@ ajv.addKeyword({
     return locations.some((location) => location.id === locationIdInput);
   }
 });
+ajv.addKeyword({
+  keyword: "sumOf",
+  type: "object",
+  schemaType: "object",
+  errors: true,
+  $data: true,
+  validate(schema, data) {
+    const { sum, field1, field2: field22 } = schema;
+    console.log(schema, data);
+    const getRefPath = (ref) => typeof ref === "object" && "$data" in ref ? ref.$data : ref;
+    const sumKey = getRefPath(sum);
+    const field1Key = getRefPath(field1);
+    const field2Key = getRefPath(field22);
+    const total = data?.$form?.[sumKey];
+    const num1 = data?.$form?.[field1Key];
+    const num2 = data?.$form?.[field2Key];
+    console.log(total, num1, num2);
+    if (typeof total !== "number" || typeof num1 !== "number" || typeof num2 !== "number") {
+      return true;
+    }
+    const valid = total === num1 + num2;
+    return valid;
+  }
+});
 function validate(schema, data) {
   const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
   const result = validator(data);
@@ -3516,6 +3540,48 @@ function createFieldConditionals(fieldId) {
         required: [fieldId]
       });
     },
+    isEqualToSumOf(val1, val2) {
+      const field1Id = val1.$$field;
+      const field2Id = val2.$$field;
+      return defineFormConditional({
+        type: "object",
+        properties: {
+          [fieldId]: { type: "number" },
+          [field1Id]: { type: "number" },
+          [field2Id]: { type: "number" }
+        },
+        required: [fieldId, field1Id, field2Id],
+        sumOf: {
+          sum: { $data: `/$form/${fieldId}` },
+          field1: { $data: `/$form/${field1Id}` },
+          field2: { $data: `/$form/${field2Id}` }
+        }
+      });
+    },
+    isGreaterThanOrEqualTo(value) {
+      const fieldSchema = { type: "number" };
+      const properties = {};
+      const required = [fieldId];
+      if (typeof value === "number") {
+        fieldSchema.minimum = value;
+      } else {
+        let refField = "";
+        if (isFieldReference(value)) {
+          refField = value.$$field;
+        } else {
+          refField = value;
+        }
+        fieldSchema.minimum = { $data: `/$form/${refField}` };
+        properties[refField] = { type: "number" };
+        required.push(refField);
+      }
+      properties[fieldId] = fieldSchema;
+      return defineFormConditional({
+        type: "object",
+        properties,
+        required
+      });
+    },
     /**
      * 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))

package/dist/notification/index.js

@@ -1946,6 +1946,30 @@ ajv.addKeyword({
     return locations.some((location) => location.id === locationIdInput);
   }
 });
+ajv.addKeyword({
+  keyword: "sumOf",
+  type: "object",
+  schemaType: "object",
+  errors: true,
+  $data: true,
+  validate(schema, data) {
+    const { sum, field1, field2: field22 } = schema;
+    console.log(schema, data);
+    const getRefPath = (ref) => typeof ref === "object" && "$data" in ref ? ref.$data : ref;
+    const sumKey = getRefPath(sum);
+    const field1Key = getRefPath(field1);
+    const field2Key = getRefPath(field22);
+    const total = data?.$form?.[sumKey];
+    const num1 = data?.$form?.[field1Key];
+    const num2 = data?.$form?.[field2Key];
+    console.log(total, num1, num2);
+    if (typeof total !== "number" || typeof num1 !== "number" || typeof num2 !== "number") {
+      return true;
+    }
+    const valid = total === num1 + num2;
+    return valid;
+  }
+});
 
 // ../commons/src/utils.ts
 var z24 = __toESM(require("zod"));
@@ -2335,6 +2359,48 @@ function createFieldConditionals(fieldId) {
         required: [fieldId]
       });
     },
+    isEqualToSumOf(val1, val2) {
+      const field1Id = val1.$$field;
+      const field2Id = val2.$$field;
+      return defineFormConditional({
+        type: "object",
+        properties: {
+          [fieldId]: { type: "number" },
+          [field1Id]: { type: "number" },
+          [field2Id]: { type: "number" }
+        },
+        required: [fieldId, field1Id, field2Id],
+        sumOf: {
+          sum: { $data: `/$form/${fieldId}` },
+          field1: { $data: `/$form/${field1Id}` },
+          field2: { $data: `/$form/${field2Id}` }
+        }
+      });
+    },
+    isGreaterThanOrEqualTo(value) {
+      const fieldSchema = { type: "number" };
+      const properties = {};
+      const required = [fieldId];
+      if (typeof value === "number") {
+        fieldSchema.minimum = value;
+      } else {
+        let refField = "";
+        if (isFieldReference(value)) {
+          refField = value.$$field;
+        } else {
+          refField = value;
+        }
+        fieldSchema.minimum = { $data: `/$form/${refField}` };
+        properties[refField] = { type: "number" };
+        required.push(refField);
+      }
+      properties[fieldId] = fieldSchema;
+      return defineFormConditional({
+        type: "object",
+        properties,
+        required
+      });
+    },
     /**
      * 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))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecrvs/opencrvs-toolkit",
-  "version": "1.8.1-rc.a7ee8fb",
+  "version": "1.8.1-rc.b48c48d",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {