Merge pull request #1606 from Cratis:fix/minor-things

Fix/minor-things

Author: einari

Source/DotNET/Cratis/Cratis.csproj

@@ -18,6 +18,7 @@
         <PackageReference Include="Cratis.Chronicle.AspNetCore" />
     </ItemGroup>
     <ItemGroup>
-        <None Include="GlobalUsings.cs" Pack="true" PackagePath="contentFiles/cs/any;content" />
+        <None Include="GlobalUsings.cs" Pack="true" PackagePath="contentFiles/cs/any" BuildAction="Compile" />
+        <None Include="build/Cratis.props" Pack="true" PackagePath="build;buildTransitive" />
     </ItemGroup>
 </Project>

Source/DotNET/Cratis/GlobalUsings.cs

@@ -11,6 +11,7 @@
 global using Cratis.Arc.Identity;
 global using Cratis.Arc.Queries;
 global using Cratis.Arc.Queries.ModelBound;
+global using Cratis.Arc.Swagger;
 global using Cratis.Arc.Validation;
 global using Cratis.Chronicle;
 global using Cratis.Chronicle.Events;

Source/DotNET/Cratis/build/Cratis.props

@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)\..\contentFiles\cs\any\GlobalUsings.cs" Link="GlobalUsings.Cratis.cs" Visible="false" />
+  </ItemGroup>
+</Project>

Source/DotNET/Tools/ProxyGenerator.Specs/for_FileMetadataScanner/when_finding_orphaned_files/simulating_real_generation_flow.cs

@@ -0,0 +1,46 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Cratis.Arc.ProxyGenerator.for_FileMetadataScanner.when_finding_orphaned_files;
+
+public class simulating_real_generation_flow : Specification
+{
+    string _tempDir;
+    Dictionary<string, GeneratedFileMetadata> _generatedFiles;
+    IEnumerable<string> _orphanedFiles;
+
+    void Establish()
+    {
+        _tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+        Directory.CreateDirectory(_tempDir);
+
+        _generatedFiles = [];
+
+        var targetPath = _tempDir;
+        const string path = "commands";
+        const string fileName = "CreateOrder.ts";
+
+        var fullPath = Path.Join(targetPath, path, fileName);
+        var normalizedFullPath = Path.GetFullPath(fullPath);
+        var directory = Path.GetDirectoryName(normalizedFullPath)!;
+        Directory.CreateDirectory(directory);
+
+        var metadata = new GeneratedFileMetadata("MyApp.Commands.CreateOrder", DateTime.UtcNow);
+        var content = $"{metadata.ToCommentLine()}\nexport class CreateOrder {{}}";
+        File.WriteAllText(normalizedFullPath, content);
+
+        _generatedFiles[normalizedFullPath] = metadata;
+    }
+
+    void Because() => _orphanedFiles = FileMetadataScanner.FindOrphanedFiles(_tempDir, _generatedFiles);
+
+    [Fact] void should_not_find_any_orphaned_files() => _orphanedFiles.ShouldBeEmpty();
+
+    void Cleanup()
+    {
+        if (Directory.Exists(_tempDir))
+        {
+            Directory.Delete(_tempDir, true);
+        }
+    }
+}

Source/DotNET/Tools/ProxyGenerator.Specs/for_FileMetadataScanner/when_finding_orphaned_files/with_file_generated_using_path_join.cs

@@ -0,0 +1,44 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Cratis.Arc.ProxyGenerator.for_FileMetadataScanner.when_finding_orphaned_files;
+
+public class with_file_generated_using_path_join : Specification
+{
+    string _tempDir;
+    Dictionary<string, GeneratedFileMetadata> _generatedFiles;
+    IEnumerable<string> _orphanedFiles;
+    string _generatedFilePath;
+
+    void Establish()
+    {
+        _tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+        Directory.CreateDirectory(_tempDir);
+
+        const string subDir = "commands";
+        _generatedFilePath = Path.Join(_tempDir, subDir, "CreateOrder.ts");
+        var directory = Path.GetDirectoryName(_generatedFilePath)!;
+        Directory.CreateDirectory(directory);
+
+        var metadata = new GeneratedFileMetadata("MyApp.Commands.CreateOrder", DateTime.UtcNow);
+        File.WriteAllText(_generatedFilePath, $"{metadata.ToCommentLine()}\nexport class CreateOrder {{}}");
+
+        _generatedFiles = new Dictionary<string, GeneratedFileMetadata>
+        {
+            [_generatedFilePath] = metadata
+        };
+    }
+
+    void Because() => _orphanedFiles = FileMetadataScanner.FindOrphanedFiles(_tempDir, _generatedFiles);
+
+    [Fact] void should_not_find_the_just_generated_file_as_orphaned() => _orphanedFiles.ShouldNotContain(_generatedFilePath);
+    [Fact] void should_not_find_any_orphaned_files() => _orphanedFiles.ShouldBeEmpty();
+
+    void Cleanup()
+    {
+        if (Directory.Exists(_tempDir))
+        {
+            Directory.Delete(_tempDir, true);
+        }
+    }
+}

