Merge branch '1024-fix-unit-normalization-for-quantity-units-such-as-ucum-and-calendar-date-units' of https://github.com/FirelyTeam/firely-cql-sdk into 1024-fix-unit-normalization-for-quantity-units-such-as-ucum-and-calendar-date-units

Author: baseTwo

Cql/Cql.Compiler/Preprocessing/MissingResultTypeSpecifierCorrector.cs

@@ -7,6 +7,7 @@
  */
 
 using Hl7.Cql.Elm;
+using Tuple = Hl7.Cql.Elm.Tuple;
 
 namespace Hl7.Cql.Compiler.Preprocessing;
 
@@ -18,17 +19,73 @@ internal class MissingResultTypeSpecifierCorrector(ILogger<MissingResultTypeSpec
 {
     private readonly ElmTreeWalker _walker = ElmTreeWalker.Create((self, node) =>
     {
-        switch (node)
+        // DO NOT turn this into a switch expression.
+        // It is possible to match multiple patterns in one node, e.g.
+        // Element with resultTypeName then Query with ListTypeSpecifier
+        // The order of these blocks matters too, starting with the most general ones first.
+
         {
-            case Element { resultTypeSpecifier: null, resultTypeName: {} resultTypeName } element:
+            // If an Element has a resultTypeName but no resultTypeSpecifier, set resultTypeSpecifier to a NamedTypeSpecifier with the name from resultTypeName
+            if (node is Element { resultTypeSpecifier: null, resultTypeName: { } resultTypeName } element)
+            {
                 logger.LogDebug(
                     "Setting missing resultTypeSpecifier to resultTypeName on {elementType} to '{resultType}' @ {locator}.\n{expressionKey}",
                     element.GetType().ToString(),
                     resultTypeName,
                     element.locator,
                     self.ContextStackString);
                 element.resultTypeSpecifier = new NamedTypeSpecifier { name = resultTypeName };
-                break;
+            }
+        }
+
+        {
+            // If a Query has a ListTypeSpecifier as resultTypeSpecifier but its ReturnClause has no resultTypeSpecifier, set the ReturnClause's resultTypeSpecifier to the elementType of the ListTypeSpecifier
+            if (node is Query
+                {
+                    resultTypeSpecifier: ListTypeSpecifier { elementType: { } elementType },
+                    @return: { resultTypeSpecifier: null } returnClause,
+                } query)
+            {
+                logger.LogDebug(
+                    "Setting missing ReturnClause.resultTypeSpecifier to ListTypeSpecifier.elementType to '{resultType}' on Query @ {locator}.\n{expressionKey}",
+                    elementType,
+                    query.locator,
+                    self.ContextStackString);
+                returnClause.resultTypeSpecifier = elementType;
+            }
+        }
+
+        {
+            // If a ReturnClause has a TupleTypeSpecifier as resultTypeSpecifier but its Tuple has no resultTypeSpecifier, set the Tuple's resultTypeSpecifier to the ReturnClause's TupleTypeSpecifier
+            if (node is ReturnClause
+                {
+                    resultTypeSpecifier: TupleTypeSpecifier tupleTypeSpecifier,
+                    expression: Tuple { resultTypeSpecifier: null } tuple,
+                } clause)
+            {
+                logger.LogDebug(
+                    "Setting missing Tuple.resultTypeSpecifier to TupleTypeSpecifier to '{resultType}' on ReturnClause @ {locator}.\n{expressionKey}",
+                    tupleTypeSpecifier,
+                    clause.locator,
+                    self.ContextStackString);
+                tuple.resultTypeSpecifier = tupleTypeSpecifier;
+            }
+        }
+
+        {
+            // If a Tuple has elements with missing resultTypeSpecifier but the Tuple itself has a TupleTypeSpecifier as resultTypeSpecifier, set the missing element resultTypeSpecifiers from the TupleTypeSpecifier
+            if (node is Tuple { element: { Length: > 0 } elements, resultTypeSpecifier: TupleTypeSpecifier tupleTypeSpecifier } tuple
+                && elements.Any(e => e.value.resultTypeSpecifier is null))
+            {
+                logger.LogDebug(
+                    "Setting missing Tuple.element.value.resultTypeSpecifier from TupleTypeSpecifier on Tuple @ {locator}.\n{expressionKey}",
+                    tuple.locator,
+                    self.ContextStackString);
+                foreach (var (index, tupleElement) in elements.Select((v, i) => (i, v)))
+                {
+                    tupleElement.value.resultTypeSpecifier ??= tupleTypeSpecifier.element[index].elementType;
+                }
+            }
         }
 
         return false; // Continue walking children

Cql/PackagerCLI/Hl7.Cql.Packager.ecqm-content-cms-2025.appsettings.json

@@ -1,9 +1,6 @@
 {
   "Elm": {
     "SkipFiles": [
-      // Tuple element value does not have a resultTypeSpecifier
-      "CMS2FHIRPCSDepressionScreenAndFollowUp.json",
-
       // Exception: cannot convert from 'Hl7.Fhir.Model.Id' to 'Hl7.Fhir.Model.Code<Hl7.Fhir.Model.Account.AccountStatus>'
       "NHSNHelpers.json",
 

Cql/PackagerCLI/Hl7.Cql.Packager.ecqm-content-qicore-2024.appsettings.json

@@ -19,10 +19,6 @@
       "CMS506FHIRSafeUseofOpioids.json",
       "PCSBMIScreenAndFollowUpFHIR.json",
 
-      // Tuple element value does not have a resultTypeSpecifier
-      "CADBetaBlockerTherapyPriorMIorLVSDFHIR.json",
-      "PCSDepressionScreenAndFollowUpFHIR.json",
-
       // Multiple sort fields not supported yet
       "CMS986FHIRMalnutritionScore.json",
       "HospitalHarmAcuteKidneyInjuryFHIR.json",

Cql/PackagerCLI/Hl7.Cql.Packager.ecqm-content-qicore-2025.appsettings.json

@@ -1,11 +1,6 @@
 {
   "Elm": {
     "SkipFiles": [
-      // Tuple element value does not have a resultTypeSpecifier
-      "CMS2FHIRPCSDepressionScreenAndFollowUp.json",
-      "CMS145FHIRCADBetaBlockerTherapyPriorMIorLVSD.json",
-      "CMS832HHAKIFHIR.json",
-
       // Cannot resolve type {http://hl7.org/fhir}DoNotPerformReason} for expression
       "CMS190VTEProphylaxisICUFHIR.json",
       "CMS108FHIRVTEProphylaxis.json"