temporary downgrade to 5.7.1-20240403.17

FirelyTeam · May 1, 2024 · 5ca4e9c · 5ca4e9c
1 parent 0299005
commit 5ca4e9c
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 14 deletions.
diff --git a/firely-validator-api-tests.props b/firely-validator-api-tests.props
@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<FirelySdkVersion>5.8.0</FirelySdkVersion>
+		<FirelySdkVersion>5.7.1-20240403.17</FirelySdkVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

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

diff --git a/src/Firely.Fhir.Validation/Schema/ValueElementNode.cs b/src/Firely.Fhir.Validation/Schema/ValueElementNode.cs
@@ -23,10 +23,11 @@ public ValueElementNode(IScopedNode wrapped)
 
         public string Name => "value";
 
-        public string? InstanceType => (_wrapped.Value is not null) ? TypeSpecifier.ForNativeType(_wrapped.Value.GetType()).FullName : null;
+        public string InstanceType => TypeSpecifier.ForNativeType(_wrapped.Value!.GetType()).FullName;
 
-        public object? Value => _wrapped.Value;
+        public object Value => _wrapped.Value!;
 
         public IEnumerable<IScopedNode> Children(string? name = null) => Enumerable.Empty<IScopedNode>();
+
     }
 }
diff --git a/src/Firely.Fhir.Validation/Support/ScopedNodeToTypedElementAdapter.cs b/src/Firely.Fhir.Validation/Support/ScopedNodeToTypedElementAdapter.cs
@@ -36,9 +36,9 @@ public ScopedNodeToTypedElementAdapter(IScopedNode adaptee)
 
         public string Name => _adaptee.Name;
 
-        public string? InstanceType => _adaptee.InstanceType;
+        public string InstanceType => _adaptee.InstanceType!;
 
-        public object? Value => _adaptee.Value;
+        public object Value => _adaptee.Value!;
 
         public IEnumerable<ITypedElement> Children(string? name = null) =>
             _adaptee.Children(name).Select(n => new ScopedNodeToTypedElementAdapter(n));

diff --git a/src/Firely.Fhir.Validation/Support/TypedElementToIScopedNodeToAdapter.cs b/src/Firely.Fhir.Validation/Support/TypedElementToIScopedNodeToAdapter.cs
@@ -29,9 +29,9 @@ private TypedElementToIScopedNodeToAdapter(ITypedElement adaptee)
 
         public string Name => _adaptee.Name;
 
-        public string? InstanceType => _adaptee.InstanceType;
+        public string InstanceType => _adaptee.InstanceType!;
 
-        public object? Value => _adaptee.Value;
+        public object Value => _adaptee.Value!;
 
         IEnumerable<IScopedNode> IBaseElementNavigator<IScopedNode>.Children(string? name) =>
             _adaptee.Children(name).Select(n => new TypedElementToIScopedNodeToAdapter(n));

