Implemented IToSystemPrimitive on all applicable FHIR Primitives.

FirelyTeam · Jan 17, 2025 · c40e360 · c40e360
1 parent 4fe1b2a
commit c40e360
Show file tree

Hide file tree

Showing 33 changed files with 1,128 additions and 366 deletions.
diff --git a/src/Benchmarks/DateTimeBenchmark.cs b/src/Benchmarks/DateTimeBenchmark.cs
@@ -10,10 +10,10 @@ public class DateTimeBenchmarks
         public void BenchmarkSetup()
         {
             _dateTimeInstance = new FhirDateTime(DATETIME);
-            _ = _dateTimeInstance.TryToDateTime(out var _); // trigger initial compile of regex
+            _ = _dateTimeInstance.TryToSystemDateTime(out var _); // trigger initial compile of regex
 
             _dateInstance = new Date(DATE);
-            _ = _dateInstance.TryToDate(out var _); // trigger initial compile of regex
+            _ = _dateInstance.TryToSystemDate(out var _); // trigger initial compile of regex
         }
 
         private const string DATETIME = "2023-07-11T13:00:00";
@@ -59,4 +59,4 @@ public DateTimeOffset DateToDTO_Cached()
             return result;
         }
     }
-}
+}
diff --git a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
diff --git a/src/Hl7.Fhir.Base/ElementModel/Types/Any.cs b/src/Hl7.Fhir.Base/ElementModel/Types/Any.cs
@@ -17,7 +17,7 @@ namespace Hl7.Fhir.ElementModel.Types;
 /// <summary>
 /// The base class for all CQL/FhirPath types.
 /// </summary>
