fix for non normalized paths

AdaskoTheBeAsT · Nov 27, 2023 · c581f70 · c581f70
1 parent 25703ea
commit c581f70
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/src/Tests/LongPaths/FileWriterTest.cs b/src/Tests/LongPaths/FileWriterTest.cs
@@ -8,7 +8,7 @@ namespace Typewriter.Tests.LongPaths
     public class FileWriterTest
     {
         [Fact]
-        public void ShouldCreateFileInDirectory()
+        public void ShouldCreateFileInDirectoryForLongPath()
         {
             var path = @"C:\Dev\SomeInnerPath\Github\Project\src\innerpath\another-subpath\A.Very.Long.Project.Name.Like.Dotnet.People.Like\packages\some-random-scope\some-package-name\src\lib\events\a-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long-file-name.ts";
             var modifiedPath = path.StartsWith(@"\\", StringComparison.OrdinalIgnoreCase)
@@ -27,5 +27,27 @@ public void ShouldCreateFileInDirectory()
 
             action.Should().NotThrow();
         }
+
+        [Fact]
+        public void ShouldCreateFileInDirectoryForNonNormalizedLongPath()
+        {
+            var path = @"C:\Dev\..\Dev\SomeInnerPath\Github\Project\src\innerpath\another-subpath\A.Very.Long.Project.Name.Like.Dotnet.People.Like\packages\some-random-scope\some-package-name\src\lib\events\a-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long-file-name.ts";
+            var normalizedPath = Path.GetFullPath(path);
+            var longPath = normalizedPath.StartsWith(@"\\", StringComparison.OrdinalIgnoreCase)
+                ? $@"\\?\UNC\{normalizedPath.Substring(2, normalizedPath.Length - 2)}"
+                : $@"\\?\{normalizedPath}";
+            Action action = () =>
+            {
+                var dir = Path.GetDirectoryName(longPath);
+                if (!Directory.Exists(dir) && dir != null)
+                {
+                    Directory.CreateDirectory(dir);
+                }
+
+                File.WriteAllText(longPath, "ok");
+            };
+
+            action.Should().NotThrow();
+        }
     }
 }
diff --git a/src/Typewriter/Generation/Template.cs b/src/Typewriter/Generation/Template.cs
@@ -10,6 +10,7 @@
 using Typewriter.Generation.Controllers;
 using Typewriter.VisualStudio;
 using File = Typewriter.CodeModel.File;
+using Path = System.IO.Path;
 
 namespace Typewriter.Generation
 {
@@ -165,18 +166,19 @@ public bool RenderFile(File[] files)
 
         protected virtual void WriteFile(string outputPath, string outputContent)
         {
-            var modifiedPath = outputPath.StartsWith(@"\\", StringComparison.OrdinalIgnoreCase)
-            ? $@"\\?\UNC\{outputPath.Substring(2, outputPath.Length - 2)}"
-                : $@"\\?\{outputPath}";
+            var normalizedPath = Path.GetFullPath(outputPath);
+            var longPath = normalizedPath.StartsWith(@"\\", StringComparison.OrdinalIgnoreCase)
+                ? $@"\\?\UNC\{normalizedPath.Substring(2, normalizedPath.Length - 2)}"
+                : $@"\\?\{normalizedPath}";
 
-            var dir = System.IO.Path.GetDirectoryName(modifiedPath);
-            if (!System.IO.Directory.Exists(dir) && dir != null)
+            var dir = Path.GetDirectoryName(longPath);
+            if (!Directory.Exists(dir) && dir != null)
             {
-                System.IO.Directory.CreateDirectory(dir);
+                Directory.CreateDirectory(dir);
             }
 
             System.IO.File.WriteAllText(
-                modifiedPath,
+                longPath,
                 outputContent,
                 new UTF8Encoding(encoderShouldEmitUTF8Identifier: false));
         }

diff --git a/src/Typewriter/source.extension.vsixmanifest b/src/Typewriter/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="68E244F1-14E1-4681-A51C-5B902B9EE96C" Version="2.21.0" Language="en-US" Publisher="frhagn" />
+        <Identity Id="68E244F1-14E1-4681-A51C-5B902B9EE96C" Version="2.22.0" Language="en-US" Publisher="frhagn" />
         <DisplayName>Typewriter64</DisplayName>
         <Description xml:space="preserve">Typewriter generates TypeScript files from c# code files using TypeScript Templates. This allows you to create fully typed TypeScript representations of server side API that automatically updates when you make changes to your c# code.</Description>
         <MoreInfo>http://frhagn.github.io/Typewriter/</MoreInfo>