WIP: Update as_fn function

beda-software · Dec 22, 2023 · aae2beb · aae2beb
1 parent fda4941
commit aae2beb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/fhirpathpy/engine/invocations/types.py b/fhirpathpy/engine/invocations/types.py
@@ -15,6 +15,7 @@ def is_fn(ctx, coll, type_info):
 
 
 def as_fn(ctx, coll, type_info):
+    TypeInfo.model = ctx.get("model")
     if not coll:
         return []
     if len(coll) > 1:

diff --git a/fhirpathpy/engine/nodes.py b/fhirpathpy/engine/nodes.py
@@ -779,7 +779,7 @@ def get_type_info(self):
         if not TypeInfo.model:
             return TypeInfo.create_by_value_in_namespace(namespace=namespace, value=self.data)
 
-        return TypeInfo(namespace=namespace, name="BackboneElement")
+        return TypeInfo(namespace=namespace, name=self.path)
 
     def toJSON(self):
         return json.dumps(self.data)
@@ -805,7 +805,8 @@ def is_type(type_name, super_type):
         while type_name:
             if type_name == super_type:
                 return True
-            type_name = TypeInfo.model.get("type2Parent").get(type_name)
+            # TODO: Double check it
+            type_name = TypeInfo.model.get("type2Parent").get(type_name) or TypeInfo.model.get("path2Type").get(type_name)
         return False
 
     def is_(self, other):