fix(Serialization): Change Dictionary and List to Array Types

JsonSerializer does not support Tuples, which results in null values for the List<(int,int)> also by using JsonSerializable(typeof(List<(int,int)>)

Author: DevTKSS

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/CodeSampleOption.cs

@@ -1,11 +1,24 @@
 namespace DevTKSS.Uno.Samples.MvuxGallery.Models.CodeSamples;
 public record CodeSampleOption
 {
+    public string SampleID { get; init; } = string.Empty;
     public string Description { get; init; } = string.Empty;
     public string FilePath { get; init; } = string.Empty;
-    public List<(int Start, int End)> LineRanges { get; init; } = [];
+    public Lines[] LineRanges { get; init; } = [];
 }
+public record Lines
+{
+    public int Start { get; init; }
+    public int End { get; init; }
+}
+
+[JsonSerializable(typeof(CodeSampleOptionsConfiguration))]
 [JsonSerializable(typeof(CodeSampleOption))]
+[JsonSerializable(typeof(ListboardSampleOptions))]
+[JsonSerializable(typeof(MainSampleOptions))]
+[JsonSerializable(typeof(CounterSampleOptions))]
+[JsonSerializable(typeof(SimpleCardsSampleOptions))]
+[JsonSerializable(typeof(DashboardSampleOptions))]
 public partial class CodeSampleOptionContext : JsonSerializerContext
 {
 }

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/CodeSampleOptionsConfiguration.cs

@@ -1,54 +1,28 @@
 namespace DevTKSS.Uno.Samples.MvuxGallery.Models.CodeSamples;
 
-public record CodeSampleOptionsConfiguration()
-{
-    public Dictionary<string, CodeSampleOption> Samples { get; init; } = new();
-}
-[JsonSerializable(typeof(CodeSampleOptionsConfiguration))]
-public partial class CodeSampleOptionsConfigurationContext : JsonSerializerContext
-{
-}
-
-public record ListboardCodeSampleOptions : CodeSampleOptionsConfiguration
-{
-}
-
-[JsonSerializable(typeof(ListboardCodeSampleOptions))]
-public partial class ListboardCodeSampleOptionsContext : JsonSerializerContext
+public record CodeSampleOptionsConfiguration
 {
+    public CodeSampleOption[] Samples { get; init; } = Array.Empty<CodeSampleOption>();
 }
 
-public record MainCodeSampleOptions : CodeSampleOptionsConfiguration
+public record ListboardSampleOptions : CodeSampleOptionsConfiguration
 {
 }
 
-[JsonSerializable(typeof(MainCodeSampleOptions))]
-public partial class MainCodeSampleOptionsContext : JsonSerializerContext
+public record MainSampleOptions : CodeSampleOptionsConfiguration
 {
 }
 
-public record CounterCodeSampleOptions : CodeSampleOptionsConfiguration
+public record CounterSampleOptions : CodeSampleOptionsConfiguration
 {
 }
 
-[JsonSerializable(typeof(CounterCodeSampleOptions))]
-public partial class CounterCodeSampleOptionsContext : JsonSerializerContext
+public record SimpleCardsSampleOptions : CodeSampleOptionsConfiguration
 {
 }
 
-public record SimpleCardsCodeSampleOptions : CodeSampleOptionsConfiguration
-{
-}
-[JsonSerializable(typeof(SimpleCardsCodeSampleOptions))]
-public partial class SimpleCardsCodeSampleOptionsContext : JsonSerializerContext
-{
-}
 
-public record DashboardCodeSampleOptions : CodeSampleOptionsConfiguration
+public record DashboardSampleOptions : CodeSampleOptionsConfiguration
 {
 }
 
-[JsonSerializable(typeof(DashboardCodeSampleOptions))]
-public partial class DashboardCodeSampleOptionsContext : JsonSerializerContext
-{
-}

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/CodeSampleService.cs

@@ -1,7 +1,8 @@
 using Microsoft.Extensions.Configuration;
+using Windows.Networking.BackgroundTransfer;
 
 namespace DevTKSS.Uno.Samples.MvuxGallery.Models.CodeSamples;
-public record CodeSampleService<SampleOptions> : ICodeSampleService<SampleOptions>
+public partial record CodeSampleService<SampleOptions> : ICodeSampleService<SampleOptions>
     where SampleOptions : CodeSampleOptionsConfiguration
 {
     public CodeSampleService(
@@ -10,9 +11,21 @@ public CodeSampleService(
         IStorage storage)
     {
         _options = options.Value;
-        
         _logger = logger;
         _storage = storage;
+        if (_logger.IsEnabled(LogLevel.Trace))
+        { 
+            // Log LineRanges for each sample option
+            foreach (var sample in _options.Samples)
+            {
+                _logger.LogTrace("SampleID: {sampleID},\nDescription: {description},\nFilePath: {filePath},\nLineRanges: {lineRanges}",
+                    sample.SampleID,
+                    sample.Description,
+                    sample.FilePath,
+                    sample.LineRanges);
+                                 
+            }
+        }
     }
 
     private readonly IStorage _storage;
@@ -36,24 +49,29 @@ public CodeSampleService(
     public async ValueTask<IImmutableList<string>> GetCodeSampleOptionsAsync(CancellationToken ct = default)
     {
         await Task.Delay(1);
-        _logger.LogInformation("Options: {options}", _options.Samples);
-        return _options.Samples.Keys.ToImmutableList(); 
+        var sampleOptions = _options.Samples.Select(sample => sample.SampleID).ToImmutableList();
+        _logger.LogInformation("Options:\n{options}", sampleOptions.JoinBy("," + Environment.NewLine));
+        return sampleOptions; 
     }
 
     public async ValueTask<string> GetCodeSampleAsync(string? sampleID, CancellationToken ct = default)
     {
-        if (sampleID is not null && _options.Samples.TryGetValue(sampleID, out CodeSampleOption? sampleOption))
+        if (_options.Samples.FirstOrDefault(sample => sample.SampleID == sampleID) is CodeSampleOption sampleOption)
         {
-            return await _storage.ReadLinesFromPackageFile(sampleOption.FilePath, sampleOption.LineRanges);
+            if(_logger.IsEnabled(LogLevel.Trace))
+            {
+                _logger.LogTrace("SampleID: {sampleID},\nDescription: {description},\nFilePath: {filePath},\nLineRanges: {lineRanges}",
+                    sampleOption.SampleID,
+                    sampleOption.Description,
+                    sampleOption.FilePath,
+                    sampleOption.LineRanges);
+            }
+
+            return await _storage.ReadLinesFromPackageFile(sampleOption.FilePath,sampleOption.LineRanges.Select(lr => (lr.Start, lr.End)));
         }
+        
 
         _logger.LogWarning("Code sample with ID {sampleID} not found", sampleID);
         return string.Empty;
     }
-    public async ValueTask<string> SwitchCodeSampleAsync(string? selectedSampleOption, CancellationToken ct = default)
-    {
-        string sample = await GetCodeSampleAsync(selectedSampleOption,ct);
-        _logger.LogInformation("Switched to code sample {sample}", selectedSampleOption);
-        return sample;
-    }
 }

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/ICodeSampleService.cs

@@ -17,15 +17,4 @@ public interface ICodeSampleService<SampleOptions> where SampleOptions : class
     /// <param name="ct">A cancellation token for the operation.</param>
     /// <returns>A list of available code sample options.</returns>
     ValueTask<IImmutableList<string>> GetCodeSampleOptionsAsync(CancellationToken ct = default);
-
-
-    /// <summary>
-    /// Switches the current code sample to the specified option asynchronously.
-    /// </summary>
-    /// <param name="selectedSampleOption">The selected code sample option to switch to.</param>
-    /// <param name="ct">A cancellation token for the operation.</param>
-    /// <returns>
-    /// A <see cref="ValueTask{TResult}"/> representing the asynchronous operation, with the content of the switched code sample as a string.
-    /// </returns>
-    ValueTask<string> SwitchCodeSampleAsync(string? selectedSampleOption, CancellationToken ct = default);
 }