VONK-5093: Validation is using now IScopedNode as input

Firely.Validator.API.sln

@@ -8,8 +8,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{32AC4A3D-A456-4CAC-8458-B0F20103F669}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		firely-validator-api.props = firely-validator-api.props
 		firely-validator-api-tests.props = firely-validator-api-tests.props
+		firely-validator-api.props = firely-validator-api.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7D9F5C18-2827-4975-8FBF-DD45758075AE}"
@@ -27,11 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Firely.Fhir.Validation.Comp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "test\Benchmarks\Benchmarks.csproj", "{1B02120E-C942-448D-A444-6F7EB1816C95}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Hl7.Fhir.Validation.Shared", "src\Hl7.Fhir.Validation.Shared\Hl7.Fhir.Validation.Shared.shproj", "{21BF806C-BBE6-4A33-91F9-BF3AB5F1E70B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hl7.Fhir.Validation.R5.Tests", "test\Hl7.Fhir.Validation.Tests\Hl7.Fhir.Validation.R5.Tests.csproj", "{533FADED-DC64-408D-AF93-E7AE8D9DAF56}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hl7.Fhir.Validation.R4", "src\Hl7.Fhir.Validation.R4\Hl7.Fhir.Validation.R4.csproj", "{22520A59-7EBF-4740-A66C-3651742FAC0B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Firely.Fhir.Validation.R4", "src\Firely.Fhir.Validation.R4\Firely.Fhir.Validation.R4.csproj", "{22520A59-7EBF-4740-A66C-3651742FAC0B}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Firely.Fhir.Validation.Compilation.Shared", "src\Firely.Fhir.Validation.Compilation.Shared\Firely.Fhir.Validation.Compilation.Shared.shproj", "{7794C7D2-EA50-405D-A61A-23F8ECF4228B}"
 EndProject
