Merge pull request #116 from mechanik-daniel/resolve-issue-114

fix: resolve issue 114
Outburn-IL · Dec 1, 2024 · 2df4ee1 · 2df4ee1
2 parents 4dd5aeb + d916c6c
commit 2df4ee1
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 25 deletions.
diff --git a/src/helpers/jsonataExpression.ts b/src/helpers/jsonataExpression.ts
@@ -556,34 +556,54 @@ const expressions: InternalJsonataExpression = {
     $_isEmpty($value)
   )`),
   codeSystemToDictionary: jsonata('concept.**[$type($)="object"]{code:display}'),
-  valueSetExpandDictionary: jsonata(`(
-    $compose := $vs.(  
-      $expandInclude := function($include){(
-        $exists(filter) ? undefined : (
-          $vs := $include.valueSet.$valueSetExpand($);
-          $concepts := $exists($include.concept) ? $include.{system: concept{code: display}} : ($exists($include.system) ? $include.{system: $codeSystemDictionary(system)});
-          $count($vs) > 0 ? (
-            $exists($include.system) ? (
-              $system = $include.system;
-              {
-                $system: $concepts.*.$sift(function($v,$k){(
-                  $exists(
-                    $vs.$lookup($system) ~> $lookup($k)
-                  )
-                )})
+  valueSetExpandDictionary: jsonata(`  (
+    $expandInclude := function($include){(
+
+      $exists($include.filter) ? undefined : (
+        $vs := $include.valueSet.$valueSetExpand($);
+        $concepts := (
+          /*if*/ 
+          $exists($include.concept) 
+          /*then*/ ? 
+          $include.(
+            $sys := system;
+            {
+              system: concept{
+                code: (
+                  $exists(display) ? display : $lookup($codeSystemDictionary($sys),code)
+                )
               }
-            ) : (
-              $vs
-            )
-          ) : $concepts
-        )
-      )};
-    
+            }
+          ) 
+          /*else*/ : (
+            $exists($include.system) 
+              ? $include.{
+                system: $codeSystemDictionary($include.system)
+              }
+            ));
+        $count($vs) > 0 ? (
+          $exists($include.system) ? (
+            $system = $include.system;
+            {
+              $system: $concepts.*.$sift(function($v,$k){(
+                $exists(
+                  $vs.$lookup($system) ~> $lookup($k)
+                )
+              )})
+            }
+          ) : (
+            $vs
+          )
+        ) : $concepts
+      )
+    )};
+
+    $compose := $vs.(   
       $countIncludes := $count(compose.include);
       $countExcludes := $count(compose.exclude);
     
-      $includes := compose.$expandInclude(include);
-      $excludes := compose.$expandInclude(exclude);
+      $includes := compose.include.$expandInclude($);
+      $excludes := compose.exclude.$expandInclude($);
     
       $count($includes)=$countIncludes and $count($excludes)=$countExcludes ? (
         [$includes.(
@@ -601,7 +621,8 @@ const expressions: InternalJsonataExpression = {
         )]
       )
     );
-    $count($compose) > 0 ? $compose
+    $count($compose) > 0 ? $compose;
+
   )`),
   testCodeAgainstVS: jsonata(`(
     $allCodes := $merge($vs.*);

diff --git a/src/helpers/jsonataFunctions/transform.ts b/src/helpers/jsonataFunctions/transform.ts
@@ -14,6 +14,7 @@ import jsonata from 'jsonata';
 import { IAppBinding } from '../../types';
 import { getCache } from '../cache';
 import * as conformance from '../conformance';
+import { codeSystemDictionary, valueSetExpandDictionary } from '../conformance/conformance';
 import fhirFuncs from '../fhirFunctions';
 import { parseCsv } from '../inputConverters';
 import * as v2 from '../inputConverters/hl7v2';
@@ -111,6 +112,8 @@ export const transform = async (input, expression: string, extraBindings: Record
     if (dev) bindings.getElementDefinition = compiler.getElementDefinition;
     if (dev) bindings.replaceColonsWithBrackets = compiler.replaceColonsWithBrackets;
     if (dev) bindings.removeComments = removeComments;
+    if (dev) bindings.valueSetExpandDictionary = valueSetExpandDictionary;
+    if (dev) bindings.codeSystemDictionary = codeSystemDictionary;
     bindings.getCodeSystem = conformance.getCodeSystem;
     bindings.getValueSet = conformance.getValueSet;
     // end of debug functions

diff --git a/tests/root/index.test.ts b/tests/root/index.test.ts
@@ -391,6 +391,21 @@ describe('integration tests', () => {
     expect(wrong.body.message).toBe('Transformation error: value \'lalaland\' is invalid for element address.country. This code is not in the required value set');
   });
 
+  test('Validate Task.intent code', async () => {
+    const fume = `InstanceOf: Task
+* status = 'accepted'
+* intent = 'plan'`;
+    const requestBody = { fume };
+
+    const res = await request(globalThis.app).post('/').send(requestBody);
+
+    expect(res.body).toStrictEqual({
+      resourceType: 'Task',
+      status: 'accepted',
+      intent: 'plan'
+    });
+  });
+
   test('Case 2 - Slices with fixed values appear even if no children are set', async () => {
     const mapping = `
             InstanceOf: il-core-patient