Add merge command and tests

.github/workflows/test.yml

@@ -35,7 +35,7 @@ jobs:
         sudo apt-get install gcc-i686-linux-gnu gcc-x86-64-linux-gnu gcc-aarch64-linux-gnu llvm-14 clang-14
 
     - name: "Setup .NET"
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '8.x'
 
@@ -44,7 +44,7 @@ jobs:
         dotnet test '${{ github.workspace }}/src/cs/tests/c2ffi.Tests.EndToEnd.Extract/c2ffi.Tests.EndToEnd.Extract.csproj' --nologo --verbosity minimal --configuration Release
 
     - name: "Upload generated FFI files"
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: "ffi-${{ matrix.platform.name }}"
         path: |
@@ -63,26 +63,26 @@ jobs:
       uses: actions/checkout@v4
 
     - name: "Setup .NET"
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '8.x'
 
     - name: "Download generated FFI files: windows"
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: "ffi-windows"
         path: |
           ${{ github.workspace }}/src/c/tests
 
     - name: "Download generated FFI files: linux"
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: "ffi-linux"
         path: |
           ${{ github.workspace }}/src/c/tests
 
     - name: "Download generated FFI files: macos"
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: "ffi-macos"
         path: |
@@ -92,3 +92,10 @@ jobs:
       run: |
         dotnet test '${{ github.workspace }}/src/cs/tests/c2ffi.Tests.EndToEnd.Merge/c2ffi.Tests.EndToEnd.Merge.csproj' --nologo --verbosity minimal --configuration Release
 
+    - name: "Upload generated FFI files"
+      uses: actions/upload-artifact@v4
+      with:
+        name: "ffi-x"
+        path: |
+          ${{ github.workspace }}/src/c/tests/**/ffi-x/*.json
+

.gitignore

@@ -7,3 +7,4 @@ bin/
 obj/
 /artifacts/
 src/c/tests/**/ffi/*.json
+src/c/tests/**/ffi-x/*.json

src/cs/production/c2ffi.Data/Nodes/CMacroObject.cs

@@ -45,6 +45,16 @@ public override bool Equals(CNode? other)
         return TypeInfo.Equals(other2.TypeInfo) && Value == other2.Value;
     }
 
+    public bool EqualsWithoutValue(CMacroObject other)
+    {
+        if (!base.Equals(other))
+        {
+            return false;
+        }
+
+        return TypeInfo.Equals(other.TypeInfo);
+    }
+
     /// <inheritdoc />
     public override int GetHashCode()
     {

src/cs/production/c2ffi.Tool/Commands/Merge/Input/MergeInputSanitizer.cs

@@ -0,0 +1,46 @@
+// Copyright (c) Bottlenose Labs Inc. (https://github.com/bottlenoselabs). All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the Git repository root directory for full license information.
+
+using System.Collections.Immutable;
+using System.IO.Abstractions;
+using bottlenoselabs.Common.Tools;
+using c2ffi.Tool.Commands.Merge.Input.Sanitized;
+using c2ffi.Tool.Commands.Merge.Input.Unsanitized;
+
+namespace c2ffi.Tool.Commands.Merge.Input;
+
+public sealed class MergeInputSanitizer
+{
+    private readonly IFileSystem _fileSystem;
+
+    public MergeInputSanitizer(IFileSystem fileSystem)
+    {
+        _fileSystem = fileSystem;
+    }
+
+    public MergeOptions Sanitize(UnsanitizedMergeOptions unsanitizedOptions)
+    {
+        var directoryPath = _fileSystem.Path.GetFullPath(unsanitizedOptions.InputDirectoryPath);
+        if (!_fileSystem.Directory.Exists(directoryPath))
+        {
+            throw new ToolInputSanitizationException($"The directory '{directoryPath}' does not exist.");
+        }
+
+        var filePaths = _fileSystem.Directory.GetFiles(directoryPath, "*.json").ToImmutableArray();
+
+        if (filePaths.IsDefaultOrEmpty)
+        {
+            throw new ToolInputSanitizationException($"The directory '{directoryPath}' does not contain any abstract syntax tree `.json` files.");
+        }
+
+        var outputFilePath = _fileSystem.Path.GetFullPath(unsanitizedOptions.OutputFilePath);
+
+        var result = new MergeOptions
+        {
+            OutputFilePath = outputFilePath,
+            InputFilePaths = filePaths
+        };
+
+        return result;
+    }
+}

src/cs/production/c2ffi.Tool/Commands/Merge/Input/Sanitized/MergeOptions.cs

@@ -0,0 +1,13 @@
+// Copyright (c) Bottlenose Labs Inc. (https://github.com/bottlenoselabs). All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the Git repository root directory for full license information.
+
+using System.Collections.Immutable;
+
+namespace c2ffi.Tool.Commands.Merge.Input.Sanitized;
+
+public class MergeOptions
+{
+    public ImmutableArray<string> InputFilePaths { get; set; } = ImmutableArray<string>.Empty;
+
+    public string OutputFilePath { get; set; } = string.Empty;
+}

src/cs/production/c2ffi.Tool/Commands/Merge/Input/Unsanitized/UnsanitizedMergeOptions.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Bottlenose Labs Inc. (https://github.com/bottlenoselabs). All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the Git repository root directory for full license information.
+
+namespace c2ffi.Tool.Commands.Merge.Input.Unsanitized;
+
+// NOTE: This class is considered un-sanitized input; all strings and other types could be null.
+public class UnsanitizedMergeOptions
+{
+    public string InputDirectoryPath { get; set; } = string.Empty;
+
+    public string OutputFilePath { get; set; } = string.Empty;
+}

src/cs/production/c2ffi.Tool/Commands/Merge/MergeFfisCommand.cs

@@ -2,23 +2,26 @@
 // Licensed under the MIT license. See LICENSE file in the Git repository root directory for full license information.
 
 using System.CommandLine;
-using JetBrains.Annotations;
+using c2ffi.Tool.Commands.Merge.Input.Unsanitized;
 
 namespace c2ffi.Tool.Commands.Merge;
 
-[UsedImplicitly]
-public class MergeFfisCommand : Command
+public sealed class MergeFfisCommand : Command
 {
-    public MergeFfisCommand()
+    private readonly MergeFfisTool _tool;
+
+    public MergeFfisCommand(MergeFfisTool tool)
         : base(
             "merge",
             "Merge multiple target platform FFI (foreign function interface) `.json` files into a cross-platform FFI `.json` file.")
     {
+        _tool = tool;
+
         var directoryOption = new Option<string>(
             "--inputDirectoryPath", "The input directory where the multiple target platform FFI (foreign function interface) `.json` files are located.")
-        {
-            IsRequired = true
-        };
+            {
+                IsRequired = true
+            };
         AddOption(directoryOption);
 
         var fileOption = new Option<string>(
@@ -30,6 +33,6 @@ public MergeFfisCommand()
 
     private void Main(string inputDirectoryPath, string outputFilePath)
     {
-        Console.WriteLine("Merge!");
+        _tool.Run(inputDirectoryPath, outputFilePath);
     }
 }