@@ -45,6 +41,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Firely.Fhir.Validation.Comp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Firely.Fhir.Validation.Compilation.R4.Tests", "test\Firely.Fhir.Validation.Compilation.Tests.R4\Firely.Fhir.Validation.Compilation.R4.Tests.csproj", "{B5968107-6E13-46C1-AB04-7FCEFFF179C7}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Firely.Fhir.Validation.Shared", "src\Firely.Fhir.Validation.Shared\Firely.Fhir.Validation.Shared.shproj", "{21BF806C-BBE6-4A33-91F9-BF3AB5F1E70B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Firely.Fhir.Validation.STU3", "src\Firely.Fhir.Validation.STU3\Firely.Fhir.Validation.STU3.csproj", "{4C9C5275-0C05-4CDE-A74C-1B43245252FB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -76,12 +76,6 @@ Global
 		{1B02120E-C942-448D-A444-6F7EB1816C95}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
 		{1B02120E-C942-448D-A444-6F7EB1816C95}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B02120E-C942-448D-A444-6F7EB1816C95}.Release|Any CPU.Build.0 = Release|Any CPU
-		{533FADED-DC64-408D-AF93-E7AE8D9DAF56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{533FADED-DC64-408D-AF93-E7AE8D9DAF56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{533FADED-DC64-408D-AF93-E7AE8D9DAF56}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{533FADED-DC64-408D-AF93-E7AE8D9DAF56}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
-		{533FADED-DC64-408D-AF93-E7AE8D9DAF56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{533FADED-DC64-408D-AF93-E7AE8D9DAF56}.Release|Any CPU.Build.0 = Release|Any CPU
 		{22520A59-7EBF-4740-A66C-3651742FAC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{22520A59-7EBF-4740-A66C-3651742FAC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{22520A59-7EBF-4740-A66C-3651742FAC0B}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -112,14 +106,19 @@ Global
 		{B5968107-6E13-46C1-AB04-7FCEFFF179C7}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
 		{B5968107-6E13-46C1-AB04-7FCEFFF179C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5968107-6E13-46C1-AB04-7FCEFFF179C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9C5275-0C05-4CDE-A74C-1B43245252FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9C5275-0C05-4CDE-A74C-1B43245252FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9C5275-0C05-4CDE-A74C-1B43245252FB}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9C5275-0C05-4CDE-A74C-1B43245252FB}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9C5275-0C05-4CDE-A74C-1B43245252FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9C5275-0C05-4CDE-A74C-1B43245252FB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{AC070065-936C-4266-9652-5B967C1C4E1F} = {7D9F5C18-2827-4975-8FBF-DD45758075AE}
 		{1B02120E-C942-448D-A444-6F7EB1816C95} = {7D9F5C18-2827-4975-8FBF-DD45758075AE}
-		{533FADED-DC64-408D-AF93-E7AE8D9DAF56} = {7D9F5C18-2827-4975-8FBF-DD45758075AE}
 		{DFEFC934-BF53-4CD2-9C05-992062378F2A} = {7D9F5C18-2827-4975-8FBF-DD45758075AE}
 		{994A42C0-396B-48B6-81A0-4E622460ECAB} = {7D9F5C18-2827-4975-8FBF-DD45758075AE}
 		{F0695E43-0242-4D14-BFF7-4D0F36B0DAD8} = {7D9F5C18-2827-4975-8FBF-DD45758075AE}
@@ -130,8 +129,8 @@ Global
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Firely.Fhir.Validation.Compilation.Shared\Firely.Fhir.Validation.Compilation.Shared.projitems*{052b9175-3a5b-46ca-b677-8d082c9a6063}*SharedItemsImports = 5
-		src\Hl7.Fhir.Validation.Shared\Hl7.Fhir.Validation.Shared.projitems*{21bf806c-bbe6-4a33-91f9-bf3ab5f1e70b}*SharedItemsImports = 13
-		src\Hl7.Fhir.Validation.Shared\Hl7.Fhir.Validation.Shared.projitems*{22520a59-7ebf-4740-a66c-3651742fac0b}*SharedItemsImports = 5
+		src\Firely.Fhir.Validation.Shared\Firely.Fhir.Validation.Shared.projitems*{22520a59-7ebf-4740-a66c-3651742fac0b}*SharedItemsImports = 5
+		src\Firely.Fhir.Validation.Shared\Firely.Fhir.Validation.Shared.projitems*{4c9c5275-0c05-4cde-a74c-1b43245252fb}*SharedItemsImports = 5
 		src\Firely.Fhir.Validation.Compilation.Shared\Firely.Fhir.Validation.Compilation.Shared.projitems*{7391862b-ac99-40c5-a616-dc83edd83a88}*SharedItemsImports = 5
 		src\Firely.Fhir.Validation.Compilation.Shared\Firely.Fhir.Validation.Compilation.Shared.projitems*{7794c7d2-ea50-405d-a61a-23f8ecf4228b}*SharedItemsImports = 13
 		test\Firely.Fhir.Validation.Compilation.Tests.Shared\Firely.Fhir.Validation.Compilation.Tests.Shared.projitems*{994a42c0-396b-48b6-81a0-4e622460ecab}*SharedItemsImports = 5

build/variables.yml

@@ -5,6 +5,6 @@
 variables:
   buildConfiguration: 'Release'
   vmImage: 'windows-latest'
-  DOTNET_CORE_SDK: '6.0.x'
+  DOTNET_CORE_SDK: '8.0.x'
   GITHUB_PACKAGES_APIKEY: $(GitHubPushPackagesAPIKey) # key is set in variable group APIKeys
   NUGET_APIKEY: $(NuGetAPIKey) # key is set in variable group APIKeys

firely-validator-api-tests.props

@@ -2,15 +2,15 @@
 
 	<PropertyGroup>
 		<ContainsTests>true</ContainsTests>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<IsPackable>false</IsPackable>
 		<!-- Missing XML comments -->
 		<NoWarn>1591</NoWarn>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<FirelySdkVersion>5.3.0</FirelySdkVersion>
+		<FirelySdkVersion>5.4.1-20231207.3</FirelySdkVersion>
 		<LegacyValidatorVersion>5.1.0</LegacyValidatorVersion>
 	</PropertyGroup>
 

firely-validator-api.props

@@ -2,11 +2,11 @@
 
 	<!-- Solution-wide properties for NuGet packaging -->
 	<PropertyGroup>
-		<VersionPrefix>1.1.1</VersionPrefix>
+		<VersionPrefix>1.2.0-alpha5</VersionPrefix>
 		<Authors>Firely</Authors>
 		<Company>Firely (https://fire.ly)</Company>
 		<Copyright>Copyright 2015-2022 Firely</Copyright>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<RepositoryUrl>https://github.com/FirelyTeam/firely-serverless-validator</RepositoryUrl>
 	</PropertyGroup>
 
@@ -19,7 +19,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<FirelySdkVersion>5.3.0</FirelySdkVersion>
+		<FirelySdkVersion>5.4.1-20231207.3</FirelySdkVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -28,6 +28,7 @@
 		<IncludeSymbols>true</IncludeSymbols>
 		<Optimize>false</Optimize>
 		<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
+		<LibraryPKHash></LibraryPKHash>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -38,11 +39,14 @@
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+		<LibraryPKHash>0024000004800000940000000602000000240000525341310004000001000100c11eea5df3095844b027f018b356bc326a5a30b1f245010ad789589aa685569b2eb7f5f2ea5c49dafed338e3d9969eab21848c6c20a6b0a22c5ff7797d9a5062d7f3e42478e905d72a3dde344086a003f2df9deeb838e206d92c8cc59150c3151e9490381321f77a716e0a2b24a585b302ba2b3db37966a3da9abe4c601ba4c1</LibraryPKHash>
+		<WarningsNotAsErrors>NU5104</WarningsNotAsErrors>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<!-- Error	CS4014	Because this call is not awaited, execution of the current method continues before the call is completed. 
     Consider applying the 'await' operator to the result of the call.	-->
 		<WarningsAsErrors>CS4014</WarningsAsErrors>
+		<WarningsNotAsErrors>NU5104</WarningsNotAsErrors>
 	</PropertyGroup>
 </Project>

src/Firely.Fhir.Validation.Compilation.STU3/Firely.Fhir.Validation.Compilation.STU3.csproj

@@ -15,9 +15,12 @@
 
 	<ItemGroup>
 		<PackageReference Include="Hl7.Fhir.STU3" Version="$(FirelySdkVersion)" />
+		<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.23472.1" PrivateAssets="All" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\Firely.Fhir.Validation\Firely.Fhir.Validation.csproj" />
+		<ProjectReference Include="..\Firely.Fhir.Validation\Firely.Fhir.Validation.csproj" />		
+		<InternalsVisibleTo Include="Firely.Fhir.Validation.STU3" Key="$(LibraryPKHash)" />
+		<InternalsVisibleTo Include="Firely.Fhir.Validation.Compilation.STU3.Tests" Key="$(LibraryPKHash)" />
 	</ItemGroup>
 </Project>

src/Firely.Fhir.Validation.Compilation.STU3/Properties/AssemblyInfo.cs

@@ -13,10 +13,10 @@
 
 #if DEBUG
 [assembly: InternalsVisibleTo("Firely.Fhir.Validation.Tests")]
-[assembly: InternalsVisibleTo("Firely.Fhir.Validation.Compilation.Tests.STU3")]
+[assembly: InternalsVisibleTo("Firely.Fhir.Validation.Compilation.STU3.Tests")]
 #endif
 
 #if RELEASE
 [assembly: InternalsVisibleTo("Firely.Fhir.Validation.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c11eea5df3095844b027f018b356bc326a5a30b1f245010ad789589aa685569b2eb7f5f2ea5c49dafed338e3d9969eab21848c6c20a6b0a22c5ff7797d9a5062d7f3e42478e905d72a3dde344086a003f2df9deeb838e206d92c8cc59150c3151e9490381321f77a716e0a2b24a585b302ba2b3db37966a3da9abe4c601ba4c1")]
-[assembly: InternalsVisibleTo("Firely.Fhir.Validation.Compilation.Tests.STU3, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c11eea5df3095844b027f018b356bc326a5a30b1f245010ad789589aa685569b2eb7f5f2ea5c49dafed338e3d9969eab21848c6c20a6b0a22c5ff7797d9a5062d7f3e42478e905d72a3dde344086a003f2df9deeb838e206d92c8cc59150c3151e9490381321f77a716e0a2b24a585b302ba2b3db37966a3da9abe4c601ba4c1")]
+[assembly: InternalsVisibleTo("Firely.Fhir.Validation.Compilation.STU3.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c11eea5df3095844b027f018b356bc326a5a30b1f245010ad789589aa685569b2eb7f5f2ea5c49dafed338e3d9969eab21848c6c20a6b0a22c5ff7797d9a5062d7f3e42478e905d72a3dde344086a003f2df9deeb838e206d92c8cc59150c3151e9490381321f77a716e0a2b24a585b302ba2b3db37966a3da9abe4c601ba4c1")]
 #endif

src/Firely.Fhir.Validation.Compilation.STU3/PublicAPI.Shipped.txt

@@ -0,0 +1 @@
+

src/Firely.Fhir.Validation.Compilation.STU3/PublicAPI.Unshipped.txt

@@ -0,0 +1,8 @@
+#nullable enable
+Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver
+Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.Nested.get -> Hl7.Fhir.Specification.Source.IAsyncResourceResolver!
+Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.ResolveByCanonicalUri(string! uri) -> Hl7.Fhir.Model.Resource?
+Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.ResolveByCanonicalUriAsync(string! uri) -> System.Threading.Tasks.Task<Hl7.Fhir.Model.Resource?>!
+Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.ResolveByUri(string! uri) -> Hl7.Fhir.Model.Resource?
+Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.ResolveByUriAsync(string! uri) -> System.Threading.Tasks.Task<Hl7.Fhir.Model.Resource?>!
+Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.StructureDefinitionCorrectionsResolver(Hl7.Fhir.Specification.Source.ISyncOrAsyncResourceResolver! nested) -> void

src/Firely.Fhir.Validation.Compilation.Shared/CommonTypeRefComponentExtensions.cs

@@ -5,7 +5,6 @@
  */
 
 using Hl7.Fhir.Model;
-using Hl7.Fhir.Validation;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Firely.Fhir.Validation.Compilation.Shared/DiscriminatorFactory.cs

@@ -9,7 +9,6 @@
 using Hl7.Fhir.Specification.Navigation;
 using Hl7.Fhir.Specification.Source;
 using Hl7.Fhir.Utility;
-using Hl7.Fhir.Validation;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Firely.Fhir.Validation.Compilation.Shared/ElementConversionMode.cs

@@ -12,7 +12,7 @@ namespace Firely.Fhir.Validation.Compilation
     /// Determines which kind of schema we want to generate from the
     /// element.
     /// </summary>
-    public enum ElementConversionMode
+    internal enum ElementConversionMode
     {
         /// <summary>
         /// Generate a schema which includes all constraints represented

src/Firely.Fhir.Validation.Compilation.Shared/EnterpriseSchemaBuilders/ElementDefinitionBuilder.cs

@@ -6,7 +6,7 @@ namespace Firely.Fhir.Validation.Compilation
     /// <summary>
     /// The schema builder for the <see cref="ElementDefinitionValidator"/>.
     /// </summary>
-    public class ElementDefinitionBuilder : ISchemaBuilder
+    internal class ElementDefinitionBuilder : ISchemaBuilder
     {
         /// <inheritdoc/>
         public IEnumerable<IAssertion> Build(ElementDefinitionNavigator nav, ElementConversionMode? conversionMode = ElementConversionMode.Full)

src/Firely.Fhir.Validation.Compilation.Shared/EnterpriseSchemaBuilders/StructureDefinitionBuilder.cs

@@ -6,7 +6,7 @@ namespace Firely.Fhir.Validation.Compilation
     /// <summary>
     /// The schema builder for the <see cref="ElementDefinitionValidator"/>.
     /// </summary>
-    public class StructureDefinitionBuilder : ISchemaBuilder
+    internal class StructureDefinitionBuilder : ISchemaBuilder
     {
         /// <inheritdoc/>
         public IEnumerable<IAssertion> Build(ElementDefinitionNavigator nav, ElementConversionMode? conversionMode = ElementConversionMode.Full)

src/Firely.Fhir.Validation.Compilation.Shared/ISchemaBuilder.cs

@@ -12,7 +12,7 @@ namespace Firely.Fhir.Validation.Compilation
     /// <summary>
     /// An interface for implementing a schema builder. Utilize this to extend the schema.
     /// </summary>
-    public interface ISchemaBuilder
+    internal interface ISchemaBuilder
     {
         /// <summary>
         /// Constucts a schema block.

src/Firely.Fhir.Validation.Compilation.Shared/SchemaBuilder.cs

@@ -9,7 +9,6 @@
 using Hl7.Fhir.Specification.Source;
 using Hl7.Fhir.Support;
 using Hl7.Fhir.Utility;
-using Hl7.Fhir.Validation;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,7 +20,7 @@ namespace Firely.Fhir.Validation.Compilation
     /// Converts the constraints in a <see cref="StructureDefinition"/> to an
     /// <see cref="ElementSchema"/>, which can then be used for validation.
     /// </summary>
-    public class SchemaBuilder : ISchemaBuilder
+    internal class SchemaBuilder : ISchemaBuilder
     {
         /// <summary>
         /// The resolver to use when the <see cref="StructureDefinition"/> under conversion

src/Firely.Fhir.Validation.Compilation.Shared/SchemaBuilders/BaseSchemaBuilder.cs

@@ -16,7 +16,7 @@ namespace Firely.Fhir.Validation.Compilation
     /// you can directly implement the <see cref="Build(ElementDefinition, StructureDefinition, bool, ElementConversionMode?)"/>
     /// method using the <see cref="ElementDefinition"/> parameter instead of the <see cref="ElementDefinitionNavigator"/>.
     /// </summary>
-    public abstract class BaseSchemaBuilder : ISchemaBuilder
+    internal abstract class BaseSchemaBuilder : ISchemaBuilder
     {
         /// <inheritdoc/>
         public IEnumerable<IAssertion> Build(ElementDefinitionNavigator nav,

src/Firely.Fhir.Validation.Compilation.Shared/SchemaBuilders/BindingBuilder.cs

@@ -6,7 +6,6 @@
 
 using Hl7.Fhir.Model;
 using Hl7.Fhir.Specification.Navigation;
-using Hl7.Fhir.Validation;
 using System.Collections.Generic;
 
 namespace Firely.Fhir.Validation.Compilation

src/Firely.Fhir.Validation.Compilation.Shared/SchemaBuilders/FixedBuilder.cs

@@ -4,8 +4,6 @@
  * via any medium is strictly prohibited.
  */
 
-using Hl7.Fhir.ElementModel;
-using Hl7.Fhir.Introspection;
 using Hl7.Fhir.Specification.Navigation;
 using System.Collections.Generic;
 
@@ -25,7 +23,7 @@ public IEnumerable<IAssertion> Build(ElementDefinitionNavigator nav, ElementConv
             var def = nav.Current;
 
             if (def.Fixed is not null)
-                yield return new FixedValidator(def.Fixed.ToTypedElement(ModelInspector.Base));
+                yield return new FixedValidator(def.Fixed);
         }
     }
 }

src/Firely.Fhir.Validation.Compilation.Shared/SchemaBuilders/PatternBuilder.cs

@@ -4,8 +4,6 @@
  * via any medium is strictly prohibited.
  */
 
-using Hl7.Fhir.ElementModel;
-using Hl7.Fhir.Introspection;
 using Hl7.Fhir.Specification.Navigation;
 using System.Collections.Generic;
 
@@ -25,7 +23,7 @@ public IEnumerable<IAssertion> Build(ElementDefinitionNavigator nav, ElementConv
             var def = nav.Current;
 
             if (def.Pattern is not null)
-                yield return new PatternValidator(def.Pattern.ToTypedElement(ModelInspector.Base));
+                yield return new PatternValidator(def.Pattern);
         }
     }
 }