Reflection

 - fixed duplicated read of generic arguments

ASP.NET
 - fixed wrong fixDate call on generics

Author: kai-melchior

Reflection/Readers/ReflectionModelReader.cs

@@ -202,14 +202,22 @@ private void ApplyGenericTemplate(Type type, GenericModelTransferObject model)
 
         private void ApplyGenericTemplate(TypeTransferObject target, string alias, TypeTransferObject type)
         {
-            if (target is GenericModelTransferObject genericModel)
+            if (target is GenericModelTransferObject genericModel && genericModel.Generics.Count == 0)
             {
                 genericModel.Template.Generics.Clone().ForEach(genericModel.Generics.Add);
                 genericModel.Template.Constants.Clone().ForEach(genericModel.Constants.Add);
                 genericModel.Template.Fields.Clone().ForEach(genericModel.Fields.Add);
                 genericModel.Template.Properties.Clone().ForEach(genericModel.Properties.Add);
             }
-            target.Generics.Where(x => x.Alias.Name == alias).ForEach(x => x.Type = type);
+            GenericAliasTransferObject aliasedGeneric = target.Generics.SingleOrDefault(x => x.Alias?.Name == alias);
+            if (aliasedGeneric?.Type != null)
+            {
+                return;
+            }
+            if (aliasedGeneric != null)
+            {
+                aliasedGeneric.Type = type;
+            }
             if (target is ModelTransferObject model)
             {
                 model.Constants.ForEach(x => this.ApplyGenericTemplate(x, alias, type));

Tests/Types/Output/generic-sub-type.ts

@@ -6,6 +6,7 @@ export class GenericSubType<TOne, TTwo> {
     public single2: string;
     public enumerable: TOne[];
     public list: TTwo[];
+    public stringList: string[];
 }
 
 // outputid:605e91d7-ee13-4f1d-9b92-845bb3ace852

Tests/Types/Output/self-referencing-type.ts

@@ -0,0 +1,10 @@
+/* eslint-disable */
+// tslint:disable
+
+export class SelfReferencingType {
+    public stringProperty: string;
+    public selfProperty: SelfReferencingType;
+    public selfList: SelfReferencingType[];
+}
+
+// outputid:605e91d7-ee13-4f1d-9b92-845bb3ace852

Tests/Types/SelfReferencingType.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using KY.Generator;
+
+namespace Types
+{
+    [Generate(OutputLanguage.TypeScript, "Output")]
+    public class SelfReferencingType
+    {
+        public string StringProperty { get; set; }
+        public SelfReferencingType SelfProperty { get; set; }
+        public List<SelfReferencingType> SelfList { get; set; }
+    }
+}

Tests/Types/Types.cs

@@ -118,5 +118,6 @@ public class GenericSubType<TOne, TTwo>
         public string Single2 { get; }
         public IEnumerable<TOne> Enumerable { get; set; }
         public List<TTwo> List { get; set; }
+        public List<string> StringList { get; set; }
     }
 }

Tests/WebApiController/ClientApp/src/app/date/models/generic-result.ts

@@ -3,6 +3,7 @@
 
 export class GenericResult<T> {
     public rows: T[];
+    public strings: string[];
 
     public constructor(init?: Partial<GenericResult<T>>) {
         Object.assign(this, init);

Tests/WebApiController/ClientApp/src/app/edge-cases/models/generic-result.ts

@@ -3,6 +3,7 @@
 
 export class GenericResult<T> {
     public rows: T[];
+    public strings: string[];
 
     public constructor(init?: Partial<GenericResult<T>>) {
         Object.assign(this, init);

Tests/WebApiController/Models/GenericResult.cs

@@ -5,6 +5,7 @@ namespace WebApiController.Models
     public class GenericResult<T>
     {
         public IEnumerable<T> Rows { get; }
+        public List<string> Strings { get; set; }
 
         public GenericResult(IEnumerable<T> rows)
         {