diff --git a/...tion.Compilation.Tests.R4/TestData/issue-165/conformance/Extension-gender-amtlich-de.json b/...tion.Compilation.Tests.R4/TestData/issue-165/conformance/Extension-gender-amtlich-de.json
@@ -0,0 +1 @@
+{"resourceType":"StructureDefinition","id":"gender-amtlich-de","url":"http://fhir.de/StructureDefinition/gender-amtlich-de","version":"0.9.13","name":"GenderAmtlichDE","title":"Differenzierung des administrativen Geschlechts 'other'","status":"draft","experimental":true,"date":"2019-07-06","publisher":"HL7 Deutschland e.V. (Technisches Komitee FHIR)","contact":[{"telecom":[{"system":"url","value":"http://hl7.de/technische-komitees/fhir/"}]}],"description":"Extension zur genaueren Differenzierung des administrativen Geschlechts 'other', vgl. https://wiki.hl7.de/index.php?title=Geschlecht#administratives_Geschlecht.","copyright":"HL7 Deutschland e.V.","fhirVersion":"4.0.1","kind":"complex-type","abstract":false,"context":[{"type":"element","expression":"Patient.gender"},{"type":"element","expression":"RelatedPerson.gender"},{"type":"element","expression":"Person.gender"},{"type":"element","expression":"Practitioner.gender"},{"type":"element","expression":"Patient.contact.gender"}],"type":"Extension","baseDefinition":"http://hl7.org/fhir/StructureDefinition/Extension","derivation":"constraint","differential":{"element":[{"id":"Extension.url","path":"Extension.url","fixedUri":"http://fhir.de/StructureDefinition/gender-amtlich-de"},{"id":"Extension.value[x]","path":"Extension.value[x]","min":1,"type":[{"code":"Coding"}],"binding":{"strength":"required","valueSet":"http://fhir.de/ValueSet/gender-amtlich-de"}}]}}
diff --git a/test/Firely.Fhir.Validation.Compilation.Tests.R4/TestData/issue-165/data/FOR_Patient.json b/test/Firely.Fhir.Validation.Compilation.Tests.R4/TestData/issue-165/data/FOR_Patient.json
@@ -1 +1,57 @@
-{"resourceType":"Patient","id":"9774f67f-a238-4daf-b4e6-679deeef3811","meta":{"profile":["https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient|1.0.3"]},"identifier":[{"type":{"coding":[{"system":"http://fhir.de/CodeSystem/identifier-type-de-basis","code":"GKV"}]},"system":"http://fhir.de/NamingSystem/gkv/kvid-10","value":"X234567890"}],"name":[{"use":"official","family":"Königsstein","_family":{"extension":[{"url":"http://hl7.org/fhir/StructureDefinition/humanname-own-name","valueString":"Königsstein"}]},"given":["Ludger"]}],"birthDate":"1935-06-22","address":[{"type":"both","line":["Musterstr. 1"],"_line":[{"extension":[{"url":"http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber","valueString":"1"},{"url":"http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName","valueString":"Musterstr."}]}],"city":"Berlin","postalCode":"10623"}]}
+{
+  "resourceType": "Patient",
+  "id": "9774f67f-a238-4daf-b4e6-679deeef3811",
+  "meta": { "profile": [ "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient|1.0.3" ] },
+  "identifier": [
+    {
+      "type": {
+        "coding": [
+          {
+            "system": "http://fhir.de/CodeSystem/identifier-type-de-basis",
+            "code": "GKV"
+          }
+        ]
+      },
+      "system": "http://fhir.de/NamingSystem/gkv/kvid-10",
+      "value": "X234567890"
+    }
+  ],
+  "name": [
+    {
+      "use": "official",
+      "family": "Königsstein",
+      "_family": {
+        "extension": [
+          {
+            "url": "http://hl7.org/fhir/StructureDefinition/humanname-own-name",
+            "valueString": "Königsstein"
+          }
+        ]
+      },
+      "given": [ "Ludger" ]
+    }
+  ],
+  "birthDate": "1935-06-22",
+  "address": [
+    {
+      "type": "both",
+      "line": [ "Musterstr. 1" ],
+      "_line": [
+        {
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber",
+              "valueString": "1"
+            },
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName",
+              "valueString": "Musterstr."
+            }
+          ]
+        }
+      ],
+      "city": "Berlin",
+      "postalCode": "10623"
+    }
+  ]
+}
diff --git a/test/Firely.Fhir.Validation.Compilation.Tests.R4/TestData/issue-165/fhirpkg.lock.json b/test/Firely.Fhir.Validation.Compilation.Tests.R4/TestData/issue-165/fhirpkg.lock.json
@@ -1,5 +1,5 @@
 {
-  "updated": "2024-02-15T16:22:23.5553277+01:00",
+  "updated": "2024-05-01T11:00:27.5683748+02:00",
   "dependencies": {
     "kbv.ita.erp": "1.0.2",
     "hl7.fhir.r4.core": "4.0.1",

diff --git a/test/Firely.Fhir.Validation.Compilation.Tests.Shared/ValidationIntegrationTests.cs b/test/Firely.Fhir.Validation.Compilation.Tests.Shared/ValidationIntegrationTests.cs
@@ -159,9 +159,9 @@ public async Task CheckResolver()
             if (Directory.Exists(conformanceDirectory))
                 sources.Add(new DirectorySource(conformanceDirectory));
 
-            //var externalPackagesManifest = Path.Combine(suiteDirectory, PackageFileNames.MANIFEST);
-            //if (File.Exists(externalPackagesManifest))
-            //    sources.Add();
+            var externalPackagesManifest = Path.Combine(suiteDirectory, PackageFileNames.MANIFEST);
+            if (File.Exists(externalPackagesManifest))
+                sources.Add(NpmPackageHelper.Create(M.ModelInfo.ModelInspector, suiteDirectory).Result);
 
             var usecasePackageSource = NpmPackageHelper.Create(M.ModelInfo.ModelInspector, suiteDirectory).Result;
 
@@ -174,7 +174,7 @@ public async Task CheckResolver()
             var profileSource = new SnapshotSource(new CachedResolver(combinedSource));
 
 
-            var result = await usecasePackageSource.ResolveByCanonicalUriAsync("http://fhir.de/StructureDefinition/gender-amtlich-de|0.9.13");
+            var result = await profileSource.ResolveByCanonicalUriAsync("https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient");
 
             result.Should().NotBeNull();
         }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"resourceType":"StructureDefinition","id":"gender-amtlich-de","url":"http://fhir.de/StructureDefinition/gender-amtlich-de","version":"0.9.13","name":"GenderAmtlichDE","title":"Differenzierung des administrativen Geschlechts 'other'","status":"draft","experimental":true,"date":"2019-07-06","publisher":"HL7 Deutschland e.V. (Technisches Komitee FHIR)","contact":[{"telecom":[{"system":"url","value":"http://hl7.de/technische-komitees/fhir/"}]}],"description":"Extension zur genaueren Differenzierung des administrativen Geschlechts 'other', vgl. https://wiki.hl7.de/index.php?title=Geschlecht#administratives_Geschlecht.","copyright":"HL7 Deutschland e.V.","fhirVersion":"4.0.1","kind":"complex-type","abstract":false,"context":[{"type":"element","expression":"Patient.gender"},{"type":"element","expression":"RelatedPerson.gender"},{"type":"element","expression":"Person.gender"},{"type":"element","expression":"Practitioner.gender"},{"type":"element","expression":"Patient.contact.gender"}],"type":"Extension","baseDefinition":"http://hl7.org/fhir/StructureDefinition/Extension","derivation":"constraint","differential":{"element":[{"id":"Extension.url","path":"Extension.url","fixedUri":"http://fhir.de/StructureDefinition/gender-amtlich-de"},{"id":"Extension.value[x]","path":"Extension.value[x]","min":1,"type":[{"code":"Coding"}],"binding":{"strength":"required","valueSet":"http://fhir.de/ValueSet/gender-amtlich-de"}}]}}