Try to remove duplicate overloads caused by Java primitives

Author: bensku

src/main/java/io/github/bensku/tsbind/AstGenerator.java

@@ -264,7 +264,7 @@ private Method processMethod(MethodDeclaration member, Set<String> privateOverri
 				&& method.getTypeParameters().isEmpty()) {
 			// GraalJS will make this getter work, somehow
 			return new Getter(name, returnType, methodDoc, method.isStatic(), override);
-		} else if (name.length() > 4 && name.startsWith("set") && method.getNumberOfParams() == 1
+		} else if (name.length() > 3 && name.startsWith("set") && method.getNumberOfParams() == 1
 				&& TypeRef.fromType(method.getParam(0).getType()) != TypeRef.BOOLEAN
 				&& method.getTypeParameters().isEmpty()) {
 			// GraalJS will make this setter work, somehow

src/main/java/io/github/bensku/tsbind/binding/TsClass.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -12,7 +13,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import io.github.bensku.tsbind.ast.Constructor;
 import io.github.bensku.tsbind.ast.Getter;
 import io.github.bensku.tsbind.ast.Member;
 import io.github.bensku.tsbind.ast.Method;
@@ -26,7 +26,39 @@ public class TsClass implements TsGenerator<TypeDefinition> {
 
 	private TsClass() {}
 
-	private class Members {
+	private static class MethodId {
+		String name;
+		List<String> paramTypes;
+		
+		MethodId(Method method) {
+			this.name = method.name();
+			this.paramTypes = method.params.stream().map(param -> param.type)
+					.map(type -> TsTypes.primitiveName(type).orElse(type.name()))
+					.collect(Collectors.toList());
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(name, paramTypes);
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) {
+				return true;
+			}
+			if (obj == null) {
+				return false;
+			}
+			if (getClass() != obj.getClass()) {
+				return false;
+			}
+			MethodId other = (MethodId) obj;
+			return Objects.equals(name, other.name) && Objects.equals(paramTypes, other.paramTypes);
+		}
+	}
+	
+	private static class Members {
 
 		private final TypeDefinition type;
 		private final List<Member> members;
@@ -65,36 +97,6 @@ private void visitSupertypes(TypeDefinition type, Consumer<TypeDefinition> visit
 		 * We do exactly that.
 		 */
 		public void addMissingOverloads() {
-			class MethodId {
-				String name;
-				List<TypeRef> paramTypes;
-				
-				MethodId(Method method) {
-					this.name = method.name();
-					this.paramTypes = method.params.stream().map(param -> param.type).collect(Collectors.toList());
-				}
-
-				@Override
-				public int hashCode() {
-					return Objects.hash(name, paramTypes);
-				}
-
-				@Override
-				public boolean equals(Object obj) {
-					if (this == obj) {
-						return true;
-					}
-					if (obj == null) {
-						return false;
-					}
-					if (getClass() != obj.getClass()) {
-						return false;
-					}
-					MethodId other = (MethodId) obj;
-					return Objects.equals(name, other.name) && Objects.equals(paramTypes, other.paramTypes);
-				}
-			}
-			
 			// Figure out what methods we already have
 			Set<MethodId> methods = new HashSet<>();
 			for (Member member : members) {
@@ -190,6 +192,26 @@ public void fixInheritDoc() {
 			}
 		}
 
+		/**
+		 * Many Java types are emitted as 'number', which can cause strange
+		 * duplicates to appear in TS types. This pass removes them.
+		 */
+		public void removeDuplicates() {
+			Set<MethodId> methods = new HashSet<>();
+			Iterator<Member> it = members.iterator();
+			while (it.hasNext()) {
+				Member member = it.next();
+				if (member instanceof Method) {
+					MethodId id = new MethodId((Method) member);
+					if (methods.contains(id)) {
+						it.remove(); // Duplicate, remove it
+					} else {
+						methods.add(id); // First occurrance
+					}
+				}
+			}
+		}
+		
 		/**
 		 * Transforms a TS getter/setter at given index to a normal method.
 		 * If the member there is not an accessor, nothing is done.
@@ -282,6 +304,7 @@ public void emit(TypeDefinition node, TsEmitter out) {
 		Members members = new Members(node, out);
 		members.addMissingOverloads();
 		members.fixInheritDoc();
+		members.removeDuplicates();
 		members.resolveConflicts();
 
 		// Emit class members with some indentation

src/main/java/io/github/bensku/tsbind/binding/TsTypes.java

@@ -1,29 +1,34 @@
 package io.github.bensku.tsbind.binding;
 
+import java.util.Optional;
+
 import io.github.bensku.tsbind.ast.TypeRef;
 
 public class TsTypes {
-
-	public static final TsGenerator<TypeRef.Simple> SIMPLE = (node, out) -> {
+	
+	public static Optional<String> primitiveName(TypeRef node) {
 		if (node == TypeRef.VOID) {
-			out.print("void");
+			return Optional.of("void");
 		} else if (node == TypeRef.BOOLEAN) {
-			out.print("boolean");
+			return Optional.of("boolean");
 		} else if (node == TypeRef.BYTE || node == TypeRef.SHORT 
 				|| node == TypeRef.INT || node == TypeRef.FLOAT
 				|| node == TypeRef.LONG || node == TypeRef.DOUBLE) {
 			// Closest TS type of most primitives is number
 			// FIXME GraalJS can't implicitly convert between all of these
-			out.print("number");
+			return Optional.of("number");
 		} else if (node == TypeRef.STRING || node == TypeRef.CHAR) {
-			out.print("string");
+			return Optional.of("string");
 		} else if (node == TypeRef.OBJECT) {
 			// Allow autoboxing JS boolean and number to Object
 			// Also helps with generic inheritance
-			out.print("any");
-		} else {
-			out.printType(node);
+			return Optional.of("any");
 		}
+		return Optional.empty();
+	}
+
+	public static final TsGenerator<TypeRef.Simple> SIMPLE = (node, out) -> {
+		primitiveName(node).ifPresentOrElse(out::print, () -> out.printType(node));
 	};
 
 	public static final TsGenerator<TypeRef.Wildcard> WILDCARD = (node, out) -> {