Cancel cardinality checks (#78)

* feat: added $capabilities() function * fix: package lock * fix: removed incorrect cardinality errors
Outburn-IL · Jun 1, 2024 · d73118c · d73118c
1 parent 3fc8762
commit d73118c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 23 deletions.
diff --git a/src/helpers/parser/toJsonataString.ts b/src/helpers/parser/toJsonataString.ts
@@ -393,11 +393,10 @@ export const toJsonataString = async (inExpr: string): Promise<string | undefine
           min: eDef?.min ?? 0,
           path: pathForCardinality,
           eDefPath,
-          kind,
-          mandatory: mandatoryObj
+          kind
         };
           // construct line
-        const line = `${prefix}$__flashInstance := $__flashMerge(${JSON.stringify(mergeOptions)},$__flashInstance,$__castToFhir(${JSON.stringify(castOptions)}, ${contextPart}(${valuePart};`;
+        const line = `${prefix}$__context := ${contextPart}($);$__flashInstance := $__flashMerge($merge([${JSON.stringify(mergeOptions)},{'mandatory': $count($__context)>0 ? ${JSON.stringify(mandatoryObj)} : undefined }]),$__flashInstance,$__castToFhir(${JSON.stringify(castOptions)}, ${contextPart}(${valuePart};`;
         return line;
       };
     } else if (nodes.length > 1) {

diff --git a/src/helpers/runtime/flashMerge.ts b/src/helpers/runtime/flashMerge.ts
@@ -6,7 +6,7 @@
 import _ from 'lodash';
 
 import { isEmpty } from '../objectFunctions';
-import thrower from '../thrower';
+// import thrower from '../thrower';
 
 export interface FlashMergeOptions {
   key: string // name of the element
@@ -44,22 +44,22 @@ const addToArr = (arr, value) => {
 };
 
 export const flashMerge = async (options: FlashMergeOptions, baseObj: any, ruleObj: any): Promise<any> => {
-  const empty: boolean = await isEmpty(ruleObj);
-  if (options?.min === 0) {
-    if (empty) return baseObj;
-  } else {
-    let amountOfElements = 1;
-    if (empty) {
-      amountOfElements = 0;
-    } else {
-      try {
-        amountOfElements = JSON.parse(ruleObj[options.key]).length;
-      } catch (e) {}
-    }
-    if (amountOfElements < Number(options.min)) {
-      thrower.throwRuntimeError(`Element '${options.path ?? ''}' has a minimum cardinality of ${options.min ?? ''}, got ${amountOfElements} instead`);
-    }
-  }
+  // const empty: boolean = await isEmpty(ruleObj);
+  // if (options?.min === 0) {
+  //   if (empty) return baseObj;
+  // } else {
+  //   let amountOfElements = 1;
+  //   if (empty) {
+  //     amountOfElements = 0;
+  //   } else {
+  //     try {
+  //       amountOfElements = JSON.parse(ruleObj[options.key]).length;
+  //     } catch (e) {}
+  //   }
+  //   // if (amountOfElements < Number(options.min)) {
+  //   //   thrower.throwRuntimeError(`Element '${options.path ?? ''}' has a minimum cardinality of ${options.min ?? ''}, got ${amountOfElements} instead`);
+  //   // }
+  // }
   // this function merges key:value into an existing object
   // taking into account cardinality and children of primitives
   const isBaseArray: boolean = typeof options?.baseMax !== 'undefined' && (options?.baseMax > '1' || options?.baseMax === '*');

diff --git a/tests/root/index.test.ts b/tests/root/index.test.ts
@@ -144,7 +144,19 @@ describe('integration tests', () => {
     };
 
     const res = await request(globalThis.app).post('/').send(requestBody);
-    expect(res.body.message).toBe('Transformation error: Element \'Patient.identifier[il-id].value\' has a minimum cardinality of 1, got 0 instead');
+    expect(res.body).toStrictEqual({
+      resourceType: 'Patient',
+      meta: {
+        profile: [
+          'http://fhir.health.gov.il/StructureDefinition/il-core-patient'
+        ]
+      },
+      identifier: [
+        {
+          system: 'http://fhir.health.gov.il/identifier/il-national-id'
+        }
+      ]
+    });
   });
 
   test('Case 3 - Slices with fixed values appear even if no children are set', async () => {
@@ -298,7 +310,7 @@ describe('integration tests', () => {
     });
   });
 
-  test('Case 8 - Throw runtime error if mandatory element is missing', async () => {
+  test.skip('Case 8 - Throw runtime error if mandatory element is missing', async () => {
     const mapping = `
         InstanceOf: il-core-patient
         * identifier[il-id].value = '000000018'
@@ -432,7 +444,7 @@ describe('integration tests', () => {
     });
   });
 
-  test('Case 16 - Supply the full path of the element in the cardinality error', async () => {
+  test.skip('Case 16 - Supply the full path of the element in the cardinality error', async () => {
     const mapping = `
             InstanceOf: bp
             * component[SystolicBP].valueQuantity