sdc-qrf 1.1.0-alpha.5 → 1.1.0-alpha.6

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "sdc-qrf",
     "license": "MIT",
-    "version": "1.1.0-alpha.5",
+    "version": "1.1.0-alpha.6",
     "scripts": {
         "test": "vitest --watch=false",
         "test:watch": "vitest --watch",

package/src/converter/__tests__/fce.test.ts

@@ -37,6 +37,7 @@ import fce_practitioner_create_structure_map from './resources/questionnaire_fce
 import fce_practitioner_edit from './resources/questionnaire_fce/practitioner_edit.json';
 import fce_practitioner_role_create from './resources/questionnaire_fce/practitioner_role_create.json';
 import fce_public_appointment from './resources/questionnaire_fce/public_appointment.json';
+import fce_questionnaire_variable from './resources/questionnaire_fce/questionnaire_variable.json';
 import fce_review_of_systems from './resources/questionnaire_fce/review_of_systems.json';
 import fce_source_queries from './resources/questionnaire_fce/source_queries.json';
 import fce_sub_questionnaire from './resources/questionnaire_fce/sub-questionnaire.json';
@@ -81,6 +82,7 @@ import fhir_practitioner_create_structure_map from './resources/questionnaire_fh
 import fhir_practitioner_edit from './resources/questionnaire_fhir/practitioner_edit.json';
 import fhir_practitioner_role_create from './resources/questionnaire_fhir/practitioner_role_create.json';
 import fhir_public_appointment from './resources/questionnaire_fhir/public_appointment.json';
+import fhir_questionnaire_variable from './resources/questionnaire_fhir/questionnaire_variable.json';
 import fhir_review_of_systems from './resources/questionnaire_fhir/review_of_systems.json';
 import fhir_source_queries from './resources/questionnaire_fhir/source_queries.json';
 import fhir_sub_questionnaire from './resources/questionnaire_fhir/sub-questionnaire.json';
@@ -128,6 +130,7 @@ describe('Questionanire and QuestionnaireResponses transformation', () => {
         ['answerOptionsToggleExpression', fhir_answer_options_toggle_expression, fce_answer_options_toggle_expression],
         ['unit-option', fhir_unit_option, fce_unit_option],
         ['variable', fhir_variable, fce_variable],
+        ['questionnaire-variable', fhir_questionnaire_variable, fce_questionnaire_variable],
         ['sub-questionnaire', fhir_sub_questionnaire, fce_sub_questionnaire],
         ['with-attachment-questionnaire', fhir_with_attachment_questionnaire, fce_with_attachment_questionnaire],
         // NOTE: this following is not included here because it's example of mixed FCE + extensions, it is only for FCE -> FHIR
@@ -180,6 +183,7 @@ describe('Questionanire and QuestionnaireResponses transformation', () => {
         ['answerOptionsToggleExpression', fce_answer_options_toggle_expression, fhir_answer_options_toggle_expression],
         ['unit-option', fce_unit_option, fhir_unit_option],
         ['variable', fce_variable, fhir_variable],
+        ['questionnaire-variable', fce_questionnaire_variable, fhir_questionnaire_variable],
         ['sub-questionnaire', fce_sub_questionnaire, fhir_sub_questionnaire],
         ['with-attachment-questionnaire', fce_with_attachment_questionnaire, fhir_with_attachment_questionnaire],
         ['mixed-fce-with-extensions', fce_mixed_fce_with_extensions, fhir_mixed_fce_with_extensions],

package/src/converter/__tests__/resources/questionnaire_fce/questionnaire_variable.json

@@ -0,0 +1,28 @@
+{
+    "resourceType": "Questionnaire",
+    "id": "questionnaire-variable",
+    "meta": {
+        "profile": [
+            "https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire"
+        ]
+    },
+    "status": "active",
+    "variable": [
+        {
+            "name": "First",
+            "language": "text/fhirpath",
+            "expression": "'First'"
+        },
+        {
+            "name": "Second",
+            "language": "text/fhirpath",
+            "expression": "%First + 'Second'"
+        }
+    ],
+    "item": [
+        {
+            "type": "string",
+            "linkId": "test"
+        }
+    ]
+}

package/src/converter/__tests__/resources/questionnaire_fhir/questionnaire_variable.json

@@ -0,0 +1,32 @@
+{
+    "item": [
+        {
+            "type": "string",
+            "linkId": "test"
+        }
+    ],
+    "meta": {
+        "profile": ["https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire"]
+    },
+    "extension": [
+        {
+            "url": "http://hl7.org/fhir/StructureDefinition/variable",
+            "valueExpression": {
+                "name": "First",
+                "language": "text/fhirpath",
+                "expression": "'First'"
+            }
+        },
+        {
+            "url": "http://hl7.org/fhir/StructureDefinition/variable",
+            "valueExpression": {
+                "name": "Second",
+                "language": "text/fhirpath",
+                "expression": "%First + 'Second'"
+            }
+        }
+    ],
+    "status": "active",
+    "id": "questionnaire-variable",
+    "resourceType": "Questionnaire"
+}

package/src/converter/fceToFhir/questionnaire/processExtensions.ts

@@ -10,6 +10,7 @@ export function processExtensions(questionnaire: FCEQuestionnaire): FHIRQuestion
         assembledFrom,
         assembleContext,
         itemPopulationContext,
+        variable,
         ...fhirQuestionnaire
     } = questionnaire;
 
@@ -107,6 +108,15 @@ export function processExtensions(questionnaire: FCEQuestionnaire): FHIRQuestion
         });
     }
 
+    if (variable) {
+        extensions = extensions.concat(
+            variable.map((expr) => ({
+                url: 'http://hl7.org/fhir/StructureDefinition/variable',
+                valueExpression: expr,
+            })),
+        );
+    }
+
     if (extensions.length) {
         fhirQuestionnaire.extension = (fhirQuestionnaire.extension ?? []).concat(extensions);
     }

package/src/converter/fhirToFce/questionnaire/processExtensions.ts

@@ -8,6 +8,7 @@ export function processExtensions(fhirQuestionnaire: FHIRQuestionnaire): {
     assembledFrom?: any;
     assembleContext?: string[];
     itemPopulationContext?: FHIRExpression;
+    variable?: FHIRExpression[];
 } {
     const launchContext = processLaunchContext(fhirQuestionnaire);
     const mapping = processMapping(fhirQuestionnaire);
@@ -16,6 +17,7 @@ export function processExtensions(fhirQuestionnaire: FHIRQuestionnaire): {
     const assembledFrom = processAssembledFrom(fhirQuestionnaire);
     const assembleContext = processAssembleContext(fhirQuestionnaire);
     const itemPopulationContext = processItemPopulationContext(fhirQuestionnaire);
+    const variable = processVariable(fhirQuestionnaire);
 
     return {
         launchContext: launchContext?.length ? launchContext : undefined,
@@ -25,6 +27,7 @@ export function processExtensions(fhirQuestionnaire: FHIRQuestionnaire): {
         assembledFrom: assembledFrom ? assembledFrom : undefined,
         assembleContext: assembleContext.length ? assembleContext : undefined,
         itemPopulationContext: itemPopulationContext ? itemPopulationContext : undefined,
+        variable: variable?.length ? variable : undefined,
     };
 }
 
@@ -141,3 +144,15 @@ function processItemPopulationContext(fhirQuestionnaire: FHIRQuestionnaire): FHI
 
     return extension.valueExpression;
 }
+
+function processVariable(fhirQuestionnaire: FHIRQuestionnaire): FHIRExpression[] | undefined {
+    const extensions = fhirQuestionnaire.extension?.filter(
+        (ext) => ext.url === 'http://hl7.org/fhir/StructureDefinition/variable',
+    );
+
+    if (!extensions?.length) {
+        return undefined;
+    }
+
+    return extensions.map((ext) => ext.valueExpression!);
+}

package/src/utils.ts

@@ -729,13 +729,14 @@ export function getEnabledQuestions(
 export function calcInitialContext(
     qrfDataContext: QuestionnaireResponseFormData['context'],
     values: FormItems,
+    evaluateFhirpath?: EvaluateFhirpath,
 ): ItemContext {
     const questionnaireResponse = {
         ...qrfDataContext.questionnaireResponse,
         ...mapFormToResponse(values, qrfDataContext.questionnaire),
     };
 
-    return {
+    const baseContext: ItemContext = {
         ...qrfDataContext.launchContextParameters.reduce((acc, { name, resource, ...param }) => {
             const value = getChoiceTypeValue(param, 'value');
 
@@ -754,6 +755,23 @@ export function calcInitialContext(
         Questionnaire: qrfDataContext.questionnaire,
         QuestionnaireResponse: questionnaireResponse,
     };
+
+    // Evaluate questionnaire-level FHIRPath variables in declaration order
+    return (qrfDataContext.fceQuestionnaire.variable ?? []).reduce((ctx: ItemContext, variable) => {
+        if (!variable?.name || !variable.expression || variable.language !== 'text/fhirpath') {
+            console.warn(`Only fhirpath variables are supported. Variable ${variable.name} is not supported.`);
+            return ctx;
+        }
+        return {
+            ...ctx,
+            [variable.name]: evaluateFHIRPathExpression(
+                variable,
+                ctx,
+                `questionnaire.variable.${variable.name}`,
+                evaluateFhirpath,
+            ),
+        };
+    }, baseContext);
 }
 
 export function resolveTemplateExpr(