Update Harp.Generators to 0.8.0

src/Harp.Toolkit/Generate/GenerateCSharpInterfaceCommand.cs

@@ -25,7 +25,7 @@ public GenerateCSharpInterfaceCommand()
             var metadataPath = parseResult.GetRequiredValue(metadataPathArgument);
             var ns = parseResult.GetValue(namespaceOption);
 
-            var deviceMetadata = GeneratorHelper.ReadDeviceMetadata(metadataPath.FullName);
+            var deviceMetadata = DeviceMetadata.Load(metadataPath.FullName);
             var generator = new InterfaceGenerator(deviceMetadata, ns ?? $"Harp.{deviceMetadata.Device}");
             var implementation = generator.GenerateImplementation();
             if (GeneratorHelper.AssertNoGeneratorErrors(generator.Errors))

src/Harp.Toolkit/Generate/GenerateFirmwareCommand.cs

@@ -29,8 +29,8 @@ public GenerateFirmwareCommand()
             var iosMetadataFileName = parseResult.GetRequiredValue(iosMetadataPathOption).FullName;
             var generateImplementation = parseResult.GetValue(generateImplementationOption);
 
-            var deviceMetadata = GeneratorHelper.ReadDeviceMetadata(registerMetadataFileName);
-            var portPinMetadata = GeneratorHelper.ReadPortPinMetadata(iosMetadataFileName);
+            var deviceMetadata = DeviceMetadata.Load(registerMetadataFileName);
+            var portPinMetadata = PortPinMetadata.Load(iosMetadataFileName);
             var generator = new FirmwareGenerator(deviceMetadata, portPinMetadata);
             var headers = generator.GenerateHeaders();
             var implementation = generateImplementation ? generator.GenerateImplementation() : default;

src/Harp.Toolkit/Generate/GeneratePythonInterfaceCommand.cs

@@ -19,7 +19,7 @@ public GeneratePythonInterfaceCommand()
             var outputPath = parseResult.GetRequiredValue(outputPathOption);
             var metadataPath = parseResult.GetRequiredValue(metadataPathArgument);
 
-            var deviceMetadata = GeneratorHelper.ReadDeviceMetadata(metadataPath.FullName);
+            var deviceMetadata = DeviceMetadata.Load(metadataPath.FullName);
             var generator = new PythonGenerator(deviceMetadata);
             var implementation = generator.GenerateImplementation();
             if (GeneratorHelper.AssertNoGeneratorErrors(generator.Errors))

src/Harp.Toolkit/Generate/GeneratorHelper.cs

@@ -1,25 +1,11 @@
 using System.CodeDom.Compiler;
 using System.Text;
 using Harp.Generators;
-using YamlDotNet.Core;
 
 namespace Harp.Toolkit.Generate;
 
 public static class GeneratorHelper
 {
-    public static DeviceMetadata ReadDeviceMetadata(string path)
-    {
-        using var reader = new StreamReader(path);
-        var parser = new MergingParser(new Parser(reader));
-        return MetadataDeserializer.Instance.Deserialize<DeviceMetadata>(parser);
-    }
-
-    public static Dictionary<string, PortPinInfo> ReadPortPinMetadata(string path)
-    {
-        using var reader = new StreamReader(path);
-        return MetadataDeserializer.Instance.Deserialize<Dictionary<string, PortPinInfo>>(reader);
-    }
-
     public static IEnumerable<KeyValuePair<string, T>> GetPortPinsOfType<T>(IDictionary<string, PortPinInfo> portPins) where T : PortPinInfo
     {
         return from item in portPins

src/Harp.Toolkit/Harp.Toolkit.csproj

@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="ExcelDataReader.DataSet" Version="3.8.0" />
-    <PackageReference Include="Harp.Generators" Version="0.7.0" />
+    <PackageReference Include="Harp.Generators" Version="0.8.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.1" />

src/Harp.Toolkit/Verify/VerifyCommand.cs

@@ -3,7 +3,6 @@
 using Spectre.Console;
 using Harp.Generators;
 using Harp.Toolkit.Verify.Suites;
-using Harp.Toolkit.Generate;
 
 namespace Harp.Toolkit.Verify;
 public class VerifyCommand : Command
@@ -93,7 +92,7 @@ static async Task<int> RunVerification(string portName, FileInfo? reportFile, bo
         if (metadataPath is not null)
         {
             AnsiConsole.Markup($"Loading device metadata from [bold]{metadataPath.FullName}[/]...");
-            deviceMetadata = GeneratorHelper.ReadDeviceMetadata(metadataPath.FullName);
+            deviceMetadata = DeviceMetadata.Load(metadataPath.FullName);
             deviceRawYaml = await File.ReadAllTextAsync(metadataPath.FullName, cancellationToken);
             AnsiConsole.MarkupLine($" [green]Done![/] ({deviceMetadata.Registers.Count} registers)");
         }