correctly generate type with generic enum constraint

skbkontur · Mar 1, 2024 · eaa21eb · eaa21eb
1 parent 9ba8da4
commit eaa21eb
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 25 deletions.
diff --git a/TypeScript.ContractGenerator.Tests/CliTest.cs b/TypeScript.ContractGenerator.Tests/CliTest.cs
@@ -1,4 +1,7 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
 
 using FluentAssertions;
 
@@ -13,28 +16,24 @@ public class CliTest
         [Test]
         public void CliGenerated()
         {
-            RunDotnetCommand($"{pathToSlnDirectory}/TypeScript.ContractGenerator.Cli/bin/{configuration}/{targetFramework}/SkbKontur.TypeScript.ContractGenerator.Cli.dll " +
-                             $"-a {pathToSlnDirectory}/AspNetCoreExample.Api/bin/{configuration}/{targetFramework}/AspNetCoreExample.Api.dll " +
-                             $"-o {TestContext.CurrentContext.TestDirectory}/cliOutput " +
-                             "--nullabilityMode NullableReference " +
-                             "--lintMode TsLint");
-
-            var expectedDirectory = $"{pathToSlnDirectory}/AspNetCoreExample.Generator/output";
-            var actualDirectory = $"{TestContext.CurrentContext.TestDirectory}/cliOutput";
-            TestBase.CheckDirectoriesEquivalenceInner(expectedDirectory, actualDirectory, generatedOnly : true);
+            var output = Path.Combine(TestContext.CurrentContext.TestDirectory, "cliOutput");
+
+            RunDotnetCommand($"{Tool()} -a {Assembly()} -o {output} --nullabilityMode NullableReference --lintMode TsLint");
+
+            var expectedDirectory = $"{repoRoot}/AspNetCoreExample.Generator/output";
+            TestBase.CheckDirectoriesEquivalenceInner(expectedDirectory, output, generatedOnly : true);
         }
 
         [Test]
         public void RoslynCliGenerated()
         {
-            RunDotnetCommand($"{pathToSlnDirectory}/TypeScript.ContractGenerator.Cli/bin/{configuration}/{targetFramework}/SkbKontur.TypeScript.ContractGenerator.Cli.dll " +
-                             $"-d {pathToSlnDirectory}/AspNetCoreExample.Api " +
-                             $"-a {typeof(ControllerBase).Assembly.Location} " +
-                             $"-o {TestContext.CurrentContext.TestDirectory}/roslynCliOutput " +
-                             "--nullabilityMode NullableReference " +
-                             "--lintMode TsLint");
-
-            var expectedDirectory = $"{pathToSlnDirectory}/AspNetCoreExample.Generator/output";
+            var project = Path.Combine(repoRoot, "AspNetCoreExample.Api");
+            var assembly = typeof(ControllerBase).Assembly.Location;
+            var output = Path.Combine(TestContext.CurrentContext.TestDirectory, "roslynCliOutput");
+
+            RunDotnetCommand($"{Tool()} -d {project} -a {assembly} -o {output} --nullabilityMode NullableReference --lintMode TsLint");
+
+            var expectedDirectory = $"{repoRoot}/AspNetCoreExample.Generator/output";
             var actualDirectory = $"{TestContext.CurrentContext.TestDirectory}/roslynCliOutput";
             TestBase.CheckDirectoriesEquivalenceInner(expectedDirectory, actualDirectory, generatedOnly : true);
         }
@@ -55,12 +54,47 @@ private static void RunDotnetCommand(string command)
             process.Start();
             process.WaitForExit();
 
-            process.ExitCode.Should().Be(0);
-            process.StandardOutput.ReadToEnd().Trim().Should().Be("Generating TypeScript");
             process.StandardError.ReadToEnd().Trim().Should().BeEmpty();
