#2910 Make Base implement IScopedNode - phase 1

src/Hl7.Fhir.Base/ElementModel/ITypedElement.cs

@@ -7,6 +7,7 @@
  */
 
 using Hl7.Fhir.Specification;
+using System.Collections.Generic;
 
 #nullable enable
 
@@ -22,10 +23,52 @@ namespace Hl7.Fhir.ElementModel
     /// </remarks>
 
 #pragma warning disable CS0618 // Type or member is obsolete
-    public interface ITypedElement : IBaseElementNavigator<ITypedElement>
+    public interface ITypedElement
 #pragma warning restore CS0618 // Type or member is obsolete
     {
+        /// <summary>
+        /// Enumerate the child nodes present in the source representation (if any)
+        /// </summary>
+        /// <param name="name">Return only the children with the given name.</param>
+        /// <returns></returns>
+        IEnumerable<ITypedElement> Children(string? name = null);
+
+        /// <summary>
+        /// Name of the node, e.g. "active", "value".
+        /// </summary>
+        string Name { get; }
 
+        /// <summary>
+        /// Type of the node. If a FHIR type, this is just a simple string, otherwise a StructureDefinition url for a type defined as a logical model.
+        /// </summary>
+        string? InstanceType { get; }
+
+        /// <summary>
+        /// The value of the node (if it represents a primitive FHIR value)
+        /// </summary>
+        /// <remarks>
+        /// FHIR primitives are mapped to underlying C# types as follows:
+        ///
+        /// instant         Hl7.Fhir.ElementModel.Types.DateTime
+        /// time            Hl7.Fhir.ElementModel.Types.Time
+        /// date            Hl7.Fhir.ElementModel.Types.Date
+        /// dateTime        Hl7.Fhir.ElementModel.Types.DateTime
+        /// decimal         decimal
+        /// boolean         bool
+        /// integer         int
+        /// unsignedInt     int
+        /// positiveInt     int
+        /// long/integer64  long (name will be finalized in R5)
+        /// string          string
+        /// code            string
+        /// id              string
+        /// uri, oid, uuid, 
+        /// canonical, url  string
+        /// markdown        string
+        /// base64Binary    string (uuencoded)
+        /// xhtml           string
+        /// </remarks>
+        object? Value { get; }
 
         /// <summary>
         /// An indication of the location of this node within the data represented by the <c>ITypedElement</c>.

src/Hl7.Fhir.Base/ElementModel/PocoElementNode.cs

@@ -14,7 +14,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using P = Hl7.Fhir.ElementModel.Types;
 
 namespace Hl7.Fhir.ElementModel
@@ -32,7 +31,7 @@ internal PocoElementNode(ModelInspector inspector, Base root, string rootName =
         {
             Current = root;
             _inspector = inspector;
-            _myClassMapping = _inspector.FindOrImportClassMapping(root.GetType());
+            _myClassMapping = _inspector.FindOrImportClassMapping(root.GetType())!;
 
             InstanceType = ((IStructureDefinitionSummary)_myClassMapping).TypeName;
             Definition = ElementDefinitionSummary.ForRoot(_myClassMapping, rootName ?? root.TypeName);
@@ -70,7 +69,7 @@ private Type determineInstanceType(PropertyMapping definition)
             {
                 "url" => typeof(FhirUri),
                 "id" => typeof(FhirString),
-                "div" => typeof(XHtml),
+                //"div" => typeof(XHtml),
                 _ => throw new NotSupportedException(
                     $"Encountered unexpected primitive type {Name} in backward compat behaviour for PocoElementNode.InstanceType.")
             };
@@ -205,39 +204,20 @@ internal object ToITypedElementValue()
         {
             try
             {
-                switch (Current)
+                return Current switch
                 {
-                    case Hl7.Fhir.Model.Instant ins when ins.Value.HasValue:
-                        return P.DateTime.FromDateTimeOffset(ins.Value.Value);
-                    case Hl7.Fhir.Model.Time time when time.Value is { }:
-                        return P.Time.Parse(time.Value);
-                    case Hl7.Fhir.Model.Date dt when dt.Value is { }:
-                        return P.Date.Parse(dt.Value);
-                    case FhirDateTime fdt when fdt.Value is { }:
-                        return P.DateTime.Parse(fdt.Value);
-                    case Hl7.Fhir.Model.Integer fint:
-                        if (!fint.Value.HasValue)
-                            return null;
-                        return (int)fint.Value;
-                    case Hl7.Fhir.Model.Integer64 fint64:
-                        if (!fint64.Value.HasValue)
-                            return null;
-                        return (long)fint64.Value;
-                    case Hl7.Fhir.Model.PositiveInt pint:
-                        if (!pint.Value.HasValue)
-                            return null;
-                        return (int)pint.Value;
-                    case Hl7.Fhir.Model.UnsignedInt unsint:
-                        if (!unsint.Value.HasValue)
-                            return null;
-                        return (int)unsint.Value;
-                    case Hl7.Fhir.Model.Base64Binary b64:
-                        return b64.Value != null ? PrimitiveTypeConverter.ConvertTo<string>(b64.Value) : null;
-                    case PrimitiveType prim:
-                        return prim.ObjectValue;
-                    default:
-                        return null;
-                }
+                    Instant { Value: { } ins } => P.DateTime.FromDateTimeOffset(ins),
+                    Time { Value: { } time } => P.Time.Parse(time),
+                    Date { Value: { } dt } => P.Date.Parse(dt),
+                    FhirDateTime { Value: { } fdt } => P.DateTime.Parse(fdt),
+                    Integer fint => fint.Value,
+                    Integer64 fint64 => fint64.Value,
+                    PositiveInt pint => pint.Value,
+                    UnsignedInt unsint => unsint.Value,
+                    Base64Binary { Value: { } b64 } => PrimitiveTypeConverter.ConvertTo<string>(b64),
+                    PrimitiveType prim => prim.ObjectValue,
+                    _ => null
+                };
             }
             catch (FormatException)
             {
@@ -247,25 +227,24 @@ internal object ToITypedElementValue()
         }
 
 
-        public string InstanceType { get; private set; }
+        public string InstanceType { get; }
 
-        public string Location { get; private set; }
+        public string Location { get; }
 
         public string ResourceType => Current is Resource ? InstanceType : null;
 
         public IEnumerable<object> Annotations(Type type)
         {
             if (type == typeof(PocoElementNode) || type == typeof(ITypedElement) || type == typeof(IShortPathGenerator))
-                return new[] { this };
+                return [this];
             else if (type == typeof(IFhirValueProvider))
-                return new[] { this };
+                return [this];
             else if (type == typeof(IResourceTypeSupplier))
-                return new[] { this };
+                return [this];
             else if (FhirValue is IAnnotated ia)
                 return ia.Annotations(type);
-
             else
-                return Enumerable.Empty<object>();
+                return [];
         }
     }
 }

src/Hl7.Fhir.Base/ElementModel/TypedElementExtensions.cs

@@ -14,6 +14,7 @@
 using Hl7.Fhir.Model;
 using System;
 using System.Linq;
+using System.Runtime.CompilerServices;
 
 namespace Hl7.Fhir.ElementModel
 {
@@ -26,6 +27,7 @@ public static class TypedElementExtensions
         /// <param name="modelInspector">The <see cref="ModelInspector"/> containing the POCO classes to be used for deserialization.</param>
         /// <param name="rootName"></param>
         /// <returns></returns>
+        [TemporarilyChanged]
         public static ITypedElement ToTypedElement(this Base @base, ModelInspector modelInspector, string? rootName = null)
             => new PocoElementNode(modelInspector, @base, rootName: rootName);
 
@@ -39,7 +41,7 @@ public static ITypedElement ToTypedElement(this Base @base, ModelInspector model
         /// of the equation.</param>
         /// <returns><c>true</c> when the ITypedElements are equal, <c>false</c> otherwise.</returns>
 #pragma warning disable CS0618 // Type or member is obsolete
-        public static bool IsExactlyEqualTo<T>(this T? left, T? right, bool ignoreOrder = false) where T : IBaseElementNavigator<T>
+        public static bool IsExactlyEqualTo(this ITypedElement? left, ITypedElement? right, bool ignoreOrder = false)
 #pragma warning restore CS0618 // Type or member is obsolete
         {
             if (left == null && right == null) return true;
@@ -102,7 +104,7 @@ public static bool ValueEquality<T1, T2>(T1? val1, T2? val2)
         /// <param name="pattern"></param>
         /// <returns><c>true</c> when <paramref name="value"/> matches the <paramref name="pattern"/>, <c>false</c> otherwise.</returns>
 #pragma warning disable CS0618 // Type or member is obsolete
-        public static bool Matches<T>(this T value, T pattern) where T : IBaseElementNavigator<T>
+        public static bool Matches(this ITypedElement value, ITypedElement pattern)
 #pragma warning restore CS0618 // Type or member is obsolete
         {
             if (value == null && pattern == null) return true;
@@ -120,4 +122,4 @@ public static bool Matches<T>(this T value, T pattern) where T : IBaseElementNav
         }
     }
 }
-#nullable restore
+#nullable restore

src/Hl7.Fhir.Base/ElementModel/TypedElementParseExtensions.cs

@@ -44,13 +44,13 @@ public static class TypedElementParseExtensions
         /// <inheritdoc cref="ParseBindable"/>
         [Obsolete("WARNING! Intended for internal API usage exclusively, interface IBaseElementNavigator can be changed in " +
             "the near future.")]
-        public static Element? ParseBindableInternal<T>(this IBaseElementNavigator<T> instance) where T : IBaseElementNavigator<T>
+        internal static Element? ParseBindableInternal(this ITypedElement instance) 
         {
             return instance.InstanceType switch
             {
-                FhirTypeConstants.CODE => instance.ParsePrimitiveInternal<Code, T>(),
-                FhirTypeConstants.STRING => new Code(instance.ParsePrimitiveInternal<FhirString, T>().Value),
-                FhirTypeConstants.URI => new Code(instance.ParsePrimitiveInternal<FhirUri, T>().Value),
+                FhirTypeConstants.CODE => instance.ParsePrimitiveInternal<Code>(),
+                FhirTypeConstants.STRING => new Code(instance.ParsePrimitiveInternal<FhirString>().Value),
+                FhirTypeConstants.URI => new Code(instance.ParsePrimitiveInternal<FhirUri>().Value),
                 FhirTypeConstants.CODING => instance.ParseCodingInternal(),
                 FhirTypeConstants.CODEABLE_CONCEPT => instance.ParseCodeableConceptInternal(),
                 FhirTypeConstants.QUANTITY => parseQuantity(),
@@ -90,7 +90,7 @@ public static Quantity ParseQuantity(this ITypedElement instance)
 
         [Obsolete("WARNING! Intended for internal API usage exclusively, interface IBaseElementNavigator can be changed in " +
             "the near future.")]
-        public static Quantity ParseQuantityInternal<T>(this IBaseElementNavigator<T> instance) where T : IBaseElementNavigator<T>
+        public static Quantity ParseQuantityInternal(this ITypedElement instance) 
         {
             var newQuantity = new Quantity
             {
@@ -111,12 +111,12 @@ public static Quantity ParseQuantityInternal<T>(this IBaseElementNavigator<T> in
         #region ParsePrimitive
         public static T ParsePrimitive<T>(this ITypedElement instance) where T : PrimitiveType, new()
 #pragma warning disable CS0618 // Type or member is obsolete
-            => ParsePrimitiveInternal<T, ITypedElement>(instance);
+            => ParsePrimitiveInternal<T>(instance);
 #pragma warning restore CS0618 // Type or member is obsolete
 
         [Obsolete("WARNING! Intended for internal API usage exclusively, interface IBaseElementNavigator can be changed in " +
             "the near future.")]
-        public static T ParsePrimitiveInternal<T, U>(this IBaseElementNavigator<U> instance) where T : PrimitiveType, new() where U : IBaseElementNavigator<U>
+        public static T ParsePrimitiveInternal<T>(this ITypedElement instance) where T : PrimitiveType, new()
                     => new() { ObjectValue = instance.Value };
 
         #endregion
@@ -130,7 +130,7 @@ public static Coding ParseCoding(this ITypedElement instance)
 
         [Obsolete("WARNING! Intended for internal API usage exclusively, interface IBaseElementNavigator can be changed in " +
             "the near future.")]
-        public static Coding ParseCodingInternal<T>(this IBaseElementNavigator<T> instance) where T : IBaseElementNavigator<T>
+        public static Coding ParseCodingInternal(this ITypedElement instance) 
         {
             return new Coding()
             {
@@ -151,7 +151,7 @@ public static ResourceReference ParseResourceReference(this ITypedElement instan
 
         [Obsolete("WARNING! Intended for internal API usage exclusively, interface IBaseElementNavigator can be changed in " +
             "the near future.")]
-        public static ResourceReference ParseResourceReferenceInternal<T>(this IBaseElementNavigator<T> instance) where T : IBaseElementNavigator<T>
+        public static ResourceReference ParseResourceReferenceInternal(this ITypedElement instance) 
         {
             return new ResourceReference()
             {
@@ -169,7 +169,7 @@ public static CodeableConcept ParseCodeableConcept(this ITypedElement instance)
 
         [Obsolete("WARNING! Intended for internal API usage exclusively, interface IBaseElementNavigator can be changed in " +
             "the near future.")]
-        public static CodeableConcept ParseCodeableConceptInternal<T>(this IBaseElementNavigator<T> instance) where T : IBaseElementNavigator<T>
+        public static CodeableConcept ParseCodeableConceptInternal(this ITypedElement instance) 
         {
             return new CodeableConcept()
             {
@@ -181,7 +181,7 @@ public static CodeableConcept ParseCodeableConceptInternal<T>(this IBaseElementN
         #endregion
 
 #pragma warning disable CS0618 // Type or member is obsolete
-        public static string? GetString<T>(this IEnumerable<T> instance) where T : IBaseElementNavigator<T>
+        public static string? GetString(this IEnumerable<ITypedElement> instance) 
 #pragma warning restore CS0618 // Type or member is obsolete
             => instance.SingleOrDefault()?.Value as string;
     }

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

@@ -9,9 +9,6 @@
 
 using Hl7.Fhir.ElementModel;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Dynamic;
-using System.Linq;
 
 namespace Hl7.FhirPath.Expressions
 {