Merge pull request #1035 from FirelyTeam/copilot/fix-1007-2

1007 Fix multi-source query sorting and update skip list categorization

Author: baseTwo

Cql/Cql.Compiler/ExpressionBuilderContext.cs

@@ -1702,60 +1702,7 @@ void PushScopes(
 
             if (query.sort is { by.Length: > 0 })
             {
-                if (sources.Length == 1)
-                    @return = SortClause(query, @return);
-                else
-                {
-                    throw new NotImplementedException("Sort is broken in ELM XSD?").WithContext(this);
-                    //foreach (var by in query.sort.by)
-                    //{
-                    //    var order = ListSortDirection.Ascending;
-                    //    if (by.direction == "desc" || by.direction == "descending")
-                    //        order = ListSortDirection.Descending;
-                    //    else if (by.direction == "asc" || by.direction == "ascending")
-                    //        order = ListSortDirection.Ascending;
-                    //    else throw ctx.NewExpressionBuildingException($"Invalid sort order {by.direction}");
-
-                    //    if (by.expression != null)
-                    //    {
-                    //        var parameterName = "@this";
-                    //        var returnElementType = TypeResolver.GetListElementType(@return.Type);
-                    //        var sortMemberParameter = Expression.Parameter(returnElementType, parameterName);
-                    //        var subContext = ctx.WithImpliedAlias(parameterName!, sortMemberParameter, by.expression);
-                    //        var sortMemberExpression = TranslateExpression(by.expression, subContext);
-                    //        var lambdaBody = Expression.Convert(sortMemberExpression, typeof(object));
-                    //        var sortLambda = System.Linq.Expressions.Expression.Lambda(lambdaBody, sortMemberParameter);
-                    //        var sort = Operators.Bind(CqlOperator.SortBy, ctx.RuntimeContextParameter,
-                    //            @return, sortLambda, Expression.Constant(order, typeof(SortOrder)));
-                    //        @return = sort;
-                    //    }
-                    //    else if (by.path != null && by.resultTypeName != null)
-                    //    {
-                    //        var parameterName = "@this";
-                    //        var returnElementType = TypeResolver.GetListElementType(@return.Type);
-                    //        var sortMemberParameter = Expression.Parameter(returnElementType, parameterName);
-                    //        var pathMemberType = TypeResolver.ResolveType(by.resultTypeName);
-                    //        if (pathMemberType == null)
-                    //        {
-                    //            var msg = $"Type specifier {by.resultTypeName} at {by.locator ?? "unknown"} could not be resolved.";
-                    //            ctx.LogError(msg);
-                    //            throw ctx.NewExpressionBuildingException(msg);
-                    //        }
-                    //        var pathExpression = PropertyHelper(sortMemberParameter, by.path, pathMemberType!, ctx);
-                    //        var lambdaBody = Expression.Convert(pathExpression, typeof(object));
-                    //        var sortLambda = System.Linq.Expressions.Expression.Lambda(lambdaBody, sortMemberParameter);
-                    //        var sort = Operators.Bind(CqlOperator.SortBy, ctx.RuntimeContextParameter,
-                    //            @return, sortLambda, Expression.Constant(order, typeof(SortOrder)));
-                    //        @return = sort;
-                    //    }
-                    //    else
-                    //    {
-                    //        var sort = Operators.Bind(CqlOperator.Sort, ctx.RuntimeContextParameter,
-                    //            @return, Expression.Constant(order, typeof(SortOrder)));
-                    //        @return = sort;
-                    //    }
-                    //}
-                }
+                @return = SortClause(query, @return);
             }
 
             // Because we promoted the source to a list, we now have to demote the result again.

Cql/CqlToElmTests/(tests)/QueryTest.cs

@@ -420,5 +420,29 @@ then flatten({ (result) r where r !~ Last(result),
             var query = lib.Should().BeACorrectlyInitializedLibraryWithStatementOfType<Query>();
             query.Should().HaveType(SystemTypes.DateType.ToIntervalType().ToListType());
         }
+
+        [TestMethod]
+        public void Multisource_sort_by_expression()
+        {
+            var lib = CreateCqlToolkit().MakeLibrary("""
+                library MultisourceSort version '1.0.0'
+
+                define "Multisource sort by expression":
+                  from 
+                    ({3, 1}) Num1,
+                    ({4, 2}) Num2
+                  return Tuple { sum: Num1 + Num2, n1: Num1, n2: Num2 }
+                  sort by sum desc
+                """);
+
+            lib.GetErrors().Should().BeEmpty();
+            lib.statements.Should().HaveCount(1);
+            var expression = lib.statements[0].expression.Should().BeOfType<Query>().Subject;
+            expression.source.Should().HaveCount(2);
+            expression.sort.Should().NotBeNull();
+            expression.sort.by.Should().HaveCount(1);
+            var byExpression = expression.sort.by[0].Should().BeOfType<ByExpression>().Subject;
+            byExpression.direction.Should().Be(SortDirection.desc);
+        }
     }
 }

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

@@ -4,9 +4,6 @@
       // Tuple element value does not have a resultTypeSpecifier
       "CMS2FHIRPCSDepressionScreenAndFollowUp.json",
       "CMS145FHIRCADBetaBlockerTherapyPriorMIorLVSD.json",
-
-      // Sort is broken in ELM XSD
-      "CMS986FHIRMalnutritionScore.json",
       "CMS832HHAKIFHIR.json",
 
       // Cannot resolve type {http://hl7.org/fhir}DoNotPerformReason} for expression