Merge pull request #353 from FirelyTeam/feature/FP-invariant-rootreso…

…urce-fix Added root resource to the evaluation context of FP invariant evaluation
FirelyTeam · Sep 12, 2024 · d77a9de · d77a9de
2 parents 194c9e4 + 89ecc28
commit d77a9de
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/firely-validator-api-tests.props b/firely-validator-api-tests.props
@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<FirelySdkVersion>5.9.1</FirelySdkVersion>
+		<FirelySdkVersion>5.10.1</FirelySdkVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/firely-validator-api.props b/firely-validator-api.props
@@ -27,7 +27,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<FirelySdkVersion>5.9.1</FirelySdkVersion>
+		<FirelySdkVersion>5.10.1</FirelySdkVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/src/Firely.Fhir.Validation/Impl/FhirPathValidator.cs b/src/Firely.Fhir.Validation/Impl/FhirPathValidator.cs
@@ -110,11 +110,13 @@ internal override (bool, ResultReport?) RunInvariant(IScopedNode input, Validati
             try
             {
                 ScopedNode node = input.ToScopedNode();
-                var context = new FhirEvaluationContext(node.ResourceContext)
+                var context = new FhirEvaluationContext() //%resource is the parent resource, but if we are in the root, it is the resource itself
                 {
                     TerminologyService = new ValidateCodeServiceToTerminologyServiceAdapter(vc.ValidateCodeService)
                 };
-                return (predicate(node, context, vc), null);
+
+                var success = predicate(node, context, vc);
+                return (success, null);
             }
             catch (Exception e)
             {

diff --git a/test/Firely.Fhir.Validation.Compilation.Tests.Shared/FhirTestCases b/test/Firely.Fhir.Validation.Compilation.Tests.Shared/FhirTestCases