Fix after rebase

vojtechhabarta · Jun 11, 2021 · 085e5b3 · 085e5b3
1 parent fcfc1f6
commit 085e5b3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...-generator-core/src/main/java/cz/habarta/typescript/generator/compiler/ModelCompiler.java b/...-generator-core/src/main/java/cz/habarta/typescript/generator/compiler/ModelCompiler.java
@@ -535,7 +535,7 @@ private TsModel addConstructors(SymbolTable symbolTable, TsModel tsModel) {
         final List<TsBeanModel> beans = new ArrayList<>();
         for (TsBeanModel bean : tsModel.getBeans()) {
             final Symbol beanIdentifier = symbolTable.getSymbol(bean.getOrigin());
-            final List<TsType.GenericVariableType> typeParameters = getTypeParameters(bean.getOrigin());
+            final List<TsType.BoundedGenericVariableType> typeParameters = getTypeParameters(symbolTable, bean.getOrigin());
             final TsType.ReferenceType dataType = typeParameters.isEmpty()
                     ? new TsType.ReferenceType(beanIdentifier)
                     : new TsType.GenericReferenceType(beanIdentifier, typeParameters);

diff --git a/...pt-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/TsAliasModel.java b/...pt-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/TsAliasModel.java
@@ -9,16 +9,16 @@
 
 public class TsAliasModel extends TsDeclarationModel {
 
-    private final List<TsType.GenericVariableType> typeParameters;
+    private final List<? extends TsType.GenericVariableType> typeParameters;
     private final TsType definition;
 
-    public TsAliasModel(Class<?> origin, Symbol name, List<TsType.GenericVariableType> typeParameters, TsType definition, List<String> comments) {
+    public TsAliasModel(Class<?> origin, Symbol name, List<? extends TsType.GenericVariableType> typeParameters, TsType definition, List<String> comments) {
         super(origin, null, name, comments);
         this.typeParameters = typeParameters != null ? typeParameters : Collections.emptyList();
         this.definition = definition;
     }
 
-    public List<TsType.GenericVariableType> getTypeParameters() {
+    public List<? extends TsType.GenericVariableType> getTypeParameters() {
         return typeParameters;
     }
 

diff --git a/typescript-generator-core/src/test/java/cz/habarta/typescript/generator/KotlinTest.kt b/typescript-generator-core/src/test/java/cz/habarta/typescript/generator/KotlinTest.kt
@@ -89,7 +89,7 @@ class KotlinTest {
         val settings = TestUtils.settings()
         val output = TypeScriptGenerator(settings).generateTypeScript(Input.from(A2::class.java))
         val errorMessage = "Unexpected output: $output"
-        Assert.assertTrue(errorMessage, output.contains("interface A2<S>"))
+        Assert.assertTrue(errorMessage, output.contains("interface A2<S extends Enum<S>>"))
     }
 
     private class A2<S> where S : Enum<S> {

diff --git a/...script-generator-core/src/test/java/cz/habarta/typescript/generator/TaggedUnionsTest.java b/...script-generator-core/src/test/java/cz/habarta/typescript/generator/TaggedUnionsTest.java
@@ -392,7 +392,7 @@ 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<M>"));
+        Assert.assertTrue(output.contains("VehiculeUnion<M extends Engine>"));
     }
 
     public static void main(String[] args) throws Exception {