-public abstract class Any : ICqlConvertible
+public abstract class Any
 {
     /// <summary>
     /// Returns the concrete subclass of Any that is used to represent the

diff --git a/src/Hl7.Fhir.Base/ElementModel/Types/Boolean.cs b/src/Hl7.Fhir.Base/ElementModel/Types/Boolean.cs
@@ -13,7 +13,7 @@
 
 namespace Hl7.Fhir.ElementModel.Types;
 
-public class Boolean(bool value) : Any, ICqlEquatable, ICqlConvertible
+public class Boolean(bool value) : Any, ICqlEquatable
 {
     public static Boolean True = new(true);
     public static Boolean False = new(false);

diff --git a/...ase/ElementModel/Types/ICqlConvertible.cs → .../ElementModel/Types/IToSystemPrimitive.cs b/...ase/ElementModel/Types/ICqlConvertible.cs → .../ElementModel/Types/IToSystemPrimitive.cs
@@ -12,20 +12,23 @@
 
 namespace Hl7.Fhir.ElementModel.Types;
 
-public interface ICqlConvertible
+/// <summary>
+/// An interface to convert a model POCO into a CQL/FhirPath type.
+/// </summary>
+public interface IToSystemPrimitive
 {
     /// <summary>
     /// Tries to convert this object into a CQL/FhirPath type.
     /// </summary>
-    /// <param name="to">The subclass of Any to convert to.</param>
     /// <param name="result">If succesful, the converted object, otherwise null.</param>
-    bool TryConvertTo(Type to, [NotNullWhen(true)] out Any? result);
+    /// <returns>true if this model object has a CQL equivalent and the conversion succeeded, otherwise false.</returns>
+    bool TryConvertToSystemType([NotNullWhen(true)] out Any? result);
 }
 
 
 public static class CqlConvertible
 {
-    public static bool TryConvertTo<T>(this ICqlConvertible source, [NotNullWhen(true)] out T? result) where T : Any
+    public static bool TryConvertTo<T>(this Any source, [NotNullWhen(true)] out T? result) where T : Any
     {
         var success = source.TryConvertTo(typeof(T), out var any) && any is T;
 

diff --git a/src/Hl7.Fhir.Base/ElementModel/Types/Quantity.cs b/src/Hl7.Fhir.Base/ElementModel/Types/Quantity.cs
@@ -16,7 +16,7 @@
 namespace Hl7.Fhir.ElementModel.Types;
 
 public class Quantity(decimal value, string? unit, QuantityUnitSystem system)
-    : Any, IComparable, ICqlEquatable, ICqlOrderable, ICqlConvertible
+    : Any, IComparable, ICqlEquatable, ICqlOrderable
 {
     public const string UCUM = "http://unitsofmeasure.org";
     public const string UCUM_UNIT = "1";

diff --git a/src/Hl7.Fhir.Base/FhirPath/Functions/ConversionOperators.cs b/src/Hl7.Fhir.Base/FhirPath/Functions/ConversionOperators.cs
@@ -22,11 +22,8 @@ internal static class ConversionOperators
         /// </summary>
         /// <param name="focus"></param>
         /// <returns></returns>
-        public static bool? ToBoolean(this Any focus)
-        {
-            if (focus is not ICqlConvertible c) return null;
-            return c.TryConvertTo<Boolean>(out var result) ? result.Value : null;
-        }
+        public static bool? ToBoolean(this Any focus) =>
+            focus.TryConvertTo<Boolean>(out var result) ? result.Value : null;
 
         /// <summary>
         /// FhirPath convertsToBoolean() function
@@ -41,11 +38,7 @@ internal static class ConversionOperators
         /// </summary>
         /// <param name="focus"></param>
         /// <returns></returns>
-        public static int? ToInteger(this Any focus)
-        {
-            if (focus is not ICqlConvertible c) return null;
-            return c.TryConvertTo<Integer>(out var result) ? result.Value : null;
-        }
+        public static int? ToInteger(this Any focus) => focus.TryConvertTo<Integer>(out var result) ? result.Value : null;
 
         /// <summary>
         /// FhirPath convertsToInteger() function.
@@ -60,11 +53,8 @@ internal static class ConversionOperators
         /// </summary>
         /// <param name="focus"></param>
         /// <returns></returns>
-        public static decimal? ToDecimal(this Any focus)
-        {
-            if (focus is not ICqlConvertible c) return null;
-            return c.TryConvertTo<Decimal>(out var result) ? result.Value : null;
-        }
+        public static decimal? ToDecimal(this Any focus) =>
+            focus.TryConvertTo<Decimal>(out var result) ? result.Value : null;
 
         /// <summary>
         /// FhirPath convertsToDecimal() function.
@@ -79,11 +69,7 @@ internal static class ConversionOperators
         /// </summary>
         /// <param name="focus"></param>
         /// <returns></returns>
-        public static long? ToLong(this Any focus)
-        {
-            if (focus is not ICqlConvertible c) return null;
-            return c.TryConvertTo<Long>(out var result) ? result.Value : null;
-        }
+        public static long? ToLong(this Any focus) => focus.TryConvertTo<Long>(out var result) ? result.Value : null;
 
 
         /// <summary>
@@ -99,11 +85,7 @@ internal static class ConversionOperators
         /// </summary>
         /// <param name="focus"></param>
         /// <returns></returns>
-        public static P.Quantity? ToQuantity(this Any focus)
-        {
-            if (focus is not ICqlConvertible c) return null;
-            return c.TryConvertTo<Quantity>(out var result) ? result : null;
-        }
+        public static P.Quantity? ToQuantity(this Any focus) => focus.TryConvertTo<Quantity>(out var result) ? result : null;
 
         /// <summary>
         /// FhirPath convertsToQuantity() function.
@@ -118,11 +100,8 @@ internal static class ConversionOperators
         /// </summary>
         /// <param name="focus"></param>
         /// <returns></returns>
-        public static string? ToStringRepresentation(this Any focus)
-        {
-            if (focus is not ICqlConvertible c) return null;
-            return c.TryConvertTo<String>(out var result) ? result.Value : null;
-        }
+        public static string? ToStringRepresentation(this Any focus) =>
+            focus.TryConvertTo<String>(out var result) ? result.Value : null;
 
         /// <summary>
         /// FhirPath convertsToString() function.
@@ -136,11 +115,7 @@ internal static class ConversionOperators
         /// </summary>
         /// <param name="focus"></param>
         /// <returns></returns>
-        public static P.Date? ToDate(this Any focus)
-        {
-            if (focus is not ICqlConvertible c) return null;
-            return c.TryConvertTo<Date>(out var result) ? result : null;
-        }
+        public static P.Date? ToDate(this Any focus) => focus.TryConvertTo<Date>(out var result) ? result : null;
 
 
         /// <summary>
@@ -156,11 +131,7 @@ internal static class ConversionOperators
         /// </summary>
         /// <param name="focus"></param>
         /// <returns></returns>
-        public static P.DateTime? ToDateTime(this Any focus)
-        {
-            if (focus is not ICqlConvertible c) return null;
-            return c.TryConvertTo<DateTime>(out var result) ? result : null;
-        }
+        public static P.DateTime? ToDateTime(this Any focus) => focus.TryConvertTo<DateTime>(out var result) ? result : null;
 
 
         /// <summary>
@@ -175,13 +146,7 @@ internal static class ConversionOperators
         /// </summary>
         /// <param name="focus"></param>
         /// <returns></returns>
-        public static P.Time? ToTime(this Any focus)
-        {
-            if (focus is not ICqlConvertible c) return null;
-            return c.TryConvertTo<Time>(out var result) ? result : null;
-
-        }
-
+        public static P.Time? ToTime(this Any focus) => focus.TryConvertTo<Time>(out var result) ? result : null;
 
         /// <summary>
         /// FhirPath convertsToTime() function.