make exclusion work with fully qualified class names

Author: angryziber

.idea/misc.xml

@@ -38,7 +38,7 @@ public Converter(TypeMapper typeMapper) {
     this.typeMapper = typeMapper;
   }
 
-  public static String convertName(Class<?> clazz) {
+  public static String tsName(Class<?> clazz) {
     var name = clazz.getName();
     name = name.substring(name.lastIndexOf('.') + 1).replace("$", "").replace(";", "");
     return name;
@@ -54,7 +54,7 @@ else if (clazz.isEnum())
   }
 
   private String convertEnum(Class<?> clazz) {
-    var output = new StringBuilder("enum ").append(convertName(clazz)).append(" {");
+    var output = new StringBuilder("enum ").append(tsName(clazz)).append(" {");
 
     try {
       var enumConstants = clazz.getEnumConstants();
@@ -74,7 +74,7 @@ private String convertEnum(Class<?> clazz) {
   }
 
   private String convertClass(Class<?> clazz) {
-    var out = new StringBuilder("interface ").append(convertName(clazz)).append(" {");
+    var out = new StringBuilder("interface ").append(tsName(clazz)).append(" {");
     var nonRuntimeAnnotations = new LinkedHashMap<String, List<String>>();
 
     try {
@@ -192,7 +192,7 @@ private boolean processGenericField(StringBuilder typeBuffer, Class<?> fieldType
       var type = typeMapper.getSimpleTSType(fieldType);
       if (type != null) typeBuffer.append(type);
       else {
-        typeBuffer.append(convertName(fieldType));
+        typeBuffer.append(tsName(fieldType));
         typeBuffer.append("<");
         for (int j = 0; j < parameterTypes.length; j++) {
           if (j > 0) typeBuffer.append(",");

src/main/java/jvm2dts/Converter.java

@@ -19,7 +19,7 @@ static class Args {
     @Parameter
     private List<String> packages = new ArrayList<>();
 
-    @Parameter(names = {"-e", "-exclude"}, description = "Excludes classes in the generation matching a Java RegExp pattern")
+    @Parameter(names = {"-e", "-exclude"}, description = "Excludes classes in the generation with qualified name matching a RegExp")
     private String excludeRegex;
 
     @Parameter(names = {"-c", "-cast"}, description = "Comma-separated key=value map to make classnames matching the key into specified value")
@@ -69,13 +69,11 @@ public static void main(String[] args) throws Exception {
       Files.walk(basePath)
         .filter(Files::isRegularFile)
         .filter(path -> path.getFileName().toString().endsWith(".class"))
-        .filter(path -> {
+        .map(path -> toClassName(path, basePath))
+        .filter(className -> {
           if (exclude == null) return true;
-          var fileName = path.getFileName().toString();
-          var className = fileName.substring(0, fileName.lastIndexOf('.'));
           return !className.matches(exclude);
         })
-        .map(path -> toClassName(path, basePath))
         .filter(className -> isInPackage(className, packages))
         .sorted()
         .forEach(className -> processClass(className, converter, parsedArgs.dataOnly, withAnnotations));
@@ -126,4 +124,4 @@ private static boolean isData(Class<?> clazz) {
   private static boolean isAnnotated(Class<?> clazz, Set<String> annotations) {
     return stream(clazz.getAnnotations()).anyMatch(a -> annotations.contains(a.annotationType().getName()));
   }
-}
+}

src/main/java/jvm2dts/Main.java

@@ -10,7 +10,7 @@
 import java.time.zone.ZoneOffsetTransitionRule;
 import java.util.*;
 
-import static jvm2dts.Converter.convertName;
+import static jvm2dts.Converter.tsName;
 
 public class TypeMapper {
   private Map<Class<?>, String> map = new HashMap<>();
@@ -72,6 +72,6 @@ public String getSimpleTSType(Class<?> type) {
 
   public String getTSType(Class<?> type) {
     var simple = getSimpleTSType(type);
-    return simple != null ? simple : convertName(type);
+    return simple != null ? simple : tsName(type);
   }
 }