Generic types

markusobviuse · markusobviuse · commit c7584bec170e · 2021-04-06T14:34:47.000+02:00
diff --git a/src/Test/GenericTest.cs b/src/Test/GenericTest.cs
@@ -0,0 +1,51 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Test
+{
+    
+
+    public class GetCookiesForWebsiteQuery : Query<GetCookiesForWebsiteResult>
+    {
+        public override string Alias => "GetCookiesForWebsite";
+
+        public Guid WebsiteKey { get; set; }
+
+    }
+
+    public class GetCookiesForWebsiteResult
+    {
+        public string WebsiteName {get;set;}
+
+        
+
+
+    }
+
+    public abstract class Query<T> : IQuery<T>
+    {
+        public abstract string Alias { get; }
+        
+    }
+
+    public interface IQuery
+    {
+        /// <summary>
+        /// Used when performing requests from the front end
+        /// </summary>
+        string Alias { get; }
+        
+    }
+
+    
+    /// <summary>
+    /// Base class for Queries using the <see cref="IMediator"/>
+    /// </summary>
+    /// <typeparam name="TResponse"></typeparam>
+    public interface IQuery<out TResponse> : IQuery
+    {
+     
+    }
+
+}
diff --git a/src/Test/Program.cs b/src/Test/Program.cs
@@ -17,7 +17,8 @@ public static void Main(string[] args)
 
             builder
                 .ExcludeType(typeof(Program))
-                .AddCSType(typeof(Poco));
+                //.AddCSType(typeof(Poco))
+                .AddCSType(typeof(GetCookiesForWebsiteQuery));
                 //.AddCSType(typeof(TestA.Employee));
                 //.AddCSType(typeof(TestA.Equipment))
                 //.AddCSType(typeof(TestB.Strange<>));
diff --git a/src/TypeScriptBuilder/TypeScriptGenerator.cs b/src/TypeScriptBuilder/TypeScriptGenerator.cs
@@ -109,9 +109,16 @@ public string TypeName(Type type, bool forceClass = false)
                             return "{}";
                         }
 
-                        // any other enumerable
-                        if (genericType.GetInterfaces().Any(e => e.GetGenericTypeDefinition() == typeof(IEnumerable<>)))
-                            return TypeName(generics[0]) + "[]";
+                        try
+                        {
+                            // any other enumerable
+                            if (genericType.GetInterfaces().Any(e => e.GetGenericTypeDefinition() == typeof(IEnumerable<>)))
+                                return TypeName(generics[0]) + "[]";
+                        }
+                        catch (Exception e)
+                        {
+                            return "any";
+                        }
 
                         AddCSType(genericType);
 
@@ -180,7 +187,12 @@ void GenerateTypeDefinition(Type type)
                 baseType = ti.BaseType;
 
             if (ti.IsClass && !flat && baseType != null && baseType != typeof(object))
-                Builder.AppendLine($" extends {TypeName(baseType)}");
+            {
+                var typeName = TypeName(baseType);
+                if(typeName != "any")
+                    Builder.AppendLine($" extends {typeName}");
+            }
+                
 
             Builder.OpenScope();
 