Source/DotNET/Tools/ProxyGenerator.Specs/for_FileMetadataScanner/when_finding_orphaned_files/with_file_just_generated_in_same_run.cs

@@ -0,0 +1,40 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Cratis.Arc.ProxyGenerator.for_FileMetadataScanner.when_finding_orphaned_files;
+
+public class with_file_just_generated_in_same_run : Specification
+{
+    string _tempDir;
+    Dictionary<string, GeneratedFileMetadata> _generatedFiles;
+    IEnumerable<string> _orphanedFiles;
+    string _justGeneratedFilePath;
+
+    void Establish()
+    {
+        _tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+        Directory.CreateDirectory(_tempDir);
+
+        _justGeneratedFilePath = Path.Combine(_tempDir, "JustGenerated.ts");
+        var metadata = new GeneratedFileMetadata("MyNamespace.MyCommand", DateTime.UtcNow);
+        File.WriteAllText(_justGeneratedFilePath, $"{metadata.ToCommentLine()}\nexport class JustGenerated {{}}");
+
+        _generatedFiles = new Dictionary<string, GeneratedFileMetadata>
+        {
+            [_justGeneratedFilePath] = metadata
+        };
+    }
+
+    void Because() => _orphanedFiles = FileMetadataScanner.FindOrphanedFiles(_tempDir, _generatedFiles);
+
+    [Fact] void should_not_find_the_just_generated_file_as_orphaned() => _orphanedFiles.ShouldNotContain(_justGeneratedFilePath);
+    [Fact] void should_not_find_any_orphaned_files() => _orphanedFiles.ShouldBeEmpty();
+
+    void Cleanup()
+    {
+        if (Directory.Exists(_tempDir))
+        {
+            Directory.Delete(_tempDir, true);
+        }
+    }
+}

Source/DotNET/Tools/ProxyGenerator/DescriptorExtensions.cs

@@ -45,7 +45,8 @@ public static async Task Write(
         {
             var path = descriptor.Type.ResolveTargetPath(segmentsToSkip);
             var fullPath = Path.Join(targetPath, path, $"{descriptor.Name}.ts");
-            var directory = Path.GetDirectoryName(fullPath)!;
+            var normalizedFullPath = Path.GetFullPath(fullPath);
+            var directory = Path.GetDirectoryName(normalizedFullPath)!;
             if (!Directory.Exists(directory)) Directory.CreateDirectory(directory);
 
             if (!directories.Contains(directory))
@@ -56,19 +57,19 @@ public static async Task Write(
             var proxyContent = template(descriptor);
             var metadata = new GeneratedFileMetadata(descriptor.Type.FullName!, generationTime);
             var contentWithMetadata = $"{metadata.ToCommentLine()}{Environment.NewLine}{proxyContent}";
-            await File.WriteAllTextAsync(fullPath, contentWithMetadata);
+            await File.WriteAllTextAsync(normalizedFullPath, contentWithMetadata);
 
             // Track the generated file in the index
             if (fileIndex is not null)
             {
-                var relativePath = Path.GetRelativePath(targetPath, fullPath);
+                var relativePath = Path.GetRelativePath(targetPath, normalizedFullPath);
                 fileIndex.AddFile(relativePath);
             }
 
             // Track generated file metadata
             if (generatedFiles is not null)
             {
-                generatedFiles[fullPath] = metadata;
+                generatedFiles[normalizedFullPath] = metadata;
             }
         }