Merge pull request #25 from rjrudman/master

Add flag to convert line endings to unix
lukemurray · Nov 28, 2023 · 9497644 · 9497644
2 parents 51eeed0 + 2ed50a3
commit 9497644
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/src/dotnet-gqlgen-console/Program.cs b/src/dotnet-gqlgen-console/Program.cs
@@ -31,6 +31,9 @@ public class Program
 
         [Option(LongName = "no_generated_timestamp", ShortName = "nt", Description = "Don't add 'Generated on abc from xyz' in generated files")]
         public bool NoGeneratedTimestamp { get; }
+
+        [Option(LongName = "unix", ShortName = "un", Description = "Convert windows endings to unix")]
+        public bool ConvertToUnixLineEnding { get; }
 
         public static Task<int> Main(string[] args) => CommandLineApplication.ExecuteAsync<Program>(args);
 
@@ -47,7 +50,8 @@ await Generator.Generate(new()
                     ScalarMapping = ScalarMapping,
                     OutputDir = OutputDir,
                     Usings = Usings,
-                    NoGeneratedTimestamp = NoGeneratedTimestamp
+                    NoGeneratedTimestamp = NoGeneratedTimestamp,
+                    ConvertToUnixLineEnding = ConvertToUnixLineEnding
                 });
             }
             catch (Exception e)

diff --git a/src/dotnet-gqlgen/Generator.cs b/src/dotnet-gqlgen/Generator.cs
@@ -21,6 +21,7 @@ public class GeneratorOptions
         public string OutputDir { get; set; } = "output";
         public string Usings { get; set; } = "";
         public bool NoGeneratedTimestamp { get; set; }
+        public bool ConvertToUnixLineEnding { get; set; } = true;
     }
 
     public static class Generator
@@ -112,7 +113,7 @@ public static async Task Generate(GeneratorOptions options)
                 options.NoGeneratedTimestamp
             });
             Directory.CreateDirectory(options.OutputDir);
-            await File.WriteAllTextAsync($"{options.OutputDir}/GeneratedResultTypes.cs", resultTypes);
+            await NormalizeAndWriteIfChanged($"{options.OutputDir}/GeneratedResultTypes.cs", resultTypes, options.ConvertToUnixLineEnding);
 
             string queryTypes = await engine.CompileRenderAsync("queryTypes.cshtml", new
             {
@@ -125,7 +126,7 @@ public static async Task Generate(GeneratorOptions options)
                 options.NoGeneratedTimestamp
             });
             Directory.CreateDirectory(options.OutputDir);
-            await File.WriteAllTextAsync($"{options.OutputDir}/GeneratedQueryTypes.cs", queryTypes);
+            await NormalizeAndWriteIfChanged($"{options.OutputDir}/GeneratedQueryTypes.cs", queryTypes, options.ConvertToUnixLineEnding);
 
             resultTypes = await engine.CompileRenderAsync("client.cshtml", new
             {
@@ -138,20 +139,30 @@ public static async Task Generate(GeneratorOptions options)
                 CmdArgs = $"-n {options.Namespace} -c {options.ClientClassName} -m {options.ScalarMapping}",
                 options.NoGeneratedTimestamp
             });
-            await File.WriteAllTextAsync($"{options.OutputDir}/{options.ClientClassName}.cs", resultTypes);
+            await NormalizeAndWriteIfChanged($"{options.OutputDir}/{options.ClientClassName}.cs", resultTypes, options.ConvertToUnixLineEnding);
 
-            await WriteResourceToFile(rootType, "BaseGraphQLClient.cs", $"{options.OutputDir}/BaseGraphQLClient.cs");
-            await WriteResourceToFile(rootType, "GqlFieldNameAttribute.cs", $"{options.OutputDir}/GqlFieldNameAttribute.cs");
+            await WriteResourceToFile(rootType, "BaseGraphQLClient.cs", $"{options.OutputDir}/BaseGraphQLClient.cs", options.ConvertToUnixLineEnding);
+            await WriteResourceToFile(rootType, "GqlFieldNameAttribute.cs", $"{options.OutputDir}/GqlFieldNameAttribute.cs", options.ConvertToUnixLineEnding);
 
             Console.WriteLine($"Done.");
         }
+
+        private static async Task NormalizeAndWriteIfChanged(string file, string text, bool convertToUnixLineEnding)
+        {
+            var normalizedText = convertToUnixLineEnding ? text.Replace("\r\n", "\n") : text;
+            if (File.Exists(file) && string.Equals(await File.ReadAllTextAsync(file), normalizedText)) return;
+
+            await File.WriteAllTextAsync(file, normalizedText);
+        }
 
-        private static async Task WriteResourceToFile(Type rootType, string resourceName, string outputLocation) 
+        private static async Task WriteResourceToFile(Type rootType, string resourceName, string outputLocation, bool convertToUnixLineEnding) 
         {
             var assembly = rootType.GetTypeInfo().Assembly;
-            await using var fileStream = File.Open(outputLocation, FileMode.Create);
             await using var resourceStream = assembly.GetManifestResourceStream($"{rootType.Namespace}.{resourceName}")!;
-            await resourceStream.CopyToAsync(fileStream);
+            using var streamReader = new StreamReader(resourceStream);
+
+            var text = await streamReader.ReadToEndAsync();
+            await NormalizeAndWriteIfChanged(outputLocation, text, convertToUnixLineEnding);
         }
 
         /// <summary>

diff --git a/src/dotnet-gqlgen/dotnet-gqlgen.csproj b/src/dotnet-gqlgen/dotnet-gqlgen.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>dotnet_gqlgen</RootNamespace>
     <PreserveCompilationContext>true</PreserveCompilationContext>
-    <PackageVersion>0.6.2</PackageVersion>
+    <PackageVersion>0.6.4</PackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>