Refactor library handling and update command line args

Updated `CommandLineOptions.cs` to use `CqlVersionedLibraryIdentifier` for library parsing and validation. Modified `LoadValueSets` in `ResourceHelper.cs` to accept value set IDs for validation. Enhanced `LibraryRunner.cs` to utilize the new library identifier and added a method to retrieve unique ValueSet IDs. Introduced `EnumerableExtensions` with a new `SelectWhere` method for collection filtering. Updated `launchSettings.json` to remove "Library-" prefix from command line arguments.

Author: baseTwo

Demo/CLI/Helpers/CommandLineOptions.cs

@@ -8,15 +8,17 @@
 
 using CommandLine;
 using Dumpify;
+using Hl7.Cql.Runtime;
+using Hl7.Cql.Runtime.Parsing;
 
 namespace CLI.Helpers
 {
     internal class CommandLineOptions
     {
         [Option('l', "library", Required = true, HelpText = "The name of a measure Library resource, which contains name and version.")]
         public string Library { get; set; } = "";
-        public string LibraryName => Library.Split('-')[1];
-        public string LibraryVersion => Library.Split('-')[2];
+
+        public CqlVersionedLibraryIdentifier LibraryIdentifier => CqlVersionedLibraryIdentifier.Parse(Library);
 
         [Option('d', "data", HelpText = "The folder for test data.")]
         public string DataDirectory { get; set; } = "";
@@ -45,10 +47,10 @@ internal class CommandLineOptions
         public static void EnsureValidOptions(CommandLineOptions options)
         {
             // Validate the library name format
-            if (options.Library.Count(c => c == '-') != 2
-                && !options.Library.StartsWith("Library-", StringComparison.OrdinalIgnoreCase))
+            CqlParseError? cqlParseError = null;
+            if (!CqlVersionedLibraryIdentifier.TryParse(options.Library, out _, err => cqlParseError = err))
             {
-                throw new InvalidOperationException($"The name of the Library resource '{options.Library}' should be written as 'Library-<name>-<version>'.");
+                throw new InvalidOperationException($"The name of the Library resource '{options.Library}' did not parse as a valid identifier ({cqlParseError}).");
             }
 
             // Check if the data directory is set

Demo/CLI/Helpers/ResourceHelper.cs

@@ -42,8 +42,13 @@ public static Bundle LoadBundle(string bundleFile)
         return bundle;
     }
 
-    public static IValueSetDictionary LoadValueSets(DirectoryInfo directory)
+    public static IValueSetDictionary LoadValueSets(
+        DirectoryInfo directory,
+        IEnumerable<string> valueSetIds)
     {
+        // TODO: Should this be used to validate the valuesets?
+        var valueSetIdSet = valueSetIds.ToHashSet();
+
         var valueSets = new List<ValueSet>();
         foreach (var file in directory.GetFiles("*.json", SearchOption.AllDirectories))
         {

Demo/CLI/LibraryRunner.cs

@@ -8,11 +8,13 @@
 
 using CLI.Helpers;
 using Dumpify;
+using Hl7.Cql.Abstractions;
 using Hl7.Cql.CodeGeneration.NET;
 using Hl7.Cql.Fhir;
 using Hl7.Cql.Fhir.Serialization.Extensions;
 using Hl7.Cql.Invocation.Toolkit;
 using Hl7.Cql.Invocation.Toolkit.Extensions;
+using Hl7.Cql.Primitives;
 using Hl7.Cql.Runtime;
 using Hl7.Cql.ValueSets;
 using Hl7.Fhir.Model;
@@ -50,25 +52,66 @@ public void RunWithResources()
         {
             //run using Library Resource files - production scenario, no debugging inline with measures project
             Console.WriteLine($"Loading resources for Library: {_opts.Library}");
-            var librarySetName = CqlVersionedLibraryIdentifier.ParseFromIdentifierAndVersion(_opts.LibraryName, _opts.LibraryVersion);
+            var libraryIdentifier = _opts.LibraryIdentifier;
+
+            // TODO: Not efficient to load all resources in the directory,
+            // still have to add an extension to InvocationToolkit to load only the library resource
+            // and its dependencies
             using var librarySetInvoker = new InvocationToolkit()
                                           .AddAssemblyBinariesInFhirLibrariesFromDirectory(new (_opts.ResourcesDirectory))
-                                          .CreateLibrarySetInvoker(librarySetName);
+                                          .CreateLibrarySetInvoker(libraryIdentifier);
             RunShared(_opts, librarySetInvoker);
         }
 
         private void RunShared(CommandLineOptions opt, LibrarySetInvoker librarySetInvoker)
         {
             Console.WriteLine("Loading value sets");
-            IValueSetDictionary valueSets = ResourceHelper.LoadValueSets(new DirectoryInfo(opt.ValueSetsDirectory));
+            var valueSetIds = GetValueSetIds(librarySetInvoker, opt.Library);
+            IValueSetDictionary valueSets = ResourceHelper.LoadValueSets(
+                new DirectoryInfo(opt.ValueSetsDirectory),
+                valueSetIds);
 
             Console.WriteLine("Loading test case files");
-            var testDataDir = Path.Join(opt.DataDirectory, opt.LibraryName);
+            var testDataDir = Path.Join(opt.DataDirectory, (string)opt.LibraryIdentifier.Identifier);
             var patientList = ProcessTestPatients(testDataDir, librarySetInvoker, valueSets);
             //optionally use patientList Dictionary
         }
 
-
+        /// <summary>
+        /// Retrieves a set of unique ValueSet IDs from the specified library and its dependencies.
+        /// </summary>
+        /// <param name="librarySetInvoker">
+        /// An instance of <see cref="LibrarySetInvoker"/> used to access library invokers and their dependencies.
+        /// </param>
+        /// <param name="libraryName">
+        /// The name of the library from which to retrieve ValueSet IDs. This should be a valid CQL library identifier.
+        /// </param>
+        /// <returns>
+        /// A <see cref="HashSet{T}"/> containing the unique ValueSet IDs defined in the specified library and its dependencies.
+        /// </returns>
+        /// <exception cref="KeyNotFoundException">
+        /// Thrown if the specified library name does not exist in the <paramref name="librarySetInvoker"/>.
+        /// </exception>
+        /// <exception cref="ArgumentException">
+        /// Thrown if the <paramref name="libraryName"/> is not a valid CQL library identifier.
+        /// </exception>
+        private static List<string> GetValueSetIds(LibrarySetInvoker librarySetInvoker, string libraryName)
+        {
+            var libraryIdentifier = CqlVersionedLibraryIdentifier.Parse(libraryName);
+            var libraryInvoker = librarySetInvoker.LibraryInvokers[libraryIdentifier];
+            var libraryInvokerAndDependencies = libraryInvoker
+                                                .SelectDependencyLibraries(includeSelf: true, recursive: true)
+                                                .ToArray();
+            var valueSetIds = libraryInvokerAndDependencies
+                              .SelectMany(li => li.Definitions.Values)
+                              .SelectWhere(d =>
+                                               d.CqlDefinitionAttribute is CqlValueSetDefinitionAttribute vsda
+                                                   ? (true, vsda)
+                                                   : default)
+                              .Select(vsda => vsda.ValueSetId)
+                              .ToList();
+            return valueSetIds;
+        }
 
         #region Processing Patients
         private Dictionary<string, Dictionary<string, object>> ProcessTestPatients(
@@ -160,7 +203,7 @@ public Dictionary<string, object> ProcessBundle(LibrarySetInvoker librarySetInvo
 
             // Invoke all expressions and collect results
             var results = expressions.SelectResults(setup, new SelectResultsOptions(
-                InvocationExceptionCallback: (definition, exception, _) => 
+                InvocationExceptionCallback: (definition, exception, _) =>
                 {
                     var errorKey = $"{definition.LibraryInvoker.LibraryIdentifier.Identifier}-{definition.DefinitionSignature.Name}";
                     errors.TryAdd(errorKey, exception);
@@ -173,7 +216,7 @@ public Dictionary<string, object> ProcessBundle(LibrarySetInvoker librarySetInvo
                 // Use library identifier and definition name to create unique key
                 var declName = $"{definitionInvoker.LibraryInvoker.LibraryIdentifier.Identifier}-{definitionInvoker.DefinitionSignature.Name}";
                 Console.WriteLine($"Running definition: {definitionInvoker.DefinitionSignature.Name}");
-                
+
                 // Use TryAdd to avoid duplicate key exceptions
                 if (!values.TryAdd(declName, invocationResult!))
                 {
@@ -243,3 +286,22 @@ private void WritePatientResults(Dictionary<string, object> patientResults)
         #endregion Writing Output
     }
 }
+
+file static class EnumerableExtensions
+{
+    /// <summary>
+    /// Projects each element of a collection into a new form based on a selector function, and filters out elements based on a condition.
+    /// </summary>
+    /// <typeparam name="T">The type of elements in the source collection.</typeparam>
+    /// <typeparam name="TR">The type of elements in the resulting collection.</typeparam>
+    /// <param name="source">The source collection.</param>
+    /// <param name="selector">A function to test each element for a condition and project the element into a new form.</param>
+    /// <returns>An enumerable collection that contains the transformed elements that satisfy the condition.</returns>
+    public static IEnumerable<TR> SelectWhere<T, TR>(this IEnumerable<T> source, Func<T, (bool include, TR resultOrDefault)> selector)
+    {
+        foreach (var item in source)
+            if (selector(item) is (include: true, { } resultOrDefault))
+                yield return resultOrDefault;
+    }
+
+}

Demo/Measures.Demo/Properties/launchSettings.json

@@ -2,15 +2,15 @@
   "profiles": {
     "BCSEHEDISMY2022-1.0.0": {
       "commandName": "Project",
-      "commandLineArgs": "--l Library-BCSEHEDISMY2022-1.0.0"
+      "commandLineArgs": "--l BCSEHEDISMY2022-1.0.0"
     },
     "AdultOutpatientEncountersFHIR4-2.2.000": {
       "commandName": "Project",
-      "commandLineArgs": "--l Library-AdultOutpatientEncountersFHIR4-2.2.000"
+      "commandLineArgs": "--l AdultOutpatientEncountersFHIR4-2.2.000"
     },
     "ColorectalCancerScreeningsFHIR-0.0.003": {
       "commandName": "Project",
-      "commandLineArgs": "--l Library-ColorectalCancerScreeningsFHIR-0.0.003"
+      "commandLineArgs": "--l ColorectalCancerScreeningsFHIR-0.0.003"
     }
   }
 }