Merge pull request #943 from FirelyTeam/copilot/fix-883

883 Fix Demo CLI to use modern LibrarySetInvoker APIs

Author: alexzautke

Cql/Cql.Abstractions/Cql.Abstractions.csproj

@@ -36,6 +36,7 @@
 		<InternalsVisibleTo Include="Hl7.Cql.Invocation" Key="$(LibraryPKHash)" />
 		<InternalsVisibleTo Include="Hl7.Cql.Packager" Key="$(LibraryPKHash)" />
 		<InternalsVisibleTo Include="CqlSdkExamplesPreview" Key="$(LibraryPKHash)" />
+		<InternalsVisibleTo Include="CLI" Key="$(LibraryPKHash)" />
 	</ItemGroup>
 
 	<ItemGroup>

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/LibraryExtensions.cs

@@ -42,7 +42,8 @@ public static Bundle LoadBundle(string bundleFile)
         return bundle;
     }
 
-    public static IValueSetDictionary LoadValueSets(DirectoryInfo directory)
+    public static IValueSetDictionary LoadValueSets(
+        DirectoryInfo directory)
     {
         var valueSets = new List<ValueSet>();
         foreach (var file in directory.GetFiles("*.json", SearchOption.AllDirectories))
@@ -59,19 +60,6 @@ public static IValueSetDictionary LoadValueSets(DirectoryInfo directory)
         return vsd;
     }
 
-    // public static LibrarySetInvoker CreateRuntimeScopeFromFhirLibraryFile(
-    //     DirectoryInfo dir,
-    //     string lib,
-    //     string version)
-    // {
-    //     var libFile = new FileInfo(Path.Combine(dir.FullName, $"Library-{lib}-{version}.json"));
-    //     using var fs = libFile.OpenRead();
-    //     var library = fs.DeserializeJsonToFhir<Library>();
-    //     var deps = library.GetDependenciesAndSelf(dir);
-    //     return deps.ToLibrarySetInvoker();
-    // }
-
-
     public static Bundle CreateBundle(string[] files)
     {
         var bundle = new Bundle();