+            process.StandardOutput.ReadToEnd().Trim().Should().Be("Generating TypeScript");
+            process.ExitCode.Should().Be(0);
+        }
+
+        private static string Tool()
+        {
+            return Path.Combine(
+                repoRoot,
+                "TypeScript.ContractGenerator.Cli",
+                "bin",
+                configuration,
+                targetFramework,
+                "SkbKontur.TypeScript.ContractGenerator.Cli.dll"
+            );
+        }
+
+        private static string Assembly()
+        {
+            return Path.Combine(
+                repoRoot,
+                "AspNetCoreExample.Api",
+                "bin",
+                configuration,
+                targetFramework,
+                "AspNetCoreExample.Api.dll"
+            );
+        }
+
+        private static string RootDirectory(DirectoryInfo? current = null)
+        {
+            current ??= new DirectoryInfo(TestContext.CurrentContext.TestDirectory);
+            while (current != null && current.EnumerateFiles().All(x => x.Name != "TypeScript.ContractGenerator.sln"))
+            {
+                current = current.Parent;
+            }
+
+            return current?.FullName ?? throw new InvalidOperationException("Cannot find root folder");
         }
 
-        private static readonly string pathToSlnDirectory = $"{TestContext.CurrentContext.TestDirectory}/../../../../";
+        private static readonly string repoRoot = RootDirectory();
 
         private const string targetFramework = "net8.0";
 

diff --git a/TypeScript.ContractGenerator.Tests/EndToEndTests.cs b/TypeScript.ContractGenerator.Tests/EndToEndTests.cs
@@ -24,6 +24,7 @@ public class EndToEndTests<TTypesProvider> : TestBase
         [TestCase(typeof(ComplexRootType), "complex-types")]
         [TestCase(typeof(GenericRootType<>), "generic-root")]
         [TestCase(typeof(GenericContainingRootType), "generic-types")]
+        [TestCase(typeof(GenericInheritingType<>), "generic-inheriting-types")]
         [TestCase(typeof(ArrayRootType), "array-types")]
         [TestCase(typeof(NotNullRootType), "notnull-types")]
         [TestCase(typeof(NonDefaultConstructorRootType), "non-default-constructor")]

diff --git a/TypeScript.ContractGenerator.Tests/Files/SimpleGenerator/generic-inheriting-types.ts b/TypeScript.ContractGenerator.Tests/Files/SimpleGenerator/generic-inheriting-types.ts
@@ -0,0 +1,4 @@
+
+export type GenericInheritingType<TType> = {
+    type: TType;
+};
diff --git a/TypeScript.ContractGenerator.Tests/TypeScript.ContractGenerator.Tests.csproj b/TypeScript.ContractGenerator.Tests/TypeScript.ContractGenerator.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0</TargetFrameworks>
     <AssemblyName>SkbKontur.TypeScript.ContractGenerator.Tests</AssemblyName>
     <RootNamespace>SkbKontur.TypeScript.ContractGenerator.Tests</RootNamespace>
   </PropertyGroup>

diff --git a/TypeScript.ContractGenerator.Tests/Types/GenericInheritingType.cs b/TypeScript.ContractGenerator.Tests/Types/GenericInheritingType.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace SkbKontur.TypeScript.ContractGenerator.Tests.Types
+{
+    public class GenericInheritingType<TType>
+        where TType : Enum
+    {
+        [NotNull]
+        public TType Type { get; set; }
+    }
+}
diff --git a/TypeScript.ContractGenerator/TypeScriptGenerator.cs b/TypeScript.ContractGenerator/TypeScriptGenerator.cs
@@ -102,15 +102,15 @@ private ITypeBuildingContext GetTypeBuildingContext(string typeLocation, ITypeIn
             if (NullableTypeBuildingContext.Accept(typeInfo))
                 return new NullableTypeBuildingContext(typeInfo);
 
+            if (typeInfo.IsGenericParameter)
+                return new GenericParameterTypeBuildingContext(typeInfo);
+
             if (typeInfo.IsEnum)
                 return new TypeScriptEnumTypeBuildingContext(typeUnitFactory.GetOrCreateTypeUnit(typeLocation), typeInfo);
 
             if (typeInfo.IsGenericType && !typeInfo.IsGenericTypeDefinition)
                 return new GenericTypeTypeBuildingContext(typeInfo);
 
-            if (typeInfo.IsGenericParameter)
-                return new GenericParameterTypeBuildingContext(typeInfo);
-
             if (typeInfo.IsGenericTypeDefinition)
                 return new CustomTypeTypeBuildingContext(typeUnitFactory.GetOrCreateTypeUnit(typeLocation), typeInfo);