Merge branch 'develop' into copilot/address-mstest-analyzer-warnings

Author: ewoutkramer

src/Benchmarks/Benchmarks.csproj

@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="BenchmarkDotNet" Version="0.15.4" />
+		<PackageReference Include="BenchmarkDotNet" Version="0.15.5" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Hl7.Fhir.Base/FhirPath/Expressions/OrderedNode.cs

@@ -12,7 +12,7 @@
 
 namespace Hl7.FhirPath.Expressions;
 
-internal record OrderedNode(PrimitiveType Primitive, PocoNodeOrList ParentNode, int? Index, string Name = null, bool Descending = false) : PrimitiveNode(Primitive, ParentNode, Index, Name)
+internal record OrderedNode(PrimitiveType Primitive, PocoNode Parent, int? Index, string Name = null, bool Descending = false) : PrimitiveNode(Primitive, Parent, Index, Name)
 {
     internal static OrderedNode FromPrimitiveNode(PocoNode primitiveNode, bool descending = false) =>
         new((PrimitiveType)primitiveNode.Poco, primitiveNode.Parent, primitiveNode.Index, primitiveNode.Name, descending);

src/Hl7.Fhir.Base/Model/IExtendable.cs

@@ -208,9 +208,30 @@ public static void RemoveExtension(this IExtendable extendable, string uri)
             }
         }
 
+        /// <summary>
+        /// Remove all extensions that are specified in the uris list, if any.
+        /// </summary>
+        /// <param name="extendable"></param>
+        /// <param name="uris"></param>
+        internal static void RemoveExtensions(this IExtendable extendable, IEnumerable<string> uris)
+        {
+            var remove = extendable.Extension.Where(ext => uris.Contains(ext.Url)).ToList();
+
+            foreach (var ext in remove)
+                extendable.Extension.Remove(ext);
+
+            if (extendable is IModifierExtendable me)
+            {
+                remove = me.ModifierExtension.Where(ext => uris.Contains(ext.Url)).ToList();
+
+                foreach (var ext in remove)
+                    me.ModifierExtension.Remove(ext);
+            }
+        }
+
 
         /// <summary>
-        /// Add an extension with the given uri and value, removing any pre-existsing extensions
+        /// Add an extension with the given uri and value, removing any pre-existing extensions
         /// with the same uri.
         /// </summary>
         /// <param name="extendable"></param>

src/Hl7.Fhir.Base/Model/PocoNode.Primitives.cs

@@ -62,7 +62,7 @@ public static IEnumerable<PocoNode> FromAnyList(IEnumerable<object> values) =>
         values.Select(v => v as PocoNode ?? ForAnyPrimitive(v));
 }
 
