Correctly inherit from descendant TsInterfaces (#75)

Fixes #74

jsinterop-ts-defs-processor/src/main/java/com/vertispan/tsdefs/visitors/ClassTypeVisitor.java

@@ -46,7 +46,7 @@ public void visit(TypeScriptModule.TsModuleBuilder moduleBuilder) {
               .addModifiers(TsModifier.EXPORT)
               .addModifiers(getJsModifiers());
       new TypeArgumentsVisitor<TsClass.TsClassBuilder>(element.asType(), env).visit(builder);
-      getSuperClass().ifPresent(builder::superClass);
+      getSuperClass(element).ifPresent(builder::superClass);
       new InterfacesVisitor<TsClass.TsClassBuilder>(element, env).visit(builder);
 
       element.getEnclosedElements().stream()
@@ -68,22 +68,7 @@ public void visit(TypeScriptModule.TsModuleBuilder moduleBuilder) {
               });
 
       TsClass tsClass = builder.build();
-      getJavaSuperClass()
-          .ifPresent(
-              superclass -> {
-                TsElement superTsElement = TsElement.of(superclass, env);
-                if (superTsElement.isTsIgnored() || superTsElement.isTsInterface()) {
-                  TsClass.TsClassBuilder superBuilder =
-                      TsClass.builder(superTsElement.getName(), superTsElement.getNamespace());
-                  superTsElement
-                      .element()
-                      .getEnclosedElements()
-                      .forEach(e -> visit(superBuilder, e));
-                  TsClass superTsClass = superBuilder.build();
-                  tsClass.mergeFunctions(superTsClass);
-                  tsClass.mergeProperties(superTsClass);
-                }
-              });
+      getJavaSuperClass().ifPresent(superclass -> processSuperClass(tsClass, superclass));
       builder.setEmitProtectedContr(requiresProtectedConstructor());
 
       moduleBuilder.addClass(tsClass);
@@ -102,6 +87,25 @@ public void visit(TypeScriptModule.TsModuleBuilder moduleBuilder) {
     }
   }
 
