86 custom array type (#88)

* Locate array component type by search supertype for top defined array type

Author: cuzfrog

client-test/typescript/src/types.java17.ts

@@ -2,6 +2,7 @@ import {
     type DependencyClassA, type DependencyClassB, type DependencyClassC, type EnumGalaxy, type EnumSize,
     EnumTShirt, type JavaRecord, type AnotherJavaClass, type RecursiveClass, type MapClass,
     type OptionalMethod,
+    type ArrayClass,
 } from "./index.java17";
 
 export const list1: EnumGalaxy[] = ["Andromeda", "MilkyWay", "Triangulum"];
@@ -101,3 +102,7 @@ export const optionalMethods: OptionalMethod = {
 optionalMethods.mapNestedValueOptional = { 1: "foo" };
 optionalMethods.setNestedValueOptional = ["foo"];
 optionalMethods.nestedValueOptional = "bar";
+
+export const arrayClass: ArrayClass = {
+    arr: ["abc"],
+}

it/java8/src/main/java/online/sharedtype/it/java8/ArrayClass.java

@@ -0,0 +1,8 @@
+package online.sharedtype.it.java8;
+
+import online.sharedtype.SharedType;
+
+@SharedType
+final class ArrayClass {
+    private CustomList arr;
+}

processor/src/main/java/online/sharedtype/processor/context/Context.java

@@ -73,6 +73,16 @@ public boolean isArraylike(TypeMirror typeMirror) {
         return false;
     }
 
+    /** Check if the type is directly the same type as one of the defined arraylike types */
+    public boolean isTopArrayType(TypeMirror typeMirror) {
+        for (TypeMirror toArrayType : arraylikeTypes) {
+            if (types.isSameType(types.erasure(typeMirror), toArrayType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public boolean isMaplike(TypeMirror typeMirror) {
         for (TypeMirror maplikeType : maplikeTypes) {
             if (types.isSubtype(types.erasure(typeMirror), maplikeType)) {

processor/src/main/java/online/sharedtype/processor/parser/type/TypeInfoParserImpl.java

@@ -4,7 +4,6 @@
 import online.sharedtype.processor.context.TypeStore;
 import online.sharedtype.processor.domain.ArrayTypeInfo;
 import online.sharedtype.processor.domain.ConcreteTypeInfo;
-import online.sharedtype.processor.domain.Constants;
 import online.sharedtype.processor.domain.DependingKind;
 import online.sharedtype.processor.domain.TypeInfo;
 import online.sharedtype.processor.domain.TypeVariableInfo;
@@ -17,6 +16,7 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVariable;
+import javax.lang.model.util.Types;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -25,16 +25,17 @@
 import static online.sharedtype.processor.support.Preconditions.checkArgument;
 
 /**
- *
  * @author Cause Chung
  */
 final class TypeInfoParserImpl implements TypeInfoParser {
     private final Context ctx;
     private final TypeStore typeStore;
+    private final Types types;
 
     TypeInfoParserImpl(Context ctx) {
         this.ctx = ctx;
         this.typeStore = ctx.getTypeStore();
+        this.types = ctx.getProcessingEnv().getTypeUtils();
     }
 
     @Override
@@ -66,9 +67,8 @@ private TypeInfo parseDeclared(DeclaredType declaredType, TypeContext typeContex
         TypeMirror currentType = declaredType;
         TypeInfo typeInfo = null;
         while (ctx.isArraylike(currentType)) {
-            checkArgument(typeArgs.size() == 1, "Array type must have exactly one type argument, but got: %s, type: %s", typeArgs.size(), currentType);
             arrayStack++;
-            currentType = typeArgs.get(0);
+            currentType = locateArrayComponentType(currentType);
             if (currentType instanceof DeclaredType) {
                 DeclaredType argDeclaredType = (DeclaredType) currentType;
                 TypeElement element = (TypeElement) argDeclaredType.asElement();
@@ -108,7 +108,7 @@ private TypeInfo parseDeclared(DeclaredType declaredType, TypeContext typeContex
         }
 
         if (typeContext.getDependingKind() == DependingKind.COMPONENTS && typeInfo instanceof ConcreteTypeInfo) {
-            ConcreteTypeInfo concreteTypeInfo = (ConcreteTypeInfo)typeInfo;
+            ConcreteTypeInfo concreteTypeInfo = (ConcreteTypeInfo) typeInfo;
             concreteTypeInfo.referencingTypes().add(typeContext.getTypeDef());
         }
 
@@ -125,14 +125,33 @@ private TypeVariableInfo parseTypeVariable(TypeVariable typeVariable, TypeContex
         String qualifiedName = TypeVariableInfo.concatQualifiedName(contextTypeQualifiedName, simpleName);
         TypeInfo typeInfo = typeStore.getTypeInfo(qualifiedName, Collections.emptyList());
         if (typeInfo != null) {
-            return (TypeVariableInfo)typeInfo;
+            return (TypeVariableInfo) typeInfo;
         }
         typeInfo = TypeVariableInfo.builder()
             .contextTypeQualifiedName(contextTypeQualifiedName)
             .name(simpleName)
             .qualifiedName(qualifiedName)
             .build();
         typeStore.saveTypeInfo(qualifiedName, Collections.emptyList(), typeInfo);
-        return (TypeVariableInfo)typeInfo;
+        return (TypeVariableInfo) typeInfo;
+    }
+
+    private TypeMirror locateArrayComponentType(TypeMirror typeMirror) {
+        TypeMirror cur = typeMirror;
+        int depth = 0;
+        while (!ctx.isTopArrayType(cur)) {
+            for (TypeMirror supertype : types.directSupertypes(cur)) {
+                if (ctx.isArraylike(supertype)) {
+                    cur = supertype;
+                    break;
+                }
+            }
+            if (depth++ > 100) {
+                throw new SharedTypeInternalError("Array type hierarchy exceed max depth: " + typeMirror);
+            }
+        }
+        List<? extends TypeMirror> typeArgs = ((DeclaredType)cur).getTypeArguments();
+        checkArgument(typeArgs.size() == 1, "Array type must have exactly one type argument, but got: %s, type: %s", typeArgs.size(), typeMirror);
+        return typeArgs.get(0);
     }
 }

processor/src/test/java/online/sharedtype/processor/context/AbstractElementMock.java

@@ -69,6 +69,11 @@ public final M withModifiers(Modifier... modifiers) {
         return returnThis();
     }
 
+    public M withSuperTypes(TypeMirror... superTypes) {
+        when(types.directSupertypes(type)).thenAnswer(invoc -> Arrays.asList(superTypes));
+        return returnThis();
+    }
+
     public final M ofTree(VariableTreeMock tree) {
         tree.fromElement(element);
         return returnThis();

processor/src/test/java/online/sharedtype/processor/context/DeclaredTypeVariableElementMock.java

@@ -3,8 +3,11 @@
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Types;
 
+import java.util.Arrays;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;