-public record PrimitiveNode(PrimitiveType Primitive, PocoNodeOrList? ParentNode, int? Index, string? Name = null) : PocoNode(Primitive, ParentNode, Index, Name)
+public record PrimitiveNode(PrimitiveType Primitive, PocoNode? Parent, int? Index, string? Name = null) : PocoNode(Primitive, Parent, Index, Name)
 {
     protected override object? ValueInternal => Primitive.ToITypedElementValue();
     internal object? Value => ValueInternal;
@@ -86,10 +86,10 @@ public record PrimitiveNode(PrimitiveType Primitive, PocoNodeOrList? ParentNode,
     protected override string? TextInternal => Primitive.ToString();
 }
 
-internal record PrimitiveListNode(IReadOnlyList<PrimitiveType> Primitives, PocoNodeOrList? ParentNode, string? Name = null) : PocoListNode(Primitives, ParentNode, Name ?? "value")
+internal record PrimitiveListNode(IReadOnlyList<PrimitiveType> Primitives, PocoNode? Parent, string? Name = null) : PocoListNode(Primitives, Parent, Name ?? "value")
 {
     public override IEnumerator<PocoNode> GetEnumerator() =>
-        Primitives.Select((primitive, index) => new PrimitiveNode(primitive, ParentNode, index, Name)).GetEnumerator();
+        Primitives.Select((primitive, index) => new PrimitiveNode(primitive, Parent, index, Name)).GetEnumerator();
 
     internal IEnumerable<object?> Values => Primitives.Select(p => p.JsonValue);
 }

src/Hl7.Fhir.Base/Model/PocoNodeExtensions.cs

@@ -298,7 +298,9 @@ internal static IEnumerable<PocoNode> Where<T>(this PocoListNode pln, Func<T, bo
     /// <typeparam name="T"></typeparam>
     /// <returns></returns>
     public static PocoNode? FirstOrDefault<T>(this IEnumerable<PocoNode> node, Func<T, bool> predicate) where T : Base =>
-        node.FirstOrDefault(n => n.Poco is T t && predicate(t));
+        node is PocoListNode pln
+            ? pln.FirstOrDefault(predicate)
+            : node.FirstOrDefault(n => n.Poco is T t && predicate(t));
 
     /// <summary>
     /// Navigates to a child node or set of child nodes using a path. The path is a string that can contain dot-separated names and array indices, much like navigation in FhirPath.

src/Hl7.Fhir.Base/Model/PocoNodeOrList.cs

@@ -15,13 +15,9 @@ namespace Hl7.Fhir.Model;
 /// A singular node in a POCO node tree. This node represents either a repeating or singular POCO instance.
 /// </summary>
 /// <param name="Name"></param>
-public abstract record PocoNodeOrList(string Name) : IEnumerable<PocoNode>
+/// <param name="Parent"></param>
+public abstract record PocoNodeOrList(string Name, PocoNode? Parent) : IEnumerable<PocoNode>
 {
-    /// <summary>
-    /// The parent of this node. This is always a singular PocoNode. If the Parent field is set to a PocoListNode, this will construct and return the PocoNode at the specified index.
-    /// </summary>
-    public abstract PocoNode? Parent { get; }
-    
     public abstract IEnumerator<PocoNode> GetEnumerator();
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
@@ -36,20 +32,12 @@ public abstract record PocoNodeOrList(string Name) : IEnumerable<PocoNode>
 /// A singular node in a POCO node tree. This node represents a single POCO instance.
 /// </summary>
 /// <param name="Poco"></param>
-/// <param name="ParentNode"></param>
+/// <param name="Parent"></param>
 /// <param name="Index">This Poco's index in a list, if it is contained in one</param>
 /// <param name="Name"></param>
-public partial record PocoNode(Base Poco, PocoNodeOrList? ParentNode, int? Index, string? Name)
-    : PocoNodeOrList(Name ?? Poco.TypeName), ITypedElement, IShortPathGenerator, ISourceNode, IFhirValueProvider, IResourceTypeSupplier, IAnnotatable
+public partial record PocoNode(Base Poco, PocoNode? Parent, int? Index, string? Name)
+    : PocoNodeOrList(Name ?? Poco.TypeName, Parent), ITypedElement, IShortPathGenerator, ISourceNode, IFhirValueProvider, IResourceTypeSupplier, IAnnotatable
 {
-    /// <inheritdoc />
-    public override PocoNode? Parent => ParentNode switch
-    {
-        PocoListNode nodes => nodes[Index!.Value],
-        PocoNode node => node,
-        _ => null
-    };
-
     /// <summary>
     /// Enumerates all children of this node. These can each either be singular or repeating PocoNodes.
     /// </summary>
@@ -83,8 +71,8 @@ private PocoNodeOrList nodeFor(string name, object value) =>
         {
             PrimitiveType primitive => new PrimitiveNode(primitive, this, null, name),
             Base b => new PocoNode(b, this, null, name),
-            IEnumerable<PrimitiveType> primitiveList => new PrimitiveListNode(primitiveList.ToList(), this, name),
-            IEnumerable<Base> list => new PocoListNode(list.ToList(), this, name),
+            IReadOnlyList<PrimitiveType> primitiveList => new PrimitiveListNode(primitiveList.ToList(), this, name),
+            IReadOnlyList<Base> list => new PocoListNode(list.ToList(), this, name),
             _ => throw new InvalidOperationException("Unexpected element in child list")
         };
 
@@ -153,11 +141,10 @@ IEnumerable<object> IAnnotated.Annotations(Type type)
 /// A single node for a repeating element. Note that since a repeating element has a single parent, this cannot be used for grouping "separate" pocos that are not repeating in the specification.
 /// </summary>
 /// <param name="Pocos"></param>
-/// <param name="ParentNode"></param>
+/// <param name="Parent"></param>
 /// <param name="Name"></param>
-public record PocoListNode(IReadOnlyList<Base> Pocos, PocoNodeOrList? ParentNode, string Name) : PocoNodeOrList(Name)
+public record PocoListNode(IReadOnlyList<Base> Pocos, PocoNode? Parent, string Name) : PocoNodeOrList(Name, Parent)
 {
     public PocoNode this[int index] => new(Pocos[index], Parent, index, Name);
-    public override PocoNode? Parent => ParentNode as PocoNode; // safe because FHIR knows no nested lists
     public override IEnumerator<PocoNode> GetEnumerator() => Pocos.Select((poco, index) => new PocoNode(poco, Parent, index, Name)).GetEnumerator();
 }

src/Hl7.Fhir.Base/Specification/Snapshot/SnapshotGeneratorExtensions.cs

@@ -88,6 +88,29 @@ public static void RemoveAllConstrainedByDiffExtensions<T>(this IEnumerable<T> e
             }
         }
 
+        internal static bool HasAnyNonInheritableExtensions(this Element element)
+        {
+            if (element == null) return false;
+            if (element.HasNonInheritableExtensions()) return true;
+#pragma warning disable CS0618 // Type or member is obsolete
+            return element.Children().OfType<Element>().Any(child => child.HasAnyNonInheritableExtensions());
+#pragma warning restore CS0618 // Type or member is obsolete
+        }
+
+        internal static bool HasNonInheritableExtensions(this IExtendable element)
+        {
+            if (element == null) 
+                return false;
+
+            if (element.Extension.Any(ext => _nonInheritableExtensions.Contains(ext.Url)))
+                return true;
+
+            if (element is IModifierExtendable modifierElement)
+                return modifierElement.ModifierExtension.Any(ext => _nonInheritableExtensions.Contains(ext.Url));
+
+            return false;
+        }
+
         /// <summary>
         /// This extension removes all non-inheritable extensions from the specified element definition and all it's child objects.
         /// Non-inheritable extensions are extensions that should not be inherited by derived profiles.
@@ -108,13 +131,10 @@ internal static void RemoveAllNonInheritableExtensions(this Element element)
         internal static void RemoveNonInheritableExtensions(this IExtendable element)
         {
             if (element == null) { throw Error.ArgumentNull(nameof(element)); }
-            foreach (var ext in _nonInheritableExtensions)
-            {
-                element.RemoveExtension(ext);
-            }
+            element.RemoveExtensions(_nonInheritableExtensions);
         }
 
-        private static readonly List<string> _nonInheritableExtensions = [
+        private static readonly HashSet<string> _nonInheritableExtensions = [
          ResourceIdentity.CORE_BASE_URL + "elementdefinition-isCommonBinding",
          ResourceIdentity.CORE_BASE_URL + "structuredefinition-fmm",
          ResourceIdentity.CORE_BASE_URL + "structuredefinition-fmm-no-warnings",

src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs

@@ -233,6 +233,9 @@ public async Tasks.Task<IList<ElementDefinition>> ExpandElementAsync(IList<Eleme
             try
             {
                 await expandElement(nav).ConfigureAwait(false);
+
+                foreach (var elem in nav.Elements)
+                    elem.RemoveAllNonInheritableExtensions();
             }
             finally
             {
@@ -260,7 +263,12 @@ public async Tasks.Task<bool> ExpandElementAsync(ElementDefinitionNavigator nav)
             _stack.OnStartRecursion();
             try
             {
-                return await expandElement(nav).ConfigureAwait(false);
+                var result = await expandElement(nav).ConfigureAwait(false);
+
+                foreach (var elem in nav.Elements)
+                    elem.RemoveAllNonInheritableExtensions();
+
+                return result;
             }
             finally
             {

src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs

@@ -228,6 +228,9 @@ public async Tasks.Task<IList<ElementDefinition>> ExpandElementAsync(IList<Eleme
             try
             {
                 await expandElement(nav).ConfigureAwait(false);
+
+                foreach (var elem in nav.Elements)
+                    elem.RemoveAllNonInheritableExtensions();
             }
             finally
             {
@@ -255,7 +258,12 @@ public async Tasks.Task<bool> ExpandElementAsync(ElementDefinitionNavigator nav)
             _stack.OnStartRecursion();
             try
             {
-                return await expandElement(nav).ConfigureAwait(false);
+                var result = await expandElement(nav).ConfigureAwait(false);
+
+                foreach (var elem in nav.Elements)
+                    elem.RemoveAllNonInheritableExtensions();
+
+                return result;
             }
             finally
             {

src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs

@@ -1424,6 +1424,8 @@ private async Tasks.Task verifyExpandElement(ElementDefinition elem, IList<Eleme
         {
             var expandElemPath = elem.Path;
 
+            Assert.IsFalse(elem.HasAnyNonInheritableExtensions());
+
             // Debug.WriteLine("\r\nOutput:");
             // Debug.WriteLine(string.Join(Environment.NewLine, result.Where(e => e.Path.StartsWith(expandElemPath)).Select(e => e.Path)));