Add support for array expression. Closes #20

Author: ruscoder

CHANGELOG.md

@@ -0,0 +1,7 @@
+## 0.1.0
+
+- Add `{[ expr ]}` that always returns an array #20
+
+## 0.0.1
+
+- Initial PyPI release

python/fpml/core/extract.py

@@ -125,10 +125,17 @@ def process_template_string(
     context: Context,
     fp_options: Optional[FPOptions],
 ) -> Any:
-    template_regexp = re.compile(r"{{\+?\s*([\s\S]+?)\s*\+?}}")
+    array_template_regexp = re.compile(r"{\[\s*([\s\S]+?)\s*\]}")
+
+    match = array_template_regexp.match(node)
+    if match:
+        expr = match.group(1)
+        return evaluate_expression(path, resource, expr, context, fp_options) 
+
+    single_template_regexp = re.compile(r"{{\+?\s*([\s\S]+?)\s*\+?}}")
     result = node
 
-    for match in template_regexp.finditer(node):
+    for match in single_template_regexp.finditer(node):
         expr = match.group(1)
         try:
             replacement = evaluate_expression(path, resource, expr, context, fp_options)[0]

python/pyproject.toml

@@ -1,5 +1,6 @@
 [project]
 name = "fpml"
+version = "0.1.0"
 description = "The FHIRPath mapping language is a data DSL designed to convert data from QuestionnaireResponse (and not only) to any FHIR Resource."
 authors = [{ name = "Beda Software", email = "ilya@beda.software" }]
 maintainers = [
@@ -9,7 +10,7 @@ maintainers = [
 license = { text = "MIT" }
 requires-python = ">=3.9"
 keywords = ["fhir", "fhirpath"]
-dynamic = ["version", "classifiers"]
+dynamic = ["classifiers"]
 dependencies = ["fhirpathpy (>=1.2.1,<2.0.0)"]
 
 [project.urls]
@@ -19,7 +20,6 @@ documentation = "https://github.com/beda-software/FHIRPathMappingLanguage/tree/m
 "Bug Tracker" = "https://github.com/beda-software/FHIRPathMappingLanguage/issues"
 
 [tool.poetry]
-version = "0.0.1"
 packages = [{ include = "fpml" }]
 classifiers = [
     "Development Status :: 5 - Production/Stable",

python/tests/core/test_extract.py

@@ -125,6 +125,11 @@ def test_transformation_fails_with_incorrect_fhirpath_expression() -> None:
         resolve_template({}, "{{ item.where(linkId='a) }}")
 
 
+def test_transformation_for_array_template_works_properly() -> None:
+    resource: Resource = {"list": [{"key": 1}, {"key": 2}]}
+    assert resolve_template(resource, "{[ list.key ]}") == [1, 2]
+
+
 def test_context_block_resolve_template() -> None:
     resource: Resource = {
         "foo": "bar",

tests/__data__/complex-example.aidbox.template.yaml

@@ -2,12 +2,10 @@ body:
   "{% assign %}":
     - patientId: "{{ %Patient.id }}"
     - recordedDate: "{{ %QuestionnaireResponse.authored }}"
-    - provenanceTargetIds:
-        "{% for id in %Provenance.target.id %}": "{{ %id }}"
+    - provenanceTargetIds: "{[ %Provenance.target.id ]}"
     - weight: "{{ repeat(item).where(linkId='WEIGHT').answer.value.children() }}"
     - height: "{{ repeat(item).where(linkId='HEIGHT').answer.value.children() }}"
-    - medConditions:
-        "{% for answer in repeat(item).where(linkId in 'MEDCOND1' | 'MEDCOND2').answer.value.children() %}": "{{ %answer }}"
+    - medConditions: "{[ repeat(item).where(linkId in 'MEDCOND1' | 'MEDCOND2').answer.value.children() ]}"
     - observationEntries:
         - "{% if %weight.exists() and %height.exists() %}":
             "{% assign %}":

tests/__data__/complex-example.fhir.template.yaml

@@ -2,12 +2,10 @@ body:
   "{% assign %}":
     - patientRef: "Patient/{{ %Patient.id }}"
     - recordedDate: "{{ %QuestionnaireResponse.authored }}"
-    - provenanceTargetIds:
-        "{% for id in %Provenance.target.select(reference.split('/').last()) %}": "{{ %id }}"
+    - provenanceTargetIds: "{[ %Provenance.target.select(reference.split('/').last()) ]}"
     - weight: "{{ repeat(item).where(linkId='WEIGHT').answer.value }}"
     - height: "{{ repeat(item).where(linkId='HEIGHT').answer.value }}"
-    - medConditions:
-        "{% for answer in repeat(item).where(linkId in 'MEDCOND1' | 'MEDCOND2').answer.value %}": "{{ %answer }}"
+    - medConditions: "{[ repeat(item).where(linkId in 'MEDCOND1' | 'MEDCOND2').answer.value ]}"
     - observationEntries:
         - "{% if %weight.exists() and %height.exists() %}":
             "{% assign %}":

ts/server/src/core/extract.spec.ts

@@ -121,6 +121,12 @@ describe('Transformation', () => {
             FPMLValidationError,
         );
     });
+
+    test('array template works properly', () => {
+        expect(resolveTemplate({ list: [{ key: 1 }, { key: 2 }] }, '{[ list.key ]}')).toStrictEqual(
+            [1, 2],
+        );
+    });
 });
 
 describe('Context block', () => {

ts/server/src/core/extract.ts

@@ -119,6 +119,14 @@ function processTemplateString(
         | RegExpExecArray
         | { [Symbol.replace](string: string, replaceValue: string): string }[];
 
+    const arrayTemplateRegExp = /{\[\s*([\s\S]+?)\s*\]}/g;
+    match = arrayTemplateRegExp.exec(node);
+    if (match) {
+        const expr = match[1];
+
+        return evaluateExpression(path, resource, expr, context, model, fpOptions);
+    }
+
     const singleTemplateRegExp = /{{\+?\s*([\s\S]+?)\s*\+?}}/g;
     let result: any = node;