Fix existence and filtering

beda-software · Dec 20, 2023 · 05e7bd3 · 05e7bd3
1 parent bd46761
commit 05e7bd3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/fhirpathpy/engine/invocations/existence.py b/fhirpathpy/engine/invocations/existence.py
@@ -41,7 +41,8 @@ def exists_macro(ctx, coll, expr=None):
 
 
 def all_macro(ctx, colls, expr):
-    for coll in colls:
+    for i, coll in enumerate(colls):
+        ctx["$index"] = i
         if not util.is_true(expr(coll)):
             return [False]
 

diff --git a/fhirpathpy/engine/invocations/filtering.py b/fhirpathpy/engine/invocations/filtering.py
@@ -23,14 +23,27 @@ def where_macro(ctx, data, expr):
     if not isinstance(data, list):
         return []
 
-    return util.flatten([x for x in data if check_macro_expr(expr, x)])
+    result = []
+
+    for i, x in enumerate(data):
+        ctx["$index"] = i
+        if check_macro_expr(expr, x):
+            result.append(x)
+
+    return util.flatten(result)
 
 
 def select_macro(ctx, data, expr):
     if not isinstance(data, list):
         return []
 
-    return util.flatten([expr(x) for x in data])
+    result = []
+
+    for i, x in enumerate(data):
+        ctx["$index"] = i
+        result.append(expr(x))
+
+    return util.flatten(result)
 
 
 def repeat_macro(ctx, data, expr):