Do not handle generic classes as tagged unions (#383)

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/compiler/ModelCompiler.java

@@ -269,21 +269,27 @@ private <T> TsBeanModel processBean(SymbolTable symbolTable, Model model, Map<Ty
 
         final List<TsPropertyModel> properties = processProperties(symbolTable, model, bean);
 
-        boolean isDiscriminated = false;
+        boolean isTaggedUnion = false;
         if (bean.getDiscriminantProperty() != null && bean.getProperty(bean.getDiscriminantProperty()) == null) {
-            isDiscriminated = true;
+            isTaggedUnion = true;
+            boolean isDisciminantProperty = true;
             final List<BeanModel> selfAndDescendants = getSelfAndDescendants(bean, children);
             final List<TsType.StringLiteralType> literals = new ArrayList<>();
             for (BeanModel descendant : selfAndDescendants) {
                 if (descendant.getDiscriminantProperty() == null || descendant.getProperty(bean.getDiscriminantProperty()) != null) {
-                    // do not handle bean as discriminated if any descendant or it itself has duplicate discriminant property
-                    isDiscriminated = false;
+                    // do not handle bean as tagged union if any descendant or it itself has duplicate discriminant property
+                    isTaggedUnion = false;
+                    isDisciminantProperty = false;
+                }
+                if (descendant.getOrigin().getTypeParameters().length != 0) {
+                    // do not handle bean as tagged union if any descendant or it itself is a generic class
+                    isTaggedUnion = false;
                 }
                 if (descendant.getDiscriminantLiteral() != null) {
                     literals.add(new TsType.StringLiteralType(descendant.getDiscriminantLiteral()));
                 }
             }
-            final TsType discriminantType = isDiscriminated && !literals.isEmpty()
+            final TsType discriminantType = isDisciminantProperty && !literals.isEmpty()
                     ? new TsType.UnionType(literals)
                     : TsType.String;
             final TsModifierFlags modifiers = TsModifierFlags.None.setReadonly(settings.declarePropertiesAsReadOnly);
@@ -303,7 +309,7 @@ private <T> TsBeanModel processBean(SymbolTable symbolTable, Model model, Map<Ty
                 /*constructor*/ null,
                 /*methods*/ null,
                 bean.getComments());
-        return isDiscriminated
+        return isTaggedUnion
                 ? tsBean.withTaggedUnion(bean.getTaggedUnionClasses(), bean.getDiscriminantProperty(), bean.getDiscriminantLiteral())
                 : tsBean;
     }

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/TaggedUnionsTest.java

@@ -138,6 +138,48 @@ private static class ElectricCar extends Car {
         public double batteryCapacityInKWh;
     }
 
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "kind")
+    @JsonSubTypes({
+            @JsonSubTypes.Type(ElectricEngine.class),
+            @JsonSubTypes.Type(DieselEngine.class),
+    })
+    private static abstract class Engine {
+        public double horsePower;
+    }
+
+    @JsonTypeName("electric")
+    private static class ElectricEngine extends Engine {
+        public double consumptionInKWh;
+    }
+
+    @JsonTypeName("diesel")
+    private static class DieselEngine extends Engine {
+        public double consumptionInLiters;
+    }
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "kind")
+    @JsonSubTypes({
+            @JsonSubTypes.Type(Boat.class),
+            @JsonSubTypes.Type(Plane.class),
+    })
+    private static abstract class Vehicule<M extends Engine> {
+        public boolean canMove;
+    }
+
+    @JsonTypeName("boat")
+    private static class Boat<M extends Engine> extends Vehicule<M> {
+        public boolean isFloating;
+    }
+
+    @JsonTypeName("plane")
+    private static class Plane<M extends Engine> extends Vehicule<M> {
+        public double altitude;
+    }
+
+    private static class Earth {
+        public List<Vehicule<Engine>> vehicules;
+    }
+
     @Test
     public void testTaggedUnions() {
         final Settings settings = TestUtils.settings();
@@ -340,6 +382,14 @@ public void testIdClass() {
         Assert.assertEquals(expected, output);
     }
 
+    @Test
+    public void testWithTypeParameter() {
+        final Settings settings = TestUtils.settings();
+        final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(Earth.class));
+        Assert.assertTrue(output.contains("EngineUnion"));
+        Assert.assertTrue(!output.contains("VehiculeUnion"));
+    }
+
     public static void main(String[] args) throws Exception {
         final ElectricCar electricCar = new ElectricCar();
         electricCar.name = "Tesla";