+  private void processSuperClass(TsClass tsClass, TypeMirror superclass) {
+    TsElement superTsElement = TsElement.of(superclass, env);
+    if (superTsElement.isTsIgnored() || superTsElement.isTsInterface()) {
+      TsClass.TsClassBuilder superBuilder =
+          TsClass.builder(superTsElement.getName(), superTsElement.getNamespace());
+      superTsElement.element().getEnclosedElements().forEach(e -> visit(superBuilder, e));
+      TsClass superTsClass = superBuilder.build();
+      tsClass.mergeFunctions(superTsClass);
+      tsClass.mergeProperties(superTsClass);
+    } else {
+      superTsElement
+          .getJavaSuperClass()
+          .ifPresent(
+              typeMirror -> {
+                processSuperClass(tsClass, typeMirror);
+              });
+    }
+  }
+
   private boolean isSameNameSpaceAsParent(TsElement e) {
     if (e.getDeclaredNamespace().isPresent()) {
       String childNameSpace = e.getDeclaredNamespace().get();
@@ -145,7 +149,7 @@ private void visit(TsClass.TsClassBuilder classBuilder, Element enclosedElement)
     new ClassMethodVisitor<TsClass.TsClassBuilder>(enclosedElement, env).visit(classBuilder);
   }
 
-  private Optional<TsClass> getSuperClass() {
+  private Optional<TsClass> getSuperClass(Element element) {
     TypeMirror superclass = ((TypeElement) element).getSuperclass();
 
     if (((TypeElement) env.types().asElement(superclass))
@@ -165,7 +169,8 @@ private Optional<TsClass> getSuperClass() {
           TsClass.builder(superTsElement.getName(), superTsElement.getNamespace());
       new TypeArgumentsVisitor<TsClass.TsClassBuilder>(superclass, env).visit(builder);
       return Optional.of(builder.build());
+    } else {
+      return getSuperClass(superTsElement.element());
     }
-    return Optional.empty();
   }
 }

jsinterop-ts-defs-processor/src/main/java/com/vertispan/tsdefs/visitors/SuperTsInterfaceVisitor.java

@@ -33,6 +33,12 @@ public SuperTsInterfaceVisitor(TypeMirror typeMirror, HasProcessorEnv env) {
   public void visit(IsClassBuilder<T> builder) {
     if (isTsInterface()) {
       addInterface(builder, type);
+    } else {
+      getJavaSuperClass()
+          .ifPresent(
+              typeMirror -> {
+                new SuperTsInterfaceVisitor<T>(typeMirror, env).visit(builder);
+              });
     }
   }
 

jsinterop-ts-defs-processor/src/test/java/com/vertispan/tsdefs/inheritance/JsTypeGrandChild.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2023 Vertispan
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vertispan.tsdefs.inheritance;
+
+import jsinterop.annotations.JsType;
+
+@JsType
+public class JsTypeGrandChild extends NonJsTypeParent {
+
+  public String propertyFromA;
+
+  public String doSomethingFromA() {
+    return "";
+  }
+}

jsinterop-ts-defs-processor/src/test/java/com/vertispan/tsdefs/inheritance/JsTypeGrandChild2.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2023 Vertispan
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vertispan.tsdefs.inheritance;
+
+import jsinterop.annotations.JsType;
+
+@JsType
+public class JsTypeGrandChild2 extends NonJsTypeParent2 {
+
+  public String propertyFromA;
+
+  public String doSomethingFromA() {
+    return "";
+  }
+}

jsinterop-ts-defs-processor/src/test/java/com/vertispan/tsdefs/inheritance/JsTypeGrandParent.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2023 Vertispan
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vertispan.tsdefs.inheritance;
+
+import jsinterop.annotations.JsType;
+
+@JsType
+public class JsTypeGrandParent {
+  public String propertyFromC;
+
+  public String doSomethingFromC() {
+    return "";
+  }
+}

jsinterop-ts-defs-processor/src/test/java/com/vertispan/tsdefs/inheritance/NonJsTypeParent.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2023 Vertispan
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vertispan.tsdefs.inheritance;
+
+public class NonJsTypeParent extends TsInterfaceParent {
+
+  public String propertyFromB;
+
+  public String doSomethingFromB() {
+    return "";
+  }
+}

jsinterop-ts-defs-processor/src/test/java/com/vertispan/tsdefs/inheritance/NonJsTypeParent2.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2023 Vertispan
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vertispan.tsdefs.inheritance;
+
+public class NonJsTypeParent2 extends JsTypeGrandParent {
+
+  public String propertyFromB;
+
+  public String doSomethingFromB() {
+    return "";
+  }
+}

jsinterop-ts-defs-processor/src/test/java/com/vertispan/tsdefs/inheritance/TsInterfaceParent.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2023 Vertispan
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vertispan.tsdefs.inheritance;
+
+import com.vertispan.tsdefs.annotations.TsInterface;
+import jsinterop.annotations.JsType;
+
+@TsInterface
+@JsType
+public class TsInterfaceParent {
+  public String propertyFromC;
+
+  public String doSomethingFromC() {
+    return "";
+  }
+}

jsinterop-ts-defs-processor/src/test/resources/types/test.ts

@@ -107,6 +107,11 @@ import TsInterfaceWithJsNullableFields = com.vertispan.tsdefs.jsnullable.TsInter
 
 import UnionTypeApi = com.vertispan.tsdefs.tsunion.UnionTypeApi;
 
+// ---------------- Inheritance ----------------
+
+import JsTypeGrandChild = com.vertispan.tsdefs.inheritance.JsTypeGrandChild;
+import JsTypeGrandChild2 = com.vertispan.tsdefs.inheritance.JsTypeGrandChild2;
+
 // ---------- Properties tests -------------------------
 const jsTypeWithProperties = new JsTypeWithProperties();
 
@@ -531,6 +536,28 @@ jsTypeExtendsTsIgnoredSuperType.childProperty;
 jsTypeExtendsTsIgnoredSuperType.property;
 jsTypeExtendsTsIgnoredSuperType.doSomething();
 
+const jsTypeGrandChild = new JsTypeGrandChild();
+
+jsTypeGrandChild.propertyFromA;
+jsTypeGrandChild.doSomethingFromA();
+jsTypeGrandChild.propertyFromC;
+jsTypeGrandChild.doSomethingFromC();
+// @ts-expect-error
+jsTypeGrandChild.propertyFromB;
+// @ts-expect-error
+jsTypeGrandChild.doSomethingFromB;
+
+const jsTypeGrandChild2 = new JsTypeGrandChild2();
+
+jsTypeGrandChild2.propertyFromA;
+jsTypeGrandChild2.doSomethingFromA();
+jsTypeGrandChild2.propertyFromC;
+jsTypeGrandChild2.doSomethingFromC();
+// @ts-expect-error
+jsTypeGrandChild2.propertyFromB;
+// @ts-expect-error
+jsTypeGrandChild2.doSomethingFromB;
+
 // ------------------------ TsName ---------------------
 
 class ImplementsJsInterfaceWithTsName implements JsInterfaceByTsName {